diff --git a/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoParser.cs b/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoParser.cs index bdbd399e62..2a1784cb00 100644 --- a/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoParser.cs +++ b/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoParser.cs @@ -77,17 +77,17 @@ public CouchPotatoParser(CouchPotatoSettings settings) return movies; } - protected virtual bool PreProcess(NetImportResponse indexerResponse) + protected virtual bool PreProcess(NetImportResponse netImportResponse) { - if (indexerResponse.HttpResponse.StatusCode != HttpStatusCode.OK) + if (netImportResponse.HttpResponse.StatusCode != HttpStatusCode.OK) { - throw new NetImportException(indexerResponse, "Indexer API call resulted in an unexpected StatusCode [{0}]", indexerResponse.HttpResponse.StatusCode); + throw new NetImportException(netImportResponse, "List API call resulted in an unexpected StatusCode [{0}]", netImportResponse.HttpResponse.StatusCode); } - if (indexerResponse.HttpResponse.Headers.ContentType != null && indexerResponse.HttpResponse.Headers.ContentType.Contains("text/json") && - indexerResponse.HttpRequest.Headers.Accept != null && !indexerResponse.HttpRequest.Headers.Accept.Contains("text/json")) + if (netImportResponse.HttpResponse.Headers.ContentType != null && netImportResponse.HttpResponse.Headers.ContentType.Contains("text/json") && + netImportResponse.HttpRequest.Headers.Accept != null && !netImportResponse.HttpRequest.Headers.Accept.Contains("text/json")) { - throw new NetImportException(indexerResponse, "Indexer responded with html content. Site is likely blocked or unavailable."); + throw new NetImportException(netImportResponse, "List responded with html content. Site is likely blocked or unavailable."); } return true; diff --git a/src/NzbDrone.Core/NetImport/NetImportBase.cs b/src/NzbDrone.Core/NetImport/NetImportBase.cs index 17bb41356f..70f9736505 100644 --- a/src/NzbDrone.Core/NetImport/NetImportBase.cs +++ b/src/NzbDrone.Core/NetImport/NetImportBase.cs @@ -49,11 +49,9 @@ public virtual IEnumerable DefaultDefinitions yield return new NetImportDefinition { - Name = Name, + Name = GetType().Name, Enabled = config.Validate().IsValid && Enabled, EnableAuto = true, - ProfileId = 1, - MinimumAvailability = MovieStatusType.Announced, Implementation = GetType().Name, Settings = config }; diff --git a/src/NzbDrone.Core/NetImport/NetImportFactory.cs b/src/NzbDrone.Core/NetImport/NetImportFactory.cs index 963d4e3231..4975dcbae7 100644 --- a/src/NzbDrone.Core/NetImport/NetImportFactory.cs +++ b/src/NzbDrone.Core/NetImport/NetImportFactory.cs @@ -32,8 +32,7 @@ public NetImportFactory(INetImportRepository providerRepository, protected override List Active() { - // return base.Active().Where(c => c.Enabled).ToList(); // use this for when/if we add a setting to enable/disable lists - return base.Active().ToList(); + return base.Active().Where(c => c.Enabled).ToList(); } public override void SetProviderCharacteristics(INetImport provider, NetImportDefinition definition) diff --git a/src/NzbDrone.Core/NetImport/NetImportSearchService.cs b/src/NzbDrone.Core/NetImport/NetImportSearchService.cs index 2bcbb2be3c..4c22caa992 100644 --- a/src/NzbDrone.Core/NetImport/NetImportSearchService.cs +++ b/src/NzbDrone.Core/NetImport/NetImportSearchService.cs @@ -3,13 +3,10 @@ using NLog; using NzbDrone.Common.Extensions; using NzbDrone.Core.Configuration; -using NzbDrone.Core.Download; -using NzbDrone.Core.IndexerSearch; using NzbDrone.Core.Messaging.Commands; using NzbDrone.Core.MetadataSource; using NzbDrone.Core.Movies; using NzbDrone.Core.NetImport.ImportExclusions; -using NzbDrone.Core.RootFolders; namespace NzbDrone.Core.NetImport { @@ -25,18 +22,12 @@ public class NetImportSearchService : IFetchNetImport, IExecute(indexerResponse.HttpResponse.Content); + var error = JsonConvert.DeserializeObject(netImportResponse.HttpResponse.Content); if (error != null && error.Errors != null && error.Errors.Count != 0) { @@ -58,9 +58,9 @@ protected virtual bool PreProcess(NetImportResponse indexerResponse) //No error! } - if (indexerResponse.HttpResponse.StatusCode != System.Net.HttpStatusCode.OK) + if (netImportResponse.HttpResponse.StatusCode != System.Net.HttpStatusCode.OK) { - throw new HttpException(indexerResponse.HttpRequest, indexerResponse.HttpResponse); + throw new HttpException(netImportResponse.HttpRequest, netImportResponse.HttpResponse); } return true; diff --git a/src/NzbDrone.Core/NetImport/StevenLu/StevenLuImport.cs b/src/NzbDrone.Core/NetImport/StevenLu/StevenLuImport.cs index a3071cd914..a774b55187 100644 --- a/src/NzbDrone.Core/NetImport/StevenLu/StevenLuImport.cs +++ b/src/NzbDrone.Core/NetImport/StevenLu/StevenLuImport.cs @@ -25,7 +25,7 @@ public override INetImportRequestGenerator GetRequestGenerator() public override IParseNetImportResponse GetParser() { - return new StevenLuParser(Settings); + return new StevenLuParser(); } } } diff --git a/src/NzbDrone.Core/NetImport/StevenLu/StevenLuParser.cs b/src/NzbDrone.Core/NetImport/StevenLu/StevenLuParser.cs index 47d6e9862a..859aa52de3 100644 --- a/src/NzbDrone.Core/NetImport/StevenLu/StevenLuParser.cs +++ b/src/NzbDrone.Core/NetImport/StevenLu/StevenLuParser.cs @@ -8,12 +8,10 @@ namespace NzbDrone.Core.NetImport.StevenLu { public class StevenLuParser : IParseNetImportResponse { - private readonly StevenLuSettings _settings; private NetImportResponse _importResponse; - public StevenLuParser(StevenLuSettings settings) + public StevenLuParser() { - _settings = settings; } public IList ParseResponse(NetImportResponse importResponse) @@ -47,17 +45,17 @@ public StevenLuParser(StevenLuSettings settings) return movies; } - protected virtual bool PreProcess(NetImportResponse indexerResponse) + protected virtual bool PreProcess(NetImportResponse netImportResponse) { - if (indexerResponse.HttpResponse.StatusCode != HttpStatusCode.OK) + if (netImportResponse.HttpResponse.StatusCode != HttpStatusCode.OK) { - throw new NetImportException(indexerResponse, "Indexer API call resulted in an unexpected StatusCode [{0}]", indexerResponse.HttpResponse.StatusCode); + throw new NetImportException(netImportResponse, "StevenLu API call resulted in an unexpected StatusCode [{0}]", netImportResponse.HttpResponse.StatusCode); } - if (indexerResponse.HttpResponse.Headers.ContentType != null && indexerResponse.HttpResponse.Headers.ContentType.Contains("text/json") && - indexerResponse.HttpRequest.Headers.Accept != null && !indexerResponse.HttpRequest.Headers.Accept.Contains("text/json")) + if (netImportResponse.HttpResponse.Headers.ContentType != null && netImportResponse.HttpResponse.Headers.ContentType.Contains("text/json") && + netImportResponse.HttpRequest.Headers.Accept != null && !netImportResponse.HttpRequest.Headers.Accept.Contains("text/json")) { - throw new NetImportException(indexerResponse, "Indexer responded with html content. Site is likely blocked or unavailable."); + throw new NetImportException(netImportResponse, "StevenLu responded with html content. Site is likely blocked or unavailable."); } return true; diff --git a/src/NzbDrone.Core/NetImport/Trakt/TraktParser.cs b/src/NzbDrone.Core/NetImport/Trakt/TraktParser.cs index 72bde7be5a..3b19a2cc14 100644 --- a/src/NzbDrone.Core/NetImport/Trakt/TraktParser.cs +++ b/src/NzbDrone.Core/NetImport/Trakt/TraktParser.cs @@ -67,17 +67,17 @@ public TraktParser(TraktSettings settings) return movies; } - protected virtual bool PreProcess(NetImportResponse indexerResponse) + protected virtual bool PreProcess(NetImportResponse netImportResponse) { - if (indexerResponse.HttpResponse.StatusCode != HttpStatusCode.OK) + if (netImportResponse.HttpResponse.StatusCode != HttpStatusCode.OK) { - throw new NetImportException(indexerResponse, "Indexer API call resulted in an unexpected StatusCode [{0}]", indexerResponse.HttpResponse.StatusCode); + throw new NetImportException(netImportResponse, "Trakt API call resulted in an unexpected StatusCode [{0}]", netImportResponse.HttpResponse.StatusCode); } - if (indexerResponse.HttpResponse.Headers.ContentType != null && indexerResponse.HttpResponse.Headers.ContentType.Contains("text/json") && - indexerResponse.HttpRequest.Headers.Accept != null && !indexerResponse.HttpRequest.Headers.Accept.Contains("text/json")) + if (netImportResponse.HttpResponse.Headers.ContentType != null && netImportResponse.HttpResponse.Headers.ContentType.Contains("text/json") && + netImportResponse.HttpRequest.Headers.Accept != null && !netImportResponse.HttpRequest.Headers.Accept.Contains("text/json")) { - throw new NetImportException(indexerResponse, "Indexer responded with html content. Site is likely blocked or unavailable."); + throw new NetImportException(netImportResponse, "Trakt API responded with html content. Site is likely blocked or unavailable."); } return true;