shpaq/Jackett-Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett.git synced 2025-09-17 17:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

core: categories cleanup (#10006)

Browse Source 
* core: categories cleanup
* swap categories 2050 Movies/BluRay / 2060 Movies/3D
* swap categories 6050 XXX/Pack / 6070 XXX/Other
* swap categories 7010 Books/Mags / 7020 Books/EBook / 7030 Books/Comics
* category validation is case sensitive
* renamed some categories to follow Newznab specs
This commit is contained in:
Diego Heras
2020-10-28 20:00:48 +01:00
committed by GitHub
parent ecf1d71717
commit 767700d6bb
251 changed files with 1734 additions and 1796 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Jackett.Test/Common/Models/TorznabCapabilitiesCategoriesTests.cs
View File

@@ -53,10 +53,10 @@ namespace Jackett.Test.Common.Models
// add subcategory of books (child category)
tcc.AddCategoryMapping("33", TorznabCatType.BooksComics);
Assert.AreEqual(3, cats.Count);
Assert.AreEqual(7020, cats[2].ID);
Assert.AreEqual(7030, cats[2].ID);
// add int category with description => custom category. it's converted into 2 different categories
tcc.AddCategoryMapping("44", TorznabCatType.ConsoleXbox, "Console/Xbox_c");
tcc.AddCategoryMapping("44", TorznabCatType.ConsoleXBox, "Console/Xbox_c");
Assert.AreEqual(5, cats.Count);
Assert.AreEqual(1040, cats[3].ID);
Assert.AreEqual(100044, cats[4].ID);
@@ -69,7 +69,7 @@ namespace Jackett.Test.Common.Models
Assert.AreEqual(1030, cats[5].ID);
// add another int category with description that maps to ConsoleXbox (there are 2 tracker cats => 1 torznab cat)
tcc.AddCategoryMapping("45", TorznabCatType.ConsoleXbox, "Console/Xbox_c2");
tcc.AddCategoryMapping("45", TorznabCatType.ConsoleXBox, "Console/Xbox_c2");
Assert.AreEqual(7, cats.Count);
Assert.AreEqual(100045, cats[6].ID); // 1040 is duplicated and it is not added
}
@@ -107,7 +107,7 @@ namespace Jackett.Test.Common.Models
query = new TorznabQuery // duplicate category (1 toznab cat => 2 indexer cats)
{
Categories = new [] { TorznabCatType.ConsoleXbox.ID }
Categories = new [] { TorznabCatType.ConsoleXBox.ID }
};
trackerCats = tcc.MapTorznabCapsToTrackers(query);
Assert.AreEqual(2, trackerCats.Count);
@@ -223,9 +223,9 @@ namespace Jackett.Test.Common.Models
tcc.AddCategoryMapping("1", TorznabCatType.Movies);
tcc.AddCategoryMapping("mov_sd", TorznabCatType.MoviesSD);
tcc.AddCategoryMapping("33", TorznabCatType.BooksComics);
tcc.AddCategoryMapping("44", TorznabCatType.ConsoleXbox, "Console/Xbox_c");
tcc.AddCategoryMapping("44", TorznabCatType.ConsoleXBox, "Console/Xbox_c");
tcc.AddCategoryMapping("con_wii", TorznabCatType.ConsoleWii, "Console/Wii_c");
tcc.AddCategoryMapping("45", TorznabCatType.ConsoleXbox, "Console/Xbox_c2");
tcc.AddCategoryMapping("45", TorznabCatType.ConsoleXBox, "Console/Xbox_c2");
return tcc;
}
}

14
src/Jackett.Test/Torznab/TorznabTests.cs
View File

@@ -64,9 +64,9 @@ namespace Jackett.Test.Torznab
AddCategoryMapping("1", TorznabCatType.Movies);
AddCategoryMapping("mov_sd", TorznabCatType.MoviesSD);
AddCategoryMapping("33", TorznabCatType.BooksComics);
AddCategoryMapping("44", TorznabCatType.ConsoleXbox, "Console/Xbox_c");
AddCategoryMapping("44", TorznabCatType.ConsoleXBox, "Console/Xbox_c");
AddCategoryMapping("con_wii", TorznabCatType.ConsoleWii, "Console/Wii_c");
AddCategoryMapping("45", TorznabCatType.ConsoleXbox, "Console/Xbox_c2");
AddCategoryMapping("45", TorznabCatType.ConsoleXBox, "Console/Xbox_c2");
var query = new TorznabQuery // int category with subcategories (parent cat)
{
@@ -102,7 +102,7 @@ namespace Jackett.Test.Torznab
Assert.AreEqual("1040", dtoCaps[3].ID);
Assert.AreEqual("2000", dtoCaps[4].ID);
Assert.AreEqual("2030", dtoCaps[5].ID);
Assert.AreEqual("7020", dtoCaps[6].ID);
Assert.AreEqual("7030", dtoCaps[6].ID);
// test Torznab caps (XML) => more in Common.Model.TorznabCapabilitiesTests
var xDocument = TorznabCaps.GetXDocument();
@@ -114,7 +114,7 @@ namespace Jackett.Test.Torznab
Assert.AreEqual("1040", xDoumentCategories?[3].Attribute("id")?.Value);
Assert.AreEqual("2000", xDoumentCategories?[4].Attribute("id")?.Value); // Movies
Assert.AreEqual("2030", xDoumentCategories?[5].Attribute("id")?.Value);
Assert.AreEqual("7020", xDoumentCategories?[6].Attribute("id")?.Value);
Assert.AreEqual("7030", xDoumentCategories?[6].Attribute("id")?.Value);
Assert.AreEqual(9, xDoumentCategories?[4]?.Elements("subcat").ToList().Count); // Movies
}
@@ -179,7 +179,7 @@ namespace Jackett.Test.Torznab
new CategorymappingBlock // integer cat with description (child cat) => generates custom cat 100044
{
id = "44",
cat = TorznabCatType.ConsoleXbox.Name,
cat = TorznabCatType.ConsoleXBox.Name,
desc = "Console/Xbox_c"
},
new CategorymappingBlock // string cat with description (child cat)
@@ -191,7 +191,7 @@ namespace Jackett.Test.Torznab
new CategorymappingBlock // duplicate category (2 indexer cats => 1 toznab cat)
{
id = "45",
cat = TorznabCatType.ConsoleXbox.Name,
cat = TorznabCatType.ConsoleXBox.Name,
desc = "Console/Xbox_c2"
},
}
@@ -205,7 +205,7 @@ namespace Jackett.Test.Torznab
Assert.AreEqual(7, cats.Count);
Assert.AreEqual(2000, cats[0].ID);
Assert.AreEqual(2030, cats[1].ID);
Assert.AreEqual(7020, cats[2].ID);
Assert.AreEqual(7030, cats[2].ID);
Assert.AreEqual(1040, cats[3].ID);
Assert.AreEqual(100044, cats[4].ID);
Assert.AreEqual(1030, cats[5].ID);