cleaned up nzb download clients.

NzbDrone.Core.Test/Download/DownloadClientTests/BlackholeProviderFixture.cs

@@ -1,6 +1,5 @@
 using System.IO;
 using System.Net;
-using FluentAssertions;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
@@ -49,31 +48,11 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests
         [Test]
         public void DownloadNzb_should_download_file_if_it_doesnt_exist()
         {
-            Subject.DownloadNzb(_remoteEpisode).Should().BeTrue();
+            Subject.DownloadNzb(_remoteEpisode);
 
             Mocker.GetMock<IHttpProvider>().Verify(c => c.DownloadFile(_nzbUrl, _nzbPath), Times.Once());
         }
 
-        [Test]
-        public void DownloadNzb_not_download_file_if_it_doesn_exist()
-        {
-            WithExistingFile();
-
-            Subject.DownloadNzb(_remoteEpisode).Should().BeTrue();
-
-            Mocker.GetMock<IHttpProvider>().Verify(c => c.DownloadFile(It.IsAny<string>(), It.IsAny<string>()), Times.Never());
-        }
-
-        [Test]
-        public void should_return_false_on_failed_download()
-        {
-            WithFailedDownload();
-
-            Subject.DownloadNzb(_remoteEpisode).Should().BeFalse();
-
-            ExceptionVerification.ExpectedWarns(1);
-        }
-
         [Test]
         public void should_replace_illegal_characters_in_title()
         {
@@ -81,7 +60,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests
             var expectedFilename = Path.Combine(_blackHoleFolder, "Saturday Night Live - S38E08 - Jeremy Renner+Maroon 5 [SDTV].nzb");
             _remoteEpisode.Report.Title = illegalTitle;
 
-            Subject.DownloadNzb(_remoteEpisode).Should().BeTrue();
+            Subject.DownloadNzb(_remoteEpisode);
 
             Mocker.GetMock<IHttpProvider>().Verify(c => c.DownloadFile(It.IsAny<string>(), expectedFilename), Times.Once());
         }

NzbDrone.Core.Test/Download/DownloadClientTests/NzbgetProviderTests/DownloadNzbFixture.cs

@@ -57,10 +57,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetProviderTests
                         It.Is<String>(c => c.Equals("{\"method\":\"appendurl\",\"params\":[\"30 Rock - S01E01 - Pilot [HDTV-720p]\",\"TV\",50,false,\"http://www.nzbdrone.com\"]}"))))
                     .Returns("{\"version\": \"1.1\",\"result\": true}");
 
-            Mocker.Resolve<NzbgetClient>()
+            Mocker.Resolve<NzbgetClient>().DownloadNzb(_remoteEpisode);
-                  .DownloadNzb(_remoteEpisode)
-                  .Should()
-                  .BeTrue();
         }
 
         [Test]

NzbDrone.Core.Test/Download/DownloadClientTests/PneumaticProviderFixture.cs

@@ -1,6 +1,6 @@
+using System;
 using System.IO;
 using System.Net;
-using FluentAssertions;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
@@ -55,38 +55,27 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests
         [Test]
         public void should_download_file_if_it_doesnt_exist()
         {
-            Subject.DownloadNzb(_remoteEpisode).Should().BeTrue();
+            Subject.DownloadNzb(_remoteEpisode);
 
             Mocker.GetMock<IHttpProvider>().Verify(c => c.DownloadFile(_nzbUrl, _nzbPath), Times.Once());
         }
 
-        [Test]
-        public void should_not_download_file_if_it_doesn_exist()
-        {
-            WithExistingFile();
-
-            Subject.DownloadNzb(_remoteEpisode).Should().BeTrue();
-
-            Mocker.GetMock<IHttpProvider>().Verify(c => c.DownloadFile(It.IsAny<string>(), It.IsAny<string>()), Times.Never());
-        }
 
         [Test]
-        public void should_return_false_on_failed_download()
+        public void should_throw_on_failed_download()
         {
             WithFailedDownload();
 
-            Subject.DownloadNzb(_remoteEpisode).Should().BeFalse();
+            Assert.Throws<WebException>(() => Subject.DownloadNzb(_remoteEpisode));
-
-            ExceptionVerification.ExpectedWarns(1);
         }
 
         [Test]
-        public void should_skip_if_full_season_download()
+        public void should_throw_if_full_season_download()
         {
             _remoteEpisode.Report.Title = "30 Rock - Season 1";
             _remoteEpisode.ParsedEpisodeInfo.FullSeason = true;
 
-            Mocker.Resolve<PneumaticClient>().DownloadNzb(_remoteEpisode).Should().BeFalse();
+            Assert.Throws<NotImplementedException>(() => Subject.DownloadNzb(_remoteEpisode));
         }
 
         [Test]
@@ -96,7 +85,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests
             var expectedFilename = Path.Combine(_pneumaticFolder, "Saturday Night Live - S38E08 - Jeremy Renner+Maroon 5 [SDTV].nzb");
             _remoteEpisode.Report.Title = illegalTitle;
 
-            Subject.DownloadNzb(_remoteEpisode).Should().BeTrue();
+            Subject.DownloadNzb(_remoteEpisode);
 
             Mocker.GetMock<IHttpProvider>().Verify(c => c.DownloadFile(It.IsAny<string>(), expectedFilename), Times.Once());
         }

NzbDrone.Core.Test/Download/DownloadClientTests/SabProviderTests/SabProviderFixture.cs

@@ -61,14 +61,14 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabProviderTests
                     .Returns("{ \"status\": true }");
 
 
-            Subject.DownloadNzb(_remoteEpisode).Should().BeTrue();
+            Subject.DownloadNzb(_remoteEpisode);
         }
 
         [Test]
         public void add_by_url_should_detect_and_handle_sab_errors()
         {
             WithFailResponse();
-            Assert.Throws<ApplicationException>(() => Subject.DownloadNzb(_remoteEpisode).Should().BeFalse());
+            Assert.Throws<ApplicationException>(() => Subject.DownloadNzb(_remoteEpisode));
         }
 
         [Test]
@@ -197,13 +197,12 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabProviderTests
         }
 
         [Test]
-        public void should_return_false_when_WebException_is_thrown()
+        public void should_throw_when_WebException_is_thrown()
         {
             Mocker.GetMock<IHttpProvider>()
                     .Setup(s => s.DownloadString(It.IsAny<String>())).Throws(new WebException());
 
-            Subject.DownloadNzb(_remoteEpisode).Should().BeFalse();
+            Assert.Throws<WebException>(() => Subject.DownloadNzb(_remoteEpisode));
-            ExceptionVerification.ExpectedErrors(1);
         }
 
         [Test]
@@ -219,7 +218,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabProviderTests
                     .Returns("{ \"status\": true }");
 
 
-            Subject.DownloadNzb(_remoteEpisode).Should().BeTrue();
+            Subject.DownloadNzb(_remoteEpisode);
 
             Mocker.GetMock<IHttpProvider>()
                     .Verify(v => v.DownloadString("http://192.168.5.55:2222/api?mode=addurl&name=http://www.nzbclub.com/nzb_download.aspx?mid=1950232&priority=1&pp=3&cat=tv&nzbname=My+Series+Name+-+5x2-5x3+-+My+title+%5bBluray720p%5d+%5bProper%5d&output=json&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass"), Times.Once());

NzbDrone.Core.Test/Download/DownloadServiceFixture.cs

@@ -1,4 +1,5 @@
 using System.Linq;
+using System.Net;
 using FizzWare.NBuilder;
 using Moq;
 using NUnit.Framework;
@@ -40,15 +41,14 @@ namespace NzbDrone.Core.Test.Download
         private void WithSuccessfulAdd()
         {
             Mocker.GetMock<IDownloadClient>()
-                .Setup(s => s.DownloadNzb(It.IsAny<RemoteEpisode>()))
+                  .Setup(s => s.DownloadNzb(It.IsAny<RemoteEpisode>()));
-                .Returns(true);
         }
 
         private void WithFailedAdd()
         {
             Mocker.GetMock<IDownloadClient>()
                 .Setup(s => s.DownloadNzb(It.IsAny<RemoteEpisode>()))
-                .Returns(false);
+                .Throws(new WebException());
         }
 
         [Test]
@@ -77,7 +77,8 @@ namespace NzbDrone.Core.Test.Download
         {
             WithFailedAdd();
 
-            Subject.DownloadReport(_parseResult);
+            Assert.Throws<WebException>(() => Subject.DownloadReport(_parseResult));
+
             VerifyEventNotPublished<EpisodeGrabbedEvent>();
         }
 
@@ -90,7 +91,7 @@ namespace NzbDrone.Core.Test.Download
 
             Subject.DownloadReport(_parseResult);
 
-            Mocker.GetMock<IDownloadClient>().Verify(c => c.DownloadNzb(It.IsAny<RemoteEpisode>()),Times.Never());
+            Mocker.GetMock<IDownloadClient>().Verify(c => c.DownloadNzb(It.IsAny<RemoteEpisode>()), Times.Never());
             VerifyEventNotPublished<EpisodeGrabbedEvent>();
 
             ExceptionVerification.ExpectedWarns(1);

NzbDrone.Core/Download/Clients/BlackholeProvider.cs

@@ -32,35 +32,20 @@ namespace NzbDrone.Core.Download.Clients
             throw new NotImplementedException();
         }
 
-        public bool DownloadNzb(RemoteEpisode remoteEpisode)
+        public void DownloadNzb(RemoteEpisode remoteEpisode)
         {
             var url = remoteEpisode.Report.NzbUrl;
             var title = remoteEpisode.Report.Title;
 
-            try
-            {
             title = FileNameBuilder.CleanFilename(title);
 
             var filename = Path.Combine(_configService.BlackholeFolder, title + ".nzb");
 
-                if (_diskProvider.FileExists(filename))
-                {
-                    //Return true so a lesser quality is not returned.
-                    _logger.Info("NZB already exists on disk: {0}", filename);
-                    return true;
-                }
 
             _logger.Trace("Downloading NZB from: {0} to: {1}", url, filename);
             _httpProvider.DownloadFile(url, filename);
 
             _logger.Trace("NZB Download succeeded, saved to: {0}", filename);
-                return true;
-            }
-            catch (Exception ex)
-            {
-                _logger.WarnException("Failed to download NZB: " + url, ex);
-                return false;
-            }
         }
 
         public bool IsConfigured

NzbDrone.Core/Download/Clients/Nzbget/NzbgetClient.cs

@@ -22,13 +22,11 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
             _logger = logger;
         }
 
-        public virtual bool DownloadNzb(RemoteEpisode remoteEpisode)
+        public void DownloadNzb(RemoteEpisode remoteEpisode)
         {
             var url = remoteEpisode.Report.NzbUrl;
             var title = remoteEpisode.Report.Title;
 
-            try
-            {
             string cat = _configService.NzbgetTvCategory;
             int priority = remoteEpisode.IsRecentEpisode() ? (int)_configService.NzbgetRecentTvPriority : (int)_configService.NzbgetOlderTvPriority;
 
@@ -46,15 +44,6 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
             var success = JsonConvert.DeserializeObject<EnqueueResponse>(response).Result;
             _logger.Debug("Queue Response: [{0}]", success);
 
-                return true;
-            }
-
-            catch (WebException ex)
-            {
-                _logger.Error("Error communicating with Nzbget: " + ex.Message);
-            }
-
-            return false;
         }
 
         public bool IsConfigured

NzbDrone.Core/Download/Clients/PneumaticClient.cs

@@ -25,18 +25,14 @@ namespace NzbDrone.Core.Download.Clients
             _diskProvider = diskProvider;
         }
 
-        public virtual bool DownloadNzb(RemoteEpisode remoteEpisode)
+        public void DownloadNzb(RemoteEpisode remoteEpisode)
         {
             var url = remoteEpisode.Report.NzbUrl;
             var title = remoteEpisode.Report.Title;
 
-            try
-            {
-                //Todo: Allow full season releases
             if (remoteEpisode.ParsedEpisodeInfo.FullSeason)
             {
-                    logger.Info("Skipping Full Season Release: {0}", title);
+                throw new NotImplementedException("Full season Pneumatic releases are not supported.");
-                    return false;
             }
 
             title = FileNameBuilder.CleanFilename(title);
@@ -44,12 +40,7 @@ namespace NzbDrone.Core.Download.Clients
             //Save to the Pneumatic directory (The user will need to ensure its accessible by XBMC)
             var filename = Path.Combine(_configService.PneumaticFolder, title + ".nzb");
 
-                if (_diskProvider.FileExists(filename))
+ 
-                {
-                    //Return true so a lesser quality is not returned.
-                    logger.Info("NZB already exists on disk: {0}", filename);
-                    return true;
-                }
 
             logger.Trace("Downloading NZB from: {0} to: {1}", url, filename);
             _httpProvider.DownloadFile(url, filename);
@@ -58,14 +49,6 @@ namespace NzbDrone.Core.Download.Clients
 
             var contents = String.Format("plugin://plugin.program.pneumatic/?mode=strm&type=add_file&nzb={0}&nzbname={1}", filename, title);
             _diskProvider.WriteAllText(Path.Combine(_configService.DownloadedEpisodesFolder, title + ".strm"), contents);
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                logger.WarnException("Failed to download NZB: " + url, ex);
-                return false;
-            }
         }
 
         public bool IsConfigured

NzbDrone.Core/Download/Clients/Sabnzbd/SabnzbdClient.cs

@@ -62,13 +62,11 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
             _logger = logger;
         }
 
-        public virtual bool DownloadNzb(RemoteEpisode remoteEpisode)
+        public void DownloadNzb(RemoteEpisode remoteEpisode)
         {
             var url = remoteEpisode.Report.NzbUrl;
             var title = remoteEpisode.Report.Title;
 
-            try
-            {
             string cat = _configService.SabTvCategory;
             int priority = remoteEpisode.IsRecentEpisode() ? (int)_configService.SabRecentTvPriority : (int)_configService.SabOlderTvPriority;
 
@@ -86,15 +84,6 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
             _logger.Debug("Queue Response: [{0}]", response);
 
             CheckForError(response);
-                return true;
-            }
-
-            catch (WebException ex)
-            {
-                _logger.Error("Error communicating with SAB: " + ex.Message);
-            }
-
-            return false;
         }
 
         public bool IsConfigured

NzbDrone.Core/Download/DownloadService.cs

@@ -6,7 +6,7 @@ namespace NzbDrone.Core.Download
 {
     public interface IDownloadService
     {
-        bool DownloadReport(RemoteEpisode remoteEpisode);
+        void DownloadReport(RemoteEpisode remoteEpisode);
     }
 
     public class DownloadService : IDownloadService
@@ -24,7 +24,7 @@ namespace NzbDrone.Core.Download
             _logger = logger;
         }
 
-        public bool DownloadReport(RemoteEpisode remoteEpisode)
+        public void DownloadReport(RemoteEpisode remoteEpisode)
         {
             var downloadTitle = remoteEpisode.Report.Title;
             var downloadClient = _downloadClientProvider.GetDownloadClient();
@@ -32,18 +32,13 @@ namespace NzbDrone.Core.Download
             if (!downloadClient.IsConfigured)
             {
                 _logger.Warn("Download client {0} isn't configured yet.", downloadClient.GetType().Name);
-                return false;
+                return;
             }
 
-            bool success = downloadClient.DownloadNzb(remoteEpisode);
+            downloadClient.DownloadNzb(remoteEpisode);
 
-            if (success)
-            {
             _logger.Info("Report sent to download client. {0}", downloadTitle);
             _messageAggregator.PublishEvent(new EpisodeGrabbedEvent(remoteEpisode));
         }
-
-            return success;
-        }
     }
 }

NzbDrone.Core/Download/IDownloadClient.cs

@@ -5,7 +5,7 @@ namespace NzbDrone.Core.Download
 {
     public interface IDownloadClient
     {
-        bool DownloadNzb(RemoteEpisode remoteEpisode);
+        void DownloadNzb(RemoteEpisode remoteEpisode);
         bool IsConfigured { get; }
         IEnumerable<QueueItem> GetQueue();
     }