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

Fixup Gazelle Parsing, Rework Auth to allow Indexer Override

Browse Source
This commit is contained in:
Qstick
2021-02-14 22:58:00 -05:00
parent 69a55ea858
commit da60543c72
5 changed files with 148 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,6 +22,7 @@ namespace NzbDrone.Core.Indexers
protected const int MaxNumResultsPerQuery = 1000;
protected readonly IHttpClient _httpClient;
public IDictionary<string, string> Cookies { get; set; }
public override bool SupportsRss => true;
public override bool SupportsSearch => true;
@@ -111,6 +112,23 @@ namespace NzbDrone.Core.Indexers
return generator;
}
protected IDictionary<string, string> GetCookies()
{
var cookies = _indexerStatusService.GetIndexerCookies(Definition.Id);
var expiration = _indexerStatusService.GetIndexerCookiesExpirationDate(Definition.Id);
if (expiration < DateTime.Now)
{
cookies = null;
}
return cookies;
}
protected void UpdateCookies(IDictionary<string, string> cookies, DateTime? expiration)
{
_indexerStatusService.UpdateCookies(Definition.Id, cookies, expiration);
}
protected virtual IndexerPageableQueryResult FetchReleases(Func<IIndexerRequestGenerator, IndexerPageableRequestChain> pageableRequestChainSelector, bool isRecent = false)
{
var releases = new List<ReleaseInfo>();
@@ -333,6 +351,15 @@ namespace NzbDrone.Core.Indexers
}
}
protected virtual bool CheckIfLoginNeeded(HttpResponse httpResponse)
{
return false;
}
protected virtual void DoLogin()
{
}
protected virtual IndexerResponse FetchIndexerResponse(IndexerRequest request)
{
_logger.Debug("Downloading Feed " + request.HttpRequest.ToString(false));
@@ -342,7 +369,17 @@ namespace NzbDrone.Core.Indexers
request.HttpRequest.RateLimit = RateLimit;
}
request.HttpRequest.AllowAutoRedirect = true;
request.HttpRequest.AllowAutoRedirect = false;
Cookies = GetCookies();
if (Cookies != null)
{
foreach (var cookie in Cookies)
{
request.HttpRequest.Cookies.Add(cookie.Key, cookie.Value);
}
}
var stopWatch = Stopwatch.StartNew();
@@ -350,6 +387,23 @@ namespace NzbDrone.Core.Indexers
stopWatch.Stop();
// Check reponse to see if auth is needed, if needed try again
if (CheckIfLoginNeeded(response))
{
DoLogin();
request.HttpRequest.Cookies.Clear();
if (Cookies != null)
{
foreach (var cookie in Cookies)
{
request.HttpRequest.Cookies.Add(cookie.Key, cookie.Value);
}
}
response = _httpClient.Execute(request.HttpRequest);
}
return new IndexerResponse(request, response, stopWatch.ElapsedMilliseconds);
}