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: correct Other as 8000 and Books as 7000 (#9986)

Browse Source 
as documented in https://newznab.readthedocs.io/en/latest/misc/api/#predefined-categories
and update any indexers affected
This commit is contained in:
garfield69
2020-10-28 08:02:32 +13:00
committed by GitHub
parent 124dbc356b
commit aec14b88e9
18 changed files with 187 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Jackett.Common/Definitions/7torrents.yml
View File

@@ -10,9 +10,7 @@ links:
caps:
categories:
1: TV
2: Movies
3: Other
Other: Other
modes:
search: [q]
@@ -20,14 +18,10 @@ caps:
movie-search: [q]
settings:
- name: category-id
type: select
label: The 7torrents web site does not provide categories. Select the category you want Jackett to set on all results returned.
default: 3
options:
1: TV
2: Movies
3: Other
- name: info_8000
type: info
label: About 7torrents Categories
default: 7torrents does not return categories in its search results page. To add to Sonarr or Radarr replace all categories with 8000(Other).
- name: sort
type: select
label: Sort requested from site
@@ -50,7 +44,7 @@ search:
fields:
category:
text: "{{ .Config.category-id }}"
text: Other
title:
selector: div.media
attribute: data-name

18
src/Jackett.Common/Definitions/brasiltracker.yml
View File

@@ -10,9 +10,7 @@ links:
caps:
categories:
1: TV
2: Movies
3: Other
Other: Other
modes:
search: [q]
@@ -26,14 +24,10 @@ settings:
- name: password
type: password
label: Password
- name: category-id
type: select
label: The BrasilTracker web site does not provide categories. Select the category you want Jackett to set on all results returned.
default: 3
options:
1: TV
2: Movies
3: Other
- name: info_8000
type: info
label: About BrasilTracker Categores
default: BrasilTracker does not return categories in its search results page. To add to Sonarr or Radarr replace all categories with 8000(Other).
- name: freeleech
type: checkbox
label: Search freeleech only
@@ -91,7 +85,7 @@ search:
fields:
category:
text: "{{ .Config.category-id }}"
text: Other
details:
selector: a[href^="torrents.php?id="]
attribute: href

18
src/Jackett.Common/Definitions/btdigg.yml
View File

@@ -10,9 +10,7 @@ links:
caps:
categories:
1: TV
2: Movies
3: Other
Other: Other
modes:
search: [q]
@@ -20,14 +18,10 @@ caps:
movie-search: [q]
settings:
- name: category-id
type: select
label: The BTDigg web site does not provide categories. Select the category you want Jackett to set on all results returned.
default: 3
options:
1: TV
2: Movies
3: Other
- name: info_8000
type: info
label: About BTDigg Categores
default: BTDigg does not return categories in its search results page. To add to Sonarr or Radarr replace all categories with 8000(Other).
- name: sort
type: select
label: Sort requested from site
@@ -54,7 +48,7 @@ search:
fields:
category:
text: "{{ .Config.category-id }}"
text: Other
title:
selector: div.torrent_name a
details:

18
src/Jackett.Common/Definitions/btsow.yml
View File

@@ -23,9 +23,7 @@ legacylinks:
caps:
categories:
tv: TV
movies: Movies
other: Other
Other: Other
modes:
search: [q]
@@ -33,14 +31,10 @@ caps:
movie-search: [q]
settings:
- name: category-id
type: select
label: The BTSOW web site does not provide categories. Select the category you want Jackett to set on all results returned.
default: other
options:
tv: TV
movies: Movies
other: Other
- name: info_8000
type: info
label: About BTSOW Categores
default: BTSOW does not return categories in its search results page. To add to Sonarr or Radarr replace all categories with 8000(Other).
download:
selector: a#magnetOpen
@@ -53,7 +47,7 @@ search:
selector: div.row:has(a[href*="/detail/hash/"])
fields:
category:
text: "{{ .Config.category-id }}"
text: Other
title:
selector: a[href*="/detail/hash/"]
attribute: title

18
src/Jackett.Common/Definitions/cpabien.yml
View File

@@ -43,9 +43,7 @@ legacylinks:
caps:
categories:
1: TV
2: Movies
3: Other
Other: Other
modes:
search: [q]
@@ -68,14 +66,10 @@ settings:
type: info
label: How to get the User-Agent
default: "<ol><li>From the same place you fetched the cookie,<li>Find <b>'user-agent:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole user-agent string <i>(everything after 'user-agent: ')</i> and <b>Paste</b> here.</ol>"
- name: category-id
type: select
label: The cpabien web site does not provide categories. Select the category you want Jackett to set on all results returned.
default: 3
options:
1: TV
2: Movies
3: Other
- name: info_8000
type: info
label: About cpasbien Categores
default: cpasbien does not return categories in its search results page. To add to Sonarr or Radarr replace all categories with 8000(Other).
- name: multilang
type: checkbox
label: Replace MULTI by another language in release name
@@ -125,7 +119,7 @@ search:
fields:
category:
text: "{{ .Config.category-id }}"
text: Other
site_date:
selector: a
filters:

18
src/Jackett.Common/Definitions/cpasbienclone.yml
View File

@@ -22,9 +22,7 @@ legacylinks:
caps:
categories:
1: TV
2: Movies
3: Other
Other: Other
modes:
search: [q]
@@ -32,14 +30,10 @@ caps:
movie-search: [q]
settings:
- name: category-id
type: select
label: The cpasbien clone web site does not provide categories. Select the category you want Jackett to set on all results returned.
default: 3
options:
1: TV
2: Movies
3: Other
- name: info_8000
type: info
label: About cpasbienclone Categores
default: cpasbienclone does not return categories in its search results page. To add to Sonarr or Radarr replace all categories with 8000(Other).
- name: multilang
type: checkbox
label: Replace MULTI by another language in release name
@@ -86,7 +80,7 @@ search:
fields:
category:
text: "{{ .Config.category-id }}"
text: Other
site_date:
selector: a
filters:

18
src/Jackett.Common/Definitions/extratorrent-cd.yml
View File

@@ -14,9 +14,7 @@ legacylinks:
caps:
categories:
1: TV
2: Movies
3: Other
Other: Other
modes:
search: [q]
@@ -24,14 +22,10 @@ caps:
movie-search: [q]
settings:
- name: category-id
type: select
label: The ExtraTorrent web site does not provide categories. Select the category you want Jackett to set on all results returned.
default: 3
options:
1: TV
2: Movies
3: Other
- name: info_8000
type: info
label: About ExtraTorrent Categores
default: ExtraTorrent does not return categories in its search results page. To add to Sonarr or Radarr replace all categories with 8000(Other).
search:
paths:
@@ -48,7 +42,7 @@ search:
fields:
category:
text: "{{ .Config.category-id }}"
text: Other
title:
selector: a[href*="/torrent/"][title^="view"]
details:

18
src/Jackett.Common/Definitions/magnet4you.yml
View File

@@ -21,9 +21,7 @@ legacylinks:
caps:
categories:
1: TV
2: Movies
3: Other
Other: Other
modes:
search: [q]
@@ -31,14 +29,10 @@ caps:
movie-search: [q]
settings:
- name: category-id
type: select
label: The Magnet4You web site does not provide categories. Select the category you want Jackett to set on all results returned.
default: 3
options:
1: TV
2: Movies
3: Other
- name: info_8000
type: info
label: About Magnet4You Categores
default: Magnet4You does not return categories in its search results page. To add to Sonarr or Radarr replace all categories with 8000(Other).
- name: sort
type: select
label: Sort requested from site
@@ -58,7 +52,7 @@ search:
fields:
category:
text: "{{ .Config.category-id }}"
text: Other
title:
selector: a[href^="magnet/"]
details:

18
src/Jackett.Common/Definitions/movcr.yml
View File

@@ -21,9 +21,7 @@ legacylinks:
caps:
categories:
tv: TV
movies: Movies
other: Other
Other: Other
modes:
search: [q]
@@ -31,14 +29,10 @@ caps:
movie-search: [q]
settings:
- name: category-id
type: select
label: The MovCr web site does not provide categories. Select the category you want Jackett to set on all results returned.
default: other
options:
tv: TV
movies: Movies
other: Other
- name: info_8000
type: info
label: About MovCr Categores
default: MovCr does not return categories in its search results page. To add to Sonarr or Radarr replace all categories with 8000(Other).
download:
selector: a[href^="/torrents/"]
@@ -55,7 +49,7 @@ search:
fields:
category:
text: "{{ .Config.category-id }}"
text: Other
title:
selector: td.name a:nth-child(2)
details:

18
src/Jackett.Common/Definitions/mvgroupforum.yml
View File

@@ -12,9 +12,7 @@ legacylinks:
caps:
categories:
1: TV
2: Movies
3: Other
Other: Other
modes:
search: [q]
@@ -28,14 +26,10 @@ settings:
- name: password
type: password
label: Password
- name: category-id
type: select
label: The MVGroup web site does not provide categories. Select the category you want Jackett to set on all results returned.
default: 3
options:
1: TV
2: Movies
3: Other
- name: info_8000
type: info
label: About MVGroup Categores
default: MVGroup does not return categories in its search results page. To add to Sonarr or Radarr replace all categories with 8000(Other).
- name: hidef
type: checkbox
label: Show MVGroup HiDef Releases only
@@ -162,7 +156,7 @@ search:
fields:
category:
text: "{{ .Config.category-id }}"
text: Other
title:
# fallback title (to prevent abend if optional is not found)
text: "title not found"

18
src/Jackett.Common/Definitions/mvgroupmain.yml
View File

@@ -12,9 +12,7 @@ legacylinks:
caps:
categories:
1: TV
2: Movies
3: Other
Other: Other
modes:
search: [q]
@@ -28,14 +26,10 @@ settings:
- name: password
type: password
label: Password
- name: category-id
type: select
label: The MVGroup web site does not provide categories. Select the category you want Jackett to set on all results returned.
default: 3
options:
1: TV
2: Movies
3: Other
- name: info_8000
type: info
label: About MVGroup Categores
default: MVGroup does not return categories in its search results page. To add to Sonarr or Radarr replace all categories with 8000(Other).
- name: hidef
type: checkbox
label: Show MVGroup HiDef Releases only
@@ -162,7 +156,7 @@ search:
fields:
category:
text: "{{ .Config.category-id }}"
text: Other
title:
# fallback title (to prevent abend if optional is not found)
text: "title not found"

18
src/Jackett.Common/Definitions/torrent4you.yml
View File

@@ -12,9 +12,7 @@ legacylinks:
caps:
categories:
1: TV
2: Movies
3: Other
Other: Other
modes:
search: [q]
@@ -22,14 +20,10 @@ caps:
movie-search: [q]
settings:
- name: category-id
type: select
label: The Torrent4You web site does not provide categories. Select the category you want Jackett to set on all results returned.
default: 3
options:
1: TV
2: Movies
3: Other
- name: info_8000
type: info
label: About Torrent4You Categores
default: Torrent4You does not return categories in its search results page. To add to Sonarr or Radarr replace all categories with 8000(Other).
- name: sort
type: select
label: Sort requested from site
@@ -53,7 +47,7 @@ search:
fields:
category:
text: "{{ .Config.category-id }}"
text: Other
title:
selector: td:nth-child(1) a
details:

18
src/Jackett.Common/Definitions/torrentkitty.yml
View File

@@ -14,9 +14,7 @@ links:
caps:
categories:
tv: TV
movies: Movies
other: Other
Other: Other
modes:
search: [q]
@@ -24,14 +22,10 @@ caps:
movie-search: [q]
settings:
- name: category-id
type: select
label: The TorrentKitty web site does not provide categories. Select the category you want Jackett to set on all results returned.
default: other
options:
tv: TV
movies: Movies
other: Other
- name: info_8000
type: info
label: About TorrentKitty Categores
default: TorrentKitty does not return categories in its search results page. To add to Sonarr or Radarr replace all categories with 8000(Other).
search:
paths:
@@ -42,7 +36,7 @@ search:
fields:
category:
text: "{{ .Config.category-id }}"
text: Other
title:
selector: td.name
details:

6
src/Jackett.Common/Definitions/torrentproject2.yml
View File

@@ -61,10 +61,10 @@ settings:
oldest: "created asc"
seeders: seeders
size: size
- name: info
- name: info_8000
type: info
label: A note about TP2
default: TP2 does not display categories in its search results page. To add to Sonarr or Radarr replace all categories with 7000.
label: About TorrentProject2 Categories
default: TorrentProject2 does not return categories in its search results page. To add to Sonarr or Radarr replace all categories with 8000(Other).
download:
selector: "#download > div:nth-child(2) > div:nth-child(1) > a"

18
src/Jackett.Common/Definitions/zetorrents.yml
View File

@@ -14,9 +14,7 @@ legacylinks:
caps:
categories:
1: TV
2: Movies
3: Other
Other: Other
modes:
search: [q]
@@ -24,14 +22,10 @@ caps:
movie-search: [q]
settings:
- name: category-id
type: select
label: The zetorrents web site does not provide categories. Select the category you want Jackett to set on all results returned.
default: 3
options:
1: TV
2: Movies
3: Other
- name: info_8000
type: info
label: About zetorrents Categores
default: zetorrents does not return categories in its search results page. To add to Sonarr or Radarr replace all categories with 8000(Other).
- name: multilang
type: checkbox
label: Replace MULTI by another language in release name
@@ -71,7 +65,7 @@ search:
fields:
category:
text: "{{ .Config.category-id }}"
text: Other
site_date:
selector: a[href^="/torrent/"]
filters:

21
src/Jackett.Common/Models/TorznabCatType.generated.cs
View File

@@ -122,26 +122,25 @@ namespace Jackett.Common.Models
public static readonly TorznabCategory XXXPacks = new TorznabCategory(6070, "XXX/Packs");
public static readonly TorznabCategory Other = new TorznabCategory(7000, "Other");
public static readonly TorznabCategory Books = new TorznabCategory(7000, "Books");
public static readonly TorznabCategory OtherMisc = new TorznabCategory(7010, "Other/Misc");
public static readonly TorznabCategory BooksEbook = new TorznabCategory(7010, "Books/Ebook");
public static readonly TorznabCategory OtherHashed = new TorznabCategory(7020, "Other/Hashed");
public static readonly TorznabCategory BooksComics = new TorznabCategory(7020, "Books/Comics");
public static readonly TorznabCategory Books = new TorznabCategory(8000, "Books");
public static readonly TorznabCategory BooksMagazines = new TorznabCategory(7030, "Books/Magazines");
public static readonly TorznabCategory BooksEbook = new TorznabCategory(8010, "Books/Ebook");
public static readonly TorznabCategory BooksTechnical = new TorznabCategory(7040, "Books/Technical");
public static readonly TorznabCategory BooksComics = new TorznabCategory(8020, "Books/Comics");
public static readonly TorznabCategory BooksOther = new TorznabCategory(7050, "Books/Other");
public static readonly TorznabCategory BooksMagazines = new TorznabCategory(8030, "Books/Magazines");
public static readonly TorznabCategory BooksForeign = new TorznabCategory(7060, "Books/Foreign");
public static readonly TorznabCategory BooksTechnical = new TorznabCategory(8040, "Books/Technical");
public static readonly TorznabCategory Other = new TorznabCategory(8000, "Other");
public static readonly TorznabCategory BooksOther = new TorznabCategory(8050, "Books/Other");
public static readonly TorznabCategory BooksForeign = new TorznabCategory(8060, "Books/Foreign");
public static readonly TorznabCategory OtherMisc = new TorznabCategory(8010, "Other/Misc");
public static readonly TorznabCategory OtherHashed = new TorznabCategory(8020, "Other/Hashed");
public static readonly TorznabCategory[] AllCats = new TorznabCategory[] { Console, ConsoleNDS, ConsolePSP, ConsoleWii, ConsoleXbox, ConsoleXbox360, ConsoleWiiwareVC, ConsoleXBOX360DLC, ConsolePS3, ConsoleOther, Console3DS, ConsolePSVita, ConsoleWiiU, ConsoleXboxOne, ConsolePS4, Movies, MoviesForeign, MoviesOther, MoviesSD, MoviesHD, MoviesUHD, Movies3D, MoviesBluRay, MoviesDVD, MoviesWEBDL, Audio, AudioMP3, AudioVideo, AudioAudiobook, AudioLossless, AudioOther, AudioForeign, PC, PC0day, PCISO, PCMac, PCPhoneOther, PCGames, PCPhoneIOS, PCPhoneAndroid, TV, TVWEBDL, TVFOREIGN, TVSD, TVHD, TVUHD, TVOTHER, TVSport, TVAnime, TVDocumentary, XXX, XXXDVD, XXXWMV, XXXXviD, XXXx264, XXXOther, XXXImageset, XXXPacks, Other, OtherMisc, OtherHashed, Books, BooksEbook, BooksComics, BooksMagazines, BooksTechnical, BooksOther, BooksForeign };

20
src/Jackett.Common/Models/TorznabCatType.tt
View File

@@ -63,16 +63,16 @@
6050: XXX/Other
6060: XXX/Imageset
6070: XXX/Packs
7000: Other
7010: Other/Misc
7020: Other/Hashed
8000: Books
8010: Books/Ebook
8020: Books/Comics
8030: Books/Magazines
8040: Books/Technical
8050: Books/Other
8060: Books/Foreign
7000: Books
7010: Books/Ebook
7020: Books/Comics
7030: Books/Magazines
7040: Books/Technical
7050: Books/Other
7060: Books/Foreign
8000: Other
8010: Other/Misc
8020: Other/Hashed
"; #>
using System.Collections.Generic;

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

@@ -74,7 +74,7 @@ namespace Jackett.Test.Torznab
// add subcategory of books (child category)
AddCategoryMapping(33, TorznabCatType.BooksComics);
Assert.AreEqual(3, TorznabCaps.Categories.Count);
Assert.AreEqual(8020, TorznabCaps.Categories[2].ID);
Assert.AreEqual(7020, TorznabCaps.Categories[2].ID);
// add int category with description => custom category. it's converted into 2 different categories
AddCategoryMapping(44, TorznabCatType.ConsoleXbox, "Console/Xbox_c");
@@ -226,7 +226,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("8020", dtoCaps[6].ID);
Assert.AreEqual("7020", dtoCaps[6].ID);
// test Torznab caps (XML) => more in Common.Model.TorznabCapabilitiesTests
var xDocument = TorznabCaps.GetXDocument();
@@ -238,7 +238,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("8020", xDoumentCategories?[6].Attribute("id")?.Value);
Assert.AreEqual("7020", xDoumentCategories?[6].Attribute("id")?.Value);
Assert.AreEqual(9, xDoumentCategories?[4]?.Elements("subcat").ToList().Count); // Movies
}
@@ -328,7 +328,7 @@ namespace Jackett.Test.Torznab
Assert.AreEqual(7, indexer.TorznabCaps.Categories.Count);
Assert.AreEqual(2000, indexer.TorznabCaps.Categories[0].ID);
Assert.AreEqual(2030, indexer.TorznabCaps.Categories[1].ID);
Assert.AreEqual(8020, indexer.TorznabCaps.Categories[2].ID);
Assert.AreEqual(7020, indexer.TorznabCaps.Categories[2].ID);
Assert.AreEqual(1040, indexer.TorznabCaps.Categories[3].ID);
Assert.AreEqual(100044, indexer.TorznabCaps.Categories[4].ID);
Assert.AreEqual(1030, indexer.TorznabCaps.Categories[5].ID);