shpaq/Prowlarr-Prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr.git synced 2025-09-17 17:14:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

More AnimeTorrents work

Browse Source
This commit is contained in:
Qstick
2021-02-20 17:09:25 -05:00
parent 0ac420d39a
commit c74208f9de
7 changed files with 42 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/NzbDrone.Core/Indexers/Definitions/AnimeTorrents.cs
View File

@@ -10,6 +10,7 @@ using NLog;
using NzbDrone.Common.Http;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Indexers.Exceptions;
using NzbDrone.Core.IndexerSearch.Definitions;
using NzbDrone.Core.Parser;
using NzbDrone.Core.Parser.Model;
@@ -45,17 +46,19 @@ namespace NzbDrone.Core.Indexers.Definitions
protected override void DoLogin()
{
UpdateCookies(null, null);
var requestBuilder = new HttpRequestBuilder(LoginUrl)
{
LogResponseContent = true
LogResponseContent = true,
AllowAutoRedirect = true
};
var loginPage = _httpClient.Execute(new HttpRequest(LoginUrl));
requestBuilder.Method = HttpMethod.POST;
requestBuilder.PostProcess += r => r.RequestTimeout = TimeSpan.FromSeconds(15);
requestBuilder.SetCookies(loginPage.GetCookies());
var cookies = Cookies;
Cookies = null;
var authLoginRequest = requestBuilder
.AddFormParameter("username", Settings.Username)
.AddFormParameter("password", Settings.Password)
@@ -66,10 +69,16 @@ namespace NzbDrone.Core.Indexers.Definitions
var response = _httpClient.Execute(authLoginRequest);
cookies = response.GetCookies();
UpdateCookies(cookies, DateTime.Now + TimeSpan.FromDays(30));
if (response.Content != null && response.Content.Contains("logout.php"))
{
UpdateCookies(response.GetCookies(), DateTime.Now + TimeSpan.FromDays(30));
_logger.Debug("AnimeTorrents authentication succeeded.");
_logger.Debug("AnimeTorrents authentication succeeded");
}
else
{
throw new IndexerAuthException("AnimeTorrents authentication failed");
}
}
protected override bool CheckIfLoginNeeded(HttpResponse httpResponse)

2
src/NzbDrone.Core/Indexers/Definitions/BroadcastheNet/BroadcastheNetParser.cs
View File

@@ -21,7 +21,7 @@ namespace NzbDrone.Core.Indexers.BroadcastheNet
switch (indexerResponse.HttpResponse.StatusCode)
{
case HttpStatusCode.Unauthorized:
throw new ApiKeyException("API Key invalid or not authorized");
throw new IndexerAuthException("API Key invalid or not authorized");
case HttpStatusCode.NotFound:
throw new IndexerException(indexerResponse, "Indexer API call returned NotFound, the Indexer API may have changed.");
case HttpStatusCode.ServiceUnavailable:

4
src/NzbDrone.Core/Indexers/Definitions/Newznab/NewznabRssParser.cs
View File

@@ -35,12 +35,12 @@ namespace NzbDrone.Core.Indexers.Newznab
if (code >= 100 && code <= 199)
{
throw new ApiKeyException(errorMessage);
throw new IndexerAuthException(errorMessage);
}
if (!indexerResponse.Request.Url.FullUri.Contains("apikey=") && (errorMessage == "Missing parameter" || errorMessage.Contains("apikey")))
{
throw new ApiKeyException("Indexer requires an API key");
throw new IndexerAuthException("Indexer requires an API key");
}
if (errorMessage == "Request limit reached")

4
src/NzbDrone.Core/Indexers/Definitions/Torznab/TorznabRssParser.cs
View File

@@ -32,12 +32,12 @@ namespace NzbDrone.Core.Indexers.Torznab
if (code >= 100 && code <= 199)
{
throw new ApiKeyException("Invalid API key");
throw new IndexerAuthException("Invalid API key");
}
if (!indexerResponse.Request.Url.FullUri.Contains("apikey=") && errorMessage == "Missing parameter")
{
throw new ApiKeyException("Indexer requires an API key");
throw new IndexerAuthException("Indexer requires an API key");
}
if (errorMessage == "Request limit reached")

17
src/NzbDrone.Core/Indexers/Exceptions/ApiKeyException.cs
View File

@@ -1,17 +0,0 @@
using NzbDrone.Common.Exceptions;
namespace NzbDrone.Core.Indexers.Exceptions
{
public class ApiKeyException : NzbDroneException
{
public ApiKeyException(string message, params object[] args)
: base(message, args)
{
}
public ApiKeyException(string message)
: base(message)
{
}
}
}

17
src/NzbDrone.Core/Indexers/Exceptions/IndexerAuthException.cs Normal file
View File

@@ -0,0 +1,17 @@
using NzbDrone.Common.Exceptions;
namespace NzbDrone.Core.Indexers.Exceptions
{
public class IndexerAuthException : NzbDroneException
{
public IndexerAuthException(string message, params object[] args)
: base(message, args)
{
}
public IndexerAuthException(string message)
: base(message)
{
}
}
}

8
src/NzbDrone.Core/Indexers/HttpIndexerBase.cs
View File

@@ -304,10 +304,10 @@ namespace NzbDrone.Core.Indexers
_indexerStatusService.RecordFailure(Definition.Id, TimeSpan.FromHours(1));
_logger.Warn("API Request Limit reached for {0}", this);
}
catch (ApiKeyException)
catch (IndexerAuthException)
{
_indexerStatusService.RecordFailure(Definition.Id);
_logger.Warn("Invalid API Key for {0} {1}", this, url);
_logger.Warn("Invalid Credentials for {0} {1}", this, url);
}
catch (CloudFlareCaptchaException ex)
{
@@ -480,9 +480,9 @@ namespace NzbDrone.Core.Indexers
return new ValidationFailure(string.Empty, "Query successful, but no results were returned from your indexer. This may be an issue with the indexer or your indexer category settings.");
}
}
catch (ApiKeyException ex)
catch (IndexerAuthException ex)
{
_logger.Warn("Indexer returned result for RSS URL, API Key appears to be invalid: " + ex.Message);
_logger.Warn("Indexer returned result for RSS URL, Credentials appears to be invalid: " + ex.Message);
return new ValidationFailure("ApiKey", "Invalid API Key");
}