From 1b0cdf922e34c23935c721ef98f43f53cffb0e07 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Wed, 30 Nov 2011 21:08:36 -0800 Subject: [PATCH 1/8] Removed un-needed call from Episode Search. InventoryProvider.IsAcceptableSize will now handle daily series properly. --- .../InventoryProvider_IsAcceptableSizeTest.cs | 23 +++++++++++++++++++ NzbDrone.Core/Providers/InventoryProvider.cs | 7 +++--- NzbDrone.Core/Providers/SearchProvider.cs | 8 +++---- 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/NzbDrone.Core.Test/ProviderTests/InventoryProvider_IsAcceptableSizeTest.cs b/NzbDrone.Core.Test/ProviderTests/InventoryProvider_IsAcceptableSizeTest.cs index ab6048a0a..bf218c914 100644 --- a/NzbDrone.Core.Test/ProviderTests/InventoryProvider_IsAcceptableSizeTest.cs +++ b/NzbDrone.Core.Test/ProviderTests/InventoryProvider_IsAcceptableSizeTest.cs @@ -364,5 +364,28 @@ namespace NzbDrone.Core.Test.ProviderTests //Assert result.Should().BeTrue(); } + + [Test] + public void IsAcceptableSize_should_treat_daily_series_as_single_episode() + { + parseResultSingle.Series = series60minutes; + parseResultSingle.Size = 300.Megabytes(); + parseResultSingle.AirDate = DateTime.Today; + parseResultSingle.EpisodeNumbers = null; + + qualityType.MaxSize = (int)600.Megabytes(); + + Mocker.GetMock().Setup(s => s.Get(1)).Returns(qualityType); + + Mocker.GetMock().Setup( + s => s.IsFirstOrLastEpisodeOfSeason(It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(true); + + //Act + bool result = Mocker.Resolve().IsAcceptableSize(parseResultSingle); + + //Assert + result.Should().BeTrue(); + } } } \ No newline at end of file diff --git a/NzbDrone.Core/Providers/InventoryProvider.cs b/NzbDrone.Core/Providers/InventoryProvider.cs index fd9a99b73..2ebd78d1f 100644 --- a/NzbDrone.Core/Providers/InventoryProvider.cs +++ b/NzbDrone.Core/Providers/InventoryProvider.cs @@ -156,12 +156,13 @@ namespace NzbDrone.Core.Providers //Multiply maxSize by Series.Runtime maxSize = maxSize * series.Runtime; - //Multiply maxSize by the number of episodes parsed - maxSize = maxSize * parseResult.EpisodeNumbers.Count; + //Multiply maxSize by the number of episodes parsed (if EpisodeNumbers is null it will be treated as a single episode) + if (parseResult.EpisodeNumbers != null) + maxSize = maxSize * parseResult.EpisodeNumbers.Count; //Check if there was only one episode parsed //and it is the first or last episode of the season - if (parseResult.EpisodeNumbers.Count == 1 && + if (parseResult.EpisodeNumbers != null && parseResult.EpisodeNumbers.Count == 1 && _episodeProvider.IsFirstOrLastEpisodeOfSeason(series.SeriesId, parseResult.SeasonNumber, parseResult.EpisodeNumbers[0])) { diff --git a/NzbDrone.Core/Providers/SearchProvider.cs b/NzbDrone.Core/Providers/SearchProvider.cs index f0346bd9c..6de2b72e4 100644 --- a/NzbDrone.Core/Providers/SearchProvider.cs +++ b/NzbDrone.Core/Providers/SearchProvider.cs @@ -131,23 +131,21 @@ namespace NzbDrone.Core.Providers notification.CurrentMessage = "Searching for " + episode; - var series = _seriesProvider.GetSeries(episode.SeriesId); - if (episode.Series.IsDaily && !episode.AirDate.HasValue) { Logger.Warn("AirDate is not Valid for: {0}", episode); return false; } - var reports = PerformSearch(notification, series, episode.SeasonNumber, new List { episode }); + var reports = PerformSearch(notification, episode.Series, episode.SeasonNumber, new List { episode }); Logger.Debug("Finished searching all indexers. Total {0}", reports.Count); notification.CurrentMessage = "Processing search results"; - if (!series.IsDaily && ProcessSearchResults(notification, reports, series, episode.SeasonNumber, episode.EpisodeNumber).Count == 1) + if (!episode.Series.IsDaily && ProcessSearchResults(notification, reports, episode.Series, episode.SeasonNumber, episode.EpisodeNumber).Count == 1) return true; - if (series.IsDaily && ProcessSearchResults(notification, reports, series, episode.AirDate.Value)) + if (episode.Series.IsDaily && ProcessSearchResults(notification, reports, episode.Series, episode.AirDate.Value)) return true; Logger.Warn("Unable to find {0} in any of indexers.", episode); From 3b4b20cc95c28da889ab2e4df031351c599a32c5 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Thu, 1 Dec 2011 20:24:44 -0800 Subject: [PATCH 2/8] SceneMappingProvider will perform an update if database is empty when looking for a SeriesId or SceneName. --- NzbDrone.Core.Test/Files/SceneMappings.csv | 5 + NzbDrone.Core.Test/NzbDrone.Core.Test.csproj | 5 +- .../SceneMappingProviderTest.cs} | 122 +++++++++++++++++- .../Providers/SceneMappingProvider.cs | 16 ++- 4 files changed, 144 insertions(+), 4 deletions(-) create mode 100644 NzbDrone.Core.Test/Files/SceneMappings.csv rename NzbDrone.Core.Test/{SceneMappingTest.cs => ProviderTests/SceneMappingProviderTest.cs} (52%) diff --git a/NzbDrone.Core.Test/Files/SceneMappings.csv b/NzbDrone.Core.Test/Files/SceneMappings.csv new file mode 100644 index 000000000..4238b2ebb --- /dev/null +++ b/NzbDrone.Core.Test/Files/SceneMappings.csv @@ -0,0 +1,5 @@ +csinewyork,73696,CSI +csiny,73696,CSI +csi,72546,CSI +csilasvegas,72546,CSI +archer,110381,Archer \ No newline at end of file diff --git a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj index 96228512e..5d3ccc7e0 100644 --- a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj +++ b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj @@ -159,7 +159,7 @@ - + @@ -235,6 +235,9 @@ Designer Always + + Always + Always diff --git a/NzbDrone.Core.Test/SceneMappingTest.cs b/NzbDrone.Core.Test/ProviderTests/SceneMappingProviderTest.cs similarity index 52% rename from NzbDrone.Core.Test/SceneMappingTest.cs rename to NzbDrone.Core.Test/ProviderTests/SceneMappingProviderTest.cs index 5c801f892..bf520f615 100644 --- a/NzbDrone.Core.Test/SceneMappingTest.cs +++ b/NzbDrone.Core.Test/ProviderTests/SceneMappingProviderTest.cs @@ -1,7 +1,13 @@  +using System; +using System.IO; +using System.Net; using FizzWare.NBuilder; +using FluentAssertions; +using Moq; using NUnit.Framework; using NzbDrone.Core.Providers; +using NzbDrone.Core.Providers.Core; using NzbDrone.Core.Repository; using NzbDrone.Core.Test.Framework; using NzbDrone.Test.Common.AutoMoq; @@ -10,8 +16,24 @@ namespace NzbDrone.Core.Test { [TestFixture] // ReSharper disable InconsistentNaming - public class SceneMappingTest : CoreTest + public class SceneMappingProviderTest : CoreTest { + private const string SceneMappingUrl = "http://www.nzbdrone.com/SceneMappings.csv"; + + private void WithValidCsv() + { + Mocker.GetMock() + .Setup(s => s.DownloadString(SceneMappingUrl)) + .Returns(File.ReadAllText(@".\Files\SceneMappings.csv")); + } + + private void WithErrorDownloadingCsv() + { + Mocker.GetMock() + .Setup(s => s.DownloadString(SceneMappingUrl)) + .Throws(new WebException()); + } + [Test] public void GetSceneName_exists() { @@ -136,5 +158,103 @@ namespace NzbDrone.Core.Test //Assert Assert.AreEqual(fakeMap.SceneName, sceneName); } + + [Test] + public void UpdateMappings_should_add_all_mappings_to_database() + { + //Setup + WithRealDb(); + WithValidCsv(); + + //Act + Mocker.Resolve().UpdateMappings(); + + //Assert + Mocker.Verify(v => v.DownloadString(It.IsAny()), Times.Once()); + var result = Db.Fetch(); + result.Should().HaveCount(5); + } + + [Test] + public void UpdateMappings_should_overwrite_existing_mappings() + { + //Setup + var fakeMap = Builder.CreateNew() + .With(f => f.SeriesId = 12345) + .With(f => f.SceneName = "Law and Order") + .With(f => f.SceneName = "laworder") + .Build(); + + WithRealDb(); + WithValidCsv(); + Db.Insert(fakeMap); + + //Act + Mocker.Resolve().UpdateMappings(); + + //Assert + Mocker.Verify(v => v.DownloadString(It.IsAny()), Times.Once()); + var result = Db.Fetch(); + result.Should().HaveCount(5); + } + + [Test] + public void UpdateMappings_should_not_delete_if_csv_download_fails() + { + //Setup + var fakeMap = Builder.CreateNew() + .With(f => f.SeriesId = 12345) + .With(f => f.SceneName = "Law and Order") + .With(f => f.SceneName = "laworder") + .Build(); + + WithRealDb(); + WithErrorDownloadingCsv(); + Db.Insert(fakeMap); + + //Act + Mocker.Resolve().UpdateMappings(); + + //Assert + Mocker.Verify(v => v.DownloadString(It.IsAny()), Times.Once()); + var result = Db.Fetch(); + result.Should().HaveCount(1); + } + + [Test] + public void UpdateIfEmpty_should_not_update_if_count_is_not_zero() + { + //Setup + var fakeMap = Builder.CreateNew() + .With(f => f.SeriesId = 12345) + .With(f => f.SceneName = "Law and Order") + .With(f => f.SceneName = "laworder") + .Build(); + + WithRealDb(); + Db.Insert(fakeMap); + + //Act + Mocker.Resolve().UpdateIfEmpty(); + + //Assert + Mocker.Verify(v => v.DownloadString(It.IsAny()), Times.Never()); + } + + [Test] + public void UpdateIfEmpty_should_update_if_count_is_zero() + { + //Setup + WithRealDb(); + WithValidCsv(); + + //Act + Mocker.Resolve().UpdateIfEmpty(); + + //Assert + Mocker.Verify(v => v.DownloadString(SceneMappingUrl), Times.Once()); + var result = Db.Fetch(); + result.Should().HaveCount(5); + } } } diff --git a/NzbDrone.Core/Providers/SceneMappingProvider.cs b/NzbDrone.Core/Providers/SceneMappingProvider.cs index 9ef2b0f53..313d0c6b5 100644 --- a/NzbDrone.Core/Providers/SceneMappingProvider.cs +++ b/NzbDrone.Core/Providers/SceneMappingProvider.cs @@ -29,7 +29,7 @@ namespace NzbDrone.Core.Providers { try { - var mapping = _httpProvider.DownloadString("http://vps.nzbdrone.com/SceneMappings.csv"); + var mapping = _httpProvider.DownloadString("http://www.nzbdrone.com/SceneMappings.csv"); var newMaps = new List(); using (var reader = new StringReader(mapping)) @@ -59,7 +59,7 @@ namespace NzbDrone.Core.Providers catch (Exception ex) { - Logger.InfoException("Failed to Update Scene Mappings", ex); + Logger.InfoException("Failed to Update Scene Mappings:", ex); return false; } return true; @@ -67,6 +67,8 @@ namespace NzbDrone.Core.Providers public virtual string GetSceneName(int seriesId) { + UpdateIfEmpty(); + var item = _database.FirstOrDefault("WHERE SeriesId = @0", seriesId); if (item == null) @@ -77,6 +79,8 @@ namespace NzbDrone.Core.Providers public virtual Nullable GetSeriesId(string cleanName) { + UpdateIfEmpty(); + var item = _database.SingleOrDefault("WHERE CleanTitle = @0", cleanName); if (item == null) @@ -84,5 +88,13 @@ namespace NzbDrone.Core.Providers return item.SeriesId; } + + public void UpdateIfEmpty() + { + var count = _database.ExecuteScalar("SELECT COUNT(*) FROM SceneMappings"); + + if (count == 0) + UpdateMappings(); + } } } From 8de49bb112af0465a9b2b31774c08b71c61792f9 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Thu, 1 Dec 2011 21:14:59 -0800 Subject: [PATCH 3/8] Moved RenameSeriesJob to the Jobs folder. --- NzbDrone.Core.Test/CentralDispatchFixture.cs | 1 - NzbDrone.Core.Test/JobTests/AppUpdateJobFixture.cs | 1 - NzbDrone.Core.Test/JobTests/BacklogSearchJobTest.cs | 1 - NzbDrone.Core.Test/JobTests/BannerDownloadJobTest.cs | 1 - NzbDrone.Core.Test/JobTests/DiskScanJobTest.cs | 1 - NzbDrone.Core.Test/JobTests/ImportNewSeriesJobTest.cs | 1 - NzbDrone.Core.Test/JobTests/RecentBacklogSearchJobTest.cs | 1 - NzbDrone.Core.Test/JobTests/SearchJobTest.cs | 1 - NzbDrone.Core.Test/JobTests/SeasonSearchJobTest.cs | 1 - NzbDrone.Core.Test/JobTests/SeriesSearchJobTest.cs | 1 - .../ProviderTests/JobProviderTests/JobProviderFixture.cs | 1 - .../ProviderTests/JobProviderTests/TestJobs.cs | 1 - NzbDrone.Core.Test/SortHelperTest.cs | 1 - NzbDrone.Core/CentralDispatch.cs | 1 - NzbDrone.Core/Jobs/AppUpdateJob.cs | 1 - NzbDrone.Core/Jobs/BacklogSearchJob.cs | 1 - NzbDrone.Core/Jobs/BannerDownloadJob.cs | 1 - NzbDrone.Core/Jobs/ConvertEpisodeJob.cs | 1 - NzbDrone.Core/Jobs/DeleteSeriesJob.cs | 1 - NzbDrone.Core/Jobs/DiskScanJob.cs | 1 - NzbDrone.Core/Jobs/EpisodeSearchJob.cs | 1 - NzbDrone.Core/Jobs/ImportNewSeriesJob.cs | 1 - NzbDrone.Core/{Providers => }/Jobs/RenameSeriesJob.cs | 5 +++-- NzbDrone.Core/NzbDrone.Core.csproj | 6 ++++-- NzbDrone.Core/WebTimer.cs | 1 - NzbDrone.Web/Controllers/AddSeriesController.cs | 1 - NzbDrone.Web/Controllers/CommandController.cs | 1 - NzbDrone.Web/Controllers/EpisodeController.cs | 1 - NzbDrone.Web/Controllers/HistoryController.cs | 1 - NzbDrone.Web/Controllers/SeriesController.cs | 1 - NzbDrone.Web/Controllers/SharedController.cs | 1 - NzbDrone.Web/Controllers/SystemController.cs | 1 - NzbDrone.Web/Controllers/UpdateController.cs | 1 - 33 files changed, 7 insertions(+), 35 deletions(-) rename NzbDrone.Core/{Providers => }/Jobs/RenameSeriesJob.cs (95%) diff --git a/NzbDrone.Core.Test/CentralDispatchFixture.cs b/NzbDrone.Core.Test/CentralDispatchFixture.cs index d4f6bdf8a..e89b69627 100644 --- a/NzbDrone.Core.Test/CentralDispatchFixture.cs +++ b/NzbDrone.Core.Test/CentralDispatchFixture.cs @@ -7,7 +7,6 @@ using NUnit.Framework; using NzbDrone.Core.Jobs; using NzbDrone.Core.Providers; using NzbDrone.Core.Providers.Indexer; -using NzbDrone.Core.Providers.Jobs; using NzbDrone.Core.Test.Framework; using Ninject; diff --git a/NzbDrone.Core.Test/JobTests/AppUpdateJobFixture.cs b/NzbDrone.Core.Test/JobTests/AppUpdateJobFixture.cs index 24e9cc275..a61c84f73 100644 --- a/NzbDrone.Core.Test/JobTests/AppUpdateJobFixture.cs +++ b/NzbDrone.Core.Test/JobTests/AppUpdateJobFixture.cs @@ -10,7 +10,6 @@ using NzbDrone.Core.Jobs; using NzbDrone.Core.Model; using NzbDrone.Core.Providers; using NzbDrone.Core.Providers.Core; -using NzbDrone.Core.Providers.Jobs; using NzbDrone.Core.Test.Framework; namespace NzbDrone.Core.Test.JobTests diff --git a/NzbDrone.Core.Test/JobTests/BacklogSearchJobTest.cs b/NzbDrone.Core.Test/JobTests/BacklogSearchJobTest.cs index 3d47b87ec..8b3e46b46 100644 --- a/NzbDrone.Core.Test/JobTests/BacklogSearchJobTest.cs +++ b/NzbDrone.Core.Test/JobTests/BacklogSearchJobTest.cs @@ -7,7 +7,6 @@ using NUnit.Framework; using NzbDrone.Core.Jobs; using NzbDrone.Core.Model.Notification; using NzbDrone.Core.Providers; -using NzbDrone.Core.Providers.Jobs; using NzbDrone.Core.Repository; using NzbDrone.Test.Common.AutoMoq; diff --git a/NzbDrone.Core.Test/JobTests/BannerDownloadJobTest.cs b/NzbDrone.Core.Test/JobTests/BannerDownloadJobTest.cs index 9a5b14d54..1efa075c5 100644 --- a/NzbDrone.Core.Test/JobTests/BannerDownloadJobTest.cs +++ b/NzbDrone.Core.Test/JobTests/BannerDownloadJobTest.cs @@ -9,7 +9,6 @@ using NzbDrone.Core.Jobs; 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.Test.Framework; diff --git a/NzbDrone.Core.Test/JobTests/DiskScanJobTest.cs b/NzbDrone.Core.Test/JobTests/DiskScanJobTest.cs index 3b16c2872..0ff6e4b7a 100644 --- a/NzbDrone.Core.Test/JobTests/DiskScanJobTest.cs +++ b/NzbDrone.Core.Test/JobTests/DiskScanJobTest.cs @@ -9,7 +9,6 @@ using NUnit.Framework; using NzbDrone.Core.Jobs; using NzbDrone.Core.Model.Notification; using NzbDrone.Core.Providers; -using NzbDrone.Core.Providers.Jobs; using NzbDrone.Core.Repository; using NzbDrone.Core.Test.Framework; using NzbDrone.Test.Common; diff --git a/NzbDrone.Core.Test/JobTests/ImportNewSeriesJobTest.cs b/NzbDrone.Core.Test/JobTests/ImportNewSeriesJobTest.cs index 1df8f42af..ba6446f77 100644 --- a/NzbDrone.Core.Test/JobTests/ImportNewSeriesJobTest.cs +++ b/NzbDrone.Core.Test/JobTests/ImportNewSeriesJobTest.cs @@ -9,7 +9,6 @@ using NUnit.Framework; using NzbDrone.Core.Jobs; using NzbDrone.Core.Model.Notification; using NzbDrone.Core.Providers; -using NzbDrone.Core.Providers.Jobs; using NzbDrone.Core.Repository; using NzbDrone.Core.Test.Framework; using NzbDrone.Test.Common; diff --git a/NzbDrone.Core.Test/JobTests/RecentBacklogSearchJobTest.cs b/NzbDrone.Core.Test/JobTests/RecentBacklogSearchJobTest.cs index f1414e2bf..e9793c021 100644 --- a/NzbDrone.Core.Test/JobTests/RecentBacklogSearchJobTest.cs +++ b/NzbDrone.Core.Test/JobTests/RecentBacklogSearchJobTest.cs @@ -8,7 +8,6 @@ using NUnit.Framework; using NzbDrone.Core.Jobs; using NzbDrone.Core.Model.Notification; using NzbDrone.Core.Providers; -using NzbDrone.Core.Providers.Jobs; using NzbDrone.Core.Repository; using NzbDrone.Core.Test.Framework; using NzbDrone.Test.Common.AutoMoq; diff --git a/NzbDrone.Core.Test/JobTests/SearchJobTest.cs b/NzbDrone.Core.Test/JobTests/SearchJobTest.cs index 9e1f3763b..6dd2dbf88 100644 --- a/NzbDrone.Core.Test/JobTests/SearchJobTest.cs +++ b/NzbDrone.Core.Test/JobTests/SearchJobTest.cs @@ -4,7 +4,6 @@ using Moq; using NUnit.Framework; using NzbDrone.Core.Jobs; using NzbDrone.Core.Model.Notification; -using NzbDrone.Core.Providers.Jobs; using NzbDrone.Test.Common.AutoMoq; namespace NzbDrone.Core.Test.JobTests diff --git a/NzbDrone.Core.Test/JobTests/SeasonSearchJobTest.cs b/NzbDrone.Core.Test/JobTests/SeasonSearchJobTest.cs index b82d24bc5..e1b83f75d 100644 --- a/NzbDrone.Core.Test/JobTests/SeasonSearchJobTest.cs +++ b/NzbDrone.Core.Test/JobTests/SeasonSearchJobTest.cs @@ -7,7 +7,6 @@ using NUnit.Framework; using NzbDrone.Core.Jobs; using NzbDrone.Core.Model.Notification; using NzbDrone.Core.Providers; -using NzbDrone.Core.Providers.Jobs; using NzbDrone.Core.Repository; using NzbDrone.Core.Test.Framework; using NzbDrone.Test.Common.AutoMoq; diff --git a/NzbDrone.Core.Test/JobTests/SeriesSearchJobTest.cs b/NzbDrone.Core.Test/JobTests/SeriesSearchJobTest.cs index bed82a859..4cfa03d4b 100644 --- a/NzbDrone.Core.Test/JobTests/SeriesSearchJobTest.cs +++ b/NzbDrone.Core.Test/JobTests/SeriesSearchJobTest.cs @@ -5,7 +5,6 @@ using NUnit.Framework; using NzbDrone.Core.Jobs; using NzbDrone.Core.Model.Notification; using NzbDrone.Core.Providers; -using NzbDrone.Core.Providers.Jobs; using NzbDrone.Core.Test.Framework; using NzbDrone.Test.Common.AutoMoq; diff --git a/NzbDrone.Core.Test/ProviderTests/JobProviderTests/JobProviderFixture.cs b/NzbDrone.Core.Test/ProviderTests/JobProviderTests/JobProviderFixture.cs index 5c55fc2c9..1b0d103f8 100644 --- a/NzbDrone.Core.Test/ProviderTests/JobProviderTests/JobProviderFixture.cs +++ b/NzbDrone.Core.Test/ProviderTests/JobProviderTests/JobProviderFixture.cs @@ -8,7 +8,6 @@ using FluentAssertions; using NUnit.Framework; using NzbDrone.Core.Jobs; using NzbDrone.Core.Model; -using NzbDrone.Core.Providers.Jobs; using NzbDrone.Core.Test.Framework; using NzbDrone.Test.Common; using NzbDrone.Test.Common.AutoMoq; diff --git a/NzbDrone.Core.Test/ProviderTests/JobProviderTests/TestJobs.cs b/NzbDrone.Core.Test/ProviderTests/JobProviderTests/TestJobs.cs index 73c19a381..b4f0bc744 100644 --- a/NzbDrone.Core.Test/ProviderTests/JobProviderTests/TestJobs.cs +++ b/NzbDrone.Core.Test/ProviderTests/JobProviderTests/TestJobs.cs @@ -3,7 +3,6 @@ using System.Linq; using System.Threading; using NzbDrone.Core.Jobs; using NzbDrone.Core.Model.Notification; -using NzbDrone.Core.Providers.Jobs; namespace NzbDrone.Core.Test.ProviderTests.JobProviderTests { diff --git a/NzbDrone.Core.Test/SortHelperTest.cs b/NzbDrone.Core.Test/SortHelperTest.cs index cdc5eb574..4035fb7d5 100644 --- a/NzbDrone.Core.Test/SortHelperTest.cs +++ b/NzbDrone.Core.Test/SortHelperTest.cs @@ -9,7 +9,6 @@ using NUnit.Framework; using NzbDrone.Core.Helpers; using NzbDrone.Core.Model.Notification; using NzbDrone.Core.Providers; -using NzbDrone.Core.Providers.Jobs; using NzbDrone.Core.Repository; using NzbDrone.Core.Test.Framework; diff --git a/NzbDrone.Core/CentralDispatch.cs b/NzbDrone.Core/CentralDispatch.cs index 5e630f959..ffc289e01 100644 --- a/NzbDrone.Core/CentralDispatch.cs +++ b/NzbDrone.Core/CentralDispatch.cs @@ -11,7 +11,6 @@ using NzbDrone.Core.Jobs; using NzbDrone.Core.Providers; using NzbDrone.Core.Providers.ExternalNotification; using NzbDrone.Core.Providers.Indexer; -using NzbDrone.Core.Providers.Jobs; using PetaPoco; namespace NzbDrone.Core diff --git a/NzbDrone.Core/Jobs/AppUpdateJob.cs b/NzbDrone.Core/Jobs/AppUpdateJob.cs index 201f71500..732f358f8 100644 --- a/NzbDrone.Core/Jobs/AppUpdateJob.cs +++ b/NzbDrone.Core/Jobs/AppUpdateJob.cs @@ -6,7 +6,6 @@ using NzbDrone.Common; using NzbDrone.Core.Model.Notification; using NzbDrone.Core.Providers; using NzbDrone.Core.Providers.Core; -using NzbDrone.Core.Providers.Jobs; namespace NzbDrone.Core.Jobs { diff --git a/NzbDrone.Core/Jobs/BacklogSearchJob.cs b/NzbDrone.Core/Jobs/BacklogSearchJob.cs index 7d3bb6686..04989c524 100644 --- a/NzbDrone.Core/Jobs/BacklogSearchJob.cs +++ b/NzbDrone.Core/Jobs/BacklogSearchJob.cs @@ -3,7 +3,6 @@ using System.Linq; using NLog; using NzbDrone.Core.Model.Notification; using NzbDrone.Core.Providers; -using NzbDrone.Core.Providers.Jobs; using NzbDrone.Core.Repository; namespace NzbDrone.Core.Jobs diff --git a/NzbDrone.Core/Jobs/BannerDownloadJob.cs b/NzbDrone.Core/Jobs/BannerDownloadJob.cs index 255ddf26e..38edbf5bc 100644 --- a/NzbDrone.Core/Jobs/BannerDownloadJob.cs +++ b/NzbDrone.Core/Jobs/BannerDownloadJob.cs @@ -7,7 +7,6 @@ using NzbDrone.Common; using NzbDrone.Core.Model.Notification; using NzbDrone.Core.Providers; using NzbDrone.Core.Providers.Core; -using NzbDrone.Core.Providers.Jobs; using NzbDrone.Core.Repository; namespace NzbDrone.Core.Jobs diff --git a/NzbDrone.Core/Jobs/ConvertEpisodeJob.cs b/NzbDrone.Core/Jobs/ConvertEpisodeJob.cs index 067b13cd5..4fc94e0e7 100644 --- a/NzbDrone.Core/Jobs/ConvertEpisodeJob.cs +++ b/NzbDrone.Core/Jobs/ConvertEpisodeJob.cs @@ -5,7 +5,6 @@ using NLog; using NzbDrone.Core.Model.Notification; using NzbDrone.Core.Providers; using NzbDrone.Core.Providers.Converting; -using NzbDrone.Core.Providers.Jobs; namespace NzbDrone.Core.Jobs { diff --git a/NzbDrone.Core/Jobs/DeleteSeriesJob.cs b/NzbDrone.Core/Jobs/DeleteSeriesJob.cs index aabccab8c..eaa2915dc 100644 --- a/NzbDrone.Core/Jobs/DeleteSeriesJob.cs +++ b/NzbDrone.Core/Jobs/DeleteSeriesJob.cs @@ -4,7 +4,6 @@ using Ninject; using NLog; using NzbDrone.Core.Model.Notification; using NzbDrone.Core.Providers; -using NzbDrone.Core.Providers.Jobs; namespace NzbDrone.Core.Jobs { diff --git a/NzbDrone.Core/Jobs/DiskScanJob.cs b/NzbDrone.Core/Jobs/DiskScanJob.cs index 8c7bac313..fb1333ea5 100644 --- a/NzbDrone.Core/Jobs/DiskScanJob.cs +++ b/NzbDrone.Core/Jobs/DiskScanJob.cs @@ -6,7 +6,6 @@ using NLog; using NzbDrone.Core.Helpers; using NzbDrone.Core.Model.Notification; using NzbDrone.Core.Providers; -using NzbDrone.Core.Providers.Jobs; using NzbDrone.Core.Repository; namespace NzbDrone.Core.Jobs diff --git a/NzbDrone.Core/Jobs/EpisodeSearchJob.cs b/NzbDrone.Core/Jobs/EpisodeSearchJob.cs index 8fef47942..3e549fb63 100644 --- a/NzbDrone.Core/Jobs/EpisodeSearchJob.cs +++ b/NzbDrone.Core/Jobs/EpisodeSearchJob.cs @@ -3,7 +3,6 @@ using System; using Ninject; using NzbDrone.Core.Model.Notification; using NzbDrone.Core.Providers; -using NzbDrone.Core.Providers.Jobs; namespace NzbDrone.Core.Jobs { diff --git a/NzbDrone.Core/Jobs/ImportNewSeriesJob.cs b/NzbDrone.Core/Jobs/ImportNewSeriesJob.cs index 4e11c7da3..0a03430df 100644 --- a/NzbDrone.Core/Jobs/ImportNewSeriesJob.cs +++ b/NzbDrone.Core/Jobs/ImportNewSeriesJob.cs @@ -6,7 +6,6 @@ using Ninject; using NLog; using NzbDrone.Core.Model.Notification; using NzbDrone.Core.Providers; -using NzbDrone.Core.Providers.Jobs; namespace NzbDrone.Core.Jobs { diff --git a/NzbDrone.Core/Providers/Jobs/RenameSeriesJob.cs b/NzbDrone.Core/Jobs/RenameSeriesJob.cs similarity index 95% rename from NzbDrone.Core/Providers/Jobs/RenameSeriesJob.cs rename to NzbDrone.Core/Jobs/RenameSeriesJob.cs index 9239b3f02..47144fe00 100644 --- a/NzbDrone.Core/Providers/Jobs/RenameSeriesJob.cs +++ b/NzbDrone.Core/Jobs/RenameSeriesJob.cs @@ -1,10 +1,11 @@ +using System.Linq; using System; using NLog; using Ninject; -using NzbDrone.Core.Jobs; using NzbDrone.Core.Model.Notification; +using NzbDrone.Core.Providers; -namespace NzbDrone.Core.Providers.Jobs +namespace NzbDrone.Core.Jobs { public class RenameSeriesJob : IJob { diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj index 6c6204059..0a4bfd91a 100644 --- a/NzbDrone.Core/NzbDrone.Core.csproj +++ b/NzbDrone.Core/NzbDrone.Core.csproj @@ -242,7 +242,7 @@ - + @@ -383,7 +383,9 @@ - + + + diff --git a/NzbDrone.Core/WebTimer.cs b/NzbDrone.Core/WebTimer.cs index 26459fa93..6664e1a02 100644 --- a/NzbDrone.Core/WebTimer.cs +++ b/NzbDrone.Core/WebTimer.cs @@ -3,7 +3,6 @@ using System.Web; using System.Web.Caching; using NLog; using NzbDrone.Core.Jobs; -using NzbDrone.Core.Providers.Jobs; namespace NzbDrone.Core { diff --git a/NzbDrone.Web/Controllers/AddSeriesController.cs b/NzbDrone.Web/Controllers/AddSeriesController.cs index 6296a40f8..220ee88af 100644 --- a/NzbDrone.Web/Controllers/AddSeriesController.cs +++ b/NzbDrone.Web/Controllers/AddSeriesController.cs @@ -8,7 +8,6 @@ using NzbDrone.Common; using NzbDrone.Core.Jobs; using NzbDrone.Core.Providers; using NzbDrone.Core.Providers.Core; -using NzbDrone.Core.Providers.Jobs; using NzbDrone.Core.Repository; using NzbDrone.Web.Models; diff --git a/NzbDrone.Web/Controllers/CommandController.cs b/NzbDrone.Web/Controllers/CommandController.cs index f65ff0745..5abff28c8 100644 --- a/NzbDrone.Web/Controllers/CommandController.cs +++ b/NzbDrone.Web/Controllers/CommandController.cs @@ -7,7 +7,6 @@ using NzbDrone.Core.Jobs; using NzbDrone.Core.Model; using NzbDrone.Core.Model.Twitter; using NzbDrone.Core.Providers; -using NzbDrone.Core.Providers.Jobs; using NzbDrone.Web.Models; namespace NzbDrone.Web.Controllers diff --git a/NzbDrone.Web/Controllers/EpisodeController.cs b/NzbDrone.Web/Controllers/EpisodeController.cs index 5e3d7bdd8..06038f350 100644 --- a/NzbDrone.Web/Controllers/EpisodeController.cs +++ b/NzbDrone.Web/Controllers/EpisodeController.cs @@ -5,7 +5,6 @@ using System.Web.Mvc; using NzbDrone.Core.Jobs; using NzbDrone.Core.Providers; using NzbDrone.Core.Providers.Core; -using NzbDrone.Core.Providers.Jobs; using NzbDrone.Web.Models; namespace NzbDrone.Web.Controllers diff --git a/NzbDrone.Web/Controllers/HistoryController.cs b/NzbDrone.Web/Controllers/HistoryController.cs index 5422fdabb..1c430a1ca 100644 --- a/NzbDrone.Web/Controllers/HistoryController.cs +++ b/NzbDrone.Web/Controllers/HistoryController.cs @@ -5,7 +5,6 @@ using System.Web.Mvc; using NzbDrone.Core.Jobs; using NzbDrone.Core.Model; using NzbDrone.Core.Providers; -using NzbDrone.Core.Providers.Jobs; using NzbDrone.Web.Models; using Telerik.Web.Mvc; diff --git a/NzbDrone.Web/Controllers/SeriesController.cs b/NzbDrone.Web/Controllers/SeriesController.cs index fa7c1f49f..4a461565a 100644 --- a/NzbDrone.Web/Controllers/SeriesController.cs +++ b/NzbDrone.Web/Controllers/SeriesController.cs @@ -8,7 +8,6 @@ using NzbDrone.Core; using NzbDrone.Core.Helpers; using NzbDrone.Core.Jobs; using NzbDrone.Core.Providers; -using NzbDrone.Core.Providers.Jobs; using NzbDrone.Core.Repository; using NzbDrone.Web.Models; using Telerik.Web.Mvc; diff --git a/NzbDrone.Web/Controllers/SharedController.cs b/NzbDrone.Web/Controllers/SharedController.cs index 8d00b11b2..3b0c339f4 100644 --- a/NzbDrone.Web/Controllers/SharedController.cs +++ b/NzbDrone.Web/Controllers/SharedController.cs @@ -3,7 +3,6 @@ using System.Web.Mvc; using NzbDrone.Common; using NzbDrone.Core.Jobs; using NzbDrone.Core.Providers; -using NzbDrone.Core.Providers.Jobs; using NzbDrone.Web.Models; namespace NzbDrone.Web.Controllers diff --git a/NzbDrone.Web/Controllers/SystemController.cs b/NzbDrone.Web/Controllers/SystemController.cs index 4a1aeba0a..99f259903 100644 --- a/NzbDrone.Web/Controllers/SystemController.cs +++ b/NzbDrone.Web/Controllers/SystemController.cs @@ -8,7 +8,6 @@ using NzbDrone.Core.Helpers; using NzbDrone.Core.Jobs; using NzbDrone.Core.Providers; using NzbDrone.Core.Providers.Core; -using NzbDrone.Core.Providers.Jobs; using NzbDrone.Web.Models; using Telerik.Web.Mvc; diff --git a/NzbDrone.Web/Controllers/UpdateController.cs b/NzbDrone.Web/Controllers/UpdateController.cs index 8644e185e..b1c5bc2a1 100644 --- a/NzbDrone.Web/Controllers/UpdateController.cs +++ b/NzbDrone.Web/Controllers/UpdateController.cs @@ -5,7 +5,6 @@ using System.Web.Mvc; using NzbDrone.Common; using NzbDrone.Core.Jobs; using NzbDrone.Core.Providers; -using NzbDrone.Core.Providers.Jobs; using NzbDrone.Web.Models; namespace NzbDrone.Web.Controllers From dba5a1a23684a34150314507c6009cd0bba102e6 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Thu, 1 Dec 2011 21:37:13 -0800 Subject: [PATCH 4/8] GetSabTitle will now handle daily episodes. --- .../ProviderTests/SabProviderTest.cs | 26 +++++++++++++++++++ NzbDrone.Core/NzbDrone.Core.csproj | 4 +-- NzbDrone.Core/Providers/SabProvider.cs | 11 ++++++++ 3 files changed, 38 insertions(+), 3 deletions(-) diff --git a/NzbDrone.Core.Test/ProviderTests/SabProviderTest.cs b/NzbDrone.Core.Test/ProviderTests/SabProviderTest.cs index 4297c63d3..29dbb0bea 100644 --- a/NzbDrone.Core.Test/ProviderTests/SabProviderTest.cs +++ b/NzbDrone.Core.Test/ProviderTests/SabProviderTest.cs @@ -321,6 +321,32 @@ namespace NzbDrone.Core.Test.ProviderTests Assert.AreEqual(expected, actual); } + [TestCase(true, "My Series Name - 2011-12-01 - My Episode Title [Bluray720p] [Proper]")] + [TestCase(false, "My Series Name - 2011-12-01 - My Episode Title [Bluray720p]")] + public void sab_daily_series_title(bool proper, string expected) + { + var mocker = new AutoMoqer(); + + var series = Builder.CreateNew() + .With(c => c.Path = @"d:\tv shows\My Series Name") + .With(c => c.IsDaily = true) + .Build(); + + var parsResult = new EpisodeParseResult + { + AirDate = new DateTime(2011, 12,1), + Quality = new Quality(QualityTypes.Bluray720p, proper), + Series = series, + EpisodeTitle = "My Episode Title", + }; + + //Act + var actual = mocker.Resolve().GetSabTitle(parsResult); + + //Assert + Assert.AreEqual(expected, actual); + } + [Test] [Explicit] public void AddNewzbingByUrlSuccess() diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj index 0a4bfd91a..6284fe3b4 100644 --- a/NzbDrone.Core/NzbDrone.Core.csproj +++ b/NzbDrone.Core/NzbDrone.Core.csproj @@ -383,9 +383,7 @@ - - - + diff --git a/NzbDrone.Core/Providers/SabProvider.cs b/NzbDrone.Core/Providers/SabProvider.cs index 8d9d92126..2562926ca 100644 --- a/NzbDrone.Core/Providers/SabProvider.cs +++ b/NzbDrone.Core/Providers/SabProvider.cs @@ -117,6 +117,17 @@ namespace NzbDrone.Core.Providers return seasonResult; } + if (parseResult.Series.IsDaily) + { + var dailyResult = String.Format("{0} - {1:yyyy-MM-dd} - {2} [{3}]", new DirectoryInfo(parseResult.Series.Path).Name, + parseResult.AirDate, parseResult.EpisodeTitle, parseResult.Quality.QualityType); + + if (parseResult.Quality.Proper) + dailyResult += " [Proper]"; + + return dailyResult; + } + //Show Name - 1x01-1x02 - Episode Name //Show Name - 1x01 - Episode Name var episodeString = new List(); From f3fbcec8cb46ea1c15dc1e16d0730cbb2766c08d Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Thu, 1 Dec 2011 22:26:24 -0800 Subject: [PATCH 5/8] GetEpisodesByParseResult will return multiple episode names when multiple episodes are found. --- ...deProviderTest_GetEpisodesByParseResult.cs | 73 ++++++++++++++++++- NzbDrone.Core/Providers/EpisodeProvider.cs | 4 +- 2 files changed, 75 insertions(+), 2 deletions(-) diff --git a/NzbDrone.Core.Test/ProviderTests/EpisodeProviderTest_GetEpisodesByParseResult.cs b/NzbDrone.Core.Test/ProviderTests/EpisodeProviderTest_GetEpisodesByParseResult.cs index 52183b8ac..973a58eaa 100644 --- a/NzbDrone.Core.Test/ProviderTests/EpisodeProviderTest_GetEpisodesByParseResult.cs +++ b/NzbDrone.Core.Test/ProviderTests/EpisodeProviderTest_GetEpisodesByParseResult.cs @@ -127,7 +127,6 @@ namespace NzbDrone.Core.Test.ProviderTests ep.Should().HaveCount(2); Db.Fetch().Should().HaveCount(2); ep.First().ShouldHave().AllPropertiesBut(e => e.Series); - parseResult.EpisodeTitle.Should().Be(fakeEpisode.Title); } [Test] @@ -313,5 +312,77 @@ namespace NzbDrone.Core.Test.ProviderTests episodes.Should().BeEmpty(); Db.Fetch().Should().BeEmpty(); } + + [Test] + public void GetEpisodeParseResult_should_return_multiple_titles_for_multiple_episodes() + { + WithRealDb(); + + var fakeEpisode = Builder.CreateNew() + .With(e => e.SeriesId = 1) + .With(e => e.SeasonNumber = 2) + .With(e => e.EpisodeNumber = 10) + .With(e => e.Title = "Title1") + .Build(); + + var fakeEpisode2 = Builder.CreateNew() + .With(e => e.SeriesId = 1) + .With(e => e.SeasonNumber = 2) + .With(e => e.EpisodeNumber = 11) + .With(e => e.Title = "Title2") + .Build(); + + var fakeSeries = Builder.CreateNew().Build(); + + Db.Insert(fakeEpisode); + Db.Insert(fakeEpisode2); + Db.Insert(fakeSeries); + + var parseResult = new EpisodeParseResult + { + Series = fakeSeries, + SeasonNumber = 2, + EpisodeNumbers = new List { 10, 11 } + }; + + var ep = Mocker.Resolve().GetEpisodesByParseResult(parseResult); + + ep.Should().HaveCount(2); + Db.Fetch().Should().HaveCount(2); + ep.First().ShouldHave().AllPropertiesBut(e => e.Series); + parseResult.EpisodeTitle.Should().Be(fakeEpisode.Title + " + " + fakeEpisode2.Title); + } + + [Test] + public void GetEpisodeParseResult_should_return_single_title_for_single_episode() + { + WithRealDb(); + + var fakeEpisode = Builder.CreateNew() + .With(e => e.SeriesId = 1) + .With(e => e.SeasonNumber = 2) + .With(e => e.EpisodeNumber = 10) + .With(e => e.Title = "Title1") + .Build(); + + var fakeSeries = Builder.CreateNew().Build(); + + Db.Insert(fakeEpisode); + Db.Insert(fakeSeries); + + var parseResult = new EpisodeParseResult + { + Series = fakeSeries, + SeasonNumber = 2, + EpisodeNumbers = new List { 10 } + }; + + var ep = Mocker.Resolve().GetEpisodesByParseResult(parseResult); + + ep.Should().HaveCount(1); + Db.Fetch().Should().HaveCount(1); + ep.First().ShouldHave().AllPropertiesBut(e => e.Series); + parseResult.EpisodeTitle.Should().Be(fakeEpisode.Title); + } } } diff --git a/NzbDrone.Core/Providers/EpisodeProvider.cs b/NzbDrone.Core/Providers/EpisodeProvider.cs index ab9747f82..e99437667 100644 --- a/NzbDrone.Core/Providers/EpisodeProvider.cs +++ b/NzbDrone.Core/Providers/EpisodeProvider.cs @@ -161,6 +161,7 @@ namespace NzbDrone.Core.Providers if (episodeInfo != null) { result.Add(episodeInfo); + parseResult.EpisodeTitle = episodeInfo.Title; } return result; @@ -199,7 +200,8 @@ namespace NzbDrone.Core.Providers if (episodeInfo != null) { result.Add(episodeInfo); - parseResult.EpisodeTitle = episodeInfo.Title; + parseResult.EpisodeTitle += String.Format(" + {0}", episodeInfo.Title); + parseResult.EpisodeTitle = parseResult.EpisodeTitle.Trim('+', ' '); } else { From ceec4200356f88427f24347c339fb24960fa6eda Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Fri, 2 Dec 2011 00:35:56 -0800 Subject: [PATCH 6/8] Added test to verify EpisodeInfo would ignore new episodes for an ignored season (no bug here). --- .../ProviderTests/EpisodeProviderTest.cs | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/NzbDrone.Core.Test/ProviderTests/EpisodeProviderTest.cs b/NzbDrone.Core.Test/ProviderTests/EpisodeProviderTest.cs index 6d1f46385..86e2a637b 100644 --- a/NzbDrone.Core.Test/ProviderTests/EpisodeProviderTest.cs +++ b/NzbDrone.Core.Test/ProviderTests/EpisodeProviderTest.cs @@ -582,6 +582,57 @@ namespace NzbDrone.Core.Test.ProviderTests updatedEpisodes.Should().OnlyContain(c => c.Ignored == true); } + [Test] + public void RefreshEpisodeInfo_should_ignore_new_episode_for_ignored_season() + { + //Arrange + const int seriesId = 71663; + const int episodeCount = 2; + + var fakeEpisode = Builder.CreateNew() + .With(e => e.SeasonNumber = 5) + .With(e => e.EpisodeNumber = 1) + .With(e => e.TvDbEpisodeId = 11) + .With(e => e.SeriesId = seriesId) + .With(e => e.Ignored = true) + .Build(); + + var tvdbSeries = Builder.CreateNew().With( + c => c.Episodes = + new List(Builder.CreateListOfSize(episodeCount). + All() + .With(l => l.Language = new TvdbLanguage(0, "eng", "a")) + .With(e => e.SeasonNumber = 5) + .TheFirst(1) + .With(e => e.EpisodeNumber = 1) + .With(e => e.Id = 11) + .TheNext(1) + .With(e => e.EpisodeNumber = 2) + .With(e => e.Id = 22) + .Build()) + ).With(c => c.Id = seriesId).Build(); + + var fakeSeries = Builder.CreateNew().With(c => c.SeriesId = seriesId).Build(); + + WithRealDb(); + + Db.Insert(fakeSeries); + Db.Insert(fakeEpisode); + + Mocker.GetMock() + .Setup(c => c.GetSeries(seriesId, true)) + .Returns(tvdbSeries); + + //Act + Mocker.Resolve().RefreshEpisodeInfo(fakeSeries); + + //Assert + var result = Mocker.Resolve().GetEpisodeBySeries(seriesId).ToList(); + Mocker.GetMock().VerifyAll(); + result.Should().HaveCount(episodeCount); + result.Where(e => e.Ignored).Should().HaveCount(episodeCount); + } + [Test] public void IsSeasonIgnored_should_return_true_if_all_episodes_ignored() { From b9e9bb06a49f6739d37f0fd74ba02d70c7e68828 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Fri, 2 Dec 2011 08:14:38 -0800 Subject: [PATCH 7/8] EpisodeGrid sorting is done in the controller instead of the View, because it actually works... --- NzbDrone.Web/Controllers/SeriesController.cs | 2 +- NzbDrone.Web/Views/Series/Details.cshtml | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/NzbDrone.Web/Controllers/SeriesController.cs b/NzbDrone.Web/Controllers/SeriesController.cs index 4a461565a..f891b22d2 100644 --- a/NzbDrone.Web/Controllers/SeriesController.cs +++ b/NzbDrone.Web/Controllers/SeriesController.cs @@ -93,7 +93,7 @@ namespace NzbDrone.Web.Controllers { using (MiniProfiler.StepStatic("Controller")) { - var episodes = GetEpisodeModels(_episodeProvider.GetEpisodesBySeason(seriesId, seasonNumber)); + var episodes = GetEpisodeModels(_episodeProvider.GetEpisodesBySeason(seriesId, seasonNumber)).OrderByDescending(e => e.EpisodeNumber); return View(new GridModel(episodes)); } } diff --git a/NzbDrone.Web/Views/Series/Details.cshtml b/NzbDrone.Web/Views/Series/Details.cshtml index 22a57044e..fe08cc4f1 100644 --- a/NzbDrone.Web/Views/Series/Details.cshtml +++ b/NzbDrone.Web/Views/Series/Details.cshtml @@ -126,18 +126,12 @@ .Width(80); }) .DetailView(detailView => detailView.ClientTemplate("
<#= Overview #>
<#= Path #>
")) - .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.EpisodeNumber).Descending()).Enabled(false)) + //.Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.EpisodeNumber).Descending()).Enabled(false)) .Footer(true) .DataBinding( d => d.Ajax().Select("_AjaxSeasonGrid", "Series", new RouteValueDictionary { { "seriesId", Model.SeriesId }, { "seasonNumber", season } })) - @*.ToolBar(toolbar => toolbar.Template(@ - - ))*@ .ClientEvents(clientEvents => { clientEvents.OnRowDataBound("grid_rowBound"); From ac0371ff5c6a5e7771e4d3af18c693d2014575a4 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Fri, 2 Dec 2011 18:29:05 -0800 Subject: [PATCH 8/8] Fixed test per comments on last commit. --- .../EpisodeProviderTest_GetEpisodesByParseResult.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NzbDrone.Core.Test/ProviderTests/EpisodeProviderTest_GetEpisodesByParseResult.cs b/NzbDrone.Core.Test/ProviderTests/EpisodeProviderTest_GetEpisodesByParseResult.cs index 973a58eaa..eb95b1696 100644 --- a/NzbDrone.Core.Test/ProviderTests/EpisodeProviderTest_GetEpisodesByParseResult.cs +++ b/NzbDrone.Core.Test/ProviderTests/EpisodeProviderTest_GetEpisodesByParseResult.cs @@ -342,7 +342,7 @@ namespace NzbDrone.Core.Test.ProviderTests { Series = fakeSeries, SeasonNumber = 2, - EpisodeNumbers = new List { 10, 11 } + EpisodeNumbers = new List { fakeEpisode.EpisodeNumber, fakeEpisode2.EpisodeNumber } }; var ep = Mocker.Resolve().GetEpisodesByParseResult(parseResult); @@ -374,7 +374,7 @@ namespace NzbDrone.Core.Test.ProviderTests { Series = fakeSeries, SeasonNumber = 2, - EpisodeNumbers = new List { 10 } + EpisodeNumbers = new List { fakeEpisode.EpisodeNumber } }; var ep = Mocker.Resolve().GetEpisodesByParseResult(parseResult);