From 45fde370d802564a0012a7b6c443a0018cac4aaa Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Tue, 17 May 2011 20:10:39 -0700 Subject: [PATCH 1/6] Removed post processor from solution --- NzbDrone.Core/CentralDispatch.cs | 1 - NzbDrone.Core/NzbDrone.Core.csproj | 1 - NzbDrone.Core/Providers/MediaFileProvider.cs | 43 ++++--------------- .../Providers/PostProcessingProvider.cs | 35 --------------- NzbDrone.Web/Controllers/ApiController.cs | 37 ---------------- NzbDrone.Web/Controllers/SeriesController.cs | 7 ++- NzbDrone.Web/NzbDrone.Web.csproj | 1 - NzbDrone.sln | 13 ------ 8 files changed, 12 insertions(+), 126 deletions(-) delete mode 100644 NzbDrone.Core/Providers/PostProcessingProvider.cs delete mode 100644 NzbDrone.Web/Controllers/ApiController.cs diff --git a/NzbDrone.Core/CentralDispatch.cs b/NzbDrone.Core/CentralDispatch.cs index daee295a2..73c0cf34a 100644 --- a/NzbDrone.Core/CentralDispatch.cs +++ b/NzbDrone.Core/CentralDispatch.cs @@ -90,7 +90,6 @@ namespace NzbDrone.Core _kernel.Bind().ToSelf().InSingletonScope(); _kernel.Bind().ToSelf().InSingletonScope(); _kernel.Bind().ToSelf().InSingletonScope(); - _kernel.Bind().ToSelf().InSingletonScope(); _kernel.Bind().To().InSingletonScope(); _kernel.Bind().ToSelf().InSingletonScope(); _kernel.Bind().ToSelf().InSingletonScope(); diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj index 8fc58d7c9..9d844f434 100644 --- a/NzbDrone.Core/NzbDrone.Core.csproj +++ b/NzbDrone.Core/NzbDrone.Core.csproj @@ -203,7 +203,6 @@ - diff --git a/NzbDrone.Core/Providers/MediaFileProvider.cs b/NzbDrone.Core/Providers/MediaFileProvider.cs index 4ddb5de1a..a9816e527 100644 --- a/NzbDrone.Core/Providers/MediaFileProvider.cs +++ b/NzbDrone.Core/Providers/MediaFileProvider.cs @@ -25,9 +25,7 @@ namespace NzbDrone.Core.Providers _episodeProvider = episodeProvider; } - public MediaFileProvider() - { - } + public MediaFileProvider() { } /// /// Scans the specified series folder for media files @@ -47,24 +45,6 @@ namespace NzbDrone.Core.Providers return fileList; } - /// - /// Scans the specified series folder for media files - /// - /// The series to be scanned - public List Scan(Series series, string path) - { - var mediaFileList = GetMediaFileList(path); - var fileList = new List(); - - foreach (var filePath in mediaFileList) - { - var file = ImportFile(series, filePath); - if (file != null) - fileList.Add(file); - } - return fileList; - } - public EpisodeFile ImportFile(Series series, string filePath) { Logger.Trace("Importing file to database [{0}]", filePath); @@ -76,10 +56,11 @@ namespace NzbDrone.Core.Providers //If Size is less than 50MB and contains sample. Check for Size to ensure its not an episode with sample in the title if (size < 40000000 && filePath.ToLower().Contains("sample")) { - Logger.Trace("[{0}] appears to be a sample... skipping.", filePath); + Logger.Trace("[{0}] appears to be a sample. skipping.", filePath); return null; } + //Check to see if file already exists in the database if (!_repository.Exists(e => e.Path == Parser.NormalizePath(filePath))) { var parseResult = Parser.ParseEpisodeInfo(filePath); @@ -90,6 +71,7 @@ namespace NzbDrone.Core.Providers //Stores the list of episodes to add to the EpisodeFile var episodes = new List(); + //Check for daily shows if (parseResult.Episodes == null) { var episode = _episodeProvider.GetEpisode(series.SeriesId, parseResult.AirDate.Date); @@ -98,9 +80,10 @@ namespace NzbDrone.Core.Providers { episodes.Add(episode); } - else + { Logger.Warn("Unable to find '{0}' in the database. File:{1}", parseResult, filePath); + } } else { @@ -113,14 +96,15 @@ namespace NzbDrone.Core.Providers { episodes.Add(episode); } - else + { Logger.Warn("Unable to find '{0}' in the database. File:{1}", parseResult, filePath); + } } } //Return null if no Episodes exist in the DB for the parsed episodes from file - if (episodes.Count < 1) + if (episodes.Count <= 0) return null; var episodeFile = new EpisodeFile(); @@ -173,16 +157,7 @@ namespace NzbDrone.Core.Providers } } - public void DeleteFromDb(int fileId) - { - _repository.Delete(fileId); - } - public void DeleteFromDisk(int fileId, string path) - { - _diskProvider.DeleteFile(path); - _repository.Delete(fileId); - } public void Update(EpisodeFile episodeFile) { 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.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/Controllers/SeriesController.cs b/NzbDrone.Web/Controllers/SeriesController.cs index 80ba05d0f..0f716c715 100644 --- a/NzbDrone.Web/Controllers/SeriesController.cs +++ b/NzbDrone.Web/Controllers/SeriesController.cs @@ -76,7 +76,7 @@ namespace NzbDrone.Web.Controllers SeasonNumber = s.SeasonNumber, SeasonString = GetSeasonString(s.SeasonNumber), Monitored = s.Monitored - }).OrderBy(s=> s.SeasonNumber).ToList(); + }).OrderBy(s => s.SeasonNumber).ToList(); return View(model); } @@ -120,7 +120,7 @@ namespace NzbDrone.Web.Controllers //Start removing this series _jobProvider.QueueJob(typeof(DeleteSeriesJob), id); - + var series = GetSeriesModels(seriesInDb); return View(new GridModel(series)); } @@ -265,8 +265,7 @@ namespace NzbDrone.Web.Controllers public ActionResult SyncEpisodesOnDisk(int seriesId) { //Syncs the episodes on disk for the specified series - var series = _seriesProvider.GetSeries(seriesId); - _mediaFileProvider.Scan(series); + _jobProvider.QueueJob(typeof(MediaFileScanJob), seriesId); return RedirectToAction("Details", new { seriesId }); } diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj index 8da9302c7..a665f8c5c 100644 --- a/NzbDrone.Web/NzbDrone.Web.csproj +++ b/NzbDrone.Web/NzbDrone.Web.csproj @@ -214,7 +214,6 @@ True UploadLocalization.en-US.resx - diff --git a/NzbDrone.sln b/NzbDrone.sln index 16b90b117..5f2f23734 100644 --- a/NzbDrone.sln +++ b/NzbDrone.sln @@ -11,8 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Core.Test", "NzbDr EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{57A04B72-8088-4F75-A582-1158CF8291F7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.PostProcessor", "NzbDrone.PostProcessor\NzbDrone.PostProcessor.csproj", "{0C679573-736D-4F77-B934-FD8931AC1AA1}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -79,17 +77,6 @@ Global {193ADD3B-792B-4173-8E4C-5A3F8F0237F0}.Release|Mixed Platforms.Build.0 = Release|Any CPU {193ADD3B-792B-4173-8E4C-5A3F8F0237F0}.Release|x64.ActiveCfg = Release|Any CPU {193ADD3B-792B-4173-8E4C-5A3F8F0237F0}.Release|x86.ActiveCfg = Release|Any CPU - {0C679573-736D-4F77-B934-FD8931AC1AA1}.Debug|Any CPU.ActiveCfg = Debug|x86 - {0C679573-736D-4F77-B934-FD8931AC1AA1}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {0C679573-736D-4F77-B934-FD8931AC1AA1}.Debug|x64.ActiveCfg = Debug|x86 - {0C679573-736D-4F77-B934-FD8931AC1AA1}.Debug|x86.ActiveCfg = Debug|x86 - {0C679573-736D-4F77-B934-FD8931AC1AA1}.Debug|x86.Build.0 = Debug|x86 - {0C679573-736D-4F77-B934-FD8931AC1AA1}.Release|Any CPU.ActiveCfg = Release|x86 - {0C679573-736D-4F77-B934-FD8931AC1AA1}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {0C679573-736D-4F77-B934-FD8931AC1AA1}.Release|Mixed Platforms.Build.0 = Release|x86 - {0C679573-736D-4F77-B934-FD8931AC1AA1}.Release|x64.ActiveCfg = Release|x86 - {0C679573-736D-4F77-B934-FD8931AC1AA1}.Release|x86.ActiveCfg = Release|x86 - {0C679573-736D-4F77-B934-FD8931AC1AA1}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 2cd4e1649fb34382e37ca5d7ccac9643fb4e61ce Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Tue, 17 May 2011 20:18:35 -0700 Subject: [PATCH 2/6] Diskscan now updates the last scan time of the series object --- NzbDrone.Core.Test/MediaFileProviderTests.cs | 14 ++++++++++++++ NzbDrone.Core/Providers/MediaFileProvider.cs | 8 +++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/NzbDrone.Core.Test/MediaFileProviderTests.cs b/NzbDrone.Core.Test/MediaFileProviderTests.cs index becfc86b0..1b8fc1933 100644 --- a/NzbDrone.Core.Test/MediaFileProviderTests.cs +++ b/NzbDrone.Core.Test/MediaFileProviderTests.cs @@ -271,5 +271,19 @@ namespace NzbDrone.Core.Test Assert.IsNull(result); mocker.GetMock().Verify(r => r.Add(result), Times.Never()); } + + [Test] + public void scan_series_should_update_last_scan_date() + { + + var mocker = new AutoMoqer(); + mocker.GetMock() + .Setup(c => c.UpdateSeries(It.Is(s => s.LastDiskSync != null))).Verifiable(); + + mocker.Resolve().Scan(new Series()); + + mocker.VerifyAllMocks(); + + } } } \ No newline at end of file diff --git a/NzbDrone.Core/Providers/MediaFileProvider.cs b/NzbDrone.Core/Providers/MediaFileProvider.cs index a9816e527..5d353bea2 100644 --- a/NzbDrone.Core/Providers/MediaFileProvider.cs +++ b/NzbDrone.Core/Providers/MediaFileProvider.cs @@ -15,14 +15,16 @@ namespace NzbDrone.Core.Providers private static readonly string[] MediaExtentions = new[] { "*.mkv", "*.avi", "*.wmv", "*.mp4" }; private readonly DiskProvider _diskProvider; private readonly EpisodeProvider _episodeProvider; + private readonly SeriesProvider _seriesProvider; private readonly IRepository _repository; public MediaFileProvider(IRepository repository, DiskProvider diskProvider, - EpisodeProvider episodeProvider) + EpisodeProvider episodeProvider, SeriesProvider seriesProvider) { _repository = repository; _diskProvider = diskProvider; _episodeProvider = episodeProvider; + _seriesProvider = seriesProvider; } public MediaFileProvider() { } @@ -42,6 +44,10 @@ namespace NzbDrone.Core.Providers if (file != null) fileList.Add(file); } + + series.LastDiskSync = DateTime.Now; + _seriesProvider.UpdateSeries(series); + return fileList; } From c01595a9c4faae82df76921375110e75df1efea0 Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Tue, 17 May 2011 20:23:09 -0700 Subject: [PATCH 3/6] removed leftover merge files --- NzbDrone.Core.Test/SabControllerTest.cs.orig | 262 ------------------- NzbDrone.Core/Providers/SabProvider.cs.orig | 160 ----------- 2 files changed, 422 deletions(-) delete mode 100644 NzbDrone.Core.Test/SabControllerTest.cs.orig delete mode 100644 NzbDrone.Core/Providers/SabProvider.cs.orig 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/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 From 4ac4ba5067f3e857ddcbe6ac0cb07fc4cd118f1f Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Tue, 17 May 2011 20:52:49 -0700 Subject: [PATCH 4/6] Mediascan job doesn't scan series that aren't fully added to the db yet --- NzbDrone.Core.Test/MediaFileProviderTests.cs | 22 +++++++++++++++++++ .../Providers/Jobs/MediaFileScanJob.cs | 2 +- NzbDrone.Core/Providers/MediaFileProvider.cs | 12 +++++----- 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/NzbDrone.Core.Test/MediaFileProviderTests.cs b/NzbDrone.Core.Test/MediaFileProviderTests.cs index 1b8fc1933..9e0e2b453 100644 --- a/NzbDrone.Core.Test/MediaFileProviderTests.cs +++ b/NzbDrone.Core.Test/MediaFileProviderTests.cs @@ -1,12 +1,17 @@ using System; +using System.Collections.Generic; +using System.IO; using System.Linq.Expressions; +using System.Linq; using AutoMoq; using FizzWare.NBuilder; using MbUnit.Framework; using Moq; using Moq.Linq; +using NzbDrone.Core.Model.Notification; using NzbDrone.Core.Providers; using NzbDrone.Core.Providers.Core; +using NzbDrone.Core.Providers.Jobs; using NzbDrone.Core.Repository; using NzbDrone.Core.Repository.Quality; using SubSonic.Repository; @@ -285,5 +290,22 @@ namespace NzbDrone.Core.Test mocker.VerifyAllMocks(); } + + + [Test] + public void scan_media_job_should_not_scan_new_series() + { + var mocker = new AutoMoqer(); + mocker.GetMock() + .Setup(c => c.GetAllSeries()) + .Returns(Builder.CreateListOfSize(2) + .WhereTheFirst(1).Has(c => c.LastInfoSync = DateTime.Now).Build().AsQueryable()); + mocker.GetMock( MockBehavior.Strict) + .Setup(c=>c.Scan(It.Is(s=>s.LastInfoSync != null))).Returns(new List()).Verifiable(); + + mocker.Resolve().Start(new ProgressNotification("test"), 0); + + mocker.VerifyAllMocks(); + } } } \ No newline at end of file diff --git a/NzbDrone.Core/Providers/Jobs/MediaFileScanJob.cs b/NzbDrone.Core/Providers/Jobs/MediaFileScanJob.cs index a53a10672..5638638ad 100644 --- a/NzbDrone.Core/Providers/Jobs/MediaFileScanJob.cs +++ b/NzbDrone.Core/Providers/Jobs/MediaFileScanJob.cs @@ -40,7 +40,7 @@ namespace NzbDrone.Core.Providers.Jobs seriesToScan = new List() { _seriesProvider.GetSeries(targetId) }; } - foreach (var series in seriesToScan) + foreach (var series in seriesToScan.Where(c => c.LastInfoSync != null)) { notification.CurrentMessage = string.Format("Scanning disk for '{0}'", series.Title); _mediaFileProvider.Scan(series); diff --git a/NzbDrone.Core/Providers/MediaFileProvider.cs b/NzbDrone.Core/Providers/MediaFileProvider.cs index 5d353bea2..75d9fbc28 100644 --- a/NzbDrone.Core/Providers/MediaFileProvider.cs +++ b/NzbDrone.Core/Providers/MediaFileProvider.cs @@ -33,7 +33,7 @@ namespace NzbDrone.Core.Providers /// Scans the specified series folder for media files /// /// The series to be scanned - public List Scan(Series series) + public virtual List Scan(Series series) { var mediaFileList = GetMediaFileList(series.Path); var fileList = new List(); @@ -51,7 +51,7 @@ namespace NzbDrone.Core.Providers return fileList; } - public EpisodeFile ImportFile(Series series, string filePath) + public virtual EpisodeFile ImportFile(Series series, string filePath) { Logger.Trace("Importing file to database [{0}]", filePath); @@ -150,7 +150,7 @@ namespace NzbDrone.Core.Providers /// Removes files that no longer exist from the database /// /// list of files to verify - public void CleanUp(List files) + public virtual void CleanUp(List files) { //TODO: remove orphaned files. in files table but not linked to from episode table. foreach (var episodeFile in files) @@ -165,17 +165,17 @@ namespace NzbDrone.Core.Providers - public void Update(EpisodeFile episodeFile) + public virtual void Update(EpisodeFile episodeFile) { _repository.Update(episodeFile); } - public EpisodeFile GetEpisodeFile(int episodeFileId) + public virtual EpisodeFile GetEpisodeFile(int episodeFileId) { return _repository.Single(episodeFileId); } - public List GetEpisodeFiles() + public virtual List GetEpisodeFiles() { return _repository.All().ToList(); } From 6c4f19b365668349e13ca94c37d602eb8402328a Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Tue, 17 May 2011 21:21:13 -0700 Subject: [PATCH 5/6] Added GetSeasonFiles to MediaFileProvider --- NzbDrone.Core.Test/MediaFileProviderTests.cs | 30 +++++++++++++++++-- .../Providers/Jobs/NewSeriesUpdate.cs | 9 ++++-- NzbDrone.Core/Providers/MediaFileProvider.cs | 11 ++++++- NzbDrone.Core/Repository/Season.cs | 4 +-- 4 files changed, 46 insertions(+), 8 deletions(-) diff --git a/NzbDrone.Core.Test/MediaFileProviderTests.cs b/NzbDrone.Core.Test/MediaFileProviderTests.cs index 9e0e2b453..dbb363255 100644 --- a/NzbDrone.Core.Test/MediaFileProviderTests.cs +++ b/NzbDrone.Core.Test/MediaFileProviderTests.cs @@ -300,12 +300,38 @@ namespace NzbDrone.Core.Test .Setup(c => c.GetAllSeries()) .Returns(Builder.CreateListOfSize(2) .WhereTheFirst(1).Has(c => c.LastInfoSync = DateTime.Now).Build().AsQueryable()); - mocker.GetMock( MockBehavior.Strict) - .Setup(c=>c.Scan(It.Is(s=>s.LastInfoSync != null))).Returns(new List()).Verifiable(); + mocker.GetMock(MockBehavior.Strict) + .Setup(c => c.Scan(It.Is(s => s.LastInfoSync != null))).Returns(new List()).Verifiable(); mocker.Resolve().Start(new ProgressNotification("test"), 0); mocker.VerifyAllMocks(); } + + [Test] + public void get_season_files() + { + var episodes = Builder.CreateListOfSize(20) + .WhereTheFirst(8) + .Has(c => c.EpisodeFile = new EpisodeFile()) + .AndTheRemaining() + .Has(c => c.EpisodeFile = null) + .Build().ToList(); + + var mocker = new AutoMoqer(); + mocker.GetMock() + .Setup(c => c.GetSeason(12)) + .Returns(Builder.CreateNew().With(c => c.Episodes = episodes).Build()) + .Verifiable(); + + + var result = mocker.Resolve().GetSeasonFiles(12); + + Assert.Count(8, result); + Assert.DoesNotContain(result, null); + mocker.VerifyAllMocks(); + + + } } } \ No newline at end of file diff --git a/NzbDrone.Core/Providers/Jobs/NewSeriesUpdate.cs b/NzbDrone.Core/Providers/Jobs/NewSeriesUpdate.cs index 70190f52e..ae78b62db 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,11 +50,12 @@ 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); diff --git a/NzbDrone.Core/Providers/MediaFileProvider.cs b/NzbDrone.Core/Providers/MediaFileProvider.cs index 75d9fbc28..32956d4e4 100644 --- a/NzbDrone.Core/Providers/MediaFileProvider.cs +++ b/NzbDrone.Core/Providers/MediaFileProvider.cs @@ -16,15 +16,17 @@ namespace NzbDrone.Core.Providers private readonly DiskProvider _diskProvider; private readonly EpisodeProvider _episodeProvider; private readonly SeriesProvider _seriesProvider; + private readonly SeasonProvider _seasonProvider; private readonly IRepository _repository; public MediaFileProvider(IRepository repository, DiskProvider diskProvider, - EpisodeProvider episodeProvider, SeriesProvider seriesProvider) + EpisodeProvider episodeProvider, SeriesProvider seriesProvider, SeasonProvider seasonProvider) { _repository = repository; _diskProvider = diskProvider; _episodeProvider = episodeProvider; _seriesProvider = seriesProvider; + _seasonProvider = seasonProvider; } public MediaFileProvider() { } @@ -180,6 +182,13 @@ namespace NzbDrone.Core.Providers return _repository.All().ToList(); } + public virtual List GetSeasonFiles(int seasonId) + { + var res = _seasonProvider.GetSeason(seasonId).Episodes.Where(c => c.EpisodeFile != null).Select(c => c.EpisodeFile); + + return res.ToList(); + } + private List GetMediaFileList(string path) { Logger.Debug("Scanning '{0}' for episodes", path); diff --git a/NzbDrone.Core/Repository/Season.cs b/NzbDrone.Core/Repository/Season.cs index f75dff0dd..35baf9bf8 100644 --- a/NzbDrone.Core/Repository/Season.cs +++ b/NzbDrone.Core/Repository/Season.cs @@ -18,9 +18,9 @@ namespace NzbDrone.Core.Repository public DayOfWeek? LastDiskSync { get; set; } [SubSonicToManyRelation] - public virtual List Episodes { get; protected set; } + public virtual List Episodes { get; set; } [SubSonicToOneRelation(ThisClassContainsJoinKey = true)] - public virtual Series Series { get; protected set; } + public virtual Series Series { get; set; } } } \ No newline at end of file From f2ce5bef184698ed15fb287fabdd955e88925292 Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Tue, 17 May 2011 22:10:46 -0700 Subject: [PATCH 6/6] Super smart season ignore logic. ;) --- NzbDrone.Core/Providers/Jobs/NewSeriesUpdate.cs | 16 +++++++++++++++- NzbDrone.Core/Providers/MediaFileProvider.cs | 9 ++++++--- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/NzbDrone.Core/Providers/Jobs/NewSeriesUpdate.cs b/NzbDrone.Core/Providers/Jobs/NewSeriesUpdate.cs index ae78b62db..d0ad46c07 100644 --- a/NzbDrone.Core/Providers/Jobs/NewSeriesUpdate.cs +++ b/NzbDrone.Core/Providers/Jobs/NewSeriesUpdate.cs @@ -60,8 +60,22 @@ namespace NzbDrone.Core.Providers.Jobs 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/MediaFileProvider.cs b/NzbDrone.Core/Providers/MediaFileProvider.cs index 32956d4e4..6f1046af2 100644 --- a/NzbDrone.Core/Providers/MediaFileProvider.cs +++ b/NzbDrone.Core/Providers/MediaFileProvider.cs @@ -182,11 +182,14 @@ namespace NzbDrone.Core.Providers return _repository.All().ToList(); } - public virtual List GetSeasonFiles(int seasonId) + public virtual IEnumerable GetSeasonFiles(int seasonId) { - var res = _seasonProvider.GetSeason(seasonId).Episodes.Where(c => c.EpisodeFile != null).Select(c => c.EpisodeFile); + return _seasonProvider.GetSeason(seasonId).Episodes.Where(c => c.EpisodeFile != null).Select(c => c.EpisodeFile); + } - return res.ToList(); + public virtual IEnumerable GetSeriesFiles(int seriesId) + { + return _seriesProvider.GetSeries(seriesId).Episodes.Where(c => c.EpisodeFile != null).Select(c => c.EpisodeFile); } private List GetMediaFileList(string path)