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

Fixed: (Cardigann) Replace legacy links with default link when making requests

Browse Source
This commit is contained in:
Qstick
2022-02-03 22:29:46 -06:00
parent bc1e397ce3
commit 74663ea077
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannBase.cs
View File

@@ -816,5 +816,24 @@ namespace NzbDrone.Core.Indexers.Cardigann
{
return new Uri(currentUrl ?? new Uri(SiteLink), path);
}
protected string ResolveSiteLink()
{
var settingsBaseUrl = Settings?.BaseUrl;
var defaultLink = _definition.Links.First();
if (settingsBaseUrl == null)
{
return defaultLink;
}
if (_definition.Legacylinks.Contains(settingsBaseUrl))
{
_logger.Trace("Changing legacy site link from {0} to {1}", settingsBaseUrl, defaultLink);
return defaultLink;
}
return settingsBaseUrl;
}
}
}

2
src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannParser.cs
View File

@@ -21,7 +21,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
{
public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
protected override string SiteLink => Settings?.BaseUrl ?? _definition.Links.First();
protected override string SiteLink => ResolveSiteLink();
public CardigannParser(IConfigService configService,
CardigannDefinition definition,

2
src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs
View File

@@ -27,7 +27,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
public IDictionary<string, string> Cookies { get; set; }
protected HttpResponse landingResult;
protected IHtmlDocument landingResultDocument;
protected override string SiteLink => Settings?.BaseUrl ?? _definition.Links.First();
protected override string SiteLink => ResolveSiteLink();
public CardigannRequestGenerator(IConfigService configService,
CardigannDefinition definition,