Core: correct Other as 8000 and Books as 7000 (#9986)

as documented in https://newznab.readthedocs.io/en/latest/misc/api/#predefined-categories
and update any indexers affected

src/Jackett.Common/Definitions/7torrents.yml

@@ -10,9 +10,7 @@ links:
 
 caps:
   categories:
-    1: TV
+    Other: Other
-    2: Movies
-    3: Other
 
   modes:
     search: [q]
@@ -20,14 +18,10 @@ caps:
     movie-search: [q]
 
 settings:
-  - name: category-id
+  - name: info_8000
-    type: select
+    type: info
-    label: The 7torrents web site does not provide categories. Select the category you want Jackett to set on all results returned.
+    label: About 7torrents Categories
-    default: 3
+    default: 7torrents does not return categories in its search results page. To add to Sonarr or Radarr replace all categories with 8000(Other).
-    options:
-      1: TV
-      2: Movies
-      3: 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

src/Jackett.Common/Definitions/brasiltracker.yml

@@ -10,9 +10,7 @@ links:
 
 caps:
   categories:
-    1: TV
+    Other: Other
-    2: Movies
-    3: Other
 
   modes:
     search: [q]
@@ -26,14 +24,10 @@ settings:
   - name: password
     type: password
     label: Password
-  - name: category-id
+  - name: info_8000
-    type: select
+    type: info
-    label: The BrasilTracker web site does not provide categories. Select the category you want Jackett to set on all results returned.
+    label: About BrasilTracker Categores
-    default: 3
+    default: BrasilTracker does not return categories in its search results page. To add to Sonarr or Radarr replace all categories with 8000(Other).
-    options:
-      1: TV
-      2: Movies
-      3: 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

src/Jackett.Common/Definitions/btdigg.yml

@@ -10,9 +10,7 @@ links:
 
 caps:
   categories:
-    1: TV
+    Other: Other
-    2: Movies
-    3: Other
 
   modes:
     search: [q]
@@ -20,14 +18,10 @@ caps:
     movie-search: [q]
 
 settings:
-  - name: category-id
+  - name: info_8000
-    type: select
+    type: info
-    label: The BTDigg web site does not provide categories. Select the category you want Jackett to set on all results returned.
+    label: About BTDigg Categores
-    default: 3
+    default: BTDigg does not return categories in its search results page. To add to Sonarr or Radarr replace all categories with 8000(Other).
-    options:
-      1: TV
-      2: Movies
-      3: 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:

src/Jackett.Common/Definitions/btsow.yml

@@ -23,9 +23,7 @@ legacylinks:
 
 caps:
   categories:
-    tv: TV
+    Other: Other
-    movies: Movies
-    other: Other
 
   modes:
     search: [q]
@@ -33,14 +31,10 @@ caps:
     movie-search: [q]
 
 settings:
-  - name: category-id
+  - name: info_8000
-    type: select
+    type: info
-    label: The BTSOW web site does not provide categories. Select the category you want Jackett to set on all results returned.
+    label: About BTSOW Categores
-    default: other
+    default: BTSOW does not return categories in its search results page. To add to Sonarr or Radarr replace all categories with 8000(Other).
-    options:
-      tv: TV
-      movies: Movies
-      other: 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

src/Jackett.Common/Definitions/cpabien.yml

@@ -43,9 +43,7 @@ legacylinks:
 
 caps:
   categories:
-    1: TV
+    Other: Other
-    2: Movies
-    3: 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
+  - name: info_8000
-    type: select
+    type: info
-    label: The cpabien web site does not provide categories. Select the category you want Jackett to set on all results returned.
+    label: About cpasbien Categores
-    default: 3
+    default: cpasbien does not return categories in its search results page. To add to Sonarr or Radarr replace all categories with 8000(Other).
-    options:
-      1: TV
-      2: Movies
-      3: 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:

src/Jackett.Common/Definitions/cpasbienclone.yml

@@ -22,9 +22,7 @@ legacylinks:
 
 caps:
   categories:
-    1: TV
+    Other: Other
-    2: Movies
-    3: Other
 
   modes:
     search: [q]
@@ -32,14 +30,10 @@ caps:
     movie-search: [q]
 
 settings:
-  - name: category-id
+  - name: info_8000
-    type: select
+    type: info
-    label: The cpasbien clone web site does not provide categories. Select the category you want Jackett to set on all results returned.
+    label: About cpasbienclone Categores
-    default: 3
+    default: cpasbienclone does not return categories in its search results page. To add to Sonarr or Radarr replace all categories with 8000(Other).
-    options:
-      1: TV
-      2: Movies
-      3: 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:

src/Jackett.Common/Definitions/extratorrent-cd.yml

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

src/Jackett.Common/Definitions/magnet4you.yml

@@ -21,9 +21,7 @@ legacylinks:
 
 caps:
   categories:
-    1: TV
+    Other: Other
-    2: Movies
-    3: Other
 
   modes:
     search: [q]
@@ -31,14 +29,10 @@ caps:
     movie-search: [q]
 
 settings:
-  - name: category-id
+  - name: info_8000
-    type: select
+    type: info
-    label: The Magnet4You web site does not provide categories. Select the category you want Jackett to set on all results returned.
+    label: About Magnet4You Categores
-    default: 3
+    default: Magnet4You does not return categories in its search results page. To add to Sonarr or Radarr replace all categories with 8000(Other).
-    options:
-      1: TV
-      2: Movies
-      3: 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:

src/Jackett.Common/Definitions/movcr.yml

@@ -21,9 +21,7 @@ legacylinks:
 
 caps:
   categories:
-    tv: TV
+    Other: Other
-    movies: Movies
-    other: Other
 
   modes:
     search: [q]
@@ -31,14 +29,10 @@ caps:
     movie-search: [q]
 
 settings:
-  - name: category-id
+  - name: info_8000
-    type: select
+    type: info
-    label: The MovCr web site does not provide categories. Select the category you want Jackett to set on all results returned.
+    label: About MovCr Categores
-    default: other
+    default: MovCr does not return categories in its search results page. To add to Sonarr or Radarr replace all categories with 8000(Other).
-    options:
-      tv: TV
-      movies: Movies
-      other: 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:

src/Jackett.Common/Definitions/mvgroupforum.yml

@@ -12,9 +12,7 @@ legacylinks:
 
 caps:
   categories:
-    1: TV
+    Other: Other
-    2: Movies
-    3: Other
 
   modes:
     search: [q]
@@ -28,14 +26,10 @@ settings:
   - name: password
     type: password
     label: Password
-  - name: category-id
+  - name: info_8000
-    type: select
+    type: info
-    label: The MVGroup web site does not provide categories. Select the category you want Jackett to set on all results returned.
+    label: About MVGroup Categores
-    default: 3
+    default: MVGroup does not return categories in its search results page. To add to Sonarr or Radarr replace all categories with 8000(Other).
-    options:
-      1: TV
-      2: Movies
-      3: 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"

src/Jackett.Common/Definitions/mvgroupmain.yml

@@ -12,9 +12,7 @@ legacylinks:
 
 caps:
   categories:
-    1: TV
+    Other: Other
-    2: Movies
-    3: Other
 
   modes:
     search: [q]
@@ -28,14 +26,10 @@ settings:
   - name: password
     type: password
     label: Password
-  - name: category-id
+  - name: info_8000
-    type: select
+    type: info
-    label: The MVGroup web site does not provide categories. Select the category you want Jackett to set on all results returned.
+    label: About MVGroup Categores
-    default: 3
+    default: MVGroup does not return categories in its search results page. To add to Sonarr or Radarr replace all categories with 8000(Other).
-    options:
-      1: TV
-      2: Movies
-      3: 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"

src/Jackett.Common/Definitions/torrent4you.yml

@@ -12,9 +12,7 @@ legacylinks:
 
 caps:
   categories:
-    1: TV
+    Other: Other
-    2: Movies
-    3: Other
 
   modes:
     search: [q]
@@ -22,14 +20,10 @@ caps:
     movie-search: [q]
 
 settings:
-  - name: category-id
+  - name: info_8000
-    type: select
+    type: info
-    label: The Torrent4You web site does not provide categories. Select the category you want Jackett to set on all results returned.
+    label: About Torrent4You Categores
-    default: 3
+    default: Torrent4You does not return categories in its search results page. To add to Sonarr or Radarr replace all categories with 8000(Other).
-    options:
-      1: TV
-      2: Movies
-      3: 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:

src/Jackett.Common/Definitions/torrentkitty.yml

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

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
+    label: About TorrentProject2 Categories
-    default: TP2 does not display categories in its search results page. To add to Sonarr or Radarr replace all categories with 7000.
+    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"

src/Jackett.Common/Definitions/zetorrents.yml

@@ -14,9 +14,7 @@ legacylinks:
 
 caps:
   categories:
-    1: TV
+    Other: Other
-    2: Movies
-    3: Other
 
   modes:
     search: [q]
@@ -24,14 +22,10 @@ caps:
     movie-search: [q]
 
 settings:
-  - name: category-id
+  - name: info_8000
-    type: select
+    type: info
-    label: The zetorrents web site does not provide categories. Select the category you want Jackett to set on all results returned.
+    label: About zetorrents Categores
-    default: 3
+    default: zetorrents does not return categories in its search results page. To add to Sonarr or Radarr replace all categories with 8000(Other).
-    options:
-      1: TV
-      2: Movies
-      3: 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:

src/Jackett.Common/Models/TorznabCatType.generated.cs

@@ -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 OtherMisc = new TorznabCategory(8010, "Other/Misc");
-				
-		public static readonly TorznabCategory BooksForeign = new TorznabCategory(8060, "Books/Foreign");
 
+		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 };
 

src/Jackett.Common/Models/TorznabCatType.tt

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

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);