tedkulp/Prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr.git synced 2026-04-26 23:06:43 -04: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
src/NzbDrone.Core/Indexers/Definitions/AnimeTorrents.cs
+16 -7
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)
src/NzbDrone.Core/Indexers/Definitions/BroadcastheNet/BroadcastheNetParser.cs
+1 -1
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:
src/NzbDrone.Core/Indexers/Definitions/Newznab/NewznabRssParser.cs
+2 -2
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")
src/NzbDrone.Core/Indexers/Definitions/Torznab/TorznabRssParser.cs
+2 -2
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")