Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New: Show download client name in GUI notifications 

Closes: #642
This commit is contained in:
Mark McDowall 2015-07-16 23:19:59 -07:00
parent c4fe645c31
commit 03cf9a44cf
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/NzbDrone.Core.Test/Download/DownloadServiceFixture.cs
View File

@ -9,6 +9,7 @@ using NzbDrone.Core.Test.Framework;
using NzbDrone.Core.Tv; using NzbDrone.Core.Tv;
using NzbDrone.Test.Common; using NzbDrone.Test.Common;
using System.Collections.Generic; using System.Collections.Generic;
using NzbDrone.Core.Indexers;
namespace NzbDrone.Core.Test.Download namespace NzbDrone.Core.Test.Download
{ {
@ -27,8 +28,8 @@ namespace NzbDrone.Core.Test.Download
.Returns(_downloadClients); .Returns(_downloadClients);
Mocker.GetMock<IProvideDownloadClient>() Mocker.GetMock<IProvideDownloadClient>()
.Setup(v => v.GetDownloadClient(It.IsAny<Indexers.DownloadProtocol>())) .Setup(v => v.GetDownloadClient(It.IsAny<DownloadProtocol>()))
.Returns<Indexers.DownloadProtocol>(v => _downloadClients.FirstOrDefault(d => d.Protocol == v)); .Returns<DownloadProtocol>(v => _downloadClients.FirstOrDefault(d => d.Protocol == v));
var episodes = Builder<Episode>.CreateListOfSize(2) var episodes = Builder<Episode>.CreateListOfSize(2)
.TheFirst(1).With(s => s.Id = 12) .TheFirst(1).With(s => s.Id = 12)
@ -37,7 +38,7 @@ namespace NzbDrone.Core.Test.Download
.Build().ToList(); .Build().ToList();
var releaseInfo = Builder<ReleaseInfo>.CreateNew() var releaseInfo = Builder<ReleaseInfo>.CreateNew()
.With(v => v.DownloadProtocol = Indexers.DownloadProtocol.Usenet) .With(v => v.DownloadProtocol = DownloadProtocol.Usenet)
.With(v => v.DownloadUrl = "http://test.site/download1.ext") .With(v => v.DownloadUrl = "http://test.site/download1.ext")
.Build(); .Build();
@ -50,20 +51,24 @@ namespace NzbDrone.Core.Test.Download
private Mock<IDownloadClient> WithUsenetClient() private Mock<IDownloadClient> WithUsenetClient()
{ {
var mock = new Mock<IDownloadClient>(Moq.MockBehavior.Default); var mock = new Mock<IDownloadClient>(MockBehavior.Default);
mock.SetupGet(s => s.Definition).Returns(Builder<IndexerDefinition>.CreateNew().Build());
_downloadClients.Add(mock.Object); _downloadClients.Add(mock.Object);
mock.SetupGet(v => v.Protocol).Returns(Indexers.DownloadProtocol.Usenet); mock.SetupGet(v => v.Protocol).Returns(DownloadProtocol.Usenet);
return mock; return mock;
} }
private Mock<IDownloadClient> WithTorrentClient() private Mock<IDownloadClient> WithTorrentClient()
{ {
var mock = new Mock<IDownloadClient>(Moq.MockBehavior.Default); var mock = new Mock<IDownloadClient>(MockBehavior.Default);
mock.SetupGet(s => s.Definition).Returns(Builder<IndexerDefinition>.CreateNew().Build());
_downloadClients.Add(mock.Object); _downloadClients.Add(mock.Object);
mock.SetupGet(v => v.Protocol).Returns(Indexers.DownloadProtocol.Torrent); mock.SetupGet(v => v.Protocol).Returns(DownloadProtocol.Torrent);
return mock; return mock;
} }
@ -131,7 +136,7 @@ namespace NzbDrone.Core.Test.Download
var mockTorrent = WithTorrentClient(); var mockTorrent = WithTorrentClient();
var mockUsenet = WithUsenetClient(); var mockUsenet = WithUsenetClient();
_parseResult.Release.DownloadProtocol = Indexers.DownloadProtocol.Torrent; _parseResult.Release.DownloadProtocol = DownloadProtocol.Torrent;
Subject.DownloadReport(_parseResult); Subject.DownloadReport(_parseResult);

2
src/NzbDrone.Core/Download/DownloadService.cs
View File

@ -63,7 +63,7 @@ namespace NzbDrone.Core.Download
episodeGrabbedEvent.DownloadId = downloadClientId; episodeGrabbedEvent.DownloadId = downloadClientId;
} }
_logger.ProgressInfo("Report sent to download client. {0}", downloadTitle); _logger.ProgressInfo("Report sent to {0}. {1}", downloadClient.Definition.Name, downloadTitle);
_eventAggregator.PublishEvent(episodeGrabbedEvent); _eventAggregator.PublishEvent(episodeGrabbedEvent);
} }
} }