From ba4d8a64ff0859c8a0561dd69a8ac095791a29d9 Mon Sep 17 00:00:00 2001 From: garfield69 Date: Thu, 27 Jun 2024 13:13:22 +1200 Subject: [PATCH] cardigann: add info_categories_8000 (#15434) --- src/Jackett.Common/Definitions/bitsearch.yml | 2 +- src/Jackett.Common/Definitions/btsow.yml | 6 ++---- src/Jackett.Common/Definitions/cpabien.yml | 6 ++---- src/Jackett.Common/Definitions/cpasbienclone.yml | 6 ++---- src/Jackett.Common/Definitions/limetorrents.yml | 2 +- src/Jackett.Common/Definitions/mvgroupforum.yml | 6 ++---- src/Jackett.Common/Definitions/mvgroupmain.yml | 6 ++---- src/Jackett.Common/Definitions/schema.json | 2 +- src/Jackett.Common/Definitions/torrentby.yml | 6 ++---- src/Jackett.Common/Definitions/torrentkitty.yml | 6 ++---- src/Jackett.Common/Definitions/torrentproject2.yml | 6 ++---- src/Jackett.Common/Definitions/torrentz2nz.yml | 6 ++---- src/Jackett.Common/Definitions/zetorrents.yml | 6 ++---- src/Jackett.Common/Indexers/CardigannIndexer.cs | 3 +++ src/Jackett.Test/Resources/html-definition1.yml | 12 ++++-------- 15 files changed, 30 insertions(+), 51 deletions(-) diff --git a/src/Jackett.Common/Definitions/bitsearch.yml b/src/Jackett.Common/Definitions/bitsearch.yml index d0e4caa55..0a2278845 100644 --- a/src/Jackett.Common/Definitions/bitsearch.yml +++ b/src/Jackett.Common/Definitions/bitsearch.yml @@ -70,7 +70,7 @@ settings: options: desc: desc asc: asc - - name: info_8000 + - name: info_category_8000 type: info label: About BitSearch Categories default: BitSearch does not properly return categories in its search results for some releases.
To add to your Apps' Torznab indexer, you will need to include the 8000(Other) category. diff --git a/src/Jackett.Common/Definitions/btsow.yml b/src/Jackett.Common/Definitions/btsow.yml index c57219918..6e6162939 100644 --- a/src/Jackett.Common/Definitions/btsow.yml +++ b/src/Jackett.Common/Definitions/btsow.yml @@ -37,10 +37,8 @@ caps: book-search: [q] settings: - - name: info_8000 - type: info - label: About BTSOW Categories - default: BTSOW does not return categories in its search results.
To add to your Apps' Torznab indexer, replace all categories with 8000(Other). + - name: info_category_8000 + type: info_category_8000 download: selectors: diff --git a/src/Jackett.Common/Definitions/cpabien.yml b/src/Jackett.Common/Definitions/cpabien.yml index d02285eba..a92864993 100644 --- a/src/Jackett.Common/Definitions/cpabien.yml +++ b/src/Jackett.Common/Definitions/cpabien.yml @@ -40,10 +40,8 @@ caps: settings: - name: info_flaresolverr type: info_flaresolverr - - name: info_8000 - type: info - label: About cpasbien Categories - default: cpasbien does not return categories in its search results.
To add to your Apps' Torznab indexer, replace all categories with 8000(Other). + - name: info_category_8000 + type: info_category_8000 - name: multilang type: checkbox label: Replace MULTi by another language in release name diff --git a/src/Jackett.Common/Definitions/cpasbienclone.yml b/src/Jackett.Common/Definitions/cpasbienclone.yml index c707a7263..ecd874793 100644 --- a/src/Jackett.Common/Definitions/cpasbienclone.yml +++ b/src/Jackett.Common/Definitions/cpasbienclone.yml @@ -34,10 +34,8 @@ caps: allowrawsearch: true settings: - - name: info_8000 - type: info - label: About cpasbienclone Categories - default: cpasbienclone does not return categories in its search results.
To add to your Apps' Torznab indexer, replace all categories with 8000(Other). + - name: info_category_8000 + type: info_category_8000 - name: multilang type: checkbox label: Replace MULTi by another language in release name diff --git a/src/Jackett.Common/Definitions/limetorrents.yml b/src/Jackett.Common/Definitions/limetorrents.yml index b51fe7e67..e0641e1ef 100644 --- a/src/Jackett.Common/Definitions/limetorrents.yml +++ b/src/Jackett.Common/Definitions/limetorrents.yml @@ -79,7 +79,7 @@ settings: date: created seeds: seeders size: size - - name: info_8000 + - name: info_category_8000 type: info label: About LimeTorrents Categories default: LimeTorrents only returns category Other in its Keywordless search results page.
To pass your apps' indexer TEST you will need to include the 8000(Other) category. diff --git a/src/Jackett.Common/Definitions/mvgroupforum.yml b/src/Jackett.Common/Definitions/mvgroupforum.yml index 8075e641c..06691ec03 100644 --- a/src/Jackett.Common/Definitions/mvgroupforum.yml +++ b/src/Jackett.Common/Definitions/mvgroupforum.yml @@ -26,10 +26,8 @@ settings: - name: password type: password label: Password - - name: info_8000 - type: info - label: About MVGroup Categories - default: MVGroup does not return categories in its search results.
To add to your Apps' Torznab indexer, replace all categories with 8000(Other). + - name: info_category_8000 + type: info_category_8000 - name: hidef type: checkbox label: Show MVGroup HiDef Releases only diff --git a/src/Jackett.Common/Definitions/mvgroupmain.yml b/src/Jackett.Common/Definitions/mvgroupmain.yml index e5b2ee311..5082fd206 100644 --- a/src/Jackett.Common/Definitions/mvgroupmain.yml +++ b/src/Jackett.Common/Definitions/mvgroupmain.yml @@ -26,10 +26,8 @@ settings: - name: password type: password label: Password - - name: info_8000 - type: info - label: About MVGroup Categories - default: MVGroup does not return categories in its search results.
To add to your Apps' Torznab indexer, replace all categories with 8000(Other). + - name: info_category_8000 + type: info_category_8000 - name: hidef type: checkbox label: Show MVGroup HiDef Releases only diff --git a/src/Jackett.Common/Definitions/schema.json b/src/Jackett.Common/Definitions/schema.json index c0001d151..1c10146bb 100644 --- a/src/Jackett.Common/Definitions/schema.json +++ b/src/Jackett.Common/Definitions/schema.json @@ -229,7 +229,7 @@ }, "type":{ "type": "string", - "enum": ["info", "text", "password", "checkbox", "select", "info_cookie", "info_flaresolverr", "info_useragent"] + "enum": ["info", "text", "password", "checkbox", "select", "info_category_8000", "info_cookie", "info_flaresolverr", "info_useragent"] }, "default": { "oneOf": [ diff --git a/src/Jackett.Common/Definitions/torrentby.yml b/src/Jackett.Common/Definitions/torrentby.yml index cf27c1f36..a94bd55fa 100644 --- a/src/Jackett.Common/Definitions/torrentby.yml +++ b/src/Jackett.Common/Definitions/torrentby.yml @@ -31,10 +31,8 @@ settings: type: checkbox label: Add RUS to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified. default: false - - name: info_8000 - type: info - label: About torrent.by Categories - default: torrent.by does not return categories in its search results.
To add to your Apps' Torznab indexer, replace all categories with 8000(Other). + - name: info_category_8000 + type: info_category_8000 search: paths: diff --git a/src/Jackett.Common/Definitions/torrentkitty.yml b/src/Jackett.Common/Definitions/torrentkitty.yml index af568e9b0..92c297c24 100644 --- a/src/Jackett.Common/Definitions/torrentkitty.yml +++ b/src/Jackett.Common/Definitions/torrentkitty.yml @@ -30,10 +30,8 @@ caps: settings: - name: info_flaresolverr type: info_flaresolverr - - name: info_8000 - type: info - label: About TorrentKitty Categories - default: TorrentKitty does not return categories in its search results.
To add to your Apps' Torznab indexer, replace all categories with 8000(Other). + - name: info_category_8000 + type: info_category_8000 search: paths: diff --git a/src/Jackett.Common/Definitions/torrentproject2.yml b/src/Jackett.Common/Definitions/torrentproject2.yml index 3fe6e28a1..4860659b4 100644 --- a/src/Jackett.Common/Definitions/torrentproject2.yml +++ b/src/Jackett.Common/Definitions/torrentproject2.yml @@ -43,10 +43,8 @@ settings: oldest: "created asc" seeders: seeders size: size - - name: info_8000 - type: info - label: About TorrentProject2 Categories - default: TorrentProject2 does not return categories in its search results.
To add to your Apps' Torznab indexer, replace all categories with 8000(Other). + - name: info_category_8000 + type: info_category_8000 download: selectors: diff --git a/src/Jackett.Common/Definitions/torrentz2nz.yml b/src/Jackett.Common/Definitions/torrentz2nz.yml index e2c6cd404..c80768cc0 100644 --- a/src/Jackett.Common/Definitions/torrentz2nz.yml +++ b/src/Jackett.Common/Definitions/torrentz2nz.yml @@ -24,10 +24,8 @@ caps: movie-search: [q] settings: - - name: info_8000 - type: info - label: About Torrentz2nz Categories - default: Torrentz2nz does not return categories in its search results.
To add to your Apps' Torznab indexer, replace all categories with 8000(Other). + - name: info_category_8000 + type: info_category_8000 search: paths: diff --git a/src/Jackett.Common/Definitions/zetorrents.yml b/src/Jackett.Common/Definitions/zetorrents.yml index 472d37108..39d08105a 100644 --- a/src/Jackett.Common/Definitions/zetorrents.yml +++ b/src/Jackett.Common/Definitions/zetorrents.yml @@ -36,10 +36,8 @@ caps: allowrawsearch: true settings: - - name: info_8000 - type: info - label: About zetorrents Categories - default: zetorrents does not return categories in its search results.
To add to your Apps' Torznab indexer, replace all categories with 8000(Other). + - name: info_category_8000 + type: info_category_8000 - name: multilang type: checkbox label: Replace MULTi by another language in release name diff --git a/src/Jackett.Common/Indexers/CardigannIndexer.cs b/src/Jackett.Common/Indexers/CardigannIndexer.cs index 580ce3b5d..72773f564 100644 --- a/src/Jackett.Common/Indexers/CardigannIndexer.cs +++ b/src/Jackett.Common/Indexers/CardigannIndexer.cs @@ -174,6 +174,9 @@ namespace Jackett.Common.Indexers case "info": item = new DisplayInfoConfigurationItem(itemName, Setting.Default); break; + case "info_category_8000": + item = new DisplayInfoConfigurationItem($"About {Definition.Name} Categories", $"{Definition.Name} does not return categories in its search results.
To add to your Apps' Torznab indexer, replace all categories with 8000(Other)."); + break; case "info_cookie": item = new DisplayInfoConfigurationItem("How to get the Cookie", "
  1. Login to this tracker with your browser
  2. If present in the login page, ensure you have the Remember me ticked and the Log Me Out if IP Changes unticked when you login
  3. Open the DevTools panel by pressing F12
  4. Select the Network tab
  5. Click on the Doc button (Chrome Browser) or HTML button (FireFox)
  6. Refresh the page by pressing F5
  7. Click on the first row entry
  8. Select the Headers tab on the Right panel
  9. Find 'cookie:' in the Request Headers section
  10. Select and Copy the whole cookie string (everything after 'cookie: ') and Paste here.
"); break; diff --git a/src/Jackett.Test/Resources/html-definition1.yml b/src/Jackett.Test/Resources/html-definition1.yml index 54d1f2985..f834c98f0 100644 --- a/src/Jackett.Test/Resources/html-definition1.yml +++ b/src/Jackett.Test/Resources/html-definition1.yml @@ -28,14 +28,10 @@ settings: created: created length: size seeders: seeders - - name: flaresolverr - type: info - label: FlareSolverr - default: This site may use Cloudflare DDoS Protection, therefore Jackett requires FlareSolver to access it. - - name: info_8000 - type: info - label: About testdefinition1 Categories - default: testdefinition1 does not return categories in its search results.
To add to your Apps' Torznab indexer, replace all categories with 8000(Other). + - name: info_flaresolverr + type: info_flaresolverr + - name: info_category_8000 + type: info_category_8000 search: # https://www.testdefinition1.cc/search?query=ubuntu&sort=created