Fixed: Push Downloads to client fails for download overrides

src/NzbDrone.Core/Indexers/Definitions/AnimeBytes.cs

@@ -23,7 +23,7 @@ using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Indexers.Definitions
 {
-    public class AnimeBytes : HttpIndexerBase<AnimeBytesSettings>
+    public class AnimeBytes : TorrentIndexerBase<AnimeBytesSettings>
     {
         public override string Name => "AnimeBytes";
         public override string BaseUrl => "https://animebytes.tv/";

src/NzbDrone.Core/Indexers/Definitions/AnimeTorrents.cs

@@ -21,7 +21,7 @@ using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Indexers.Definitions
 {
-    public class AnimeTorrents : HttpIndexerBase<AnimeTorrentsSettings>
+    public class AnimeTorrents : TorrentIndexerBase<AnimeTorrentsSettings>
     {
         public override string Name => "AnimeTorrents";
 

src/NzbDrone.Core/Indexers/Definitions/Avistaz/AvistazBase.cs

@@ -9,7 +9,7 @@ using NzbDrone.Core.Messaging.Events;
 
 namespace NzbDrone.Core.Indexers.Definitions.Avistaz
 {
-    public abstract class AvistazBase : HttpIndexerBase<AvistazSettings>
+    public abstract class AvistazBase : TorrentIndexerBase<AvistazSettings>
     {
         public override DownloadProtocol Protocol => DownloadProtocol.Torrent;
         public override string BaseUrl => "";

src/NzbDrone.Core/Indexers/Definitions/BakaBT.cs

@@ -21,7 +21,7 @@ using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Indexers.Definitions
 {
-    public class BakaBT : HttpIndexerBase<BakaBTSettings>
+    public class BakaBT : TorrentIndexerBase<BakaBTSettings>
     {
         public override string Name => "BakaBT";
 

src/NzbDrone.Core/Indexers/Definitions/BeyondHD.cs

@@ -21,7 +21,7 @@ using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Indexers.Definitions
 {
-    public class BeyondHD : HttpIndexerBase<BeyondHDSettings>
+    public class BeyondHD : TorrentIndexerBase<BeyondHDSettings>
     {
         public override string Name => "BeyondHD";
 

src/NzbDrone.Core/Indexers/Definitions/BroadcastheNet/BroadcastheNet.cs

@@ -6,7 +6,7 @@ using NzbDrone.Core.Messaging.Events;
 
 namespace NzbDrone.Core.Indexers.BroadcastheNet
 {
-    public class BroadcastheNet : HttpIndexerBase<BroadcastheNetSettings>
+    public class BroadcastheNet : TorrentIndexerBase<BroadcastheNetSettings>
     {
         public override string Name => "BroadcasTheNet";
 

src/NzbDrone.Core/Indexers/Definitions/Cardigann/Cardigann.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Net;
 using System.Text;
 using System.Threading.Tasks;
 using FluentValidation.Results;
@@ -7,6 +8,7 @@ using NLog;
 using NzbDrone.Common.Cache;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Exceptions;
 using NzbDrone.Core.IndexerVersions;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.ThingiProvider;
@@ -14,7 +16,7 @@ using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Indexers.Cardigann
 {
-    public class Cardigann : HttpIndexerBase<CardigannSettings>
+    public class Cardigann : TorrentIndexerBase<CardigannSettings>
     {
         private readonly IIndexerDefinitionUpdateService _definitionService;
         private readonly ICached<CardigannRequestGenerator> _generatorCache;
@@ -147,6 +149,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
 
             if (request.Url.Scheme == "magnet")
             {
+                ValidateMagnet(request.Url.FullUri);
                 return Encoding.UTF8.GetBytes(request.Url.FullUri);
             }
 
@@ -159,10 +162,36 @@ namespace NzbDrone.Core.Indexers.Cardigann
                 var response = await _httpClient.ExecuteAsync(request);
                 downloadBytes = response.ResponseData;
             }
+            catch (HttpException ex)
+            {
+                if (ex.Response.StatusCode == HttpStatusCode.NotFound)
+                {
+                    _logger.Error(ex, "Downloading torrent file for release failed since it no longer exists ({0})", request.Url.FullUri);
+                    throw new ReleaseUnavailableException("Downloading torrent failed", ex);
+                }
+
+                if ((int)ex.Response.StatusCode == 429)
+                {
+                    _logger.Error("API Grab Limit reached for {0}", request.Url.FullUri);
+                }
+                else
+                {
+                    _logger.Error(ex, "Downloading torrent file for release failed ({0})", request.Url.FullUri);
+                }
+
+                throw new ReleaseDownloadException("Downloading torrent failed", ex);
+            }
+            catch (WebException ex)
+            {
+                _logger.Error(ex, "Downloading torrent file for release failed ({0})", request.Url.FullUri);
+
+                throw new ReleaseDownloadException("Downloading torrent failed", ex);
+            }
             catch (Exception)
             {
                 _indexerStatusService.RecordFailure(Definition.Id);
-                _logger.Error("Download failed");
+                _logger.Error("Downloading torrent failed");
+                throw;
             }
 
             return downloadBytes;

src/NzbDrone.Core/Indexers/Definitions/DigitalCore.cs

@@ -21,7 +21,7 @@ using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Indexers.Definitions
 {
-    public class DigitalCore : HttpIndexerBase<DigitalCoreSettings>
+    public class DigitalCore : TorrentIndexerBase<DigitalCoreSettings>
     {
         public override string Name => "DigitalCore";
         public override string BaseUrl => "https://digitalcore.club/";

src/NzbDrone.Core/Indexers/Definitions/FileList/FileList.cs

@@ -6,7 +6,7 @@ using NzbDrone.Core.Messaging.Events;
 
 namespace NzbDrone.Core.Indexers.FileList
 {
-    public class FileList : HttpIndexerBase<FileListSettings>
+    public class FileList : TorrentIndexerBase<FileListSettings>
     {
         public override string Name => "FileList.io";
         public override string BaseUrl => "https://filelist.io";

src/NzbDrone.Core/Indexers/Definitions/Gazelle/Gazelle.cs

@@ -7,7 +7,7 @@ using NzbDrone.Core.Messaging.Events;
 
 namespace NzbDrone.Core.Indexers.Gazelle
 {
-    public abstract class Gazelle : HttpIndexerBase<GazelleSettings>
+    public abstract class Gazelle : TorrentIndexerBase<GazelleSettings>
     {
         public override DownloadProtocol Protocol => DownloadProtocol.Torrent;
         public override string BaseUrl => "";

src/NzbDrone.Core/Indexers/Definitions/HDBits/HDBits.cs

@@ -6,7 +6,7 @@ using NzbDrone.Core.Messaging.Events;
 
 namespace NzbDrone.Core.Indexers.HDBits
 {
-    public class HDBits : HttpIndexerBase<HDBitsSettings>
+    public class HDBits : TorrentIndexerBase<HDBitsSettings>
     {
         public override string Name => "HDBits";
         public override string BaseUrl => "https://hdbits.org";

src/NzbDrone.Core/Indexers/Definitions/HDTorrents.cs

@@ -20,7 +20,7 @@ using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Indexers.Definitions
 {
-    public class HDTorrents : HttpIndexerBase<HDTorrentsSettings>
+    public class HDTorrents : TorrentIndexerBase<HDTorrentsSettings>
     {
         public override string Name => "HD-Torrents";
 

src/NzbDrone.Core/Indexers/Definitions/Headphones/Headphones.cs

@@ -6,11 +6,12 @@ using FluentValidation.Results;
 using NLog;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Download;
 using NzbDrone.Core.Messaging.Events;
 
 namespace NzbDrone.Core.Indexers.Headphones
 {
-    public class Headphones : HttpIndexerBase<HeadphonesSettings>
+    public class Headphones : UsenetIndexerBase<HeadphonesSettings>
     {
         public override string Name => "Headphones VIP";
 
@@ -35,8 +36,8 @@ namespace NzbDrone.Core.Indexers.Headphones
             return new HeadphonesRssParser(Capabilities.Categories);
         }
 
-        public Headphones(IHttpClient httpClient, IEventAggregator eventAggregator, IIndexerStatusService indexerStatusService, IConfigService configService, Logger logger)
-            : base(httpClient, eventAggregator, indexerStatusService, configService, logger)
+        public Headphones(IHttpClient httpClient, IEventAggregator eventAggregator, IIndexerStatusService indexerStatusService, IConfigService configService, IValidateNzbs nzbValidationService, Logger logger)
+            : base(httpClient, eventAggregator, indexerStatusService, configService, nzbValidationService, logger)
         {
         }
 

src/NzbDrone.Core/Indexers/Definitions/IPTorrents.cs

@@ -18,7 +18,7 @@ using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Indexers.Definitions
 {
-    public class IPTorrents : HttpIndexerBase<IPTorrentsSettings>
+    public class IPTorrents : TorrentIndexerBase<IPTorrentsSettings>
     {
         public override string Name => "IPTorrents";
 

src/NzbDrone.Core/Indexers/Definitions/ImmortalSeed.cs

@@ -21,7 +21,7 @@ using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Indexers.Definitions
 {
-    public class ImmortalSeed : HttpIndexerBase<ImmortalSeedSettings>
+    public class ImmortalSeed : TorrentIndexerBase<ImmortalSeedSettings>
     {
         public override string Name => "ImmortalSeed";
 

src/NzbDrone.Core/Indexers/Definitions/Milkie.cs

@@ -16,7 +16,7 @@ using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Indexers.Definitions
 {
-    public class Milkie : HttpIndexerBase<MilkieSettings>
+    public class Milkie : TorrentIndexerBase<MilkieSettings>
     {
         public override string Name => "Milkie";
 

src/NzbDrone.Core/Indexers/Definitions/MyAnonamouse.cs

@@ -18,7 +18,7 @@ using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Indexers.Definitions
 {
-    public class MyAnonamouse : HttpIndexerBase<MyAnonamouseSettings>
+    public class MyAnonamouse : TorrentIndexerBase<MyAnonamouseSettings>
     {
         public override string Name => "MyAnonamouse";
 

src/NzbDrone.Core/Indexers/Definitions/Newznab/Newznab.cs

@@ -7,13 +7,14 @@ using NLog;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Download;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.ThingiProvider;
 using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Indexers.Newznab
 {
-    public class Newznab : HttpIndexerBase<NewznabSettings>
+    public class Newznab : UsenetIndexerBase<NewznabSettings>
     {
         private readonly INewznabCapabilitiesProvider _capabilitiesProvider;
 
@@ -108,8 +109,8 @@ namespace NzbDrone.Core.Indexers.Newznab
             }
         }
 
-        public Newznab(INewznabCapabilitiesProvider capabilitiesProvider, IHttpClient httpClient, IEventAggregator eventAggregator, IIndexerStatusService indexerStatusService, IConfigService configService, Logger logger)
-            : base(httpClient, eventAggregator, indexerStatusService, configService, logger)
+        public Newznab(INewznabCapabilitiesProvider capabilitiesProvider, IHttpClient httpClient, IEventAggregator eventAggregator, IIndexerStatusService indexerStatusService, IConfigService configService, IValidateNzbs nzbValidationService, Logger logger)
+            : base(httpClient, eventAggregator, indexerStatusService, configService, nzbValidationService, logger)
         {
             _capabilitiesProvider = capabilitiesProvider;
         }

src/NzbDrone.Core/Indexers/Definitions/PassThePopcorn/PassThePopcorn.cs

@@ -7,7 +7,7 @@ using NzbDrone.Core.Messaging.Events;
 
 namespace NzbDrone.Core.Indexers.PassThePopcorn
 {
-    public class PassThePopcorn : HttpIndexerBase<PassThePopcornSettings>
+    public class PassThePopcorn : TorrentIndexerBase<PassThePopcornSettings>
     {
         public override string Name => "PassThePopcorn";
         public override string BaseUrl => "https://passthepopcorn.me";

src/NzbDrone.Core/Indexers/Definitions/PreToMe.cs

@@ -21,7 +21,7 @@ using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Indexers.Definitions
 {
-    public class PreToMe : HttpIndexerBase<PreToMeSettings>
+    public class PreToMe : TorrentIndexerBase<PreToMeSettings>
     {
         public override string Name => "PreToMe";
         public override string BaseUrl => "https://pretome.info/";

src/NzbDrone.Core/Indexers/Definitions/Rarbg/Rarbg.cs

@@ -11,7 +11,7 @@ using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Indexers.Rarbg
 {
-    public class Rarbg : HttpIndexerBase<RarbgSettings>
+    public class Rarbg : TorrentIndexerBase<RarbgSettings>
     {
         private readonly IRarbgTokenProvider _tokenProvider;
 

src/NzbDrone.Core/Indexers/Definitions/RevolutionTT.cs

@@ -21,7 +21,7 @@ using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Indexers.Definitions
 {
-    public class RevolutionTT : HttpIndexerBase<RevolutionTTSettings>
+    public class RevolutionTT : TorrentIndexerBase<RevolutionTTSettings>
     {
         public override string Name => "RevolutionTT";
 

src/NzbDrone.Core/Indexers/Definitions/SubsPlease.cs

@@ -18,7 +18,7 @@ using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Indexers.Definitions
 {
-    public class SubsPlease : HttpIndexerBase<SubsPleaseSettings>
+    public class SubsPlease : TorrentIndexerBase<SubsPleaseSettings>
     {
         public override string Name => "SubsPlease";
         public override string BaseUrl => "https://subsplease.org/";

src/NzbDrone.Core/Indexers/Definitions/SuperBits.cs

@@ -19,7 +19,7 @@ using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Indexers.Definitions
 {
-    public class SuperBits : HttpIndexerBase<SuperBitsSettings>
+    public class SuperBits : TorrentIndexerBase<SuperBitsSettings>
     {
         public override string Name => "SuperBits";
 

src/NzbDrone.Core/Indexers/Definitions/ThePirateBay.cs

@@ -18,7 +18,7 @@ using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Indexers.Definitions
 {
-    public class ThePirateBay : HttpIndexerBase<ThePirateBaySettings>
+    public class ThePirateBay : TorrentIndexerBase<ThePirateBaySettings>
     {
         public override string Name => "ThePirateBay";
         public override string BaseUrl => "https://thepiratebay.org/";

src/NzbDrone.Core/Indexers/Definitions/TorrentDay.cs

@@ -17,7 +17,7 @@ using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Indexers.Definitions
 {
-    public class TorrentDay : HttpIndexerBase<TorrentDaySettings>
+    public class TorrentDay : TorrentIndexerBase<TorrentDaySettings>
     {
         public override string Name => "TorrentDay";
 

src/NzbDrone.Core/Indexers/Definitions/TorrentLeech.cs

@@ -21,7 +21,7 @@ using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Indexers.Definitions
 {
-    public class TorrentLeech : HttpIndexerBase<TorrentLeechSettings>
+    public class TorrentLeech : TorrentIndexerBase<TorrentLeechSettings>
     {
         public override string Name => "TorrentLeech";
 

src/NzbDrone.Core/Indexers/Definitions/TorrentPotato/TorrentPotato.cs

@@ -6,7 +6,7 @@ using NzbDrone.Core.Messaging.Events;
 
 namespace NzbDrone.Core.Indexers.TorrentPotato
 {
-    public class TorrentPotato : HttpIndexerBase<TorrentPotatoSettings>
+    public class TorrentPotato : TorrentIndexerBase<TorrentPotatoSettings>
     {
         public override string Name => "TorrentPotato";
         public override string BaseUrl => "http://127.0.0.1";

src/NzbDrone.Core/Indexers/Definitions/TorrentSeeds.cs

@@ -20,7 +20,7 @@ using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Indexers.Definitions
 {
-    public class TorrentSeeds : HttpIndexerBase<TorrentSeedsSettings>
+    public class TorrentSeeds : TorrentIndexerBase<TorrentSeedsSettings>
     {
         public override string Name => "TorrentSeeds";
 

src/NzbDrone.Core/Indexers/Definitions/Torznab/Torznab.cs

@@ -14,7 +14,7 @@ using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Indexers.Torznab
 {
-    public class Torznab : HttpIndexerBase<TorznabSettings>
+    public class Torznab : TorrentIndexerBase<TorznabSettings>
     {
         private readonly INewznabCapabilitiesProvider _capabilitiesProvider;
 

src/NzbDrone.Core/Indexers/Definitions/UNIT3D/Unit3dBase.cs

@@ -5,7 +5,7 @@ using NzbDrone.Core.Messaging.Events;
 
 namespace NzbDrone.Core.Indexers.Definitions.UNIT3D
 {
-    public abstract class Unit3dBase : HttpIndexerBase<Unit3dSettings>
+    public abstract class Unit3dBase : TorrentIndexerBase<Unit3dSettings>
     {
         public override DownloadProtocol Protocol => DownloadProtocol.Torrent;
         public override string BaseUrl => "";