diff --git a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/Cardigann.cs b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/Cardigann.cs index 45553786f..46443503f 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/Cardigann.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/Cardigann.cs @@ -4,10 +4,8 @@ using System.Linq; using System.Threading.Tasks; using FluentValidation.Results; using NLog; -using NzbDrone.Common; using NzbDrone.Common.Cache; using NzbDrone.Common.Http; -using NzbDrone.Common.Serializer; using NzbDrone.Core.Configuration; using NzbDrone.Core.IndexerSearch.Definitions; using NzbDrone.Core.IndexerVersions; @@ -24,7 +22,7 @@ namespace NzbDrone.Core.Indexers.Definitions.Cardigann private readonly ICached _generatorCache; public override string Name => "Cardigann"; - public override string[] IndexerUrls => new string[] { "" }; + public override string[] IndexerUrls => new[] { "" }; public override string Description => ""; public override IndexerPrivacy Privacy => IndexerPrivacy.Private; @@ -49,8 +47,7 @@ namespace NzbDrone.Core.Indexers.Definitions.Cardigann public override IIndexerRequestGenerator GetRequestGenerator() { - var cacheKey = $"{Settings.DefinitionFile}.{HashUtil.ComputeSha256Hash(Settings.ToJson())}"; - var generator = _generatorCache.Get(cacheKey, () => + var generator = _generatorCache.Get(Settings.DefinitionFile, () => new CardigannRequestGenerator(_configService, _definitionService.GetCachedDefinition(Settings.DefinitionFile), _logger, @@ -61,10 +58,11 @@ namespace NzbDrone.Core.Indexers.Definitions.Cardigann Settings = Settings }); - generator = (CardigannRequestGenerator)SetCookieFunctions(generator); - + generator.Definition = Definition; generator.Settings = Settings; + generator = (CardigannRequestGenerator)SetCookieFunctions(generator); + _generatorCache.ClearExpired(); return generator; diff --git a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs index 72cccca19..45019d590 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs @@ -1178,14 +1178,14 @@ namespace NzbDrone.Core.Indexers.Definitions.Cardigann if (method == HttpMethod.Get && searchUrls.Contains(searchUrl)) { - _logger.Trace("Skip duplicated request {0}", searchUrl); + _logger.Trace("Skip duplicated request for {0}: {1}", Definition.Name, searchUrl); continue; } searchUrls.Add(searchUrl); - _logger.Debug($"Adding request: {searchUrl}"); + _logger.Debug("Adding request for {0}: {1}", Definition.Name, searchUrl); var requestBuilder = new HttpRequestBuilder(searchUrl) {