torrent9-tel -> semi-private resolves #15217

e.g. `test/this/that`

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -64,6 +64,6 @@ body:
   id: screenshots
   attributes:
     label: Screenshots
-    description: Place any screenshots of the issue here if needed
+    description: Place any useful screenshots of the issue here, if needed (not a screenshot of the error textbox)
   validations:
     required: false

.github/workflows/issuebot.yml

@@ -48,4 +48,4 @@ jobs:
           WORKFLOW_REPO: ${{ github.event.repository.name }}
           WORKFLOW_REPO_OWNER: ${{ github.repository_owner }}
         run: |
-          node .github/workflows/scripts/redeliver-failed-deliveries.js
+          node .github/workflows/scripts/redeliver-failed-deliveries.mjs

.github/workflows/scripts/redeliver-failed-deliveries.mjs

@@ -1,5 +1,5 @@
-// This script uses GitHub's Octokit SDK to make API requests. For more information, see "[AUTOTITLE](/rest/guides/scripting-with-the-rest-api-and-javascript)."
-const { App, Octokit } = require("octokit");
+// This script uses GitHub's Octokit SDK to make API requests. For more information, see https://docs.github.com/en/rest/guides/scripting-with-the-rest-api-and-javascript?apiVersion=2022-11-28
+import { App, Octokit } from "octokit";
 
 const sleep = ms => new Promise(r => setTimeout(r, ms));
 let secondDelivery = true;

README.md

@@ -19,9 +19,9 @@ Developer note: The software implements the [Torznab](https://torznab.github.io/
 A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](https://github.com/webtor-io/go-jackett)
 
 #### Supported Systems
-* Windows 7 SP1 or greater
-* Linux [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/6.0/supported-os.md#linux)
-* macOS 10.15+ or greater
+* Windows 10 Version 1607+ or greater [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md#windows)
+* Linux [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md#linux)
+* macOS 12.0+ (Monterey) or greater [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md#macos)
 
 <details> <summary> <b> Supported Public Trackers </b> </summary>
 
@@ -50,7 +50,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * cpasbien
  * cpasbienClone
  * CrackingPatching
- * Demonoid
  * DivxTotal
  * dmhy
  * DonTorrent
@@ -64,6 +63,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * GamesTorrents
  * GkTorrent
  * GloDLS
+ * GTorrent.pro
  * Idope
  * Il Corsaro Nero
  * Internet Archive (archive.org)
@@ -91,6 +91,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * NoNaMe Club (NNM-Club)
  * Nyaa.si
  * OneJAV
+ * OxTorrent
  * ParnuXi
  * PC-torrent
  * PornoTorrent
@@ -118,7 +119,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * torrent.by
  * torrent-pirat
  * Torrent9
- * Torrent9 clone
  * Torrent911
  * TorrentFunk
  * TorrentDownloads
@@ -207,6 +207,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * SkTorrent-org
  * themixingbowl (TMB)
  * Toloka.to
+ * Torrent9-tel
  * TorrentMasters
  * Torrents-Local
  * TorrentDownload
@@ -214,7 +215,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Union Fansub
  * UniOtaku
  * xTorrenty
- * YggTorrent (YGG)
  * ZOMB
  * Ztracker
 </details>
@@ -224,10 +224,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * 0day.kiev
  * 1ptbar
  * 2 Fast 4 You [![(invite needed)][inviteneeded]](#)
- * 2xFree
  * 3ChangTrai (3CT)
  * 3D Torrents (3DT)
- * 4thD (4th Dimension)
+ * 4thD (4th Dimension) [![(invite needed)][inviteneeded]](#)
  * 52PT
  * 720pier
  * Abnormal
@@ -257,16 +256,16 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Azusa (梓喵) [![(invite needed)][inviteneeded]](#)
  * Back-ups
  * BakaBT [![(invite needed)][inviteneeded]](#)
- * BeiTai (备胎)
  * Beload
  * Best-Core
  * BeyondHD (BHD)
- * Bibliotik
+ * Bibliotik [![(invite needed)][inviteneeded]](#)
  * Bit-Bázis
  * BIT-HDTV
  * Bitded
  * Bithorlo (BHO)
  * BitHUmen [![(invite needed)][inviteneeded]](#)
+ * Bitpalace
  * BitPorn
  * Bitspyder
  * BitTorrentFiles
@@ -279,7 +278,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Brasil Tracker
  * BroadcasTheNet (BTN) [![(invite needed)][inviteneeded]](#)
  * BrokenStones [![(invite needed)][inviteneeded]](#)
- * BrSociety
  * BTArg
  * BTNext (BTNT) [![(invite needed)][inviteneeded]](#)
  * BTSCHOOL
@@ -322,7 +320,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * DocsPedia
  * Dream Tracker [![(invite needed)][inviteneeded]](#)
  * Drugari
- * Ebooks-Shares
+ * Ebooks-Shares [![(invite needed)][inviteneeded]](#)
  * Empornium (EMP) [![(invite needed)][inviteneeded]](#)
  * Enthralled
  * eShareNet
@@ -331,14 +329,14 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ExoticaZ (YourExotic)
  * ExtremeBits
  * F1Carreras
- * Falkon Vision Team
  * FANO.IN [![(invite needed)][inviteneeded]](#)
  * Fantastiko [![(invite needed)][inviteneeded]](#)
  * Fappaizuri
  * FearNoPeer
  * Femdomcult
+ * File-Shack
  * FileList (FL)
- * FinElite (FE) [![(invite needed)][inviteneeded]](#)
+ * FinElite (FE)
  * FinVip
  * Flux-Zone
  * Free Farm (自由农场)
@@ -363,12 +361,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HappyFappy
  * Hares Club (白兔俱乐部) [![(invite needed)][inviteneeded]](#)
  * Hawke-uno
+ * HD Dolby
  * HD-Club [![(invite needed)][inviteneeded]](#)
  * HD-Forever (HDF) [![(invite needed)][inviteneeded]](#)
- * HD-Olimpo
+ * HD-Olimpo [![(invite needed)][inviteneeded]](#)
  * HD-Only (HDO)
  * HD-Space (HDS)
- * HD-Torrents (HDT)
+ * HD-Torrents (HDT) [![(invite needed)][inviteneeded]](#)
  * HD-UNiT3D
  * HD4FANS [![(invite needed)][inviteneeded]](#)
  * HDArea (HDA)
@@ -389,12 +388,12 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDU
  * hdvbits
  * HDVIDEO
- * Heavens-Hell
  * Hebits
  * HellasHut
  * HHanClub
  * House of Devil
  * HQMusic
+ * HUDBT (蝴蝶) [![(invite needed)][inviteneeded]](#)
  * iAnon
  * ICC2022 (冰淇淋)
  * ilolicon PT
@@ -445,12 +444,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * MegamixTracker
  * MeseVilág (Fairytale World)
  * MetalGuru [![(invite needed)][inviteneeded]](#)
+ * METALWRKS
  * Milkie
  * MMA-Torrents [![(invite needed)][inviteneeded]](#)
  * MNV (Max-New-Vision)
  * MOJBLiNK
  * MonikaDesign (MDU)
- * MoreThanTV (MTV)
+ * MoreThanTV (MTV) [![(invite needed)][inviteneeded]](#)
  * MouseBits
  * Movie-Torrentz
  * MyAnonamouse (MAM)
@@ -481,7 +481,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * PiXELHD (PxHD) [![(invite needed)][inviteneeded]](#)
  * Plusteca
  * Polish Torrent (PTT)
- * PolishTracker
+ * PolishTracker [![(invite needed)][inviteneeded]](#)
  * Pornbay [![(invite needed)][inviteneeded]](#)
  * Portugas
  * PotUK
@@ -498,12 +498,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * PTLSP
  * PTSBAO (烧包) [![(invite needed)][inviteneeded]](#)
  * PTtime
+ * PTVicomo
  * Punk's Horror Tracker
- * PuntoTorrent
+ * PuntoTorrent [![(invite needed)][inviteneeded]](#)
  * PuTao (葡萄)
  * PWTorrents (PWT)
  * Qingwa (青蛙)
- * R3V WTF!
+ * R3V WTF! [![(invite needed)][inviteneeded]](#)
  * Racing4Everyone (R4E)
  * RacingForMe (RFM)
  * RareShare2
@@ -514,8 +515,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ReelFlix
  * Resurrect The Net [![(invite needed)][inviteneeded]](#)
  * RetroFlix
- * RevolutionTT
- * RM-HD
+ * RevolutionTT [![(invite needed)][inviteneeded]](#)
  * RocketHD
  * Romanian Metal Torrents (RMT)
  * RoTorrent
@@ -571,7 +571,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TheEmpire (TE)
  * TheLeachZone (TLZ)
  * TheScenePlace (TSP)
- * Thor's Land
  * TJUPT (北洋园PT)
  * TLFBits [![(invite needed)][inviteneeded]](#)
  * TmGHuB [![(invite needed)][inviteneeded]](#)
@@ -587,7 +586,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TOrrent-tuRK (TORK)
  * Torrent.LT
  * TorrentBD
- * TorrentBytes (TBy)
+ * TorrentBytes (TBy) [![(invite needed)][inviteneeded]](#)
  * TorrentCCF (TCCF)
  * TorrentDay (TD)
  * TorrentDD
@@ -604,16 +603,15 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TranceTraffic
  * Trellas (Magico) [![(invite needed)][inviteneeded]](#)
  * TreZzoR
+ * TurkSeed
  * TurkTorrent (TT)
  * TV Chaos UK (TVCUK)
- * TvRoad
  * TVstore
  * U2 (U2分享園@動漫花園) [![(invite needed)][inviteneeded]](#)
  * UBits
  * UHDBits
  * UltraHD
  * UnionGang
- * Universal-Torrents
  * UnlimitZ
  * upload.cx
  * UTOPIA
@@ -626,18 +624,19 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * x-ite.me (XM)
  * Xider-Torrent
  * XSpeeds (XS)
- * Xthor
+ * Xthor [![(invite needed)][inviteneeded]](#)
  * XtremeBytes
  * XWT-Classics
  * XWTorrents (XWT)
  * YDYPT (伊甸园PT)
+ * YggTorrent (YGG)
  * Zamunda.net
  * Zelka.org
  * ZmPT (织梦)
- * ZonaQ
+ * ZonaQ [![(invite needed)][inviteneeded]](#)
 </details>
 
-Trackers marked with [![(invite needed)][inviteneeded]](#) have no active maintainer and may be missing features or be broken. If you have an invite for them please send it to garfieldsixtynine -at- gmail.com or jacketttest -at- gmail.com to get them fixed/improved.
+Trackers marked with [![(invite needed)][inviteneeded]](#) have no active maintainer and may be broken or missing features. If you have an invite please send it to jacketttest [at] gmail [dot] com or garfieldsixtynine [at] gmail [dot] com get them fixed/improved.
 
 ### Jackett Torznab query syntax
 
@@ -686,7 +685,7 @@ Supported filters
 Filter | Condition
 -|-
 `type:<type>` | where the indexer type is equal to `<type>`
-`tag:<tag>` | where the indexer tags contains `<tag>`
+`tag:<tag>` | where the indexer tags contain `<tag>`
 `lang:<tag>` | where the indexer language start with `<lang>`
 `test:{passed\|failed}` | where the last indexer test performed `passed` or `failed`
 `status:{healthy\|failing\|unknown}` | where the indexer state is `healthy` (successfully operates in the last minutes), `failing` (generates errors in the recent call) or `unknown` (unused for a while)
@@ -709,7 +708,7 @@ The "filter" indexer at `/api/v2.0/indexers/!status:failing,test:passed` will qu
 A special "all" indexer is available at `/api/v2.0/indexers/all/results/torznab`.
 It will query all configured indexers and return the combined results.
 
-If your client supports multiple feeds it's recommended to add each indexer directly instead of using the all indexer.
+If your client supports multiple feeds it's recommended to add each indexer directly instead of using the "all" indexer.
 Using the "all" indexer has no advantages (besides reduced management overhead), the only disadvantages:
 * you lose control over indexer specific settings (categories, search modes, etc.)
 * mixing search modes (IMDB, query, etc.) might cause low-quality results
@@ -724,7 +723,7 @@ We recommend you install Jackett as a Windows service using the supplied install
 
 To get started with using the installer for Jackett, follow the steps below:
 
-1. Check if you need any .NET prerequisites installed, see https://docs.microsoft.com/en-us/dotnet/core/install/windows?tabs=net60#dependencies
+1. Check if you need any .NET prerequisites installed, see https://docs.microsoft.com/en-us/dotnet/core/install/windows?tabs=net80#dependencies
 2. Download the latest version of the Windows installer, "Jackett.Installer.Windows.exe" from the [releases](https://github.com/Jackett/Jackett/releases/latest) page.
 3. When prompted if you would like this app to make changes to your computer, select "yes".
 4. If you would like to install Jackett as a Windows Service, make sure the "Install as Windows Service" checkbox is filled.
@@ -737,35 +736,35 @@ When installed as a service the tray icon acts as a way to open/start/stop Jacke
 Jackett can also be run from the command line if you would like to see log messages (Ensure the server isn't already running from the tray/service). This can be done by using "JackettConsole.exe" (for Command Prompt), found in the Jackett data folder: "%ProgramData%\Jackett".
 
 
-## Install on Linux (AMDx64)
+## Installation on Linux (AMDx64)
 On most operating systems all the required dependencies will already be present. In case they are not, you can refer to this page https://github.com/dotnet/core/blob/master/Documentation/linux-prereqs.md
 
 ### Install as service
 A) Command to download and install the latest package and run the Jackett service:
 
-`cd /opt && f=Jackett.Binaries.LinuxAMDx64.tar.gz && release=$(wget -q https://github.com/Jackett/Jackett/releases/latest -O - | grep "title>Release" | cut -d " " -f 4) && sudo wget -Nc https://github.com/Jackett/Jackett/releases/download/$release/"$f" && sudo tar -xzf "$f" && sudo rm -f "$f" && cd Jackett* && sudo ./install_service_systemd.sh && systemctl status jackett.service && cd - && echo -e "\nVisit http://127.0.0.1:9117"`
+`cd /opt && f=Jackett.Binaries.LinuxAMDx64.tar.gz && sudo wget -Nc https://github.com/Jackett/Jackett/releases/latest/download/"$f" && sudo tar -xzf "$f" && sudo rm -f "$f" && cd Jackett* && sudo ./install_service_systemd.sh && systemctl status jackett.service && cd - && echo -e "\nVisit http://127.0.0.1:9117"`
 
 B) Or manually:
 
-1. Download and extract the latest `Jackett.Binaries.LinuxAMDx64.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases)
+1. Download and extract the latest `Jackett.Binaries.LinuxAMDx64.tar.gz` release from the [releases](https://github.com/Jackett/Jackett/releases/latest) page
 2. To install Jackett as a service, open a Terminal, cd to the jackett folder, and run `sudo ./install_service_systemd.sh` You need root permissions to install the service. The service will start on each logon. You can always stop it by running `systemctl stop jackett.service` from Terminal. You can start it again using `systemctl start jackett.service`. Logs are stored as usual under `~/.config/Jackett/log.txt` and also in `journalctl -u jackett.service`.
 
 ### Run without installing as a service
-Download and extract the latest `Jackett.Binaries.LinuxAMDx64.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases), open a Terminal, cd to the jackett folder, and run Jackett with the command `./jackett`
+Download and extract the latest `Jackett.Binaries.LinuxAMDx64.tar.gz` release from the [releases](https://github.com/Jackett/Jackett/releases/latest) page, open a Terminal, cd to the jackett folder, and run Jackett with the command `./jackett`
 
 ### home directory
 If you want to run it with a user without a /home directory you need to add `Environment=XDG_CONFIG_HOME=/path/to/folder` to your systemd file, this folder will be used to store your config files.
 
 
-## Install on Linux (ARMv7 or above)
+## Installation on Linux (ARMv7 or above)
 On most operating systems all the required dependencies will already be present. In case they are not, you can refer to this page https://github.com/dotnet/core/blob/master/Documentation/linux-prereqs.md
 
 ### Install as service
-1. Download and extract the latest `Jackett.Binaries.LinuxARM32.tar.gz` or `Jackett.Binaries.LinuxARM64.tar.gz` (32 bit is the most common on ARM) release from the [releases page](https://github.com/Jackett/Jackett/releases)
+1. Download and extract the latest `Jackett.Binaries.LinuxARM32.tar.gz` or `Jackett.Binaries.LinuxARM64.tar.gz` (32 bit is the most common on ARM) release from the [releases](https://github.com/Jackett/Jackett/releases/latest) page
 2. To install Jackett as a service, open a Terminal, cd to the jackett folder, and run `sudo ./install_service_systemd.sh` You need root permissions to install the service. The service will start on each logon. You can always stop it by running `systemctl stop jackett.service` from Terminal. You can start it again using `systemctl start jackett.service`. Logs are stored as usual under `~/.config/Jackett/log.txt` and also in `journalctl -u jackett.service`.
 
 ### Run without installing as a service
-Download and extract the latest `Jackett.Binaries.LinuxARM32.tar.gz` or `Jackett.Binaries.LinuxARM64.tar.gz` (32 bit is the most common on ARM) release from the [releases page](https://github.com/Jackett/Jackett/releases), open a Terminal, cd to the jackett folder and run Jackett with the command `./jackett`
+Download and extract the latest `Jackett.Binaries.LinuxARM32.tar.gz` or `Jackett.Binaries.LinuxARM64.tar.gz` (32 bit is the most common on ARM) release from the [releases](https://github.com/Jackett/Jackett/releases/latest) page, open a Terminal, cd to the jackett folder and run Jackett with the command `./jackett`
 
 ### home directory
 If you want to run it with a user without a /home directory you need to add `Environment=XDG_CONFIG_HOME=/path/to/folder` to your systemd file, this folder will be used to store your config files.
@@ -779,7 +778,7 @@ If you want to run it with a user without a /home directory you need to add `Env
        * Debian/Ubuntu: `apt-get install libcurl4-openssl-dev`
        * Redhat/Fedora: `yum install libcurl-devel`
        * For other distros see the  [Curl docs](http://curl.haxx.se/dlwiz/?type=devel).
- 3. Download and extract the latest `Jackett.Binaries.Mono.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases) and run Jackett using mono with the command `mono --debug JackettConsole.exe`.
+ 3. Download and extract the latest `Jackett.Binaries.Mono.tar.gz` release from the [releases](https://github.com/Jackett/Jackett/releases/latest) page and run Jackett using mono with the command `mono --debug JackettConsole.exe`.
  4. (Optional) To install Jackett as a service, open the Terminal and run `sudo ./install_service_systemd_mono.sh` You need root permissions to install the service. The service will start on each logon. You can always stop it by running `systemctl stop jackett.service` from Terminal. You can start it again it using `systemctl start jackett.service`. Logs are stored as usual under `~/.config/Jackett/log.txt` and also in `journalctl -u jackett.service`.
 
 If you want to run it with a user without a /home directory you need to add `Environment=XDG_CONFIG_HOME=/path/to/folder` to your systemd file, this folder will be used to store your config files.
@@ -794,18 +793,17 @@ On a CentOS/RedHat 7 system: [jewflix.jackett](https://galaxy.ansible.com/jewfli
 On an Ubuntu 16 system: [chrisjohnson00.jackett](https://galaxy.ansible.com/chrisjohnson00/jackett)
 
 
-### Installation on Linux or macOS via Homebrew
-
-[Homebrew Formulae - Jackett](https://formulae.brew.sh/formula/jackett)
+## Uninstallation on Linux
+`wget https://raw.githubusercontent.com/Jackett/Jackett/master/uninstall_service_systemd.sh --quiet -O -|sudo bash`
 
 
 ## Installation on macOS
 
 ### Prerequisites
-macOS 10.15+ or greater
+macOS 12.0+ (Monterey) or greater
 
 ### Install as service
-1. Download and extract the latest `Jackett.Binaries.macOS.tar.gz` or `Jackett.Binaries.macOSARM64.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases).
+1. Download and extract the latest `Jackett.Binaries.macOS.tar.gz` or `Jackett.Binaries.macOSARM64.tar.gz` release from the [releases](https://github.com/Jackett/Jackett/releases/latest) page.
 2. Open the extracted folder and double-click on `install_service_macos`.
 3. If the installation was a success, you can close the Terminal window.
 
@@ -813,7 +811,16 @@ The service will start on each logon. You can always stop it by running `launchc
 Logs are stored as usual under `~/.config/Jackett/log.txt`.
 
 ### Run without installing as a service
-Download and extract the latest `Jackett.Binaries.macOS.tar.gz` or `Jackett.Binaries.macOSARM64.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases) and run Jackett with the command `./jackett`.
+Download and extract the latest `Jackett.Binaries.macOS.tar.gz` or `Jackett.Binaries.macOSARM64.tar.gz` release from the [releases](https://github.com/Jackett/Jackett/releases/latest) page and run Jackett with the command `./jackett`.
+
+
+## Uninstallation on macOS
+`curl -sSL https://raw.githubusercontent.com/Jackett/Jackett/master/uninstall_jackett_macos| bash`
+
+
+## Installation on Linux or macOS via Homebrew
+
+[Homebrew Formulae - Jackett](https://formulae.brew.sh/formula/jackett)
 
 
 ## Installation using Docker
@@ -870,7 +877,7 @@ If you have enabled the Jackett internal cache, but have an indexer for which yo
 ## Configuring FlareSolverr
 Some indexers are protected by Cloudflare or similar services and Jackett is not able to solve the challenges.
 For these cases, [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr) has been integrated into Jackett. This service is in charge of solving the challenges and configuring Jackett with the necessary cookies.
-Setting up this service is optional, most indexers don't need it.
+Setting up this service is optional; most indexers don't need it.
 * Install FlareSolverr service (following their instructions)
 * Configure **FlareSolverr API URL** in Jackett. For example: http://172.17.0.2:8191
 * It is recommended to keep the default value in **FlareSolverr Max Timeout (ms)**
@@ -939,8 +946,8 @@ git clone https://github.com/Jackett/Jackett.git
 cd Jackett/src
 
 # dotnet core version
-dotnet publish Jackett.Server -f net6.0 --self-contained -r osx-x64 -c Debug # takes care of everything
-./Jackett.Server/bin/Debug/net6.0/osx-x64/jackett # run jackett
+dotnet publish Jackett.Server -f net8.0 --self-contained -r osx-x64 -c Debug # takes care of everything
+./Jackett.Server/bin/Debug/net8.0/osx-x64/jackett # run jackett
 ```
 
 ### Linux
@@ -952,8 +959,8 @@ git clone https://github.com/Jackett/Jackett.git
 cd Jackett/src
 
 # dotnet core version
-dotnet publish Jackett.Server -f net6.0 --self-contained -r linux-x64 -c Debug # takes care of everything
-./Jackett.Server/bin/Debug/net6.0/linux-x64/jackett # run jackett
+dotnet publish Jackett.Server -f net8.0 --self-contained -r linux-x64 -c Debug # takes care of everything
+./Jackett.Server/bin/Debug/net8.0/linux-x64/jackett # run jackett
 ```
 
 ## Screenshots

azure-pipelines.yml

@@ -2,24 +2,36 @@
 name: $(majorVersion).$(minorVersion).$(patchVersion)
 variables:
   majorVersion: 0
-  minorVersion: 21
+  minorVersion: 22
   patchVersion: $[counter(variables['minorVersion'], 1)]  # this will reset when we bump minor
   jackettVersion: $(majorVersion).$(minorVersion).$(patchVersion)
   buildConfiguration: Release
-  netCoreFramework: net6.0
-  netCoreSdkVersion: 6.0.x
+  netCoreFramework: net8.0
+  netCoreSdkVersion: 8.0.x
   # system.debug: true
 
 trigger:
   batch: true
   branches:
     include:
-      - '*'
+      - master
+      - test/**
+  paths:
+    exclude:
+      - .github
+      - README.md
+      - CONTRIBUTING.md
 
 pr:
   branches:
     include:
-      - '*'
+      - master
+      - test/**
+  paths:
+    exclude:
+      - .github
+      - README.md
+      - CONTRIBUTING.md
 
 stages:
   - stage: BuildJackett
@@ -117,7 +129,7 @@ stages:
             displayName: Build DateTimeRoutines
             # this task is not mandatory since DateTimeRoutines is build in the next task, but the purpose is to fix:
             # error MSB4018: System.IO.IOException: The process cannot access the file
-            # '/home/vsts/work/1/net6.0-linux-musl-arm/src/DateTimeRoutines/bin/Release/netstandard2.0/DateTimeRoutines.deps.json'
+            # '/home/vsts/work/1/src/DateTimeRoutines/bin/Release/netstandard2.0/DateTimeRoutines.deps.json'
             # because it is being used by another process.
             inputs:
               command: build
@@ -419,7 +431,7 @@ stages:
               framework: $(netCoreFramework)
               runtime: osx-x64
             LinuxAMDx64:
-              buildDescription: Linux AMD x64
+              buildDescription: LinuxAMDx64
               imageName: ubuntu-22.04
               framework: $(netCoreFramework)
               runtime: linux-x64
@@ -442,22 +454,23 @@ stages:
               installationPath: $(Agent.ToolsDirectory)/dotnet
 
           - task: DotNetCoreCLI@2
-            displayName: Unit Tests (Mono, Linux and macOS)
-            condition: and(succeeded(), not(startsWith(variables['runtime'], 'win')))
+            displayName: Unit Tests & Code Coverage
             inputs:
               command: test
-              projects: '**/*.Test*/*.csproj'
-              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework)'
+              projects: '$(Build.SourcesDirectory)/src/**/*.Test*/*.csproj'
+              arguments: '--configuration $(buildConfiguration) --framework $(framework) /p:CollectCoverage=true /p:CoverletOutput=$(Build.SourcesDirectory)/coverlet/reports/coverage.cobertura.$(buildDescription).xml /p:CoverletOutputFormat=cobertura /p:IncludeTestAssembly=true /p:ExcludeByAttribute=TestSDKAutoGeneratedCode'
               testRunTitle: 'Unit - $(buildDescription) - $(Build.BuildId)'
 
-          - task: DotNetCoreCLI@2
-            displayName: Unit Tests & Code Coverage (Windows only)
+          - task: PublishPipelineArtifact@1
+            condition: and(succeeded(), not(startsWith(variables['runtime'], 'win')))
+            inputs:
+              targetPath: $(Build.SourcesDirectory)/coverlet/reports/
+
+          - task: DownloadPipelineArtifact@2
             condition: and(succeeded(), startsWith(variables['runtime'], 'win'))
             inputs:
-              command: test
-              projects: '**/*.Test*/*.csproj'
-              arguments: '--configuration $(buildConfiguration) --framework $(framework) /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura'
-              testRunTitle: 'Unit - $(buildDescription) - $(Build.BuildId)'
+              downloadPath: $(Build.SourcesDirectory)/coverlet/reports/
+              itemPattern: '**/coverage.cobertura.*.xml'
 
           - task: DotNetCoreCLI@2
             displayName: Install Coverage ReportGenerator Tool (Windows only)
@@ -465,21 +478,29 @@ stages:
             inputs:
               command: custom
               custom: tool
-              arguments: install --tool-path . dotnet-reportgenerator-globaltool
+              arguments: install -g dotnet-reportgenerator-globaltool
 
           - task: PowerShell@2
             displayName: Generate Coverage Report (Windows only)
             condition: and(succeeded(), startsWith(variables['runtime'], 'win'))
             inputs:
               targetType: inline
-              script: ./reportgenerator -reports:$(Build.SourcesDirectory)/src/*.Test*/coverage.*.cobertura.xml -targetdir:$(Build.SourcesDirectory)/coverlet/reports -reporttypes:"Cobertura"
+              script: reportgenerator -reports:$(Build.SourcesDirectory)/coverlet/reports/**/coverage.cobertura.*.xml -targetdir:$(Build.SourcesDirectory)/coverlet/reports/final/ -sourcedirs:$(Build.SourcesDirectory)/src/ -reporttypes:"Cobertura"
 
           - task: PublishCodeCoverageResults@1
-            displayName: Publish Code Coverage (Windows only)
+            displayName: Publish Code Coverage
             condition: and(succeeded(), startsWith(variables['runtime'], 'win'))
             inputs:
               codeCoverageTool: Cobertura
-              summaryFileLocation: $(Build.SourcesDirectory)/coverlet/reports/Cobertura.xml
+              summaryFileLocation: $(Build.SourcesDirectory)/coverlet/reports/final/Cobertura.xml
+              pathToSources: $(Build.SourcesDirectory)/src/
+              additionalCodeCoverageFiles: $(Agent.TempDirectory)/*.trx
+              failIfCoverageEmpty: true
+
+          - task: PublishPipelineArtifact@1
+            condition: and(succeeded(), startsWith(variables['runtime'], 'win'))
+            inputs:
+              targetPath: $(Build.SourcesDirectory)/coverlet/reports/coverage.cobertura.Windows.net8.0.xml
 
   - stage: IntegrationTestJackett
     displayName: Integration Tests
@@ -558,20 +579,10 @@ stages:
               installationPath: $(Agent.ToolsDirectory)/dotnet
 
           - task: DotNetCoreCLI@2
-            displayName: Integration Tests (Mono, Linux and macOS)
-            condition: and(succeeded(), not(startsWith(variables['runtime'], 'win')))
+            displayName: Integration Tests
             inputs:
               command: test
-              projects: '**/*IntegrationTest*/*.csproj'
-              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework)'
-              testRunTitle: 'Integration - $(buildDescription) - $(Build.BuildId)'
-
-          - task: DotNetCoreCLI@2
-            displayName: Integration Tests (Windows only)
-            condition: and(succeeded(), startsWith(variables['runtime'], 'win'))
-            inputs:
-              command: test
-              projects: '**/*IntegrationTest*/*.csproj'
+              projects: '$(Build.SourcesDirectory)/src/**/*IntegrationTest*/*.csproj'
               arguments: '--configuration $(buildConfiguration) --framework $(framework)'
               testRunTitle: 'Integration - $(buildDescription) - $(Build.BuildId)'
 

install_service_systemd.sh

@@ -24,7 +24,7 @@ if systemctl is-active --quiet "${JACKETT_SERVICE}"; then
     if systemctl stop "${JACKETT_SERVICE}"; then
         echo "Service '${JACKETT_SERVICE}' stopped"
     else
-        echo "${BOLDRED}ERROR${NC}: The service '${JACKETT_SERVICE}' Can not be stopped"
+        echo "${BOLDRED}ERROR${NC}: The service '${JACKETT_SERVICE}' can not be stopped"
         exit 1
     fi
 

install_service_systemd_mono.sh

@@ -24,7 +24,7 @@ if systemctl is-active --quiet "${JACKETT_SERVICE}"; then
     if systemctl stop "${JACKETT_SERVICE}"; then
         echo "Service '${JACKETT_SERVICE}' stopped"
     else
-        echo "${BOLDRED}ERROR${NC}: The service '${JACKETT_SERVICE}' Can not be stopped"
+        echo "${BOLDRED}ERROR${NC}: The service '${JACKETT_SERVICE}' can not be stopped"
         exit 1
     fi
 

nuget.config

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-  </packageSources>
-</configuration>

src/Directory.Build.props

@@ -10,4 +10,8 @@
     <PropertyGroup Condition="'$(JackettProject)'=='true'">
         <PathMap>$(MSBuildProjectDirectory)=./$(MSBuildProjectName)/</PathMap>
     </PropertyGroup>
+
+    <PropertyGroup>
+        <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
+    </PropertyGroup>
 </Project>

src/Jackett.Common/Definitions/1337x.yml

@@ -21,9 +21,6 @@ links:
 legacylinks:
   - https://1337x.is/
   - https://1337x.gd/
-  - https://1337x.nocensor.art/
-  - https://1337x.unblockit.bio/
-  - https://1337x.unblockit.boo/
   - https://1337x.mrunblock.guru/
   - https://1337x.mrunblock.life/
   - https://1337x.unblockit.click/
@@ -40,6 +37,8 @@ legacylinks:
   - https://1337x.unblockit.dad/
   - https://1337x.unblockit.africa/
   - https://1337x.unblockit.casa/ # 502
+  - https://unblockit.sbs/ # 502
+  - https://unblockit.ong/ # 502
 
 caps:
   categorymappings:
@@ -133,10 +132,8 @@ caps:
   allowrawsearch: true
 
 settings:
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr
   - name: downloadlink
     type: select
     label: Download link

src/Jackett.Common/Definitions/1ptbar.yml

@@ -63,10 +63,8 @@ settings:
     options:
       desc: desc
       asc: asc
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr
   - name: info_tpp
     type: info
     label: Results Per Page
@@ -197,4 +195,4 @@ search:
     description:
       selector: td:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.8.11 2024-03-27
+# NexusPHP v1.8.12 2024-05-20

src/Jackett.Common/Definitions/3changtrai.yml

@@ -56,10 +56,8 @@ settings:
     options:
       desc: desc
       asc: asc
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr
   - name: info_tpp
     type: info
     label: Results Per Page

src/Jackett.Common/Definitions/52bt.yml

@@ -7,11 +7,12 @@ type: public
 encoding: UTF-8
 links:
   # Send any content to 52btbtbt@gmail.com to get the latest address. or visit https://521.52btbt.cyou/
-  - https://529048.xyz/
-  - https://529049.xyz/
   - https://www.529052.xyz/
+  - https://www.529053.xyz/
 legacylinks:
   - https://529050.xyz/
+  - https://529048.xyz/
+  - https://529049.xyz/
 
 caps:
   categorymappings:
@@ -53,14 +54,14 @@ settings:
       2: created
       1: size
       0: relevance
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr
 
 search:
   paths:
     - path: "search-{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}-{{ .Config.cat-id }}-{{ .Config.sort }}-1.html"
+  error:
+    - selector: :root:contains("Internal Server Error")
 
   rows:
     selector: div.ssbox

src/Jackett.Common/Definitions/Bittorrentfiles.yml

@@ -208,7 +208,7 @@ search:
         - name: replace
           args: ["Gestern", "Yesterday"]
         - name: append
-          args: " +01:00" # CET
+          args: "+01:00" # CET
     date_year:
       # 30.02.2018 23:12:50
       selector: td:nth-child(10):contains("."):contains(":")
@@ -217,7 +217,7 @@ search:
         - name: split
           args: ["b", 0]
         - name: append
-          args: " +01:00" # CET
+          args: "+01:00" # CET
         - name: dateparse
           args: "dd.MM.yyyy HH:mm:ss zzz"
     date:

src/Jackett.Common/Definitions/abtorrents.yml

@@ -86,10 +86,8 @@ settings:
   - name: cookie
     type: text
     label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
   - name: freeleech
     type: checkbox
     label: Search freeleech only

src/Jackett.Common/Definitions/aidoruonline.yml

@@ -35,10 +35,8 @@ settings:
   - name: cookie
     type: text
     label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
   - name: freeleech
     type: checkbox
     label: Search freeleech only

src/Jackett.Common/Definitions/aither-api.yml

@@ -178,4 +178,4 @@ search:
     minimumseedtime:
       # 5 days (as seconds = 5 x 24 x 60 x 60)
       text: 432000
-# json UNIT3D 8.0.2
+# json UNIT3D 8.1.3

src/Jackett.Common/Definitions/animeworld-api.yml

@@ -40,11 +40,15 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://animeworld.cx/\" target=\"_blank\">AnimeWorld</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://animeworld.cx/\" target=\"_blank\">AnimeWorld</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
     default: false
+  - name: single_file_release_use_filename
+    type: checkbox
+    label: Use filename as title for single file releases
+    default: true
   - name: sort
     type: select
     label: Sort requested from site
@@ -110,8 +114,15 @@ search:
   fields:
     category:
       selector: category_id
-    title:
+    title_optional:
       selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    files:
+      selector: num_file
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
     details:
       selector: details_link
     download:
@@ -133,17 +144,11 @@ search:
       selector: meta.genres
       filters:
         - name: re_replace
-          args: ["(?i)^None$", ""]
-        - name: re_replace
-          args: ["(?i)(Cinema TV)", "Cinema_TV"]
-        - name: re_replace
-          args: ["(?i)(Ficção científica)", "Ficção_científica"]
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
         - name: replace
           args: [" & ", "_&_"]
     description:
       text: "{{ .Result.genre }}"
-    files:
-      selector: num_file
     seeders:
       selector: seeders
     leechers:
@@ -171,12 +176,15 @@ search:
         100%: 0 # freeleech
         "*": 0 # catch errors
     uploadvolumefactor:
-      # api returns 0=false, 1=true
+      # api returns False, True
       selector: double_upload
       case:
-        0: 1 # normal
-        1: 2 # double
+        False: 1 # normal
+        True: 2 # double
+# global MR is 1.0 but torrents must be seeded for 7 days regardless of ratio
+#    minimumratio:
+#      text: 1.0
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 6.5.0
+# json UNIT3D 8.0.0

src/Jackett.Common/Definitions/anirena.yml

@@ -9,10 +9,8 @@ links:
   - https://www.anirena.com/
 
 settings:
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/audiences.yml

@@ -33,10 +33,8 @@ settings:
   - name: cookie
     type: text
     label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
   - name: freeleech
     type: checkbox
     label: Search freeleech only

src/Jackett.Common/Definitions/beload.yml

@@ -55,10 +55,8 @@ settings:
   - name: cookie
     type: text
     label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
   - name: sort
     type: select
     label: Sort requested from site

src/Jackett.Common/Definitions/bitbazis.yml

@@ -46,10 +46,8 @@ settings:
   - name: cookie
     type: text
     label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
   - name: freeleech
     type: checkbox
     label: Filter freeleech only

src/Jackett.Common/Definitions/bithorlo.yml

@@ -56,17 +56,13 @@ settings:
   - name: cookie
     type: text
     label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
   - name: useragent
     type: text
     label: User-Agent
   - name: info_useragent
-    type: info
-    label: How to get the User-Agent
-    default: "<ol><li>From the same place you fetched the cookie,</li><li>Find <b>'user-agent:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole user-agent string <i>(everything after 'user-agent: ')</i> and <b>Paste</b> here.</li></ol>"
+    type: info_useragent
   - name: freeleech
     type: checkbox
     label: Search freeleech only

src/Jackett.Common/Definitions/bitpalace.yml

@@ -0,0 +1,166 @@
+---
+id: bitpalace
+name: Bitpalace
+description: "Bitpalace is a Hungarian Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: hu-HU
+type: private
+encoding: UTF-8
+links:
+  - https://bitpalace.cc/
+
+caps:
+  categorymappings:
+    - {id: 8, cat: Movies/BluRay, desc: "BLUERAY ENG"}
+    - {id: 7, cat: Movies/BluRay, desc: "BLUERAY HUN"}
+    - {id: 15, cat: Movies/DVD, desc: "DVD-R ENG"}
+    - {id: 2, cat: Movies/DVD, desc: "DVD-R HUN"}
+    - {id: 9, cat: Books, desc: "Ebook ENG"}
+    - {id: 5, cat: Books, desc: "Ebook HUN"}
+    - {id: 40, cat: Other, desc: "EGYÉBB"}
+    - {id: 16, cat: Movies/HD, desc: "HD ENG"}
+    - {id: 1, cat: Movies/HD, desc: "HD HUN"}
+    - {id: 25, cat: TV/Anime, desc: "MESE ENG"}
+    - {id: 24, cat: TV/Anime, desc: "MESE HUN"}
+    - {id: 18, cat: PC/Games, desc: "PC game ISO"}
+    - {id: 21, cat: Console, desc: "PC game KONZOL"}
+    - {id: 17, cat: PC/Games, desc: "PC game RIP"}
+    - {id: 27, cat: PC/ISO, desc: "Program ISO"}
+    - {id: 26, cat: PC/Mobile-Other, desc: "Program MOBIL"}
+    - {id: 78, cat: PC/0day, desc: "Program RIP"}
+    - {id: 23, cat: TV/SD, desc: "Sor.DVD-R ENG"}
+    - {id: 22, cat: TV/SD, desc: "Sor.DVD-R HUN"}
+    - {id: 14, cat: TV/SD, desc: "Sor.XVID ENG"}
+    - {id: 4, cat: TV, desc: "Sorozat HUN"}
+    - {id: 13, cat: Movies/SD, desc: "XVID ENG"}
+    - {id: 3, cat: Movies/SD, desc: "XVID HUN"}
+    - {id: 12, cat: XXX/DVD, desc: "XXX DVD-R"}
+    - {id: 6, cat: XXX/x264, desc: "XXX HD"}
+    - {id: 10, cat: XXX/ImageSet, desc: "XXX/Képek"}
+    - {id: 11, cat: XXX/XviD, desc: "XXX XVID"}
+    - {id: 19, cat: Audio/Video, desc: "ZENE Klipp"}
+    - {id: 26, cat: Audio/MP3, desc: "ZENE MP3"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Filter freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: login
+  method: form
+  form: form[action="/login_check"]
+  inputs:
+    _username: "{{ .Config.username }}"
+    _password: "{{ .Config.password }}"
+    logout: ""
+  error:
+    - selector: h3[style="color:red"]
+  test:
+    path: my
+    selector: a[href="/logout"]
+
+search:
+  paths:
+    - path: browse
+  keywordsfilters:
+    # the site uses % for wildcard
+    - name: re_replace
+      args: ["[^a-zA-Z0-9]+", "%"]
+  inputs:
+    $raw: "{{ range .Categories }}cat[]={{.}}&{{end}}"
+    search: "{{ .Keywords }}"
+    # 0 active, 1 incldead, 2 onlydead
+    incldead: 1
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+    # does not support imdbid searches
+
+  rows:
+    selector: "table#torrenttable > tbody > tr:has(a[onclick]){{ if .Config.freeleech }}:has(img[src$=\"/freeicon.png\"]){{ else }}{{ end }}"
+
+  fields:
+    categorydesc:
+      selector: img
+      attribute: alt
+    title:
+      selector: a[onclick]
+      remove: style
+    _id:
+      selector: a[onclick]
+      attribute: onclick
+      filters:
+        - name: regexp
+          args: (\d+)
+    details:
+      text: "details?id={{ .Result._id }}"
+    download:
+      text: "/raw/download?id={{ .Result._id }}&name={{ .Result.title }}.torrent"
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    description:
+      case:
+        img[src$="/yes.png"]: "Verified"
+        img[src$="/nincs.png"]: "Unverified"
+    poster:
+      selector: img[width="200"][height="250"]
+      attribute: src
+    date:
+      selector: td:nth-last-child(6)
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    size:
+      selector: td:nth-last-child(5)
+    grabs:
+      selector: td:nth-last-child(4)
+    seeders:
+      selector: td:nth-last-child(3)
+    leechers:
+      selector: td:nth-last-child(2)
+    downloadvolumefactor:
+      case:
+        img[src$="/freeicon.png"]: 0
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img[src$="/2xup.jpg"]: 2
+        "*": 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# engine n/a

src/Jackett.Common/Definitions/bitporn.yml

@@ -32,6 +32,7 @@ caps:
     - {id: 426, cat: XXX, desc: "Fetish"}
     - {id: 457, cat: XXX, desc: "Fisting"}
     - {id: 453, cat: XXX, desc: "Gangbang"}
+    - {id: 459, cat: XXX, desc: "Game"}
     - {id: 427, cat: XXX, desc: "Gay / Bi"}
     - {id: 412, cat: XXX, desc: "Hair"}
     - {id: 411, cat: XXX, desc: "Hardcore"}

src/Jackett.Common/Definitions/blutopia-api.yml

@@ -178,4 +178,4 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 8.0.2
+# json UNIT3D 8.1.3

src/Jackett.Common/Definitions/btschool.yml

@@ -39,10 +39,8 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr
   - name: info_tpp
     type: info
     label: Results Per Page

src/Jackett.Common/Definitions/byrutor.yml

@@ -6,11 +6,12 @@ language: ru-RU
 type: public
 encoding: UTF-8
 links:
-  - https://thebyrut.org/
+  - https://byruthub.org/
 legacylinks:
   - https://byrutor.org/
   - https://byrutdb.org/
   - https://byrut.org/
+  - https://thebyrut.org/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/capybarabr.yml

@@ -18,7 +18,9 @@ caps:
     - {id: 5, cat: Console, desc: "Jogos"}
     - {id: 9, cat: PC, desc: "Programas"}
     - {id: 10, cat: Audio, desc: "HQs"}
-    - {id: 11, cat: Books, desc: "Livros"}
+    - {id: 11, cat: Books/EBook, desc: "Livros"}
+    - {id: 12, cat: Other, desc: "Cursos"}
+    - {id: 13, cat: Books/Mags, desc: "Revistas"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/carphunter.yml

@@ -54,10 +54,8 @@ settings:
   - name: cookie
     type: text
     label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
   - name: freeleech
     type: checkbox
     label: Search freeleech only

src/Jackett.Common/Definitions/carpt.yml

@@ -193,4 +193,4 @@ search:
     description:
       selector: td.rowfollow:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP vv1.8.11 2024-03-11
+# NexusPHP v1.8.12 2024-05-10

src/Jackett.Common/Definitions/cinemamovies.yml

@@ -42,10 +42,8 @@ settings:
   - name: cookie
     type: text
     label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
   - name: freeleech
     type: checkbox
     label: Search freeleech only

src/Jackett.Common/Definitions/cinematik.yml

@@ -174,10 +174,10 @@ search:
       case:
         False: 1 # normal
         True: 2 # double
-# global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
+# global MR is 0.6 but torrents must be seeded for 7 days regardless of ratio
 #    minimumratio:
-#      text: 0.4
+#      text: 0.6
     minimumseedtime:
       # 3 days (as seconds = 3 x 24 x 60 x 60)
       text: 259200
-# json UNIT3D 8.0.2
+# json UNIT3D 8.1.0

src/Jackett.Common/Definitions/cpabien.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://cpasbien-vf.li/
+  - https://feminalpes.fr/
 legacylinks:
   - https://www.cpasbiens.cz/
   - https://www.cpasbiens.bz/
@@ -26,6 +26,7 @@ legacylinks:
   - https://jardattraction.fr/
   - https://cpasbien-vf.fr/
   - https://cpasbien-vf.pics/
+  - https://cpasbien-vf.li/
 
 caps:
   categories:
@@ -37,10 +38,8 @@ caps:
     movie-search: [q]
 
 settings:
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr
   - name: info_8000
     type: info
     label: About cpasbien Categories
@@ -79,11 +78,16 @@ search:
   inputs:
     story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ end }}"
   # does not support imdbid search and does not return imdb link in results.
+
   keywordsfilters:
     # if searching for season packs with S01 to saison 1 #9712
     - name: re_replace
       args: ["(?i)\\b(?:S0?)(\\d{1,3})\\b", "saison $1"]
 
+  headers:
+    # site blocks Linux UAs, so slightly alter the Windows UA here (e.g. Safari/537.36 > Safari/537.35)
+    User-Agent: ["Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.35"]
+
   rows:
     selector: div#gauche > table > tbody > tr:has(a), div#dle-content > a.cover2
 

src/Jackett.Common/Definitions/crabpt.yml

@@ -10,15 +10,16 @@ links:
 
 caps:
   categorymappings:
-    - {id: 408, cat: Audio, desc: "音乐"}
-    - {id: 409, cat: Other, desc: "其他"}
-    - {id: 407, cat: TV/Sport, desc: "体育竞技"}
+    - {id: 401, cat: Movies, desc: "电影 / Movies"}
+    - {id: 402, cat: TV, desc: "电视剧 / TVSeries"}
+    - {id: 413, cat: TV/Other, desc: "短剧 / Playlet"}
+    - {id: 408, cat: Audio, desc: "音乐 / Music"}
+    - {id: 405, cat: TV/Anime, desc: "动漫 / Anime"}
     - {id: 406, cat: Audio/Video, desc: "MV"}
-    - {id: 403, cat: Movies, desc: "综艺/真人秀"}
-    - {id: 402, cat: TV, desc: "电视剧"}
-    - {id: 405, cat: TV, desc: "动画"}
-    - {id: 404, cat: TV/Anime, desc: "纪录片"}
-    - {id: 401, cat: Movies, desc: "电影"}
+    - {id: 403, cat: Movies, desc: "综艺 / TV Shows"}
+    - {id: 407, cat: TV/Sport, desc: "体育竞技 / Sports"}
+    - {id: 409, cat: Other, desc: "其他 / Other"}
+    - {id: 404, cat: TV/Documentary, desc: "纪录片 / Documentary"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/crazyspirits.yml

@@ -113,10 +113,8 @@ settings:
   - name: cookie
     type: text
     label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
   - name: freeleech
     type: checkbox
     label: Search freeleech only

src/Jackett.Common/Definitions/crt2fa.yml

@@ -1,7 +1,7 @@
 ---
 id: crt2fa
 name: CRT2FA
-description: "Cathode-Ray.Tube (CRT) is a Private Torrent Tracker for CLASSIC MOVIES / TV.  Cookie Login for 2FA use."
+description: "Cathode-Ray.Tube (CRT) is a Private Torrent Tracker for CLASSIC MOVIES / TV. This indexer uses cookie login for 2FA."
 language: en-GB
 type: private
 encoding: UTF-8
@@ -26,9 +26,7 @@ settings:
     type: text
     label: Cookie
   - name: info_cookie
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+    type: info_cookie
   - name: freeleech
     type: checkbox
     label: Search freeleech only

src/Jackett.Common/Definitions/demonoid.yml

@@ -1,404 +0,0 @@
----
-id: demonoid
-name: Demonoid
-description: "Demonoid is a Semi-Private torrent site for MOVIES / TV / GENERAL"
-language: en-US
-type: semi-private
-encoding: UTF-8
-links:
-  - https://www.demonoid.is/
-  - https://www.dnoid.to/
-  - https://www.dnoid.pw/
-  - https://demonoid.torrentbay.st/
-legacylinks:
-  - https://demonoid.unblockit.boo/
-  - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.ly/
-  - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.tor2web.to/
-  - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.tor2web.link/ # Origin is unreachable Error code 523
-  - https://demonoid.mrunblock.guru/
-  - https://demonoid.torrentbay.to/
-  - https://demonoid.unblockit.click/
-  - https://demonoid.unblockit.asia/
-  - https://demonoid.unblockit.mov/
-  - https://demonoid.mrunblock.life/
-  - https://demonoid.unblockit.rsvp/
-  - https://demonoid.nocensor.click/
-  - https://demonoid.unblockit.vegas/
-  - https://demonoid.unblockit.esq/
-  - https://demonoid.unblockit.zip/
-  - https://demonoid.unblockit.foo/
-  - https://demonoid.unblockit.ing/
-  - https://demonoid.torrentbay.net/
-  - https://demonoid.mrunblock.bond/
-  - https://demonoid.nocensor.cloud/
-  - https://demonoid.unblockit.date/
-  - https://demonoid.unblockit.dad/
-  - https://demonoid.unblockit.africa/
-  - https://demonoid.unblockit.casa/ # 302
-
-caps:
-  categorymappings:
-    # fetch these from https://www.demonoid.is/cached/torrent_categories_script.js?v5
-    # Everything
-    - {id: 0, cat: Other/Misc, desc: "Miscellaneous"}
-    # Applications
-    - {id: 1, cat: PC/Mobile-Android, desc: "Applications Android"}
-    - {id: 2, cat: PC/Mobile-iOS, desc: "Applications phone / Ipod touch"}
-    - {id: 3, cat: PC, desc: "Applications Linux"}
-    - {id: 4, cat: PC/Mac, desc: "Applications Mac"}
-    - {id: 5, cat: PC/Mobile-Other, desc: "Applications Mobile phone"}
-    - {id: 6, cat: PC, desc: "Applications PocketPC"}
-    - {id: 7, cat: PC/0day, desc: "Applications Windows"}
-    # Audio Books
-    - {id: 8, cat: Audio/Audiobook, desc: "Audio Books Action"}
-    - {id: 9, cat: Audio/Audiobook, desc: "Audio Books Adventure"}
-    - {id: 10, cat: Audio/Audiobook, desc: "Audio Books Biography"}
-    - {id: 11, cat: Audio/Audiobook, desc: "Audio Books Childrens"}
-    - {id: 12, cat: Audio/Audiobook, desc: "Audio Books Computers and Technology"}
-    - {id: 13, cat: Audio/Audiobook, desc: "Audio Books Contemporary"}
-    - {id: 14, cat: Audio/Audiobook, desc: "Audio Books Cooking"}
-    - {id: 15, cat: Audio/Audiobook, desc: "Audio Books Crafts and Hobbies"}
-    - {id: 16, cat: Audio/Audiobook, desc: "Audio Books Educational"}
-    - {id: 17, cat: Audio/Audiobook, desc: "Audio Books Fantasy"}
-    - {id: 18, cat: Audio/Audiobook, desc: "Audio Books Fiction"}
-    - {id: 19, cat: Audio/Audiobook, desc: "Audio Books General"}
-    - {id: 20, cat: Audio/Audiobook, desc: "Audio Books History"}
-    - {id: 21, cat: Audio/Audiobook, desc: "Audio Books Horror"}
-    - {id: 22, cat: Audio/Audiobook, desc: "Audio Books Humor"}
-    - {id: 23, cat: Audio/Audiobook, desc: "Audio Books Literary"}
-    - {id: 24, cat: Audio/Audiobook, desc: "Audio Books Magazine"}
-    - {id: 25, cat: Audio/Audiobook, desc: "Audio Books Mainstream"}
-    - {id: 26, cat: Audio/Audiobook, desc: "Audio Books Medicine and Health"}
-    - {id: 27, cat: Audio/Audiobook, desc: "Audio Books Mystery and Suspense"}
-    - {id: 28, cat: Audio/Audiobook, desc: "Audio Books Newspaper"}
-    - {id: 29, cat: Audio/Audiobook, desc: "Audio Books Nonfiction"}
-    - {id: 30, cat: Audio/Audiobook, desc: "Audio Books Other"}
-    - {id: 31, cat: Audio/Audiobook, desc: "Audio Books Paranormal"}
-    - {id: 32, cat: Audio/Audiobook, desc: "Audio Books Religion"}
-    - {id: 33, cat: Audio/Audiobook, desc: "Audio Books Romance"}
-    - {id: 34, cat: Audio/Audiobook, desc: "Audio Books RPG"}
-    - {id: 35, cat: Audio/Audiobook, desc: "Audio Books Sci-Fi"}
-    - {id: 36, cat: Audio/Audiobook, desc: "Audio Books Self-help"}
-    - {id: 37, cat: Audio/Audiobook, desc: "Audio Books Suspense"}
-    - {id: 38, cat: Audio/Audiobook, desc: "Audio Books Textbook"}
-    - {id: 39, cat: Audio/Audiobook, desc: "Audio Books Thriller"}
-    - {id: 40, cat: Audio/Audiobook, desc: "Audio Books Western"}
-    - {id: 41, cat: Audio/Audiobook, desc: "Audio Books Young Adult"}
-    # Books
-    - {id: 42, cat: Books/EBook, desc: "Books Action and Adventure"}
-    - {id: 43, cat: Books/EBook, desc: "Books Biography"}
-    - {id: 44, cat: Books/EBook, desc: "Books Childrens"}
-    - {id: 45, cat: Books/EBook, desc: "Books Computers and Technology"}
-    - {id: 46, cat: Books/EBook, desc: "Books Contemporary"}
-    - {id: 47, cat: Books/EBook, desc: "Books Cooking"}
-    - {id: 48, cat: Books/EBook, desc: "Books Crafts and Hobbies"}
-    - {id: 49, cat: Books/EBook, desc: "Books Educational"}
-    - {id: 50, cat: Books/EBook, desc: "Books Fantasy"}
-    - {id: 51, cat: Books/EBook, desc: "Books Fiction"}
-    - {id: 52, cat: Books/EBook, desc: "Books General"}
-    - {id: 53, cat: Books/EBook, desc: "Books History"}
-    - {id: 54, cat: Books/EBook, desc: "Books Horror"}
-    - {id: 55, cat: Books/EBook, desc: "Books Humor"}
-    - {id: 56, cat: Books/EBook, desc: "Books Literary"}
-    - {id: 57, cat: Books/Mags, desc: "Books Magazine"}
-    - {id: 58, cat: Books/EBook, desc: "Books Mainstream"}
-    - {id: 59, cat: Books/EBook, desc: "Books Medicine and Health"}
-    - {id: 60, cat: Books/EBook, desc: "Books Mystery and Suspense"}
-    - {id: 61, cat: Books/EBook, desc: "Books Newspaper"}
-    - {id: 62, cat: Books/EBook, desc: "Books Nonfiction"}
-    - {id: 63, cat: Books/EBook, desc: "Books Other"}
-    - {id: 64, cat: Books/EBook, desc: "Books Paranormal"}
-    - {id: 65, cat: Books/EBook, desc: "Books Religion"}
-    - {id: 66, cat: Books/EBook, desc: "Books Romance"}
-    - {id: 67, cat: Books/EBook, desc: "Books RPG"}
-    - {id: 68, cat: Books/EBook, desc: "Books Sci-Fi"}
-    - {id: 69, cat: Books/EBook, desc: "Books Self-help"}
-    - {id: 70, cat: Books/EBook, desc: "Books Suspense"}
-    - {id: 71, cat: Books/EBook, desc: "Books Textbook"}
-    - {id: 72, cat: Books/EBook, desc: "Books Thriller"}
-    - {id: 73, cat: Books/EBook, desc: "Books Western"}
-    - {id: 74, cat: Books/EBook, desc: "Books Young Adult"}
-    # Comics
-    - {id: 75, cat: Books/Comics, desc: "Comics Action / Adventure"}
-    - {id: 76, cat: Books/Comics, desc: "Comics Crime"}
-    - {id: 77, cat: Books/Comics, desc: "Comics Drama"}
-    - {id: 78, cat: Books/Comics, desc: "Comics Fantasy"}
-    - {id: 79, cat: Books/Comics, desc: "Comics Historical fiction"}
-    - {id: 80, cat: Books/Comics, desc: "Comics Horror"}
-    - {id: 81, cat: Books/Comics, desc: "Comics Illustrated novel"}
-    - {id: 82, cat: Books/Comics, desc: "Comics Manga"}
-    - {id: 83, cat: Books/Comics, desc: "Comics Other"}
-    - {id: 84, cat: Books/Comics, desc: "Comics Real-Life"}
-    - {id: 85, cat: Books/Comics, desc: "Comics Sci-Fi"}
-    - {id: 86, cat: Books/Comics, desc: "Comics Super Hero"}
-    # Games
-    - {id: 87, cat: PC, desc: "Games DOS"}
-    - {id: 88, cat: Console/Other, desc: "Games Dreamcast"}
-    - {id: 89, cat: Console/Other, desc: "Games Emulators"}
-    - {id: 90, cat: Console/Other, desc: "Games GameBoy"}
-    - {id: 91, cat: Console/Other, desc: "Games GameCube"}
-    - {id: 92, cat: PC, desc: "Games Linux"}
-    - {id: 93, cat: PC/Mac, desc: "Games Mac"}
-    - {id: 94, cat: PC/Mobile-Other, desc: "Games Mobile phone"}
-    - {id: 95, cat: Console/NDS, desc: "Games Nintendo DS"}
-    - {id: 96, cat: Console/Other, desc: "Games Palm"}
-    - {id: 97, cat: Console/PS3, desc: "Games Playstation"}
-    - {id: 98, cat: Console/Other, desc: "Games PocketPC"}
-    - {id: 99, cat: Console/PSP, desc: "Games PSP"}
-    - {id: 100, cat: Console/Wii, desc: "Games Wii / Wii U"}
-    - {id: 101, cat: PC/Games, desc: "Games Windows"}
-    - {id: 102, cat: Console/XBox, desc: "Games XBox"}
-    # Anime
-    - {id: 103, cat: TV/Anime, desc: "Anime Action"}
-    - {id: 104, cat: TV/Anime, desc: "Anime Adventure"}
-    - {id: 105, cat: TV/Anime, desc: "Anime Comedy"}
-    - {id: 106, cat: TV/Anime, desc: "Anime Drama"}
-    - {id: 107, cat: TV/Anime, desc: "Anime Fantasy"}
-    - {id: 108, cat: TV/Anime, desc: "Anime Horror"}
-    - {id: 109, cat: TV/Anime, desc: "Anime Other"}
-    - {id: 157, cat: TV/Anime, desc: "Anime Romance"}
-    - {id: 158, cat: TV/Anime, desc: "Anime Sci-Fi"}
-    # Movies
-    - {id: 151, cat: Movies, desc: "Movies Action"}
-    - {id: 110, cat: Movies, desc: "Movies Adventure"}
-    - {id: 236, cat: Movies, desc: "Movies Animation"}
-    - {id: 111, cat: Movies, desc: "Movies Biography"}
-    - {id: 152, cat: Movies, desc: "Movies Comedy"}
-    - {id: 112, cat: Movies, desc: "Movies Concerts"}
-    - {id: 113, cat: Movies, desc: "Movies Crime"}
-    - {id: 114, cat: Movies, desc: "Movies Documentary"}
-    - {id: 115, cat: Movies, desc: "Movies Drama"}
-    - {id: 116, cat: Movies, desc: "Movies Family"}
-    - {id: 153, cat: Movies, desc: "Movies Fantasy"}
-    - {id: 117, cat: Movies, desc: "Movies Horror"}
-    - {id: 118, cat: Movies, desc: "Movies Musical"}
-    - {id: 119, cat: Movies, desc: "Movies Mystery"}
-    - {id: 120, cat: Movies, desc: "Movies Other"}
-    - {id: 121, cat: Movies, desc: "Movies Romance"}
-    - {id: 154, cat: Movies, desc: "Movies Sci-Fi"}
-    - {id: 159, cat: Movies, desc: "Movies Short-Film"}
-    - {id: 160, cat: Movies, desc: "Movies Sports"}
-    - {id: 161, cat: Movies, desc: "Movies Thriller"}
-    - {id: 162, cat: Movies, desc: "Movies Trailers"}
-    - {id: 163, cat: Movies, desc: "Movies War"}
-    - {id: 164, cat: Movies, desc: "Movies Western"}
-    # Music
-    - {id: 122, cat: Audio, desc: "Music Alternative"}
-    - {id: 123, cat: Audio, desc: "Music Bluegrass"}
-    - {id: 124, cat: Audio, desc: "Music Blues"}
-    - {id: 125, cat: Audio, desc: "Music Childrens"}
-    - {id: 126, cat: Audio, desc: "Music Christian"}
-    - {id: 127, cat: Audio, desc: "Music Classical"}
-    - {id: 128, cat: Audio, desc: "Music Comedy"}
-    - {id: 129, cat: Audio, desc: "Music Contemporary African"}
-    - {id: 130, cat: Audio, desc: "Music Country"}
-    - {id: 131, cat: Audio, desc: "Music Dance / Disco"}
-    - {id: 132, cat: Audio, desc: "Music Drum and Bass"}
-    - {id: 133, cat: Audio, desc: "Music Electro / Techno"}
-    - {id: 134, cat: Audio, desc: "Music Folk"}
-    - {id: 165, cat: Audio, desc: "Music Gospel"}
-    - {id: 166, cat: Audio, desc: "Music Grunge"}
-    - {id: 167, cat: Audio, desc: "Music Hip-Hop / Rap"}
-    - {id: 168, cat: Audio, desc: "Music Indie"}
-    - {id: 169, cat: Audio, desc: "Music Industrial"}
-    - {id: 170, cat: Audio, desc: "Music J-Pop"}
-    - {id: 171, cat: Audio, desc: "Music Jazz"}
-    - {id: 172, cat: Audio, desc: "Music Latin American"}
-    - {id: 173, cat: Audio, desc: "Music Melodic"}
-    - {id: 174, cat: Audio, desc: "Music Metal"}
-    - {id: 175, cat: Audio, desc: "Music Other"}
-    - {id: 176, cat: Audio, desc: "Music Pop"}
-    - {id: 177, cat: Audio, desc: "Music Punk"}
-    - {id: 178, cat: Audio, desc: "Music Radio Show"}
-    - {id: 179, cat: Audio, desc: "Music Reggae"}
-    - {id: 180, cat: Audio, desc: "Music Rhythm and blues"}
-    - {id: 181, cat: Audio, desc: "Music Rock"}
-    - {id: 182, cat: Audio, desc: "Music Soul"}
-    - {id: 183, cat: Audio, desc: "Music Soundtrack"}
-    - {id: 184, cat: Audio, desc: "Music Trance"}
-    - {id: 185, cat: Audio, desc: "Music Trip Hop"}
-    # Music Videos
-    - {id: 135, cat: Audio/Video, desc: "Music Videos Alternative"}
-    - {id: 136, cat: Audio/Video, desc: "Music Videos Bluegrass"}
-    - {id: 137, cat: Audio/Video, desc: "Music Videos Blues"}
-    - {id: 138, cat: Audio/Video, desc: "Music Videos Childrens"}
-    - {id: 139, cat: Audio/Video, desc: "Music Videos Christian"}
-    - {id: 186, cat: Audio/Video, desc: "Music Videos Classical"}
-    - {id: 187, cat: Audio/Video, desc: "Music Videos Comedy"}
-    - {id: 188, cat: Audio/Video, desc: "Music Videos Contemporary African"}
-    - {id: 189, cat: Audio/Video, desc: "Music Videos Country"}
-    - {id: 190, cat: Audio/Video, desc: "Music Videos Dance / Disco"}
-    - {id: 191, cat: Audio/Video, desc: "Music Videos Drum and Bass"}
-    - {id: 192, cat: Audio/Video, desc: "Music Videos Electro / Techno"}
-    - {id: 193, cat: Audio/Video, desc: "Music Videos Folk"}
-    - {id: 194, cat: Audio/Video, desc: "Music Videos Gospel"}
-    - {id: 195, cat: Audio/Video, desc: "Music Videos Grunge"}
-    - {id: 196, cat: Audio/Video, desc: "Music Videos Hip-Hop / Rap"}
-    - {id: 197, cat: Audio/Video, desc: "Music Videos Indie"}
-    - {id: 198, cat: Audio/Video, desc: "Music Videos Industrial"}
-    - {id: 199, cat: Audio/Video, desc: "Music Videos J-Pop"}
-    - {id: 200, cat: Audio/Video, desc: "Music Videos Jazz"}
-    - {id: 201, cat: Audio/Video, desc: "Music Videos Latin American"}
-    - {id: 202, cat: Audio/Video, desc: "Music Videos Melodic"}
-    - {id: 203, cat: Audio/Video, desc: "Music Videos Metal"}
-    - {id: 204, cat: Audio/Video, desc: "Music Videos Other"}
-    - {id: 205, cat: Audio/Video, desc: "Music Videos Pop"}
-    - {id: 206, cat: Audio/Video, desc: "Music Videos Punk"}
-    - {id: 207, cat: Audio/Video, desc: "Music Videos Radio Show"}
-    - {id: 208, cat: Audio/Video, desc: "Music Videos Reggae"}
-    - {id: 209, cat: Audio/Video, desc: "Music Videos Rhythm and blues"}
-    - {id: 210, cat: Audio/Video, desc: "Music Videos Rock"}
-    - {id: 211, cat: Audio/Video, desc: "Music Videos Soul"}
-    - {id: 212, cat: Audio/Video, desc: "Music Videos Soundtrack"}
-    - {id: 213, cat: Audio/Video, desc: "Music Videos Trance"}
-    - {id: 214, cat: Audio/Video, desc: "Music Videos Trip Hop"}
-    # Pictures
-    - {id: 140, cat: Other, desc: "Pictures Art"}
-    - {id: 141, cat: Other, desc: "Pictures Commercial"}
-    - {id: 142, cat: Other, desc: "Pictures Glamour"}
-    - {id: 215, cat: Other, desc: "Pictures Other"}
-    - {id: 216, cat: Other, desc: "Pictures Photojournalism"}
-    - {id: 217, cat: Other, desc: "Pictures Snapshots"}
-    - {id: 218, cat: Other, desc: "Pictures Sports"}
-    - {id: 219, cat: Other, desc: "Pictures Wildlife"}
-    # TV
-    - {id: 155, cat: TV, desc: "TV Action"}
-    - {id: 143, cat: TV, desc: "TV Adventure"}
-    - {id: 144, cat: TV, desc: "TV Biography"}
-    - {id: 145, cat: TV, desc: "TV Cartoons"}
-    - {id: 146, cat: TV, desc: "TV Comedy"}
-    - {id: 147, cat: TV, desc: "TV Concerts"}
-    - {id: 148, cat: TV, desc: "TV Crime"}
-    - {id: 149, cat: TV, desc: "TV Documentary"}
-    - {id: 156, cat: TV, desc: "TV Drama"}
-    - {id: 220, cat: TV, desc: "TV Family"}
-    - {id: 221, cat: TV, desc: "TV Fantasy"}
-    - {id: 222, cat: TV, desc: "TV Horror"}
-    - {id: 223, cat: TV, desc: "TV Musical"}
-    - {id: 224, cat: TV, desc: "TV Mystery"}
-    - {id: 225, cat: TV, desc: "TV Other"}
-    - {id: 226, cat: TV, desc: "TV Reality"}
-    - {id: 227, cat: TV, desc: "TV Romance"}
-    - {id: 228, cat: TV, desc: "TV Sci-Fi"}
-    - {id: 229, cat: TV, desc: "TV Short film"}
-    - {id: 230, cat: TV, desc: "TV Sports"}
-    - {id: 231, cat: TV, desc: "TV Talk show"}
-    - {id: 232, cat: TV, desc: "TV Thriller"}
-    - {id: 233, cat: TV, desc: "TV Trailers"}
-    - {id: 234, cat: TV, desc: "TV War"}
-    - {id: 235, cat: TV, desc: "TV Western"}
-    # cat 7 Miscellaneous has no subcats
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: cookie
-    type: text
-    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Access this tracker with your browser</li><li>click on the <b>Apply Filter</b> button on the page to invoke the search and solve the challenge</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: _
-    options:
-      _: created
-      S: seeders desc
-      s: seeders asc
-      B: size desc
-      b: size asc
-
-login:
-  method: cookie
-  inputs:
-    cookie: "{{ .Config.cookie }}"
-  test:
-    path: /
-    selector: a[href^="/account_handler.php"]
-
-download:
-  infohash:
-    hash:
-      selector: tr:has(td:contains("Torrent hash"))
-      filters:
-        # 907617B7 070AACB6 08CC213C 5277368D 217C1666
-        - name: replace
-          args: [" ", ""]
-        - name: regexp
-          args: ([A-F|0-9]{40})
-    title:
-      selector: td.ctable_header
-      filters:
-        - name: replace
-          args: ["Details for ", ""]
-
-search:
-  paths:
-    # https://www.demonoid.is/files/?category=0&subcategory=0&quality=0&seeded=2&external=2&query=&sort=S
-    # https://www.demonoid.is/files/?c154&language=0&quality=0&seeded=2&query=world&to=1&sort=
-    # https://www.demonoid.is/files/?seeded=2&language=0&quality=0&to=1&query=world
-    - path: files/
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}&{{end}}"
-    # 0 seeded, 1 unseeded, 2 both
-    seeded: 2
-    # 0 all
-    quality: 0
-    # 0 Demonoid, 1 External, 2 Both
-    external: 2
-    # search in titles only
-    to: "{{ if .Query.IMDBID }}{{ else }}1{{ end }}"
-    query: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    sort: "{{ re_replace .Config.sort \"_\" \"\" }}"
-    # does not return imdb link in results
-
-  rows:
-    selector: table.font_12px tbody tr:has(td[class^="tone_1"]):not(:has(script))
-    after: 1
-    dateheaders:
-      selector: td.added_today:not(:contains("Sponsored links"))
-      filters:
-        - name: replace
-          args: ["Added ", ""]
-        - name: replace
-          args: ["on ", ""]
-
-  fields:
-    category:
-      selector: a.subcategory
-      attribute: href
-      optional: true
-      default: 0
-      filters:
-        - name: querystring
-          args: subcategory
-    title:
-      selector: a[href^="/files/details/"]
-    details:
-      selector: a[href^="/files/details/"]
-      attribute: href
-    download:
-      selector: a[href^="/files/details/"]
-      attribute: href
-    description:
-      selector: td:nth-last-child(8)
-    size:
-      selector: td:nth-last-child(6)
-    grabs:
-      selector: td:nth-last-child(4)
-    seeders:
-      selector: td:nth-last-child(3)
-    leechers:
-      selector: td:nth-last-child(2)
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/desitorrents-api.yml

@@ -6,10 +6,10 @@ language: en-US
 type: private
 encoding: UTF-8
 links:
-  - https://desitorrents.rocks/
   - https://torrent.desi/
 legacylinks:
   - https://desitorrents.tv/
+  - https://desitorrents.rocks/
 
 caps:
   categorymappings:
@@ -54,7 +54,7 @@ settings:
   - name: info_activity
     type: info
     label: Account Inactivity
-    default: "<ul><li>Accounts are regarded as inactive when users fail to sign into their accounts for more than 3 months (90 days). Inactive accounts are automatically disabled by a script that runs once every day.</li><li>For new accounts, members must generate some activity by downloading or uploading torrents in the first month (30 days) of their memberships.</li><li>Donors are exempt from automatic account disabling due to inactivity. If you wish to always maintain an active account consider donating.</li></ul>"
+    default: "Inactive accounts will be disabled after 3 months of inactivity, 1 month for new accounts. Members must generate some download or upload activity at least once every 3 months."
 
 login:
   path: /api/torrents

src/Jackett.Common/Definitions/devil-torrents.yml

@@ -60,10 +60,8 @@ settings:
     options:
       POLISH: POLISH
       MULTi POLISH: MULTi POLISH
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr
 
 login:
   path: logowanie

src/Jackett.Common/Definitions/digitalcore.yml

@@ -25,6 +25,7 @@ caps:
     - {id: 13, cat: TV/UHD, desc: Tv/2160p}
     - {id: 14, cat: TV/HD, desc: Tv/BluRay}
     - {id: 12, cat: TV/HD, desc: Tv/PACKS}
+    - {id: 15, cat: TV/Sport, desc: Tv/SPORTS}
     - {id: 17, cat: Other, desc: Unknown}
     - {id: 18, cat: PC/0day, desc: Apps/0DAY}
     - {id: 20, cat: PC/ISO, desc: Apps/PC}
@@ -63,10 +64,8 @@ settings:
   - name: cookie
     type: text
     label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
   - name: freeleech
     type: checkbox
     label: Search freeleech only

src/Jackett.Common/Definitions/discfan.yml

@@ -184,4 +184,4 @@ search:
           args: "cat={{ .Result.category_title }} - "
     minimumratio:
       text: 0.9
-# NexusPHP v1.8.11 2024-03-27
+# NexusPHP v1.8.12 2024-05-10

src/Jackett.Common/Definitions/divteam.yml

@@ -59,9 +59,7 @@ settings:
     type: text
     label: Cookie
   - name: info_cookie
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+    type: info_cookie
   - name: freeleech
     type: checkbox
     label: Filter freeleech only

src/Jackett.Common/Definitions/dmhy.yml

@@ -42,10 +42,8 @@ caps:
     book-search: [q]
 
 settings:
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr
 
 search:
   paths:

src/Jackett.Common/Definitions/electro-torrent.yml

@@ -58,17 +58,13 @@ settings:
   - name: cookie
     type: text
     label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
   - name: useragent
     type: text
     label: User-Agent
   - name: info_useragent
-    type: info
-    label: How to get the User-Agent
-    default: "<ol><li>From the same place you fetched the cookie,</li><li>Find <b>'user-agent:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole user-agent string <i>(everything after 'user-agent: ')</i> and <b>Paste</b> here.</li></ol>"
+    type: info_useragent
   - name: multilang
     type: checkbox
     label: Replace MULTi by another language in release name

src/Jackett.Common/Definitions/empornium2fa.yml

@@ -1,7 +1,7 @@
 ---
 id: empornium2fa
 name: Empornium2FA
-description: "this indexer uses a cookie login for Empornium for those that want to use 2FA"
+description: "Empornium (EMP) is a Private Torrent Tracker for 3X. This indexer uses cookie login for 2FA."
 language: en-US
 type: private
 encoding: UTF-8
@@ -69,10 +69,8 @@ settings:
   - name: cookie
     type: text
     label: Cookie
-  - name: infocookie
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
   - name: freeleech
     type: checkbox
     label: Search freeleech only

src/Jackett.Common/Definitions/enthralled2fa.yml

@@ -24,9 +24,7 @@ settings:
     type: text
     label: Cookie
   - name: info_cookie
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+    type: info_cookie
   - name: freeleech
     type: checkbox
     label: Search freeleech only

src/Jackett.Common/Definitions/ex-torrenty.yml

@@ -85,7 +85,7 @@ search:
     # does not support imdbid searching, or have imdb in results
 
   rows:
-    selector: table[width="100%"] > tbody > tr:has(a[href^="torrent/"])
+    selector: table[width="100%"] > tbody > tr:has(a[href*="torrent/"])
 
   fields:
     category:
@@ -117,9 +117,9 @@ search:
         ":contains(\"GSM/PDA\")": 31
         ":contains(\"Inne\")": 32
     title_phase1:
-      selector: a[href^="torrent/"]
+      selector: a[href*="torrent/"]
     title_multilang:
-      selector: a[href^="torrent/"]
+      selector: a[href*="torrent/"]
       filters:
         - name: re_replace
           args: ["(?i)\\b(MULTI(?!.*(?:POLISH|ENGLISH|\\bPL\\b)))\\b", "{{ .Config.multilanguage }}"]
@@ -128,10 +128,10 @@ search:
     title:
       text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
     details:
-      selector: a[href^="torrent/"]
+      selector: a[href*="torrent/"]
       attribute: href
     download:
-      selector: a[href^="torrent/"]
+      selector: a[href*="torrent/"]
       attribute: href
       filters:
         - name: replace

src/Jackett.Common/Definitions/exitorrent-org.yml

@@ -46,10 +46,8 @@ settings:
   - name: cookie
     type: text
     label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -106,7 +104,7 @@ search:
       args: [" +(?:19|20)\\d{2} *$", ""]
 
   rows:
-    selector: table[class="text"][border="0"][cellspacing="0"][cellpadding="4"] > tbody > tr:has(a[href^="details.php?id="]):has(td[class*="tableBody1"])
+    selector: table[class="text"][border="0"][cellspacing="0"][cellpadding="4"] > tbody > tr:has(a[href^="details.php?id="]):has(td[class*="tableBody1"], td[class*="tableBody1B"])
     filters:
       - name: andmatch
 
@@ -118,9 +116,9 @@ search:
         - name: querystring
           args: cat
     title_raw:
-      selector: a[href^="details.php?id="]
+      selector: div[class="span_title"] > a[href^="details.php?id="]
     title_stripped:
-      selector: a[href^="details.php?id="]
+      selector: div[class="span_title"] > a[href^="details.php?id="]
       filters:
         - name: re_replace
           args: ["^(.*/)(.*)$", "$2"]
@@ -131,8 +129,11 @@ search:
       selector: a[href^="details.php?id="]
       attribute: href
     download:
-      selector: a[href^="download.php/"], a[href^="downloadfl.php/"]
-      attribute: href
+      selector: div.span_icon > a[onclick^="return downloadTorrent"]
+      attribute: onclick
+      filters:
+        - name: re_replace
+          args: ["^return downloadTorrent\\('([^']+)', '([^']+)', ''\\);$", "download.php/$1/$2.torrent"]
     genre:
       selector: div.span_title span div
     _language:

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

@@ -10,8 +10,6 @@ links:
   - https://extratorrent.ninjaproxy1.com/
   - https://extratorrent.proxyninja.org/
 legacylinks:
-  - https://extratorrent.nocensor.art/
-  - https://extratorrent.unblockit.bio/
   - https://extratorrent.unblockit.boo/
   - https://extratorrent.mrunblock.guru/
   - https://extratorrent.unblockit.click/
@@ -19,7 +17,6 @@ legacylinks:
   - https://extratorrent.unblockit.mov/
   - https://extratorrent.mrunblock.life/
   - https://extratorrent.unblockit.rsvp/
-  - https://extratorrent.nocensor.click/
   - https://extratorrent.unblockit.vegas/
   - https://extratorrent.unblockit.esq/
   - https://extratorrent.unblockit.zip/
@@ -31,6 +28,8 @@ legacylinks:
   - https://extratorrent.unblockit.dad/
   - https://extratorrent.unblockit.africa/
   - https://extratorrent.unblockit.casa/ # 502
+  - https://unblockit.sbs/ # 502
+  - https://unblockit.ong/ # 502
 
 caps:
   categorymappings:
@@ -87,10 +86,8 @@ caps:
     book-search: [q]
 
 settings:
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr
 
 search:
   paths:

src/Jackett.Common/Definitions/exttorrents.yml

@@ -96,10 +96,8 @@ settings:
     options:
       desc: desc
       asc: asc
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr
 
 download:
   selectors:

src/Jackett.Common/Definitions/eztv.yml

@@ -12,7 +12,7 @@ links:
   - https://eztv.yt/
   - https://eztv1.xyz/
   - https://eztv.abcproxy.org/
-  - https://eztv.unblockit.casa/
+  - https://eztv.unblockit.ong/
   - https://eztv.unblockninja.com/
   - https://eztv.ninjaproxy1.com/
   - https://eztv.proxyninja.org/
@@ -27,7 +27,6 @@ legacylinks:
   - https://eztv.unblockit.mov/
   - https://eztv.mrunblock.life/
   - https://eztv.unblockit.rsvp/
-  - https://eztv.nocensor.click/
   - https://eztv.unblockit.vegas/
   - https://eztv.unblockit.esq/
   - https://eztv.unblockit.zip/
@@ -40,6 +39,8 @@ legacylinks:
   - https://eztv.unblockit.date/
   - https://eztv.unblockit.dad/
   - https://eztv.unblockit.africa/
+  - https://eztv.unblockit.casa/
+  - https://eztv.unblockit.sbs/
 
 caps:
   categories:

src/Jackett.Common/Definitions/f1carreras-api.yml

@@ -18,6 +18,9 @@ caps:
     - {id: 6, cat: TV/Sport, desc: "Formula E"}
     - {id: 7, cat: TV/Sport, desc: "MotoGP"}
     - {id: 8, cat: TV/Sport, desc: "Nascar"}
+    - {id: 9, cat: TV/Sport, desc: "Formula 3"}
+    - {id: 10, cat: TV/Sport, desc: "DTM"}
+    - {id: 11, cat: TV/Sport, desc: "Rally"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/falkonvisionteam.yml

@@ -1,157 +0,0 @@
----
-id: falkonvisionteam
-name: Falkon Vision Team
-description: "Falkon Vision Team is a CROATIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: hr-HR
-type: private
-encoding: UTF-8
-links:
-  - http://falkonvision-team.com/ # does not support https, CA expired March 2018
-
-caps:
-  categorymappings:
-    - {id: 16, cat: Audio/Audiobook, desc: "Audio knjige"}
-    - {id: 10, cat: Movies/BluRay, desc: "Blue Ray"}
-    - {id: 6, cat: TV/Documentary, desc: "Dokumentarci"}
-    - {id: 9, cat: Movies/DVD, desc: "DVD"}
-    - {id: 4, cat: Movies/DVD, desc: "DVDRip"}
-    - {id: 12, cat: Books/EBook, desc: "E-KNJIGE"}
-    - {id: 3, cat: Other, desc: "FVT"}
-    - {id: 13, cat: Movies/HD, desc: "HD Rip"}
-    - {id: 14, cat: Audio/Video, desc: "Koncerti"}
-    - {id: 7, cat: Audio, desc: "Muzika"}
-    - {id: 15, cat: TV, desc: "Serije"}
-    - {id: 8, cat: TV/Sport, desc: "Sport"}
-    - {id: 5, cat: TV, desc: "TV Rip"}
-    - {id: 11, cat: Movies/Other, desc: "Video spotovi"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Filter freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: added
-    options:
-      added: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_activity
-    type: info
-    label: Account Inactivity
-    default: "To keep records updated reguarly, all inactive accounts will be deleted after 60 days of inactivity."
-
-login:
-  path: login.php?
-  method: form
-  form: form[action="takelogin.php"]
-  captcha:
-    type: image
-    selector: img#regimage
-    input: imagestring
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    logout: ""
-  error:
-    - selector: table:contains("Greska")
-  test:
-    path: index.php
-    selector: a[href*="/logout.php?logouthash="]
-
-search:
-  paths:
-    - path: browse.php
-  keywordsfilters:
-    - name: re_replace
-      args: ["[\\s]+", "%"]
-  inputs:
-    do: search
-    keywords: "{{ .Keywords }}"
-    # t_name, t_description, t_both, t_uploader, t_genre
-    # searching t_name yields no results!
-    search_type: t_both
-    # does not support multi category searching so defaulting to all.
-    category: 0
-    include_dead_torrents: yes
-    sort: "{{ if .Config.freeleech }}free{{ else }}{{ .Config.sort }}{{ end }}"
-    order: "{{ if .Config.freeleech }}asc{{ else }}{{ .Config.type }}{{ end }}"
-    # does not return imdb link in results and t_genre does not return imdbid search results
-
-  rows:
-    selector: "table.sortable tr:has(a[href*=\"/download.php?id=\"]){{ if .Config.freeleech }}:has(img[src$=\"/freedownload.gif\"]){{ else }}{{ end }}"
-
-  fields:
-    category:
-      selector: a[href*="/browse.php?category="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    title:
-      selector: a[href*="/details.php?id="]
-    details:
-      selector: a[href*="/details.php?id="]
-      attribute: href
-    download:
-      selector: a[href*="/download.php?id="]
-      attribute: href
-    poster:
-      selector: img[src*="/torrents/images/"]
-      attribute: src
-    date:
-      selector: td:nth-child(2)
-      # auto adjusted by site account profile
-      filters:
-        - name: regexp
-          args: "(\\d{2}-\\d{2}-\\d{2} \\d{2}:\\d{2})"
-        - name: dateparse
-          args: "dd-MM-yy HH:mm"
-    size:
-      selector: td:nth-last-child(5)
-    grabs:
-      selector: td:nth-last-child(4)
-    seeders:
-      selector: td:nth-last-child(3)
-    leechers:
-      selector: td:nth-last-child(2)
-    description:
-      # Wait: 4 h
-      # Cekanje: 4 h
-      selector: div.tooltip-content > div:last-child
-    downloadvolumefactor:
-      case:
-        img[src$="/freedownload.gif"]: 0
-        img[src$="/silverdownload.gif"]: 0.5
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[src$="/x2.gif"]: 2
-        "*": 1
-    minimumseedtime:
-      # 60 hours (as seconds = 60 x 60 x 60)
-      text: 216000
-# TS Special Edition v.7.4

src/Jackett.Common/Definitions/fearnopeer.yml

@@ -175,4 +175,4 @@ search:
 # Maintain global ratio above 0.5 or downloads will get disabled. No MST.
     minimumratio:
       text: 0.51
-# json UNIT3D 8.0.2
+# json UNIT3D 8.1.3

src/Jackett.Common/Definitions/file-shack.yml

@@ -0,0 +1,176 @@
+---
+id: file-shack
+name: File-Shack
+description: "File-Shack is a Private tracker for MOVIES / TV / GENERAL"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://file-shack.xyz/
+
+caps:
+  categorymappings:
+    - {id: 6, cat: PC/0day, desc: "Apps: Windows"}
+    - {id: 7, cat: PC/Mac, desc: "Apps: Mac"}
+    - {id: 8, cat: PC, desc: "Apps: Linux"}
+    - {id: 75, cat: Movies/DVD, desc: "Movies: DVD"}
+    - {id: 26, cat: Movies/BluRay, desc: "Movies: Blu-Ray"}
+    - {id: 42, cat: Movies/HD, desc: "Movies: FHD-HD"}
+    - {id: 50, cat: Movies/WEB-DL, desc: "Movies: Web-Dl"}
+    - {id: 74, cat: Movies/SD, desc: "Movies: SD"}
+    - {id: 49, cat: Movies/UHD, desc: "Movies: 4k"}
+    - {id: 46, cat: Movies/3D, desc: "Movies: 3D"}
+    - {id: 24, cat: Movies, desc: "Movies: Packs"}
+    - {id: 28, cat: Movies/Other, desc: "Movies: Cartoons"}
+    - {id: 47, cat: XXX, desc: "Movies: XXX"}
+    - {id: 41, cat: TV/HD, desc: "TV: HD"}
+    - {id: 52, cat: TV/WEB-DL, desc: "TV: WEB-DL"}
+    - {id: 48, cat: TV, desc: "TV: Packs"}
+    - {id: 9, cat: TV/Documentary, desc: "TV: Documentaries"}
+    - {id: 22, cat: Audio/MP3, desc: "Music: MP3"}
+    - {id: 23, cat: Audio/Lossless, desc: "Music: FLAC"}
+    - {id: 25, cat: Audio/Video, desc: "Music: Video"}
+    - {id: 27, cat: Audio, desc: "Music: Pack"}
+    - {id: 53, cat: PC/Games, desc: "Games: Pc"}
+    - {id: 54, cat: Console, desc: "Games: PsP"}
+    - {id: 76, cat: Audio/Audiobook, desc: "Books: Audio"}
+    - {id: 77, cat: Books/EBook, desc: "Books: eBooks"}
+    - {id: 78, cat: TV/UHD, desc: "TV: 4k"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: id
+    options:
+      id: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_results
+    type: info
+    label: Search results
+    default: "If you are not getting results, then access the site with your browser and mark as read all PMs."
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Be active here, you must login at least once a month. Also, not downloading anything is considered being inactive (except if you're an uploader or VIP). The accounts inactive for 3 months are deleted."
+
+login:
+  path: account-login.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: div.myFrame:contains("Access Denied")
+  test:
+    path: index.php
+    selector: a[href^="account-logout.php"]
+
+search:
+  paths:
+    # https://file-shack.xyz/torrents-search.php?c22=1&c23=1&c76=1&c77=1&search=&incldead=0&freeleech=0&inclrosub=0
+    - path: torrents-search.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
+    # 0 only active 1 incl dead 2 only dead
+    incldead: 1
+    # 0 all 1 not freeleech 2 only freeleech
+    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+
+  rows:
+    selector: table.ttable_headinner > tbody > tr
+
+  fields:
+    category:
+      selector: a[href^="torrents.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: title
+    details:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    poster:
+      selector: a[href^="torrents-details.php?id="]:not(a[onmouseover*="images/nocover.png"])
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: src=([^\s]+)
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    size:
+      selector: td:nth-child(4)
+    date:
+      # 15.11.21<br>07:47
+      selector: td:nth-child(5)
+      # auto adjusted by site account profile
+      filters:
+        - name: dateparse
+          args: "d.MM.yyHH:mm"
+    grabs:
+      selector: td:nth-child(7)
+    seeders:
+      selector: td:nth-child(8)
+    leechers:
+      selector: td:nth-child(9)
+    genre:
+      selector: a:contains("Genre:")
+      filters:
+        - name: replace
+          args: ["Genre: ", ""]
+    _source:
+      case:
+        img[src="images/t_extern.png"]: External
+        "*": Local
+    description:
+      text: "{{ .Result._source }} - {{ .Result.genre }}"
+    downloadvolumefactor:
+      case:
+        img[src="images/t_extern.png"]: 0
+        img[src="images/free.png"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+# global MR is 1.0 but torrents must be seeded for 1 day regardless of ratio
+#    minimumratio:
+#      text: 1.0
+    minimumseedtime:
+      # 1 day (as seconds = 24 x 60 x 60)
+      text: 86400
+# engine n/a

src/Jackett.Common/Definitions/finelite.yml

@@ -13,7 +13,7 @@ settings:
     type: text
     label: Username
   - name: password
-    type: password
+    type: text
     label: Password
   - name: freeleech
     type: checkbox
@@ -35,6 +35,18 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_finelite
+    type: info
+    label: Login Requirement
+    default: "To successfully login, members must first <a href=\"https://finelite.org/staff.php\" target=\"_blank\">message FinElite staff</a>, asking that their account be whitelisted from captcha validation.</br></br>Onnistuakseen sisäänkirjautumisessa jäsenten on ensin lähetettävä <a href=\"https://finelite.org/staff.php\" target=\"_blank\">viesti FinElite henkilökunnalle</a> ja pyydettävä, että heidän tilinsä poistetaan captcha-varmennuksesta."
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Julkaisuja per sivu</b> setting to <b>100</b> on your account profile.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Unused IDs in the User and Power User categories are automatically deleted after 90 days. The account can be parked and stored on the site for 180 days."
 
 caps:
   categorymappings:
@@ -43,8 +55,7 @@ caps:
     - {id: 24, cat: Books/EBook, desc: "Ebooks"}
     - {id: 10, cat: Console, desc: "Games - Console"}
     - {id: 11, cat: PC/Games, desc: "Games - PC"}
-    - {id: 26, cat: Movies, desc: "Kids"}
-    - {id: 9, cat: PC/Mobile-Other, desc: "Mobile"}
+    - {id: 26, cat: Movies/Other, desc: "Kids"}
     - {id: 12, cat: Movies, desc: "Movie Pack"}
     - {id: 31, cat: Movies/UHD, desc: "Movies 4K"}
     - {id: 38, cat: Movies/BluRay, desc: "Movies BD"}
@@ -71,27 +82,26 @@ caps:
 login:
   path: login.php
   method: form
-  form: form#login
+  form: form[action="/take_login.php"]
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
   error:
-    - selector: td.embedded:contains("Virhe") # error
-    - selector: td.embedded:contains("epäonnistui") # falied
+    - selector: div.notice.notice-error
   test:
     path: /
-    selector: a[href="ulos.php"]
+    selector: a[href="/logout.php"]
 
 search:
   paths:
-    # https://finelite.org/selaa.php?c14=1&c15=1&c31=1&search=tt6591554&hae=2&type=desc&cat=0&incldead=1&sort=1
-    # https://finelite.org/selaa.php?search=&hae=0&type=desc&cat=0&incldead=1&freeleech=yes&sort=1
-    - path: selaa.php
+    # https://finelite.org/browse.php?c14=1&c15=1&c31=1&search=tt6591554&hae=2&type=desc&cat=0&incldead=1&sort=1
+    # https://finelite.org/browse.php?search=&hae=0&type=desc&cat=0&incldead=1&freeleech=yes&sort=1
+    - path: browse.php
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
     # 0 name&descr, 1 name, 2 descr, 3 tags, 4 imdb with rating
-    hae: "{{ if .Query.IMDBID }}2{{ else }}1{{ end }}"
+    hae: "{{ if .Query.IMDBID }}4{{ else }}1{{ end }}"
     # 0 active, 1 incldead, 2 deadonly
     incldead: 1
     freeleech: "{{ if .Config.freeleech }}yes{{ else }}{{ end }}"
@@ -99,23 +109,26 @@ search:
     type: "{{ .Config.type }}"
 
   rows:
-    selector: table.main > tbody >  tr:has(a[href^="/lataa.php/"])
+    selector: table.main > tbody >  tr:has(a[href^="/lataa/"])
 
   fields:
     category:
-      selector: a[href^="selaa.php?c"]
+      selector: a[href^="/browse.php?c"]
       attribute: href
       filters:
         - name: regexp
           args: c(\d+)=1
     title:
-      selector: a[href^="julkaisu.php?id="]
+      selector: a[href^="/details/"]
     details:
-      selector: a[href^="julkaisu.php?id="]
+      selector: a[href^="/details/"]
       attribute: href
     download:
-      selector: a[href^="/lataa.php/"]
+      selector: a[href^="/lataa/"]
       attribute: href
+    poster:
+      selector: a[href^="/details/"] img
+      attribute: src
     imdbid:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
@@ -128,7 +141,7 @@ search:
         - name: append
           args: " +02:00" # EET
         - name: dateparse
-          args: "d.M.yyyy HH:mm zzz"
+          args: "d.M.yyyy  HH:mm zzz"
     size:
       selector: td:nth-last-child(3)
     seeders:
@@ -137,7 +150,7 @@ search:
       selector: td:nth-last-child(1)
     downloadvolumefactor:
       case:
-        span.label-free: 0
+        span[title="Freeleech"]: 0
         "*": 1
     uploadvolumefactor:
       text: 1
@@ -146,4 +159,4 @@ search:
     minimumseedtime:
       # 3 days (as seconds = 3 x 24 x 60 x 60)
       text: 259200
-# custom 3.6.8
+# FE v4.0.0

src/Jackett.Common/Definitions/freefarm.yml

@@ -69,10 +69,8 @@ settings:
     options:
       desc: desc
       asc: asc
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr
   - name: info_tpp
     type: info
     label: Results Per Page

src/Jackett.Common/Definitions/fuzer.yml

@@ -70,10 +70,8 @@ settings:
   - name: cookie
     type: text
     label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
   - name: freeleech
     type: checkbox
     label: Search freeleech only

src/Jackett.Common/Definitions/gamera.yml

@@ -32,10 +32,8 @@ settings:
   - name: cookie
     type: text
     label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
   - name: freeleech
     type: checkbox
     label: Search freeleech only

src/Jackett.Common/Definitions/gktorrent.yml

@@ -8,14 +8,10 @@ encoding: UTF-8
 followredirect: true
 # to fetch current domain use https://www.protege-torrent.com/Gktorrent
 links:
-  - https://www.gktorrent.eu/
+  - https://www.gktorrent.pm/
 legacylinks:
   - https://www.rantop.org/
-  - https://gktorrent.nocensor.work/
-  - https://gktorrent.nocensor.biz/
-  - https://gktorrent.nocensor.sbs/
-  - https://gktorrent.nocensor.world/
-  - https://gktorrent.nocensor.lol/
+  - https://www.torrent.ws/
   - https://gktorrent.mrunblock.guru/
   - https://gktorrent.mrunblock.life/
   - https://gktorrent.nocensor.click/
@@ -31,10 +27,13 @@ legacylinks:
   - https://www.gktorrent.vg/
   - https://www.gktorrent.lol/
   - https://www.gktorrent.sh/
+  - https://www.gktorrent.eu/
+  - https://www.gktorrent.xyz/
 
 caps:
   categorymappings:
     - {id: Films, cat: Movies, desc: "Movies"}
+    - {id: Vidéos, cat: Movies, desc: "Vidéos"}
     - {id: Animes, cat: TV/Anime, desc: "Anime"}
     - {id: Séries, cat: TV, desc: "TV Series"}
     - {id: Spectacles, cat: TV, desc: "TV Shows"}
@@ -97,7 +96,7 @@ search:
       args: ["(?i)(S)(\\d{1,3})$", "saison $2"]
 
   rows:
-    selector: table.table-hover > tbody > tr
+    selector: table.table-hover > tbody > tr:has(td a[href])
 
   fields:
     category:

src/Jackett.Common/Definitions/glodls.yml

@@ -8,21 +8,18 @@ encoding: UTF-8
 links:
   - https://glodls.to/
   - https://gtso.cc/
-  - https://glotorrents.unblockit.casa/
+  - https://glotorrents.unblockit.ong/
   - https://glodls.unblockninja.com/
   - https://glodls.ninjaproxy1.com/
 legacylinks:
   - https://glodls.rocks/
   - https://gtdb.to/
-  - https://glotorrents.unblockit.bio/
-  - https://glotorrents.unblockit.boo/
   - https://glotorrents.mrunblock.guru/
   - https://glotorrents.unblockit.click/
   - https://glotorrents.unblockit.asia/
   - https://glotorrents.unblockit.mov/
   - https://glotorrents.mrunblock.life/
   - https://glotorrents.unblockit.rsvp/
-  - https://glotorrents.nocensor.click/
   - https://gtdb.cc/
   - https://glotorrents.unblockit.vegas/
   - https://glotorrents.unblockit.esq/
@@ -35,6 +32,8 @@ legacylinks:
   - https://glotorrents.unblockit.date/
   - https://glotorrents.unblockit.dad/
   - https://glotorrents.unblockit.africa/
+  - https://glotorrents.unblockit.casa/
+  - https://glotorrents.unblockit.sbs/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/gtorrentpro.yml

@@ -0,0 +1,79 @@
+---
+id: gtorrentpro
+name: GTorrent.club
+description: "GTorrent.club is a RUSSIAN Public Torrent Tracker for MOVIES / TV / GENERAL"
+language: ru-RU
+type: public
+encoding: windows-1251
+links:
+  - https://gtorrent.club/
+legacylinks:
+  - http://gtorrent.pro/
+  - http://gtorrent.ru/
+
+caps:
+  categorymappings:
+    - {id: "filmy", cat: Movies, desc: "Фильмы (Movies)"}
+    - {id: "muzyka", cat: Audio, desc: "Музыка (Music)"}
+    - {id: "igry", cat: Console, desc: "Игры (Games)"}
+    - {id: "serialy", cat: TV, desc: "Сериалы (TV series)"}
+    - {id: "programmy", cat: PC, desc: "Программы (Software)"}
+    - {id: "prilozheniya", cat: Other, desc: "prilozheniya (Other)"}
+
+  modes:
+    search: [q]
+
+settings:
+  - name: info_flaresolverr
+    type: info_flaresolverr
+
+download:
+  selectors:
+    - selector: a[href^="/engine/download.php?id="]
+      attribute: href
+
+search:
+  # do=search&subaction=search&search_start=0&full_search=0&result_from=1&story=%D0%A6%D0%B5%D0%BB%D1%8C%D0%BD%D0%BE%D0%BC%D0%B5%D1%82%D0%B0%D0%BB%D0%BB%D0%B8%D1%87%D0%B5%D1%81%D0%BA%D0%B0%D1%8F+%D0%BE%D0%B1%D0%BE%D0%BB%D0%BE%D1%87%D0%BA%D0%B0+
+  paths:
+    - path: index.php
+  inputs:
+    do: search
+    subaction: search
+    search_start: 0
+    full_search: 0
+    result_from: 1
+    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+
+  rows:
+    selector: div.blog_brief_news:not(div.first_line):not(:has(div.uploaded:empty))
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      selector: div.name a
+      attribute: href
+      filters:
+        - name: split
+          args: ["/", 3]
+    title:
+      selector: div.name
+    details:
+      selector: div.name a
+      attribute: href
+    download:
+      selector: div.name a
+      attribute: href
+    date:
+      text: now
+    size:
+      selector: div:nth-child(2)
+    seeders:
+      selector: div.uploaded
+    leechers:
+      selector: div.download
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/h-p2p.yml

@@ -10,27 +10,22 @@ links:
 
 caps:
   categorymappings:
-    - {id: 6, cat: XXX/WEB-DL, desc: "OnlyFans"}
-    - {id: 8, cat: XXX/WEB-DL, desc: "Privacy"}
-    - {id: 9, cat: XXX/WEB-DL, desc: "Other"}
-    - {id: 11, cat: XXX/WEB-DL, desc: "JAV"}
-    - {id: 12, cat: XXX/WEB-DL, desc: "Hentai"}
-    - {id: 13, cat: XXX/WEB-DL, desc: "Straight"}
-    - {id: 14, cat: XXX/WEB-DL, desc: "Lesbian"}
-    - {id: 15, cat: XXX/WEB-DL, desc: "Gay"}
-    - {id: 16, cat: XXX/WEB-DL, desc: "Bisexual"}
-    - {id: 17, cat: XXX/WEB-DL, desc: "MILF"}
-    - {id: 18, cat: XXX/WEB-DL, desc: "Anal"}
-    - {id: 19, cat: XXX/WEB-DL, desc: "BDSM"}
-    - {id: 20, cat: XXX/WEB-DL, desc: "Gangbang"}
-    - {id: 21, cat: XXX/WEB-DL, desc: "Voyeurism"}
-    - {id: 22, cat: XXX/WEB-DL, desc: "JustForFans"}
-    - {id: 23, cat: XXX/WEB-DL, desc: "Fansly"}
+    - {id: 1, cat: XXX/WEB-DL, desc: "OnlyFans"}
+    - {id: 2, cat: XXX/WEB-DL, desc: "Fansly"}
+    - {id: 3, cat: XXX/WEB-DL, desc: "Privacy"}
+    - {id: 4, cat: XXX/WEB-DL, desc: "JustForFans"}
+    - {id: 5, cat: XXX/WEB-DL, desc: "ManyVids"}
+    - {id: 6, cat: XXX/WEB-DL, desc: "Clips4Sale"}
+    - {id: 7, cat: XXX/WEB-DL, desc: "Hentai"}
+    - {id: 8, cat: XXX/WEB-DL, desc: "JAV"}
+    - {id: 9, cat: XXX/WEB-DL, desc: "Paid Site"}
+    - {id: 10, cat: XXX/WEB-DL, desc: "HomeMade"}
+    - {id: 11, cat: XXX/WEB-DL, desc: "Other"}
+    - {id: 27, cat: XXX/WEB-DL, desc: "Gay"}
+    - {id: 28, cat: XXX/WEB-DL, desc: "XXX Movie"}
 
   modes:
     search: [q]
-    tv-search: [q]
-    movie-search: [q]
 
 settings:
   - name: apikey
@@ -39,11 +34,15 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://h-p2p.cam/\" target=\"_blank\">H-P2P</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://h-p2p.cam/\" target=\"_blank\">H-P2P</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
     default: false
+  - name: single_file_release_use_filename
+    type: checkbox
+    label: Use filename as title for single file releases
+    default: true
   - name: sort
     type: select
     label: Sort requested from site
@@ -83,10 +82,10 @@ search:
   inputs:
     $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
     name: "{{ .Keywords }}"
-    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    "free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
-    perPage: 100
+    perPage: 75
 
   keywordsfilters:
     - name: re_replace
@@ -97,10 +96,19 @@ search:
     attribute: attributes
 
   fields:
+    _id:
+      selector: ..id
     category:
       selector: category_id
-    title:
+    title_optional:
       selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    files:
+      selector: num_file
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
     details:
       selector: details_link
     download:
@@ -108,12 +116,16 @@ search:
     infohash:
       selector: info_hash
     poster:
-      selector: poster
+      text: "{{ .Config.sitelink }}files/img/torrent-cover_{{ .Result._id }}.jpg"
+    genre:
+      selector: meta.genres
       filters:
+        - name: re_replace
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
         - name: replace
-          args: ["https://via.placeholder.com/90x135", ""]
-    files:
-      selector: num_file
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
     seeders:
       selector: seeders
     leechers:
@@ -141,14 +153,12 @@ search:
         100%: 0 # freeleech
         "*": 0 # catch errors
     uploadvolumefactor:
-      # api returns 0=false, 1=true
+      # api returns False, True
       selector: double_upload
       case:
-        0: 1 # normal
-        1: 2 # double
-    minimumratio:
-      text: 1.0
+        False: 1 # normal
+        True: 2 # double
     minimumseedtime:
-      # 7 days (as seconds = 7 x 24 x 60 x 60)
-      text: 604800
-# json UNIT3D 6.3.0
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# json UNIT3D 8.1.3 (custom)

src/Jackett.Common/Definitions/happyfappy2fa.yml

@@ -0,0 +1,147 @@
+---
+id: happyfappy2fa
+name: HappyFappy2FA
+description: "HappyFappy is a Private Torrent Tracker for 3X. This indexer uses cookie login for 2FA."
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://www.happyfappy.org/
+
+caps:
+  categorymappings:
+    - {id: 11, cat: XXX, desc: "Asian"}
+    - {id: 6, cat: XXX, desc: "Fansite"}
+    - {id: 13, cat: XXX, desc: "Games"}
+    - {id: 3, cat: XXX, desc: "Gay"}
+    - {id: 4, cat: XXX, desc: "Interracial"}
+    - {id: 5, cat: XXX, desc: "Lesbian"}
+    - {id: 9, cat: XXX, desc: "Packs"}
+    - {id: 10, cat: XXX, desc: "Pics"}
+    - {id: 1, cat: XXX, desc: "Pron"}
+    - {id: 8, cat: XXX, desc: "Retro"}
+    - {id: 12, cat: XXX, desc: "Transsexual"}
+    - {id: 7, cat: XXX, desc: "VR"}
+
+  modes:
+    search: [q]
+
+settings:
+  - name: cookie
+    type: text
+    label: Cookie
+  - name: info_cookie
+    type: info_cookie
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: time
+    options:
+      time: created
+      seeders: seeders
+      size: size
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "To keep your account active, sign in and browse the site at least once every 120 days. Seeding torrents does not count as account activity, so in order to remain active you need to sign in and browse the site. Pornstar Trainee (and above) have a longer inactivity timer, but logging in regularly is recommended to learn about special events and new features."
+
+login:
+  method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
+  test:
+    path: /
+    selector: "#nav_userinfo"
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
+    title: "{{ .Keywords }}"
+    order_by: "{{ .Config.sort }}"
+    order_way: "{{ .Config.type }}"
+    action: advanced
+    filter_freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+
+  rows:
+    selector: table#torrent_table > tbody > tr[class^="torrent row"]:has(a[href*="action=download"])
+
+  fields:
+    category:
+      selector: a[href^="/torrents.php?filter_cat["]
+      attribute: href
+      filters:
+        - name: regexp
+          args: \[(\d+)\]
+    title:
+      selector: a[href^="/torrents.php?id="]
+    details:
+      selector: a[href^="/torrents.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="torrents.php?action=download&id="]
+      attribute: href
+    description_tags:
+      selector: div.tags
+    description:
+      case:
+        span.icon_okay: "Verified: {{ .Result.description_tags }}"
+        "*": "Unverified: {{ .Result.description_tags }}"
+    poster:
+      selector: td:nth-child(2) > script
+      filters:
+        - name: regexp
+          args: "src=\\\\\"(.*?)\\\\\""
+        - name: re_replace
+          args: ["\\\\(.)", "$1"]
+        - name: replace
+          args: ["/static/common/noartwork/noimage.png", ""]
+    files:
+      selector: td:nth-child(3)
+    date:
+      selector: td:nth-child(5) > span
+      attribute: title
+      # auto adjusted by site account profile
+      filters:
+        - name: dateparse
+          args: "MMM dd yyyy, HH:mm"
+    size:
+      selector: td:nth-child(6)
+    grabs:
+      selector: td:nth-child(7)
+    seeders:
+      selector: td:nth-child(8)
+    leechers:
+      selector: td:nth-child(9)
+    downloadvolumefactor:
+      case:
+        span.icon[title*="Freeleech"]: 0
+        "img[alt=\"Freeleech\"]": 0
+        "*": 1
+    uploadvolumefactor:
+      case:
+        span.icon[title*="DoubleSeed"]: 2
+        "img[alt=\"DoubleSeed\"]": 2
+        "*": 1
+    minimumratio:
+      text: 0.5
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# Luminance

src/Jackett.Common/Definitions/hd-unit3d-api.yml

@@ -174,4 +174,4 @@ search:
     minimumseedtime:
       # 3 days (as seconds = 3 x 24 x 60 x 60)
       text: 259200
-# json UNIT3D 8.0.2
+# json UNIT3D 8.1.3

src/Jackett.Common/Definitions/hdarea.yml

@@ -42,10 +42,8 @@ settings:
   - name: cookie
     type: text
     label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
   - name: freeleech
     type: checkbox
     label: Search freeleech only

src/Jackett.Common/Definitions/hdc.yml

@@ -36,10 +36,8 @@ settings:
   - name: cookie
     type: text
     label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
   - name: freeleech
     type: checkbox
     label: Search freeleech only

src/Jackett.Common/Definitions/hddolby.yml

@@ -1,24 +1,26 @@
 ---
-id: beitai
-name: BeiTai (备胎)
-description: "BeiTai (备胎) is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
+id: hddolby
+name: HD Dolby
+description: "HD Dolby is a CHINESE Private Torrent Tracker for HD MOVIES / TV / GENERAL"
 language: zh-CN
 type: private
 encoding: UTF-8
 links:
-  - https://www.beitai.pt/
+  - https://www.hddolby.com/
 
 caps:
   categorymappings:
-    - {id: 401, cat: Movies, desc: "Movies/电影"}
-    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
-    - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
-    - {id: 402, cat: TV, desc: "TV Series/剧集"}
-    - {id: 403, cat: TV, desc: "TV Shows/综艺"}
-    - {id: 406, cat: Audio/Video, desc: "MusicVideo/音乐MV"}
-    - {id: 407, cat: TV/Sport, desc: "Sports/运体"}
-    - {id: 409, cat: Other, desc: "Misc/其他"}
-    - {id: 408, cat: Audio, desc: "HQ Audio/无损音乐"}
+    - {id: 401, cat: Movies, desc: "Movies电影"}
+    - {id: 402, cat: TV, desc: "TV Series电视剧"}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries纪录片"}
+    - {id: 405, cat: TV/Anime, desc: "Animations动漫"}
+    - {id: 403, cat: TV, desc: "TV Shows综艺"}
+    - {id: 406, cat: Audio/Video, desc: "Music Videos"}
+    - {id: 407, cat: TV/Sport, desc: "Sports体育"}
+    - {id: 408, cat: Audio, desc: "HQ Audio音乐"}
+    - {id: 410, cat: PC/Games, desc: "Games游戏"}
+    - {id: 411, cat: Other, desc: "Study学习"}
+    - {id: 409, cat: Other, desc: "Others其他"}
 
   modes:
     search: [q]
@@ -27,12 +29,11 @@ caps:
     music-search: [q]
 
 settings:
-  - name: username
+  - name: cookie
     type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
+    label: Cookie
+  - name: info_cookie
+    type: info_cookie
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -53,6 +54,8 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_flaresolverr
+    type: info_flaresolverr
   - name: info_tpp
     type: info
     label: Results Per Page
@@ -60,20 +63,12 @@ settings:
   - name: info_activity
     type: info
     label: Account Inactivity
-    default: "Account retention rules:<ol><li>Veteran User and above will be retained forever</li><li>Elite User and above will not have their account deleted after parking (in the control panel)</li><li>Users with a parked account will be deleted if they do not log in for 400 consecutive days</li><li>Users with a non-parked account be deleted if they do not log in for 150 consecutive days</li><li>Users with no traffic (ie, upload/download data are both 0) will be deleted if they do not log in for 100 consecutive days.</li></ol>"
+    default: "Account retention rules:<ol><li>(Division Commander) Extreme User and above will be retained forever</li><li>(Brigadier Commander) Veteran Users and above will not be deleted after their account has been parked (in the Control Panel)</li><li>Users who have parked their accounts will be disabled if they do not log in for 180 consecutive days</li><li>Users with a non-parked account will have their account disabled if they do not log in for 90 consecutive days</li><li>Newly registered users who do not have traffic (i.e., upload and download data is 0) and do not log in for 5 consecutive days will be disabld.</li></ol>"
 
 login:
-  path: takelogin.php
-  method: post
+  method: cookie
   inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    logout: ""
-    securelogin: ""
-    ssl: yes
-    trackerssl: yes
-  error:
-    - selector: td.embedded:has(h2:contains("失败"))
+    cookie: "{{ .Config.cookie }}"
   test:
     path: index.php
     selector: a[href="logout.php"]
@@ -83,14 +78,14 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if .Query.DoubanID }}/{{ .Query.DoubanID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}{{ .Keywords }}{{ end }}"
-    # 0 incldead, 1 active, 2 dead
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }} {{ else }}{{ .Keywords }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}"
+    # 0=incldead, 1=active, 2=dead
     incldead: 0
-    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    # show promotions: 0=all, 1=normal, 2=free, 3=2x, 4=2xFree, 5=50%, 6=2x50%, 7=30%
     spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 title, 1 descr, 3 uploader, 4 imdburl (4 does not appear to work).
+    # 0=title, 1=descr, 3=uploader
     search_area: "{{ if or .Query.IMDBID .Query.DoubanID }}1{{ else }}0{{ end }}"
-    # 0 AND, 1 OR, 2 exact
+    # 0=AND, 1=OR, 2=Exact
     search_mode: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
@@ -100,6 +95,12 @@ search:
     selector: table.torrents > tbody > tr:has(table.torrentname)
 
   fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
     title_default:
       selector: a[href^="details.php?id="]
     title:
@@ -107,24 +108,18 @@ search:
       attribute: title
       optional: true
       default: "{{ .Result.title_default }}"
-    category:
-      selector: a[href^="?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
     details:
       selector: a[href^="details.php?id="]
       attribute: href
     download:
       selector: a[href^="download.php?id="]
       attribute: href
-    imdbid:
-      selector: div.imdb_100 > a
+    tmdbid:
+      selector: a[href*="themoviedb.org/movie/"], a[href*="themoviedb.org/tv/"]
       attribute: href
     date_elapsed:
       # time type: time elapsed (default)
-      selector: td:nth-child(4) > span[title]
+      selector: td.rowfollow:nth-child(4) > span[title]
       attribute: title
       optional: true
       filters:
@@ -134,7 +129,7 @@ search:
           args: "yyyy-MM-dd HH:mm:ss zzz"
     date_added:
       # time added
-      selector: td:nth-child(4):not(:has(span))
+      selector: td.rowfollow:nth-child(4):not(:has(span))
       optional: true
       filters:
         - name: append
@@ -144,13 +139,13 @@ search:
     date:
       text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
     size:
-      selector: td:nth-child(5)
+      selector: td.rowfollow:nth-child(5)
     seeders:
-      selector: td:nth-child(6)
+      selector: td.rowfollow:nth-child(6)
     leechers:
-      selector: td:nth-child(7)
+      selector: td.rowfollow:nth-child(7)
     grabs:
-      selector: td:nth-child(8)
+      selector: td.rowfollow:nth-child(8)
     downloadvolumefactor:
       case:
         img.pro_free: 0
@@ -165,7 +160,15 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
+    minimumratio:
+      text: 1.5
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
     description:
-      selector: td:nth-child(2)
-      remove: a, b, font, img, span
-# NexusPHP Standard v1.5 Beta 4
+      selector: td.rowfollow:nth-child(2)
+      remove: a, b, font, img, span.tags
+      filters:
+        - name: re_replace
+          args: ["(?i)\\s*(剩余时间:|剩餘時間：|will end in)\\s*", ""]
+# NexusPHP 59e6a24 2024-5-9

src/Jackett.Common/Definitions/hdfans.yml

@@ -195,7 +195,10 @@ search:
         img.pro_2up: 2
         "*": 1
     minimumratio:
-      text: 0.81
+      text: 1
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
     description_verified:
       case:
         span[title="通过"], span[title="通過"], span[title="Allowed"]: "Verified:"

src/Jackett.Common/Definitions/hdgalaktik.yml

@@ -40,10 +40,8 @@ settings:
   - name: cookie
     type: text
     label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
   - name: stripcyrillic
     type: checkbox
     label: Strip Cyrillic Letters

src/Jackett.Common/Definitions/hdhome.yml

@@ -73,10 +73,8 @@ settings:
   - name: cookie
     type: text
     label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -102,7 +100,6 @@ search:
     search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
     incldead: 1
     spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    inclbookmarked: 0
     search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
     search_mode: 0
     notnewword: 1

src/Jackett.Common/Definitions/hdolimpo-api.yml

@@ -93,63 +93,72 @@ search:
   fields:
     categorydesc:
       selector: category
-    title:
+    title_phase1:
       selector: name
       filters:
         - name: re_replace
-          args: ["\\[", " "]
+          args: ["(?i)\\b(full uhd|(uhd )?full\\s?(blu-?ray|uhd))\\b", "BRDISK"]
         - name: re_replace
-          args: ["\\]", " "]
+          args: ["\\bE-AC-3\\b", "EAC3"]
         - name: re_replace
-          args: ["(?i)(full(bluray)?)", "BRDISK"] # FULL(BR/UHD) -> BRDISK
-        - name: replace
-          args: ["HDOlimpo", ""] # Delete HDOlimpo
-        - name: replace
-          args: ["HD-Olimpo", ""] # Delete HD-Olimpo
-        - name: replace
-          args: ["E-AC-3", "EAC3"]
+          args: ["(?i)\\b(es-cat?-en|es-en-cat?|en-cat?-es|en-es-cat?|cat?-es-en|cat?-en-es)\\b", "MULTi SPANiSH CATALAN ENGLiSH"]
         - name: re_replace
-          args: ["[ -](?i)español[ -]", " SPANiSH "]
+          args: ["(?i)\\b(es-cat?-(ja|ja?p)|es-(ja|ja?p)-cat?|cat?-es-(ja|ja?p)|cat?-(ja|ja?p)-es|(ja|ja?p)-es-cat?|(ja|ja?p)-cat?-es)\\b", "MULTi SPANiSH CATALAN JAPANES"] # misspelled to accomodate negative lookback, corrected later
         - name: re_replace
-          args: ["[ -](?i)castellano[ -]", " SPANiSH "]
+          args: ["(?i)\\b(es-en|en-es)\\b", "MULTi SPANiSH ENGLiSH"]
         - name: re_replace
-          args: ["[ -](?i)spa[ -]", " SPANiSH "]
+          args: ["(?i)\\b(es-cat?|cat?-es)\\b", "MULTi SPANiSH CATALAN"]
         - name: re_replace
-          args: ["[ -](?i)esp[ -]", " SPANiSH "]
+          args: ["(?i)\\b(es-(ja|ja?p)|(ja|ja?p)-es)\\b", "MULTi SPANiSH JAPANES"] # misspelled to accomodate negative lookback, corrected later
         - name: re_replace
-          args: [" ES ", " SPANiSH "]
+          args: ["(?i)\\b(es-fr[ae]?n?|fr[ae]?n?-es)\\b", "MULTi SPANiSH FRENCHx"] # misspelled to accomodate negative lookback, corrected later
         - name: re_replace
-          args: ["[ -](?i)ingl[eé]s[ -]", " English "]
+          args: ["(?i)\\b(es-ita?|ita?-es)\\b", "MULTi SPANiSH iTALiAN"]
         - name: re_replace
-          args: ["[ -](?i)[ei]ng[ -]", " English "]
+          args: ["(?i)\\b(es-rus?|rus?-es)\\b", "MULTi SPANiSH RUSSiAN"]
         - name: re_replace
-          args: ["[ -](?i)cat[ -]", " Catalan "]
+          args: ["(?i)\\b(es-(ger?|al(e|em)?)|(ger?|al(e|em)?)-es)\\b", "MULTi SPANiSH GERMANx"] # misspelled to accomodate negative lookback, corrected later
         - name: re_replace
-          args: ["[ -](?i)vas[ -]", " Basque "]
+          args: ["(?i)\\btriaudio\\b", "MULTi SPANiSH"]
         - name: re_replace
-          args: ["[ -](?i)fr[ae][ -]", " French "]
+          args: ["(?i)\\b(espa[ñn]ol|castellano|esp)\\b", "SPANiSH"]
         - name: re_replace
-          args: ["[ -](?i)jap[ -]", " Japanese "]
+          args: ["(?i)\\b(ingl[ée]s|[ei]ng)\\b", "ENGLiSH"]
         - name: re_replace
-          args: ["[ -](?i)ita[ -]", " Italian "]
+          args: ["(?i)\\bcat\\b", "CATALAN"]
         - name: re_replace
-          args: ["[ -](?i)rus[ -]", " Russian "]
+          args: ["(?i)\\bfr[ae]?n?\\b", "FRENCHx"] # misspelled to accomodate negative lookback, corrected later
         - name: re_replace
-          args: ["[ -](?i)ger[ -]", " German "]
+          args: ["(?i)\\b(jap|jp)\\b", "JAPANES"] # misspelled to accomodate negative lookback, corrected later
         - name: re_replace
-          args: ["(?i)(triaudio)", "MULTi SPANiSH English"]
+          args: ["(?i)\\bita\\b", "iTALiAN"]
         - name: re_replace
-          args: ["(?i)(dual)", " MULTi SPANiSH "]
+          args: ["(?i)\\brus?\\b", "RUSSiAN"]
         - name: re_replace
-          args: ["(?i)(es-en)", " MULTi SPANiSH "]
+          args: ["(?i)\\b(ger?|alem)\\b", "GERMANx"] # misspelled to accomodate negative lookback, corrected later
         - name: re_replace
-          args: ["(?i)(en-es)", " MULTi SPANiSH "]
+          args: ["(\\s|\\.)+", "$1"]
+        # add MULTi SPANiSH if not preceded by another language or followed by SPANiSH
         - name: re_replace
-          args: ["\\.+", "."] # More than 1 dot -> .
+          args: ["(?<!(SPANiSH|ENGLiSH|CATALAN|FRENCHx|JAPANES|iTALiAN|RUSSiAN|GERMANx)[\\s.])\\b(ENGLiSH|CATALAN|FRENCHx|JAPANES|iTALiAN|RUSSiAN|GERMANx)\\b(?![\\s.]SPANiSH)", "MULTi SPANiSH $2"]
+        # correct purposefully misspelled languages
         - name: re_replace
-          args: ["^\\.", ""] # Delete first dot
+          args: ["\\bFRENCHx\\b", "FRENCH"]
         - name: re_replace
-          args: ["\\s+", " "] # More than 1 space to 1 space
+          args: ["\\bJAPANES\\b", "JAPANESE"]
+        - name: re_replace
+          args: ["\\bGERMANx\\b", "GERMAN"]
+    title_spanish:
+      text: "{{ .Result.title_phase1 }}"
+      filters:
+        - name: regexp
+          args: "(?i)(spanish)"
+    title:
+      text: "{{ .Result.title_phase1 }}"
+      filters:
+        # append SPANiSH if title does not contain the word 'spanish'
+        - name: append
+          args: "{{ if .Result.title_spanish }}{{ else }} SPANiSH{{ end }}"
     details:
       selector: details_link
     download:

src/Jackett.Common/Definitions/hdonly.yml

@@ -262,16 +262,16 @@ search:
           args: .
         - name: append
           args: "{{ if .Result._release_group }}-{{ .Result._release_group }}{{ else }}{{ end }}"
-    _filename:
+    title_filename:
       selector: "fileName"
       optional: true
       filters:
-        - name: replace
-          args: [".mkv", ""]
+        - name: re_replace
+          args: ["\\s÷$", ""]
         - name: append
           args: " {{ if and (.Config.add_hybrid_features_to_filename) (eq .Result._hdr \"True\") }}[HDR]{{ else }}{{ end }}{{ if and (.Config.add_hybrid_features_to_filename) (eq .Result._hdr10plus \"True\") }}[HDR10+]{{ else }}{{ end }}{{ if and (.Config.add_hybrid_features_to_filename) (eq .Result._dovi \"True\") }}[DoVi]{{ else }}{{ end }}"
     title_phase1:
-      text: "{{ if and (eq .Result.files \"1\") (.Result._filename) }}{{ .Result._filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
+      text: "{{ if and (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
     title_vostfr:
       text: "{{ .Result.title_phase1 }}"
       filters:
@@ -287,7 +287,10 @@ search:
     title:
       text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
     description:
-      text: "{{ .Result._filename }}"
+      text: "{{ .Result.title_filename }}"
+      filters:
+        - name: re_replace
+          args: ["\\s÷$", ""]
     _free:
       selector: isFreeleech
     downloadvolumefactor:

src/Jackett.Common/Definitions/hdsky.yml

@@ -36,10 +36,8 @@ settings:
   - name: cookie
     type: text
     label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
   - name: freeleech
     type: checkbox
     label: Search freeleech only

src/Jackett.Common/Definitions/hdspace.yml

@@ -67,10 +67,8 @@ settings:
     options:
       2: desc
       1: asc
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr
 
 login:
   path: index.php?page=login

src/Jackett.Common/Definitions/hdt-lafenice.yml

@@ -26,7 +26,8 @@ caps:
     - {id: 43, cat: PC/0day, desc: "App-Win"}
     - {id: 44, cat: PC/Mac, desc: "App-Mac"}
     - {id: 45, cat: PC/Mobile-Android, desc: "Android"}
-    - {id: 47, cat: Books, desc: "E-Book"}
+    - {id: 47, cat: Books/EBook, desc: "E-Book"}
+    - {id: 52, cat: Books/Mags, desc: "Edicola"}
     - {id: 49, cat: Other, desc: "Altro"}
 
   modes:

src/Jackett.Common/Definitions/hdtorrentsit.yml

@@ -178,4 +178,4 @@ search:
         False: 1 # normal
         True: 2 # double
 # as a pay site there is no MR or MST
-# json UNIT3D 8.0.2 (custom)
+# json UNIT3D 8.1.3 (custom)

src/Jackett.Common/Definitions/hdturk.yml

@@ -92,10 +92,8 @@ settings:
   - name: cookie
     type: text
     label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
   - name: freeleech
     type: checkbox
     label: Filter freeleech only

src/Jackett.Common/Definitions/hdvideo.yml

@@ -29,10 +29,8 @@ settings:
   - name: cookie
     type: text
     label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
   - name: freeleech
     type: checkbox
     label: Search freeleech only

src/Jackett.Common/Definitions/heavens-hell.yml

@@ -1,214 +0,0 @@
----
-id: heavens-hell
-name: Heavens-Hell
-description: "Heavens-Hell is a Private Torrent Tracker for MUSIC / AUDIO SOFTWARE"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://heavens-hell.info/
-
-caps:
-  categorymappings:
-    - {id: 39, cat: Audio, desc: "Albums"}
-    - {id: 40, cat: Audio, desc: "Alternative"}
-    - {id: 4, cat: PC, desc: "Apps"}
-    - {id: 50, cat: PC, desc: "Apps -- Miscellaneous"}
-    - {id: 11, cat: Audio, desc: "Billboard Top 100"}
-    - {id: 7, cat: Audio, desc: "Blues"}
-    - {id: 8, cat: Audio, desc: "Chillout"}
-    - {id: 41, cat: Audio, desc: "Christmas"}
-    - {id: 9, cat: Audio, desc: "Classical"}
-    - {id: 12, cat: Audio, desc: "Country"}
-    - {id: 10, cat: Audio, desc: "Dance"}
-    - {id: 13, cat: Audio, desc: "Discography"}
-    - {id: 42, cat: Audio, desc: "DJ Music"}
-    - {id: 44, cat: Audio, desc: "DJ Music -- Funkymix"}
-    - {id: 45, cat: Audio, desc: "DJ Music -- Promo Only"}
-    - {id: 43, cat: Audio, desc: "DJ Music -- Ultimix"}
-    - {id: 21, cat: Audio, desc: "DJ Radio Sets"}
-    - {id: 19, cat: Audio, desc: "DMC"}
-    - {id: 20, cat: Audio, desc: "Drum&Bass"}
-    - {id: 22, cat: Audio/Lossless, desc: "Flac Music"}
-    - {id: 23, cat: Audio/Lossless, desc: "Flac-24 Bit Hi-Res"}
-    - {id: 14, cat: Audio, desc: "Funk"}
-    - {id: 15, cat: Audio, desc: "Hardcore"}
-    - {id: 16, cat: Audio, desc: "Hip hop"}
-    - {id: 24, cat: Audio, desc: "House"}
-    - {id: 17, cat: Audio, desc: "Jazz"}
-    - {id: 25, cat: Audio, desc: "Jungle"}
-    - {id: 46, cat: Audio, desc: "K3 WAV"}
-    - {id: 49, cat: Audio/Other, desc: "K3 WAV -- Other WAV"}
-    - {id: 18, cat: Audio, desc: "Karaoke"}
-    - {id: 26, cat: Audio, desc: "Mastermix"}
-    - {id: 28, cat: Audio, desc: "Metal"}
-    - {id: 27, cat: Audio/MP3, desc: "MP3 NEW RELEASES"}
-    - {id: 51, cat: Audio/MP3, desc: "MP3 -- Other MP3"}
-    - {id: 33, cat: Audio, desc: "Music Packs"}
-    - {id: 32, cat: Audio/Video, desc: "Music Videos"}
-    - {id: 29, cat: Audio, desc: "Oldies"}
-    - {id: 47, cat: Audio, desc: "Pop music"}
-    - {id: 30, cat: Audio, desc: "Punk"}
-    - {id: 34, cat: Audio, desc: "R&B/Motown"}
-    - {id: 35, cat: Audio, desc: "Reggae"}
-    - {id: 36, cat: Audio, desc: "Retro"}
-    - {id: 31, cat: Audio, desc: "Rock"}
-    - {id: 37, cat: Audio, desc: "Soul"}
-    - {id: 48, cat: Audio, desc: "Trance"}
-    - {id: 38, cat: Audio, desc: "VIPs only"}
-
-  modes:
-    search: [q]
-    music-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Filter freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: added
-    options:
-      added: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>40</b> on your account profile. The Default is <i>15</i>.
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
-  - name: info_activity
-    type: info
-    label: Account Inactivity
-    default: "To keep records updated regularly, all inactive accounts will be deleted after 60 days of inactivity."
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    logout: ""
-  error:
-    - selector: table:has(a[href*="login.php?error=1"])
-      message:
-        text: "ERROR: Incorrect username!"
-    - selector: table:has(a[href*="login.php?error=4"])
-      message:
-        text: "ERROR: Incorrect password!"
-    - selector: table:has(a[href*="login.php?error="])
-      message:
-        text: "ERROR: Something went wrong during login!"
-  test:
-    path: index.php
-    selector: a[href*="/logout.php?logouthash="]
-
-download:
-  before:
-    path: takethanks.php
-    method: post
-    inputs:
-      torrentid: "{{ .DownloadUri.Query.id }}"
-  selectors:
-    - selector: a[href*="download.php?id="]
-      attribute: href
-
-search:
-  paths:
-    - path: browse.php
-      method: post
-  keywordsfilters:
-    - name: re_replace
-      args: ["[\\s]+", "%"]
-  inputs:
-    do: search
-    keywords: "{{ .Keywords }}"
-    # t_name, t_description, t_both, t_uploader, t_genre
-    search_type: t_name
-    # does not support multi category searching so defaulting to all.
-    category: 0
-    # yes, no
-    include_dead_torrents: yes
-    sort: "{{ if .Config.freeleech }}free{{ else }}{{ .Config.sort }}{{ end }}"
-    order: "{{ if .Config.freeleech }}asc{{ else }}{{ .Config.type }}{{ end }}"
-
-  rows:
-    selector: "table.sortable tr:has(a[href*=\"/download.php?id=\"]){{ if .Config.freeleech }}:has(img[src$=\"/freedownload.gif\"]){{ else }}{{ end }}"
-
-  fields:
-    category:
-      selector: a[href*="/browse.php?category="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    title_default:
-      # is usually abbreaviated
-      selector: a[href*="/details.php?id="]
-    title:
-      # while still abbreviated, is usually longer than the default
-      selector: div.tooltip-content div
-      optional: true
-      default: "{{ .Result.title_default }}"
-    details:
-      selector: a[href*="/details.php?id="]
-      attribute: href
-    download:
-      selector: a[href*="/details.php?id="]
-      attribute: href
-    poster:
-      selector: img[src*="/torrents/images/"]
-      attribute: src
-    date:
-      selector: td:nth-child(2)
-      # auto adjusted by site account profile
-      filters:
-        - name: regexp
-          args: "(\\d{2}-\\d{2}-\\d{4} \\d{2}:\\d{2})"
-        - name: dateparse
-          args: "dd-MM-yyyy HH:mm"
-    size:
-      selector: td:nth-last-child(5)
-    grabs:
-      selector: td:nth-last-child(4)
-    seeders:
-      selector: td:nth-last-child(3)
-    leechers:
-      selector: td:nth-last-child(2)
-    description:
-      # Wait: 4 h
-      selector: div.tooltip-content > div:last-child
-    downloadvolumefactor:
-      case:
-        img[src$="/freedownload.gif"]: 0
-        img[src$="/silverdownload.gif"]: 0.5
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[src$="/x2.gif"]: 2
-        "*": 1
-    minimumratio:
-      text: 0.5
-    minimumseedtime:
-      # 1 day (as seconds = 24 x 60 x 60)
-      text: 86400
-# TS Special Edition v.8.0

src/Jackett.Common/Definitions/hebits.yml

@@ -32,10 +32,8 @@ settings:
   - name: cookie
     type: text
     label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
   - name: freeleech
     type: checkbox
     label: Search freeleech only

src/Jackett.Common/Definitions/helltorrents.yml

@@ -100,10 +100,8 @@ settings:
     type: info
     label: Results Per Page
     default: For best results, change the <b>Torrentów na stronę:</b> (Torrents per page) setting to <b>100</b> on your account profile.
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr
 
 login:
   path: login.php
@@ -130,7 +128,7 @@ search:
     # does not support sorting results, or imdbid searching, or have imdb in results
 
   rows:
-    selector: table.header:has(a[href^="details.php?id="])
+    selector: table.header:has(a[href*="download.php?id="]), table.header:has(a[href*="piekielny.php"])
 
   fields:
     categorydesc:

src/Jackett.Common/Definitions/hudbt.yml

@@ -0,0 +1,199 @@
+---
+id: hudbt
+name: HUDBT (蝴蝶)
+description: "HUDBT (蝴蝶) is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - https://hudbt.hust.edu.cn/
+
+caps:
+  categorymappings:
+    - {id: 401, cat: Movies, desc: "大陆电影"}
+    - {id: 413, cat: Movies, desc: "港台电影"}
+    - {id: 414, cat: Movies, desc: "亚洲电影"}
+    - {id: 415, cat: Movies, desc: "欧美电影"}
+    - {id: 430, cat: PC/Mobile-iOS, desc: "iPad"}
+    - {id: 433, cat: Movies, desc: "抢先视频"}
+    - {id: 402, cat: TV, desc: "大陆剧集"}
+    - {id: 417, cat: TV, desc: "港台剧集"}
+    - {id: 416, cat: TV, desc: "亚洲剧集"}
+    - {id: 418, cat: TV, desc: "欧美剧集"}
+    - {id: 404, cat: TV/Documentary, desc: "纪录片"}
+    - {id: 407, cat: TV/Sport, desc: "体育"}
+    - {id: 403, cat: TV, desc: "大陆综艺"}
+    - {id: 419, cat: TV, desc: "港台综艺"}
+    - {id: 420, cat: TV, desc: "亚洲综艺"}
+    - {id: 421, cat: TV, desc: "欧美综艺"}
+    - {id: 408, cat: Audio, desc: "华语音乐"}
+    - {id: 422, cat: Audio, desc: "日韩音乐"}
+    - {id: 423, cat: Audio, desc: "欧美音乐"}
+    - {id: 424, cat: Audio, desc: "古典音乐"}
+    - {id: 425, cat: Audio, desc: "原声音乐"}
+    - {id: 406, cat: Audio/Video, desc: "音乐MV"}
+    - {id: 409, cat: Other/Misc, desc: "其他"}
+    - {id: 432, cat: Books/EBook, desc: "电子书"}
+    - {id: 405, cat: TV/Anime, desc: "完结动漫"}
+    - {id: 427, cat: TV/Anime, desc: "连载动漫"}
+    - {id: 428, cat: TV/Anime, desc: "剧场OVA"}
+    - {id: 429, cat: TV/Anime, desc: "动漫周边"}
+    - {id: 410, cat: PC/Games, desc: "游戏"}
+    - {id: 431, cat: Console, desc: "游戏视频"}
+    - {id: 411, cat: PC/0day, desc: "软件"}
+    - {id: 412, cat: Books, desc: "学习"}
+    - {id: 426, cat: PC/Mac, desc: "MAC"}
+    - {id: 1037, cat: Other, desc: "HUST"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Account retention rules:<ol><li>Veteran User and above will be retained forever</li><li>Elite User and above will not be deleted after parking (in the control panel)</li><li>Users with a parked account who do not log in for 240 consecutive days will be deleted</li><li>Users with non-parked account will be deleted if they do not log in for 120 consecutive days</li><li>Users with no traffic (that is, upload/download data are both 0) will be deleted if they do not log in for 30 consecutive days, or if the registration time reaches 60 days.</li></ol>"
+
+login:
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
+  error:
+    - selector: div#stderr:has(h2:contains("失败"))
+  test:
+    path: index.php
+    selector: form[action$="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    # currently supports only one query id at one time.
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }} {{ else }}{{ .Keywords }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
+    incldead: 0
+    # 0 no limit, 3 3days, 7 1week, 30 1month, 90 3months
+    indate: 0
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%, 8 special offer, 9 all promotions
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}{{ end }}{{ if .Query.DoubanID }}1{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}0{{ end }}"
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    notnewword: 1
+
+  rows:
+    selector: table.torrents > tbody > tr:has(div.torrent-title)
+
+  fields:
+    category:
+      selector: a[href*="cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_default:
+      selector: a[href*="details.php?id="]
+    title:
+      selector: a[title][href*="details.php?id="]
+      attribute: title
+      optional: true
+      default: "{{ .Result.title_default }}"
+    details:
+      selector: a[href*="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href*="download.php?id="]
+      attribute: href
+    date_elapsed:
+      # time type: time elapsed (default)
+      selector: td:nth-child(4) > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    date_added:
+      # time added
+      selector: td:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-ddHH:mm:ss zzz"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td:nth-child(5)
+    seeders:
+      selector: td:nth-child(6)
+    leechers:
+      selector: td:nth-child(7)
+    grabs:
+      selector: td:nth-child(8)
+    downloadvolumefactor:
+      case:
+        img.free: 0
+        img.twoupfree: 0
+        img.halfdown: 0.5
+        img.twouphalfdown: 0.5
+        img.thirtypercent: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.twouphalfdown: 2
+        img.twoupfree: 2
+        img.twoup: 2
+        "*": 1
+    description:
+      selector: td:nth-child(2) div.torrent-title h3
+# NexusPHP HUDBT自优化版本 2013-05-13

src/Jackett.Common/Definitions/huntorrent.yml

@@ -52,17 +52,13 @@ settings:
   - name: cookie
     type: text
     label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
   - name: useragent
     type: text
     label: User-Agent
   - name: info_useragent
-    type: info
-    label: How to get the User-Agent
-    default: "<ol><li>From the same place you fetched the cookie,</li><li>Find <b>'user-agent:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole user-agent string <i>(everything after 'user-agent: ')</i> and <b>Paste</b> here.</li></ol>"
+    type: info_useragent
   - name: sort
     type: select
     label: Sort requested from site

src/Jackett.Common/Definitions/idope.yml

@@ -60,10 +60,8 @@ settings:
       3: "created asc"
       1: "seeders asc"
       2: "size asc"
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr
 
 search:
   paths:

src/Jackett.Common/Definitions/ilcorsaroblu.yml

@@ -86,10 +86,8 @@ settings:
     type: checkbox
     label: Filter freeleech only
     default: false
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr
   - name: sort
     type: select
     label: Sort requested from site

src/Jackett.Common/Definitions/ilolicon.yml

@@ -30,10 +30,8 @@ settings:
   - name: cookie
     type: text
     label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
   - name: freeleech
     type: checkbox
     label: Search freeleech only

src/Jackett.Common/Definitions/infire.yml

@@ -30,6 +30,7 @@ caps:
     - {id: 97, cat: Movies/UHD, desc: "BluRay 2160p", default: true}
     - {id: 99, cat: Movies/HD, desc: "BRRip 720p", default: true}
     - {id: 100, cat: Movies/HD, desc: "BRRip 1080p", default: true}
+    - {id: 101, cat: Movies/HD, desc: "BRRip", default: true}
     # TV
     - {id: 23, cat: TV, desc: "TV", default: true}
     - {id: 24, cat: TV/HD, desc: "HDTV 720p", default: true}

src/Jackett.Common/Definitions/itatorrents.yml

@@ -20,6 +20,8 @@ caps:
     - {id: 8, cat: Audio/Audiobook, desc: "AudioLibri"}
     - {id: 12, cat: Other, desc: "Corsi"}
     - {id: 13, cat: Books/Comics, desc: "Fumetti"}
+    - {id: 14, cat: Audio/Video, desc: "Concerti"}
+    - {id: 15, cat: Audio, desc: "Discografie"}
 
   modes:
     search: [q]
@@ -188,4 +190,4 @@ search:
     minimumseedtime:
       # 7 days (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 8.0.2 (custom)
+# json UNIT3D 8.1.3 (custom)

src/Jackett.Common/Definitions/joyhd.yml

@@ -82,7 +82,6 @@ search:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
     # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
     spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    inclbookmarked: 0
     search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }} {{ else }}{{ .Keywords }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}"
     # 0 title, 1 descr, 3 uploader, 4 imdburl (4 does not appear to work).
     search_area: "{{ if or .Query.IMDBID .Query.DoubanID }}1{{ else }}0{{ end }}"

src/Jackett.Common/Definitions/jpopsuki.yml

@@ -86,6 +86,8 @@ search:
     searchtags: "{{ .Query.Genre }}"
     # 0 Any, 1 All
     tags_type: 1
+  error:
+    - selector: :root:contains("Database error.")
 
   rows:
     selector: table#torrent_table > tbody > tr[class^="torrent"]

src/Jackett.Common/Definitions/kamept.yml

@@ -34,10 +34,8 @@ settings:
   - name: cookie
     type: text
     label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
   - name: freeleech
     type: checkbox
     label: Search freeleech only

src/Jackett.Common/Definitions/keepfriends.yml

@@ -40,10 +40,8 @@ settings:
   - name: cookie
     type: text
     label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
   - name: freeleech
     type: checkbox
     label: Search freeleech only

src/Jackett.Common/Definitions/kickasstorrents-ws.yml

@@ -73,7 +73,7 @@ search:
     - path: "{{ if .Keywords }}usearch/{{ .Keywords }}/{{ else }}new/{{ end }}?field={{ .Config.sort }}&sorder={{ .Config.type }}"
 
   rows:
-    selector: table.data tr[id]
+    selector: table.data tr[id]:has(a[data-download])
 
   fields:
     category_optional:
@@ -93,7 +93,7 @@ search:
       attribute: href
     download:
       # the official site delivers mylink so we skip to the magnet URI
-      selector: td:nth-child(1) > div > a[data-download=""]
+      selector: td:nth-child(1) > div > a[data-download]
       attribute: href
       filters:
         - name: querystring

src/Jackett.Common/Definitions/kimoji.yml

@@ -1,7 +1,7 @@
 ---
 id: kimoji
 name: KIMOJI
-description: "KIMOJI is a CHINESE Private Torrent Tracker for MOVIES / TV / MUSIC"
+description: "KIMOJI is a CHINESE Private Torrent Tracker for MUSIC"
 language: en-US
 type: private
 encoding: UTF-8
@@ -10,15 +10,10 @@ links:
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies, desc: "电影"}
-    - {id: 2, cat: TV, desc: "剧集"}
-    - {id: 3, cat: Audio, desc: "音乐"}
-    - {id: 4, cat: Audio/Audiobook, desc: "有声"}
+    - {id: 3, cat: Audio, desc: "Music"}
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
-    movie-search: [q, imdbid, tmdbid]
     music-search: [q]
 
 settings:
@@ -73,11 +68,6 @@ search:
   # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
     $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
     name: "{{ .Keywords }}"
-    seasonNumber: "{{ .Query.Season }}"
-    episodeNumber: "{{ .Query.Ep }}"
-    imdbId: "{{ .Query.IMDBIDShort }}"
-    tmdbId: "{{ .Query.TMDBID }}"
-    tvdbId: "{{ .Query.TVDBID }}"
     "free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
@@ -92,6 +82,8 @@ search:
     attribute: attributes
 
   fields:
+    _id:
+      selector: ..id
     category:
       selector: category_id
     title:
@@ -103,33 +95,16 @@ search:
     infohash:
       selector: info_hash
     poster:
-      selector: meta.poster
-      filters:
-        - name: replace
-          args: ["https://via.placeholder.com/90x135", ""]
-    imdbid:
-      selector: imdb_id
-    tmdbid:
-      selector: tmdb_id
-    tvdbid:
-      selector: tvdb_id
+      text: "{{ .Config.sitelink }}files/img/torrent-cover_{{ .Result._id }}.jpg"
     genre:
-      selector: meta.genres
+      selector: distributor
       filters:
         - name: re_replace
-          args: ["(?i)^None$", ""]
+          args: ["(?i)(Hard Rock)", "Hard_Rock"]
         - name: re_replace
-          args: ["(?i)(Science Fiction)", "Science_Fiction"]
-        - name: re_replace
-          args: ["(?i)(TV Movies)", "TV_Movies"]
-        - name: re_replace
-          args: ["(?i)(Reality TV)", "Reality_TV"]
-        - name: re_replace
-          args: ["(?i)(Soap Opera)", "Soap_Opera"]
-        - name: re_replace
-          args: ["(?i)(Talk Show)", "Talk_Show"]
+          args: ["(?i)(World Music)", "World_Music"]
         - name: replace
-          args: [" & ", "_&_"]
+          args: ["/", "_"]
     description:
       text: "{{ .Result.genre }}"
     files:

src/Jackett.Common/Definitions/korsar.yml

@@ -435,17 +435,13 @@ settings:
   - name: cookie
     type: text
     label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
   - name: useragent
     type: text
     label: User-Agent
   - name: info_useragent
-    type: info
-    label: How to get the User-Agent
-    default: "<ol><li>From the same place you fetched the cookie,</li><li>Find <b>'user-agent:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole user-agent string <i>(everything after 'user-agent: ')</i> and <b>Paste</b> here.</li></ol>"
+    type: info_useragent
   - name: sort
     type: select
     label: Sort requested from site

src/Jackett.Common/Definitions/laidbackmanor.yml

@@ -16,6 +16,7 @@ caps:
     - {id: 4, cat: Console, desc: "Game"}
     - {id: 5, cat: PC, desc: "Application"}
     - {id: 6, cat: Books, desc: "Books"}
+    - {id: 8, cat: TV/Sport, desc: "Sports"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/lastdigitalunderground.yml

@@ -6,6 +6,8 @@ language: en-US
 type: private
 encoding: UTF-8
 links:
+  - https://theldu.to/
+legacylinks:
   - https://theldu.net/
 
 caps:
@@ -18,27 +20,33 @@ caps:
     - {id: 19, cat: Movies/Other, desc: "Films: Shorts"}
     - {id: 17, cat: TV/Documentary, desc: "Films: Documentary"}
     - {id: 12, cat: Movies/Other, desc: "Films: FanEdits/Restorations"}
-    - {id: 33, cat: Movies/Other, desc: "Films: [No TMDB]"}
+    - {id: 33, cat: Movies/Other, desc: "Films: [TMDB UnListed]"}
     - {id: 27, cat: Movies/Foreign, desc: "Films SP1: Dub or Vid issues"}
     - {id: 22, cat: Movies/Foreign, desc: "Films SP2: No English"}
     - {id: 28, cat: Movies/Other, desc: "Films SP3: Other"}
     - {id: 8, cat: Movies/Other, desc: "Anime: Films"}
     - {id: 9, cat: TV/Anime, desc: "Anime: Series/OVAs"}
     - {id: 2, cat: TV, desc: "Series/TV: General"}
+    - {id: 41, cat: TV, desc: "Series/TV: Single Episodes"}
     - {id: 31, cat: TV/Foreign, desc: "Series/TV SP1: Dub"}
     - {id: 29, cat: TV/Foreign, desc: "Series/TV SP2: No English"}
     - {id: 32, cat: TV/Other, desc: "Series/TV SP3: Other"}
+    - {id: 38, cat: TV/Other, desc: "Series/TV [TMDB unlisted]"}
+    - {id: 40, cat: TV/Documentary, desc: "Series: Documentary"}
     - {id: 20, cat: TV/Other, desc: "Culture: Stand-up"}
     - {id: 7, cat: Books/EBook, desc: "Culture: Ebooks"}
     - {id: 3, cat: Audio, desc: "Culture: Music"}
     - {id: 16, cat: Audio/Video, desc: "Culture: Music Videos"}
     - {id: 34, cat: Audio/Audiobook, desc: "Culture: Audio Books"}
     - {id: 35, cat: TV/Sport, desc: "Culture: Sports"}
-    - {id: 6, cat: XXX, desc: "XXX: Mainstream Smut [TMDB]"}
-    - {id: 30, cat: XXX, desc: "XXX: Filthy Smut [No TMDB]"}
+    - {id: 37, cat: TV/Other, desc: "Culture: Firearms and Freedom"}
+    - {id: 36, cat: TV/Other, desc: "Culture: Roms"}
+    - {id: 6, cat: XXX, desc: "XXX: Smut [TMDB Listed]"}
+    - {id: 30, cat: XXX, desc: "XXX: Smut [TMDB UnListed]"}
     - {id: 15, cat: XXX/Pack, desc: "XXX: MegaPacks"}
     - {id: 10, cat: XXX, desc: "XXX: Hentai"}
     - {id: 14, cat: XXX/Other, desc: "XXX: Creators Corner"}
+    - {id: 39, cat: XXX/Other, desc: "XXX: Pain and Violence"}
     - {id: 13, cat: XXX/Other, desc: "XXX: Other"}
     - {id: 11, cat: XXX/Other, desc: "XXX: Zoo"}
     - {id: 26, cat: Other, desc: "FuckedUpShit"}
@@ -58,7 +66,7 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://theldu.net/\" target=\"_blank\">Last Digital Underground</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://theldu.to/\" target=\"_blank\">Last Digital Underground</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -83,6 +91,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "You are required to log in once per month. We will be purging user accounts via automated script set at an undisclosed interval."
 
 login:
   path: /api/torrents
@@ -201,6 +213,6 @@ search:
 #    minimumratio:
 #      text: 0.4
     minimumseedtime:
-      # 7 day (as seconds = 7 x 24 x 60 x 60)
+      # 7 days (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 8.0.1
+# json UNIT3D 8.1.3

src/Jackett.Common/Definitions/lastfiles.yml

@@ -78,10 +78,8 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr
   - name: info_activity
     type: info
     label: Account Inactivity