tedkulp/Readarr
1
0
Fork 0
mirror of https://github.com/Readarr/Readarr.git synced 2026-04-27 22:56:45 -04:00
Code Issues Projects Releases Wiki Activity

Cleanup Conflicts in Sonarr/Lidarr Pulls

Browse Source 
Co-Authored-By: Robin Dadswell <19610103+RobinDadswell@users.noreply.github.com>
This commit is contained in:
Qstick
2021-01-24 02:22:50 -05:00
parent ffc12656ee
commit 93ba5ade9e
298 changed files with 4460 additions and 4508 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NzbDrone.Core.Test/Download/CompletedDownloadServiceTests/ImportFixture.cs
+22 -22
View File
@@ -33,7 +33,7 @@ namespace NzbDrone.Core.Test.Download.CompletedDownloadServiceTests
.With(h => h.Title = "Drone.S01E01.HDTV")
.Build();
var remoteBook = BuildRemoteAlbum();
var remoteBook = BuildRemoteBook();
_trackedDownload = Builder<TrackedDownload>.CreateNew()
.With(c => c.State = TrackedDownloadState.Downloading)
@@ -55,11 +55,11 @@ namespace NzbDrone.Core.Test.Download.CompletedDownloadServiceTests
.Returns(new History.History());
Mocker.GetMock<IParsingService>()
.Setup(s => s.GetArtist("Drone.S01E01.HDTV"))
.Setup(s => s.GetAuthor("Drone.S01E01.HDTV"))
.Returns(remoteBook.Author);
}
private Book CreateAlbum(int id)
private Book CreateBook(int id)
{
return new Book
{
@@ -67,12 +67,12 @@ namespace NzbDrone.Core.Test.Download.CompletedDownloadServiceTests
};
}
private RemoteBook BuildRemoteAlbum()
private RemoteBook BuildRemoteBook()
{
return new RemoteBook
{
Author = new Author(),
Books = new List<Book> { CreateAlbum(1) }
Books = new List<Book> { CreateBook(1) }
};
}
@@ -86,18 +86,18 @@ namespace NzbDrone.Core.Test.Download.CompletedDownloadServiceTests
.Returns(new History.History() { SourceTitle = "Droned S01E01" });
Mocker.GetMock<IParsingService>()
.Setup(s => s.GetArtist(It.IsAny<string>()))
.Setup(s => s.GetAuthor(It.IsAny<string>()))
.Returns((Author)null);
Mocker.GetMock<IParsingService>()
.Setup(s => s.GetArtist("Droned S01E01"))
.Returns(BuildRemoteAlbum().Author);
.Setup(s => s.GetAuthor("Droned S01E01"))
.Returns(BuildRemoteBook().Author);
}
private void GivenArtistMatch()
private void GivenAuthorMatch()
{
Mocker.GetMock<IParsingService>()
.Setup(s => s.GetArtist(It.IsAny<string>()))
.Setup(s => s.GetAuthor(It.IsAny<string>()))
.Returns(_trackedDownload.RemoteBook.Author);
}
@@ -167,11 +167,11 @@ namespace NzbDrone.Core.Test.Download.CompletedDownloadServiceTests
[Test]
public void should_mark_as_imported_if_all_tracks_were_imported_but_extra_files_were_not()
{
GivenArtistMatch();
GivenAuthorMatch();
_trackedDownload.RemoteBook.Books = new List<Book>
{
CreateAlbum(1)
CreateBook(1)
};
Mocker.GetMock<IDownloadedBooksImportService>()
@@ -192,9 +192,9 @@ namespace NzbDrone.Core.Test.Download.CompletedDownloadServiceTests
{
_trackedDownload.RemoteBook.Books = new List<Book>
{
CreateAlbum(1),
CreateAlbum(1),
CreateAlbum(1)
CreateBook(1),
CreateBook(1),
CreateBook(1)
};
Mocker.GetMock<IDownloadedBooksImportService>()
@@ -227,9 +227,9 @@ namespace NzbDrone.Core.Test.Download.CompletedDownloadServiceTests
[Test]
public void should_not_mark_as_imported_if_some_of_episodes_were_not_imported_including_history()
{
var albums = Builder<Book>.CreateListOfSize(3).BuildList();
var books = Builder<Book>.CreateListOfSize(3).BuildList();
_trackedDownload.RemoteBook.Books = albums;
_trackedDownload.RemoteBook.Books = books;
Mocker.GetMock<IDownloadedBooksImportService>()
.Setup(v => v.ProcessPath(It.IsAny<string>(), It.IsAny<ImportMode>(), It.IsAny<Author>(), It.IsAny<DownloadClientItem>()))
@@ -261,7 +261,7 @@ namespace NzbDrone.Core.Test.Download.CompletedDownloadServiceTests
{
_trackedDownload.RemoteBook.Books = new List<Book>
{
CreateAlbum(1)
CreateBook(1)
};
Mocker.GetMock<IDownloadedBooksImportService>()
@@ -285,9 +285,9 @@ namespace NzbDrone.Core.Test.Download.CompletedDownloadServiceTests
[Test]
public void should_mark_as_imported_if_all_episodes_were_imported_including_history()
{
var albums = Builder<Book>.CreateListOfSize(2).BuildList();
var books = Builder<Book>.CreateListOfSize(2).BuildList();
_trackedDownload.RemoteBook.Books = albums;
_trackedDownload.RemoteBook.Books = books;
Mocker.GetMock<IDownloadedBooksImportService>()
.Setup(v => v.ProcessPath(It.IsAny<string>(), It.IsAny<ImportMode>(), It.IsAny<Author>(), It.IsAny<DownloadClientItem>()))
@@ -295,11 +295,11 @@ namespace NzbDrone.Core.Test.Download.CompletedDownloadServiceTests
{
new ImportResult(
new ImportDecision<LocalBook>(
new LocalBook { Path = @"C:\TestPath\Droned.S01E01.mkv", Book = albums[0] })),
new LocalBook { Path = @"C:\TestPath\Droned.S01E01.mkv", Book = books[0] })),
new ImportResult(
new ImportDecision<LocalBook>(
new LocalBook { Path = @"C:\TestPath\Droned.S01E02.mkv", Book = albums[1] }), "Test Failure")
new LocalBook { Path = @"C:\TestPath\Droned.S01E02.mkv", Book = books[1] }), "Test Failure")
});
var history = Builder<History.History>.CreateListOfSize(2)
src/NzbDrone.Core.Test/Download/CompletedDownloadServiceTests/ProcessFixture.cs
+10 -10
View File
@@ -29,7 +29,7 @@ namespace NzbDrone.Core.Test.Download.CompletedDownloadServiceTests
.With(h => h.Title = "Drone.S01E01.HDTV")
.Build();
var remoteBook = BuildRemoteAlbum();
var remoteBook = BuildRemoteBook();
_trackedDownload = Builder<TrackedDownload>.CreateNew()
.With(c => c.State = TrackedDownloadState.Downloading)
@@ -54,11 +54,11 @@ namespace NzbDrone.Core.Test.Download.CompletedDownloadServiceTests
.Returns(new History.History());
Mocker.GetMock<IParsingService>()
.Setup(s => s.GetArtist("Drone.S01E01.HDTV"))
.Setup(s => s.GetAuthor("Drone.S01E01.HDTV"))
.Returns(remoteBook.Author);
}
private RemoteBook BuildRemoteAlbum()
private RemoteBook BuildRemoteBook()
{
return new RemoteBook
{
@@ -74,10 +74,10 @@ namespace NzbDrone.Core.Test.Download.CompletedDownloadServiceTests
.Returns((History.History)null);
}
private void GivenArtistMatch()
private void GivenAuthorMatch()
{
Mocker.GetMock<IParsingService>()
.Setup(s => s.GetArtist(It.IsAny<string>()))
.Setup(s => s.GetAuthor(It.IsAny<string>()))
.Returns(_trackedDownload.RemoteBook.Author);
}
@@ -90,12 +90,12 @@ namespace NzbDrone.Core.Test.Download.CompletedDownloadServiceTests
.Returns(new History.History() { SourceTitle = "Droned S01E01" });
Mocker.GetMock<IParsingService>()
.Setup(s => s.GetArtist(It.IsAny<string>()))
.Setup(s => s.GetAuthor(It.IsAny<string>()))
.Returns((Author)null);
Mocker.GetMock<IParsingService>()
.Setup(s => s.GetArtist("Droned S01E01"))
.Returns(BuildRemoteAlbum().Author);
.Setup(s => s.GetAuthor("Droned S01E01"))
.Returns(BuildRemoteBook().Author);
}
[TestCase(DownloadItemStatus.Downloading)]
@@ -128,7 +128,7 @@ namespace NzbDrone.Core.Test.Download.CompletedDownloadServiceTests
{
_trackedDownload.DownloadItem.Category = "tv";
GivenNoGrabbedHistory();
GivenArtistMatch();
GivenAuthorMatch();
Subject.Check(_trackedDownload);
@@ -164,7 +164,7 @@ namespace NzbDrone.Core.Test.Download.CompletedDownloadServiceTests
{
_trackedDownload.RemoteBook.Author = null;
Mocker.GetMock<IParsingService>()
.Setup(s => s.GetArtist("Drone.S01E01.HDTV"))
.Setup(s => s.GetAuthor("Drone.S01E01.HDTV"))
.Returns((Author)null);
Subject.Check(_trackedDownload);
src/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/DownloadApprovedFixture.cs
+42 -42
View File
@@ -30,21 +30,21 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests
.Returns<List<DownloadDecision>>(v => v);
}
private Book GetAlbum(int id)
private Book GetBook(int id)
{
return Builder<Book>.CreateNew()
.With(e => e.Id = id)
.Build();
}
private RemoteBook GetRemoteAlbum(List<Book> albums, QualityModel quality, DownloadProtocol downloadProtocol = DownloadProtocol.Usenet)
private RemoteBook GetRemoteBook(List<Book> books, QualityModel quality, DownloadProtocol downloadProtocol = DownloadProtocol.Usenet)
{
var remoteBook = new RemoteBook();
remoteBook.ParsedBookInfo = new ParsedBookInfo();
remoteBook.ParsedBookInfo.Quality = quality;
remoteBook.Books = new List<Book>();
remoteBook.Books.AddRange(albums);
remoteBook.Books.AddRange(books);
remoteBook.Release = new ReleaseInfo();
remoteBook.Release.DownloadProtocol = downloadProtocol;
@@ -58,10 +58,10 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests
}
[Test]
public void should_download_report_if_album_was_not_already_downloaded()
public void should_download_report_if_book_was_not_already_downloaded()
{
var albums = new List<Book> { GetAlbum(1) };
var remoteBook = GetRemoteAlbum(albums, new QualityModel(Quality.MP3_320));
var books = new List<Book> { GetBook(1) };
var remoteBook = GetRemoteBook(books, new QualityModel(Quality.MP3_320));
var decisions = new List<DownloadDecision>();
decisions.Add(new DownloadDecision(remoteBook));
@@ -71,10 +71,10 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests
}
[Test]
public void should_only_download_album_once()
public void should_only_download_book_once()
{
var albums = new List<Book> { GetAlbum(1) };
var remoteBook = GetRemoteAlbum(albums, new QualityModel(Quality.MP3_320));
var books = new List<Book> { GetBook(1) };
var remoteBook = GetRemoteBook(books, new QualityModel(Quality.MP3_320));
var decisions = new List<DownloadDecision>();
decisions.Add(new DownloadDecision(remoteBook));
@@ -85,14 +85,14 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests
}
[Test]
public void should_not_download_if_any_album_was_already_downloaded()
public void should_not_download_if_any_book_was_already_downloaded()
{
var remoteBook1 = GetRemoteAlbum(
new List<Book> { GetAlbum(1) },
var remoteBook1 = GetRemoteBook(
new List<Book> { GetBook(1) },
new QualityModel(Quality.MP3_320));
var remoteBook2 = GetRemoteAlbum(
new List<Book> { GetAlbum(1), GetAlbum(2) },
var remoteBook2 = GetRemoteBook(
new List<Book> { GetBook(1), GetBook(2) },
new QualityModel(Quality.MP3_320));
var decisions = new List<DownloadDecision>();
@@ -106,8 +106,8 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests
[Test]
public void should_return_downloaded_reports()
{
var albums = new List<Book> { GetAlbum(1) };
var remoteBook = GetRemoteAlbum(albums, new QualityModel(Quality.MP3_320));
var books = new List<Book> { GetBook(1) };
var remoteBook = GetRemoteBook(books, new QualityModel(Quality.MP3_320));
var decisions = new List<DownloadDecision>();
decisions.Add(new DownloadDecision(remoteBook));
@@ -118,12 +118,12 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests
[Test]
public void should_return_all_downloaded_reports()
{
var remoteBook1 = GetRemoteAlbum(
new List<Book> { GetAlbum(1) },
var remoteBook1 = GetRemoteBook(
new List<Book> { GetBook(1) },
new QualityModel(Quality.MP3_320));
var remoteBook2 = GetRemoteAlbum(
new List<Book> { GetAlbum(2) },
var remoteBook2 = GetRemoteBook(
new List<Book> { GetBook(2) },
new QualityModel(Quality.MP3_320));
var decisions = new List<DownloadDecision>();
@@ -136,16 +136,16 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests
[Test]
public void should_only_return_downloaded_reports()
{
var remoteBook1 = GetRemoteAlbum(
new List<Book> { GetAlbum(1) },
var remoteBook1 = GetRemoteBook(
new List<Book> { GetBook(1) },
new QualityModel(Quality.MP3_320));
var remoteBook2 = GetRemoteAlbum(
new List<Book> { GetAlbum(2) },
var remoteBook2 = GetRemoteBook(
new List<Book> { GetBook(2) },
new QualityModel(Quality.MP3_320));
var remoteBook3 = GetRemoteAlbum(
new List<Book> { GetAlbum(2) },
var remoteBook3 = GetRemoteBook(
new List<Book> { GetBook(2) },
new QualityModel(Quality.MP3_320));
var decisions = new List<DownloadDecision>();
@@ -159,8 +159,8 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests
[Test]
public void should_not_add_to_downloaded_list_when_download_fails()
{
var albums = new List<Book> { GetAlbum(1) };
var remoteBook = GetRemoteAlbum(albums, new QualityModel(Quality.MP3_320));
var books = new List<Book> { GetBook(1) };
var remoteBook = GetRemoteBook(books, new QualityModel(Quality.MP3_320));
var decisions = new List<DownloadDecision>();
decisions.Add(new DownloadDecision(remoteBook));
@@ -183,8 +183,8 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests
[Test]
public void should_not_grab_if_pending()
{
var albums = new List<Book> { GetAlbum(1) };
var remoteBook = GetRemoteAlbum(albums, new QualityModel(Quality.MP3_320));
var books = new List<Book> { GetBook(1) };
var remoteBook = GetRemoteBook(books, new QualityModel(Quality.MP3_320));
var decisions = new List<DownloadDecision>();
decisions.Add(new DownloadDecision(remoteBook, new Rejection("Failure!", RejectionType.Temporary)));
@@ -194,10 +194,10 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests
}
[Test]
public void should_not_add_to_pending_if_album_was_grabbed()
public void should_not_add_to_pending_if_book_was_grabbed()
{
var albums = new List<Book> { GetAlbum(1) };
var remoteBook = GetRemoteAlbum(albums, new QualityModel(Quality.MP3_320));
var books = new List<Book> { GetBook(1) };
var remoteBook = GetRemoteBook(books, new QualityModel(Quality.MP3_320));
var decisions = new List<DownloadDecision>();
decisions.Add(new DownloadDecision(remoteBook));
@@ -210,8 +210,8 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests
[Test]
public void should_add_to_pending_even_if_already_added_to_pending()
{
var albums = new List<Book> { GetAlbum(1) };
var remoteBook = GetRemoteAlbum(albums, new QualityModel(Quality.MP3_320));
var books = new List<Book> { GetBook(1) };
var remoteBook = GetRemoteBook(books, new QualityModel(Quality.MP3_320));
var decisions = new List<DownloadDecision>();
decisions.Add(new DownloadDecision(remoteBook, new Rejection("Failure!", RejectionType.Temporary)));
@@ -224,8 +224,8 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests
[Test]
public void should_add_to_failed_if_already_failed_for_that_protocol()
{
var albums = new List<Book> { GetAlbum(1) };
var remoteBook = GetRemoteAlbum(albums, new QualityModel(Quality.MP3_320));
var books = new List<Book> { GetBook(1) };
var remoteBook = GetRemoteBook(books, new QualityModel(Quality.MP3_320));
var decisions = new List<DownloadDecision>();
decisions.Add(new DownloadDecision(remoteBook));
@@ -241,9 +241,9 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests
[Test]
public void should_not_add_to_failed_if_failed_for_a_different_protocol()
{
var albums = new List<Book> { GetAlbum(1) };
var remoteBook = GetRemoteAlbum(albums, new QualityModel(Quality.MP3_320), DownloadProtocol.Usenet);
var remoteBook2 = GetRemoteAlbum(albums, new QualityModel(Quality.MP3_320), DownloadProtocol.Torrent);
var books = new List<Book> { GetBook(1) };
var remoteBook = GetRemoteBook(books, new QualityModel(Quality.MP3_320), DownloadProtocol.Usenet);
var remoteBook2 = GetRemoteBook(books, new QualityModel(Quality.MP3_320), DownloadProtocol.Torrent);
var decisions = new List<DownloadDecision>();
decisions.Add(new DownloadDecision(remoteBook));
@@ -260,8 +260,8 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests
[Test]
public void should_add_to_rejected_if_release_unavailable_on_indexer()
{
var albums = new List<Book> { GetAlbum(1) };
var remoteBook = GetRemoteAlbum(albums, new QualityModel(Quality.MP3_320));
var books = new List<Book> { GetBook(1) };
var remoteBook = GetRemoteBook(books, new QualityModel(Quality.MP3_320));
var decisions = new List<DownloadDecision>();
decisions.Add(new DownloadDecision(remoteBook));
src/NzbDrone.Core.Test/Download/DownloadClientTests/Blackhole/TorrentBlackholeFixture.cs
+11 -11
View File
@@ -87,15 +87,15 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
_magnetFilePath = Path.ChangeExtension(_filePath, extension);
}
protected override RemoteBook CreateRemoteAlbum()
protected override RemoteBook CreateRemoteBook()
{
var remoteBook = base.CreateRemoteAlbum();
var remoteBook = base.CreateRemoteBook();
var torrentInfo = new TorrentInfo();
torrentInfo.Title = remoteBook.Release.Title;
torrentInfo.DownloadUrl = remoteBook.Release.DownloadUrl;
torrentInfo.DownloadProtocol = remoteBook.Release.DownloadProtocol;
torrentInfo.MagnetUrl = "magnet:?xt=urn:btih:755248817d32b00cc853e633ecdc48e4c21bff15&dn=Artist.Album.FLAC.loseless-DEFiNE%5Brartv%5D&tr=http%3A%2F%2Ftracker.trackerfix.com%3A80%2Fannounce&tr=udp%3A%2F%2F9.rarbg.me%3A2710&tr=udp%3A%2F%2F9.rarbg.to%3A2710";
torrentInfo.MagnetUrl = "magnet:?xt=urn:btih:755248817d32b00cc853e633ecdc48e4c21bff15&dn=Author.Book.FLAC.loseless-DEFiNE%5Brartv%5D&tr=http%3A%2F%2Ftracker.trackerfix.com%3A80%2Fannounce&tr=udp%3A%2F%2F9.rarbg.me%3A2710&tr=udp%3A%2F%2F9.rarbg.to%3A2710";
remoteBook.Release = torrentInfo;
@@ -141,7 +141,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
[Test]
public void Download_should_download_file_if_it_doesnt_exist()
{
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
Subject.Download(remoteBook);
@@ -155,7 +155,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
{
GivenMagnetFilePath();
Subject.Definition.Settings.As<TorrentBlackholeSettings>().SaveMagnetFiles = true;
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
remoteBook.Release.DownloadUrl = null;
Subject.Download(remoteBook);
Mocker.GetMock<IHttpClient>().Verify(c => c.Get(It.Is<HttpRequest>(v => v.Url.FullUri == _downloadUrl)), Times.Never());
@@ -173,7 +173,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
Subject.Definition.Settings.As<TorrentBlackholeSettings>().SaveMagnetFiles = true;
Subject.Definition.Settings.As<TorrentBlackholeSettings>().MagnetFileExtension = magnetFileExtension;
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
remoteBook.Release.DownloadUrl = null;
Subject.Download(remoteBook);
@@ -188,7 +188,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
public void Download_should_not_save_magnet_if_disabled()
{
GivenMagnetFilePath();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
remoteBook.Release.DownloadUrl = null;
Assert.Throws<ReleaseDownloadException>(() => Subject.Download(remoteBook));
@@ -204,7 +204,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
{
Subject.Definition.Settings.As<TorrentBlackholeSettings>().SaveMagnetFiles = true;
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
Subject.Download(remoteBook);
@@ -220,7 +220,7 @@ 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 remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
remoteBook.Release.Title = illegalTitle;
Subject.Download(remoteBook);
@@ -233,7 +233,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
[Test]
public void Download_should_throw_if_magnet_and_torrent_url_does_not_exist()
{
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
remoteBook.Release.DownloadUrl = null;
Assert.Throws<ReleaseDownloadException>(() => Subject.Download(remoteBook));
@@ -308,7 +308,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
[Test]
public void should_return_null_hash()
{
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
Subject.Download(remoteBook).Should().BeNull();
}
src/NzbDrone.Core.Test/Download/DownloadClientTests/Blackhole/UsenetBlackholeFixture.cs
+2 -2
View File
@@ -113,7 +113,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
[Test]
public void Download_should_download_file_if_it_doesnt_exist()
{
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
Subject.Download(remoteBook);
@@ -128,7 +128,7 @@ 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 remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
remoteBook.Release.Title = illegalTitle;
Subject.Download(remoteBook);
src/NzbDrone.Core.Test/Download/DownloadClientTests/DelugeTests/DelugeFixture.cs
+2 -2
View File
@@ -204,7 +204,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DelugeTests
{
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
var id = Subject.Download(remoteBook);
@@ -216,7 +216,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DelugeTests
{
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
remoteBook.Release.DownloadUrl = magnetUrl;
var id = Subject.Download(remoteBook);
src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadClientFixtureBase.cs
+2 -2
View File
@@ -30,7 +30,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests
Mocker.GetMock<IParsingService>()
.Setup(s => s.Map(It.IsAny<ParsedBookInfo>(), null))
.Returns(() => CreateRemoteAlbum());
.Returns(() => CreateRemoteBook());
Mocker.GetMock<IHttpClient>()
.Setup(s => s.Get(It.IsAny<HttpRequest>()))
@@ -41,7 +41,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests
.Returns<string, OsPath>((h, r) => r);
}
protected virtual RemoteBook CreateRemoteAlbum()
protected virtual RemoteBook CreateRemoteBook()
{
var remoteBook = new RemoteBook();
remoteBook.Release = new ReleaseInfo();
src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/TorrentDownloadStationFixture.cs
+9 -9
View File
@@ -34,7 +34,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
protected string _serialNumber = "SERIALNUMBER";
protected string _category = "readarr";
protected string _musicDirectory = @"music/Artist";
protected string _musicDirectory = @"music/Author";
protected string _defaultDestination = "somepath";
protected OsPath _physicalPath = new OsPath("/mnt/sdb1/mydata");
@@ -360,13 +360,13 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
.Callback(PrepareClientToReturnQueuedItem);
}
protected override RemoteBook CreateRemoteAlbum()
protected override RemoteBook CreateRemoteBook()
{
var album = base.CreateRemoteAlbum();
var book = base.CreateRemoteBook();
album.Release.DownloadUrl = DownloadURL;
book.Release.DownloadUrl = DownloadURL;
return album;
return book;
}
protected int GivenAllKindOfTasks()
@@ -387,7 +387,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
GivenTvDirectory();
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
var id = Subject.Download(remoteBook);
@@ -404,7 +404,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
GivenMusicCategory();
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
var id = Subject.Download(remoteBook);
@@ -420,7 +420,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
GivenSerialNumber();
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
var id = Subject.Download(remoteBook);
@@ -495,7 +495,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
[Test]
public void Download_should_throw_and_not_add_task_if_cannot_get_serial_number()
{
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
Mocker.GetMock<ISerialNumberProvider>()
.Setup(s => s.GetSerialNumber(_settings))
src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/UsenetDownloadStationFixture.cs
+6 -6
View File
@@ -29,7 +29,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
protected string _serialNumber = "SERIALNUMBER";
protected string _category = "readarr";
protected string _musicDirectory = @"music/Artist";
protected string _musicDirectory = @"music/Author";
protected string _defaultDestination = "somepath";
protected OsPath _physicalPath = new OsPath("/mnt/sdb1/mydata");
@@ -40,7 +40,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
[SetUp]
public void Setup()
{
_remoteBook = CreateRemoteAlbum();
_remoteBook = CreateRemoteBook();
_settings = new DownloadStationSettings()
{
@@ -264,7 +264,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
GivenTvDirectory();
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
var id = Subject.Download(remoteBook);
@@ -281,7 +281,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
GivenMusicCategory();
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
var id = Subject.Download(remoteBook);
@@ -297,7 +297,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
GivenSerialNumber();
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
var id = Subject.Download(remoteBook);
@@ -372,7 +372,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
[Test]
public void Download_should_throw_and_not_add_task_if_cannot_get_serial_number()
{
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
Mocker.GetMock<ISerialNumberProvider>()
.Setup(s => s.GetSerialNumber(_settings))
src/NzbDrone.Core.Test/Download/DownloadClientTests/HadoukenTests/HadoukenFixture.cs
+3 -3
View File
@@ -200,7 +200,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.HadoukenTests
{
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
var id = Subject.Download(remoteBook);
@@ -279,7 +279,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.HadoukenTests
[Test]
public void Download_from_magnet_link_should_return_hash_uppercase()
{
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
remoteBook.Release.DownloadUrl = "magnet:?xt=urn:btih:a45129e59d8750f9da982f53552b1e4f0457ee9f";
@@ -294,7 +294,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.HadoukenTests
[Test]
public void Download_from_torrent_file_should_return_hash_uppercase()
{
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
Mocker.GetMock<IHadoukenProxy>()
.Setup(v => v.AddTorrentFile(It.IsAny<HadoukenSettings>(), It.IsAny<byte[]>()))
src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbVortexTests/NzbVortexFixture.cs
+2 -2
View File
@@ -204,7 +204,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbVortexTests
{
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
var id = Subject.Download(remoteBook);
@@ -216,7 +216,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbVortexTests
{
GivenFailedDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
Assert.Throws<DownloadClientException>(() => Subject.Download(remoteBook));
}
src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbgetTests/NzbgetFixture.cs
+3 -3
View File
@@ -335,7 +335,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetTests
{
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
var id = Subject.Download(remoteBook);
@@ -347,7 +347,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetTests
{
GivenFailedDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
Assert.Throws<DownloadClientRejectedReleaseException>(() => Subject.Download(remoteBook));
}
@@ -452,7 +452,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetTests
[Test]
public void should_use_final_dir_when_set_instead_of_dest_dir()
{
_completed.FinalDir = "/remote/mount/music2/Some.Artist-Some.Album.FLAC.2018-DRONE";
_completed.FinalDir = "/remote/mount/music2/Some.Author-Some.Book.FLAC.2018-DRONE";
GivenQueue(null);
GivenHistory(_completed);
src/NzbDrone.Core.Test/Download/DownloadClientTests/QBittorrentTests/QBittorrentFixture.cs
+8 -8
View File
@@ -422,7 +422,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
{
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
var id = Subject.Download(remoteBook);
@@ -434,7 +434,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
{
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
remoteBook.Release.DownloadUrl = magnetUrl;
var id = Subject.Download(remoteBook);
@@ -449,7 +449,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
.Setup(s => s.GetConfig(It.IsAny<QBittorrentSettings>()))
.Returns(new QBittorrentPreferences() { DhtEnabled = false });
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
remoteBook.Release.DownloadUrl = "magnet:?xt=urn:btih:ZPBPA2P6ROZPKRHK44D5OW6NHXU5Z6KR";
Assert.Throws<ReleaseDownloadException>(() => Subject.Download(remoteBook));
@@ -462,7 +462,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
.Setup(s => s.GetConfig(It.IsAny<QBittorrentSettings>()))
.Returns(new QBittorrentPreferences { DhtEnabled = false });
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
remoteBook.Release.DownloadUrl = "magnet:?xt=urn:btih:ZPBPA2P6ROZPKRHK44D5OW6NHXU5Z6KR&tr=udp://abc";
Assert.DoesNotThrow(() => Subject.Download(remoteBook));
@@ -477,7 +477,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
GivenHighPriority();
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
var id = Subject.Download(remoteBook);
@@ -495,7 +495,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
.Setup(v => v.MoveTorrentToTopInQueue(It.IsAny<string>(), It.IsAny<QBittorrentSettings>()))
.Throws(new HttpException(new HttpResponse(new HttpRequest("http://me.local/"), new HttpHeader(), new byte[0], System.Net.HttpStatusCode.Forbidden)));
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
var id = Subject.Download(remoteBook);
@@ -529,7 +529,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
GivenRedirectToMagnet();
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
var id = Subject.Download(remoteBook);
@@ -542,7 +542,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
GivenRedirectToTorrent();
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
var id = Subject.Download(remoteBook);
src/NzbDrone.Core.Test/Download/DownloadClientTests/RTorrentTests/RTorrentFixture.cs
+1 -1
View File
@@ -115,7 +115,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.RTorrentTests
{
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
var id = Subject.Download(remoteBook);
src/NzbDrone.Core.Test/Download/DownloadClientTests/SabnzbdTests/SabnzbdFixture.cs
+3 -3
View File
@@ -298,7 +298,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
{
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
remoteBook.Release.Title = title;
var id = Subject.Download(remoteBook);
@@ -312,7 +312,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
{
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
var id = Subject.Download(remoteBook);
@@ -353,7 +353,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
.Setup(s => s.DownloadNzb(It.IsAny<byte[]>(), It.IsAny<string>(), It.IsAny<string>(), (int)SabnzbdPriority.High, It.IsAny<SabnzbdSettings>()))
.Returns(new SabnzbdAddResponse { Ids = new List<string> { "readarrtest" } });
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
remoteBook.Books = Builder<Book>.CreateListOfSize(1)
.All()
.With(e => e.ReleaseDate = DateTime.Today)
src/NzbDrone.Core.Test/Download/DownloadClientTests/TransmissionTests/TransmissionFixture.cs
+6 -6
View File
@@ -58,7 +58,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
{
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
var id = Subject.Download(remoteBook);
@@ -71,7 +71,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
GivenTvDirectory();
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
var id = Subject.Download(remoteBook);
@@ -87,7 +87,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
GivenMusicCategory();
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
var id = Subject.Download(remoteBook);
@@ -105,7 +105,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
_transmissionConfigItems["download-dir"] += "/";
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
var id = Subject.Download(remoteBook);
@@ -120,7 +120,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
{
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
var id = Subject.Download(remoteBook);
@@ -135,7 +135,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
{
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
remoteBook.Release.DownloadUrl = magnetUrl;
var id = Subject.Download(remoteBook);
src/NzbDrone.Core.Test/Download/DownloadClientTests/UTorrentTests/UTorrentFixture.cs
+4 -4
View File
@@ -232,7 +232,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.UTorrentTests
{
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
var id = Subject.Download(remoteBook);
@@ -256,7 +256,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.UTorrentTests
{
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
remoteBook.Release.DownloadUrl = magnetUrl;
var id = Subject.Download(remoteBook);
@@ -355,7 +355,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.UTorrentTests
GivenRedirectToMagnet();
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
var id = Subject.Download(remoteBook);
@@ -368,7 +368,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.UTorrentTests
GivenRedirectToTorrent();
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
var id = Subject.Download(remoteBook);
src/NzbDrone.Core.Test/Download/DownloadClientTests/VuzeTests/VuzeFixture.cs
+6 -6
View File
@@ -67,7 +67,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.VuzeTests
{
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
var id = Subject.Download(remoteBook);
@@ -80,7 +80,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.VuzeTests
GivenTvDirectory();
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
var id = Subject.Download(remoteBook);
@@ -96,7 +96,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.VuzeTests
GivenMusicCategory();
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
var id = Subject.Download(remoteBook);
@@ -114,7 +114,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.VuzeTests
_transmissionConfigItems["download-dir"] += "/";
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
var id = Subject.Download(remoteBook);
@@ -129,7 +129,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.VuzeTests
{
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
var id = Subject.Download(remoteBook);
@@ -144,7 +144,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.VuzeTests
{
GivenSuccessfulDownload();
var remoteBook = CreateRemoteAlbum();
var remoteBook = CreateRemoteBook();
remoteBook.Release.DownloadUrl = magnetUrl;
var id = Subject.Download(remoteBook);
src/NzbDrone.Core.Test/Download/FailedDownloadServiceTests/ProcessFixture.cs
+1 -1
View File
@@ -27,7 +27,7 @@ namespace NzbDrone.Core.Test.Download.FailedDownloadServiceTests
var completed = Builder<DownloadClientItem>.CreateNew()
.With(h => h.Status = DownloadItemStatus.Completed)
.With(h => h.OutputPath = new OsPath(@"C:\DropFolder\MyDownload".AsOsAgnostic()))
.With(h => h.Title = "Drone.DroneTheAlbum.FLAC")
.With(h => h.Title = "Drone.DroneTheBook.FLAC")
.Build();
_grabHistory = Builder<History.History>.CreateListOfSize(2).BuildList();
src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/AddFixture.cs
+12 -12
View File
@@ -21,8 +21,8 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
public class AddFixture : CoreTest<PendingReleaseService>
{
private DownloadDecision _temporarilyRejected;
private Author _artist;
private Book _album;
private Author _author;
private Book _book;
private QualityProfile _profile;
private ReleaseInfo _release;
private ParsedBookInfo _parsedBookInfo;
@@ -32,10 +32,10 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
[SetUp]
public void Setup()
{
_artist = Builder<Author>.CreateNew()
_author = Builder<Author>.CreateNew()
.Build();
_album = Builder<Book>.CreateNew()
_book = Builder<Book>.CreateNew()
.Build();
_profile = new QualityProfile
@@ -50,7 +50,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
},
};
_artist.QualityProfile = new LazyLoaded<QualityProfile>(_profile);
_author.QualityProfile = new LazyLoaded<QualityProfile>(_profile);
_release = Builder<ReleaseInfo>.CreateNew().Build();
@@ -58,8 +58,8 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
_parsedBookInfo.Quality = new QualityModel(Quality.MP3_320);
_remoteBook = new RemoteBook();
_remoteBook.Books = new List<Book> { _album };
_remoteBook.Author = _artist;
_remoteBook.Books = new List<Book> { _book };
_remoteBook.Author = _author;
_remoteBook.ParsedBookInfo = _parsedBookInfo;
_remoteBook.Release = _release;
@@ -77,15 +77,15 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
Mocker.GetMock<IAuthorService>()
.Setup(s => s.GetAuthor(It.IsAny<int>()))
.Returns(_artist);
.Returns(_author);
Mocker.GetMock<IAuthorService>()
.Setup(s => s.GetAuthors(It.IsAny<IEnumerable<int>>()))
.Returns(new List<Author> { _artist });
.Returns(new List<Author> { _author });
Mocker.GetMock<IParsingService>()
.Setup(s => s.GetAlbums(It.IsAny<ParsedBookInfo>(), _artist, null))
.Returns(new List<Book> { _album });
.Setup(s => s.GetBooks(It.IsAny<ParsedBookInfo>(), _author, null))
.Returns(new List<Book> { _book });
Mocker.GetMock<IPrioritizeDownloadDecision>()
.Setup(s => s.PrioritizeDecisions(It.IsAny<List<DownloadDecision>>()))
@@ -100,7 +100,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
var heldReleases = Builder<PendingRelease>.CreateListOfSize(1)
.All()
.With(h => h.AuthorId = _artist.Id)
.With(h => h.AuthorId = _author.Id)
.With(h => h.Title = title)
.With(h => h.Release = release)
.With(h => h.Reason = reason)
src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/RemoveGrabbedFixture.cs
+12 -12
View File
@@ -21,8 +21,8 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
public class RemoveGrabbedFixture : CoreTest<PendingReleaseService>
{
private DownloadDecision _temporarilyRejected;
private Author _artist;
private Book _album;
private Author _author;
private Book _book;
private QualityProfile _profile;
private ReleaseInfo _release;
private ParsedBookInfo _parsedBookInfo;
@@ -32,10 +32,10 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
[SetUp]
public void Setup()
{
_artist = Builder<Author>.CreateNew()
_author = Builder<Author>.CreateNew()
.Build();
_album = Builder<Book>.CreateNew()
_book = Builder<Book>.CreateNew()
.Build();
_profile = new QualityProfile
@@ -50,7 +50,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
},
};
_artist.QualityProfile = new LazyLoaded<QualityProfile>(_profile);
_author.QualityProfile = new LazyLoaded<QualityProfile>(_profile);
_release = Builder<ReleaseInfo>.CreateNew().Build();
@@ -58,8 +58,8 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
_parsedBookInfo.Quality = new QualityModel(Quality.MP3_320);
_remoteBook = new RemoteBook();
_remoteBook.Books = new List<Book> { _album };
_remoteBook.Author = _artist;
_remoteBook.Books = new List<Book> { _book };
_remoteBook.Author = _author;
_remoteBook.ParsedBookInfo = _parsedBookInfo;
_remoteBook.Release = _release;
@@ -77,15 +77,15 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
Mocker.GetMock<IAuthorService>()
.Setup(s => s.GetAuthor(It.IsAny<int>()))
.Returns(_artist);
.Returns(_author);
Mocker.GetMock<IAuthorService>()
.Setup(s => s.GetAuthors(It.IsAny<IEnumerable<int>>()))
.Returns(new List<Author> { _artist });
.Returns(new List<Author> { _author });
Mocker.GetMock<IParsingService>()
.Setup(s => s.GetAlbums(It.IsAny<ParsedBookInfo>(), _artist, null))
.Returns(new List<Book> { _album });
.Setup(s => s.GetBooks(It.IsAny<ParsedBookInfo>(), _author, null))
.Returns(new List<Book> { _book });
Mocker.GetMock<IPrioritizeDownloadDecision>()
.Setup(s => s.PrioritizeDecisions(It.IsAny<List<DownloadDecision>>()))
@@ -99,7 +99,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
var heldReleases = Builder<PendingRelease>.CreateListOfSize(1)
.All()
.With(h => h.AuthorId = _artist.Id)
.With(h => h.AuthorId = _author.Id)
.With(h => h.Release = _release.JsonClone())
.With(h => h.ParsedBookInfo = parsedEpisodeInfo)
.Build();
src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/RemovePendingFixture.cs
+19 -19
View File
@@ -16,14 +16,14 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
public class RemovePendingFixture : CoreTest<PendingReleaseService>
{
private List<PendingRelease> _pending;
private Book _album;
private Book _book;
[SetUp]
public void Setup()
{
_pending = new List<PendingRelease>();
_album = Builder<Book>.CreateNew()
_book = Builder<Book>.CreateNew()
.Build();
Mocker.GetMock<IPendingReleaseRepository>()
@@ -43,25 +43,25 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
.Returns(new List<Author> { new Author() });
Mocker.GetMock<IParsingService>()
.Setup(s => s.GetAlbums(It.IsAny<ParsedBookInfo>(), It.IsAny<Author>(), null))
.Returns(new List<Book> { _album });
.Setup(s => s.GetBooks(It.IsAny<ParsedBookInfo>(), It.IsAny<Author>(), null))
.Returns(new List<Book> { _book });
}
private void AddPending(int id, string album)
private void AddPending(int id, string book)
{
_pending.Add(new PendingRelease
{
Id = id,
ParsedBookInfo = new ParsedBookInfo { BookTitle = album }
ParsedBookInfo = new ParsedBookInfo { BookTitle = book }
});
}
[Test]
public void should_remove_same_release()
{
AddPending(id: 1, album: "Album");
AddPending(id: 1, book: "Book");
var queueId = HashConverter.GetHashInt31(string.Format("pending-{0}-book{1}", 1, _album.Id));
var queueId = HashConverter.GetHashInt31(string.Format("pending-{0}-book{1}", 1, _book.Id));
Subject.RemovePendingQueueItems(queueId);
@@ -71,12 +71,12 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
[Test]
public void should_remove_multiple_releases_release()
{
AddPending(id: 1, album: "Album 1");
AddPending(id: 2, album: "Album 2");
AddPending(id: 3, album: "Album 3");
AddPending(id: 4, album: "Album 3");
AddPending(id: 1, book: "Book 1");
AddPending(id: 2, book: "Book 2");
AddPending(id: 3, book: "Book 3");
AddPending(id: 4, book: "Book 3");
var queueId = HashConverter.GetHashInt31(string.Format("pending-{0}-book{1}", 3, _album.Id));
var queueId = HashConverter.GetHashInt31(string.Format("pending-{0}-book{1}", 3, _book.Id));
Subject.RemovePendingQueueItems(queueId);
@@ -84,14 +84,14 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
}
[Test]
public void should_not_remove_diffrent_albums()
public void should_not_remove_diffrent_books()
{
AddPending(id: 1, album: "Album 1");
AddPending(id: 2, album: "Album 1");
AddPending(id: 3, album: "Album 2");
AddPending(id: 4, album: "Album 3");
AddPending(id: 1, book: "Book 1");
AddPending(id: 2, book: "Book 1");
AddPending(id: 3, book: "Book 2");
AddPending(id: 4, book: "Book 3");
var queueId = HashConverter.GetHashInt31(string.Format("pending-{0}-book{1}", 1, _album.Id));
var queueId = HashConverter.GetHashInt31(string.Format("pending-{0}-book{1}", 1, _book.Id));
Subject.RemovePendingQueueItems(queueId);
src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/RemoveRejectedFixture.cs
+12 -12
View File
@@ -22,8 +22,8 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
public class RemoveRejectedFixture : CoreTest<PendingReleaseService>
{
private DownloadDecision _temporarilyRejected;
private Author _artist;
private Book _album;
private Author _author;
private Book _book;
private QualityProfile _profile;
private ReleaseInfo _release;
private ParsedBookInfo _parsedBookInfo;
@@ -32,10 +32,10 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
[SetUp]
public void Setup()
{
_artist = Builder<Author>.CreateNew()
_author = Builder<Author>.CreateNew()
.Build();
_album = Builder<Book>.CreateNew()
_book = Builder<Book>.CreateNew()
.Build();
_profile = new QualityProfile
@@ -50,7 +50,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
},
};
_artist.QualityProfile = new LazyLoaded<QualityProfile>(_profile);
_author.QualityProfile = new LazyLoaded<QualityProfile>(_profile);
_release = Builder<ReleaseInfo>.CreateNew().Build();
@@ -58,8 +58,8 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
_parsedBookInfo.Quality = new QualityModel(Quality.MP3_320);
_remoteBook = new RemoteBook();
_remoteBook.Books = new List<Book> { _album };
_remoteBook.Author = _artist;
_remoteBook.Books = new List<Book> { _book };
_remoteBook.Author = _author;
_remoteBook.ParsedBookInfo = _parsedBookInfo;
_remoteBook.Release = _release;
@@ -71,15 +71,15 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
Mocker.GetMock<IAuthorService>()
.Setup(s => s.GetAuthor(It.IsAny<int>()))
.Returns(_artist);
.Returns(_author);
Mocker.GetMock<IAuthorService>()
.Setup(s => s.GetAuthors(It.IsAny<IEnumerable<int>>()))
.Returns(new List<Author> { _artist });
.Returns(new List<Author> { _author });
Mocker.GetMock<IParsingService>()
.Setup(s => s.GetAlbums(It.IsAny<ParsedBookInfo>(), _artist, null))
.Returns(new List<Book> { _album });
.Setup(s => s.GetBooks(It.IsAny<ParsedBookInfo>(), _author, null))
.Returns(new List<Book> { _book });
Mocker.GetMock<IPrioritizeDownloadDecision>()
.Setup(s => s.PrioritizeDecisions(It.IsAny<List<DownloadDecision>>()))
@@ -94,7 +94,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
var heldReleases = Builder<PendingRelease>.CreateListOfSize(1)
.All()
.With(h => h.AuthorId = _artist.Id)
.With(h => h.AuthorId = _author.Id)
.With(h => h.Title = title)
.With(h => h.Release = release)
.Build();
src/NzbDrone.Core.Test/Download/RedownloadFailedDownloadServiceFixture.cs
+4 -4
View File
@@ -64,7 +64,7 @@ namespace NzbDrone.Core.Test.Download
}
[Test]
public void should_redownload_album_on_failure()
public void should_redownload_book_on_failure()
{
var failedEvent = new DownloadFailedEvent
{
@@ -87,7 +87,7 @@ namespace NzbDrone.Core.Test.Download
}
[Test]
public void should_redownload_multiple_albums_on_failure()
public void should_redownload_multiple_books_on_failure()
{
var failedEvent = new DownloadFailedEvent
{
@@ -111,9 +111,9 @@ namespace NzbDrone.Core.Test.Download
}
[Test]
public void should_redownload_artist_on_failure()
public void should_redownload_author_on_failure()
{
// note that artist is set to have 3 albums in setup
// note that author is set to have 3 books in setup
var failedEvent = new DownloadFailedEvent
{
AuthorId = 2,
src/NzbDrone.Core.Test/Download/TrackedDownloads/TrackedDownloadAlreadyImportedFixture.cs
+12 -12
View File
@@ -13,17 +13,17 @@ namespace NzbDrone.Core.Test.Download.TrackedDownloads
[TestFixture]
public class TrackedDownloadAlreadyImportedFixture : CoreTest<TrackedDownloadAlreadyImported>
{
private List<Book> _albums;
private List<Book> _books;
private TrackedDownload _trackedDownload;
private List<History.History> _historyItems;
[SetUp]
public void Setup()
{
_albums = new List<Book>();
_books = new List<Book>();
var remoteBook = Builder<RemoteBook>.CreateNew()
.With(r => r.Books = _albums)
.With(r => r.Books = _books)
.Build();
_trackedDownload = Builder<TrackedDownload>.CreateNew()
@@ -35,7 +35,7 @@ namespace NzbDrone.Core.Test.Download.TrackedDownloads
public void GivenEpisodes(int count)
{
_albums.AddRange(Builder<Book>.CreateListOfSize(count)
_books.AddRange(Builder<Book>.CreateListOfSize(count)
.BuildList());
}
@@ -66,7 +66,7 @@ namespace NzbDrone.Core.Test.Download.TrackedDownloads
{
GivenEpisodes(1);
GivenHistoryForEpisode(_albums[0], HistoryEventType.Grabbed);
GivenHistoryForEpisode(_books[0], HistoryEventType.Grabbed);
Subject.IsImported(_trackedDownload, _historyItems)
.Should()
@@ -78,8 +78,8 @@ namespace NzbDrone.Core.Test.Download.TrackedDownloads
{
GivenEpisodes(2);
GivenHistoryForEpisode(_albums[0], HistoryEventType.Grabbed);
GivenHistoryForEpisode(_albums[1], HistoryEventType.Grabbed);
GivenHistoryForEpisode(_books[0], HistoryEventType.Grabbed);
GivenHistoryForEpisode(_books[1], HistoryEventType.Grabbed);
Subject.IsImported(_trackedDownload, _historyItems)
.Should()
@@ -91,8 +91,8 @@ namespace NzbDrone.Core.Test.Download.TrackedDownloads
{
GivenEpisodes(2);
GivenHistoryForEpisode(_albums[0], HistoryEventType.DownloadImported, HistoryEventType.Grabbed);
GivenHistoryForEpisode(_albums[1], HistoryEventType.Grabbed);
GivenHistoryForEpisode(_books[0], HistoryEventType.DownloadImported, HistoryEventType.Grabbed);
GivenHistoryForEpisode(_books[1], HistoryEventType.Grabbed);
Subject.IsImported(_trackedDownload, _historyItems)
.Should()
@@ -104,7 +104,7 @@ namespace NzbDrone.Core.Test.Download.TrackedDownloads
{
GivenEpisodes(1);
GivenHistoryForEpisode(_albums[0], HistoryEventType.DownloadImported, HistoryEventType.Grabbed);
GivenHistoryForEpisode(_books[0], HistoryEventType.DownloadImported, HistoryEventType.Grabbed);
Subject.IsImported(_trackedDownload, _historyItems)
.Should()
@@ -116,8 +116,8 @@ namespace NzbDrone.Core.Test.Download.TrackedDownloads
{
GivenEpisodes(2);
GivenHistoryForEpisode(_albums[0], HistoryEventType.DownloadImported, HistoryEventType.Grabbed);
GivenHistoryForEpisode(_albums[1], HistoryEventType.DownloadImported, HistoryEventType.Grabbed);
GivenHistoryForEpisode(_books[0], HistoryEventType.DownloadImported, HistoryEventType.Grabbed);
GivenHistoryForEpisode(_books[1], HistoryEventType.DownloadImported, HistoryEventType.Grabbed);
Subject.IsImported(_trackedDownload, _historyItems)
.Should()
src/NzbDrone.Core.Test/Download/TrackedDownloads/TrackedDownloadServiceFixture.cs
+12 -12
View File
@@ -27,7 +27,7 @@ namespace NzbDrone.Core.Test.Download.TrackedDownloads
new History.History()
{
DownloadId = "35238",
SourceTitle = "Audio Artist - Audio Album [2018 - FLAC]",
SourceTitle = "Audio Author - Audio Book [2018 - FLAC]",
AuthorId = 5,
BookId = 4,
}
@@ -45,13 +45,13 @@ namespace NzbDrone.Core.Test.Download.TrackedDownloads
Books = new List<Book> { new Book { Id = 4 } },
ParsedBookInfo = new ParsedBookInfo()
{
BookTitle = "Audio Album",
AuthorName = "Audio Artist"
BookTitle = "Audio Book",
AuthorName = "Audio Author"
}
};
Mocker.GetMock<IParsingService>()
.Setup(s => s.Map(It.Is<ParsedBookInfo>(i => i.BookTitle == "Audio Album" && i.AuthorName == "Audio Artist"), It.IsAny<int>(), It.IsAny<IEnumerable<int>>()))
.Setup(s => s.Map(It.Is<ParsedBookInfo>(i => i.BookTitle == "Audio Book" && i.AuthorName == "Audio Author"), It.IsAny<int>(), It.IsAny<IEnumerable<int>>()))
.Returns(remoteBook);
var client = new DownloadClientDefinition()
@@ -82,7 +82,7 @@ namespace NzbDrone.Core.Test.Download.TrackedDownloads
}
[Test]
public void should_unmap_tracked_download_if_album_deleted()
public void should_unmap_tracked_download_if_book_deleted()
{
GivenDownloadHistory();
@@ -92,13 +92,13 @@ namespace NzbDrone.Core.Test.Download.TrackedDownloads
Books = new List<Book> { new Book { Id = 4 } },
ParsedBookInfo = new ParsedBookInfo()
{
BookTitle = "Audio Album",
AuthorName = "Audio Artist"
BookTitle = "Audio Book",
AuthorName = "Audio Author"
}
};
Mocker.GetMock<IParsingService>()
.Setup(s => s.Map(It.Is<ParsedBookInfo>(i => i.BookTitle == "Audio Album" && i.AuthorName == "Audio Artist"), It.IsAny<int>(), It.IsAny<IEnumerable<int>>()))
.Setup(s => s.Map(It.Is<ParsedBookInfo>(i => i.BookTitle == "Audio Book" && i.AuthorName == "Audio Author"), It.IsAny<int>(), It.IsAny<IEnumerable<int>>()))
.Returns(remoteBook);
var client = new DownloadClientDefinition()
@@ -109,7 +109,7 @@ namespace NzbDrone.Core.Test.Download.TrackedDownloads
var item = new DownloadClientItem()
{
Title = "Audio Artist - Audio Album [2018 - FLAC]",
Title = "Audio Author - Audio Book [2018 - FLAC]",
DownloadId = "35238",
DownloadClientInfo = new DownloadClientItemClientInfo
{
@@ -123,15 +123,15 @@ namespace NzbDrone.Core.Test.Download.TrackedDownloads
var trackedDownload = Subject.TrackDownload(client, item);
Subject.GetTrackedDownloads().Should().HaveCount(1);
// simulate deletion - album no longer maps
// simulate deletion - book no longer maps
Mocker.GetMock<IParsingService>()
.Setup(s => s.Map(It.Is<ParsedBookInfo>(i => i.BookTitle == "Audio Album" && i.AuthorName == "Audio Artist"), It.IsAny<int>(), It.IsAny<IEnumerable<int>>()))
.Setup(s => s.Map(It.Is<ParsedBookInfo>(i => i.BookTitle == "Audio Book" && i.AuthorName == "Audio Author"), It.IsAny<int>(), It.IsAny<IEnumerable<int>>()))
.Returns(default(RemoteBook));
// handle deletion event
Subject.Handle(new BookDeletedEvent(remoteBook.Books.First(), false, false));
// verify download has null remote album
// verify download has null remote book
var trackedDownloads = Subject.GetTrackedDownloads();
trackedDownloads.Should().HaveCount(1);
trackedDownloads.First().RemoteBook.Should().BeNull();