open-source-mirrors
/
Prowlarr
mirror of https://github.com/Prowlarr/Prowlarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cardigann Categories

Browse Source
pull/6/head
Qstick 4 years ago
parent 5b22093c29
commit 529102ebcf
10 changed files with 575 additions and 51 deletions
Show Stats Download Patch File Download Diff File

22
src/NzbDrone.Core/Indexers/CategoryMapping.cs
Unescape View File

@ -0,0 +1,22 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace NzbDrone.Core.Indexers
{
public class CategoryMapping
{
public CategoryMapping(string trackerCat, string trackerCatDesc, int newzCat)
{
TrackerCategory = trackerCat;
TrackerCategoryDesc = trackerCatDesc;
NewzNabCategory = newzCat;
}
public string TrackerCategory { get; private set; }
public string TrackerCategoryDesc { get; private set; }
public int NewzNabCategory { get; private set; }
}
}

9
src/NzbDrone.Core/Indexers/Definitions/Cardigann/IndexerDefinitionUpdateCommand.cs
Unescape View File

@ -1,9 +0,0 @@
using NzbDrone.Core.Messaging.Commands;
namespace NzbDrone.Core.Indexers.Definitions.Cardigann
{
public class IndexerDefinitionUpdateCommand : Command
{
public override bool SendUpdatesToClient => true;
}
}

12
src/NzbDrone.Core/Indexers/Definitions/Newznab/Newznab.cs
Unescape View File

@ -110,17 +110,9 @@ namespace NzbDrone.Core.Indexers.Newznab
failures.AddIfNotNull(TestCapabilities()); failures.AddIfNotNull(TestCapabilities());
} }
protected static List<int> CategoryIds(List<IndexerCategory> categories) protected static List<int> CategoryIds(IndexerCapabilitiesCategories categories)
{ {
var l = categories.Select(c => c.Id).ToList(); var l = categories.GetTorznabCategoryTree().Select(c => c.Id).ToList();
foreach (var category in categories)
{
if (category.SubCategories != null)
{
l.AddRange(CategoryIds(category.SubCategories));
}
}
return l; return l;
} }

2
src/NzbDrone.Core/Indexers/Definitions/Newznab/NewznabCapabilitiesProvider.cs
Unescape View File

@ -214,7 +214,7 @@ namespace NzbDrone.Core.Indexers.Newznab
}); });
} }
capabilities.Categories.Add(cat); capabilities.Categories.AddCategoryMapping(cat.Name, cat);
} }
} }

12
src/NzbDrone.Core/Indexers/Definitions/Torznab/Torznab.cs
Unescape View File

@ -97,17 +97,9 @@ namespace NzbDrone.Core.Indexers.Torznab
failures.AddIfNotNull(TestCapabilities()); failures.AddIfNotNull(TestCapabilities());
} }
protected static List<int> CategoryIds(List<IndexerCategory> categories) protected static List<int> CategoryIds(IndexerCapabilitiesCategories categories)
{ {
var l = categories.Select(c => c.Id).ToList(); var l = categories.GetTorznabCategoryTree().Select(c => c.Id).ToList();
foreach (var category in categories)
{
if (category.SubCategories != null)
{
l.AddRange(CategoryIds(category.SubCategories));
}
}
return l; return l;
} }

40
src/NzbDrone.Core/Indexers/IndexerCapabilities.cs
Unescape View File

@ -41,7 +41,9 @@ namespace NzbDrone.Core.Indexers
public enum BookSearchParam public enum BookSearchParam
{ {
Q Q,
Title,
Author
} }
public class IndexerCapabilities public class IndexerCapabilities
@ -75,8 +77,10 @@ namespace NzbDrone.Core.Indexers
public List<BookSearchParam> BookSearchParams; public List<BookSearchParam> BookSearchParams;
public bool BookSearchAvailable => BookSearchParams.Count > 0; public bool BookSearchAvailable => BookSearchParams.Count > 0;
public bool BookSearchTitleAvailable => BookSearchParams.Contains(BookSearchParam.Title);
public bool BookSearchAuthorAvailable => BookSearchParams.Contains(BookSearchParam.Author);
public List<IndexerCategory> Categories { get; private set; } public readonly IndexerCapabilitiesCategories Categories;
public IndexerCapabilities() public IndexerCapabilities()
{ {
@ -85,7 +89,7 @@ namespace NzbDrone.Core.Indexers
MovieSearchParams = new List<MovieSearchParam>(); MovieSearchParams = new List<MovieSearchParam>();
MusicSearchParams = new List<MusicSearchParam>(); MusicSearchParams = new List<MusicSearchParam>();
BookSearchParams = new List<BookSearchParam>(); BookSearchParams = new List<BookSearchParam>();
Categories = new List<IndexerCategory>(); Categories = new IndexerCapabilitiesCategories();
} }
public void ParseCardigannSearchModes(Dictionary<string, List<string>> modes) public void ParseCardigannSearchModes(Dictionary<string, List<string>> modes)
@ -315,26 +319,20 @@ namespace NzbDrone.Core.Indexers
return string.Join(",", parameters); return string.Join(",", parameters);
} }
private string SupportedBookSearchParams private string SupportedBookSearchParams()
{ {
get var parameters = new List<string> { "q" }; // q is always enabled
if (BookSearchTitleAvailable)
{ {
var parameters = new List<string>() { "q" }; parameters.Add("title");
if (BookSearchAvailable) }
{
parameters.Add("author,title");
}
return string.Join(",", parameters); if (BookSearchAuthorAvailable)
{
parameters.Add("author");
} }
}
public bool SupportsCategories(int[] categories) return string.Join(",", parameters);
{
var subCategories = Categories.SelectMany(c => c.SubCategories);
var allCategories = Categories.Concat(subCategories);
var supportsCategory = allCategories.Any(i => categories.Any(c => c == i.Id));
return supportsCategory;
} }
public XDocument GetXDocument() public XDocument GetXDocument()
@ -367,9 +365,9 @@ namespace NzbDrone.Core.Indexers
new XAttribute("supportedParams", SupportedMusicSearchParams())), new XAttribute("supportedParams", SupportedMusicSearchParams())),
new XElement("book-search", new XElement("book-search",
new XAttribute("available", BookSearchAvailable ? "yes" : "no"), new XAttribute("available", BookSearchAvailable ? "yes" : "no"),
new XAttribute("supportedParams", SupportedBookSearchParams))), new XAttribute("supportedParams", SupportedBookSearchParams()))),
new XElement("categories", new XElement("categories",
from c in Categories.OrderBy(x => x.Id < 100000 ? "z" + x.Id.ToString() : x.Name) from c in Categories.GetTorznabCategoryTree(true)
select new XElement("category", select new XElement("category",
new XAttribute("id", c.Id), new XAttribute("id", c.Id),
new XAttribute("name", c.Name), new XAttribute("name", c.Name),
@ -390,7 +388,7 @@ namespace NzbDrone.Core.Indexers
left.MovieSearchParams = left.MovieSearchParams.Union(right.MovieSearchParams).ToList(); left.MovieSearchParams = left.MovieSearchParams.Union(right.MovieSearchParams).ToList();
left.MusicSearchParams = left.MusicSearchParams.Union(right.MusicSearchParams).ToList(); left.MusicSearchParams = left.MusicSearchParams.Union(right.MusicSearchParams).ToList();
left.BookSearchParams = left.BookSearchParams.Union(right.BookSearchParams).ToList(); left.BookSearchParams = left.BookSearchParams.Union(right.BookSearchParams).ToList();
left.Categories.AddRange(right.Categories.Where(x => x.Id < 100000).Except(left.Categories)); // exclude indexer specific categories (>= 100000) left.Categories.Concat(right.Categories);
return left; return left;
} }
} }

211
src/NzbDrone.Core/Indexers/IndexerCapabilitiesCategories.cs
Unescape View File

@ -0,0 +1,211 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Cryptography;
using System.Text;
namespace NzbDrone.Core.Indexers
{
public class IndexerCapabilitiesCategories
{
private readonly List<CategoryMapping> _categoryMapping = new List<CategoryMapping>();
private readonly List<IndexerCategory> _torznabCategoryTree = new List<IndexerCategory>();
public List<string> GetTrackerCategories() => _categoryMapping
.Where(m => m.NewzNabCategory < 100000)
.Select(m => m.TrackerCategory).Distinct().ToList();
public List<IndexerCategory> GetTorznabCategoryTree(bool sorted = false)
{
if (!sorted)
{
return _torznabCategoryTree;
}
// we build a new tree, original is unsorted
// first torznab categories ordered by id and then custom cats ordered by name
var sortedTree = _torznabCategoryTree
.Select(c =>
{
var sortedSubCats = c.SubCategories.OrderBy(x => x.Id);
var newCat = new IndexerCategory(c.Id, c.Name);
newCat.SubCategories.AddRange(sortedSubCats);
return newCat;
}).OrderBy(x => x.Id >= 100000 ? "zzz" + x.Name : x.Id.ToString()).ToList();
return sortedTree;
}
public List<IndexerCategory> GetTorznabCategoryList(bool sorted = false)
{
var tree = GetTorznabCategoryTree(sorted);
// create a flat list (without subcategories)
var newFlatList = new List<IndexerCategory>();
foreach (var cat in tree)
{
newFlatList.Add(cat.CopyWithoutSubCategories());
newFlatList.AddRange(cat.SubCategories);
}
return newFlatList;
}
public void AddCategoryMapping(string trackerCategory, IndexerCategory torznabCategory, string trackerCategoryDesc = null)
{
_categoryMapping.Add(new CategoryMapping(trackerCategory, trackerCategoryDesc, torznabCategory.Id));
AddTorznabCategoryTree(torznabCategory);
if (trackerCategoryDesc == null)
{
return;
}
// create custom cats (1:1 categories) if trackerCategoryDesc is defined
// - if trackerCategory is "integer" we use that number to generate custom category id
// - if trackerCategory is "string" we compute a hash to generate fixed integer id for the custom category
// the hash is not perfect but it should work in most cases. we can't use sequential numbers because
// categories are updated frequently and the id must be fixed to work in 3rd party apps
if (!int.TryParse(trackerCategory, out var trackerCategoryInt))
{
var hashed = SHA1.Create().ComputeHash(Encoding.UTF8.GetBytes(trackerCategory));
trackerCategoryInt = BitConverter.ToUInt16(hashed, 0); // id between 0 and 65535 < 100000
}
var customCat = new IndexerCategory(trackerCategoryInt + 100000, trackerCategoryDesc);
_categoryMapping.Add(new CategoryMapping(trackerCategory, trackerCategoryDesc, customCat.Id));
AddTorznabCategoryTree(customCat);
}
//public List<string> MapTorznabCapsToTrackers(TorznabQuery query, bool mapChildrenCatsToParent = false)
//{
// var expandedQueryCats = ExpandTorznabQueryCategories(query, mapChildrenCatsToParent);
// var result = _categoryMapping
// .Where(c => expandedQueryCats.Contains(c.NewzNabCategory))
// .Select(mapping => mapping.TrackerCategory).Distinct().ToList();
// return result;
//}
public ICollection<int> MapTrackerCatToNewznab(string trackerCategory)
{
if (string.IsNullOrWhiteSpace(trackerCategory))
{
return new List<int>();
}
var cats = _categoryMapping
.Where(m =>
!string.IsNullOrWhiteSpace(m.TrackerCategory) &&
string.Equals(m.TrackerCategory, trackerCategory, StringComparison.InvariantCultureIgnoreCase))
.Select(c => c.NewzNabCategory).ToList();
return cats;
}
public ICollection<int> MapTrackerCatDescToNewznab(string trackerCategoryDesc)
{
if (string.IsNullOrWhiteSpace(trackerCategoryDesc))
{
return new List<int>();
}
var cats = _categoryMapping
.Where(m =>
!string.IsNullOrWhiteSpace(m.TrackerCategoryDesc) &&
string.Equals(m.TrackerCategoryDesc, trackerCategoryDesc, StringComparison.InvariantCultureIgnoreCase))
.Select(c => c.NewzNabCategory).ToList();
return cats;
}
public int[] SupportedCategories(int[] categories)
{
if (categories == null || categories.Length == 0)
{
return Array.Empty<int>();
}
var subCategories = _torznabCategoryTree.SelectMany(c => c.SubCategories);
var allCategories = _torznabCategoryTree.Concat(subCategories);
return allCategories.Where(c => categories.Contains(c.Id)).Select(c => c.Id).ToArray();
}
public void Concat(IndexerCapabilitiesCategories rhs)
{
// exclude indexer specific categories (>= 100000)
// we don't concat _categoryMapping because it makes no sense for the aggregate indexer
rhs.GetTorznabCategoryList().Where(x => x.Id < 100000).ToList().ForEach(AddTorznabCategoryTree);
}
//public List<int> ExpandTorznabQueryCategories(TorznabQuery query, bool mapChildrenCatsToParent = false)
//{
// var expandedQueryCats = new List<int>();
// foreach (var queryCategory in query.Categories)
// {
// expandedQueryCats.Add(queryCategory);
// if (queryCategory >= 100000)
// {
// continue;
// }
// var parentCat = _torznabCategoryTree.FirstOrDefault(c => c.Id == queryCategory);
// if (parentCat != null)
// {
// // if it's parent cat we add all the children
// expandedQueryCats.AddRange(parentCat.SubCategories.Select(c => c.Id));
// }
// else if (mapChildrenCatsToParent)
// {
// // if it's child cat and mapChildrenCatsToParent is enabled we add the parent
// var queryCategoryTorznab = new IndexerCategory(queryCategory, "");
// parentCat = _torznabCategoryTree.FirstOrDefault(c => c.Contains(queryCategoryTorznab));
// if (parentCat != null)
// {
// expandedQueryCats.Add(parentCat.Id);
// }
// }
// }
// return expandedQueryCats.Distinct().ToList();
//}
private void AddTorznabCategoryTree(IndexerCategory torznabCategory)
{
// build the category tree
if (TorznabCatType.ParentCats.Contains(torznabCategory))
{
// parent cat
if (!_torznabCategoryTree.Contains(torznabCategory))
{
_torznabCategoryTree.Add(torznabCategory.CopyWithoutSubCategories());
}
}
else
{
// child or custom cat
var parentCat = TorznabCatType.ParentCats.FirstOrDefault(c => c.Contains(torznabCategory));
if (parentCat != null)
{
// child cat
var nodeCat = _torznabCategoryTree.FirstOrDefault(c => c.Equals(parentCat));
if (nodeCat != null)
{
// parent cat already exists
if (!nodeCat.Contains(torznabCategory))
{
nodeCat.SubCategories.Add(torznabCategory);
}
}
else
{
// create parent cat and add child
nodeCat = parentCat.CopyWithoutSubCategories();
nodeCat.SubCategories.Add(torznabCategory);
_torznabCategoryTree.Add(nodeCat);
}
}
else
{
// custom cat
_torznabCategoryTree.Add(torznabCategory);
}
}
}
}
}

273
src/NzbDrone.Core/Indexers/IndexerCatType.cs
Unescape View File

@ -0,0 +1,273 @@
using System.Collections.Generic;
using System.Linq;
namespace NzbDrone.Core.Indexers
{
public static class TorznabCatType
{
public static readonly IndexerCategory Console = new IndexerCategory(1000, "Console");
public static readonly IndexerCategory ConsoleNDS = new IndexerCategory(1010, "Console/NDS");
public static readonly IndexerCategory ConsolePSP = new IndexerCategory(1020, "Console/PSP");
public static readonly IndexerCategory ConsoleWii = new IndexerCategory(1030, "Console/Wii");
public static readonly IndexerCategory ConsoleXBox = new IndexerCategory(1040, "Console/XBox");
public static readonly IndexerCategory ConsoleXBox360 = new IndexerCategory(1050, "Console/XBox 360");
public static readonly IndexerCategory ConsoleWiiware = new IndexerCategory(1060, "Console/Wiiware");
public static readonly IndexerCategory ConsoleXBox360DLC = new IndexerCategory(1070, "Console/XBox 360 DLC");
public static readonly IndexerCategory ConsolePS3 = new IndexerCategory(1080, "Console/PS3");
public static readonly IndexerCategory ConsoleOther = new IndexerCategory(1090, "Console/Other");
public static readonly IndexerCategory Console3DS = new IndexerCategory(1110, "Console/3DS");
public static readonly IndexerCategory ConsolePSVita = new IndexerCategory(1120, "Console/PS Vita");
public static readonly IndexerCategory ConsoleWiiU = new IndexerCategory(1130, "Console/WiiU");
public static readonly IndexerCategory ConsoleXBoxOne = new IndexerCategory(1140, "Console/XBox One");
public static readonly IndexerCategory ConsolePS4 = new IndexerCategory(1180, "Console/PS4");
public static readonly IndexerCategory Movies = new IndexerCategory(2000, "Movies");
public static readonly IndexerCategory MoviesForeign = new IndexerCategory(2010, "Movies/Foreign");
public static readonly IndexerCategory MoviesOther = new IndexerCategory(2020, "Movies/Other");
public static readonly IndexerCategory MoviesSD = new IndexerCategory(2030, "Movies/SD");
public static readonly IndexerCategory MoviesHD = new IndexerCategory(2040, "Movies/HD");
public static readonly IndexerCategory MoviesUHD = new IndexerCategory(2045, "Movies/UHD");
public static readonly IndexerCategory MoviesBluRay = new IndexerCategory(2050, "Movies/BluRay");
public static readonly IndexerCategory Movies3D = new IndexerCategory(2060, "Movies/3D");
public static readonly IndexerCategory MoviesDVD = new IndexerCategory(2070, "Movies/DVD");
public static readonly IndexerCategory MoviesWEBDL = new IndexerCategory(2080, "Movies/WEB-DL");
public static readonly IndexerCategory Audio = new IndexerCategory(3000, "Audio");
public static readonly IndexerCategory AudioMP3 = new IndexerCategory(3010, "Audio/MP3");
public static readonly IndexerCategory AudioVideo = new IndexerCategory(3020, "Audio/Video");
public static readonly IndexerCategory AudioAudiobook = new IndexerCategory(3030, "Audio/Audiobook");
public static readonly IndexerCategory AudioLossless = new IndexerCategory(3040, "Audio/Lossless");
public static readonly IndexerCategory AudioOther = new IndexerCategory(3050, "Audio/Other");
public static readonly IndexerCategory AudioForeign = new IndexerCategory(3060, "Audio/Foreign");
public static readonly IndexerCategory PC = new IndexerCategory(4000, "PC");
public static readonly IndexerCategory PC0day = new IndexerCategory(4010, "PC/0day");
public static readonly IndexerCategory PCISO = new IndexerCategory(4020, "PC/ISO");
public static readonly IndexerCategory PCMac = new IndexerCategory(4030, "PC/Mac");
public static readonly IndexerCategory PCMobileOther = new IndexerCategory(4040, "PC/Mobile-Other");
public static readonly IndexerCategory PCGames = new IndexerCategory(4050, "PC/Games");
public static readonly IndexerCategory PCMobileiOS = new IndexerCategory(4060, "PC/Mobile-iOS");
public static readonly IndexerCategory PCMobileAndroid = new IndexerCategory(4070, "PC/Mobile-Android");
public static readonly IndexerCategory TV = new IndexerCategory(5000, "TV");
public static readonly IndexerCategory TVWEBDL = new IndexerCategory(5010, "TV/WEB-DL");
public static readonly IndexerCategory TVForeign = new IndexerCategory(5020, "TV/Foreign");
public static readonly IndexerCategory TVSD = new IndexerCategory(5030, "TV/SD");
public static readonly IndexerCategory TVHD = new IndexerCategory(5040, "TV/HD");
public static readonly IndexerCategory TVUHD = new IndexerCategory(5045, "TV/UHD");
public static readonly IndexerCategory TVOther = new IndexerCategory(5050, "TV/Other");
public static readonly IndexerCategory TVSport = new IndexerCategory(5060, "TV/Sport");
public static readonly IndexerCategory TVAnime = new IndexerCategory(5070, "TV/Anime");
public static readonly IndexerCategory TVDocumentary = new IndexerCategory(5080, "TV/Documentary");
public static readonly IndexerCategory XXX = new IndexerCategory(6000, "XXX");
public static readonly IndexerCategory XXXDVD = new IndexerCategory(6010, "XXX/DVD");
public static readonly IndexerCategory XXXWMV = new IndexerCategory(6020, "XXX/WMV");
public static readonly IndexerCategory XXXXviD = new IndexerCategory(6030, "XXX/XviD");
public static readonly IndexerCategory XXXx264 = new IndexerCategory(6040, "XXX/x264");
public static readonly IndexerCategory XXXUHD = new IndexerCategory(6045, "XXX/UHD");
public static readonly IndexerCategory XXXPack = new IndexerCategory(6050, "XXX/Pack");
public static readonly IndexerCategory XXXImageSet = new IndexerCategory(6060, "XXX/ImageSet");
public static readonly IndexerCategory XXXOther = new IndexerCategory(6070, "XXX/Other");
public static readonly IndexerCategory XXXSD = new IndexerCategory(6080, "XXX/SD");
public static readonly IndexerCategory XXXWEBDL = new IndexerCategory(6090, "XXX/WEB-DL");
public static readonly IndexerCategory Books = new IndexerCategory(7000, "Books");
public static readonly IndexerCategory BooksMags = new IndexerCategory(7010, "Books/Mags");
public static readonly IndexerCategory BooksEBook = new IndexerCategory(7020, "Books/EBook");
public static readonly IndexerCategory BooksComics = new IndexerCategory(7030, "Books/Comics");
public static readonly IndexerCategory BooksTechnical = new IndexerCategory(7040, "Books/Technical");
public static readonly IndexerCategory BooksOther = new IndexerCategory(7050, "Books/Other");
public static readonly IndexerCategory BooksForeign = new IndexerCategory(7060, "Books/Foreign");
public static readonly IndexerCategory Other = new IndexerCategory(8000, "Other");
public static readonly IndexerCategory OtherMisc = new IndexerCategory(8010, "Other/Misc");
public static readonly IndexerCategory OtherHashed = new IndexerCategory(8020, "Other/Hashed");
public static readonly IndexerCategory[] ParentCats =
{
Console,
Movies,
Audio,
PC,
TV,
XXX,
Books,
Other
};
public static readonly IndexerCategory[] AllCats =
{
Console,
ConsoleNDS,
ConsolePSP,
ConsoleWii,
ConsoleXBox,
ConsoleXBox360,
ConsoleWiiware,
ConsoleXBox360DLC,
ConsolePS3,
ConsoleOther,
Console3DS,
ConsolePSVita,
ConsoleWiiU,
ConsoleXBoxOne,
ConsolePS4,
Movies,
MoviesForeign,
MoviesOther,
MoviesSD,
MoviesHD,
MoviesUHD,
MoviesBluRay,
Movies3D,
MoviesDVD,
MoviesWEBDL,
Audio,
AudioMP3,
AudioVideo,
AudioAudiobook,
AudioLossless,
AudioOther,
AudioForeign,
PC,
PC0day,
PCISO,
PCMac,
PCMobileOther,
PCGames,
PCMobileiOS,
PCMobileAndroid,
TV,
TVWEBDL,
TVForeign,
TVSD,
TVHD,
TVUHD,
TVOther,
TVSport,
TVAnime,
TVDocumentary,
XXX,
XXXDVD,
XXXWMV,
XXXXviD,
XXXx264,
XXXUHD,
XXXPack,
XXXImageSet,
XXXOther,
XXXSD,
XXXWEBDL,
Books,
BooksMags,
BooksEBook,
BooksComics,
BooksTechnical,
BooksOther,
BooksForeign,
Other,
OtherMisc,
OtherHashed
};
static TorznabCatType()
{
Console.SubCategories.AddRange(
new List<IndexerCategory>
{
ConsoleNDS,
ConsolePSP,
ConsoleWii,
ConsoleXBox,
ConsoleXBox360,
ConsoleWiiware,
ConsoleXBox360DLC,
ConsolePS3,
ConsoleOther,
Console3DS,
ConsolePSVita,
ConsoleWiiU,
ConsoleXBoxOne,
ConsolePS4
});
Movies.SubCategories.AddRange(
new List<IndexerCategory>
{
MoviesForeign,
MoviesOther,
MoviesSD,
MoviesHD,
MoviesUHD,
MoviesBluRay,
Movies3D,
MoviesDVD,
MoviesWEBDL
});
Audio.SubCategories.AddRange(
new List<IndexerCategory>
{
AudioMP3,
AudioVideo,
AudioAudiobook,
AudioLossless,
AudioOther,
AudioForeign
});
PC.SubCategories.AddRange(
new List<IndexerCategory>
{
PC0day,
PCISO,
PCMac,
PCMobileOther,
PCGames,
PCMobileiOS,
PCMobileAndroid
});
TV.SubCategories.AddRange(
new List<IndexerCategory>
{
TVWEBDL,
TVForeign,
TVSD,
TVHD,
TVUHD,
TVOther,
TVSport,
TVAnime,
TVDocumentary
});
XXX.SubCategories.AddRange(
new List<IndexerCategory>
{
XXXDVD,
XXXWMV,
XXXXviD,
XXXx264,
XXXUHD,
XXXPack,
XXXImageSet,
XXXOther,
XXXSD,
XXXWEBDL
});
Books.SubCategories.AddRange(
new List<IndexerCategory>
{
BooksMags,
BooksEBook,
BooksComics,
BooksTechnical,
BooksOther,
BooksForeign
});
Other.SubCategories.AddRange(new List<IndexerCategory> { OtherMisc, OtherHashed });
}
public static string GetCatDesc(int torznabCatId) =>
AllCats.FirstOrDefault(c => c.Id == torznabCatId)?.Name ?? string.Empty;
public static IndexerCategory GetCatByName(string name) => AllCats.FirstOrDefault(c => c.Name == name);
}
}

1
src/NzbDrone.Core/Indexers/IndexerCategory.cs
Unescape View File

@ -35,5 +35,6 @@ namespace NzbDrone.Core.Indexers
// Get Hash code should be calculated off read only properties. // Get Hash code should be calculated off read only properties.
// ID is not readonly // ID is not readonly
public override int GetHashCode() => Id; public override int GetHashCode() => Id;
public IndexerCategory CopyWithoutSubCategories() => new IndexerCategory(Id, Name);
} }
} }

44
src/NzbDrone.Core/Indexers/IndexerFactory.cs
Unescape View File

@ -53,6 +53,7 @@ namespace NzbDrone.Core.Indexers
definition.Privacy = defFile.Type == "private" ? IndexerPrivacy.Private : IndexerPrivacy.Public; definition.Privacy = defFile.Type == "private" ? IndexerPrivacy.Private : IndexerPrivacy.Public;
definition.Capabilities = new IndexerCapabilities(); definition.Capabilities = new IndexerCapabilities();
definition.Capabilities.ParseCardigannSearchModes(defFile.Caps.Modes); definition.Capabilities.ParseCardigannSearchModes(defFile.Caps.Modes);
MapCardigannCategories(definition, defFile);
} }
} }
@ -71,6 +72,7 @@ namespace NzbDrone.Core.Indexers
definition.Privacy = defFile.Type == "private" ? IndexerPrivacy.Private : IndexerPrivacy.Public; definition.Privacy = defFile.Type == "private" ? IndexerPrivacy.Private : IndexerPrivacy.Public;
definition.Capabilities = new IndexerCapabilities(); definition.Capabilities = new IndexerCapabilities();
definition.Capabilities.ParseCardigannSearchModes(defFile.Caps.Modes); definition.Capabilities.ParseCardigannSearchModes(defFile.Caps.Modes);
MapCardigannCategories(definition, defFile);
} }
return definition; return definition;
@ -81,6 +83,48 @@ namespace NzbDrone.Core.Indexers
return base.Active().Where(c => c.Enable).ToList(); return base.Active().Where(c => c.Enable).ToList();
} }
private void MapCardigannCategories(IndexerDefinition def, CardigannDefinition defFile)
{
if (defFile.Caps.Categories != null)
{
foreach (var category in defFile.Caps.Categories)
{
var cat = TorznabCatType.GetCatByName(category.Value);
if (cat == null)
{
continue;
}
def.Capabilities.Categories.AddCategoryMapping(category.Key, cat);
}
}
if (defFile.Caps.Categorymappings != null)
{
foreach (var categorymapping in defFile.Caps.Categorymappings)
{
IndexerCategory torznabCat = null;
if (categorymapping.cat != null)
{
torznabCat = TorznabCatType.GetCatByName(categorymapping.cat);
if (torznabCat == null)
{
continue;
}
}
def.Capabilities.Categories.AddCategoryMapping(categorymapping.id, torznabCat, categorymapping.desc);
//if (categorymapping.Default)
//{
// DefaultCategories.Add(categorymapping.id);
//}
}
}
}
public override IEnumerable<IndexerDefinition> GetDefaultDefinitions() public override IEnumerable<IndexerDefinition> GetDefaultDefinitions()
{ {
foreach (var provider in _providers) foreach (var provider in _providers)

Write Preview
Loading…
Cancel
Save