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

Fixed: Some TV scrubbing

Browse Source
This commit is contained in:
Qstick
2019-03-09 21:34:25 -05:00
parent 0926862609
commit 7d4d923903
24 changed files with 100 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NzbDrone.Core.Test/Download/DownloadClientTests/Blackhole/UsenetBlackholeFixture.cs
+5 -5
View File
@@ -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<IHttpClient>().Verify(c => c.Get(It.Is<HttpRequest>(v => v.Url.FullUri == _downloadUrl)), Times.Once());
Mocker.GetMock<IDiskProvider>().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<IHttpClient>().Verify(c => c.Get(It.Is<HttpRequest>(v => v.Url.FullUri == _downloadUrl)), Times.Once());
Mocker.GetMock<IDiskProvider>().Verify(c => c.OpenWriteStream(expectedFilename), Times.Once());
src/NzbDrone.Core.Test/Download/DownloadClientTests/DelugeTests/DelugeFixture.cs
+5 -5
View File
@@ -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);
}
src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/TorrentDownloadStationFixture.cs
+8 -8
View File
@@ -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<ISerialNumberProvider>()
.Setup(s => s.GetSerialNumber(_settings))
.Throws(new ApplicationException("Some unknown exception, HttpException or DownloadClientException"));
Assert.Throws(Is.InstanceOf<Exception>(), () => Subject.Download(remoteEpisode));
Assert.Throws(Is.InstanceOf<Exception>(), () => Subject.Download(remoteAlbum));
Mocker.GetMock<IDownloadStationTaskProxy>()
.Verify(v => v.AddTaskFromUrl(It.IsAny<string>(), null, _settings), Times.Never());
src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/UsenetDownloadStationFixture.cs
+8 -8
View File
@@ -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<ISerialNumberProvider>()
.Setup(s => s.GetSerialNumber(_settings))
.Throws(new ApplicationException("Some unknown exception, HttpException or DownloadClientException"));
Assert.Throws(Is.InstanceOf<Exception>(), () => Subject.Download(remoteEpisode));
Assert.Throws(Is.InstanceOf<Exception>(), () => Subject.Download(remoteAlbum));
Mocker.GetMock<IDownloadStationTaskProxy>()
.Verify(v => v.AddTaskFromUrl(It.IsAny<string>(), null, _settings), Times.Never());
src/NzbDrone.Core.Test/Download/DownloadClientTests/HadoukenTests/HadoukenFixture.cs
+7 -7
View File
@@ -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<IHadoukenProxy>()
.Setup(v => v.AddTorrentUri(It.IsAny<HadoukenSettings>(), It.IsAny<string>()));
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<IHadoukenProxy>()
.Setup(v => v.AddTorrentFile(It.IsAny<HadoukenSettings>(), It.IsAny<byte[]>()))
.Returns("hash");
var result = Subject.Download(remoteEpisode);
var result = Subject.Download(remoteAlbum);
Assert.IsFalse(result.Any(c => char.IsLower(c)));
}
src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbVortexTests/NzbVortexFixture.cs
+4 -4
View File
@@ -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<DownloadClientException>(() => Subject.Download(remoteEpisode));
Assert.Throws<DownloadClientException>(() => Subject.Download(remoteAlbum));
}
[Test]
src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbgetTests/NzbgetFixture.cs
+4 -4
View File
@@ -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<DownloadClientException>(() => Subject.Download(remoteEpisode));
Assert.Throws<DownloadClientException>(() => Subject.Download(remoteAlbum));
}
[Test]
src/NzbDrone.Core.Test/Download/DownloadClientTests/RTorrentTests/RTorrentFixture.cs
+3 -3
View File
@@ -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();
}
src/NzbDrone.Core.Test/Download/DownloadClientTests/SabnzbdTests/SabnzbdFixture.cs
+8 -8
View File
@@ -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<ISabnzbdProxy>()
.Verify(v => v.DownloadNzb(It.IsAny<byte[]>(), filename, It.IsAny<string>(), It.IsAny<int>(), It.IsAny<SabnzbdSettings>()), 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<byte[]>(), It.IsAny<string>(), It.IsAny<string>(), (int)SabnzbdPriority.High, It.IsAny<SabnzbdSettings>()))
.Returns(new SabnzbdAddResponse());
var remoteEpisode = CreateRemoteAlbum();
remoteEpisode.Albums = Builder<Album>.CreateListOfSize(1)
var remoteAlbum = CreateRemoteAlbum();
remoteAlbum.Albums = Builder<Album>.CreateListOfSize(1)
.All()
.With(e => e.ReleaseDate = DateTime.Today)
.Build()
.ToList();
Subject.Download(remoteEpisode);
Subject.Download(remoteAlbum);
Mocker.GetMock<ISabnzbdProxy>()
.Verify(v => v.DownloadNzb(It.IsAny<byte[]>(), It.IsAny<string>(), It.IsAny<string>(), (int)SabnzbdPriority.High, It.IsAny<SabnzbdSettings>()), Times.Once());
src/NzbDrone.Core.Test/Download/DownloadClientTests/TransmissionTests/TransmissionFixture.cs
+13 -13
View File
@@ -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);
}
src/NzbDrone.Core.Test/Download/DownloadClientTests/UTorrentTests/UTorrentFixture.cs
+9 -9
View File
@@ -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();
}
src/NzbDrone.Core.Test/Download/DownloadClientTests/VuzeTests/VuzeFixture.cs
+13 -13
View File
@@ -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);
}