Pull DownloadClientItemClientInfo part of 824d315a

src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadClientFixtureBase.cs

@@ -61,7 +61,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests
 
         protected void VerifyIdentifiable(DownloadClientItem downloadClientItem)
         {
-            downloadClientItem.DownloadClient.Should().Be(Subject.Definition.Name);
+            downloadClientItem.DownloadClientInfo.Protocol.Should().Be(Subject.Protocol);
+            downloadClientItem.DownloadClientInfo.Id.Should().Be(Subject.Definition.Id);
+            downloadClientItem.DownloadClientInfo.Name.Should().Be(Subject.Definition.Name);
             downloadClientItem.DownloadId.Should().NotBeNullOrEmpty();
             downloadClientItem.Title.Should().NotBeNullOrEmpty();
         }

src/NzbDrone.Core.Test/Download/TrackedDownloads/TrackedDownloadServiceFixture.cs

@@ -64,6 +64,12 @@ namespace NzbDrone.Core.Test.Download.TrackedDownloads
             {
                 Title = "The torrent release folder",
                 DownloadId = "35238",
+                DownloadClientInfo = new DownloadClientItemClientInfo
+                {
+                    Protocol = client.Protocol,
+                    Id = client.Id,
+                    Name = client.Name
+                }
             };
 
             var trackedDownload = Subject.TrackDownload(client, item);
@@ -105,6 +111,12 @@ namespace NzbDrone.Core.Test.Download.TrackedDownloads
             {
                 Title = "Audio Artist - Audio Album [2018 - FLAC]",
                 DownloadId = "35238",
+                DownloadClientInfo = new DownloadClientItemClientInfo
+                {
+                    Protocol = client.Protocol,
+                    Id = client.Id,
+                    Name = client.Name
+                }
             };
 
             // get a tracked download in place

src/NzbDrone.Core.Test/HealthCheck/Checks/RemotePathMappingCheckFixture.cs

@@ -9,6 +9,7 @@ using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.Download.Clients;
 using NzbDrone.Core.HealthCheck.Checks;
+using NzbDrone.Core.Indexers;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.MediaFiles.Events;
 using NzbDrone.Core.Parser.Model;
@@ -39,7 +40,12 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
         {
             _downloadItem = new DownloadClientItem
             {
-                DownloadClient = "Test",
+                DownloadClientInfo = new DownloadClientItemClientInfo
+                {
+                    Protocol = DownloadProtocol.Usenet,
+                    Id = 1,
+                    Name = "Test"
+                },
                 DownloadId = "TestId",
                 OutputPath = new OsPath(_downloadItemPath)
             };
@@ -166,7 +172,7 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
         public void should_return_ok_on_track_imported_event()
         {
             GivenFolderExists(_downloadRootPath);
-            var importEvent = new TrackImportedEvent(new LocalBook(), new BookFile(), new List<BookFile>(), true, new DownloadClientItem());
+            var importEvent = new TrackImportedEvent(new LocalBook(), new BookFile(), new List<BookFile>(), true, new DownloadClientItem { DownloadClientInfo = new DownloadClientItemClientInfo() });
 
             Subject.Check(importEvent).ShouldBeOk();
         }
@@ -180,7 +186,7 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
             };
             GivenFileExists(localTrack.Path);
 
-            var importEvent = new TrackImportFailedEvent(new Exception(), localTrack, true, new DownloadClientItem());
+            var importEvent = new TrackImportFailedEvent(new Exception(), localTrack, true, new DownloadClientItem { DownloadClientInfo = new DownloadClientItemClientInfo() });
 
             Subject.Check(importEvent).ShouldBeError(wikiFragment: "permissions-error");
         }

src/NzbDrone.Core.Test/HistoryTests/HistoryServiceFixture.cs

@@ -7,6 +7,7 @@ using NUnit.Framework;
 using NzbDrone.Core.Books;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.History;
+using NzbDrone.Core.Indexers;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.MediaFiles.Events;
 using NzbDrone.Core.Parser.Model;
@@ -56,7 +57,12 @@ namespace NzbDrone.Core.Test.HistoryTests
 
             var downloadClientItem = new DownloadClientItem
             {
-                DownloadClient = "sab",
+                DownloadClientInfo = new DownloadClientItemClientInfo
+                {
+                    Protocol = DownloadProtocol.Usenet,
+                    Id = 1,
+                    Name = "sab"
+                },
                 DownloadId = "abcd"
             };
 

src/NzbDrone.Core.Test/MediaFiles/ImportApprovedTracksFixture.cs

@@ -28,6 +28,7 @@ namespace NzbDrone.Core.Test.MediaFiles
         private List<ImportDecision<LocalBook>> _approvedDecisions;
 
         private DownloadClientItem _downloadClientItem;
+        private DownloadClientItemClientInfo _clientInfo;
 
         [SetUp]
         public void Setup()
@@ -74,7 +75,8 @@ namespace NzbDrone.Core.Test.MediaFiles
                   .Setup(s => s.UpgradeBookFile(It.IsAny<BookFile>(), It.IsAny<LocalBook>(), It.IsAny<bool>()))
                   .Returns(new BookFileMoveResult());
 
-            _downloadClientItem = Builder<DownloadClientItem>.CreateNew().Build();
+            _clientInfo = Builder<DownloadClientItemClientInfo>.CreateNew().Build();
+            _downloadClientItem = Builder<DownloadClientItem>.CreateNew().With(x => x.DownloadClientInfo = _clientInfo).Build();
 
             Mocker.GetMock<IMediaFileService>()
                 .Setup(s => s.GetFilesByBook(It.IsAny<int>()))
@@ -186,7 +188,7 @@ namespace NzbDrone.Core.Test.MediaFiles
         [Test]
         public void should_copy_when_cannot_move_files_downloads()
         {
-            Subject.Import(new List<ImportDecision<LocalBook>> { _approvedDecisions.First() }, true, new DownloadClientItem { Title = "Alien.Ant.Farm-Truant", CanMoveFiles = false });
+            Subject.Import(new List<ImportDecision<LocalBook>> { _approvedDecisions.First() }, true, new DownloadClientItem { Title = "Alien.Ant.Farm-Truant", CanMoveFiles = false, DownloadClientInfo = _clientInfo });
 
             Mocker.GetMock<IUpgradeMediaFiles>()
                   .Verify(v => v.UpgradeBookFile(It.IsAny<BookFile>(), _approvedDecisions.First().Item, true), Times.Once());
@@ -195,7 +197,7 @@ namespace NzbDrone.Core.Test.MediaFiles
         [Test]
         public void should_use_override_importmode()
         {
-            Subject.Import(new List<ImportDecision<LocalBook>> { _approvedDecisions.First() }, true, new DownloadClientItem { Title = "Alien.Ant.Farm-Truant", CanMoveFiles = false }, ImportMode.Move);
+            Subject.Import(new List<ImportDecision<LocalBook>> { _approvedDecisions.First() }, true, new DownloadClientItem { Title = "Alien.Ant.Farm-Truant", CanMoveFiles = false, DownloadClientInfo = _clientInfo }, ImportMode.Move);
 
             Mocker.GetMock<IUpgradeMediaFiles>()
                   .Verify(v => v.UpgradeBookFile(It.IsAny<BookFile>(), _approvedDecisions.First().Item, false), Times.Once());

src/NzbDrone.Core.Test/QueueTests/QueueServiceFixture.cs

@@ -6,6 +6,7 @@ using FluentAssertions;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Core.Books;
+using NzbDrone.Core.Download;
 using NzbDrone.Core.Download.TrackedDownloads;
 using NzbDrone.Core.History;
 using NzbDrone.Core.Parser.Model;
@@ -22,8 +23,11 @@ namespace NzbDrone.Core.Test.QueueTests
         [SetUp]
         public void SetUp()
         {
+            var downloadClientInfo = Builder<DownloadClientItemClientInfo>.CreateNew().Build();
+
             var downloadItem = Builder<NzbDrone.Core.Download.DownloadClientItem>.CreateNew()
                 .With(v => v.RemainingTime = TimeSpan.FromSeconds(10))
+                .With(v => v.DownloadClientInfo = downloadClientInfo)
                 .Build();
 
             var artist = Builder<Author>.CreateNew()