diff --git a/src/Jackett.Common/Definitions/7torrents.yml b/src/Jackett.Common/Definitions/7torrents.yml index f521eb41b..2a5d74308 100644 --- a/src/Jackett.Common/Definitions/7torrents.yml +++ b/src/Jackett.Common/Definitions/7torrents.yml @@ -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 diff --git a/src/Jackett.Common/Definitions/brasiltracker.yml b/src/Jackett.Common/Definitions/brasiltracker.yml index 16e45b3cb..c1f84039a 100644 --- a/src/Jackett.Common/Definitions/brasiltracker.yml +++ b/src/Jackett.Common/Definitions/brasiltracker.yml @@ -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 diff --git a/src/Jackett.Common/Definitions/btdigg.yml b/src/Jackett.Common/Definitions/btdigg.yml index 0ec8ded6e..fc2eda696 100644 --- a/src/Jackett.Common/Definitions/btdigg.yml +++ b/src/Jackett.Common/Definitions/btdigg.yml @@ -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: diff --git a/src/Jackett.Common/Definitions/btsow.yml b/src/Jackett.Common/Definitions/btsow.yml index da9cc1ea3..327ff7110 100644 --- a/src/Jackett.Common/Definitions/btsow.yml +++ b/src/Jackett.Common/Definitions/btsow.yml @@ -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 diff --git a/src/Jackett.Common/Definitions/cpabien.yml b/src/Jackett.Common/Definitions/cpabien.yml index 4bf54e88d..5c8ac7d0c 100644 --- a/src/Jackett.Common/Definitions/cpabien.yml +++ b/src/Jackett.Common/Definitions/cpabien.yml @@ -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: "
  1. From the same place you fetched the cookie,
  2. Find 'user-agent:' in the Request Headers section
  3. Select and Copy the whole user-agent string (everything after 'user-agent: ') and Paste here.
" - - 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: diff --git a/src/Jackett.Common/Definitions/cpasbienclone.yml b/src/Jackett.Common/Definitions/cpasbienclone.yml index e1043f4be..b384cdb7e 100644 --- a/src/Jackett.Common/Definitions/cpasbienclone.yml +++ b/src/Jackett.Common/Definitions/cpasbienclone.yml @@ -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: diff --git a/src/Jackett.Common/Definitions/extratorrent-cd.yml b/src/Jackett.Common/Definitions/extratorrent-cd.yml index 34c6a3a90..4874a25c0 100644 --- a/src/Jackett.Common/Definitions/extratorrent-cd.yml +++ b/src/Jackett.Common/Definitions/extratorrent-cd.yml @@ -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: diff --git a/src/Jackett.Common/Definitions/magnet4you.yml b/src/Jackett.Common/Definitions/magnet4you.yml index 49e305101..9373269de 100644 --- a/src/Jackett.Common/Definitions/magnet4you.yml +++ b/src/Jackett.Common/Definitions/magnet4you.yml @@ -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: diff --git a/src/Jackett.Common/Definitions/movcr.yml b/src/Jackett.Common/Definitions/movcr.yml index 39c48f43a..9883f4e7d 100644 --- a/src/Jackett.Common/Definitions/movcr.yml +++ b/src/Jackett.Common/Definitions/movcr.yml @@ -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: diff --git a/src/Jackett.Common/Definitions/mvgroupforum.yml b/src/Jackett.Common/Definitions/mvgroupforum.yml index a899f8d9c..43549cfa7 100644 --- a/src/Jackett.Common/Definitions/mvgroupforum.yml +++ b/src/Jackett.Common/Definitions/mvgroupforum.yml @@ -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" diff --git a/src/Jackett.Common/Definitions/mvgroupmain.yml b/src/Jackett.Common/Definitions/mvgroupmain.yml index 86b36fa62..e315d7bc2 100644 --- a/src/Jackett.Common/Definitions/mvgroupmain.yml +++ b/src/Jackett.Common/Definitions/mvgroupmain.yml @@ -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" diff --git a/src/Jackett.Common/Definitions/torrent4you.yml b/src/Jackett.Common/Definitions/torrent4you.yml index 00be0f8c3..d9107db9d 100644 --- a/src/Jackett.Common/Definitions/torrent4you.yml +++ b/src/Jackett.Common/Definitions/torrent4you.yml @@ -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: diff --git a/src/Jackett.Common/Definitions/torrentkitty.yml b/src/Jackett.Common/Definitions/torrentkitty.yml index 328f8d75d..b5141f4fb 100644 --- a/src/Jackett.Common/Definitions/torrentkitty.yml +++ b/src/Jackett.Common/Definitions/torrentkitty.yml @@ -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: diff --git a/src/Jackett.Common/Definitions/torrentproject2.yml b/src/Jackett.Common/Definitions/torrentproject2.yml index 1fa7ce8fd..98034aee8 100644 --- a/src/Jackett.Common/Definitions/torrentproject2.yml +++ b/src/Jackett.Common/Definitions/torrentproject2.yml @@ -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" diff --git a/src/Jackett.Common/Definitions/zetorrents.yml b/src/Jackett.Common/Definitions/zetorrents.yml index be16ee5dd..cf6290974 100644 --- a/src/Jackett.Common/Definitions/zetorrents.yml +++ b/src/Jackett.Common/Definitions/zetorrents.yml @@ -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: diff --git a/src/Jackett.Common/Models/TorznabCatType.generated.cs b/src/Jackett.Common/Models/TorznabCatType.generated.cs index 0150c27c6..b64f41775 100644 --- a/src/Jackett.Common/Models/TorznabCatType.generated.cs +++ b/src/Jackett.Common/Models/TorznabCatType.generated.cs @@ -7,163 +7,162 @@ namespace Jackett.Common.Models { public static readonly TorznabCategory Console = new TorznabCategory(1000, "Console"); - + public static readonly TorznabCategory ConsoleNDS = new TorznabCategory(1010, "Console/NDS"); - + public static readonly TorznabCategory ConsolePSP = new TorznabCategory(1020, "Console/PSP"); - + public static readonly TorznabCategory ConsoleWii = new TorznabCategory(1030, "Console/Wii"); - + public static readonly TorznabCategory ConsoleXbox = new TorznabCategory(1040, "Console/Xbox"); - + public static readonly TorznabCategory ConsoleXbox360 = new TorznabCategory(1050, "Console/Xbox 360"); - + public static readonly TorznabCategory ConsoleWiiwareVC = new TorznabCategory(1060, "Console/Wiiware/VC"); - + public static readonly TorznabCategory ConsoleXBOX360DLC = new TorznabCategory(1070, "Console/XBOX 360 DLC"); - + public static readonly TorznabCategory ConsolePS3 = new TorznabCategory(1080, "Console/PS3"); - + public static readonly TorznabCategory ConsoleOther = new TorznabCategory(1090, "Console/Other"); - + public static readonly TorznabCategory Console3DS = new TorznabCategory(1110, "Console/3DS"); - + public static readonly TorznabCategory ConsolePSVita = new TorznabCategory(1120, "Console/PS Vita"); - + public static readonly TorznabCategory ConsoleWiiU = new TorznabCategory(1130, "Console/WiiU"); - + public static readonly TorznabCategory ConsoleXboxOne = new TorznabCategory(1140, "Console/Xbox One"); - + public static readonly TorznabCategory ConsolePS4 = new TorznabCategory(1180, "Console/PS4"); - + public static readonly TorznabCategory Movies = new TorznabCategory(2000, "Movies"); - + public static readonly TorznabCategory MoviesForeign = new TorznabCategory(2010, "Movies/Foreign"); - + public static readonly TorznabCategory MoviesOther = new TorznabCategory(2020, "Movies/Other"); - + public static readonly TorznabCategory MoviesSD = new TorznabCategory(2030, "Movies/SD"); - + public static readonly TorznabCategory MoviesHD = new TorznabCategory(2040, "Movies/HD"); - + public static readonly TorznabCategory MoviesUHD = new TorznabCategory(2045, "Movies/UHD"); - + public static readonly TorznabCategory Movies3D = new TorznabCategory(2050, "Movies/3D"); - + public static readonly TorznabCategory MoviesBluRay = new TorznabCategory(2060, "Movies/BluRay"); - + public static readonly TorznabCategory MoviesDVD = new TorznabCategory(2070, "Movies/DVD"); - + public static readonly TorznabCategory MoviesWEBDL = new TorznabCategory(2080, "Movies/WEBDL"); - + public static readonly TorznabCategory Audio = new TorznabCategory(3000, "Audio"); - + public static readonly TorznabCategory AudioMP3 = new TorznabCategory(3010, "Audio/MP3"); - + public static readonly TorznabCategory AudioVideo = new TorznabCategory(3020, "Audio/Video"); - + public static readonly TorznabCategory AudioAudiobook = new TorznabCategory(3030, "Audio/Audiobook"); - + public static readonly TorznabCategory AudioLossless = new TorznabCategory(3040, "Audio/Lossless"); - + public static readonly TorznabCategory AudioOther = new TorznabCategory(3050, "Audio/Other"); - + public static readonly TorznabCategory AudioForeign = new TorznabCategory(3060, "Audio/Foreign"); - + public static readonly TorznabCategory PC = new TorznabCategory(4000, "PC"); - + public static readonly TorznabCategory PC0day = new TorznabCategory(4010, "PC/0day"); - + public static readonly TorznabCategory PCISO = new TorznabCategory(4020, "PC/ISO"); - + public static readonly TorznabCategory PCMac = new TorznabCategory(4030, "PC/Mac"); - + public static readonly TorznabCategory PCPhoneOther = new TorznabCategory(4040, "PC/Phone-Other"); - + public static readonly TorznabCategory PCGames = new TorznabCategory(4050, "PC/Games"); - + public static readonly TorznabCategory PCPhoneIOS = new TorznabCategory(4060, "PC/Phone-IOS"); - + public static readonly TorznabCategory PCPhoneAndroid = new TorznabCategory(4070, "PC/Phone-Android"); - + public static readonly TorznabCategory TV = new TorznabCategory(5000, "TV"); - + public static readonly TorznabCategory TVWEBDL = new TorznabCategory(5010, "TV/WEB-DL"); - + public static readonly TorznabCategory TVFOREIGN = new TorznabCategory(5020, "TV/FOREIGN"); - + public static readonly TorznabCategory TVSD = new TorznabCategory(5030, "TV/SD"); - + public static readonly TorznabCategory TVHD = new TorznabCategory(5040, "TV/HD"); - + public static readonly TorznabCategory TVUHD = new TorznabCategory(5045, "TV/UHD"); - + public static readonly TorznabCategory TVOTHER = new TorznabCategory(5050, "TV/OTHER"); - + public static readonly TorznabCategory TVSport = new TorznabCategory(5060, "TV/Sport"); - + public static readonly TorznabCategory TVAnime = new TorznabCategory(5070, "TV/Anime"); - + public static readonly TorznabCategory TVDocumentary = new TorznabCategory(5080, "TV/Documentary"); - + public static readonly TorznabCategory XXX = new TorznabCategory(6000, "XXX"); - + public static readonly TorznabCategory XXXDVD = new TorznabCategory(6010, "XXX/DVD"); - + public static readonly TorznabCategory XXXWMV = new TorznabCategory(6020, "XXX/WMV"); - + public static readonly TorznabCategory XXXXviD = new TorznabCategory(6030, "XXX/XviD"); - + public static readonly TorznabCategory XXXx264 = new TorznabCategory(6040, "XXX/x264"); - + public static readonly TorznabCategory XXXOther = new TorznabCategory(6050, "XXX/Other"); - + public static readonly TorznabCategory XXXImageset = new TorznabCategory(6060, "XXX/Imageset"); - + public static readonly TorznabCategory XXXPacks = new TorznabCategory(6070, "XXX/Packs"); - - public static readonly TorznabCategory Other = new TorznabCategory(7000, "Other"); - - public static readonly TorznabCategory OtherMisc = new TorznabCategory(7010, "Other/Misc"); - - public static readonly TorznabCategory OtherHashed = new TorznabCategory(7020, "Other/Hashed"); - - public static readonly TorznabCategory Books = new TorznabCategory(8000, "Books"); - - public static readonly TorznabCategory BooksEbook = new TorznabCategory(8010, "Books/Ebook"); - - public static readonly TorznabCategory BooksComics = new TorznabCategory(8020, "Books/Comics"); - - public static readonly TorznabCategory BooksMagazines = new TorznabCategory(8030, "Books/Magazines"); - - public static readonly TorznabCategory BooksTechnical = new TorznabCategory(8040, "Books/Technical"); - - public static readonly TorznabCategory BooksOther = new TorznabCategory(8050, "Books/Other"); - - public static readonly TorznabCategory BooksForeign = new TorznabCategory(8060, "Books/Foreign"); - + + public static readonly TorznabCategory Books = new TorznabCategory(7000, "Books"); + + public static readonly TorznabCategory BooksEbook = new TorznabCategory(7010, "Books/Ebook"); + + public static readonly TorznabCategory BooksComics = new TorznabCategory(7020, "Books/Comics"); + + public static readonly TorznabCategory BooksMagazines = new TorznabCategory(7030, "Books/Magazines"); + + public static readonly TorznabCategory BooksTechnical = new TorznabCategory(7040, "Books/Technical"); + + public static readonly TorznabCategory BooksOther = new TorznabCategory(7050, "Books/Other"); + + public static readonly TorznabCategory BooksForeign = new TorznabCategory(7060, "Books/Foreign"); + + public static readonly TorznabCategory Other = new TorznabCategory(8000, "Other"); + + 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 }; static TorznabCatType() { - + Console.SubCategories.AddRange(new List { ConsoleNDS, ConsolePSP, ConsoleWii, ConsoleXbox, ConsoleXbox360, ConsoleWiiwareVC, ConsoleXBOX360DLC, ConsolePS3, ConsoleOther, Console3DS, ConsolePSVita, ConsoleWiiU, ConsoleXboxOne, ConsolePS4 }); - + Movies.SubCategories.AddRange(new List { MoviesForeign, MoviesOther, MoviesSD, MoviesHD, MoviesUHD, Movies3D, MoviesBluRay, MoviesDVD, MoviesWEBDL }); - + Audio.SubCategories.AddRange(new List { AudioMP3, AudioVideo, AudioAudiobook, AudioLossless, AudioOther, AudioForeign }); - + PC.SubCategories.AddRange(new List { PC0day, PCISO, PCMac, PCPhoneOther, PCGames, PCPhoneIOS, PCPhoneAndroid }); - + TV.SubCategories.AddRange(new List { TVWEBDL, TVFOREIGN, TVSD, TVHD, TVUHD, TVOTHER, TVSport, TVAnime, TVDocumentary }); - + XXX.SubCategories.AddRange(new List { XXXDVD, XXXWMV, XXXXviD, XXXx264, XXXOther, XXXImageset, XXXPacks }); - + Other.SubCategories.AddRange(new List { OtherMisc, OtherHashed }); - + Books.SubCategories.AddRange(new List { BooksEbook, BooksComics, BooksMagazines, BooksTechnical, BooksOther, BooksForeign }); - + } } } diff --git a/src/Jackett.Common/Models/TorznabCatType.tt b/src/Jackett.Common/Models/TorznabCatType.tt index 43bfadf7a..2685ec28e 100644 --- a/src/Jackett.Common/Models/TorznabCatType.tt +++ b/src/Jackett.Common/Models/TorznabCatType.tt @@ -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; diff --git a/src/Jackett.Test/Torznab/TorznabTests.cs b/src/Jackett.Test/Torznab/TorznabTests.cs index b99e897d7..d667d8bc5 100644 --- a/src/Jackett.Test/Torznab/TorznabTests.cs +++ b/src/Jackett.Test/Torznab/TorznabTests.cs @@ -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);