mirror of
https://github.com/Prowlarr/Prowlarr.git
synced 2026-04-19 22:04:56 -04:00
TMDb Lists should be working now :) (#775)
* Remove un-used imports * Some small update to Net Import
This commit is contained in:
@@ -7,12 +7,8 @@ using NLog;
|
||||
using NzbDrone.Common.Extensions;
|
||||
using NzbDrone.Common.Http;
|
||||
using NzbDrone.Core.Configuration;
|
||||
using NzbDrone.Core.Http.CloudFlare;
|
||||
using NzbDrone.Core.Indexers.Exceptions;
|
||||
using NzbDrone.Core.IndexerSearch.Definitions;
|
||||
using NzbDrone.Core.NetImport.Exceptions;
|
||||
using NzbDrone.Core.Parser;
|
||||
using NzbDrone.Core.Parser.Model;
|
||||
using NzbDrone.Core.ThingiProvider;
|
||||
using NzbDrone.Core.Tv;
|
||||
|
||||
@@ -21,16 +17,12 @@ namespace NzbDrone.Core.NetImport
|
||||
public abstract class HttpNetImportBase<TSettings> : NetImportBase<TSettings>
|
||||
where TSettings : IProviderConfig, new()
|
||||
{
|
||||
protected const int MaxNumResultsPerQuery = 1000;
|
||||
|
||||
protected readonly IHttpClient _httpClient;
|
||||
|
||||
public override bool Enabled => true;
|
||||
|
||||
public bool SupportsPaging => PageSize > 20;
|
||||
|
||||
public virtual int PageSize => 20;
|
||||
|
||||
public virtual TimeSpan RateLimit => TimeSpan.FromSeconds(2);
|
||||
|
||||
public abstract INetImportRequestGenerator GetRequestGenerator();
|
||||
@@ -45,7 +37,6 @@ namespace NzbDrone.Core.NetImport
|
||||
public override IList<Movie> Fetch()
|
||||
{
|
||||
var generator = GetRequestGenerator();
|
||||
|
||||
return FetchMovies(generator.GetMovies());
|
||||
}
|
||||
|
||||
@@ -61,17 +52,13 @@ namespace NzbDrone.Core.NetImport
|
||||
for (int i = 0; i < pageableRequestChain.Tiers; i++)
|
||||
{
|
||||
var pageableRequests = pageableRequestChain.GetTier(i);
|
||||
|
||||
foreach (var pageableRequest in pageableRequests)
|
||||
{
|
||||
var pagedReleases = new List<Movie>();
|
||||
|
||||
foreach (var request in pageableRequest)
|
||||
{
|
||||
url = request.Url.FullUri;
|
||||
|
||||
var page = FetchPage(request, parser);
|
||||
|
||||
pagedReleases.AddRange(page);
|
||||
}
|
||||
|
||||
@@ -107,30 +94,6 @@ namespace NzbDrone.Core.NetImport
|
||||
_logger.Warn("{0} {1}", this, httpException.Message);
|
||||
}
|
||||
}
|
||||
catch (RequestLimitReachedException)
|
||||
{
|
||||
_logger.Warn("API Request Limit reached for {0}", this);
|
||||
}
|
||||
catch (ApiKeyException)
|
||||
{
|
||||
_logger.Warn("Invalid API Key for {0} {1}", this, url);
|
||||
}
|
||||
catch (CloudFlareCaptchaException ex)
|
||||
{
|
||||
if (ex.IsExpired)
|
||||
{
|
||||
_logger.Error(ex, "Expired CAPTCHA token for {0}, please refresh in indexer settings.", this);
|
||||
}
|
||||
else
|
||||
{
|
||||
_logger.Error(ex, "CAPTCHA token required for {0}, check indexer settings.", this);
|
||||
}
|
||||
}
|
||||
catch (IndexerException ex)
|
||||
{
|
||||
var message = string.Format("{0} - {1}", ex.Message, url);
|
||||
_logger.Warn(ex, message);
|
||||
}
|
||||
catch (Exception feedEx)
|
||||
{
|
||||
feedEx.Data.Add("FeedUrl", url);
|
||||
@@ -142,7 +105,7 @@ namespace NzbDrone.Core.NetImport
|
||||
|
||||
protected virtual IList<Movie> FetchPage(NetImportRequest request, IParseNetImportResponse parser)
|
||||
{
|
||||
var response = FetchIndexerResponse(request);
|
||||
var response = FetchNetImportResponse(request);
|
||||
|
||||
return parser.ParseResponse(response).ToList().Select(m =>
|
||||
{
|
||||
@@ -153,7 +116,7 @@ namespace NzbDrone.Core.NetImport
|
||||
}).ToList();
|
||||
}
|
||||
|
||||
protected virtual NetImportResponse FetchIndexerResponse(NetImportRequest request)
|
||||
protected virtual NetImportResponse FetchNetImportResponse(NetImportRequest request)
|
||||
{
|
||||
_logger.Debug("Downloading List " + request.HttpRequest.ToString(false));
|
||||
|
||||
@@ -185,33 +148,6 @@ namespace NzbDrone.Core.NetImport
|
||||
return new ValidationFailure(string.Empty, "No results were returned from your list, please check your settings.");
|
||||
}
|
||||
}
|
||||
catch (ApiKeyException)
|
||||
{
|
||||
_logger.Warn("List returned result for RSS URL, API Key appears to be invalid");
|
||||
|
||||
return new ValidationFailure("ApiKey", "Invalid API Key");
|
||||
}
|
||||
catch (RequestLimitReachedException)
|
||||
{
|
||||
_logger.Warn("Request limit reached");
|
||||
}
|
||||
catch (CloudFlareCaptchaException ex)
|
||||
{
|
||||
if (ex.IsExpired)
|
||||
{
|
||||
return new ValidationFailure("CaptchaToken", "CloudFlare CAPTCHA token expired, please Refresh.");
|
||||
}
|
||||
else
|
||||
{
|
||||
return new ValidationFailure("CaptchaToken", "Site protected by CloudFlare CAPTCHA. Valid CAPTCHA token required.");
|
||||
}
|
||||
}
|
||||
catch (UnsupportedFeedException ex)
|
||||
{
|
||||
_logger.Warn(ex, "List feed is not supported");
|
||||
|
||||
return new ValidationFailure(string.Empty, "List feed is not supported: " + ex.Message);
|
||||
}
|
||||
catch (NetImportException ex)
|
||||
{
|
||||
_logger.Warn(ex, "Unable to connect to list");
|
||||
|
||||
Reference in New Issue
Block a user