diff --git a/NzbDrone.Core.Test/SabControllerTest.cs.orig b/NzbDrone.Core.Test/SabControllerTest.cs.orig deleted file mode 100644 index a972761da..000000000 --- a/NzbDrone.Core.Test/SabControllerTest.cs.orig +++ /dev/null @@ -1,262 +0,0 @@ -using System; -using System.IO; -using System.Linq; -using AutoMoq; -using MbUnit.Framework; -using Moq; -using NzbDrone.Core.Model; -using NzbDrone.Core.Providers; -using NzbDrone.Core.Providers.Core; -using NzbDrone.Core.Repository; -using NzbDrone.Core.Repository.Quality; - -namespace NzbDrone.Core.Test -{ - [TestFixture] - // ReSharper disable InconsistentNaming - public class SabControllerTest - { - [Test] - public void AddByUrlSuccess() - { - //Setup - string sabHost = "192.168.5.55"; - string sabPort = "2222"; - string apikey = "5c770e3197e4fe763423ee7c392c25d1"; - string username = "admin"; - string password = "pass"; - string priority = "Normal"; - string category = "tv"; - - - var mocker = new AutoMoqer(); - - var fakeConfig = mocker.GetMock(); -<<<<<<< HEAD - fakeConfig.Setup(c => c.SabHost) - .Returns(sabHost); - fakeConfig.Setup(c => c.SabPort) - .Returns(sabPort); - fakeConfig.Setup(c => c.SabApiKey) - .Returns(apikey); - fakeConfig.Setup(c => c.SabUsername) - .Returns(username); - fakeConfig.Setup(c => c.SabPassword) - .Returns(password); - fakeConfig.Setup(c => c.SabTvPriority) - .Returns(priority); - fakeConfig.Setup(c => c.SabTvCategory) -======= - fakeConfig.SetupGet(c => c.SabHost) - .Returns(sabHost); - fakeConfig.SetupGet(c => c.SabPort) - .Returns(sabPort); - fakeConfig.SetupGet(c => c.SabApiKey) - .Returns(apikey); - fakeConfig.SetupGet(c => c.SabUsername) - .Returns(username); - fakeConfig.SetupGet(c => c.SabPassword) - .Returns(password); - fakeConfig.SetupGet(c => c.SabTvPriority) - .Returns(priority); - fakeConfig.SetupGet(c => c.SabTvCategory) ->>>>>>> cb4d0e245018bf547d1d8295a7271c21f26366f8 - .Returns(category); - - mocker.GetMock(MockBehavior.Strict) - .Setup( - s => - s.DownloadString( - "http://192.168.5.55:2222/api?mode=addurl&name=http://www.nzbclub.com/nzb_download.aspx?mid=1950232&priority=0&cat=tv&nzbname=This+is+an+Nzb&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass")) - .Returns("ok"); - - //Act - bool result = mocker.Resolve().AddByUrl( - "http://www.nzbclub.com/nzb_download.aspx?mid=1950232", "This is an Nzb"); - - //Assert - Assert.IsTrue(result); - } - - [Test] - public void AddByUrlError() - { - //Setup -<<<<<<< HEAD - string sabHost = "192.168.5.55"; - string sabPort = "2222"; - string apikey = "5c770e3197e4fe763423ee7c392c25d1"; - string username = "admin"; - string password = "pass"; - string priority = "Normal"; - string category = "tv"; - - var mocker = new AutoMoqer(); - - var fakeConfig = mocker.GetMock(); - fakeConfig.Setup(c => c.SabHost) - .Returns(sabHost); - fakeConfig.Setup(c => c.SabPort) - .Returns(sabPort); - fakeConfig.Setup(c => c.SabApiKey) - .Returns(apikey); - fakeConfig.Setup(c => c.SabUsername) - .Returns(username); - fakeConfig.Setup(c => c.SabPassword) - .Returns(password); - fakeConfig.Setup(c => c.SabTvPriority) - .Returns(priority); - fakeConfig.Setup(c => c.SabTvCategory) - .Returns(category); - -======= - var mocker = new AutoMoqer(); - ->>>>>>> cb4d0e245018bf547d1d8295a7271c21f26366f8 - mocker.GetMock() - .Setup(s => s.DownloadString(It.IsAny())) - .Returns("error"); - - //Act - var sabProvider = mocker.Resolve(); - var result = sabProvider.AddByUrl("http://www.nzbclub.com/nzb_download.aspx?mid=1950232", "This is an nzb"); - - //Assert - Assert.IsFalse(result); - } - - [Test] - public void IsInQueue_True() - { - //Setup - string sabHost = "192.168.5.55"; - string sabPort = "2222"; - string apikey = "5c770e3197e4fe763423ee7c392c25d1"; - string username = "admin"; - string password = "pass"; - - var mocker = new AutoMoqer(); - - var fakeConfig = mocker.GetMock(); - fakeConfig.SetupGet(c => c.SabHost) - .Returns(sabHost); - fakeConfig.SetupGet(c => c.SabPort) - .Returns(sabPort); - fakeConfig.SetupGet(c => c.SabApiKey) - .Returns(apikey); - fakeConfig.SetupGet(c => c.SabUsername) - .Returns(username); - fakeConfig.SetupGet(c => c.SabPassword) - .Returns(password); - - mocker.GetMock(MockBehavior.Strict) - .Setup(s => s.DownloadString("http://192.168.5.55:2222/api?mode=queue&output=xml&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass")) - .Returns(File.ReadAllText(@".\Files\Queue.xml")); - - //Act - bool result = mocker.Resolve().IsInQueue("Ubuntu Test"); - - //Assert - Assert.IsTrue(result); - } - - [Test] - public void IsInQueue_False_Empty() - { - //Setup - string sabHost = "192.168.5.55"; - string sabPort = "2222"; - string apikey = "5c770e3197e4fe763423ee7c392c25d1"; - string username = "admin"; - string password = "pass"; - - var mocker = new AutoMoqer(); - - var fakeConfig = mocker.GetMock(); - fakeConfig.SetupGet(c => c.SabHost) - .Returns(sabHost); - fakeConfig.SetupGet(c => c.SabPort) - .Returns(sabPort); - fakeConfig.SetupGet(c => c.SabApiKey) - .Returns(apikey); - fakeConfig.SetupGet(c => c.SabUsername) - .Returns(username); - fakeConfig.SetupGet(c => c.SabPassword) - .Returns(password); - - mocker.GetMock(MockBehavior.Strict) - .Setup(s => s.DownloadString("http://192.168.5.55:2222/api?mode=queue&output=xml&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass")) - .Returns(File.ReadAllText(@".\Files\QueueEmpty.xml")); - - //Act - bool result = mocker.Resolve().IsInQueue(String.Empty); - - //Assert - Assert.IsFalse(result); - } - - [Test] - [ExpectedException(typeof(ApplicationException), Message = "API Key Incorrect")] - public void IsInQueue_False_Error() - { - //Setup - string sabHost = "192.168.5.55"; - string sabPort = "2222"; - string apikey = "5c770e3197e4fe763423ee7c392c25d1"; - string username = "admin"; - string password = "pass"; - - var mocker = new AutoMoqer(); - - var fakeConfig = mocker.GetMock(); - fakeConfig.SetupGet(c => c.SabHost) - .Returns(sabHost); - fakeConfig.SetupGet(c => c.SabPort) - .Returns(sabPort); - fakeConfig.SetupGet(c => c.SabApiKey) - .Returns(apikey); - fakeConfig.SetupGet(c => c.SabUsername) - .Returns(username); - fakeConfig.SetupGet(c => c.SabPassword) - .Returns(password); - - mocker.GetMock(MockBehavior.Strict) - .Setup(s => s.DownloadString("http://192.168.5.55:2222/api?mode=queue&output=xml&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass")) - .Returns(File.ReadAllText(@".\Files\QueueError.xml")); - - - //Act - mocker.Resolve().IsInQueue(String.Empty); - } - - [Test] - [Row(1, new[] { 2 }, "My Episode Title", QualityTypes.DVD, false, "My Series Name - 1x2 - My Episode Title [DVD]")] - [Row(1, new[] { 2 }, "My Episode Title", QualityTypes.DVD, true, "My Series Name - 1x2 - My Episode Title [DVD] [Proper]")] - [Row(1, new[] { 2 }, "", QualityTypes.DVD, true, "My Series Name - 1x2 - [DVD] [Proper]")] - [Row(1, new[] { 2, 4 }, "My Episode Title", QualityTypes.HDTV, false, "My Series Name - 1x2-1x4 - My Episode Title [HDTV]")] - [Row(1, new[] { 2, 4 }, "My Episode Title", QualityTypes.HDTV, true, "My Series Name - 1x2-1x4 - My Episode Title [HDTV] [Proper]")] - [Row(1, new[] { 2, 4 }, "", QualityTypes.HDTV, true, "My Series Name - 1x2-1x4 - [HDTV] [Proper]")] - public void sab_title(int seasons, int[] episodes, string title, QualityTypes quality, bool proper, string excpected) - { - var mocker = new AutoMoqer(); - - var parsResult = new EpisodeParseResult() - { - SeriesId = 12, - AirDate = DateTime.Now, - Episodes = episodes.ToList(), - Proper = proper, - Quality = quality, - SeasonNumber = seasons, - EpisodeTitle = title, - FolderName = "My Series Name" - }; - - //Act - var actual = mocker.Resolve().GetSabTitle(parsResult); - - //Assert - Assert.AreEqual(excpected, actual); - } - } -} \ No newline at end of file diff --git a/NzbDrone.Core/Providers/Jobs/NewSeriesUpdate.cs b/NzbDrone.Core/Providers/Jobs/NewSeriesUpdate.cs index 70190f52e..d0ad46c07 100644 --- a/NzbDrone.Core/Providers/Jobs/NewSeriesUpdate.cs +++ b/NzbDrone.Core/Providers/Jobs/NewSeriesUpdate.cs @@ -11,14 +11,16 @@ namespace NzbDrone.Core.Providers.Jobs private readonly SeriesProvider _seriesProvider; private readonly EpisodeProvider _episodeProvider; private readonly MediaFileProvider _mediaFileProvider; + private readonly SeasonProvider _seasonProvider; private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); - public NewSeriesUpdate(SeriesProvider seriesProvider, EpisodeProvider episodeProvider, MediaFileProvider mediaFileProvider) + public NewSeriesUpdate(SeriesProvider seriesProvider, EpisodeProvider episodeProvider, MediaFileProvider mediaFileProvider, SeasonProvider seasonProvider) { _seriesProvider = seriesProvider; _episodeProvider = episodeProvider; _mediaFileProvider = mediaFileProvider; + _seasonProvider = seasonProvider; } public string Name @@ -48,17 +50,32 @@ namespace NzbDrone.Core.Providers.Jobs { try { - notification.CurrentMessage = String.Format("Searching for '{0}'", new DirectoryInfo(currentSeries.Path).Name); + notification.CurrentMessage = String.Format("Searching for '{0}'", + new DirectoryInfo(currentSeries.Path).Name); var updatedSeries = _seriesProvider.UpdateSeriesInfo(currentSeries.SeriesId); notification.CurrentMessage = String.Format("Downloading episode info for '{0}'", - updatedSeries.Title); + updatedSeries.Title); _episodeProvider.RefreshEpisodeInfo(updatedSeries.SeriesId); notification.CurrentMessage = String.Format("Scanning disk for '{0}' files", updatedSeries.Title); _mediaFileProvider.Scan(_seriesProvider.GetSeries(updatedSeries.SeriesId)); - } + if (_mediaFileProvider.GetSeriesFiles(currentSeries.SeriesId).Count() != 0) + { + Logger.Debug("Looking for seasons to ignore"); + foreach (var season in updatedSeries.Seasons) + { + if (season.SeasonNumber != updatedSeries.Seasons.Max(s => s.SeasonNumber) && _mediaFileProvider.GetSeasonFiles(season.SeasonId).Count() == 0) + { + Logger.Info("Season {0} of {1} doesn't have any files on disk. season will not be monitored.", season.SeasonNumber, updatedSeries.Title); + season.Monitored = false; + _seasonProvider.SaveSeason(season); + } + } + } + + } catch (Exception e) { Logger.ErrorException(e.Message, e); diff --git a/NzbDrone.Core/Providers/PostProcessingProvider.cs b/NzbDrone.Core/Providers/PostProcessingProvider.cs deleted file mode 100644 index 1ffe45f74..000000000 --- a/NzbDrone.Core/Providers/PostProcessingProvider.cs +++ /dev/null @@ -1,35 +0,0 @@ -namespace NzbDrone.Core.Providers -{ - public class PostProcessingProvider - { - private readonly MediaFileProvider _mediaFileProvider; - private readonly RenameProvider _renameProvider; - private readonly SeriesProvider _seriesProvider; - - public PostProcessingProvider(SeriesProvider seriesProvider, - MediaFileProvider mediaFileProvider, RenameProvider renameProvider) - { - _seriesProvider = seriesProvider; - _mediaFileProvider = mediaFileProvider; - _renameProvider = renameProvider; - } - - public virtual void ProcessEpisode(string dir, string nzbName) - { - var parsedSeries = Parser.ParseSeriesName(nzbName); - var series = _seriesProvider.FindSeries(parsedSeries); - - if (series == null) - return; - - //Import the files, and then rename the newly added ones. - var fileList = _mediaFileProvider.Scan(series, dir); - - foreach (var file in fileList) - { - //Notifications will be sent from the Renamer, depending on the bool NewDownload (which will be set to true from here), a normal rename will be treated as such. - _renameProvider.RenameEpisodeFile(file.EpisodeFileId, true); - } - } - } -} \ No newline at end of file diff --git a/NzbDrone.Core/Providers/SabProvider.cs.orig b/NzbDrone.Core/Providers/SabProvider.cs.orig deleted file mode 100644 index acc93c5c9..000000000 --- a/NzbDrone.Core/Providers/SabProvider.cs.orig +++ /dev/null @@ -1,160 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Web; -using System.Xml.Linq; -using NLog; -using NzbDrone.Core.Model; -using NzbDrone.Core.Providers.Core; - -namespace NzbDrone.Core.Providers -{ - public class SabProvider - { - private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); - private readonly ConfigProvider _configProvider; - private readonly HttpProvider _httpProvider; - - public SabProvider() - { - } - - public SabProvider(ConfigProvider configProvider, HttpProvider httpProvider) - { - _configProvider = configProvider; - _httpProvider = httpProvider; - } - - public virtual bool AddByUrl(string url, string title) - { - string cat = _configProvider.SabTvCategory; -<<<<<<< HEAD - int priority = (int)Enum.Parse(typeof(SabnzbdPriorityType), _configProvider.SabTvPriority); -======= - string priority = _configProvider.SabTvPriority; ->>>>>>> cb4d0e245018bf547d1d8295a7271c21f26366f8 - string name = url.Replace("&", "%26"); - string nzbName = HttpUtility.UrlEncode(title); - - string action = string.Format("mode=addurl&name={0}&priority={1}&cat={2}&nzbname={3}", - name, priority, cat, nzbName); - string request = GetSabRequest(action); - - Logger.Info("Adding report [{0}] to the queue.", title); - - string response = _httpProvider.DownloadString(request).Replace("\n", String.Empty); - Logger.Debug("Queue Response: [{0}]", response); - - if (response == "ok") - return true; - - Logger.Warn("SAB returned unexpected response '{0}'", response); - - return false; - } - - public virtual bool IsInQueue(string title) - { - const string action = "mode=queue&output=xml"; - string request = GetSabRequest(action); - string response = _httpProvider.DownloadString(request); - - XDocument xDoc = XDocument.Parse(response); - - //If an Error Occurred, return) - if (xDoc.Descendants("error").Count() != 0) - throw new ApplicationException(xDoc.Descendants("error").FirstOrDefault().Value); - - if (xDoc.Descendants("queue").Count() == 0) - { - Logger.Debug("SAB Queue is empty. retiring false"); - return false; - } - //Get the Count of Items in Queue where 'filename' is Equal to goodName, if not zero, return true (isInQueue))) - if ( - (xDoc.Descendants("slot").Where( - s => s.Element("filename").Value.Equals(title, StringComparison.InvariantCultureIgnoreCase))).Count() != - 0) - { - Logger.Debug("Episode in queue - '{0}'", title); - - return true; - } - - return false; //Not in Queue - } - -<<<<<<< HEAD - public virtual bool AddById(string id, string title) - { - //mode=addid&name=333333&pp=3&script=customscript.cmd&cat=Example&priority=-1 - - const string mode = "addid"; - string cat = _configProvider.SabTvCategory; - int priority = (int)Enum.Parse(typeof(SabnzbdPriorityType), _configProvider.SabTvPriority); - string nzbName = HttpUtility.UrlEncode(title); - - string action = string.Format("mode={0}&name={1}&priority={2}&cat={3}&nzbname={4}", mode, id, priority, cat, - nzbName); - string request = GetSabRequest(action); - - Logger.Debug("Adding report [{0}] to the queue.", nzbName); - - string response = _httpProvider.DownloadString(request).Replace("\n", String.Empty); - Logger.Debug("Queue Repsonse: [{0}]", response); - - if (response == "ok") - return true; - - return false; - } - - private string GetSabRequest(string action) - { - string sabnzbdInfo = _configProvider.SabHost + ":" + - _configProvider.SabPort; - string username = _configProvider.SabUsername; - string password = _configProvider.SabPassword; - string apiKey = _configProvider.SabApiKey; - - return - string.Format(@"http://{0}/api?$Action&apikey={1}&ma_username={2}&ma_password={3}", sabnzbdInfo, apiKey, - username, password).Replace("$Action", action); -======= - private string GetSabRequest(string action) - { - return string.Format(@"http://{0}:{1}/api?{2}&apikey={3}&ma_username={4}&ma_password={5}", - _configProvider.SabHost, - _configProvider.SabPort, - action, - _configProvider.SabApiKey, - _configProvider.SabUsername, - _configProvider.SabPassword); ->>>>>>> cb4d0e245018bf547d1d8295a7271c21f26366f8 - } - - public String GetSabTitle(EpisodeParseResult parseResult) - { - //Show Name - 1x01-1x02 - Episode Name - //Show Name - 1x01 - Episode Name - var episodeString = new List(); - - foreach (var episode in parseResult.Episodes) - { - episodeString.Add(String.Format("{0}x{1}", parseResult.SeasonNumber, episode)); - } - - var epNumberString = String.Join("-", episodeString); - - var result = String.Format("{0} - {1} - {2} [{3}]", parseResult.FolderName, epNumberString, parseResult.EpisodeTitle, parseResult.Quality); - - if (parseResult.Proper) - { - result += " [Proper]"; - } - - return result; - } - } -} \ No newline at end of file diff --git a/NzbDrone.Web/Controllers/ApiController.cs b/NzbDrone.Web/Controllers/ApiController.cs deleted file mode 100644 index 5baade17c..000000000 --- a/NzbDrone.Web/Controllers/ApiController.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System.Web.Mvc; -using NLog; -using NzbDrone.Core.Providers; -using NzbDrone.Core.Providers.Core; - -namespace NzbDrone.Web.Controllers -{ - public class ApiController : Controller - { - private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); - private readonly ConfigProvider _configProvider; - private readonly PostProcessingProvider _postProcessingProvider; - - public ApiController(PostProcessingProvider postProcessingProvider, ConfigProvider configProvider) - { - _postProcessingProvider = postProcessingProvider; - _configProvider = configProvider; - } - - public ActionResult ProcessEpisode(string apiKey, string dir, string nzbName, string category) - { - if (apiKey != _configProvider.ApiKey) - { - Logger.Warn("API Key from Post Processing Script is Invalid"); - return Content("Invalid API Key"); - } - - if (_configProvider.SabTvCategory == category) - { - _postProcessingProvider.ProcessEpisode(dir, nzbName); - return Content("ok"); - } - - return Content("Category doesn't match what was configured for SAB TV Category..."); - } - } -} \ No newline at end of file diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj index 2a7be8987..c724f2bd6 100644 --- a/NzbDrone.Web/NzbDrone.Web.csproj +++ b/NzbDrone.Web/NzbDrone.Web.csproj @@ -214,7 +214,6 @@ True UploadLocalization.en-US.resx -