diff --git a/src/Lidarr.Api.V1/Calendar/CalendarModule.cs b/src/Lidarr.Api.V1/Calendar/CalendarModule.cs index 67214727f..f6c56217d 100644 --- a/src/Lidarr.Api.V1/Calendar/CalendarModule.cs +++ b/src/Lidarr.Api.V1/Calendar/CalendarModule.cs @@ -27,7 +27,6 @@ namespace Lidarr.Api.V1.Calendar var end = DateTime.Today.AddDays(2); var includeUnmonitored = Request.GetBooleanQueryParameter("unmonitored"); var includeArtist = Request.GetBooleanQueryParameter("includeArtist"); - var includeEpisodeFile = Request.GetBooleanQueryParameter("includeEpisodeFile"); //TODO: Add Album Image support to AlbumModuleWithSignalR var includeAlbumImages = Request.GetBooleanQueryParameter("includeAlbumImages"); diff --git a/src/Lidarr.Api.V1/Config/NamingExampleResource.cs b/src/Lidarr.Api.V1/Config/NamingExampleResource.cs index 27960f594..19c281e8a 100644 --- a/src/Lidarr.Api.V1/Config/NamingExampleResource.cs +++ b/src/Lidarr.Api.V1/Config/NamingExampleResource.cs @@ -22,12 +22,6 @@ namespace Lidarr.Api.V1.Config StandardTrackFormat = model.StandardTrackFormat, ArtistFolderFormat = model.ArtistFolderFormat, AlbumFolderFormat = model.AlbumFolderFormat - //IncludeSeriesTitle - //IncludeEpisodeTitle - //IncludeQuality - //ReplaceSpaces - //Separator - //NumberStyle }; } diff --git a/src/Lidarr.Api.V1/Indexers/ReleaseResource.cs b/src/Lidarr.Api.V1/Indexers/ReleaseResource.cs index 91d171b51..229d4a863 100644 --- a/src/Lidarr.Api.V1/Indexers/ReleaseResource.cs +++ b/src/Lidarr.Api.V1/Indexers/ReleaseResource.cs @@ -116,11 +116,6 @@ namespace Lidarr.Api.V1.Indexers Seeders = torrentInfo.Seeders, Leechers = (torrentInfo.Peers.HasValue && torrentInfo.Seeders.HasValue) ? (torrentInfo.Peers.Value - torrentInfo.Seeders.Value) : (int?)null, Protocol = releaseInfo.DownloadProtocol, - - //IsDaily = parsedEpisodeInfo.IsDaily, - //IsAbsoluteNumbering = parsedEpisodeInfo.IsAbsoluteNumbering, - //IsPossibleSpecialEpisode = parsedEpisodeInfo.IsPossibleSpecialEpisode, - //Special = parsedEpisodeInfo.Special, }; } diff --git a/src/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/DownloadApprovedFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/DownloadApprovedFixture.cs index f7b8c7f3f..088b00ddf 100644 --- a/src/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/DownloadApprovedFixture.cs +++ b/src/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/DownloadApprovedFixture.cs @@ -61,10 +61,10 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests public void should_download_report_if_album_was_not_already_downloaded() { var albums = new List { GetAlbum(1) }; - var remoteEpisode = GetRemoteAlbum(albums, new QualityModel(Quality.MP3_192)); + var remoteAlbum = GetRemoteAlbum(albums, new QualityModel(Quality.MP3_192)); var decisions = new List(); - decisions.Add(new DownloadDecision(remoteEpisode)); + decisions.Add(new DownloadDecision(remoteAlbum)); Subject.ProcessDecisions(decisions); Mocker.GetMock().Verify(v => v.DownloadReport(It.IsAny()), Times.Once()); @@ -248,13 +248,13 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests [Test] public void should_not_add_to_failed_if_failed_for_a_different_protocol() { - var episodes = new List { GetAlbum(1) }; - var remoteEpisode = GetRemoteAlbum(episodes, new QualityModel(Quality.MP3_320), DownloadProtocol.Usenet); - var remoteEpisode2 = GetRemoteAlbum(episodes, new QualityModel(Quality.MP3_320), DownloadProtocol.Torrent); + var albums = new List { GetAlbum(1) }; + var remoteAlbum = GetRemoteAlbum(albums, new QualityModel(Quality.MP3_320), DownloadProtocol.Usenet); + var remoteAlbum2 = GetRemoteAlbum(albums, new QualityModel(Quality.MP3_320), DownloadProtocol.Torrent); var decisions = new List(); - decisions.Add(new DownloadDecision(remoteEpisode)); - decisions.Add(new DownloadDecision(remoteEpisode2)); + decisions.Add(new DownloadDecision(remoteAlbum)); + decisions.Add(new DownloadDecision(remoteAlbum2)); Mocker.GetMock().Setup(s => s.DownloadReport(It.Is(r => r.Release.DownloadProtocol == DownloadProtocol.Usenet))) .Throws(new DownloadClientUnavailableException("Download client failed")); diff --git a/src/NzbDrone.Core.Test/Download/DownloadClientTests/Blackhole/UsenetBlackholeFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadClientTests/Blackhole/UsenetBlackholeFixture.cs index 938643ad7..291846222 100644 --- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/Blackhole/UsenetBlackholeFixture.cs +++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/Blackhole/UsenetBlackholeFixture.cs @@ -112,9 +112,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole [Test] public void Download_should_download_file_if_it_doesnt_exist() { - var remoteEpisode = CreateRemoteAlbum(); + var remoteAlbum = CreateRemoteAlbum(); - Subject.Download(remoteEpisode); + Subject.Download(remoteAlbum); Mocker.GetMock().Verify(c => c.Get(It.Is(v => v.Url.FullUri == _downloadUrl)), Times.Once()); Mocker.GetMock().Verify(c => c.OpenWriteStream(_filePath), Times.Once()); @@ -127,10 +127,10 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole var illegalTitle = "Radiohead - Scotch Mist [2008/FLAC/Lossless]"; var expectedFilename = Path.Combine(_blackholeFolder, "Radiohead - Scotch Mist [2008+FLAC+Lossless]" + Path.GetExtension(_filePath)); - var remoteEpisode = CreateRemoteAlbum(); - remoteEpisode.Release.Title = illegalTitle; + var remoteAlbum = CreateRemoteAlbum(); + remoteAlbum.Release.Title = illegalTitle; - Subject.Download(remoteEpisode); + Subject.Download(remoteAlbum); Mocker.GetMock().Verify(c => c.Get(It.Is(v => v.Url.FullUri == _downloadUrl)), Times.Once()); Mocker.GetMock().Verify(c => c.OpenWriteStream(expectedFilename), Times.Once()); diff --git a/src/NzbDrone.Core.Test/Download/DownloadClientTests/DelugeTests/DelugeFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadClientTests/DelugeTests/DelugeFixture.cs index fb819d1a9..622e65708 100644 --- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/DelugeTests/DelugeFixture.cs +++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/DelugeTests/DelugeFixture.cs @@ -204,9 +204,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DelugeTests { GivenSuccessfulDownload(); - var remoteEpisode = CreateRemoteAlbum(); + var remoteAlbum = CreateRemoteAlbum(); - var id = Subject.Download(remoteEpisode); + var id = Subject.Download(remoteAlbum); id.Should().NotBeNullOrEmpty(); } @@ -216,10 +216,10 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DelugeTests { GivenSuccessfulDownload(); - var remoteEpisode = CreateRemoteAlbum(); - remoteEpisode.Release.DownloadUrl = magnetUrl; + var remoteAlbum = CreateRemoteAlbum(); + remoteAlbum.Release.DownloadUrl = magnetUrl; - var id = Subject.Download(remoteEpisode); + var id = Subject.Download(remoteAlbum); id.Should().Be(expectedHash); } diff --git a/src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/TorrentDownloadStationFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/TorrentDownloadStationFixture.cs index 30f2a9bfd..8a022e6c1 100644 --- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/TorrentDownloadStationFixture.cs +++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/TorrentDownloadStationFixture.cs @@ -375,9 +375,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests GivenTvDirectory(); GivenSuccessfulDownload(); - var remoteEpisode = CreateRemoteAlbum(); + var remoteAlbum = CreateRemoteAlbum(); - var id = Subject.Download(remoteEpisode); + var id = Subject.Download(remoteAlbum); id.Should().NotBeNullOrEmpty(); @@ -392,9 +392,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests GivenMusicCategory(); GivenSuccessfulDownload(); - var remoteEpisode = CreateRemoteAlbum(); + var remoteAlbum = CreateRemoteAlbum(); - var id = Subject.Download(remoteEpisode); + var id = Subject.Download(remoteAlbum); id.Should().NotBeNullOrEmpty(); @@ -408,9 +408,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests GivenSerialNumber(); GivenSuccessfulDownload(); - var remoteEpisode = CreateRemoteAlbum(); + var remoteAlbum = CreateRemoteAlbum(); - var id = Subject.Download(remoteEpisode); + var id = Subject.Download(remoteAlbum); id.Should().NotBeNullOrEmpty(); @@ -483,13 +483,13 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests [Test] public void Download_should_throw_and_not_add_task_if_cannot_get_serial_number() { - var remoteEpisode = CreateRemoteAlbum(); + var remoteAlbum = CreateRemoteAlbum(); Mocker.GetMock() .Setup(s => s.GetSerialNumber(_settings)) .Throws(new ApplicationException("Some unknown exception, HttpException or DownloadClientException")); - Assert.Throws(Is.InstanceOf(), () => Subject.Download(remoteEpisode)); + Assert.Throws(Is.InstanceOf(), () => Subject.Download(remoteAlbum)); Mocker.GetMock() .Verify(v => v.AddTaskFromUrl(It.IsAny(), null, _settings), Times.Never()); diff --git a/src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/UsenetDownloadStationFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/UsenetDownloadStationFixture.cs index 80bfe20a6..d7438f1b6 100644 --- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/UsenetDownloadStationFixture.cs +++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/UsenetDownloadStationFixture.cs @@ -254,9 +254,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests GivenTvDirectory(); GivenSuccessfulDownload(); - var remoteEpisode = CreateRemoteAlbum(); + var remoteAlbum = CreateRemoteAlbum(); - var id = Subject.Download(remoteEpisode); + var id = Subject.Download(remoteAlbum); id.Should().NotBeNullOrEmpty(); @@ -271,9 +271,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests GivenMusicCategory(); GivenSuccessfulDownload(); - var remoteEpisode = CreateRemoteAlbum(); + var remoteAlbum = CreateRemoteAlbum(); - var id = Subject.Download(remoteEpisode); + var id = Subject.Download(remoteAlbum); id.Should().NotBeNullOrEmpty(); @@ -287,9 +287,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests GivenSerialNumber(); GivenSuccessfulDownload(); - var remoteEpisode = CreateRemoteAlbum(); + var remoteAlbum = CreateRemoteAlbum(); - var id = Subject.Download(remoteEpisode); + var id = Subject.Download(remoteAlbum); id.Should().NotBeNullOrEmpty(); @@ -362,13 +362,13 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests [Test] public void Download_should_throw_and_not_add_task_if_cannot_get_serial_number() { - var remoteEpisode = CreateRemoteAlbum(); + var remoteAlbum = CreateRemoteAlbum(); Mocker.GetMock() .Setup(s => s.GetSerialNumber(_settings)) .Throws(new ApplicationException("Some unknown exception, HttpException or DownloadClientException")); - Assert.Throws(Is.InstanceOf(), () => Subject.Download(remoteEpisode)); + Assert.Throws(Is.InstanceOf(), () => Subject.Download(remoteAlbum)); Mocker.GetMock() .Verify(v => v.AddTaskFromUrl(It.IsAny(), null, _settings), Times.Never()); diff --git a/src/NzbDrone.Core.Test/Download/DownloadClientTests/HadoukenTests/HadoukenFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadClientTests/HadoukenTests/HadoukenFixture.cs index 648244472..92bb41460 100644 --- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/HadoukenTests/HadoukenFixture.cs +++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/HadoukenTests/HadoukenFixture.cs @@ -200,9 +200,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.HadoukenTests { GivenSuccessfulDownload(); - var remoteEpisode = CreateRemoteAlbum(); + var remoteAlbum = CreateRemoteAlbum(); - var id = Subject.Download(remoteEpisode); + var id = Subject.Download(remoteAlbum); id.Should().NotBeNullOrEmpty(); } @@ -279,14 +279,14 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.HadoukenTests [Test] public void Download_from_magnet_link_should_return_hash_uppercase() { - var remoteEpisode = CreateRemoteAlbum(); + var remoteAlbum = CreateRemoteAlbum(); - remoteEpisode.Release.DownloadUrl = "magnet:?xt=urn:btih:a45129e59d8750f9da982f53552b1e4f0457ee9f"; + remoteAlbum.Release.DownloadUrl = "magnet:?xt=urn:btih:a45129e59d8750f9da982f53552b1e4f0457ee9f"; Mocker.GetMock() .Setup(v => v.AddTorrentUri(It.IsAny(), It.IsAny())); - var result = Subject.Download(remoteEpisode); + var result = Subject.Download(remoteAlbum); Assert.IsFalse(result.Any(c => char.IsLower(c))); } @@ -294,13 +294,13 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.HadoukenTests [Test] public void Download_from_torrent_file_should_return_hash_uppercase() { - var remoteEpisode = CreateRemoteAlbum(); + var remoteAlbum = CreateRemoteAlbum(); Mocker.GetMock() .Setup(v => v.AddTorrentFile(It.IsAny(), It.IsAny())) .Returns("hash"); - var result = Subject.Download(remoteEpisode); + var result = Subject.Download(remoteAlbum); Assert.IsFalse(result.Any(c => char.IsLower(c))); } diff --git a/src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbVortexTests/NzbVortexFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbVortexTests/NzbVortexFixture.cs index d075029f9..bffb73e31 100644 --- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbVortexTests/NzbVortexFixture.cs +++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbVortexTests/NzbVortexFixture.cs @@ -204,9 +204,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbVortexTests { GivenSuccessfulDownload(); - var remoteEpisode = CreateRemoteAlbum(); + var remoteAlbum = CreateRemoteAlbum(); - var id = Subject.Download(remoteEpisode); + var id = Subject.Download(remoteAlbum); id.Should().NotBeNullOrEmpty(); } @@ -216,9 +216,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbVortexTests { GivenFailedDownload(); - var remoteEpisode = CreateRemoteAlbum(); + var remoteAlbum = CreateRemoteAlbum(); - Assert.Throws(() => Subject.Download(remoteEpisode)); + Assert.Throws(() => Subject.Download(remoteAlbum)); } [Test] diff --git a/src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbgetTests/NzbgetFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbgetTests/NzbgetFixture.cs index 8fd776316..bb0c75c7b 100644 --- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbgetTests/NzbgetFixture.cs +++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbgetTests/NzbgetFixture.cs @@ -336,9 +336,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetTests { GivenSuccessfulDownload(); - var remoteEpisode = CreateRemoteAlbum(); + var remoteAlbum = CreateRemoteAlbum(); - var id = Subject.Download(remoteEpisode); + var id = Subject.Download(remoteAlbum); id.Should().NotBeNullOrEmpty(); } @@ -348,9 +348,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetTests { GivenFailedDownload(); - var remoteEpisode = CreateRemoteAlbum(); + var remoteAlbum = CreateRemoteAlbum(); - Assert.Throws(() => Subject.Download(remoteEpisode)); + Assert.Throws(() => Subject.Download(remoteAlbum)); } [Test] diff --git a/src/NzbDrone.Core.Test/Download/DownloadClientTests/RTorrentTests/RTorrentFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadClientTests/RTorrentTests/RTorrentFixture.cs index 30b72748a..1ef20907b 100644 --- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/RTorrentTests/RTorrentFixture.cs +++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/RTorrentTests/RTorrentFixture.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using System.Collections.Generic; using FluentAssertions; using Moq; @@ -116,9 +116,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.RTorrentTests { GivenSuccessfulDownload(); - var remoteEpisode = CreateRemoteAlbum(); + var remoteAlbum = CreateRemoteAlbum(); - var id = Subject.Download(remoteEpisode); + var id = Subject.Download(remoteAlbum); id.Should().NotBeNullOrEmpty(); } diff --git a/src/NzbDrone.Core.Test/Download/DownloadClientTests/SabnzbdTests/SabnzbdFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadClientTests/SabnzbdTests/SabnzbdFixture.cs index c2140768e..1bada7d29 100644 --- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/SabnzbdTests/SabnzbdFixture.cs +++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/SabnzbdTests/SabnzbdFixture.cs @@ -296,10 +296,10 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests { GivenSuccessfulDownload(); - var remoteEpisode = CreateRemoteAlbum(); - remoteEpisode.Release.Title = title; + var remoteAlbum = CreateRemoteAlbum(); + remoteAlbum.Release.Title = title; - var id = Subject.Download(remoteEpisode); + var id = Subject.Download(remoteAlbum); Mocker.GetMock() .Verify(v => v.DownloadNzb(It.IsAny(), filename, It.IsAny(), It.IsAny(), It.IsAny()), Times.Once()); @@ -310,9 +310,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests { GivenSuccessfulDownload(); - var remoteEpisode = CreateRemoteAlbum(); + var remoteAlbum = CreateRemoteAlbum(); - var id = Subject.Download(remoteEpisode); + var id = Subject.Download(remoteAlbum); id.Should().NotBeNullOrEmpty(); } @@ -351,14 +351,14 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests .Setup(s => s.DownloadNzb(It.IsAny(), It.IsAny(), It.IsAny(), (int)SabnzbdPriority.High, It.IsAny())) .Returns(new SabnzbdAddResponse()); - var remoteEpisode = CreateRemoteAlbum(); - remoteEpisode.Albums = Builder.CreateListOfSize(1) + var remoteAlbum = CreateRemoteAlbum(); + remoteAlbum.Albums = Builder.CreateListOfSize(1) .All() .With(e => e.ReleaseDate = DateTime.Today) .Build() .ToList(); - Subject.Download(remoteEpisode); + Subject.Download(remoteAlbum); Mocker.GetMock() .Verify(v => v.DownloadNzb(It.IsAny(), It.IsAny(), It.IsAny(), (int)SabnzbdPriority.High, It.IsAny()), Times.Once()); diff --git a/src/NzbDrone.Core.Test/Download/DownloadClientTests/TransmissionTests/TransmissionFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadClientTests/TransmissionTests/TransmissionFixture.cs index e20277368..638664693 100644 --- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/TransmissionTests/TransmissionFixture.cs +++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/TransmissionTests/TransmissionFixture.cs @@ -58,9 +58,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests { GivenSuccessfulDownload(); - var remoteEpisode = CreateRemoteAlbum(); + var remoteAlbum = CreateRemoteAlbum(); - var id = Subject.Download(remoteEpisode); + var id = Subject.Download(remoteAlbum); id.Should().NotBeNullOrEmpty(); } @@ -71,9 +71,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests GivenTvDirectory(); GivenSuccessfulDownload(); - var remoteEpisode = CreateRemoteAlbum(); + var remoteAlbum = CreateRemoteAlbum(); - var id = Subject.Download(remoteEpisode); + var id = Subject.Download(remoteAlbum); id.Should().NotBeNullOrEmpty(); @@ -87,9 +87,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests GivenMusicCategory(); GivenSuccessfulDownload(); - var remoteEpisode = CreateRemoteAlbum(); + var remoteAlbum = CreateRemoteAlbum(); - var id = Subject.Download(remoteEpisode); + var id = Subject.Download(remoteAlbum); id.Should().NotBeNullOrEmpty(); @@ -105,9 +105,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests _transmissionConfigItems["download-dir"] += "/"; - var remoteEpisode = CreateRemoteAlbum(); + var remoteAlbum = CreateRemoteAlbum(); - var id = Subject.Download(remoteEpisode); + var id = Subject.Download(remoteAlbum); id.Should().NotBeNullOrEmpty(); @@ -120,9 +120,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests { GivenSuccessfulDownload(); - var remoteEpisode = CreateRemoteAlbum(); + var remoteAlbum = CreateRemoteAlbum(); - var id = Subject.Download(remoteEpisode); + var id = Subject.Download(remoteAlbum); id.Should().NotBeNullOrEmpty(); @@ -135,10 +135,10 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests { GivenSuccessfulDownload(); - var remoteEpisode = CreateRemoteAlbum(); - remoteEpisode.Release.DownloadUrl = magnetUrl; + var remoteAlbum = CreateRemoteAlbum(); + remoteAlbum.Release.DownloadUrl = magnetUrl; - var id = Subject.Download(remoteEpisode); + var id = Subject.Download(remoteAlbum); id.Should().Be(expectedHash); } diff --git a/src/NzbDrone.Core.Test/Download/DownloadClientTests/UTorrentTests/UTorrentFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadClientTests/UTorrentTests/UTorrentFixture.cs index 89cc667d6..060ca7be4 100644 --- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/UTorrentTests/UTorrentFixture.cs +++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/UTorrentTests/UTorrentFixture.cs @@ -232,9 +232,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.UTorrentTests { GivenSuccessfulDownload(); - var remoteEpisode = CreateRemoteAlbum(); + var remoteAlbum = CreateRemoteAlbum(); - var id = Subject.Download(remoteEpisode); + var id = Subject.Download(remoteAlbum); id.Should().NotBeNullOrEmpty(); } @@ -256,10 +256,10 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.UTorrentTests { GivenSuccessfulDownload(); - var remoteEpisode = CreateRemoteAlbum(); - remoteEpisode.Release.DownloadUrl = magnetUrl; + var remoteAlbum = CreateRemoteAlbum(); + remoteAlbum.Release.DownloadUrl = magnetUrl; - var id = Subject.Download(remoteEpisode); + var id = Subject.Download(remoteAlbum); id.Should().Be(expectedHash); } @@ -355,9 +355,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.UTorrentTests GivenRedirectToMagnet(); GivenSuccessfulDownload(); - var remoteEpisode = CreateRemoteAlbum(); + var remoteAlbum = CreateRemoteAlbum(); - var id = Subject.Download(remoteEpisode); + var id = Subject.Download(remoteAlbum); id.Should().NotBeNullOrEmpty(); } @@ -368,9 +368,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.UTorrentTests GivenRedirectToTorrent(); GivenSuccessfulDownload(); - var remoteEpisode = CreateRemoteAlbum(); + var remoteAlbum = CreateRemoteAlbum(); - var id = Subject.Download(remoteEpisode); + var id = Subject.Download(remoteAlbum); id.Should().NotBeNullOrEmpty(); } diff --git a/src/NzbDrone.Core.Test/Download/DownloadClientTests/VuzeTests/VuzeFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadClientTests/VuzeTests/VuzeFixture.cs index fe645fc26..4eb31d280 100644 --- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/VuzeTests/VuzeFixture.cs +++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/VuzeTests/VuzeFixture.cs @@ -67,9 +67,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.VuzeTests { GivenSuccessfulDownload(); - var remoteEpisode = CreateRemoteAlbum(); + var remoteAlbum = CreateRemoteAlbum(); - var id = Subject.Download(remoteEpisode); + var id = Subject.Download(remoteAlbum); id.Should().NotBeNullOrEmpty(); } @@ -80,9 +80,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.VuzeTests GivenTvDirectory(); GivenSuccessfulDownload(); - var remoteEpisode = CreateRemoteAlbum(); + var remoteAlbum = CreateRemoteAlbum(); - var id = Subject.Download(remoteEpisode); + var id = Subject.Download(remoteAlbum); id.Should().NotBeNullOrEmpty(); @@ -96,9 +96,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.VuzeTests GivenMusicCategory(); GivenSuccessfulDownload(); - var remoteEpisode = CreateRemoteAlbum(); + var remoteAlbum = CreateRemoteAlbum(); - var id = Subject.Download(remoteEpisode); + var id = Subject.Download(remoteAlbum); id.Should().NotBeNullOrEmpty(); @@ -114,9 +114,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.VuzeTests _transmissionConfigItems["download-dir"] += "/"; - var remoteEpisode = CreateRemoteAlbum(); + var remoteAlbum = CreateRemoteAlbum(); - var id = Subject.Download(remoteEpisode); + var id = Subject.Download(remoteAlbum); id.Should().NotBeNullOrEmpty(); @@ -129,9 +129,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.VuzeTests { GivenSuccessfulDownload(); - var remoteEpisode = CreateRemoteAlbum(); + var remoteAlbum = CreateRemoteAlbum(); - var id = Subject.Download(remoteEpisode); + var id = Subject.Download(remoteAlbum); id.Should().NotBeNullOrEmpty(); @@ -144,10 +144,10 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.VuzeTests { GivenSuccessfulDownload(); - var remoteEpisode = CreateRemoteAlbum(); - remoteEpisode.Release.DownloadUrl = magnetUrl; + var remoteAlbum = CreateRemoteAlbum(); + remoteAlbum.Release.DownloadUrl = magnetUrl; - var id = Subject.Download(remoteEpisode); + var id = Subject.Download(remoteAlbum); id.Should().Be(expectedHash); } diff --git a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj index 84a4070be..4a40c277f 100644 --- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj @@ -365,7 +365,6 @@ - diff --git a/src/NzbDrone.Core.Test/ParserTests/SeasonParserFixture.cs b/src/NzbDrone.Core.Test/ParserTests/SeasonParserFixture.cs deleted file mode 100644 index ff42c8e4a..000000000 --- a/src/NzbDrone.Core.Test/ParserTests/SeasonParserFixture.cs +++ /dev/null @@ -1,57 +0,0 @@ -using FluentAssertions; -using NUnit.Framework; -using NzbDrone.Core.Test.Framework; - -namespace NzbDrone.Core.Test.ParserTests -{ - - [TestFixture] - public class SeasonParserFixture : CoreTest - { - [TestCase("30.Rock.Season.04.HDTV.XviD-DIMENSION", "30 Rock", 4)] - [TestCase("Parks.and.Recreation.S02.720p.x264-DIMENSION", "Parks and Recreation", 2)] - [TestCase("The.Office.US.S03.720p.x264-DIMENSION", "The Office US", 3)] - [TestCase(@"Sons.of.Anarchy.S03.720p.BluRay-CLUE\REWARD", "Sons of Anarchy", 3)] - [TestCase("Adventure Time S02 720p HDTV x264 CRON", "Adventure Time", 2)] - [TestCase("Sealab.2021.S04.iNTERNAL.DVDRip.XviD-VCDVaULT", "Sealab 2021", 4)] - [TestCase("Hawaii Five 0 S01 720p WEB DL DD5 1 H 264 NT", "Hawaii Five 0", 1)] - [TestCase("30 Rock S03 WS PDTV XviD FUtV", "30 Rock", 3)] - [TestCase("The Office Season 4 WS PDTV XviD FUtV", "The Office", 4)] - [TestCase("Eureka Season 1 720p WEB DL DD 5 1 h264 TjHD", "Eureka", 1)] - [TestCase("The Office Season4 WS PDTV XviD FUtV", "The Office", 4)] - [TestCase("Eureka S 01 720p WEB DL DD 5 1 h264 TjHD", "Eureka", 1)] - [TestCase("Doctor Who Confidential Season 3", "Doctor Who Confidential", 3)] - [TestCase("Fleming.S01.720p.WEBDL.DD5.1.H.264-NTb", "Fleming", 1)] - [TestCase("Holmes.Makes.It.Right.S02.720p.HDTV.AAC5.1.x265-NOGRP", "Holmes Makes It Right", 2)] - [TestCase("My.Series.S2014.720p.HDTV.x264-ME", "My Series", 2014)] - public void should_parse_full_season_release(string postTitle, string title, int season) - { - var result = Parser.Parser.ParseAlbumTitle(postTitle); - //result.SeasonNumber.Should().Be(season); - //result.SeriesTitle.Should().Be(title); - //result.EpisodeNumbers.Should().BeEmpty(); - //result.AbsoluteEpisodeNumbers.Should().BeEmpty(); - //result.FullSeason.Should().BeTrue(); - } - - [TestCase("Acropolis Now S05 EXTRAS DVDRip XviD RUNNER")] - [TestCase("Punky Brewster S01 EXTRAS DVDRip XviD RUNNER")] - [TestCase("Instant Star S03 EXTRAS DVDRip XviD OSiTV")] - public void should_parse_season_extras(string postTitle) - { - var result = Parser.Parser.ParseAlbumTitle(postTitle); - - result.Should().BeNull(); - } - - [TestCase("Lie.to.Me.S03.SUBPACK.DVDRip.XviD-REWARD")] - [TestCase("The.Middle.S02.SUBPACK.DVDRip.XviD-REWARD")] - [TestCase("CSI.S11.SUBPACK.DVDRip.XviD-REWARD")] - public void should_parse_season_subpack(string postTitle) - { - var result = Parser.Parser.ParseAlbumTitle(postTitle); - - result.Should().BeNull(); - } - } -} diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/HistorySpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/HistorySpecification.cs index e2d408ab1..cded91514 100644 --- a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/HistorySpecification.cs +++ b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/HistorySpecification.cs @@ -52,8 +52,8 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync if (mostRecent != null && mostRecent.EventType == HistoryEventType.Grabbed) { var recent = mostRecent.Date.After(DateTime.UtcNow.AddHours(-12)); - // The artist will be the same as the one in history since it's the same episode. - // Instead of fetching the series from the DB reuse the known series. + // The artist will be the same as the one in history since it's the same album. + // Instead of fetching the artist from the DB reuse the known artist. var preferredWordScore = _preferredWordServiceCalculator.Calculate(subject.Artist, mostRecent.SourceTitle); var cutoffUnmet = _upgradableSpecification.CutoffNotMet( diff --git a/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs b/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs index cc267c6ce..36d4d8c28 100644 --- a/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs +++ b/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs @@ -213,7 +213,7 @@ namespace NzbDrone.Core.Download.Pending } } - //Return best quality release for each episode + //Return best quality release for each album var deduped = queued.GroupBy(q => q.Album.Id).Select(g => { var artist = g.First().Artist; diff --git a/src/NzbDrone.Core/Extras/Metadata/Consumers/Wdtv/WdtvMetadata.cs b/src/NzbDrone.Core/Extras/Metadata/Consumers/Wdtv/WdtvMetadata.cs index baa0ddf83..9dfb6756a 100644 --- a/src/NzbDrone.Core/Extras/Metadata/Consumers/Wdtv/WdtvMetadata.cs +++ b/src/NzbDrone.Core/Extras/Metadata/Consumers/Wdtv/WdtvMetadata.cs @@ -116,11 +116,6 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Wdtv details.Add(new XElement("track_number", track.AbsoluteTrackNumber.ToString("00"))); details.Add(new XElement("member", string.Join(" / ", artist.Metadata.Value.Members.ConvertAll(c => c.Name + " - " + c.Instrument)))); - - //Todo: get guest stars, writer and director - //details.Add(new XElement("credits", tvdbEpisode.Writer.FirstOrDefault())); - //details.Add(new XElement("director", tvdbEpisode.Directors.FirstOrDefault())); - doc.Add(details); doc.Save(xw); diff --git a/src/NzbDrone.Core/History/HistoryService.cs b/src/NzbDrone.Core/History/HistoryService.cs index 4cd8febc3..9029c8b17 100644 --- a/src/NzbDrone.Core/History/HistoryService.cs +++ b/src/NzbDrone.Core/History/HistoryService.cs @@ -20,7 +20,7 @@ namespace NzbDrone.Core.History public interface IHistoryService { PagingSpec Paged(PagingSpec pagingSpec); - History MostRecentForAlbum(int episodeId); + History MostRecentForAlbum(int albumId); History MostRecentForDownloadId(string downloadId); History Get(int historyId); List GetByArtist(int artistId, HistoryEventType? eventType); diff --git a/src/NzbDrone.Core/MediaFiles/MediaFileTableCleanupService.cs b/src/NzbDrone.Core/MediaFiles/MediaFileTableCleanupService.cs index 39b3ee700..93ee9bc5a 100644 --- a/src/NzbDrone.Core/MediaFiles/MediaFileTableCleanupService.cs +++ b/src/NzbDrone.Core/MediaFiles/MediaFileTableCleanupService.cs @@ -60,7 +60,7 @@ namespace NzbDrone.Core.MediaFiles catch (Exception ex) { - _logger.Error(ex, "Unable to cleanup EpisodeFile in DB: {0}", trackFile.Id); + _logger.Error(ex, "Unable to cleanup TrackFile in DB: {0}", trackFile.Id); } } diff --git a/src/NzbDrone.Integration.Test/ApiTests/CalendarFixture.cs b/src/NzbDrone.Integration.Test/ApiTests/CalendarFixture.cs index 4bacbcd85..ea9249636 100644 --- a/src/NzbDrone.Integration.Test/ApiTests/CalendarFixture.cs +++ b/src/NzbDrone.Integration.Test/ApiTests/CalendarFixture.cs @@ -53,7 +53,7 @@ namespace NzbDrone.Integration.Test.ApiTests } [Test] - public void should_be_able_to_get_unmonitored_episodes() + public void should_be_able_to_get_unmonitored_albums() { var artist = EnsureArtist("aaaa_aaaaa_asaaaaa", "Alien Ant Farm", false);