Backup_Repos/Prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr synced 2025-12-15 21:14:32 +01:00
Code Issues Projects Releases Wiki Activity

Fixed: (Torznab) Categories not parsed correctly

Browse source 
Fixes #181
This commit is contained in:
Qstick 2021-06-12 01:53:22 -04:00
parent d1a3e61979
commit bcee5f1754
3 changed files with 85 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/NzbDrone.Core/Indexers/Definitions/Torznab/Torznab.cs
View file

@ -19,12 +19,15 @@ public class Torznab : TorrentIndexerBase<TorznabSettings>
private readonly INewznabCapabilitiesProvider _capabilitiesProvider;
public override string Name => "Torznab";
public override string BaseUrl => "";
public override string BaseUrl => GetBaseUrlFromSettings();
public override bool FollowRedirect => true;
public override bool SupportsRedirect => true;
public override DownloadProtocol Protocol => DownloadProtocol.Torrent;
public override IndexerPrivacy Privacy => IndexerPrivacy.Private;
public override int PageSize => _capabilitiesProvider.GetCapabilities(Settings).LimitsDefault.Value;
public override IndexerCapabilities Capabilities { get => GetCapabilitiesFromSettings(); protected set => base.Capabilities = value; }
public override IIndexerRequestGenerator GetRequestGenerator()
{
@ -37,7 +40,42 @@ public override IIndexerRequestGenerator GetRequestGenerator()
public override IParseIndexerResponse GetParser()
{
return new TorznabRssParser();
return new TorznabRssParser(Settings);
}
public string GetBaseUrlFromSettings()
{
var baseUrl = "";
if (Definition == null || Settings == null || Settings.Categories == null)
{
return baseUrl;
}
return Settings.BaseUrl;
}
public IndexerCapabilities GetCapabilitiesFromSettings()
{
var caps = new IndexerCapabilities();
if (Definition == null || Settings == null || Settings.Categories == null)
{
return caps;
}
foreach (var category in Settings.Categories)
{
caps.Categories.AddCategoryMapping(category.Name, category);
}
return caps;
}
public override IndexerCapabilities GetCapabilities()
{
// Newznab uses different Caps per site, so we need to cache them to db on first indexer add to prevent issues with loading UI and pulling caps every time.
return _capabilitiesProvider.GetCapabilities(Settings);
}
public override IEnumerable<ProviderDefinition> DefaultDefinitions
@ -68,7 +106,7 @@ private IndexerDefinition GetDefinition(string name, TorznabSettings settings)
SupportsRss = SupportsRss,
SupportsSearch = SupportsSearch,
SupportsRedirect = SupportsRedirect,
Capabilities = new IndexerCapabilities()
Capabilities = Capabilities
};
}

42
src/NzbDrone.Core/Indexers/Definitions/Torznab/TorznabRssParser.cs
View file

@ -12,9 +12,11 @@ public class TorznabRssParser : TorrentRssParser
{
public const string ns = "{http://torznab.com/schemas/2015/feed}";
public TorznabRssParser()
private readonly TorznabSettings _settings;
public TorznabRssParser(TorznabSettings settings)
{
UseEnclosureUrl = true;
_settings = settings;
}
protected override bool PreProcess(IndexerResponse indexerResponse)
@ -141,6 +143,27 @@ protected override string GetMagnetUrl(XElement item)
return TryGetTorznabAttribute(item, "magneturl");
}
protected override ICollection<IndexerCategory> GetCategory(XElement item)
{
var cats = TryGetMultipleNewznabAttributes(item, "category");
var results = new List<IndexerCategory>();
foreach (var cat in cats)
{
if (int.TryParse(cat, out var intCategory))
{
var indexerCat = _settings.Categories?.FirstOrDefault(c => c.Id == intCategory) ?? null;
if (indexerCat != null)
{
results.Add(indexerCat);
}
}
}
return results;
}
protected override int? GetSeeders(XElement item)
{
var seeders = TryGetTorznabAttribute(item, "seeders");
@ -224,5 +247,22 @@ protected float TryGetFloatTorznabAttribute(XElement item, string key, float def
return defaultValue;
}
protected List<string> TryGetMultipleNewznabAttributes(XElement item, string key)
{
var attrElements = item.Elements(ns + "attr").Where(e => e.Attribute("name").Value.Equals(key, StringComparison.OrdinalIgnoreCase));
var results = new List<string>();
foreach (var element in attrElements)
{
var attrValue = element.Attribute("value");
if (attrValue != null)
{
results.Add(attrValue.Value);
}
}
return results;
}
}
}

6
src/NzbDrone.Core/Indexers/IndexerFactory.cs
View file

@ -147,7 +147,7 @@ public override IEnumerable<IndexerDefinition> GetDefaultDefinitions()
foreach (var provider in _providers)
{
var definitions = provider.DefaultDefinitions
.Where(v => v.Name != null && (v.Name != typeof(Cardigann.Cardigann).Name || v.Name != typeof(Newznab.Newznab).Name));
.Where(v => v.Name != null && (v.Name != typeof(Cardigann.Cardigann).Name || v.Name != typeof(Newznab.Newznab).Name || v.Name != typeof(Torznab.Torznab).Name));
foreach (IndexerDefinition definition in definitions)
{
@ -256,7 +256,7 @@ public override IndexerDefinition Create(IndexerDefinition definition)
SetProviderCharacteristics(provider, definition);
if (definition.Implementation == typeof(Newznab.Newznab).Name)
if (definition.Implementation == typeof(Newznab.Newznab).Name || definition.Implementation == typeof(Torznab.Torznab).Name)
{
var settings = (NewznabSettings)definition.Settings;
settings.Categories = _newznabCapabilitiesProvider.GetCapabilities(settings)?.Categories.GetTorznabCategoryList() ?? null;
@ -276,7 +276,7 @@ public override void Update(IndexerDefinition definition)
SetProviderCharacteristics(provider, definition);
if (definition.Implementation == typeof(Newznab.Newznab).Name)
if (definition.Implementation == typeof(Newznab.Newznab).Name || definition.Implementation == typeof(Torznab.Torznab).Name)
{
var settings = (NewznabSettings)definition.Settings;
settings.Categories = _newznabCapabilitiesProvider.GetCapabilities(settings)?.Categories.GetTorznabCategoryList() ?? null;