yggtorrent: new domain. resolves #14882

Co-authored-by: Bogdan <mynameisbogdan@users.noreply.github.com>

CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 So, you've decided you want to help make Jackett a better program for everyone. Not everyone chooses to help, so we thank you for your decision.
 In order to help us make the most of your contribution please take the time to read these contributing guidelines.
-These are just guidelines, not hard rules. Use your best judgment, and feel free to propose changes to this document in a pull request.
+These are just guidelines, not hard rules. Use your best judgement, and feel free to propose changes to this document in a pull request.
 
 ## Ways you can help
 
@@ -36,8 +36,8 @@ Bugs that are submitted without being on the latest version may be closed.
 **Tracker isn't working**
 
 If you are experiencing an issue with a tracker, then:
-- Use your browser to check you can access the site directly, and if a login is required,
-    check you can login and that you do not have any outstanding account issues.
+- Use your browser to check if you can access the site directly, and if a login is required,
+    check that you can login and that you do not have any outstanding account issues.
 - If you haven't already, try upgrading to the latest version of Jackett.
 - Check our [Troubleshooting wiki](https://github.com/Jackett/Jackett/wiki/Troubleshooting) for common issues.
 - If it is still not working for you, then a **full enhanced log must be included**.

README.md

@@ -8,7 +8,7 @@
 
 _Our [![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60&style=flat-square)](https://discord.gg/J865QuA) server is no longer maintained. If you have a problem, request, or question then please open a new issue here._
 
-This project is a new fork and is recruiting development help.  If you are able to help out please [contact us](https://github.com/Jackett/Jackett/issues/8180).
+This project is a new fork and is recruiting development help.  If you can help out please [contact us](https://github.com/Jackett/Jackett/issues/8180).
 
 Please see our [troubleshooting and contributing guidelines](CONTRIBUTING.md) before submitting any issues or pull requests
 
@@ -41,10 +41,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BitRu
  * BitSearch
  * BT.etree
- * BTDIGG
  * BTMET
  * BTSOW
- * BullTorrent
  * Byrutor
  * Cinecalidad
  * comicat
@@ -62,8 +60,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * EXT Torrents
  * ExtraTorrent.st
  * EZTV
- * FileListing
- * FireBit
  * Frozen Layer
  * GamesTorrents
  * GkTorrent
@@ -89,7 +85,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * MioBT
  * MixTapeTorrent
  * MoviesDVDR
- * MovieTorrent
  * MyPornClub
  * NextJAV
  * Newstudio
@@ -101,9 +96,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * OneJAV
  * ParnuXi
  * PC-torrent
- * PiratBit
- * PornosLab
  * PornoTorrent
+ * Postman
  * ProPorn
  * Rapidzona
  * RinTorNeT
@@ -112,6 +106,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Seedoff
  * Sexy-Pics
  * Shana Project
+ * ShizaProject
  * ShowRSS
  * SimpleAnime
  * Solid Torrents
@@ -119,6 +114,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * SubsPlease
  * sukebei.Nyaa.si
  * The Pirate Bay (TPB)
+ * TheRARBG
  * Tokyo Tosho
  * Torlock
  * Torrent[CORE]
@@ -149,7 +145,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * xxxAdultTorrent
  * XXXClub
  * xxxtor
- * xxxtorrents
  * YourBittorrent
  * YTS.ag
  * zetorrents
@@ -167,6 +162,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Deildu
  * Demonoid
  * Devil-Torrents
+ * DreamingTree
  * DXP (Deaf Experts)
  * Electro-Torrent
  * EniaHD
@@ -177,11 +173,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * File-Tracker
  * Gay-Torrents.net
  * Genesis-Movement
+ * HD-Club
  * HD-CzTorrent
  * HDGalaKtik
  * HellTorrents
  * HunTorrent
  * Il CorSaRo Blu
+ * ilDraGoNeRo
  * Kinorun
  * Kinozal
  * LostFilm.tv
@@ -190,7 +188,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Masters-TB
  * Mazepa
  * Metal Tracker
- * Moviesite
+ * MIRcrew
  * MovieWorld (Flicker)
  * MuseBootlegs (MB)
  * MVGroup Forum
@@ -198,7 +196,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * NetHD (VietTorrent)
  * Newstudio (login)
  * NoNaMe Club (NNM-Club) (login)
- * PiratBit (login)
  * PornoLab
  * PussyTorrents
  * Rainbow Tracker
@@ -216,6 +213,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * SkTorrent-org
  * themixingbowl (TMB)
  * Toloka.to
+ * TorrentMasters
  * Torrents-Local
  * TorrentDownload
  * TribalMixes
@@ -250,8 +248,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * AmigosShareClub
  * AnimeBytes (AB)
  * AnimeTorrents (AnT)
- * AnimeTracker
+ * AnimeTorrents.ro (Anime Torrents Romania)
  * AnimeWorld
+ * AniToons
  * Anthelion
  * Araba Fenice (Phoenix) [![(invite needed)][inviteneeded]](#)
  * ArabP2P
@@ -266,22 +265,23 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Back-ups
  * BakaBT
  * BeiTai
+ * Beload
  * Best-Core
  * BeyondHD (BHD)
  * Bibliotik
- * biho (必火pt)
  * Bit-Bázis
  * BIT-HDTV
  * Bitded
  * Bithorlo (BHO)
  * BitHUmen [![(invite needed)][inviteneeded]](#)
  * Bit Of Valor
+ * BitPorn
  * BitSexy
  * Bitspyder
  * BitTorrentFiles
  * BiTTuRK
  * BJ-Share (BJ)
- * BlueBird [![(invite needed)][inviteneeded]](#)
+ * BlueBird
  * Blutopia (BLU)
  * Borgzelle [![(invite needed)][inviteneeded]](#)
  * Boxing Torrents
@@ -290,6 +290,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BroadCity
  * BrokenStones [![(invite needed)][inviteneeded]](#)
  * BrSociety
+ * BTArg
  * BTNext (BTNT) [![(invite needed)][inviteneeded]](#)
  * BTSCHOOL
  * BWTorrents
@@ -305,25 +306,20 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * CHDBits [![(invite needed)][inviteneeded]](#)
  * cheggit
  * ChileBT
- * CiNEFiLHD
  * Cinemageddon [![(invite needed)][inviteneeded]](#)
  * CinemaMovieS_ZT
  * Cinematik [![(invite needed)][inviteneeded]](#)
  * CinemaZ (EuTorrents)
- * Classix [![(invite needed)][inviteneeded]](#)
+ * Classix
  * Coastal-Crew
  * Concertos
- * CrazyHD
  * CrazySpirits
  * CrnaBerza
  * Dajiao (打胶) [![(invite needed)][inviteneeded]](#)
  * DANISH BYTES
- * Darius Tracker
- * Dark-Shadow
  * DataScene (DS)
- * DataTalli
  * DesiTorrents
- * Diablo Torrent [![(invite needed)][inviteneeded]](#)
+ * Diablo Torrent
  * DICMusic
  * DigitalCore
  * DimeADozen (EzTorrent)
@@ -335,17 +331,19 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Ebooks-Shares
  * Empornium (EMP) [![(invite needed)][inviteneeded]](#)
  * eShareNet
- * eStone (XiDER, BeLoad, BigTorrent)
+ * eStone (BigTorrent)
+ * Exitorrent.org [![(invite needed)][inviteneeded]](#)
  * ExoticaZ (YourExotic)
- * ExtremeTorrents
+ * ExtremeBits
  * Falkon Vision Team
  * FANO.IN [![(invite needed)][inviteneeded]](#)
  * Fantastiko
  * Fappaizuri
  * FastScene
+ * FearNoPeer
  * Femdomcult
  * FileList (FL)
- * FinElite (FE)
+ * FinElite (FE) [![(invite needed)][inviteneeded]](#)
  * FinVip
  * Flux-Zone
  * Free Farm (自由农场)
@@ -357,7 +355,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Gay-Torrents.org
  * GAYtorrent.ru
  * GazelleGames (GGn)
- * Generation-Free
+ * Generation-Free [![(invite needed)][inviteneeded]](#)
  * GigaTorrents
  * GimmePeers (formerly ILT)
  * GiroTorrent
@@ -371,7 +369,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HD Dolby
  * HD-Forever (HDF)
  * HD-Olimpo
- * HD-Only (HDO) [![(invite needed)][inviteneeded]](#)
+ * HD-Only (HDO)
  * HD-Space (HDS)
  * HD-Torrents (HDT)
  * HD-UNiT3D
@@ -388,8 +386,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDRoute [![(invite needed)][inviteneeded]](#)
  * HDSky [![(invite needed)][inviteneeded]](#)
  * HDTime
+ * HDTorrents.it [![(invite needed)][inviteneeded]](#)
  * HDTurk
  * HDU
+ * hdvbits
  * HDVIDEO
  * HDZone
  * Hebits
@@ -430,25 +430,24 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Lesbians4u
  * Libble
  * LibraNet (LN)
- * LinkoManija [![(invite needed)][inviteneeded]](#)
+ * LinkoManija
  * Locadora
  * LosslessClub [![(invite needed)][inviteneeded]](#)
  * LST
  * M-Team TP (MTTP)
  * MaDs Revolution
- * magic-heaven
  * Magico (Trellas) [![(invite needed)][inviteneeded]](#)
  * Majomparádé (TurkDepo)
+ * Making Off
  * Mansão dos Animes (MDAN)
  * MegamixTracker
  * MeseVilág (Fairytale World)
- * MetalGuru
+ * MetalGuru [![(invite needed)][inviteneeded]](#)
  * Milkie
- * MIRcrew
  * MMA-Torrents [![(invite needed)][inviteneeded]](#)
  * MNV (Max-New-Vision)
  * MOJBLiNK
- * MonikaDesign (MDU) [![(invite needed)][inviteneeded]](#)
+ * MonikaDesign (MDU)
  * MoreThanTV (MTV)
  * MouseBits
  * Movie-Torrentz
@@ -471,10 +470,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * P2PBG
  * Panda
  * Party-Tracker
+ * PassThePopcorn (PTP)
  * Peeratiko
  * Peers.FM
  * PigNetwork
- * PirateTheNet (PTN)
  * PixelCove (Ultimate Gamer)
  * PiXELHD (PxHD) [![(invite needed)][inviteneeded]](#)
  * PolishSource (PS)
@@ -505,13 +504,15 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Red Star Torrent (RST) [![(invite needed)][inviteneeded]](#)
  * Redacted (PassTheHeadphones)
  * RedBits
+ * Red Leaves [![(invite needed)][inviteneeded]](#)
  * ReelFlix
  * Resurrect The Net
  * RetroFlix
  * RevolutionTT
- * Romanian Metal Torrents (RMT) [![(invite needed)][inviteneeded]](#)
+ * Romanian Metal Torrents (RMT)
  * Rousi
  * SceneHD [![(invite needed)][inviteneeded]](#)
+ * SceneLinks (SL)
  * SceneRush
  * SceneTime
  * Secret Cinema
@@ -542,7 +543,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TeamHD
  * TeamOS
  * TEKNO3D [![(invite needed)][inviteneeded]](#)
- * TellyTorrent
  * teracod (Movie Zone)
  * The Falling Angels (TFA)
  * The Geeks
@@ -553,7 +553,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * The Shinning (TsH)
  * The Show
  * The Vault [![(invite needed)][inviteneeded]](#)
- * The-Crazy-Ones
  * The-New-Fun
  * TheEmpire (TE)
  * TheLeachZone (TLZ)
@@ -566,6 +565,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Tornado
  * Torrent Network (TN)
  * Torrent Sector Crew (TSC)
+ * Torrent Trader [![(invite needed)][inviteneeded]](#)
  * Torrent-Explosiv
  * Torrent-Syndikat [![(invite needed)][inviteneeded]](#)
  * TOrrent-tuRK (TORK)
@@ -574,14 +574,15 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TorrentBytes (TBy)
  * TorrentCCF (TCCF)
  * TorrentDay (TD)
+ * TorrentDD
  * Torrenteros (TTR)
- * TorrentHeaven [![(invite needed)][inviteneeded]](#)
+ * TorrentHeaven (German) [![(invite needed)][inviteneeded]](#)
+ * Torrent Heaven (Dutch)
  * TorrentHR [![(invite needed)][inviteneeded]](#)
  * Torrenting (TT)
  * Torrentland
  * TorrentLeech (TL)
  * TorrentLeech.pl
- * TorrentMasters
  * TorrentSeeds (TS)
  * TotallyKids (TK)
  * ToTheGlory (TTG) [![(invite needed)][inviteneeded]](#)
@@ -593,15 +594,18 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TV Chaos UK (TVCUK)
  * TvRoad
  * TVstore
+ * Twisted-Music
  * U2 (U2分享園@動漫花園) [![(invite needed)][inviteneeded]](#)
  * UBits
  * UHDBits
  * UltraHD
  * UnionGang
+ * Universal-Torrents
  * UnleashTheCartoons
  * UnlimitZ
- * Uploads
+ * Upload.cx [![(invite needed)][inviteneeded]](#)
  * UTOPIA
+ * WDT (Wrestling Desires Torrents / Ultimate Wrestling Torrents)
  * White Angel
  * WinterSakura
  * World-In-HD [![(invite needed)][inviteneeded]](#)
@@ -609,6 +613,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Wukong
  * x-ite.me (XM)
  * xBytesV2
+ * Xider-Torrent
  * XSpeeds (XS)
  * Xthor
  * XtremeBytes
@@ -629,7 +634,7 @@ 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.
-Using the all indexer has no advantages (besides reduced management overhead), only disadvantages:
+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
 * indexer specific categories (>= 100000) can't be used.
@@ -720,17 +725,17 @@ Jackett can also be run from the command line if you would like to see log messa
 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 latest package and run the Jackett 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"`
 
 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)
-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 it using `systemctl start jackett.service`. Logs are stored as usual under `~/.config/Jackett/log.txt` and also in `journalctl -u jackett.service`.
+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 page](https://github.com/Jackett/Jackett/releases), 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.
@@ -741,7 +746,7 @@ On most operating systems all the required dependencies will already be present.
 
 ### 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)
-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 it using `systemctl start jackett.service`. Logs are stored as usual under `~/.config/Jackett/log.txt` and also in `journalctl -u jackett.service`.
+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`
@@ -832,11 +837,11 @@ location /jackett {
 ```
 
 ## Search Cache
-Jackett has an internal cache to increase search speed and to reduce the number of requests to the torrent sites.
+Jackett has an internal cache to increase search speed and reduce the number of requests to torrent sites.
 The default values should be good for most users. If you have problems, you can reduce the TTL value in the
 configuration or even disable the cache. Keep in mind that you can be banned by the sites if you make a lot of requests.
 * **Cache TTL (seconds)**: (default 2100 / 35 minutes) It indicates how long the results can remain in the cache.
-* **Cache max results per indexer**: (default 1000) How many results are kept in cache for each indexer. This limit is used to limit the use of RAM. If you make many requests and you have enough memory, increase this number.
+* **Cache max results per indexer**: (default 1000) How many results are kept in the cache for each indexer? This limit is used to limit the use of RAM. If you make many requests and you have enough memory, increase this number.
 
 ## Torznab cache
 If you have enabled the Jackett internal cache, but have an indexer for which you would prefer to fetch fresh results (thus ignoring the internal cache) then add the **&cache=false** parameter to your torznab query.
@@ -886,9 +891,9 @@ To use it, please just request a free API key on [OMDb](http://www.omdbapi.com/a
     - e.g. --DataFolder="D:\Your Data\Jackett\".
     - Don't use this on Unix (mono) systems. On Unix just adjust the HOME directory of the user to the data folder or set the XDG_CONFIG_HOME environment variable.
 
--   `--NoRestart`              Don't restart after update
+-   `--NoRestart`              Don't restart after the update
 
--   `--PIDFile`                Specify the location of PID file
+-   `--PIDFile`                Specify the location of the PID file
 
 -   `--NoUpdates`              Disable automatic updates
 
@@ -900,16 +905,7 @@ To use it, please just request a free API key on [OMDb](http://www.omdbapi.com/a
 ## Building from source
 
 ### Windows
-* Install the .NET 6 [SDK](https://www.microsoft.com/net/download/windows)
-* Clone Jackett
-* Open PowerShell and from the `src` directory:
-* - run `dotnet msbuild /restore`
-* - then run `dotnet restore`
-* - and run `dotnet build`
-* Open the Jackett solution in Visual Studio 2019 (version 16.9 or above)
-* Select **Jackett.Server** as the startup project
-* In the drop-down menu of the run button select **Jackett.Server** instead of _IIS Express_
-* Build/Start the project
+[See our contributing guide.](https://github.com/Jackett/Jackett/blob/master/CONTRIBUTING.md#contributing-code)
 
 ### OSX
 

install_service_systemd.sh

@@ -73,6 +73,7 @@ Type=simple
 User=${JACKETT_USER}
 Group=${JACKETT_USER}
 WorkingDirectory=${JACKETT_DIR}
+Environment="DOTNET_EnableDiagnostics=0"
 ExecStart=/bin/sh "${JACKETT_DIR}/jackett_launcher.sh"
 TimeoutStopSec=30
 

src/Jackett.Common/Definitions/0daykiev.yml

@@ -1,8 +1,8 @@
 ---
 id: 0daykiev
 name: 0day.kiev
-description: "0day.kiev.ua is a RUSSIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: ru-RU
+description: "0day.kiev.ua is a UKRAINIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: uk-UA
 type: private
 encoding: windows-1251
 links:
@@ -13,27 +13,16 @@ legacylinks:
 caps:
   categorymappings:
     - {id: 10, cat: Movies, desc: "Фильмы (Movies)"}
-    - {id: 11, cat: TV, desc: "Мультфильмы (Cartoons)"}
-    - {id: 29, cat: TV, desc: "Мультсериалы (TV Series)"}
-    - {id: 34, cat: TV/Anime, desc: "Аниме (Anime)"}
-    - {id: 20, cat: TV/Documentary, desc: "Документальное (Documentary)"}
-    - {id: 14, cat: Audio, desc: "Музыка / Аудио (Music / Audio)"}
-    - {id: 15, cat: Audio/Video, desc: "Музыка / Видео (Music / Video)"}
     - {id: 16, cat: Movies/HD, desc: "HD / Фильмы (HD / Movies)"}
-    - {id: 27, cat: TV/HD, desc: "HD / Мультфильмы (HD / Cartoons)"}
-    - {id: 28, cat: TV/HD, desc: "HD / Документальное (HD / Documentary)"}
-    - {id: 41, cat: Movies/3D, desc: "HD / 3D видео (HD / 3D video)"}
-    - {id: 47, cat: Movies, desc: "HDv 0day Team"}
-    - {id: 17, cat: PC/Games, desc: "Игры / ПК (Games / PC)"}
-    - {id: 25, cat: Console/XBox 360, desc: "Игры / XBOX360 (Games / XBOX360)"}
-    - {id: 33, cat: Console/PSP, desc: "Игры / PSP - PS2 (Games / PSP - PS2)"}
-    - {id: 37, cat: Console/PS3, desc: "Игры / PS3 (Games / PS3)"}
-    - {id: 18, cat: PC/0day, desc: "Софт / Windows (Software / Windows)"}
-    - {id: 39, cat: PC/Mac, desc: "Mac OS (Софт / Игры) (Mac OS (Software / Games))"}
-    - {id: 19, cat: TV, desc: "TV / Сериалы (TV shows)"}
     - {id: 30, cat: TV/HD, desc: "HD / Сериалы (HD / TV Shows)"}
-    - {id: 23, cat: TV, desc: "TV / Передачи (TV / Broadcasts)"}
-    - {id: 22, cat: TV/Sport, desc: "Спорт (Sports)"}
+    - {id: 27, cat: TV/HD, desc: "HD / Мультфильмы (HD / Cartoons)"}
+    - {id: 17, cat: PC/Games, desc: "Игры / ПК (Games / PC)"}
+    - {id: 14, cat: Audio, desc: "Музыка / Аудио (Music / Audio)"}
+    - {id: 29, cat: TV, desc: "Мультсериалы (TV Series)"}
+    - {id: 11, cat: TV, desc: "Мультфильмы (Cartoons)"}
+    - {id: 28, cat: TV/HD, desc: "HD / Документальное (HD / Documentary)"}
+    - {id: 18, cat: PC/0day, desc: "Софт / Windows (Software / Windows)"}
+    - {id: 19, cat: TV, desc: "TV / Сериалы (TV shows)"}
     - {id: 31, cat: Other, desc: "Прочее (Other)"}
 
   modes:
@@ -106,12 +95,12 @@ search:
   keywordsfilters:
     - name: diacritics
       args: replace
-    - name: re_replace # S01 to Cезон 1
-      args: ["(?i)\\bS0*(\\d+)\\b", "езон $1"]
-    - name: re_replace # E01 to Серии 1
-      args: ["(?i)\\bE0*(\\d+)\\b", "ерии $1"]
-    - name: re_replace # S01E01 to Сезон 1 Серии 1
-      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "езон $1 ерии $2"]
+    - name: re_replace # S01 to сезон 1
+      args: ["(?i)\\bS0*(\\d+)\\b", "сезон $1"]
+    - name: re_replace # E01 to сері 1
+      args: ["(?i)\\bE0*(\\d+)\\b", "сері $1"]
+    - name: re_replace # S01E01 to сезон 1 сері 1
+      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "сезон $1 сері $2"]
 
   rows:
     selector: table > tbody > tr.rowtorrentinfo
@@ -128,17 +117,35 @@ search:
       filters:
         # normalize to SXXEYY format
         - name: re_replace
-          args: ["[\\:\\-\\/\\|]", " "]
+          args: ["(?i)[CС]езони?[\\s:]*(\\d+(?:-\\d+)?).+?(?:[CС]ері[їяй]|Епізоди?)[\\s:]*(\\d+(?:-\\d+)?)\\s*з\\s*(\\w?)", "S$1E$2 of $3"]
         - name: re_replace
-          args: ["(?i)\\bКураж Бамбей\\b", "kurazh"]
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езони?.+?(\\d+(?:-\\d+)?)\\s*з\\s*(\\w?)(?:\\s*(?:[CС]ері[їяй]|Епізоди?))?", "S$1E$2 of $3"]
         - name: re_replace
-          args: ["(?i)\\bКубик в Кубе\\b", "Kubik"]
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езони?.+?(\\d+(?:-\\d+)?)\\s*(?:[CС]ері[їяй]|Епізоди?)\\s+з\\s*(\\w?)", "S$1E$2 of $3"]
         - name: re_replace
-          args: ["(?i)\\bКравец\\b", "Kravec"]
+          args: ["(?i)[CС]езони?[\\s:]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)\\s*з\\s*(\\w?)(?:\\s*(?:[CС]ері[їяй]|Епізоди?))?", "S$1E$2 of $3"]
         - name: re_replace
-          args: ["(?i)(.*)\\([CС]езон\\s+(\\d+)\\)\\s+[CС]ери[ия]\\s+(\\d+)\\s+(\\d+)(.*)", "$1 S$2E$3-$4 rus $5"]
+          args: ["(?i)[CС]езони?[\\s:]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)\\s*(?:[CС]ері[їяй]|Епізоди?)\\s+з\\s*(\\w?)", "S$1E$2 of $3"]
         - name: re_replace
-          args: ["(?i)(.*)\\([CС]езон\\s+(\\d+)\\)(.*)", "$1 S$2 rus $3"]
+          args: ["(?i)[CС]езони?[\\s:]*(\\d+(?:-\\d+)?).+?(?:[CС]ері[їяй]|Епізоди?)[\\s:]*(\\d+(?:-\\d+)?)", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езони?.+?(\\d+(?:-\\d+)?)(?:\\s*(?:[CС]ері[їяй]|Епізоди?))", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)[CС]езони?[\\s:]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)(?:\\s*(?:[CС]ері[їяй]|Епізоди?))", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)[CС]езони?[\\s:]*(\\d+(?:-\\d+)?)", "S$1"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s+[CС]езони?", "S$1"]
+        - name: re_replace
+          args: ["(?i)(?:[CС]ері[їяй]|Епізоди?)[\\s:]*(\\d+(?:-\\d+)?)\\s*з\\s*(\\w?)", "E$1 of $2"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s*з\\s*(\\w?)(?:\\s*(?:[CС]ері[їяй]|Епізоди?))", "E$1 of $2"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s+(?:[CС]ері[їяй]|Епізоди?)\\s+з\\s*(\\w?)", "E$1 of $2"]
+        - name: re_replace
+          args: ["(?i)(?:[CС]ері[їяй]|Епізоди?)[\\s:]*(\\d+(?:-\\d+)?)", "E$1"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s+(?:[CС]ері[їяй]|Епізоди?)", "E$1"]
         - name: re_replace
           args: ["(\\([\\p{IsCyrillic}\\W]+\\))|(^[\\p{IsCyrillic}\\W\\d]+\\/ )|([\\p{IsCyrillic} \\-]+,+)|([\\p{IsCyrillic}]+)", "{{ if .Config.stripcyrillic }}{{ else }}$1$2$3$4{{ end }}"]
         - name: re_replace
@@ -151,6 +158,12 @@ search:
           args: ["(?i)\\bWEB Rip\\b", "WEBRip"]
         - name: re_replace
           args: ["(?i)\\bWEB DL\\b", "WEBDL"]
+        - name: re_replace
+          args: ["[\\[\\(\\{<«][\\s\\W]*[\\]\\)\\}>»]", ""]
+        - name: re_replace
+          args: ["^[\\s&,\\.!\\?\\+\\-_\\|\\/':]+", ""]
+        - name: re_replace
+          args: ["(?i)^\\(\\s*([SE]\\d+.*?)\\s*\\)[\\s\\/\\|]*(.+)", "$2 $1"]
     details:
       selector: a[href^="details.php?id="]
       attribute: href
@@ -161,7 +174,7 @@ search:
       selector: td:nth-child(2) i
       filters:
         - name: append
-          args: " +03:00" # MSK
+          args: " +02:00" # EET
         - name: dateparse
           args: "yyyy-MM-dd HH:mm:ss zzz"
     size:

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

@@ -12,18 +12,16 @@ links:
   - https://x1337x.ws/
   - https://x1337x.eu/
   - https://x1337x.se/
-  - https://1337x.unblockit.vegas/
-  - https://1337x.unblockninja.com/
+  - https://1337x.so/
+  - https://1337x.unblockit.foo/
+  - https://1337x.ninjaproxy1.com/
   - https://1337x.mrunblock.bond/
 legacylinks:
   - https://1337x.is/
   - https://1337x.nocensor.work/
   - https://1337x.nocensor.biz/
   - https://1337x.gd/
-  - https://1337x.unblockit.blue/
-  - https://1337x.unblockit.name/
   - https://1337x.nocensor.sbs/
-  - https://1337x.unblockit.ist/
   - https://1337x.unblockit.bet/
   - https://1337x.unblockit.cat/
   - https://1337x.unblockit.nz/
@@ -41,6 +39,10 @@ legacylinks:
   - https://1337x.unblockit.asia/
   - https://1337x.unblockit.mov/
   - https://1337x.unblockit.rsvp/
+  - https://1337x.unblockninja.com/
+  - https://1337x.unblockit.vegas/
+  - https://1337x.unblockit.esq/
+  - https://1337x.unblockit.zip/
 
 caps:
   categorymappings:

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

@@ -189,4 +189,4 @@ search:
     description:
       selector: td:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.8.6 2023-08-18
+# NexusPHP v1.8.8 2023-09-25

src/Jackett.Common/Definitions/2xfree.yml

@@ -16,8 +16,7 @@ caps:
     - {id: 527, cat: TV, desc: "3DSeries(3D剧集)"}
     - {id: 533, cat: Movies, desc: "VRMovies(VR电影)"}
     - {id: 534, cat: TV, desc: "VRSeries(VR剧集)"}
-    - {id: 528, cat: Audio/Video, desc: "AV(VR无码)"}
-    - {id: 529, cat: Audio/Video, desc: "AV(VR有码)"}
+    - {id: 537, cat: TV, desc: "VRShows(VR演出)"}
     - {id: 530, cat: Console, desc: "VRGame(VR一体机游戏)"}
     - {id: 531, cat: PC/Games, desc: "PCVRGame(PCVR游戏)"}
     - {id: 532, cat: Other, desc: "VRTools(VR工具软件)"}
@@ -26,8 +25,6 @@ caps:
     search: [q]
     tv-search: [q, season, ep, imdbid, doubanid]
     movie-search: [q, imdbid, doubanid]
-    music-search: [q]
-    book-search: [q]
 
 settings:
   - name: username

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

@@ -42,6 +42,10 @@ settings:
   - 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
@@ -95,7 +99,7 @@ search:
     by: "{{ .Config.type }}"
 
   rows:
-    selector: table[cellspacing!="1"].lista > tbody > tr:has(a[href^="index.php?page=torrents&category="])
+    selector: "table[cellspacing!=\"1\"].lista > tbody > tr:has(a[href^=\"index.php?page=torrents&category=\"]){{ if .Config.freeleech }}:has(img[src=\"images/sign_free.png\"]){{ else }}{{ end }}"
 
   fields:
     category:
@@ -106,7 +110,6 @@ search:
           args: category
         - name: re_replace
           args: ["(\\b0\\b)", "31"]
-
     title:
       selector: a[href^="index.php?page=torrent-details&id="]
     details:
@@ -147,6 +150,7 @@ search:
       default: 0
     downloadvolumefactor:
       case:
+        img[src="images/sign_free.png"]: 0
         img[src="images/50off.png"]: 0.5
         "*": 1
     uploadvolumefactor:

src/Jackett.Common/Definitions/abnormal.yml

@@ -114,7 +114,7 @@ search:
     SortOrder: "{{ .Config.type }}"
 
   rows:
-    selector: table.table-rows > tbody > tr
+    selector: table.table-rows > tbody > tr:has(a[href^="/Torrent/Download?ReleaseId="])
 
   fields:
     category:
@@ -168,6 +168,6 @@ search:
     minimumratio:
       text: 1.0
     minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
+      # 4 days (as seconds = 4 x 24 x 60 x 60)
+      text: 345600
 # Gazelle

src/Jackett.Common/Definitions/abtorrents.yml

@@ -138,11 +138,11 @@ search:
       selector: a[href^="download.php?torrent="]
       attribute: href
     files:
-      selector: td:nth-last-child(9)
+      selector: a[href^="filelist.php?id="]
     date_day:
       # auto adjusted by site account profile
       # Yesterday, 6:00 AM
-      selector: td:nth-last-child(7) > span[title*="day"]
+      selector: td:nth-last-child(5) > span[title*="day"]
       attribute: title
       optional: true
       filters:
@@ -150,7 +150,7 @@ search:
     date_year:
       # auto adjusted by site account profile
       # Aug 6 2021, 7:25 PM
-      selector: td:nth-last-child(7) > span[title]:not([title*="day"])
+      selector: td:nth-last-child(5) > span[title]:not([title*="day"])
       attribute: title
       optional: true
       filters:
@@ -159,13 +159,13 @@ search:
     date:
       text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
     size:
-      selector: td:nth-last-child(6)
-    grabs:
-      selector: td:nth-last-child(5)
-    seeders:
       selector: td:nth-last-child(4)
+    grabs:
+      selector: a[href^="snatches.php?id="]
+    seeders:
+      selector: a[href^="peerlist_xbt.php?id="]
     leechers:
-      selector: td:nth-last-child(3)
+      selector: td:nth-last-child(3) div:last-child
     downloadvolumefactor:
       case:
         tr.freeleech_color: 0

src/Jackett.Common/Definitions/acidlounge.yml

@@ -5,6 +5,8 @@ description: "Acid Lounge (A-L) is a Private Torrent Tracker for 0DAY / GENERAL"
 language: en-US
 type: private
 encoding: UTF-8
+certificates:
+  - ed11f0187f4aafad54382796f112ecf4bec5d76b  # Expired 28 Oct 2023
 links:
   - https://www.acid-lounge.org.uk/
 

src/Jackett.Common/Definitions/aftershock.yml

@@ -5,8 +5,6 @@ description: "Aftershock is a HUNGARIAN Private Torrent Tracker for MOVIES / GEN
 language: hu-HU
 type: private
 encoding: iso-8859-1
-certificates:
-  - b4950382d327e06126231edb455062842c717727 # expired 26 July 2023
 links:
   - https://aftershock-tracker.net/
 legacylinks:

src/Jackett.Common/Definitions/aidoruonline.yml

@@ -66,7 +66,7 @@ login:
     cookie: "{{ .Config.cookie }}"
   test:
     path: /
-    selector: a[href="account-logout.php"]
+    selector: a[href^="torrents-details.php?id="]
 
 search:
   paths:
@@ -74,7 +74,7 @@ search:
     - path: get_ttable.php
   inputs:
     pcat: "Show+All"
-    $raw: "scat={{ range .Categories }}{{.}},{{end}}&"
+    scat: "{{ join .Categories \",\" }}"
     subbed: ""
     fl: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
     resd: ""

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

@@ -14,12 +14,6 @@ caps:
     - {id: 9, cat: TV/Sport, desc: "Sport"}
     - {id: 2, cat: TV, desc: "TV"}
     - {id: 3, cat: Audio, desc: "Music"}
-    - {id: 4, cat: Console, desc: "Games"}
-    - {id: 10, cat: PC, desc: "Software & Apps"}
-    - {id: 11, cat: Books, desc: "Ebooks & Magazines"}
-    - {id: 14, cat: Audio/Audiobook, desc: "Audiobooks"}
-    - {id: 15, cat: Other, desc: "Education"}
-    - {id: 6, cat: XXX, desc: "XXX"}
 
   modes:
     search: [q]
@@ -35,7 +29,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://aither.cc/\" target=\"_blank\">Aither</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://aither.cc/\" target=\"_blank\">Aither</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -160,15 +154,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 0.4 but torrents must be seeded for 5 days regardless of ratio
 #    minimumratio:
 #      text: 0.4
     minimumseedtime:
       # 5 days (as seconds = 3 x 24 x 60 x 60)
       text: 432000
-# json UNIT3D 6.5.0
+# json UNIT3D 7.1.0b

src/Jackett.Common/Definitions/anilibria.yml

@@ -89,11 +89,10 @@ search:
       selector: ..code
     details:
       text: "{{ .Config.sitelink }}release/{{ .Result._code }}.html"
-    download:
+    download_url:
       selector: url
-      filters:
-        - name: prepend
-          args: "{{ .Config.sitelink }}"
+    download:
+      text: "{{ .Config.sitelink }}{{ .Result.download_url }}"
     magnet:
       selector: magnet
     poster:

src/Jackett.Common/Definitions/animetime.yml

@@ -41,7 +41,7 @@ search:
     title:
       selector: div.flex.flex-wrap ~ p
     details:
-      text: "{{ .Config.sitelink }}search?query={{ .Result.title }}"
+      text: /
     download:
       selector: a[href*="/download/"]
       attribute: href

src/Jackett.Common/Definitions/animetorrentsro.yml

@@ -0,0 +1,153 @@
+---
+id: animetorrentsro
+name: AnimeTorrents.ro
+description: "AnimeTorrents.ro (Anime Torrents Romania) is a ROMANIAN Private Torrent Tracker for ANIME / MANGA"
+language: ro-RO
+type: private
+encoding: UTF-8
+links:
+  - https://animetorrents.ro/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: TV/Anime, desc: "ANIME"}
+    - {id: 1, cat: Movies/Other, desc: "ANIME"} # for Radarr
+    - {id: 2, cat: Books/Comics, desc: "MANGA"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-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: cat-id
+    type: select
+    label: Category
+    default: 0
+    options:
+      0: All categories
+      1: Anime
+      2: Manga
+  - 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
+    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.
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    x: 0
+    y: 0
+    referer: /
+  error:
+    - selector: table.main:contains("esuat")
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    # https://animetorrents.ro/browse.php?search=2023&incldead=1&blah=0&cat=0
+    - path: browse.php
+  inputs:
+    search: "{{ .Keywords }}"
+    # 0 active, 1 all, 2 dead, 3 free
+    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
+    # 0 name, 1 genre
+    blah: 0
+    # site does not support multiple cats
+    cat: "{{ .Config.cat-id }}"
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    # does not support imdbid search
+
+  rows:
+    selector: td > table > tbody > tr:has(a[href^="download.php/"])
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+      filters:
+        - name: re_replace
+          args: ["^(\\[.+?\\]).(.+)", "$2.$1"]
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php/"]
+      attribute: href
+    poster:
+      selector: a[onmouseover]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "src=(.+?) width"
+    files:
+      selector: td:nth-last-child(8)
+    date:
+      selector: td:nth-last-child(6)
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "dd-MM-yyyyHH: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[alt="Free"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    genre:
+      selector: a[href^="download.php/"]
+    description:
+      text: "{{ .Result.genre }}"
+    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/animeworld-api.yml

@@ -28,8 +28,8 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
-    movie-search: [q, imdbid, tmdbid]
+    tv-search: [q, season, ep, tvdbid, tmdbid]
+    movie-search: [q, tmdbid]
     music-search: [q]
     book-search: [q]
 
@@ -87,29 +87,35 @@ search:
     name: "{{ .Keywords }}"
     seasonNumber: "{{ .Query.Season }}"
     episodeNumber: "{{ .Query.Ep }}"
-    imdbId: "{{ .Query.IMDBIDShort }}"
+    # imdbId: "{{ .Query.IMDBIDShort }}" # disabled due to #14776
     tmdbId: "{{ .Query.TMDBID }}"
     tvdbId: "{{ .Query.TVDBID }}"
-    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    "free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
 
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
   rows:
     selector: data
     attribute: attributes
 
   fields:
-    categorydesc:
-      selector: category
+    category:
+      selector: category_id
     title:
       selector: name
     details:
       selector: details_link
     download:
       selector: download_link
+    infohash:
+      selector: info_hash
     poster:
-      selector: poster
+      selector: meta.poster
       filters:
         - name: replace
           args: ["https://via.placeholder.com/90x135", ""]
@@ -119,6 +125,17 @@ search:
       selector: tmdb_id
     tvdbid:
       selector: tvdb_id
+    genre:
+      selector: meta.genres
+      filters:
+        - name: re_replace
+          args: ["(?i)(Cinema TV)", "Cinema_TV"]
+        - name: re_replace
+          args: ["(?i)(Ficção científica)", "Ficção_científica"]
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
     files:
       selector: num_file
     seeders:
@@ -156,4 +173,4 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 6.0.0
+# json UNIT3D 6.5.0

src/Jackett.Common/Definitions/anisource.yml

@@ -5,7 +5,7 @@ description: "AniSource is a Public site for HD Anime raws."
 language: en-US
 type: public
 encoding: UTF-8
-requestDelay: 2
+requestDelay: 5
 links:
   - https://asnet.pw/
 
@@ -25,18 +25,13 @@ search:
     - path: /
       inputs:
         tpage: 2
-    - path: /
-      inputs:
-        tpage: 3
-    - path: /
-      inputs:
-        tpage: 4
-    - path: /
-      inputs:
-        tpage: 5
   inputs:
     search: "{{ .Keywords }}"
 
+  headers:
+    # site blocks Jackett's User-Agents, so slightly alter it here (e.g. Chrome/87.0. > Chrome/97.0.)
+    User-Agent: ["Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4280.88 Safari/537.36"]
+
   rows:
     selector: div[class^="item"]
 

src/Jackett.Common/Definitions/anitoons.yml

@@ -1,34 +1,23 @@
 ---
-id: animetracker
-name: AnimeTracker (API)
-description: "AnimeTracker is a Private Torrent Tracker for HD ANIME / MANGA / HENTAI"
-language: en-US
+id: anitoons
+name: AniToons
+description: "AniToons is a BRAZILIAN Private Torrent Tracker for ANIME / CARTOONS"
+language: pt-BR
 type: private
 encoding: UTF-8
 links:
-  - https://animetracker.cc/
+  - https://anitoons.xyz/
 
 caps:
   categorymappings:
-    - {id: 7, cat: TV/Anime, desc: "Series English"}
-    - {id: 16, cat: TV/Anime, desc: "ongoing"}
-    - {id: 11, cat: TV/Anime, desc: "Series Non-English"}
-    - {id: 1, cat: TV/Anime, desc: "Raws"}
-    - {id: 2, cat: TV/Anime, desc: "OVA"}
-    - {id: 4, cat: Movies, desc: "Movie"}
-    - {id: 15, cat: Books/Comics, desc: "Manga"}
-    - {id: 6, cat: XXX, desc: "Hentai Censored"}
-    - {id: 14, cat: XXX, desc: "Hentai Uncensored"}
-    - {id: 9, cat: XXX, desc: "Hentai Manga"}
-    - {id: 10, cat: Movies, desc: "Live Action"}
-    - {id: 3, cat: Audio, desc: "Music"}
+    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 2, cat: TV, desc: "TV"}
+    - {id: 6, cat: XXX, desc: "Adult"}
 
   modes:
     search: [q]
     tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
-    music-search: [q]
-    book-search: [q]
 
 settings:
   - name: apikey
@@ -37,7 +26,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://animetracker.cc/\" target=\"_blank\">AnimeTracker</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://anitoons.xyz/\" target=\"_blank\">AniToons</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -87,7 +76,7 @@ search:
     imdbId: "{{ .Query.IMDBIDShort }}"
     tmdbId: "{{ .Query.TMDBID }}"
     tvdbId: "{{ .Query.TVDBID }}"
-    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    "free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
@@ -126,7 +115,7 @@ search:
       selector: meta.genres
       filters:
         - name: re_replace
-          args: ["(?i)(Science Fiction)", "Science_Fiction"]
+          args: ["(?i)(Ficção científica)", "Ficção_científica"]
         - name: replace
           args: [" & ", "_&_"]
     description:
@@ -160,15 +149,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 0.4 but torrents must be seeded for 5 days regardless of ratio
 #    minimumratio:
 #      text: 0.4
     minimumseedtime:
-      # 5 day (as seconds = 5 x 24 x 60 x 60)
+      # 5 days (as seconds = 5 x 24 x 60 x 60)
       text: 432000
-# json UNIT3D 6.4.0
+# json UNIT3D 7.0.3

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

@@ -108,12 +108,12 @@ search:
       optional: true
       filters:
         - name: trim
-    title:
+    title_optional:
       selector: title
       filters:
         - name: htmldecode
         - name: append
-          args: " {{ .Result.year }} {{ .Result._codec }} {{ .Result._container }} {{ .Result._media }} {{ .Result._resolution }} {{ .Result._audioFormat }}{{ if .Result._subbing }} Subs{{ else }}{{ end }}{{ if .Result._flags }} {{ .Result._flags }}{{ else }}{{ end }}{{ if .Result._language }} {{ .Result._language }}{{ else }}{{ end }}{{ if and (.Result._releaseGroup) (ne .Result._releaseGroup \"NULL\") }} -{{ .Result._releaseGroup }}{{ else }}{{ end }}"
+          args: " {{ .Result.year }} {{ .Result._codec }} {{ .Result._container }} {{ .Result._media }} {{ .Result._resolution }} {{ .Result._audioFormat }}{{ if .Result._subbing }} Subs{{ else }}{{ end }}{{ if .Result._flags }} {{ .Result._flags }}{{ else }}{{ end }}{{ if .Result._language }} {{ .Result._language }}{{ else }}{{ end }}{{ if and (.Result._releaseGroup) (ne .Result._releaseGroup \"NULL\") }}-{{ .Result._releaseGroup }}{{ else }}{{ end }}"
     details:
       selector: guid
     download:
@@ -155,4 +155,11 @@ search:
     minimumseedtime:
       # 3 day (as seconds = 3 x 24 x 60 x 60)
       text: 259200
+    _filename:
+      selector: "files[0].name"
+      filters:
+        - name: htmldecode
+      optional: true
+    title:
+      text: "{{ if and (eq .Result.files \"1\") (.Result._filename) }}{{ .Result._filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
 # json api

src/Jackett.Common/Definitions/audionews.yml

@@ -180,15 +180,16 @@ caps:
     - {id: 244, cat: Other, desc: "GFXNEWS OTHER GRAPHICS Zbrush, Substance tools"}
     - {id: 216, cat: Other, desc: "GFXNEWS PHOTOSTOCK"}
     - {id: 220, cat: Other, desc: "GFXNEWS PHOTOGRAPHY - ART"}
-    - {id: 227, cat: Other, desc: "GFXNEWS PHOTOSHOP"}
-    - {id: 228, cat: Other, desc: "GFXNEWS PHOTOSHOP Actions, Pattern & Styles"}
-    - {id: 229, cat: Other, desc: "GFXNEWS PHOTOSHOP Background & PSD Source"}
-    - {id: 230, cat: Other, desc: "GFXNEWS PHOTOSHOP Brushes & Gradient"}
-    - {id: 246, cat: Other, desc: "GFXNEWS PHOTOSHOP Mockup"}
-    - {id: 247, cat: Other, desc: "GFXNEWS PHOTOSHOP Overlays"}
-    - {id: 249, cat: Other, desc: "GFXNEWS PHOTOSHOP Preset"}
-    - {id: 231, cat: Other, desc: "GFXNEWS PHOTOSHOP Toolkits, Papers & Objects"}
-    - {id: 245, cat: Other, desc: "GFXNEWS PLUGINS"}
+    - {id: 227, cat: Other, desc: "GFXNEWS 2D Graphics"}
+    - {id: 250, cat: Other, desc: "GFXNEWS 2D Graphics Effects"}
+    - {id: 228, cat: Other, desc: "GFXNEWS 2D Graphics Actions, Pattern & Styles"}
+    - {id: 229, cat: Other, desc: "GFXNEWS 2D Graphics Background & PSD Source"}
+    - {id: 230, cat: Other, desc: "GFXNEWS 2D Graphics Brushes & Gradient"}
+    - {id: 246, cat: Other, desc: "GFXNEWS 2D Graphics Mockup"}
+    - {id: 247, cat: Other, desc: "GFXNEWS 2D Graphics Overlays"}
+    - {id: 249, cat: Other, desc: "GFXNEWS 2D Graphics Preset"}
+    - {id: 231, cat: Other, desc: "GFXNEWS 2D Graphics Toolkits, Papers & Objects"}
+    - {id: 245, cat: Other, desc: "GFXNEWS GFX Plugins"}
     - {id: 210, cat: Other, desc: "GFXNEWS PLUGINS WIN"}
     - {id: 223, cat: Other, desc: "GFXNEWS PLUGINS MAC"}
     - {id: 225, cat: Other, desc: "GFXNEWS PLUGINS LINUX"}

src/Jackett.Common/Definitions/badasstorrents.yml

@@ -58,22 +58,6 @@ settings:
     type: info
     label: About the Download links
     default: You can optionally set as a fallback an automatic alternate link, so if the .torrent download link fails your download will still be successful.
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: date
-    options:
-      date: created
-      seeds: seeders
-      size: size
-      title: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
 
 download:
   selectors:
@@ -84,8 +68,8 @@ download:
 
 search:
   paths:
-    - path: "torrents/{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}{{ end }}{{ .Config.sort }}/{{ .Config.type }}"
-    - path: "torrents/{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}{{ end }}26/{{ .Config.sort }}/{{ .Config.type }}"
+    - path: "torrents{{ if .Keywords }}/search/{{ .Keywords }}{{ else }}{{ end }}"
+    - path: "torrents{{ if .Keywords }}/search/{{ .Keywords }}{{ else }}{{ end }}/26"
 
   rows:
     selector: table.table-hover > tbody > tr:has(a[href*="/torrent/"])

src/Jackett.Common/Definitions/bangumi-moe.yml

@@ -50,7 +50,7 @@ search:
     title:
       selector: title
     details:
-      text: "{{ .Config.sitelink }}"
+      text: /
     infohash:
       selector: infoHash
     poster:

src/Jackett.Common/Definitions/beload.yml

@@ -0,0 +1,157 @@
+---
+id: beload
+name: Beload
+description: "Beload is a HUNGARIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: hu-HU
+type: private
+encoding: UTF-8
+links:
+  - https://beload.org/
+
+caps:
+  categorymappings:
+    - {id: 27, cat: Movies/DVD, desc: "Animáció/DVD/Eng"}
+    - {id: 26, cat: Movies/DVD, desc: "Animáció/DVD/Hun"}
+    - {id: 25, cat: Movies/HD, desc: "Animáció/HD/Eng"}
+    - {id: 24, cat: Movies/HD, desc: "Animáció/HD/Hun"}
+    - {id: 28, cat: Movies/SD, desc: "Animáció/SD/Hun"}
+    - {id: 12, cat: Movies/SD, desc: "Film/Cam/Eng"}
+    - {id: 11, cat: Movies/SD, desc: "Film/Cam/Hun"}
+    - {id: 4, cat: Movies/DVD, desc: "Film/DVD-R/Eng"}
+    - {id: 3, cat: Movies/DVD, desc: "Film/DVD-R/Hun"}
+    - {id: 6, cat: Movies/DVD, desc: "Film/DVD9/Eng"}
+    - {id: 5, cat: Movies/DVD, desc: "Film/DVD9/Hun"}
+    - {id: 2, cat: Movies/Foreign, desc: "Film/HD/Eng"}
+    - {id: 1, cat: Movies/HD, desc: "Film/HD/Hun"}
+    - {id: 8, cat: Movies/Foreign, desc: "Film/SD/Eng"}
+    - {id: 7, cat: Movies/SD, desc: "Film/SD/Hun"}
+    - {id: 10, cat: Movies/Foreign, desc: "Film/XviD/Eng"}
+    - {id: 9, cat: Movies/SD, desc: "Film/XviD/Hun"}
+    - {id: 31, cat: Audio/Audiobook, desc: "Hangoskönyv"}
+    - {id: 42, cat: PC/Games, desc: "Játék/ISO"}
+    - {id: 43, cat: PC/Games, desc: "Játék/RIP"}
+    - {id: 30, cat: Books/Foreign, desc: "Könyv/Eng"}
+    - {id: 29, cat: Books/EBook, desc: "Könyv/Hun"}
+    - {id: 44, cat: PC/ISO, desc: "Program/ISO"}
+    - {id: 45, cat: PC, desc: "Program/RIP"}
+    - {id: 14, cat: TV/Foreign, desc: "Sorozat/HD/Eng"}
+    - {id: 13, cat: TV/HD, desc: "Sorozat/HD/Hun"}
+    - {id: 16, cat: TV/Foreign, desc: "Sorozat/SD/Eng"}
+    - {id: 15, cat: TV/SD, desc: "Sorozat/SD/hun"}
+    - {id: 38, cat: XXX/SD, desc: "XXX/HD"}
+    - {id: 41, cat: XXX/ImageSet, desc: "XXX/Kép"}
+    - {id: 40, cat: XXX/SD, desc: "XXX/SD"}
+    - {id: 20, cat: Audio/Foreign, desc: "Zene/Mp3/Eng"}
+    - {id: 19, cat: Audio/MP3, desc: "Zene/Mp3/Hun"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    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>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: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      1: title
+      4: created
+      7: seeders
+      5: size
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
+  test:
+    path: index.php
+    selector: a[href="/logout.php"]
+
+search:
+  paths:
+    - path: browse.php
+
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # 0 active, 1 both, 2 dead, 3 my uploa, 4 waiting for seeds
+    incldead: 1
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+    # does not support imdbid searches
+
+  rows:
+    selector: "td.text table tbody tr:has(a[href^=\"details.php?id=\"]):not(:has(a[href=\"browse.php?cat=0\"]))"
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+      attribute: title
+      filters:
+        - name: regexp
+          args: "Név: (.+?)(\\n|$)"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?torrent="]
+      attribute: href
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    poster:
+      selector: a.preview
+      attribute: href
+    date:
+      selector: td:nth-last-child(5)
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    files:
+      selector: td:nth-last-child(7)
+    size:
+      selector: td:nth-last-child(4) b
+    grabs:
+      selector: td:nth-last-child(3)
+    seeders:
+      selector: td:nth-last-child(2)
+    leechers:
+      selector: td:nth-last-child(1)
+    downloadvolumefactor:
+      case:
+        font:contains("x0"): 0
+        "*": 1
+    uploadvolumefactor:
+      case:
+        font:contains("x2"): 2
+        font:contains("x4"): 4
+        "*": 1
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# engine n/a

src/Jackett.Common/Definitions/bitbazis.yml

@@ -18,12 +18,8 @@ caps:
     - {id: 94, cat: Movies/HD, desc: "Film-FHD", default: true}
     - {id: 92, cat: Movies/UHD, desc: "Film-UHD", default: true}
     - {id: 22, cat: TV, desc: "Sorozat-Hun", default: true}
-    - {id: 58, cat: TV, desc: "Sorozat-Eng", default: true}
     - {id: 64, cat: Movies, desc: "Film-Pack", default: true}
-    - {id: 66, cat: XXX/ImageSet, desc: "XXX-Pics", default: false}
-    - {id: 33, cat: XXX/SD, desc: "XXX-SD", default: false}
-    - {id: 89, cat: XXX/x264, desc: "XXX-HD", default: false}
-    - {id: 24, cat: Audio/Video, desc: "Videóklip", default: true}
+    - {id: 24, cat: Audio/Video, desc: "Klip", default: true}
     - {id: 70, cat: Audio/Audiobook, desc: "Hangoskönyv", default: true}
     - {id: 27, cat: Books/EBook, desc: "Könyv", default: true}
     - {id: 69, cat: TV/Anime, desc: "Mese-SD", default: true}
@@ -35,7 +31,9 @@ caps:
     - {id: 31, cat: PC/Games, desc: "Játék", default: true}
     - {id: 81, cat: PC/0day, desc: "Program", default: true}
     - {id: 14, cat: PC, desc: "Program-Egyéb", default: true}
-    - {id: 97, cat: TV/Anime, desc: "Sorozat/Mese", default: true}
+    - {id: 66, cat: XXX/ImageSet, desc: "XXX", default: false}
+    - {id: 33, cat: XXX/SD, desc: "XXX-SD", default: false}
+    - {id: 89, cat: XXX/x264, desc: "XXX-HD", default: false}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/bithorlo.yml

@@ -60,6 +60,13 @@ settings:
     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: 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>"
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -83,6 +90,8 @@ settings:
 
 login:
   method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
   test:
     path: index.php
     selector: a[href="logout.php"]
@@ -98,6 +107,9 @@ search:
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
 
+  headers:
+    User-Agent: ["{{ .Config.useragent }}"]
+
   rows:
     selector: tr[class^="browse"]
 

src/Jackett.Common/Definitions/bitporn.yml

@@ -0,0 +1,205 @@
+---
+id: bitporn
+name: BitPorn
+description: "BitPorn is a HUNGARIAN Private Torrent Tracker for 3X"
+language: hu-HU
+type: private
+encoding: UTF-8
+links:
+  - https://bitporn.eu/
+
+caps:
+  categorymappings:
+    - {id: 418, cat: XXX, desc: "Amateur"}
+    - {id: 410, cat: XXX, desc: "Anal"}
+    - {id: 414, cat: XXX, desc: "Animal"}
+    - {id: 415, cat: XXX, desc: "Asian"}
+    - {id: 416, cat: XXX, desc: "BBW"}
+    - {id: 417, cat: XXX, desc: "BDSM"}
+    - {id: 419, cat: XXX, desc: "Big Ass"}
+    - {id: 420, cat: XXX, desc: "Big Tits"}
+    - {id: 421, cat: XXX, desc: "Black"}
+    - {id: 447, cat: XXX, desc: "Cartoon"}
+    - {id: 448, cat: XXX, desc: "Casting"}
+    - {id: 422, cat: XXX, desc: "Classic"}
+    - {id: 434, cat: XXX, desc: "Collection"}
+    - {id: 423, cat: XXX, desc: "Creampie"}
+    - {id: 424, cat: XXX, desc: "Cumshot"}
+    - {id: 451, cat: XXX, desc: "Deepthroat"}
+    - {id: 455, cat: XXX, desc: "Extreme"}
+    - {id: 454, cat: XXX, desc: "Family"}
+    - {id: 425, cat: XXX, desc: "Feature"}
+    - {id: 426, cat: XXX, desc: "Fetish"}
+    - {id: 457, cat: XXX, desc: "Fisting"}
+    - {id: 453, cat: XXX, desc: "Gangbang"}
+    - {id: 427, cat: XXX, desc: "Gay / Bi"}
+    - {id: 412, cat: XXX, desc: "Hair"}
+    - {id: 411, cat: XXX, desc: "Hardcore"}
+    - {id: 456, cat: XXX, desc: "HiddenCam"}
+    - {id: 428, cat: XXX, desc: "Homemade"}
+    - {id: 429, cat: XXX, desc: "Interracial"}
+    - {id: 430, cat: XXX, desc: "Lesbian"}
+    - {id: 431, cat: XXX, desc: "Magyar"}
+    - {id: 432, cat: XXX, desc: "Masturbation"}
+    - {id: 433, cat: XXX, desc: "Mature"}
+    - {id: 435, cat: XXX, desc: "Milf"}
+    - {id: 436, cat: XXX, desc: "Old and Young"}
+    - {id: 437, cat: XXX, desc: "Parody"}
+    - {id: 449, cat: XXX, desc: "Pictures"}
+    - {id: 438, cat: XXX, desc: "Pissing"}
+    - {id: 439, cat: XXX, desc: "POV"}
+    - {id: 440, cat: XXX, desc: "Pregnant"}
+    - {id: 452, cat: XXX, desc: "Public"}
+    - {id: 441, cat: XXX, desc: "Shemale"}
+    - {id: 442, cat: XXX, desc: "Softcore"}
+    - {id: 443, cat: XXX, desc: "Squirt"}
+    - {id: 444, cat: XXX, desc: "Straight"}
+    - {id: 445, cat: XXX, desc: "Teen"}
+    - {id: 450, cat: XXX, desc: "Threesome"}
+    - {id: 446, cat: XXX, desc: "VR"}
+    - {id: 458, cat: XXX, desc: "Uncategorized"}
+
+  modes:
+    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.
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    secret: ""
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: td.embedded:has(h2:contains("Bejelentkezés sikertelen!"))
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # 0 incldead, 1 active, 2 dead
+    incldead: 0
+    # 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
+    search_area: 0
+    # 0 AND, 2 exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    notnewword: 1
+
+  rows:
+    selector: table.torrents > tbody > tr:has(a[href^="details.php?id="])
+
+  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
+    poster:
+      selector: img[data-src]
+      attribute: data-src
+    date_elapsed:
+      # time type: time elapsed (default)
+      selector: td.rowfollow:nth-child(4) > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    date_added:
+      # time added
+      selector: td.rowfollow:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - 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.rowfollow:nth-child(5)
+    seeders:
+      selector: td.rowfollow:nth-child(6)
+    leechers:
+      selector: td.rowfollow:nth-child(7)
+    grabs:
+      selector: td.rowfollow:nth-child(8)
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 48 hours (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+    description:
+      selector: td.rowfollow:nth-child(2)
+      remove: a, b, font, img, span
+# NexusPHP v1.8.5 2023-07-06

src/Jackett.Common/Definitions/bluebird.yml

@@ -10,21 +10,53 @@ links:
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies, desc: "Films"}
-    - {id: 2, cat: TV/Anime, desc: "Cartoons"}
-    - {id: 3, cat: TV/Documentary, desc: "documentary"}
-    - {id: 4, cat: Audio, desc: "Show / Music"}
-    - {id: 5, cat: TV/Sport, desc: "Sport"}
-    - {id: 6, cat: TV, desc: "TV series"}
-    - {id: 7, cat: XXX, desc: "erotica"}
-    - {id: 8, cat: Other, desc: "Demo / Misc"}
+    - {id: 1, cat: Movies, desc: "Фильмы Films"}
+    - {id: 2, cat: TV/Anime, desc: "Мультфильмы Cartoons"}
+    - {id: 3, cat: TV/Documentary, desc: "Документалистика Documentary"}
+    - {id: 4, cat: Audio, desc: "Шоу/Музыка Show/Music"}
+    - {id: 5, cat: TV/Sport, desc: "Спорт Sport"}
+    - {id: 6, cat: TV, desc: "Сериалы TV Series"}
+    - {id: 7, cat: XXX, desc: "Эротика Erotica"}
+    - {id: 8, cat: Other, desc: "Дэмо/Misc Demo/Misc"}
 
   modes:
     search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
     music-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.
+
 login:
   path: takelogin.php
   method: post
@@ -33,8 +65,10 @@ login:
     password: "{{ .Config.password }}"
   error:
     - selector: div.error
+      message:
+        text: "Error during login. Its likely your username or password is incorrect."
   test:
-    path: browse.php
+    path: /
     selector: a[href="logout.php"]
 
 search:
@@ -42,47 +76,63 @@ search:
     - path: browse.php
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    # 0 active, 1 incldead, 2 onlydead 3 gold, 4 without seeders, 5 diamond
-    incldead: 1
+    # search in title
+    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # search in description
+    dsearch: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}"
+    # 0 active, 1 incldead, 2 onlydead, 3 gold, 5 diamond, 4 without seeders
+    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
+    genre: "{{ .Query.Genre }}"
     # or, and
     stype: and
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
 
   rows:
-    selector: table[class="embedded"][cellspacing="0"][cellpadding="5"][width="100%"] > tbody > tr:has(a[href^="details.php?id="])
+    selector: table[class="embedded"][cellspacing="0"][cellpadding="5"][width="100%"] > tbody#highlighted > tr:has(a[href^="details.php?id="])
 
   fields:
-    title:
-      selector: a[href^="details.php?id="]
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
     category:
       selector: a[href^="browse.php?cat="]
       attribute: href
       filters:
         - name: querystring
           args: cat
+    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
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
     grabs:
-      selector: a[href*="&snatched=1#snatched"]
+      selector: td:nth-child(7) > nobr > a, td:nth-child(7) > nobr > b
+    date:
+      selector: div#frame > div#cleft
+      remove: a
+      filters:
+        - name: append
+          args: " +03:00" # MSK
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
     size:
       selector: td:nth-child(7)
       remove: a
-    date:
-      selector: div#cleft > font
     seeders:
       selector: td:nth-child(5)
     leechers:
       selector: td:nth-child(6)
-    poster:
-      selector: a.tname
-      attribute: onmouseover
+    genre:
+      selector: div#cleft
       filters:
-        - name: regexp
-          args: src=([^\s]+)
+        - name: replace
+          args: ["Жанр:", ""]
+    description:
+      text: "{{ .Result.genre }}"
     downloadvolumefactor:
       case:
         img[src="pic/diamond.png"]: 0
@@ -94,4 +144,4 @@ search:
       case:
         img[src="pic/diamond.png"]: 2
         "*": 1
-# engine n/a
+# TBDev v2.1.12

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

@@ -29,7 +29,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://blutopia.cc/\" target=\"_blank\">Blutopia</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://blutopia.cc/\" target=\"_blank\">Blutopia</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -154,15 +154,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 0.4 but torrents must be seeded for 7 days regardless of ratio
 #    minimumratio:
 #      text: 0.4
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 7.0.0b
+# json UNIT3D 7.1.0b

src/Jackett.Common/Definitions/btarg.yml

@@ -0,0 +1,234 @@
+---
+id: btarg
+name: BTArg
+description: "BTArg is an ARGENTINIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: es-AR
+type: private
+encoding: iso-8859-1
+links:
+  - https://www.btarg.com.ar/
+
+caps:
+  # use upload page when updating cats, browse.php uses 0a, 0b, etc for cats >10
+  categorymappings:
+    - {id: 01, cat: Movies, desc: "Cine Arg."}
+    - {id: 02, cat: Movies/Foreign, desc: "Cine Int."}
+    - {id: 03, cat: TV, desc: "TV Arg."}
+    - {id: 04, cat: TV/Foreign, desc: "TV Int."}
+    - {id: 05, cat: XXX, desc: "XXX"}
+    - {id: 06, cat: TV/Anime, desc: "Anime"}
+    - {id: 07, cat: TV/Sport, desc: "Deportes"}
+    - {id: 08, cat: Audio/Video, desc: "Video Clips"}
+    - {id: 09, cat: Audio, desc: "Musica Arg."}
+    - {id: 10, cat: Audio/Foreign, desc: "Musica Int."}
+    - {id: 11, cat: Movies/DVD, desc: "DVD-R"}
+    - {id: 12, cat: PC/Games, desc: "Juegos"}
+    - {id: 13, cat: PC/0day, desc: "Software Arg."}
+    - {id: 14, cat: PC/0day, desc: "Software Int."}
+    - {id: 15, cat: Other, desc: "Otros"}
+    - {id: 16, cat: Other, desc: "Subpacks"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    music-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: 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>Por página Torrents:</b> setting to <b>100</b> on your account profile.
+
+login:
+  path: tracker/takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: td.embedded:has(h2:contains("fallado"))
+  test:
+    path: tracker/index.php
+    selector: a[href="logout.php"], a[href^="download.php/"]
+
+search:
+  paths:
+    - path: tracker/browse.php
+  inputs:
+    $raw: "{{ range .Categories }}cat[]={{.}}&{{end}}"
+    keywords: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 title, 1 title+descr, 2 descr
+    type: "{{ if .Query.IMDBID }}2{{ else }}0{{ end }}"
+    # 0 active, 1 incldead, 2 dead
+    incldead: 0 # dead results don't have torrents
+    # 0 all, 1 free, 2 normal
+    inclfree: "{{ if .Config.freeleech }}1{{ else }}0{{ end }}"
+    sort: "{{ .Config.sort }}"
+    d: "{{ .Config.type }}"
+    list: 1
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["(?i)(S(\\d{1,3}))(?![\\dE])", "Temporada"]
+    - name: re_replace
+      args: ["(\\w+)", "+$1"] # prepend + to each word
+
+  rows:
+    selector: table > tbody > tr:not(tr:first-child):not(tr.browse)
+    after: 1
+
+  fields:
+    categorydesc:
+      selector: a[href*="?cat="] img
+      attribute: title
+    title_default:
+      selector: a[href^="details.php?id="]
+      filters:
+        - name: re_replace
+          args: ["(?i)(Primera Temporada)", "S01"]
+        - name: re_replace
+          args: ["(?i)(Segunda Temporada)", "S02"]
+        - name: re_replace
+          args: ["(?i)(Tercera Temporada)", "S03"]
+        - name: re_replace
+          args: ["(?i)(Cuarta Temporada)", "S04"]
+        - name: re_replace
+          args: ["(?i)(Quinta Temporada)", "S05"]
+        - name: re_replace
+          args: ["(?i)(Sexta Temporada)", "S06"]
+        - name: re_replace
+          args: ["(?i)(Septima Temporada)", "S07"]
+        - name: re_replace
+          args: ["(?i)(Octava Temporada)", "S08"]
+        - name: re_replace
+          args: ["(?i)(Novena Temporada)", "S09"]
+        - name: re_replace
+          args: ["(?i)(Decima Temporada)", "S10"]
+        - name: re_replace
+          args: ["(?i)(Onceava Temporada)", "S11"]
+        - name: re_replace
+          args: ["(?i)(Decimosegunda Temporada)", "S12"]
+        - name: re_replace
+          args: ["(?i)Temporada (\\d{1,3})\\s*y\\s*(\\d{1,3})", "S$1-$2"]
+        - name: re_replace
+          args: ["(?i)Temporada (\\d{1,3})", "S$1"]
+        # move ARG tag to end
+        - name: re_replace
+          args: ["^(\\[ARG\\]) (.+?)$", "$2 $1"]
+        # move quality tags to end
+        - name: re_replace
+          args: ["^(\\[.+?\\]) (.+?)$", "$2 $1"]
+    title:
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+      optional: true
+      default: "{{ .Result.title_default }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)(Primera Temporada)", "S01"]
+        - name: re_replace
+          args: ["(?i)(Segunda Temporada)", "S02"]
+        - name: re_replace
+          args: ["(?i)(Tercera Temporada)", "S03"]
+        - name: re_replace
+          args: ["(?i)(Cuarta Temporada)", "S04"]
+        - name: re_replace
+          args: ["(?i)(Quinta Temporada)", "S05"]
+        - name: re_replace
+          args: ["(?i)(Sexta Temporada)", "S06"]
+        - name: re_replace
+          args: ["(?i)(Septima Temporada)", "S07"]
+        - name: re_replace
+          args: ["(?i)(Octava Temporada)", "S08"]
+        - name: re_replace
+          args: ["(?i)(Novena Temporada)", "S09"]
+        - name: re_replace
+          args: ["(?i)(Decima Temporada)", "S10"]
+        - name: re_replace
+          args: ["(?i)(Onceava Temporada)", "S11"]
+        - name: re_replace
+          args: ["(?i)(Decimosegunda Temporada)", "S12"]
+        - name: re_replace
+          args: ["(?i)Temporada (\\d{1,3})\\s*y\\s*(\\d{1,3})", "S$1-$2"]
+        - name: re_replace
+          args: ["(?i)Temporada (\\d{1,3})", "S$1"]
+        # move ARG tag to end
+        - name: re_replace
+          args: ["^(\\[ARG\\]) (.+?)$", "$2 $1"]
+        # move quality tags to end
+        - name: re_replace
+          args: ["^(\\[.+?\\]) (.+?)$", "$2 $1"]
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php/"]
+      attribute: href
+    date:
+      selector: td:nth-child(5)
+      remove: font
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "yyyy-MM-dd zzz"
+    size:
+      selector: td:nth-child(3)
+    seeders:
+      selector: td:nth-child(8)
+      filters:
+        - name: regexp
+          args: "^(\\d+) \/"
+    leechers:
+      selector: td:nth-child(8)
+      filters:
+        - name: regexp
+          args: "\/ (\\d+)$"
+    grabs:
+      selector: td:nth-child(9)
+      filters:
+        - name: regexp
+          args: "\\\xA0(\\d+)\\\xA0"
+    downloadvolumefactor:
+      case:
+        "font[color=\"red\"]:contains(\"FREE!\")": 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 0.5
+    description_default:
+      selector: a[href^="details.php?id="]
+    description:
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+      optional: true
+      default: "{{ .Result.description_default }}"
+# engine tbd

src/Jackett.Common/Definitions/btdigg.yml

@@ -1,89 +0,0 @@
----
-id: btdigg
-name: BTDigg
-description: "BTDigg is a Public BitTorrent DHT search engine."
-language: en-US
-type: public
-encoding: UTF-8
-links:
-  - https://btdig.com/
-legacylinks:
-  - http://btdiggwzoyrwwbiv.onion.ly/
-  - https://btdiggwzoyrwwbiv.onion.ly/
-  - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.onion.ws/ # redirects to spam
-  - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.onion.pet/ # not found
-  - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.onion.ly/ # 504 gateway timeout
-  - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.tor2web.to/ # 504 gateway timeout
-  - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.tor2web.link/ # Origin is unreachable Error code 523
-
-caps:
-  categories:
-    Other: Other
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: info_8000
-    type: info
-    label: About BTDigg Categories
-    default: BTDigg does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 0
-    options:
-      0: relevance
-      2: created
-      3: size
-
-search:
-  # https://btdig.com/search?q=test&order=2
-  # only 10 results per page
-  paths:
-    - path: search
-  inputs:
-    q: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
-    # 0 relevance 2 age 3 size 4 files
-    order: "{{ .Config.sort }}"
-
-  rows:
-    selector: div.one_result
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      text: Other
-    title:
-      selector: div.torrent_name a
-    details:
-      selector: div.torrent_name a
-      attribute: href
-    download:
-      selector: a[href^="magnet:?xt="]
-      attribute: href
-    date:
-      selector: span.torrent_age
-      filters:
-        - name: replace
-          args: ["found ", ""]
-    files:
-      selector: span.torrent_files
-      optional: true
-      default: 1
-    size:
-      selector: span.torrent_size
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# dhtcrawler2

src/Jackett.Common/Definitions/btsow.yml

@@ -7,9 +7,8 @@ type: public
 encoding: UTF-8
 # use https://tellme.pw/btsow to find the new domain
 links:
-  - https://btsow.homes/
+  - https://btsow.motorcycles/
 legacylinks:
-  - https://btsow.one/
   - https://btsow.rest/
   - https://btsow.bar/
   - https://btsow.click/
@@ -24,6 +23,7 @@ legacylinks:
   - https://btsow.bond/
   - https://btsow.skin/
   - https://btsow.makeup/
+  - https://btsow.homes/
 
 caps:
   categories:
@@ -51,6 +51,10 @@ search:
   paths:
     - path: "search/{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
 
+  headers:
+    # site blocks Jackett's User-Agents, so slightly alter it here (e.g. Safari/537.36 > Safari/537.35)
+    User-Agent: ["Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.35"]
+
   rows:
     selector: div.row:has(a[href*="/detail/hash/"])
 

src/Jackett.Common/Definitions/bulltorrent.yml

@@ -1,126 +0,0 @@
----
-id: bulltorrent
-name: BullTorrent
-description: "BullTorrent (formerly TOROS) is a Public torrent index"
-language: en-US
-type: public
-encoding: UTF-8
-links:
-  - https://www.bulltorrent.com/
-legacylinks:
-  - https://toros.nocensor.space/
-  - https://toros.nocensor.work/
-  - https://www.toros.co/
-  - https://toros.nocensor.biz/
-  - https://toros.nocensor.lol/
-  - https://toros.mrunblock.guru/
-  - https://toros.mrunblock.life/ # Gateway time-out Error code 504
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: Movies}
-    - {id: 2, cat: Audio, desc: Music}
-    - {id: 3, cat: TV, desc: Television}
-    - {id: 4, cat: PC/Games, desc: Games}
-    - {id: 5, cat: PC, desc: Software}
-    - {id: 6, cat: TV/Anime, desc: Anime}
-    - {id: 7, cat: XXX, desc: Adult}
-    - {id: 8, cat: Books, desc: Ebooks}
-    - {id: 9, cat: TV/Anime, desc: Animation}
-    - {id: 10, cat: Other, desc: Other}
-    - {id: 0, cat: Other, desc: TBC}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: added
-    options:
-      added: created
-      seeds: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-download:
-  selectors:
-    - selector: a[href^="magnet:?xt="]
-      attribute: href
-
-search:
-  paths:
-    # https://www.bulltorrent.com/all/torrents/2022.html?v=&i=100&sort=added&o=desc
-    - path: "{{ if .Keywords }}all/torrents/{{ .Keywords }}.html?v=&i=100&sort={{ .Config.sort }}&o={{ .Config.type }}{{ else }}trending.html{{ end }}"
-  keywordsfilters:
-    - name: re_replace
-      args: ["[\\s]+", "-"]
-    - name: tolower
-
-  rows:
-    selector: table.table-responsive tr:has(a[href^="/torrent/"])
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: td:nth-child(1)
-      attribute: class
-      filters:
-        - name: regexp
-          args: (\d+)
-    title:
-      selector: a[href^="/torrent/"]
-    details:
-      selector: a[href^="/torrent/"]
-      attribute: href
-    download:
-      selector: a[href^="/torrent/"]
-      attribute: href
-    date_day:
-      selector: td:nth-child(2):contains("day"), td:nth-child(2):contains("Hoy"), td:nth-child(2):contains("Ayer")
-      optional: true
-      filters:
-        - name: replace
-          args: ["Hoy", "Today"]
-        - name: replace
-          args: ["Ayer", "Yesterday"]
-        - name: fuzzytime
-    date_ago:
-      selector: td:nth-child(2):contains("ago")
-      optional: true
-      filters:
-        - name: timeago
-    date_year:
-      selector: td:nth-child(2):not(:contains("ago")):not(:contains("day")):not(:contains("Hoy")):not(:contains("Ayer"))
-      optional: true
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "d MMM zzz"
-    date:
-      text: "{{ if or .Result.date_year .Result.date_ago .Result.date_day }}{{ or .Result.date_year  .Result.date_ago .Result.date_day }}{{ else }}now{{ end }}"
-    size:
-      selector: td:nth-child(3)
-    seeders:
-      selector: td:nth-child(4)
-    leechers:
-      selector: td:nth-child(5)
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/byrbt.yml

@@ -63,17 +63,11 @@ login:
   path: login.php
   method: form
   form: form[action="takelogin.php"]
-  captcha:
-    type: image
-    selector: img[alt="CAPTCHA"]
-    input: imagestring
   inputs:
-    username: "{{ .Config.username }}"
+    logintype: username
+    userinput: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
-    logout: ""
-    securelogin: ""
-    ssl: yes
-    trackerssl: yes
+    autologin: yes
   error:
     - selector: td.embedded:has(h2:contains("失败"))
   test:

src/Jackett.Common/Definitions/byrutor.yml

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

src/Jackett.Common/Definitions/carphunter.yml

@@ -109,7 +109,7 @@ search:
     # can support genre searching but you need to know the id, eg &genre2=1 for Comedy (id is 2)
 
   rows:
-    selector: "table[border=\"1\"][cellpadding=\"3\"][style=\"width: 920px;\"] > tbody > tr:has(a[href^=\"browse.php?cat=\"])"
+    selector: "table[cellpadding=\"3\"][style=\"width: 920px;\"] > tbody > tr:has(a[href^=\"browse.php?cat=\"])"
 
   fields:
     category:

src/Jackett.Common/Definitions/carpt.yml

@@ -1,7 +1,7 @@
 ---
 id: carpt
 name: CarPT
-description: "CarPT (猪猪网) is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
+description: "CarPT is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
 language: zh-CN
 type: private
 encoding: UTF-8
@@ -189,4 +189,4 @@ search:
     description:
       selector: td.rowfollow:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.7.38 2023-05-14
+# NexusPHP v1.8.8 2023-09-25

src/Jackett.Common/Definitions/cathoderaytube.yml

@@ -18,8 +18,8 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, genre]
-    movie-search: [q, genre]
+    tv-search: [q, season, ep, imdbid, genre]
+    movie-search: [q, imdbid, genre]
 
 settings:
   - name: info_2fa
@@ -76,7 +76,7 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
-    searchtext: "{{ .Keywords }}"
+    searchtext: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
     order_by: "{{ .Config.sort }}"
     order_way: "{{ .Config.type }}"
     action: advanced
@@ -91,8 +91,6 @@ search:
 
   rows:
     selector: table#torrent_table > tbody > tr[class^="torrent row"]:has(a[href*="action=download"])
-    filters:
-      - name: andmatch
 
   fields:
     category:
@@ -128,7 +126,7 @@ search:
         - name: validate
           args: "Action, Adventure, Animation, Comedy, Crime, Documentary, Drama, Family, Fantasy, History, Horror, Kids, Music, Mystery, News, Reality, Romance, SciFi, Soap, Talk, Thriller, War, Western"
     description:
-      text: "{{ .Result.genre }}"
+      selector: div.tags
     poster:
       selector: td:nth-child(2) > script
       filters:

src/Jackett.Common/Definitions/chdbits.yml

@@ -169,4 +169,4 @@ search:
     description:
       selector: td:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP Standard v1.5 Beta 4
+# NexusPHP 73f201530b 2023-08-07

src/Jackett.Common/Definitions/cinefilhd.yml

@@ -1,173 +0,0 @@
----
-id: cinefilhd
-name: CiNEFiLHD
-description: "CiNEFiLHD is a Private Torrent Tracker for MOVIES / TV /  MUSIC"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - http://cinefilhd.xyz/
-  - http://cinefilhd.sytes.net/
-legacylinks:
-  - http://www.cinefilhd.org/
-
-caps:
-  categorymappings:
-    - {id: 37, cat: Movies/HD, desc: "Internal/HD-1080p"}
-    - {id: 17, cat: Movies/HD, desc: "Internal/HD-720p"}
-    - {id: 30, cat: TV/HD, desc: "Internal/HDTV"}
-    - {id: 15, cat: Movies/HD, desc: "Internal/mHD"}
-    - {id: 40, cat: Movies, desc: "Internal/Mp4"}
-    - {id: 26, cat: Movies, desc: "Internal/Remux"}
-    - {id: 45, cat: Movies/WEB-DL, desc: "Internal/WEB-DL"}
-    - {id: 5, cat: Movies/BluRay, desc: "Movies/BluRay"}
-    - {id: 38, cat: Movies/HD, desc: "Movies/HD-1080p"}
-    - {id: 10, cat: Movies/HD, desc: "Movies/HD-720p"}
-    - {id: 29, cat: Movies/HD, desc: "Movies/mHD"}
-    - {id: 41, cat: Movies, desc: "Movies/Mp4"}
-    - {id: 39, cat: Movies, desc: "Movies/Remux"}
-    - {id: 44, cat: Movies/WEB-DL, desc: "Movies/WEB-DL"}
-    - {id: 23, cat: Audio/Lossless, desc: "Lossless"}
-    - {id: 14, cat: Audio/MP3, desc: "MP3-Packs"}
-    - {id: 22, cat: Audio/MP3, desc: "Music-MP3"}
-    - {id: 43, cat: Audio/Video, desc: "Music/1080p"}
-    - {id: 42, cat: Audio/Video, desc: "Music/720p"}
-    - {id: 12, cat: TV/HD, desc: "HDTV-Packs"}
-    - {id: 21, cat: TV/HD, desc: "Movies/HDTV"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, genre]
-    movie-search: [q, imdbid, genre]
-    music-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
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    submitme: LOGIN
-  error:
-    - selector: h2:contains("failed")
-      message:
-        selector: td.colhead2
-  test:
-    path: index.php
-    selector: a[href^="logout.php?hash_please="]
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    # note: site uses the catsX[]=nn method which cardigann does not support.
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if .Query.Genre }}{{ .Query.Genre }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.Genre }}{{ else }}{{ .Keywords }}{{ end }}"
-    # title, descr, genre, all
-    searchin: "{{ if .Query.IMDBID }}descr{{else}}{{end}}{{ if .Query.Genre }}genre{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.Genre }}{{ else }}title{{ end }}"
-    # 0 active, 1 incldead, 2 onlydead
-    incldead: 1
-    # 0 no, 1 yes
-    only_free: "{{ if .Config.freeleech }}1{{else}}0{{end}}"
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-
-  rows:
-    selector: table.mainouter table > tbody > tr:has(a[href^="details.php?id="]), table.mainouter table > tbody > tr[id^="kdescr"]
-    after: 1
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: a[href^="details.php?id="]
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?torrent="]
-      attribute: href
-    poster:
-      selector: a[href^="details.php?id="][onmouseover]
-      attribute: onmouseover
-      filters:
-          #  onmouseover="Tip('<img class=\'pup\' src=\'https://image.tmdb.org/t/p/original/x96AdPlpl4MjUP2DeUhRJifhCMd.jpg\' width=
-        - name: regexp
-          args: src=\\'(.*?)\\'
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    files:
-      selector: td:nth-child(5)
-    date_day:
-      # Today<br/>10:20 AM
-      # Yesterday<br/>08:03 PM
-      selector: td:nth-child(7):contains("day")
-      # auto adjusted by site account profile
-      optional: true
-    date_year:
-      # Feb 14 2019<br/>10:20 AM
-      selector: td:nth-child(7):not(:contains("day"))
-      # auto adjusted by site account profile
-      optional: true
-      filters:
-        - name: dateparse
-          args: "MMM d yyyy hh:mm tt"
-    date:
-      text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
-    size:
-      selector: td:nth-child(8)
-    grabs:
-      selector: td:nth-child(9)
-    seeders:
-      selector: td:nth-child(10)
-    leechers:
-      selector: td:nth-child(11)
-    genre:
-      selector: td:nth-child(2)
-      remove: a, font
-    description:
-      text: "{{ .Result.genre }}"
-    downloadvolumefactor:
-      case:
-        tr.freeleech_color: 0
-        tr.highlight: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.0
-# U-232 v3

src/Jackett.Common/Definitions/classix.yml

@@ -1,7 +1,7 @@
 ---
 id: classix
 name: Classix
-description: "Classic movie tracker"
+description: "Classix is a Private Torrent Tracker for classic MOVIES / TV / GENERAL"
 language: en-US
 type: private
 encoding: UTF-8
@@ -10,11 +10,92 @@ links:
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 59, cat: PC/0day, desc: "Apps: Movies: Misc"}
+    - {id: 55, cat: PC/0day, desc: "Apps: Graphics Editing GNU/Linux"}
+    - {id: 53, cat: PC/0day, desc: "Apps: Apps DVD/Blu-Ray Copy Mac"}
+    - {id: 57, cat: PC/0day, desc: "Apps: DVD/Blu-Ray Copy GNU/Linux"}
+    - {id: 51, cat: PC/0day, desc: "Apps: Graphics Editing Mac"}
+    - {id: 58, cat: PC/0day, desc: "Apps: Music Editing & Recording GNU/"}
+    - {id: 52, cat: PC/0day, desc: "Apps: Apps DVD Editing Mac"}
+    - {id: 56, cat: PC/0day, desc: "Apps: DVD Editing GNU/Linux"}
+    - {id: 54, cat: PC/0day, desc: "Apps: Music Editing & Recording Mac"}
+    - {id: 18, cat: PC/0day, desc: "Apps: Graphics Editing PC"}
+    - {id: 19, cat: PC/0day, desc: "Apps: DVD Editing PC"}
+    - {id: 20, cat: PC/0day, desc: "Apps: DVD/Blu-Ray Copying PC"}
+    - {id: 21, cat: PC/0day, desc: "Apps: Music Editing & Recording PC"}
+    - {id: 66, cat: Other, desc: "grumpyman: pending torrents"}
+    - {id: 67, cat: Books/EBook, desc: "Media: pdf"}
+    - {id: 49, cat: Movies/HD, desc: "Movies: HD-Compressed Or Stripped"}
+    - {id: 47, cat: Movies/Other, desc: "Movies: Covers & Artwork"}
+    - {id: 48, cat: Movies/SD, desc: "Movies: DVD-Compressed Or Stripped"}
+    - {id: 1, cat: Movies/DVD, desc: "Movies: DVD-Untouched"}
+    - {id: 50, cat: Movies, desc: "Movies: Made For TV"}
+    - {id: 2, cat: Movies/SD, desc: "Movies: Divx/Xvid/Avi"}
+    - {id: 60, cat: Movies/HD, desc: "Movies: HD-mkv/mts"}
+    - {id: 65, cat: Movies/Foreign, desc: "Movies: Movies - w/additional lang/sub"}
+    - {id: 42, cat: Movies/HD, desc: "Movies: HD-Untouched"}
+    - {id: 3, cat: Movies/SD, desc: "Movies: SVCD/VCD"}
+    - {id: 71, cat: Movies/UHD, desc: "Movies: 4K-Untouched"}
+    - {id: 4, cat: Movies/Other, desc: "Movies: Other"}
+    - {id: 22, cat: Audio/MP3, desc: "Music: MP3"}
+    - {id: 23, cat: Audio/Lossless, desc: "Music: Lossless"}
+    - {id: 24, cat: Audio/Video, desc: "Music: DVD"}
+    - {id: 70, cat: Audio/Video, desc: "Music: HD"}
+    - {id: 25, cat: Audio/Video, desc: "Music: Video"}
+    - {id: 27, cat: Audio/Other, desc: "Music: Other"}
+    - {id: 63, cat: Other, desc: "Other: Educational/Instructional"}
+    - {id: 61, cat: Books/EBook, desc: "Other: Related Material"}
+    - {id: 37, cat: Other, desc: "Other: Images"}
+    - {id: 62, cat: TV, desc: "TV: Mini-Series"}
+    - {id: 64, cat: TV/Other, desc: "TV: Covers & Art Work"}
+    - {id: 69, cat: TV/SD, desc: "TV: Series - Compressed"}
+    - {id: 5, cat: TV/SD, desc: "TV: Series: DVD"}
+    - {id: 73, cat: TV/HD, desc: "TV: Complete Series HD"}
+    - {id: 72, cat: TV/SD, desc: "TV: Complete Series DVD"}
+    - {id: 41, cat: TV/HD, desc: "TV: Series: HD"}
+    - {id: 74, cat: TV, desc: "TV: Series Compilation: DVD or HD"}
+    - {id: 6, cat: TV/SD, desc: "TV: Divx/Xvid/AVI"}
+    - {id: 7, cat: TV/SD, desc: "TV: SVCD/VCD"}
+    - {id: 68, cat: TV, desc: "TV: .mkv"}
 
   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: Search freeleech only
+    default: false
+  - name: info_free
+    type: info
+    label: About Freeleech at Classix
+    default: This appears to only be uploads by the admin <b>grumpyman57</b>.
+  - 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
 
 login:
   path: account-login.php
@@ -28,43 +109,78 @@ login:
     path: index.php
     selector: a[href="account-logout.php"]
 
-download:
-  selectors:
-    - selector: a[href^="download.php?id="]
-      attribute: href
-
 search:
   paths:
     - path: torrents-search.php
   inputs:
-    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
-    search: "{{ if .Keywords }}\"{{ .Keywords }}\"{{ else }}{{ end }}"
+# category search returns results from unrelated categories
+#     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    cat: 0
+    # 0 incldead, 1 active, 2 dead
+    incldead: 0
+    # 0 all, 1 notfree, 2 onlyfree
+    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 all, 1 english, etc
+    lang: 0
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+    # does not support imdbid search and does not return imdb link in results
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["(\\w+)", "+$1"] # prepend + to each word
 
   rows:
     selector: table > tbody > tr:has(a[href^="torrents.php?cat="])
 
   fields:
     category:
-      text: 1
-    title:
-      selector: td:nth-child(3)
-    download:
-      selector: a[href^="torrents-details.php?id="]
+      selector: a[href^="torrents.php?cat="]
       attribute: href
       filters:
-        - name: replace
-          args: ["torrents-details.php?id=", "download.php?id="]
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="torrents-details.php?id="]
     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="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "src=(.+?)>"
+    date:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "Date Added: </b>(\\d{2}-\\d{2}-\\d{4})<br />"
+        - name: dateparse
+          args: "MM-dd-yyyy"
     size:
       selector: td:nth-child(7)
     seeders:
       selector: td:nth-child(8)
     leechers:
       selector: td:nth-child(9)
+    genre:
+      selector: a[href^="torrents.php?gen="]
+    description:
+      text: "{{ .Result.genre }}"
     downloadvolumefactor:
-      text: 1
+      # returned results not marked as freeleech
+      text: "{{ if .Config.freeleech }}0{{ else }}1{{ end }}"
     uploadvolumefactor:
       text: 1
-# engine tbd
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 2 day (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# engine TorrentTrader v2-svn

src/Jackett.Common/Definitions/cpabien.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://jardattraction.fr/
+  - https://cpasbien-vf.fr/
 legacylinks:
   - https://www.cpasbiens.cz/
   - https://www.cpasbiens.bz/
@@ -23,6 +23,7 @@ legacylinks:
   - https://cpasbiens3.fr/
   - https://labastidevivante.fr/
   - https://cpasbiens911.fr/
+  - https://jardattraction.fr/
 
 caps:
   categories:

src/Jackett.Common/Definitions/cpasbienclone.yml

@@ -118,26 +118,10 @@ search:
       selector: div.poid
       filters:
         - name: re_replace
-          args: ["\\.(\\d)Ko", "$1X00"]
+          args: ["(\\w)o", "$1B"]
+          # keyword search returns nnnnn.n in MB but without unit indicator
         - name: re_replace
-          args: ["Ko", "000"]
-        - name: re_replace
-          args: ["\\.(\\d)Mo", "$1X00000"]
-        - name: re_replace
-          args: ["Mo", "000000"]
-        - name: re_replace
-          args: ["\\.(\\d)Go", "$1X00000000"]
-        - name: re_replace
-          args: ["Go", "000000000"]
-        - name: re_replace
-          args: ["\\.(\\d)To", "$1X00000000000"]
-        - name: re_replace
-          args: ["To", "000000000000"]
-        - name: replace
-          args: ["X", ""]
-          # this is for the search with keywords which returns sizes nnnnn.n without unit indicator.
-        - name: re_replace
-          args: ["(\\d+)\\.\\d", "$1 MB"]
+          args: ["(\\d+\\.\\d)$", "$1MB"]
     date:
       text: now
     seeders:

src/Jackett.Common/Definitions/crazyhd.yml

@@ -1,223 +0,0 @@
----
-id: crazyhd
-name: CrazyHD
-description: "CrazyHD is a BANGLADESHI Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://www.chd4.com/
-legacylinks:
-  - https://www.crazyhd.com/
-
-caps:
-  categorymappings:
-    # Movies
-    - {id: 16, cat: Movies/BluRay, desc: "Movies English Bluray"}
-    - {id: 11, cat: Movies/DVD, desc: "Movies English DVD-RIP"}
-    - {id: 14, cat: Movies, desc: "Movies English CAM"}
-    - {id: 60, cat: Movies/WEB-DL, desc: "Movies English HD/WEBRIP"}
-    - {id: 19, cat: Movies/DVD, desc: "Movies Hindi DVDRIP"}
-    - {id: 52, cat: Movies/BluRay, desc: "Movies Hindi Blu Ray"}
-    - {id: 18, cat: Movies/DVD, desc: "Movies Hindi PreDVD"}
-    - {id: 17, cat: Movies, desc: "Movies Hindi CAM"}
-    - {id: 42, cat: Movies, desc: "Movies Tamil"}
-    - {id: 65, cat: Movies/WEB-DL, desc: "Movies Hindi Webrip/HDrip"}
-    - {id: 24, cat: Movies, desc: "Movies UNRATED"}
-    - {id: 53, cat: Movies/Foreign, desc: "Movies Other Foreign"}
-    - {id: 64, cat: Movies, desc: "Movies Animated"}
-    - {id: 45, cat: Movies, desc: "Movies Trailers"}
-    - {id: 93, cat: Movies, desc: "Movies Dual Movies"}
-    - {id: 96, cat: Movies/UHD, desc: "Movies 4k Hindi"}
-    - {id: 59, cat: Movies, desc: "Movies Pack"}
-    - {id: 94, cat: Movies/UHD, desc: "Movies 4k"}
-    - {id: 62, cat: Movies/3D, desc: "Movies 3D"}
-    # TV
-    - {id: 34, cat: TV, desc: "TV English Series"}
-    - {id: 57, cat: TV, desc: "TV Bangla series"}
-    - {id: 58, cat: TV, desc: "TV Hindi series"}
-    - {id: 95, cat: TV, desc: "TV Other Language"}
-    - {id: 28, cat: TV/Sport, desc: "TV Sports"}
-    - {id: 29, cat: TV/Documentary, desc: "TV Documentary"}
-    # Games
-    - {id: 3, cat: PC/Games, desc: "Games PC"}
-    - {id: 75, cat: PC/Mobile-Android, desc: "Games Android"}
-    - {id: 77, cat: PC/Mobile-iOS, desc: "Games Ipad/Iphone"}
-    - {id: 79, cat: PC/Mobile-Other, desc: "Games Other Platforms"}
-    - {id: 61, cat: PC/Games, desc: "Games trailer"}
-    - {id: 90, cat: Console/PS4, desc: "Games Ps4"}
-    - {id: 86, cat: Console/PS3, desc: "Games xbox / ps3"}
-    - {id: 92, cat: PC/Games, desc: "Games unrated"}
-    # Software
-    - {id: 7, cat: PC/0day, desc: "Software Windows"}
-    - {id: 20, cat: PC/Mobile-Android, desc: "Software Android Apps"}
-    - {id: 83, cat: PC/Mobile-iOS, desc: "Software Iphone Apps"}
-    - {id: 39, cat: PC, desc: "Software Tutorials"}
-    - {id: 63, cat: PC, desc: "Software Linux"}
-    - {id: 89, cat: PC/Mac, desc: "Software MAC OSX"}
-    # Bangla
-    - {id: 56, cat: Movies, desc: "Movies Bangla"}
-    - {id: 35, cat: Movies, desc: "Movies Bangla Natok"}
-    - {id: 47, cat: Movies, desc: "Movies Indian Bangla"}
-    - {id: 46, cat: Movies, desc: "Movies Eid Natok"}
-    - {id: 67, cat: Audio, desc: "Radio program"}
-    # Anime Anime
-    - {id: 36, cat: TV/Anime, desc: "Anime Cartoons"}
-    - {id: 40, cat: TV/Anime, desc: "Anime Subbed"}
-    - {id: 51, cat: TV/Anime, desc: "Anime Dubbed"}
-    - {id: 69, cat: TV/Anime, desc: "Anime Dual Audio"}
-    # Music
-    - {id: 25, cat: Audio/MP3, desc: "MP3 English"}
-    - {id: 26, cat: Audio/MP3, desc: "MP3 Bangla"}
-    - {id: 27, cat: Audio/MP3, desc: "MP3 Hindi"}
-    # Music Video
-    - {id: 48, cat: Audio/Video, desc: "MusicVideo English"}
-    - {id: 49, cat: Audio/Video, desc: "MusicVideo Bangla"}
-    - {id: 50, cat: Audio/Video, desc: "MusicVideo Hindi"}
-    # ETC
-    - {id: 6, cat: Books, desc: "Books"}
-    - {id: 4, cat: Other, desc: "Other"}
-    - {id: 44, cat: Other, desc: "Food & Recipes"}
-    - {id: 38, cat: Other, desc: "Pictures"}
-    - {id: 54, cat: Books/Mags, desc: "Magazine"}
-    - {id: 88, cat: Books/Comics, desc: "Comics"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    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>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: 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>"
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 3
-    options:
-      3: created
-      5: seeders
-      4: size
-      2: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: 2
-    options:
-      2: desc
-      1: asc
-
-login:
-  method: cookie
-  inputs:
-    cookie: "{{ .Config.cookie }}"
-  test:
-    path: /
-    selector: a[href="logout.php"]
-
-search:
-  headers:
-    User-Agent: ["{{ .Config.useragent }}"]
-  paths:
-    - path: index.php?page=searchlist
-      method: post
-  inputs:
-    page: searchlist
-    pages: 1
-    order: "{{ .Config.sort }}"
-    by: "{{ .Config.type }}"
-    # 0=mixed, 1=no free, 2=50%free, 3=100%free, 4=50%&100%free
-    gold: "{{ if .Config.freeleech }}4{{ else }}0{{ end }}"
-    # 0=filename, 1=file&descr, 2=descr, 3=uploader
-    options: 0
-    # 0=all, 1=onlyactive, 2=onlydead
-    active: 0
-    category: "{{ if .Categories }}{{ range .Categories }}{{.}};{{end}}{{ else }}0{{ end }}"
-    search: "{{ .Keywords }}"
-
-  keywordsfilters:
-    - name: re_replace
-      args: ["\\.", " "]
-
-  rows:
-    selector: div.inf-table-row
-
-  fields:
-    title:
-      selector: div.list-name a.tlink
-      filters:
-        - name: re_replace
-          args: [" [\\(\\=\\!]+(50|100).*?[\\!\\=\\)]+", ""]
-    details:
-      selector: div.list-name a.tlink
-      attribute: href
-    category:
-      selector: div.torrent-cat small a
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    poster:
-      selector: div.list-name a.tlink
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=(.*?) width="
-    download:
-      selector: div.list-name a.tlink
-      attribute: tfid
-      filters:
-        - name: prepend
-          args: "download.php?id="
-        - name: append
-          args: "&f={{ .Result.title }}.torrent"
-    genre:
-      selector: div.col-md-12
-      filters:
-        - name: validate
-          args: "Action, Adventure, Animation, Biography, Comedy, Crime, Documentary, Drama, Family, Fantasy, Game-Show, History, Horror, Kids, Music, Musical, Mystery, News, Reality-TV, Romance, Sci-Fi, Sport, Soap, Talk-Show, Thriller, War, Western"
-    description:
-      text: "{{ .Result.genre }}"
-    size:
-      selector: div.torrent-size
-    date:
-      selector: div.torrent-time
-      # auto adjusted by site account profile
-      filters:
-        - name: dateparse
-          args: "dd/MM/yyyy"
-    seeders:
-      selector: div.torrent-seeder
-    leechers:
-      selector: div.torrent-peer
-    grabs:
-      selector: div.torrent-completed
-    downloadvolumefactor:
-      case:
-        img[src="gold/gold.gif"]: 0
-        img[src="gold/silver.gif"]: 0.5
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumseedtime:
-      # 7 day (as seconds = 7 x 24 x 60 x 60)
-      text: 604800
-# engine n/a

src/Jackett.Common/Definitions/crazyspirits.yml

@@ -11,43 +11,44 @@ links:
 caps:
   categorymappings:
     # Films
-    - {id: 1, cat: XXX, desc: "Films 3X"}
-    - {id: 47, cat: XXX, desc: "Films 3X HD720p"}
-    - {id: 48, cat: XXX, desc: "Films 3X HD1080p"}
     - {id: 49, cat: Movies/3D, desc: "Films 3D"}
+    - {id: 1, cat: XXX, desc: "Films 3X"}
+    - {id: 48, cat: XXX/x264, desc: "Films 3X HD1080p"}
+    - {id: 47, cat: XXX/x264, desc: "Films 3X HD720p"}
+    - {id: 140, cat: XXX, desc: "Films 3X Video"}
     - {id: 50, cat: Movies/UHD, desc: "Films 4K"}
     - {id: 51, cat: TV/UHD, desc: "Films 4K UHDTV"}
+    - {id: 57, cat: Movies/BluRay, desc: "Films BD-Rip"}
     - {id: 56, cat: Movies/BluRay, desc: "Films Blu-Ray"}
-    - {id: 53, cat: Movies/HD, desc: "Films HD1080p"}
-    - {id: 52, cat: Movies/HD, desc: "Films HD 720p"}
-    - {id: 61, cat: Movies/HD, desc: "Films HDRip"}
+    - {id: 58, cat: Movies/BluRay, desc: "Films BR-Rip"}
+    - {id: 66, cat: Movies/SD, desc: "Films Cam-TS"}
+    - {id: 96, cat: TV/Documentary, desc: "Docus TV"}
     - {id: 59, cat: Movies/DVD, desc: "Films DVDR"}
     - {id: 60, cat: Movies/DVD, desc: "Films DVDRip"}
-    - {id: 57, cat: Movies/BluRay, desc: "Films BD-Rip"}
-    - {id: 58, cat: Movies/BluRay, desc: "Films BR-Rip"}
-    - {id: 63, cat: Movies/HD, desc: "Films MHD"}
-    - {id: 64, cat: Movies, desc: "Films R5"}
+    - {id: 98, cat: Movies/Other, desc: "Films Animé"}
+    - {id: 126, cat: TV/HD, desc: "Films HDTV"}
+    - {id: 124, cat: TV/Documentary, desc: "Formation Vidéo"}
     - {id: 65, cat: Movies, desc: "Films FSCR"}
-    - {id: 66, cat: Movies, desc: "Films Cam-TS"}
+    - {id: 53, cat: Movies/HD, desc: "Films HD1080p"}
+    - {id: 52, cat: Movies/HD, desc: "Films HD 720p"}
+    - {id: 137, cat: Movies/UHD, desc: "Films HDR 2160p"}
+    - {id: 61, cat: Movies/HD, desc: "Films HDRip"}
+    - {id: 63, cat: Movies/HD, desc: "Films MHD"}
     - {id: 67, cat: Movies, desc: "Films Pack Films"}
-    - {id: 68, cat: Movies, desc: "Films Vost-FR"}
+    - {id: 129, cat: Movies, desc: "Films QC~Film"}
+    - {id: 64, cat: Movies, desc: "Films R5"}
+    - {id: 99, cat: Movies, desc: "Films Remux"}
     - {id: 69, cat: Movies, desc: "Films VO"}
+    - {id: 68, cat: Movies, desc: "Films Vost-FR"}
+    - {id: 122, cat: Movies/WEB-DL, desc: "Films Web-DL 1080P"}
+    - {id: 138, cat: Movies/WEB-DL, desc: "Films WEB-DL 2160p"}
+    - {id: 123, cat: Movies/WEB-DL, desc: "Films WEB-DL 720p"}
+    - {id: 143, cat: Movies/WEB-DL, desc: "Films WEB-DL-SD"}
+    - {id: 139, cat: Movies/WEB-DL, desc: "Films WEB-RIP 2160p"}
+    - {id: 73, cat: Movies/WEB-DL, desc: "Films Webrip"}
     - {id: 70, cat: Movies/WEB-DL, desc: "Films WebRip 1080p"}
     - {id: 71, cat: Movies/WEB-DL, desc: "Films WebRip 720p"}
-    - {id: 73, cat: Movies/WEB-DL, desc: "Films Webrip"}
-    - {id: 129, cat: Movies, desc: "Films QC~Film"}
     - {id: 72, cat: Movies/WEB-DL, desc: "Films WEBRip-DL"}
-    - {id: 99, cat: Movies, desc: "Films Remux"}
-    - {id: 98, cat: Movies/Other, desc: "Films Animé"}
-    - {id: 122, cat: Movies/WEB-DL, desc: "Films Web-DL 1080P"}
-    - {id: 123, cat: Movies/WEB-DL, desc: "Films WEB-DL 720p"}
-    - {id: 137, cat: Movies/UHD, desc: "Films HDR 2160p"}
-    - {id: 138, cat: Movies/WEB-DL, desc: "Films WEB-DL 2160p"}
-    - {id: 139, cat: Movies/WEB-DL, desc: "Films WEB-RIP 2160p"}
-    - {id: 126, cat: TV/HD, desc: "Films HDTV"}
-    # Documentaire
-    - {id: 96, cat: TV/Documentary, desc: "Docus TV"}
-    - {id: 124, cat: TV/Documentary, desc: "Docus Formation Video"}
     # Jeux
     - {id: 114, cat: PC/Games, desc: "Jeux PC"}
     - {id: 115, cat: Console/PS3, desc: "Jeux PS3"}
@@ -55,49 +56,51 @@ caps:
     - {id: 117, cat: Console, desc: "Jeux Roms"}
     - {id: 118, cat: Console, desc: "Jeux Switch"}
     - {id: 119, cat: Console/Wii, desc: "Jeux Wii"}
-    - {id: 121, cat: Console/XBox, desc: "Jeux Xbox"}
     - {id: 120, cat: Console/WiiU, desc: "Jeux WiiU"}
+    - {id: 121, cat: Console/XBox, desc: "Jeux Xbox"}
     # Livre
-    - {id: 135, cat: Books, desc: "Livre Québéçois"}
     - {id: 100, cat: Audio/Audiobook, desc: "Livre Audio"}
     - {id: 101, cat: Books/EBook, desc: "Livre Epub"}
     - {id: 102, cat: Books, desc: "Livre Mangas"}
+    - {id: 135, cat: Books, desc: "Livre Québéçois"}
     - {id: 103, cat: Books, desc: "Livres BD"}
     - {id: 104, cat: Books/Comics, desc: "Livres Comics"}
     - {id: 105, cat: Books/Mags, desc: "Livres Press"}
     - {id: 106, cat: Books, desc: "Livres Romans"}
     # Logiciel
-    - {id: 110, cat: PC/0day, desc: "Logiciel Windows"}
-    - {id: 111, cat: PC, desc: "Logiciel Linux"}
     - {id: 113, cat: PC/Mobile-iOS, desc: "Logiciel Apple"}
+    - {id: 111, cat: PC, desc: "Logiciel Linux"}
     - {id: 112, cat: PC/Mobile-Other, desc: "Logiciel Smart Phone"}
+    - {id: 110, cat: PC/0day, desc: "Logiciel Windows"}
     # Musiques
-    - {id: 132, cat: Audio, desc: "Musiques QC~Musique"}
-    - {id: 125, cat: Audio/Video, desc: "Musiques Videos Pack"}
-    - {id: 107, cat: Audio/MP3, desc: "Musiques MP3"}
     - {id: 108, cat: Audio/Lossless, desc: "Musiques FLAC"}
+    - {id: 107, cat: Audio/MP3, desc: "Musiques MP3"}
+    - {id: 141, cat: Audio, desc: "Musiques Pack Album"}
+    - {id: 125, cat: Audio/Video, desc: "Musiques Videos Pack"}
+    - {id: 132, cat: Audio, desc: "Musiques QC~Musique"}
     - {id: 109, cat: Audio, desc: "Musiques WMA"}
     # Séries
     - {id: 130, cat: TV, desc: "Séries QC~Serie"}
-    - {id: 77, cat: TV/HD, desc: "Séries HDTV"}
+    - {id: 97, cat: TV/Anime, desc: "Séries Animée"}
     - {id: 84, cat: TV/HD, desc: "Séries Épisodes HD"}
     - {id: 85, cat: TV/SD, desc: "Séries Épisodes SD"}
-    - {id: 97, cat: TV/Anime, desc: "Séries Animée"}
+    - {id: 77, cat: TV/HD, desc: "Séries HDTV"}
     - {id: 88, cat: TV, desc: "Séries Pack HD"}
     - {id: 128, cat: TV, desc: "Séries Pack SD"}
     # Spéctacle
     - {id: 131, cat: TV/Other, desc: "Spectacle QC~Spectacle"}
-    - {id: 91, cat: TV/Other, desc: "Spectacle 720p"}
     - {id: 90, cat: TV/Other, desc: "Spectacle 1080p"}
+    - {id: 91, cat: TV/Other, desc: "Spectacle 720p"}
+    - {id: 142, cat: TV/Other, desc: "Spectacle QC"}
     - {id: 136, cat: TV/Other, desc: "Spectacle SD"}
     # Télévision
+    - {id: 133, cat: TV, desc: "TV QC~Tv"}
+    - {id: 94, cat: TV, desc: "TV Animation"}
+    - {id: 93, cat: TV/Documentary, desc: "TV Documentaires"}
+    - {id: 92, cat: TV/Other, desc: "TV Spectacles"}
+    - {id: 95, cat: TV/Sport, desc: "TV Sports"}
     - {id: 74, cat: TV/HD, desc: "TV TVHD"}
     - {id: 75, cat: TV, desc: "TV TVRip"}
-    - {id: 92, cat: TV/Other, desc: "TV Spectacles"}
-    - {id: 93, cat: TV/Documentary, desc: "TV Documentaires"}
-    - {id: 94, cat: TV, desc: "TV Animation"}
-    - {id: 133, cat: TV, desc: "TV QC~Tv"}
-    - {id: 95, cat: TV/Sport, desc: "TV Sports"}
 
   modes:
     search: [q]
@@ -165,27 +168,30 @@ login:
 download:
   before:
     path: thanks.php
-    method: get
     inputs:
       id: "{{ .DownloadUri.Query.id }}"
       to: give
       torrent: "{{ .DownloadUri.Query.id }}"
   selectors:
-    - selector: "a[href^=\"/{{ .DownloadUri.Query.id }}/\"]"
+    - selector: a[href^="download.php?id="]
       attribute: href
 
 search:
   paths:
-    # http://crazyspirits.com/torrents-search.php?c101=1&c102=1&c103=1&c104=1&c105=1&c106=1&search=&cat=0&incldead=0&freeleech=0&lang=0
+    # https://www.crazyspirits.com/torrents-search.php?search=&cat=0&incldead=1&freeleech=0&recommended=0&lang=0
     - path: torrents-search.php
   inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+# using multi cat search causes http 500 internal server error
+# $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
+    cat: 0
     # 0 active, 1 incldead, 2 onlydead
     incldead: 1
     # 0 all, 1 nofree, 2 onlyfree
     freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 all 1 french 2 english etc
+    # 0 all, 1 not recommended, 2 only recommended
+    recommended: 0
+    # 0 all, 1 french, 2 english, etc
     lang: 0
     sort: "{{ .Config.sort }}"
     order: "{{ .Config.type }}"

src/Jackett.Common/Definitions/crt2fa.yml

@@ -18,8 +18,8 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, genre]
-    movie-search: [q, genre]
+    tv-search: [q, season, ep, imdbid, genre]
+    movie-search: [q, imdbid, genre]
 
 settings:
   - name: cookie
@@ -66,7 +66,7 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
-    searchtext: "{{ .Keywords }}"
+    searchtext: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
     order_by: "{{ .Config.sort }}"
     order_way: "{{ .Config.type }}"
     action: advanced
@@ -81,8 +81,6 @@ search:
 
   rows:
     selector: table#torrent_table > tbody > tr[class^="torrent row"]:has(a[href*="action=download"])
-    filters:
-      - name: andmatch
 
   fields:
     category:
@@ -118,7 +116,7 @@ search:
         - name: validate
           args: "Action, Adventure, Animation, Comedy, Crime, Documentary, Drama, Family, Fantasy, History, Horror, Kids, Music, Mystery, News, Reality, Romance, SciFi, Soap, Talk, Thriller, War, Western"
     description:
-      text: "{{ .Result.genre }}"
+      selector: div.tags
     poster:
       selector: td:nth-child(2) > script
       filters:

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

@@ -107,15 +107,24 @@ search:
     title:
       selector: name
     details:
-      text: "{{ .Config.sitelink }}torrents/{{ .Result._id }}"
+      text: "/torrents/{{ .Result._id }}"
     download:
-      text: "{{ .Config.sitelink }}torrent/download/{{ .Result._id }}.{{ .Config.rsskey }}"
+      text: "/torrent/download/{{ .Result._id }}.{{ .Config.rsskey }}"
     infohash:
       selector: info_hash
     poster:
       selector: poster_image
     genre:
       selector: meta_genres
+      filters:
+        - name: re_replace
+          args: ["(?i)(Action og eventyr)", "Action_og_eventyr"]
+        - name: re_replace
+          args: ["(?i)(Sci-fi og Fantasy)", "Sci-fi_og_Fantasy"]
+        - name: re_replace
+          args: ["(?i)(Stand-Up Comedy)", "Stand-Up_Comedy"]
+        - name: replace
+          args: [" & ", "_&_"]
     description:
       text: "{{ .Result.genre }}"
     imdbid:

src/Jackett.Common/Definitions/dariustracker.yml

@@ -1,177 +0,0 @@
----
-id: dariustracker
-name: Darius Tracker
-description: "Darius Tracker is a HUNGARIAN Private Tracker for MOVIES / TV / GENERAL"
-language: hu-HU
-type: private
-encoding: UTF-8
-links:
-  - https://dariustracker.hu/
-
-caps:
-  categorymappings:
-    - {id: 86, cat: Movies/SD, desc: "Film/Cam/XviD/Eng"}
-    - {id: 85, cat: Movies/SD, desc: "Film/Cam/XviD/Hun"}
-    - {id: 19, cat: Movies/DVD, desc: "Film/DVD-R/Eng"}
-    - {id: 17, cat: Movies/DVD, desc: "Film/DVD-R/Hun"}
-    - {id: 88, cat: XXX, desc: "Film/DVD/XXX"}
-    - {id: 62, cat: Movies/DVD, desc: "Film/DVD9/Hun"}
-    - {id: 82, cat: Movies/HD, desc: "Film/HD/Eng"}
-    - {id: 83, cat: Movies/HD, desc: "Film/HD/Hun"}
-    - {id: 89, cat: XXX, desc: "Film/HD/XXX"}
-    - {id: 48, cat: Movies/HD, desc: "Film/x264/Eng"}
-    - {id: 34, cat: Movies/HD, desc: "Film/x264/Hun"}
-    - {id: 16, cat: Movies/SD, desc: "Film/XviD/Eng"}
-    - {id: 15, cat: Movies/SD, desc: "Film/XviD/Hun"}
-    - {id: 64, cat: Movies/SD, desc: "Film/XviD/Pack"}
-    - {id: 70, cat: TV/Sport, desc: "Film/XviD/Sport"}
-    - {id: 33, cat: XXX, desc: "Film/XviD/XXX"}
-    - {id: 90, cat: Audio/Audiobook, desc: "Hangoskönyv"}
-    - {id: 31, cat: PC/Games, desc: "Játék/Pc/Iso"}
-    - {id: 29, cat: PC/Games, desc: "Játék/Pc/Rip"}
-    - {id: 54, cat: Console/PS3, desc: "Játék/PS2/PS3"}
-    - {id: 32, cat: Console/XBox, desc: "Játék/XBOX"}
-    - {id: 50, cat: Books, desc: "Könyv/Eng"}
-    - {id: 27, cat: Books, desc: "Könyv/Hun"}
-    - {id: 65, cat: Other, desc: "Képek"}
-    - {id: 66, cat: XXX, desc: "Képek/XXX"}
-    - {id: 71, cat: Audio/Lossless, desc: "Lossless/Eng"}
-    - {id: 84, cat: Audio/Lossless, desc: "Lossless/Hun"}
-    - {id: 68, cat: Movies/DVD, desc: "Mese/DVD"}
-    - {id: 69, cat: Movies/SD, desc: "Mese/XviD"}
-    - {id: 67, cat: PC/Mobile-Other, desc: "Mobiltelefon"}
-    - {id: 26, cat: Audio/MP3, desc: "Mp3/Eng"}
-    - {id: 25, cat: Audio/MP3, desc: "Mp3/Hun"}
-    - {id: 14, cat: PC, desc: "Program/Egyéb"}
-    - {id: 81, cat: PC/ISO, desc: "Program/Iso"}
-    - {id: 49, cat: PC, desc: "Program/Rip"}
-    - {id: 58, cat: TV, desc: "Sorozat/Eng"}
-    - {id: 22, cat: TV, desc: "Sorozat/Hun"}
-    - {id: 24, cat: Audio/Video, desc: "Videóklipp"}
-
-  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: 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: 4
-    options:
-      1: name
-      5: size
-      4: added
-      7: seeders
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: login.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: table[cellpadding="5"]:contains("Hiba")
-  test:
-    path: index.php
-    selector: a[href^="logout.php"]
-
-search:
-  paths:
-    # https://dariustracker.hu/browse.php?viewMode=&c68=1&c69=1&search=&incldead=1&sort=4&type=desc
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c[{{.}}]=1&{{end}}"
-    viewMode: ""
-    search: "{{ .Keywords }}"
-    # 0 active, 1 active and dead, 2 deadonly,  3 my torrents, 4 seedless
-    incldead: 1
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-    # does not support imdbid searches
-
-  rows:
-    selector: "table[cellpadding=\"5\"] > tbody > tr > td > table[cellpadding=\"5\"] > tbody > tr:has(a[href^=\"download.php?torrent=\"]){{ if .Config.freeleech }}:has(img[src$=\"/arrowdown.png\"] ~ span:contains(\"0x\")){{ else }}{{ end }}"
-
-  fields:
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: a[href^="details.php?id="]
-      attribute: title
-      filters:
-        - name: re_replace
-          args: ["(?i)(Név: |Első név: -)|Második név: -", ""]
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?torrent="]
-      attribute: href
-    poster:
-      selector: a.preview
-      attribute: href
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    files:
-      selector: td:nth-last-child(7)
-    date:
-      selector: td:nth-last-child(5)
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "yyyy-MM-dd HH:mm:ss zzz"
-    size:
-      selector: td:nth-last-child(4) b
-    grabs:
-      selector: td:nth-last-child(3)
-    seeders:
-      selector: td:nth-last-child(2)
-    leechers:
-      selector: td:nth-last-child(1)
-    downloadvolumefactor:
-      selector: img[src$="/arrowdown.png"] ~ span
-      filters:
-        - name: regexp
-          args: (\d+)
-    uploadvolumefactor:
-      selector: img[src$="/arrowup.png"] ~ span
-      filters:
-        - name: regexp
-          args: (\d+)
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
-# engine n/a

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

@@ -13,14 +13,36 @@ legacylinks:
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies, desc: "Movie"}
-    - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: Audio, desc: "Music"}
+    - {id: 1, cat: Movies/HD, desc: "Movie HD"}
+    - {id: 23, cat: Movies/HD, desc: "Movies HD Ro"}
+    - {id: 11, cat: Movies/UHD, desc: "Movies 4K"}
+    - {id: 12, cat: Movies/UHD, desc: "Movies 4K Ro"}
+    - {id: 14, cat: Movies/BluRay, desc: "Movies Bluray"}
+    - {id: 15, cat: Movies/BluRay, desc: "Movies Bluray Ro"}
+    - {id: 27, cat: Movies/DVD, desc: "DVD"}
+    - {id: 28, cat: Movies/DVD, desc: "DVD Ro"}
+    - {id: 19, cat: Movies/SD, desc: "SD"}
+    - {id: 20, cat: Movies/SD, desc: "SD Ro"}
+    - {id: 2, cat: TV/HD, desc: "TV HD"}
+    - {id: 18, cat: TV/HD, desc: "TV HD Ro"}
+    - {id: 26, cat: TV/SD, desc: "TV SD"}
+    - {id: 10, cat: TV/SD, desc: "TV SD Ro"}
+    - {id: 31, cat: TV/SD, desc: "DVD"}
+    - {id: 32, cat: TV/SD, desc: "DVD Ro"}
+    - {id: 29, cat: TV/UHD, desc: "TV 4K"}
+    - {id: 30, cat: TV/UHD, desc: "TV 4K Ro"}
+    - {id: 22, cat: TV, desc: "TV Pack"}
+    - {id: 33, cat: TV, desc: "TV Pack Ro"}
     - {id: 4, cat: PC/Games, desc: "Game"}
-    - {id: 5, cat: PC/0day, desc: "Application"}
-    - {id: 6, cat: XXX, desc: "XXX"}
+    - {id: 3, cat: Audio, desc: "Music"}
+    - {id: 21, cat: Audio/Video, desc: "Music Video"}
     - {id: 7, cat: PC/Mobile-Other, desc: "Mobile"}
+    - {id: 24, cat: PC, desc: "Linux"}
     - {id: 8, cat: Books/EBook, desc: "E-Book"}
+    - {id: 25, cat: TV/Sport, desc: "Sport"}
+    - {id: 5, cat: PC/0day, desc: "Application"}
+    - {id: 13, cat: TV/Anime, desc: "Anime"}
+    - {id: 6, cat: XXX, desc: "XXX"}
 
   modes:
     search: [q]
@@ -36,7 +58,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://datascene.xyz/\" target=\"_blank\">DataScene</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://datascene.xyz/\" target=\"_blank\">DataScene</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -163,15 +185,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 0.4 but torrents must be seeded for 7 days regardless of ratio
 #    minimumratio:
 #      text: 0.4
     minimumseedtime:
       # 2 days (as seconds = 2 x 24 x 60 x 60)
       text: 172800
-# json UNIT3D 6.5.0
+# json UNIT3D 7.0.3

src/Jackett.Common/Definitions/datatalli.yml

@@ -1,168 +0,0 @@
----
-id: datatalli
-name: DataTalli
-description: "DataTalli is a FINNISH Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: fi-FI
-type: private
-encoding: UTF-8
-links:
-  - https://datatalli.net/
-
-caps:
-  categorymappings:
-    - {id: 9, cat: TV/Anime, desc: "Anime"}
-    - {id: 19, cat: TV/Documentary, desc: "Dokumentit"}
-    - {id: 22, cat: Movies, desc: "DTTeam"}
-    - {id: 21, cat: Movies/3D, desc: "Elokuvat-3D"}
-    - {id: 10, cat: Movies/SD, desc: "Elokuvat-DivX"}
-    - {id: 11, cat: Movies/DVD, desc: "Elokuvat-DVD"}
-    - {id: 20, cat: Movies/HD, desc: "Elokuvat-HD"}
-    - {id: 5, cat: TV/HD, desc: "HDTV"}
-    - {id: 13, cat: Other, desc: "Kannet/Tekstit"}
-    - {id: 17, cat: Movies/SD, desc: "Lasten-DivX"}
-    - {id: 16, cat: Movies/DVD, desc: "Lasten-DVD"}
-    - {id: 4, cat: Audio, desc: "Musiikki"}
-    - {id: 3, cat: Audio, desc: "Musiikki-Suomi"}
-    - {id: 18, cat: Other, desc: "Muut"}
-    - {id: 1, cat: PC, desc: "Ohjelmat"}
-    - {id: 12, cat: PC/Games, desc: "Pelit / PC"}
-    - {id: 8, cat: Console, desc: "Pelit/Konsoli"}
-    - {id: 25, cat: PC/Mobile-Other, desc: "Puhelin"}
-    - {id: 15, cat: TV, desc: "TV-Ohjelmat"}
-    - {id: 24, cat: TV/Sport, desc: "Urheilu"}
-    - {id: 14, cat: XXX, desc: "xXx"}
-    - {id: 23, cat: XXX/x264, desc: "xXx HD"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-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: 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: 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: members.php?action=takelogin
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: td.embedded:contains("Kirjautuminen Epäonnistui")
-  test:
-    path: index.php
-    selector: a[href="members.php?action=logout"]
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    # 0 active, 1 incldead, 2 onlydead
-    incldead: 1
-    # title, descr, all
-    searchin: title
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-    only_free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-
-  rows:
-    selector: table[border="1"] tbody tr:not(:first-child)
-
-  fields:
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: a[href^="details.php?id="]
-      attribute: title
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?torrent="]
-      attribute: href
-    files:
-      selector: td:nth-last-child(6)
-    date:
-      selector: td:nth-last-child(4)
-      filters:
-        - name: replace
-          args: ["sitten", "ago"]
-        - name: replace
-          args: ["sekuntia", "seconds"]
-        - name: replace
-          args: ["sekunti", "second"]
-        - name: replace
-          args: ["minuuttia", "minutes"]
-        - name: replace
-          args: ["minuutti", "minute"]
-        - name: replace
-          args: ["tuntia", "hours"]
-        - name: replace
-          args: ["tunti", "hour"]
-        - name: replace
-          args: ["päivää", "days"]
-        - name: replace
-          args: ["päivä", "day"]
-        - name: replace
-          args: ["viikkoa", "weeks"]
-        - name: replace
-          args: ["viikko", "week"]
-    size:
-      selector: td:nth-last-child(3)
-    seeders:
-      selector: td:nth-last-child(2)
-    leechers:
-      selector: td:nth-last-child(1)
-    downloadvolumefactor:
-      case:
-        img[src$="/free.png"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    genre:
-      selector: td:nth-child(2)
-      remove: a
-      filters:
-        - name: re_replace
-          args: ["(?i)(Kieli:|Tekstit:|Array|\x0A|\x09)", ""]
-    description:
-      text: "{{ .Result.genre }}"
-    minimumratio:
-      text: 1.05
-# engine n/a

src/Jackett.Common/Definitions/demonoid.yml

@@ -5,21 +5,17 @@ description: "Demonoid is a Semi-Private torrent site for MOVIES / TV / GENERAL"
 language: en-US
 type: semi-private
 encoding: UTF-8
-followredirect: true
 links:
   - https://www.demonoid.is/
   - https://www.dnoid.to/
   - https://www.dnoid.pw/
-  - https://demonoid.unblockit.vegas/
+  - https://demonoid.unblockit.foo/
   - https://demonoid.torrentbay.net/
   - https://demonoid.mrunblock.bond/
   - https://demonoid.nocensor.cloud/
 legacylinks:
   - https://demonoid.nocensor.biz/
-  - https://demonoid.unblockit.blue/
-  - https://demonoid.unblockit.name/
   - https://demonoid.nocensor.sbs/
-  - https://demonoid.unblockit.ist/
   - https://demonoid.unblockit.bet/
   - https://demonoid.unblockit.cat/
   - https://demonoid.unblockit.nz/
@@ -44,6 +40,9 @@ legacylinks:
   - https://demonoid.mrunblock.life/
   - https://demonoid.unblockit.rsvp/
   - https://demonoid.nocensor.click/
+  - https://demonoid.unblockit.vegas/
+  - https://demonoid.unblockit.esq/
+  - https://demonoid.unblockit.zip/
 
 caps:
   categorymappings:

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

@@ -6,9 +6,10 @@ language: en-US
 type: private
 encoding: UTF-8
 links:
-  - https://desitorrents.tv/
   - https://desitorrents.rocks/
   - https://torrent.desi/
+legacylinks:
+  - https://desitorrents.tv/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/diablotorrent.yml

@@ -5,52 +5,89 @@ description: " Diablo Torrent is a Hungarian Private site for TV / MOVIES / GENE
 language: hu-HU
 type: private
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://diablotorrent.net/
 
 caps:
   categorymappings:
-    - {id: 49, cat: Movies/SD, desc: "film / Cam"}
-    - {id: 21, cat: Movies/SD, desc: "film / Cam [magyar]"}
-    - {id: 102, cat: Movies/SD, desc: "film / SD"}
-    - {id: 101, cat: Movies/SD, desc: "film / SD [magyar]"}
-    - {id: 106, cat: Movies/DVD, desc: "film / DVD-R"}
-    - {id: 105, cat: Movies/DVD, desc: "film / DVD-R [magyar]"}
-    - {id: 104, cat: Movies/HD, desc: "film / HD"}
-    - {id: 103, cat: Movies/HD, desc: "film / HD [magyar]"}
-    - {id: 108, cat: TV/SD, desc: "Sorozat / SD"}
-    - {id: 107, cat: TV/SD, desc: "Sorozat / SD [magyar]"}
-    - {id: 110, cat: TV/SD, desc: "Sorozat / DVD-R"}
-    - {id: 109, cat: TV/SD, desc: "Sorozat / DVD-R [magyar]"}
-    - {id: 112, cat: TV/HD, desc: "Sorozat / HD"}
-    - {id: 111, cat: TV/HD, desc: "Sorozat / HD [magyar]"}
-    - {id: 8, cat: Audio/MP3, desc: "Zene / MP3"}
-    - {id: 9, cat: Audio/MP3, desc: "Zene / MP3 [magyar]"}
-    - {id: 38, cat: Audio/Lossless, desc: "Zene / Lossless"}
-    - {id: 37, cat: Audio/Lossless, desc: "Zene / Lossless [magyar]"}
-    - {id: 27, cat: Other, desc: "Egyéb / !! Feltöltési segédlet !!"}
-    - {id: 29, cat: Other, desc: "Egyéb / Képek"}
-    - {id: 12, cat: PC/Games, desc: "Játék / PC"}
-    - {id: 14, cat: Console/PS4, desc: "Játék / PS"}
-    - {id: 39, cat: Console/XBox, desc: "Játék / Xbox"}
-    - {id: 40, cat: Console/Other, desc: "Játék / Egyéb"}
-    - {id: 16, cat: PC/ISO, desc: "Programok / PC"}
-    - {id: 24, cat: PC/Mobile-Other, desc: "Programok / Mobil"}
-    - {id: 53, cat: PC/0day, desc: "Programok / Egyéb"}
-    - {id: 113, cat: XXX/XviD, desc: "Pornó / SD"}
-    - {id: 34, cat: XXX/DVD, desc: "Pornó / DVD-R"}
-    - {id: 114, cat: XXX, desc: "Pornó / HD"}
-    - {id: 36, cat: XXX, desc: "Pornó / Képek"}
-    - {id: 20, cat: Books, desc: "E-Book / Magyar"}
-    - {id: 52, cat: Books, desc: "E-Book / Egyéb"}
+    # Film
+    - {id: 49, cat: Movies/SD, desc: "Film > Cam", default: true}
+    - {id: 21, cat: Movies/SD, desc: "Film > Cam [magyar]", default: true}
+    - {id: 101, cat: Movies/SD, desc: "Film > SD/HUN", default: true}
+    - {id: 102, cat: Movies/SD, desc: "Film > SD/ENG", default: true}
+    - {id: 103, cat: Movies/HD, desc: "Film > HD/HUN", default: true}
+    - {id: 104, cat: Movies/HD, desc: "Film > HD/ENG", default: true}
+    - {id: 105, cat: Movies/DVD, desc: "Film > DVD-R/HUN", default: true}
+    - {id: 106, cat: Movies/DVD, desc: "Film > DVD-R/ENG", default: true}
+    # Sorozat
+    - {id: 107, cat: TV/SD, desc: "Sorozat > SD/HUN", default: true}
+    - {id: 108, cat: TV/SD, desc: "Sorozat > SD/ENG", default: true}
+    - {id: 109, cat: TV/SD, desc: "Sorozat > DVD-R/HUN", default: true}
+    - {id: 110, cat: TV/SD, desc: "Sorozat > DVD-R/ENG", default: true}
+    - {id: 111, cat: TV/HD, desc: "Sorozat > HD/HUN", default: true}
+    - {id: 112, cat: TV/HD, desc: "Sorozat > HD/ENG", default: true}
+    # Pornó
+    - {id: 34, cat: XXX/DVD, desc: "Pornó > DVD-R", default: false}
+    - {id: 36, cat: XXX, desc: "Pornó > Képek", default: false}
+    - {id: 113, cat: XXX/XviD, desc: "Pornó > SD", default: false}
+    - {id: 114, cat: XXX, desc: "Pornó > HD", default: false}
+    # Játék
+    - {id: 12, cat: PC/Games, desc: "Játék > PC", default: true}
+    - {id: 14, cat: Console/PS4, desc: "Játék > PS", default: true}
+    - {id: 39, cat: Console/XBox, desc: "Játék > Xbox", default: true}
+    - {id: 40, cat: Console/Other, desc: "Játék > Egyéb", default: true}
+    # Zene
+    - {id: 8, cat: Audio/MP3, desc: "Zene > MP3", default: true}
+    - {id: 9, cat: Audio/MP3, desc: "Zene > MP3 [magyar]", default: true}
+    - {id: 37, cat: Audio/Lossless, desc: "Zene > Lossless [magyar]", default: true}
+    - {id: 38, cat: Audio/Lossless, desc: "Zene > Lossless", default: true}
+    # Programok
+    - {id: 16, cat: PC/0day, desc: "Programok > PC", default: true}
+    - {id: 24, cat: PC/Mobile-Other, desc: "Programok > Mobil", default: true}
+    - {id: 53, cat: PC/0day, desc: "Programok > Egyéb", default: true}
+    # Egyéb
+    - {id: 27, cat: Other, desc: "Egyéb > !! Feltöltési segédlet !!", default: true}
+    - {id: 29, cat: Other, desc: "Egyéb > Képek", default: true}
+    # E-Book
+    - {id: 20, cat: Books, desc: "E-Book > Magyar", default: true}
+    - {id: 52, cat: Books, desc: "E-Book > Egyéb", default: true}
 
   modes:
     search: [q]
-    tv-search: [q, season, ep]
-    movie-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: sort
+    type: select
+    label: Sort requested from site
+    default: 7
+    options:
+      1: title
+      7: created
+      4: seeders
+      2: size
+  - 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>Torrent oldalanként:</b> setting to <b>100</b> on your account profile.
+
 login:
   path: login
   submitpath: login/run
@@ -70,11 +107,15 @@ login:
 search:
   paths:
     - path: browse
+      categories: [49, 21, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 12, 14, 39, 40, 8, 9, 37, 38, 16, 24, 53, 27, 29, 20, 52]
+    - path: browse/1
+      categories: [34, 36, 113, 114]
   inputs:
     $raw: "{{ range .Categories }}category[]={{.}}&{{end}}"
-    search: "{{ .Keywords }}"
-    s_alapjan: 7
-    s_sorrend: desc
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    imdb: "{{ if .Query.IMDBID }}1{{ else }}{{ end }}"
+    s_alapjan: "{{ .Config.sort }}"
+    s_sorrend: "{{ .Config.type }}"
 
   rows:
     selector: div.torrent_row, div.torrent_details
@@ -125,7 +166,10 @@ search:
       selector: div.torrent_row_magyarcim
       remove: span.torrent_row_new
     downloadvolumefactor:
-      text: 0
+      text: 1
     uploadvolumefactor:
       text: 1
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
 # engine tbd

src/Jackett.Common/Definitions/digitalcore.yml

@@ -137,9 +137,9 @@ search:
     _id:
       selector: id
     details:
-      text: "{{ .Config.sitelink }}torrent/{{ .Result._id }}/"
+      text: "/torrent/{{ .Result._id }}/"
     download:
-      text: "{{ .Config.sitelink }}api/v1/torrents/download/{{ .Result._id }}"
+      text: "/api/v1/torrents/download/{{ .Result._id }}"
     imdbid:
       selector: imdbid2
     imdbid_full:
@@ -150,7 +150,7 @@ search:
       selector: firstpic
     poster_imdb:
       optional: true
-      text: "{{ if .Result.imdbid }}{{ .Config.sitelink }}img/imdb/{{ .Result.imdbid_full }}.jpg{{ else }}{{ end }}"
+      text: "{{ if .Result.imdbid }}/img/imdb/{{ .Result.imdbid_full }}.jpg{{ else }}{{ end }}"
     poster:
       text: "{{ if .Result.poster_imdb }}{{ .Result.poster_imdb }}{{ else }}{{ .Result.poster_normal }}{{ end }}"
     date:

src/Jackett.Common/Definitions/discfan.yml

@@ -184,4 +184,4 @@ search:
           args: "cat={{ .Result._cat }} - "
     minimumratio:
       text: 0.9
-# NexusPHP v1.8.4 2023-06-16
+# NexusPHP v1.8.6 2023-08-18

src/Jackett.Common/Definitions/dreamingtree.yml

@@ -0,0 +1,151 @@
+---
+id: dreamingtree
+name: DreamingTree
+description: "DreamingTree is a Semi-Private Torrent Tracker for DAVE MATHEWS MUSIC / BOOTLEGS"
+language: en-US
+type: semi-private
+encoding: UTF-8
+links:
+  - https://dreamingtree.org/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Audio, desc: Music}
+
+  modes:
+    search: [q]
+    music-search: [q, year, genre]
+
+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: 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_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Covers per page:</b> setting to <b>100</b> on your account profile.
+
+login:
+  path: login.php
+  method: form
+  form: form[action="login.php"]
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    keeplogged: 1
+    login: "Log in"
+  error:
+    - selector: span.warning
+      message:
+        selector: span[class="warning"]:not(:contains("JavaScript"))
+  test:
+    path: index.php
+    selector: a[href^="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
+    searchstr: "{{ .Keywords }}"
+    # freetorrent: 0 normal, 1 freeleech, 2 neutral leech, 3 either
+    freetorrent: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    # we can only grab the first release if group_results=1
+    group_results: 0
+    action: advanced
+    year: "{{ .Query.Year }}"
+    taglist: "{{ .Query.Genre }}"
+    order_by: "{{ .Config.sort }}"
+    order_way: "{{ .Config.type }}"
+    searchsubmit: 1
+
+  rows:
+    selector: tr.torrent
+
+  fields:
+    category:
+      text: 1
+    title_artist:
+      selector: a[href^="artist.php?id="]
+      optional: true
+      filters:
+        - name: append
+          args: " - "
+    title_name:
+      selector: a[href^="torrents.php?id="]
+    year:
+      selector: div.group_info.clear
+      filters:
+        - name: regexp
+          args: "\\[(\\d{4})\\]"
+    title:
+      text: "{{ .Result.title_artist }}{{ .Result.title_name }} [{{ .Result.year }}]"
+    details:
+      selector: a[href^="torrents.php?id="]
+      attribute: href
+    poster:
+      selector: img
+      attribute: src
+      filters:
+        - name: replace
+          args: ["static/common/noartwork/music.png", ""]
+    genre:
+      selector: div.tags
+    description_info:
+      selector: div.torrent_info
+    description:
+      text: "{{ .Result.description_info }}</br>{{ .Result.genre }}"
+    download:
+      selector: span > a[href^="torrents.php?action=download&id="]
+      attribute: href
+    date:
+      selector: span.time.tooltip
+      filters:
+        - name: timeago
+    size:
+      selector: td.number_column.nobr
+    files:
+      selector: td:nth-last-child(6)
+    seeders:
+      selector: td:nth-last-child(2)
+    leechers:
+      selector: td:nth-last-child(1)
+    grabs:
+      selector: td:nth-last-child(3)
+    downloadvolumefactor:
+      case:
+        div.torrent_info:contains("Freeleech"): 0
+        div.torrent_info:contains("Neutral Leech"): 0
+        "*": 1
+    uploadvolumefactor:
+      case:
+        div.torrent_info:contains("Neutral Leech"): 0
+        "*": 1
+    minimumratio:
+      text: 0.6
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# engine n/a

src/Jackett.Common/Definitions/dreamtracker.yml

@@ -14,6 +14,10 @@ caps:
     - {id: 113, cat: TV/Anime, desc: "Anime"}
     - {id: 114, cat: TV/Anime, desc: "Anime Series"}
     - {id: 115, cat: Movies/Other, desc: "Anime Movies"}
+    # VIP
+    - {id: 122, cat: Other, desc: "Only VIP"}
+    - {id: 123, cat: Audio, desc: "VIP Music"}
+    - {id: 124, cat: Movies, desc: "VIP Movies"}
     # Kids Stuff
     - {id: 1, cat: Movies/Other, desc: "Kids Stuff"}
     - {id: 14, cat: Movies/Other, desc: "Cartoon No Subs"}
@@ -58,6 +62,7 @@ caps:
     - {id: 59, cat: TV, desc: "Tv Shows & Series"}
     - {id: 62, cat: TV/Foreign, desc: "Tv Shows Foreign"}
     - {id: 63, cat: TV, desc: "Tv Shows Greek"}
+    - {id: 126, cat: TV/Foreign, desc: "Mini Series Foreign"}
     - {id: 64, cat: TV/Foreign, desc: "Series Foreign"}
     - {id: 65, cat: TV, desc: "Series Greek"}
     - {id: 92, cat: TV/Foreign, desc: "Series Foreign Packs"}
@@ -92,7 +97,6 @@ caps:
     - {id: 117, cat: Audio, desc: "Compact Disc Club"}
     - {id: 20, cat: Audio/Video, desc: "Music Videos"}
     - {id: 118, cat: Audio, desc: "Dream Radio Music"}
-    - {id: 124, cat: Movies, desc: "VIP Movies"}
 
   modes:
     search: [q]
@@ -219,4 +223,6 @@ search:
     minimumseedtime:
       # 4 days (as seconds = 4 x 24 x 60 x 60)
       text: 345600
+    minimumratio:
+      text: 1.0
 # TSUE 2.2

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

@@ -12,6 +12,9 @@ legacylinks:
 
 caps:
   categorymappings:
+    # from https://electro-torrent.pl/szukaj.php
+    # don't forget to update the category case block below
+    - {id: 1298, cat: Movies/SD, desc: "Filmy - Zwiastuny"}
     - {id: 1, cat: Movies/SD, desc: "Filmy XviD/DivX"}
     - {id: 769, cat: Movies/HD, desc: "Filmy 1080p AVC"}
     - {id: 770, cat: Movies/HD, desc: "Filmy x264/1080p"}
@@ -27,6 +30,7 @@ caps:
     - {id: 5, cat: Movies/3D, desc: "Filmy 3D"}
     - {id: 362, cat: Movies/SD, desc: "Filmy IVO"}
     - {id: 696, cat: Movies/SD, desc: "Filmy TS/CAM"}
+    - {id: 1255, cat: TV, desc: "TV/Seriale - Warezy"}
     - {id: 7, cat: TV, desc: "TV/Seriale"}
     - {id: 8, cat: XXX, desc: "Erotyka"}
     - {id: 10, cat: Audio, desc: "Muzyka"}
@@ -106,6 +110,7 @@ search:
     category:
       selector: div#kategoria-gatunek-1
       case:
+        "div#kategoria-gatunek-1:contains(\"Filmy - Zwiastuny\")": 1298
         "div#kategoria-gatunek-1:contains(\"Filmy XviD/DivX\")": 1
         "div#kategoria-gatunek-1:contains(\"Filmy 1080p AVC\")": 769
         "div#kategoria-gatunek-1:contains(\"Filmy x264/1080p\")": 770
@@ -121,6 +126,7 @@ search:
         "div#kategoria-gatunek-1:contains(\"Filmy 3D\")": 5
         "div#kategoria-gatunek-1:contains(\"Filmy IVO\")": 362
         "div#kategoria-gatunek-1:contains(\"Filmy TS/CAM\")": 696
+        "div#kategoria-gatunek-1:contains(\"TV/Seriale - Warezy\")": 1255
         "div#kategoria-gatunek-1:contains(\"TV/Seriale\")": 7
         "div#kategoria-gatunek-1:contains(\"Erotyka\")": 8
         "div#kategoria-gatunek-1:contains(\"Muzyka\")": 10

src/Jackett.Common/Definitions/eniahd.yml

@@ -16,6 +16,9 @@ caps:
     - {id: 13, cat: Movies/HD, desc: "Зарубежное кино HD"}
     - {id: 11, cat: Movies, desc: "Зарубежное кино"}
     - {id: 12, cat: Movies, desc: "Наше кино"}
+    - {id: 66, cat: Movies, desc: "Зарубежное кино | VIP"}
+    - {id: 67, cat: Movies, desc: "Зарубежное кино HD | VIP"}
+    - {id: 68, cat: Movies, desc: "Фабельманы / The Fabelmans"}
     # TV
     - {id: 2, cat: TV/HD, desc: "Зарубежные сериалы HD"}
     - {id: 65, cat: TV/HD, desc: "Майя МС / Майянцы / Mayans M.C."}

src/Jackett.Common/Definitions/estone.yml

@@ -1,7 +1,7 @@
 ---
 id: estone
 name: eStone
-description: "eStone (XiDER, BeLoad, BigTorrent) is a HUNGARIAN Private Torrent Tracker for 0DAY / GENERAL"
+description: "eStone (BigTorrent) is a HUNGARIAN Private Torrent Tracker for 0DAY / GENERAL"
 language: hu-HU
 type: private
 encoding: UTF-8

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

@@ -0,0 +1,171 @@
+---
+id: exitorrent-org
+name: exitorrent.org
+description: "exitorrent.org is a POLISH Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: pl-PL
+type: private
+encoding: UTF-8
+links:
+  - https://exitorrent.org/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: PC, desc: "Aplikacje PC"}
+    - {id: 43, cat: Audio/Audiobook, desc: "Audiobooki"}
+    - {id: 33, cat: Movies/BluRay, desc: "BluRay"}
+    - {id: 28, cat: Movies/Other, desc: "Dla dzieci"}
+    - {id: 20, cat: Movies/DVD, desc: "DVD-R 5/9"}
+    - {id: 37, cat: Movies/SD, desc: "DVDFan"}
+    - {id: 31, cat: Books/EBook, desc: "eBooki / PDF"}
+    - {id: 30, cat: Movies/3D, desc: "Filmy/3D "}
+    - {id: 38, cat: Movies/SD, desc: "Filmy/BDRip-BRRip"}
+    - {id: 35, cat: Movies/HD, desc: "Filmy/x264-BluRay/HD"}
+    - {id: 45, cat: Movies/HD, desc: "Filmy/x265-BluRay/HD"}
+    - {id: 4, cat: PC/Games, desc: "Gry PC"}
+    - {id: 21, cat: PC/Mobile-Other, desc: "GSM/PDA"}
+    - {id: 2, cat: TV/HD, desc: "HDTV"}
+    - {id: 19, cat: Movies/SD, desc: "HQ / DVDRip"}
+    - {id: 6, cat: Audio, desc: "Muzyka"}
+    - {id: 39, cat: Movies/HD, desc: "Remux"}
+    - {id: 29, cat: Other, desc: "Różne"}
+    - {id: 7, cat: TV, desc: "Seriale"}
+    - {id: 22, cat: Audio/Video, desc: "Teledyski / Koncerty"}
+    - {id: 44, cat: Movies/UHD, desc: "UHD BluRay"}
+    - {id: 42, cat: Movies/UHD, desc: "UHD Remux"}
+    - {id: 23, cat: Movies/WEB-DL, desc: "WEB-DL / WEBRip"}
+    - {id: 9, cat: XXX, desc: "XXX"}
+
+  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>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: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: drop_polish_prefix
+    type: checkbox
+    label: Drop the Polish title prefix
+    default: true
+  - 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:
+  method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
+  test:
+    path: /
+    selector: a[href$="/logout.php"]
+
+search:
+  paths:
+    - path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 title, 1 descr, 2 both
+    blah: "{{ if .Query.IMDBID }}1{{ else }}0{{ end }}"
+    podkat: 0
+    hashTag: 0
+    # 0 all, 1 active, 2 dead
+    incldead: 0
+    # 0 all, 1 polish, 5 dubbed, 6 subs, 2 non-polish, 3 freeleech, 4 highlighted
+    polish: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+
+  keywordsfilters:
+    # remove the year from the titles as the site chokes on them during search #7424
+    - name: re_replace
+      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"])
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_raw:
+      selector: a[href^="details.php?id="]
+    title_stripped:
+      selector: a[href^="details.php?id="]
+      filters:
+        - name: re_replace
+          args: ["^(.*/)(.*)$", "$2"]
+        - name: trim
+    title:
+      text: "{{ if .Config.drop_polish_prefix }}{{ .Result.title_stripped }}{{ else }}{{ .Result.title_raw }}{{ end }}"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php/"], a[href^="downloadfl.php/"]
+      attribute: href
+    genre:
+      selector: div.span_title span div
+    _language:
+      optional: true
+      selector: span.span_style_pl
+      attribute: title
+    _subbed:
+      optional: true
+      selector: span.span_style_plsub
+      attribute: title
+    description:
+      text: "{{ if .Result._language }}Language: {{ .Result._language }} {{ else }}{{ end }}{{ if .Result._subbed }}Subbed: {{ .Result._subbed }} {{ else }}{{ end }}{{ if .Result.genre }}Genres: {{ .Result.genre }}{{ else }}{{ end }}"
+    date:
+      selector: td:nth-child(5)
+      # auto adjusted by site account profile
+      filters:
+        - name: dateparse
+          args: "yyyy-MM-ddHH:mm:ss"
+    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:
+        a[href^="downloadfl.php/"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# TBSource v1.5.0

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

@@ -7,16 +7,13 @@ type: public
 encoding: UTF-8
 links:
   - https://extratorrent.st/
-  - https://extratorrent.unblockit.vegas/
+  - https://extratorrent.unblockit.foo/
   - https://extratorrent.mrunblock.bond/
   - https://extratorrent.nocensor.cloud/
 legacylinks:
   - https://extratorrent.nocensor.work/
   - https://extratorrent.nocensor.biz/
-  - https://extratorrent.unblockit.blue/
-  - https://extratorrent.unblockit.name/
   - https://extratorrent.nocensor.sbs/
-  - https://extratorrent.unblockit.ist/
   - https://extratorrent.unblockit.bet/
   - https://extratorrent.unblockit.cat/
   - https://extratorrent.unblockit.nz/
@@ -35,6 +32,9 @@ legacylinks:
   - https://extratorrent.mrunblock.life/
   - https://extratorrent.unblockit.rsvp/
   - https://extratorrent.nocensor.click/
+  - https://extratorrent.unblockit.vegas/
+  - https://extratorrent.unblockit.esq/
+  - https://extratorrent.unblockit.zip/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/extremebits.yml

@@ -0,0 +1,162 @@
+---
+id: extremebits
+name: ExtremeBits
+description: "ExtremeBits is a Private Torrent Tracker for EXTREME SPORTS"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://extremebits.net/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "BASE jump"}
+    - {id: 10, cat: Movies, desc: "BMX"}
+    - {id: 3, cat: Movies, desc: "Climbing"}
+    - {id: 19, cat: Other, desc: "Covers"}
+    - {id: 20, cat: Movies, desc: "Fiddy/MiniMX"}
+    - {id: 22, cat: Movies, desc: "Graffiti"}
+    - {id: 18, cat: Movies, desc: "Homevid"}
+    - {id: 16, cat: Movies, desc: "Inline Skate"}
+    - {id: 25, cat: Movies, desc: "Kayaking"}
+    - {id: 28, cat: Movies, desc: "Kiteboard"}
+    - {id: 17, cat: Movies, desc: "MC"}
+    - {id: 13, cat: Other, desc: "Misc"}
+    - {id: 4, cat: Movies, desc: "MotoX"}
+    - {id: 11, cat: Movies, desc: "MTB"}
+    - {id: 21, cat: Audio, desc: "Music"}
+    - {id: 26, cat: Movies, desc: "Paintball"}
+    - {id: 5, cat: Movies, desc: "Parkour"}
+    - {id: 24, cat: Movies, desc: "Quad/ATV"}
+    - {id: 29, cat: Movies, desc: "Rally/4x4"}
+    - {id: 6, cat: Movies, desc: "Skateboard"}
+    - {id: 12, cat: Movies, desc: "Ski"}
+    - {id: 14, cat: Movies, desc: "Skydive"}
+    - {id: 7, cat: Movies, desc: "Snowboard"}
+    - {id: 9, cat: Movies, desc: "Snowmobile"}
+    - {id: 15, cat: Movies, desc: "Streetrace"}
+    - {id: 2, cat: Movies, desc: "Surf"}
+    - {id: 23, cat: TV, desc: "Tv"}
+    - {id: 8, cat: Movies, desc: "Wakeboard/W.Ski"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-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
+
+login:
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  inputs:
+    input[placeholder="Username"]: "{{ .Config.username }}"
+    input[placeholder="Password"]: "{{ .Config.password }}"
+  selectors: true
+  error:
+    - selector: h2:contains("fail")
+      message:
+        selector: div.contentframe
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # 0 active, 1 incldead, 2 onlydead, 3 freeleech
+    incl: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
+    # 0 name, 1 descr, 2 both
+    searchin: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    # does not support imdbid searching or have imdb links in results.
+
+  rows:
+    selector: table.crowdedtablecenter > tbody >  tr:has(a[href^="details.php?id="])
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="details.php?id="]
+      attribute: href
+      filters:
+        - name: replace
+          args: ["details.php", "download.php"]
+    files:
+      selector: td:nth-of-type(5)
+    seeders:
+      selector: td:nth-of-type(7)
+    leechers:
+      selector: td:nth-of-type(8)
+    grabs:
+      selector: td:nth-of-type(10) a
+    size:
+      selector: td:nth-of-type(10)
+      remove: a
+    _cat:
+      selector: td:nth-of-type(1) a img
+      attribute: alt
+    description:
+      selector: td:nth-of-type(4)
+      filters:
+        - name: prepend
+          args: "cat={{ .Result._cat }}, wait="
+    downloadvolumefactor:
+      case:
+        img[src="img/freedownload.png"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    date:
+      selector: td:nth-of-type(2)
+      remove: a
+      filters:
+        - name: append
+          args: " +00:00" # GMT
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    minimumratio:
+      text: 0.6
+# TBDEV

src/Jackett.Common/Definitions/eztv.yml

@@ -5,27 +5,23 @@ description: "EZTV is a Public torrent site for TV shows"
 language: en-US
 type: public
 encoding: UTF-8
-followredirect: true
 links:
-  - https://eztv.re/
+  - https://eztvx.to/
   - https://eztv.wf/
   - https://eztv.tf/
   - https://eztv.yt/
   - https://eztv1.xyz/
   - https://eztv.unblockninja.com/
-  - https://eztv.unblockit.vegas/
   - https://eztv.mrunblock.bond/
   - https://eztv.nocensor.cloud/
+  - https://eztv.unblockit.foo/
 legacylinks:
   - https://eztv.ag/ # redirects to .re
   - https://eztv.it/ # redirects to .re
   - https://eztv.ch/ # redirects to .re
   - https://eztv.io/
   - https://eztv.nocensor.biz/
-  - https://eztv.unblockit.blue/
-  - https://eztv.unblockit.name/
   - https://eztv.nocensor.sbs/
-  - https://eztv.unblockit.ist/
   - https://eztv.unblockit.bet/
   - https://eztv.unblockit.cat/
   - https://eztv.unblockit.nz/
@@ -44,6 +40,11 @@ legacylinks:
   - https://eztv.mrunblock.life/
   - https://eztv.unblockit.rsvp/
   - https://eztv.nocensor.click/
+  - https://eztv.unblockit.vegas/
+  - https://eztv.unblockit.esq/
+  - https://eztv.unblockit.zip/
+  - https://eztv.re/
+  - https://eztv.li/
 
 caps:
   categories:
@@ -57,12 +58,12 @@ settings: []
 
 search:
   paths:
-    - path: "{{ if .Keywords }}search/{{ .Keywords }}{{ else }}{{ end }}"
+    - path: "{{ if .Keywords }}search/{{ .Keywords }}{{ else }}home{{ end }}"
 
   keywordsfilters:
     - name: re_replace
       args: ["S[0-9]{2}([^E]|$)", ""] # remove season tag without episode (search doesn't support it)
-    # fixes for site search issues
+    # fixes for site search issues - Prowlarr #1094
     - name: replace
       args: ["-", ""]
     - name: replace
@@ -71,7 +72,7 @@ search:
       args: ["&", ""]
 
   headers:
-    cookie: ["sort_no=100"] # show 100 results for keywordless search
+    cookie: ["sort_no=100; q_filter=all; q_filter_web=on; q_filter_reality=on; q_filter_x265=on; layout=def_wlinks"] # show 100 results for keywordless search and show links in results
 
   rows:
     # only use latest added torrents table for keywordless search to avoid duplicates, some torrents don't have any download links so skip them

src/Jackett.Common/Definitions/fanoin.yml

@@ -92,7 +92,7 @@ login:
     - selector: td.embedded:has(h2:contains("failed"))
   test:
     path: browse_old.php
-    selector: a[href="logout.php"]
+    selector: a[href="/logout.php"]
 
 search:
   paths:

src/Jackett.Common/Definitions/fearnopeer.yml

@@ -0,0 +1,169 @@
+---
+id: fearnopeer
+name: FearNoPeer
+description: "FearNoPear is a Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://fearnopeer.com/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 2, cat: TV, desc: "TV"}
+    - {id: 3, cat: Audio, desc: "Music"}
+    - {id: 6, cat: TV/Anime, desc: "Anime"}
+    - {id: 10, cat: TV, desc: "TV Pack"}
+    - {id: 4, cat: PC/Games, desc: "Games"}
+    - {id: 5, cat: PC/0day, desc: "Apps"}
+    - {id: 9, cat: TV/Sport, desc: "Sport"}
+    - {id: 11, cat: Other, desc: "Miscellaneous"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
+    movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://fearnopeer.com/\" target=\"_blank\">FearNoPeer</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: sort
+    type: select
+    label: Sort requested from site
+    default: created_at
+    options:
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: /api/torrents
+  method: get
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
+search:
+  paths:
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    - path: "/api/torrents/filter"
+      response:
+        type: json
+
+  headers:
+    Authorization: ["Bearer {{ .Config.apikey }}"]
+
+  inputs:
+  # 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 }}"
+    perPage: 100
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
+  rows:
+    selector: data
+    attribute: attributes
+
+  fields:
+    category:
+      selector: category_id
+    title:
+      selector: name
+    details:
+      selector: details_link
+    download:
+      selector: download_link
+    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
+    genre:
+      selector: meta.genres
+      filters:
+        - name: re_replace
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
+        - name: re_replace
+          args: ["(?i)(TV Movie)", "TV_Movie"]
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
+    files:
+      selector: num_file
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    date:
+      # "created_at": "2021-10-18T00:34:50.000000Z" is returned by Newtonsoft.Json.Linq as 18/10/2021 00:34:50
+      selector: created_at
+      filters:
+        - name: append
+          args: " +00:00" # GMT
+        - name: dateparse
+          args: "MM/dd/yyyy HH:mm:ss zzz"
+    size:
+      selector: size
+    downloadvolumefactor:
+      # api returns 0%, 25%, 50%, 75%, 100%
+      selector: freeleech
+      case:
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
+    uploadvolumefactor:
+      # api returns False, True
+      selector: double_upload
+      case:
+        False: 1 # normal
+        True: 2 # double
+# Maintain global ratio above 0.5 or downloads will get disabled. No MST.
+    minimumratio:
+      text: 0.51
+# json UNIT3D 7.0.3

src/Jackett.Common/Definitions/femdomcult.yml

@@ -71,7 +71,7 @@ login:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
     cinfo: "2550|1350|24|-60"
-    keeploggedin: 1
+    keeplogged: 1
   error:
     - selector: form#loginform > span.warning
   test:

src/Jackett.Common/Definitions/filelisting.yml

@@ -1,89 +0,0 @@
----
-id: filelisting
-name: FileListing
-description: "FileListing is a Public Torrent Search Engine"
-language: en-US
-type: public
-encoding: UTF-8
-links:
-  - https://filelisting.com/
-  - https://filelisting.mrunblock.bond/
-  - https://filelisting.nocensor.cloud/
-legacylinks:
-  - https://filelisting.nocensor.biz/
-  - https://filelisting.nocensor.sbs/
-  - https://filelisting.nocensor.world/
-  - https://filelisting.nocensor.lol/
-  - https://filelisting.nocensor.art/
-  - https://filelisting.mrunblock.guru/
-  - https://filelisting.mrunblock.life/
-  - https://filelisting.nocensor.click/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Other, desc: TV}
-    - {id: 2, cat: Other, desc: Movies}
-    - {id: 3, cat: Other, desc: Other}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: info
-    type: info
-    label: A note about FileListing
-    default: FileListing does not display categories in its search results page. This definition is probably only suitable for Jackett Dashboard Manual searches.
-
-search:
-  paths:
-    # https://filelisting.com/result?q=bad+batch
-    - path: "result{{ if .Keywords }}?q={{ .Keywords }}+in:title{{ else }}{{ end }}"
-  keywordsfilters:
-    - name: tolower
-
-  rows:
-    selector: table > tbody > tr:has(td.dn-title)
-
-  fields:
-    category:
-      text: 3
-    title:
-      selector: p.filedir
-    details:
-      selector: p.filedir a
-      attribute: href
-    infohash:
-      selector: p.filedir a
-      attribute: href
-      filters:
-        - name: regexp
-          args: -([a-f|0-9]{40}).html
-    date:
-      text: now
-    size:
-      selector: td.dn-size
-    seeders:
-      selector: td.dn-status
-      filters:
-        # seeders can be missing
-        - name: re_replace
-          args: ["^(\\d+)", "0$1"]
-        - name: regexp
-          args: ^(\d+)
-    leechers:
-      selector: td.dn-status
-      filters:
-        # leechers can be missing
-        - name: re_replace
-          args: ["(\\d+)$", "0$1"]
-        - name: regexp
-          args: (\d+)$
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/firebit.yml

@@ -1,198 +0,0 @@
----
-id: firebit
-name: FireBit
-description: "FireBit is an UKRAINIAN / RUSSIAN Public Torrent Tracker for MOVIES / TV / GENERAL"
-language: ru-RU
-type: public
-encoding: UTF-8
-requestDelay: 2
-links:
-  - https://firebit.net/
-legacylinks:
-  - https://firebit.name/
-  - https://firebit.biz/
-  - http://firebit.net/
-  - http://firebit.info/
-  - http://firebit.name/
-  - http://firebit.pro/
-  - http://firebit.club/
-  - http://firebit.biz/
-  - https://firebit.pro/
-  - https://firebit.club/
-  - https://firebit.info/
-
-caps:
-  categorymappings:
-    - {id: "Мультфильмы", cat: TV/Anime, desc: "Мультфильмы"}
-    - {id: "Программы", cat: PC, desc: "Программы"}
-    - {id: "Программы Видео", cat: PC, desc: "Программы Видео"}
-    - {id: "Программы FAQ", cat: PC, desc: "Программы FAQ"}
-    - {id: "Программы Web Оформление", cat: PC, desc: "Программы Web Оформление"}
-    - {id: "Linux", cat: PC, desc: "Linux"}
-    - {id: "Мобилка", cat: PC/Mobile-Other, desc: "Мобилка"}
-    - {id: "Мобилка Игры", cat: PC/Mobile-Other, desc: "Мобилка Игры"}
-    - {id: "Литература", cat: Books, desc: "Литература"}
-    - {id: "Игры", cat: PC/Games, desc: "Игры"}
-    - {id: "Игры Мобилка", cat: PC/Games, desc: "Игры Мобилка"}
-    - {id: "Фильмы", cat: Movies, desc: "Фильмы"}
-    - {id: "Фильмы Видео", cat: Movies, desc: "Фильмы Видео"}
-    - {id: "Фильмы Сериалы", cat: Movies, desc: "Фильмы Сериалы"}
-    - {id: "Фильмы Скоро на трекере", cat: Movies, desc: "Фильмы Скоро на трекере"}
-    - {id: "Видео", cat: Movies, desc: "Видео"}
-    - {id: "Музыка", cat: Audio, desc: "Музыка"}
-    - {id: "Музыка Фильмы", cat: Audio, desc: "Музыка Фильмы"}
-    - {id: "Видео Музыка", cat: Audio/Video, desc: "Видео Музыка"}
-    - {id: "Фильмы Музыка Видео", cat: Audio/Video, desc: "Фильмы Музыка Видео"}
-    - {id: "Музыка Видео", cat: Audio/Video, desc: "Музыка Видео"}
-    - {id: "Другие категории", cat: Other, desc: "Другие категории"}
-    - {id: "Сериалы", cat: TV, desc: "Сериалы"}
-    - {id: "18+", cat: TV, desc: "18+"}
-    - {id: "-", cat: Other, desc: "Другие категории"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: stripcyrillic
-    type: checkbox
-    label: Strip Cyrillic Letters
-    default: false
-  - name: addrussiantotitle
-    type: checkbox
-    label: Add RUS to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
-    default: false
-
-download:
-  selectors:
-    - selector: a[href^="/download.php?id="]
-      attribute: href
-
-search:
-  # http://firebit.net/index.php?do=search&type=simple&q=2022
-  paths:
-    - path: "{{ if .Keywords }}index.php?do=search&type=simple&q={{ .Keywords }}{{ else }}{{ end }}"
-    - path: "{{ if .Keywords }}index.php?do=search&type=simple&q={{ .Keywords }}&cstart=2{{ else }}%D1%81%D1%82%D1%80%D0%B0%D0%BD%D0%B8%D1%86%D0%B0/2/{{ end }}"
-
-  keywordsfilters:
-    # strip season and/or ep
-    - name: re_replace
-      args: ["(?i)\\b(?:[SE]\\d{1,4}){1,2}\\b\\s?", ""]
-
-  rows:
-    selector: "{{ if .Keywords }}table.torrents tbody tr:has(td.td-size){{ else }}div[id^=\"post-id-\"]:has(li.meta-size){{ end }}"
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: td:nth-child(1), div.article-indent div b
-      optional: true
-      default: "-"
-      filters:
-        - name: replace
-          args: ["Новинки", ""]
-        - name: re_replace
-          args: [",", ""]
-        - name: trim
-    title:
-      selector: td:nth-child(2), span.article-title
-      filters:
-        # normalize to SXXEYY format
-        - name: re_replace
-          args: ["(?i)[CС]езон[ыи]?[\\s:;]*(\\d+(?:-\\d+)?).+?(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))[\\s:;]*(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)", "S$1E$2 of $3"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езон[ыи]?.+?(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))?", "S$1E$2 of $3"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езон[ыи]?.+?(\\d+(?:-\\d+)?)\\s*(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))\\s+из\\s*(\\w?)", "S$1E$2 of $3"]
-        - name: re_replace
-          args: ["(?i)[CС]езон[ыи]?[\\s:;]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))?", "S$1E$2 of $3"]
-        - name: re_replace
-          args: ["(?i)[CС]езон[ыи]?[\\s:;]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)\\s*(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))\\s+из\\s*(\\w?)", "S$1E$2 of $3"]
-        - name: re_replace
-          args: ["(?i)[CС]езон[ыи]?[\\s:;]*(\\d+(?:-\\d+)?).+?(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))[\\s:;]*(\\d+(?:-\\d+)?)", "S$1E$2"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езон[ыи]?.+?(\\d+(?:-\\d+)?)(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))", "S$1E$2"]
-        - name: re_replace
-          args: ["(?i)[CС]езон[ыи]?[\\s:;]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))", "S$1E$2"]
-        - name: re_replace
-          args: ["(?i)[CС]езон[ыи]?[\\s:;]*(\\d+(?:-\\d+)?)", "S$1"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s+[CС]езон[ыи]?", "S$1"]
-        - name: re_replace
-          args: ["(?i)(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))[\\s:;]*(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)", "E$1 of $2"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))", "E$1 of $2"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s+(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))\\s+из\\s*(\\w?)", "E$1 of $2"]
-        - name: re_replace
-          args: ["(?i)(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))[\\s:;]*(\\d+(?:-\\d+)?)", "E$1"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s+(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))", "E$1"]
-        - name: re_replace
-          args: ["(\\([\\p{IsCyrillic}\\W]+\\))|(^[\\p{IsCyrillic}\\W\\d]+\\/ )|([\\p{IsCyrillic} \\-]+,+)|([\\p{IsCyrillic}]+)", "{{ if .Config.stripcyrillic }}{{ else }}$1$2$3$4{{ end }}"]
-        - name: re_replace
-          args: ["(?i)\\bHDTV[-\\s]?Rip\\b", "HDTV"]
-        - name: re_replace
-          args: ["(?i)\\bSAT[-\\s]?Rip\\b", "HDTV"]
-        - name: re_replace
-          args: ["(?i)\\bWEB[-\\s]?DL[-\\s]?Rip\\b", "WEB-DL"]
-        - name: re_replace
-          args: ["(?i)\\bWEB\\sRip\\b", "WEBRip"]
-        - name: re_replace
-          args: ["(?i)\\bWEB\\sDL\\b", "WEB-DL"]
-        - name: re_replace
-          args: ["[\\[\\(\\{<«][\\s\\W]*[\\]\\)\\}>»]", ""]
-        - name: re_replace
-          args: ["^[\\s&,\\.!\\?\\+\\-_\\|\\/':]+", ""]
-#        - name: re_replace
-#          args: ["(?i)^\\(\\s*([SE]\\d+.*?)\\s*\\)[\\s\\/\\|]*(.+)", "$2 $1"]
-        - name: append
-          args: "{{ if .Config.addrussiantotitle }} RUS{{ else }}{{ end }}"
-    details:
-      selector: td:nth-child(2) a, span.article-title a
-      attribute: href
-    download:
-      selector: td:nth-child(2) a, span.article-title a
-      attribute: href
-    size:
-      selector: td.td-size, li.meta-size
-      filters:
-        - name: replace
-          args: ["-", "0 B"]
-    date_day:
-      # Вчера, 08:01:41
-      # 2 дня назад, 19:33:51
-      selector: td:nth-child(5):contains(","), li.meta-date:contains(",")
-      optional: true
-      filters:
-        - name: replace
-          args: ["Вчера,", "Yesterday"]
-        - name: replace
-          args: ["дня назад,", "days"]
-        - name: fuzzytime
-    date_year:
-      # 16.08.2021 20:29:39
-      selector: td:nth-child(5):not(:contains(",")), li.meta-date:not(:contains(","))
-      optional: true
-      filters:
-        - name: append
-          args: " +03:00" # MSK
-        - name: dateparse
-          args: "dd.MM.yyyy HH:mm:ss zzz"
-    date:
-      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
-    seeders:
-      selector: td.l1, li.meta-sead
-    leechers:
-      selector: td.l2, li.meta-leech
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-    description:
-      selector: td:nth-child(2), span.article-title
-# engine n/a

src/Jackett.Common/Definitions/freefarm.yml

@@ -204,4 +204,4 @@ search:
     description:
       selector: td:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.8.6 2023-08-18
+# NexusPHP v1.8.9 2023-09-29

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

@@ -36,6 +36,10 @@ settings:
     options:
       0: desc
       1: asc
+  - name: whisparrv2
+    type: checkbox
+    label: Strip release date from queries (for Whisparr v2 compatibility)
+    default: false
 
 caps:
   categorymappings:
@@ -130,6 +134,8 @@ search:
     order: "{{ .Config.order }}"
     freeleech: "{{ if .Config.freeleech }}1{{ else }}0{{ end }}"
   keywordsfilters:
+    - name: re_replace
+      args: ["(\\d{2}\\.\\d{2}\\.\\d{2})", "{{ if .Config.whisparrv2 }}{{ else }}$1{{ end }}"] # strip release date from query for whisparr v2 compatibility
     - name: re_replace
       args: ["(\\w+)", "+$1"] # prepend + to each word
 

src/Jackett.Common/Definitions/gaytorrentru.yml

@@ -21,10 +21,14 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
-  - name: info
+  - name: info_hidden
     type: info
     label: "Hidden categories"
     default: "Results for categories hidden in account profile will not be visible."
+  - name: info_limit
+    type: info
+    label: "Download Ratio"
+    default: "GayTorrent.ru has a daily download slot limit as defined by your ratio, your uploads, your donations, etc. If downloads <b>fail</b> then you have exceeded your allocation. Access the web site to find more info <a href=\"https://www.gaytor.rent/rationator.php\" target=\"_blank\">here</a>"
   - name: sort
     type: select
     label: Sort requested from site
@@ -115,13 +119,16 @@ search:
     search: "{{ .Keywords }}"
     # 0 active, 1 both, 2 dead
     incldead: 1
-    # where to search: name      , descr      , filename , freeleech only ,  wishlist
-    # where to search: inname=1, indesc=1, infn=1    , infl=1              ,   inbook=1
+    # where to search: name, descr, filename, freeleech only, wishlist
+    # where to search: inname=1, indesc=1, infn=1, infl=1, inbook=1
     inname: 1
     infl: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
     orderby: "{{ .Config.sort }}"
     sort: "{{ .Config.type }}"
 
+  headers:
+    Referer: ["{{ .Config.sitelink }}browse.php"]
+
   rows:
     selector: table.browse_result > tbody > tr:has(a[href^="details.php?id="])
 

src/Jackett.Common/Definitions/gktorrent.yml

@@ -8,12 +8,10 @@ encoding: UTF-8
 followredirect: true
 # to fetch current domain use https://www.protege-torrent.com/Gktorrent
 links:
-  - https://www.gktorrent.ac/
+  - https://www.gktorrent.vc/
   - https://gktorrent.nocensor.cloud/
   - https://gktorrent.mrunblock.bond/
 legacylinks:
-  - https://www.gktorrent.org/
-  - https://www.gktorrent.me/
   - https://www.rantop.org/
   - https://www.gktorrent.cx/
   - https://www.gktorrent.tv/
@@ -37,6 +35,8 @@ legacylinks:
   - https://gktorrent.mrunblock.life/ # cloudflare 403
   - https://gktorrent.nocensor.click/
   - https://www.gktorrents.cc/
+  - https://www.gktorrent.ac/
+  - https://www.gktorrent.ph/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/glodls.yml

@@ -5,11 +5,10 @@ description: "GloDLS is a Public Torrent Tracker for MOVIES / TV / GENERAL"
 language: en-US
 type: public
 encoding: UTF-8
-followredirect: true
 links:
   - https://glodls.to/
   - https://www.gtdb.to/
-  - https://glotorrents.unblockit.vegas/
+  - https://glotorrents.unblockit.foo/
   - https://glotorrents.mrunblock.bond/
   - https://glodls.unblockninja.com/
   - https://glotorrents.nocensor.cloud/
@@ -17,10 +16,7 @@ legacylinks:
   - https://glodls.rocks/
   - https://gtdb.to/
   - https://glotorrents.nocensor.biz/
-  - https://glotorrents.unblockit.blue/
-  - https://glotorrents.unblockit.name/
   - https://glotorrents.nocensor.sbs/
-  - https://glotorrents.unblockit.ist/
   - https://glotorrents.unblockit.bet/
   - https://glotorrents.unblockit.cat/
   - https://glotorrents.unblockit.nz/
@@ -40,6 +36,9 @@ legacylinks:
   - https://glotorrents.unblockit.rsvp/
   - https://glotorrents.nocensor.click/
   - https://gtdb.cc/
+  - https://glotorrents.unblockit.vegas/
+  - https://glotorrents.unblockit.esq/
+  - https://glotorrents.unblockit.zip/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/hawke-uno.yml

@@ -90,6 +90,11 @@ search:
       selector: category
     title:
       selector: name
+      filters:
+        - name: re_replace
+          args: ["\\(((?>[^()]+|(?<o>)\\(|(?<-o>)\\))*(?(o)(?!)))(?<!\\bHONE)(?<=\\s*- [\\w]+)\\)$", "$1"]
+        - name: re_replace
+          args: ["\\s*-\\s+(\\w+)$", "-$1"]
     details:
       selector: details_link
     download:

src/Jackett.Common/Definitions/hd-club.yml

@@ -0,0 +1,141 @@
+---
+id: hd-club
+name: HD-CLUB
+description: "HD-CLUB is a CZECH Semi-Private site for TV / MOVIES / GENERAL"
+language: cs-CZ
+type: semi-private
+encoding: UTF-8
+links:
+  - https://freecztorrent.eu/
+
+caps:
+  categorymappings:
+    - {id: 11, cat: Movies/HD, desc: "H265-720/1080/2160"}
+    - {id: 31, cat: Movies/SD, desc: "Divx - Avi"}
+    - {id: 19, cat: Movies, desc: "Kreslené Filmy"}
+    - {id: 32, cat: TV/Documentary, desc: "Dokumentární  Filmy"}
+    - {id: 28, cat: TV, desc: "Seriály"}
+    - {id: 18, cat: TV/HD, desc: "Film Retro"}
+    - {id: 14, cat: TV/WEB-DL, desc: "TV - WEB- DL x264"}
+    - {id: 16, cat: TV/HD, desc: "MP4"}
+    - {id: 15, cat: TV/WEB-DL, desc: "TV - WEB- DL x265"}
+    - {id: 38, cat: XXX, desc: "XXX"}
+    - {id: 29, cat: Movies/DVD, desc: "DVD5 / DVD9"}
+    - {id: 23, cat: Movies/UHD, desc: "Bluray / 4K-UHD"}
+    - {id: 26, cat: Movies/HD, desc: "HD-720/1080/2160"}
+    - {id: 34, cat: Movies/3D, desc: "3 D"}
+    - {id: 35, cat: Movies, desc: "V.I.P Extra"}
+    - {id: 39, cat: PC, desc: "APP WINDOWS"}
+    - {id: 41, cat: PC/Mobile-Other, desc: "Mobil-PDA"}
+    - {id: 25, cat: Audio/Lossless, desc: "Flac"}
+    - {id: 20, cat: Audio/MP3, desc: "Mp3"}
+    - {id: 36, cat: Audio, desc: "Retro Hudba"}
+    - {id: 22, cat: Audio/Audiobook, desc: "Audio kniha"}
+    - {id: 3, cat: Console, desc: "Games"}
+    - {id: 5, cat: TV/Anime, desc: "Anime"}
+
+  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: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 3
+    options:
+      3: created
+      5: seeders
+      4: size
+      2: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: 2
+    options:
+      2: desc
+      1: asc
+  - name: info
+    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.
+
+login:
+  method: post
+  path: index.php?page=login
+  inputs:
+    uid: "{{ .Config.username }}"
+    pwd: "{{ .Config.password }}"
+  error:
+    - selector: td.lista span[style="color:#FF0000;"]
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    # https://freecztorrent.eu/index.php?page=torrents&active=0&category=26;29&order=3&by=2
+    - path: index.php
+  inputs:
+    page: torrents
+    search: "{{ .Keywords }}"
+    category: "{{ if .Categories }}{{ range .Categories }}{{.}};{{end}}{{ else }}0{{ end }}"
+    # 0 all, 1 active only, 2 dead only
+    active: 0
+    order: "{{ .Config.sort }}"
+    by: "{{ .Config.type }}"
+
+  rows:
+    selector: table.benylista > tbody > tr:has(a[href^="download.php"]):not(:has(a[href$="category=0"]))
+
+  fields:
+    category:
+      selector: a[href*="category="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: category
+    title:
+      selector: a[href^="index.php?page=torrent-details"]
+    details:
+      selector: a[href^="index.php?page=torrent-details"]
+      attribute: href
+    download:
+      selector: a[href^="download.php"]
+      attribute: href
+    poster:
+      selector: img.beny_img
+      attribute: src
+    date:
+      # 07.09.2023 06:20:35
+      selector: td:nth-child(8)
+      # auto adjusted by site account profile
+      filters:
+        - name: dateparse
+          args: "dd.MM.yyyy HH:mm:ss"
+    size:
+      selector: td:nth-child(9)
+    seeders:
+      selector: td:nth-child(10)
+    leechers:
+      selector: td:nth-child(11)
+    grabs:
+      selector: td:nth-child(10)
+    downloadvolumefactor:
+      text: 1
+    uploadvolumefactor:
+      text: 1
+# xbtit v2.3.1

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

@@ -78,7 +78,7 @@ search:
     imdbId: "{{ .Query.IMDBIDShort }}"
     tmdbId: "{{ .Query.TMDBID }}"
     tvdbId: "{{ .Query.TVDBID }}"
-    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    "free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
@@ -101,7 +101,7 @@ search:
     download:
       selector: download_link
     poster:
-      selector: poster
+      selector: meta.poster
       filters:
         - name: replace
           args: ["https://via.placeholder.com/90x135", ""]
@@ -111,6 +111,17 @@ search:
       selector: tmdb_id
     tvdbid:
       selector: tvdb_id
+    genre:
+      selector: meta.genres
+      filters:
+        - name: re_replace
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
+        - name: re_replace
+          args: ["(?i)(TV Movie)", "TV_Movie"]
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
     files:
       selector: num_file
     seeders:
@@ -148,4 +159,4 @@ search:
     minimumseedtime:
       # 3 days (as seconds = 3 x 24 x 60 x 60)
       text: 259200
-# json UNIT3D 6.4.1
+# json UNIT3D 6.5.0

src/Jackett.Common/Definitions/hdarea.yml

@@ -6,9 +6,10 @@ language: zh-CN
 type: private
 encoding: UTF-8
 links:
-  - https://www.hdarea.club/
+  - https://hdarea.club/
 legacylinks:
   - https://www.hdarea.co/
+  - https://www.hdarea.club/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/hdatmos.yml

@@ -175,4 +175,4 @@ search:
     description:
       selector: td:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.8.5 2023-07-29
+# NexusPHP v1.8.8 2023-09-25

src/Jackett.Common/Definitions/hdcztorrent.yml

@@ -12,54 +12,46 @@ legacylinks:
 
 caps:
   categorymappings:
-    # Filmy
+    # FILMY
     - {id: 117, cat: Movies/DVD, desc: "DvD"}
-    - {id: 119, cat: Movies/BluRay, desc: "Blu-Ray "}
+    - {id: 119, cat: Movies/BluRay, desc: "Blu-Ray"}
     - {id: 120, cat: Movies/HD, desc: "HD 720"}
     - {id: 121, cat: Movies/HD, desc: "HD 1080"}
-    - {id: 122, cat: Movies/UHD, desc: "4K"}
-    - {id: 123, cat: Movies/UHD, desc: "4K - Originál Zvuk"}
-    - {id: 124, cat: Movies/3D, desc: "3D Filmy Bluray"}
     - {id: 125, cat: Movies/3D, desc: "3D Filmy"}
     - {id: 126, cat: Movies/SD, desc: "SD Filmy"}
     - {id: 127, cat: Movies/HD, desc: "H-265"}
     - {id: 128, cat: TV/Documentary, desc: "Dokument"}
     - {id: 129, cat: TV/Sport, desc: "Sportovní Filmy"}
-    - {id: 130, cat: TV/WEB-DL, desc: "TV - WEB- DL HBO Max"}
+    - {id: 143, cat: Movies/Foreign, desc: "film titulky"}
+    - {id: 144, cat: TV/Foreign, desc: "serial titulky"}
+    - {id: 145, cat: Movies/Foreign, desc: "film original"}
+    - {id: 146, cat: TV/Foreign, desc: "serial original"}
+    - {id: 47, cat: TV/Other, desc: "Animované"}
+    - {id: 77, cat: Movies/UHD, desc: "ULTRA HD  4K"}
+    - {id: 45, cat: TV, desc: "SERIALY CZ"}
+    # premium
+    - {id: 130, cat: Movies/WEB-DL, desc: "TV - WEB- DL HBO Max"}
+    - {id: 133, cat: TV/WEB-DL, desc: "TV - WEB- DL Disney"}
+    - {id: 134, cat: TV/WEB-DL, desc: "TV -WEB- DL NETLIFIX"}
+    - {id: 135, cat: TV/WEB-DL, desc: "TV - WEB- DL Prime"}
+    - {id: 136, cat: TV/WEB-DL, desc: "TV -WEB- DL Skyshow"}
+    - {id: 147, cat: TV/WEB-DL, desc: "marvel"}
+    - {id: 148, cat: TV/WEB-DL, desc: "VOYO"}
+    # rls track
     - {id: 131, cat: Movies, desc: "RLS For HDCZT"}
     - {id: 132, cat: Movies, desc: "Film na přání"}
-    - {id: 133, cat: Movies/WEB-DL, desc: "TV - WEB- DL Disney"}
-    - {id: 134, cat: Movies/WEB-DL, desc: "TV -WEB- DL NETLIFIX"}
-    - {id: 135, cat: Movies/WEB-DL, desc: "TV - WEB- DL Prime"}
-    - {id: 136, cat: Movies/WEB-DL, desc: "TV -WEB- DL Skyshow"}
-    - {id: 91, cat: TV, desc: "Serial titulky"}
-    - {id: 45, cat: TV, desc: "SERIALY CZ"}
-    - {id: 81, cat: Movies, desc: "ORIGINAL JAZYK"}
-    # Hudba Video
-    - {id: 39, cat: Audio/Video, desc: "Hudba Video"}
-    # Animované
-    - {id: 47, cat: TV/Other, desc: "Animované"}
-    # HUDBA
-    - {id: 57, cat: Audio/Lossless, desc: "Hudba flac"}
-    - {id: 58, cat: Audio/MP3, desc: "Hudba mp3"}
-    - {id: 96, cat: Audio/Other, desc: "RETRO HUDBA"}
-    # ostatni
-    - {id: 64, cat: Books, desc: "E-books, PDF fotky"}
+    # programy win linux
+    - {id: 62, cat: PC, desc: "Aplikace All"}
+    # knihy foto pdf
+    - {id: 64, cat: Books, desc: "knihy-foto"}
     - {id: 65, cat: Audio/Audiobook, desc: "Mluvene slovo"}
-    - {id: 113, cat: Books/Other, desc: "obrazky fotky"}
-    # PORNO
+    # porno
     - {id: 11, cat: XXX, desc: "XXX 18+KLASIKA"}
-    - {id: 99, cat: XXX, desc: "XXX GAY"}
-    - {id: 100, cat: XXX, desc: "XXX ASIAN"}
-    - {id: 101, cat: XXX, desc: "XXX 3D"}
     - {id: 106, cat: XXX/ImageSet, desc: "XXX-OBRÁZKY"}
-    - {id: 108, cat: XXX, desc: "PORNO BDSM"}
+    # Hudba mp3-flac
+    - {id: 58, cat: Audio, desc: "Hudba"}
     # HRY
     - {id: 73, cat: PC/Games, desc: "Hry, Games"}
-    - {id: 97, cat: Console/PS4, desc: "HRY PS4"}
-    # APLIKACE
-    - {id: 60, cat: PC/Mobile-Other, desc: "Mobil PDA"}
-    - {id: 62, cat: PC, desc: "Aplikace All"}
 
   modes:
     search: [q]
@@ -131,7 +123,7 @@ search:
     by: "{{ .Config.type }}"
 
   rows:
-    selector: td#mcol table.lista > tbody > tr:has(a[href^="index.php?page=torrent_history"])
+    selector: td table.lista > tbody > tr:has(a[href^="download.php"])
 
   fields:
     category:

src/Jackett.Common/Definitions/hddolby.yml

@@ -193,4 +193,4 @@ search:
       filters:
         - name: replace
           args: [" 剩余时间：", ""]
-# NexusPHP Standard v1.5 Beta 4
+# NexusPHP 985f0fc 2023-08-04

src/Jackett.Common/Definitions/hdgalaktik.yml

@@ -135,8 +135,10 @@ search:
           args: cat
     title:
       selector: a.alink
-      attribute: title
+      attribute: onmouseover
       filters:
+        - name: regexp
+          args: \'>(.+?)</div
         # normalize to SXXEYY format
         - name: re_replace
           args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)", "S$1E$2 of $3"]
@@ -220,7 +222,7 @@ search:
       selector: td:nth-child(6)
       filters:
         - name: split
-          args: ["|", 0]
+          args: ["|", 1]
     date_today:
       # Сегодня в 18:22
       selector: a[href^="browse.php?date="]:contains("Сегодня")

src/Jackett.Common/Definitions/hdmayi.yml

@@ -173,4 +173,4 @@ search:
     description:
       selector: td.rowfollow:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.8.3 2023-05-13
+# NexusPHP v1.8.6 2023-08-18

src/Jackett.Common/Definitions/hdonly.yml

@@ -5,29 +5,32 @@ description: "HD-Only (HD-O) is a FRENCH Private Torrent Tracker for HD MOVIES /
 language: fr-FR
 type: private
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://hd-only.org/
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies, desc: "Film"}
-    - {id: 3, cat: TV/Anime, desc: "Dessin animé"}
-    - {id: 4, cat: Movies, desc: "Concert"}
-    - {id: 5, cat: TV, desc: "Série"}
-    - {id: 6, cat: TV/Anime, desc: "Série anim"}
-    - {id: 7, cat: Movies/Other, desc: "Film d'animation"}
-    - {id: 9, cat: Audio/Video, desc: "Concert"}
-    - {id: 11, cat: TV/Documentary, desc: "Documentaire"}
-    - {id: 13, cat: Movies/Other, desc: "Court-métrage"}
-    - {id: 14, cat: Movies/Other, desc: "Clip"}
-    - {id: 15, cat: Movies/Other, desc: "Démonstration"}
-    - {id: 16, cat: Movies/Other, desc: "Bonus de BD"}
-    - {id: 21, cat: Other, desc: "Autre"}
+    - {id: 1, cat: Movies, desc: "Films"}
+    - {id: 2, cat: TV, desc: "Séries"}
+    # Fake ids to match release types by desc
+    - {id: 101, cat: Movies, desc: "Film"}
+    - {id: 103, cat: Movies/Other, desc: "Dessin animé"}
+    - {id: 105, cat: TV, desc: "Série"}
+    - {id: 106, cat: TV/Anime, desc: "Série Animée"}
+    - {id: 107, cat: Movies/Other, desc: "Film d'animation"}
+    - {id: 109, cat: Audio/Video, desc: "Concert"}
+    - {id: 111, cat: TV/Documentary, desc: "Documentaire"}
+    - {id: 113, cat: Movies/Other, desc: "Court-métrage"}
+    - {id: 114, cat: Movies/Other, desc: "Clip"}
+    - {id: 115, cat: Movies/Other, desc: "Démonstration"}
+    - {id: 121, cat: Other, desc: "Autre"}
 
   modes:
     search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
+    tv-search: [q, season, ep, tmdbid, genre]
+    movie-search: [q, tmdbid, genre]
+  allowrawsearch: true
 
 settings:
   - name: username
@@ -40,6 +43,10 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
+  - name: add_hybrid_features_to_filename
+    type: checkbox
+    label: Include DV/HDR10 in filename when a release has multiple HDR formats.
+    default: false
   - name: multilang
     type: checkbox
     label: Replace MULTi by another language in release name
@@ -74,10 +81,6 @@ settings:
     options:
       desc: desc
       asc: asc
-  - name: info_radarr
-    type: info
-    label: About Radarr
-    default: The HD-Only web site cannot find movies if you use the release year in a title search. When you define your Radarr v3 Indexer remember to tick the <i>Remove year from search string</i> checkbox.
 
 login:
   path: login.php
@@ -93,150 +96,174 @@ login:
     selector: a[href^="logout.php?auth="]
 
 search:
-  # https://hd-only.org/torrents.php?groupname=blood&freetorrent=1&order_by=time&order_way=desc&action=advanced&searchsubmit=1
-  path: torrents.php
+  # https://hd-only.org/torrents.php?filelist=blood+2009&freetorrent=1&order_by=time&order_way=desc&action=advanced&searchsubmit=1
+  paths:
+    - path: ajax.php
+      response:
+        type: json
+
   inputs:
-    # does not support categories, uses releasetype for single filter so we canot do multi releasetype filtering either.
+    # does not support categories, uses releasetype for single filter, so we cannot do multi releasetype filtering either.
     # $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
-    groupname: "{{ .Keywords }}"
+    searchstr: "{{ .Keywords }}"
+    tmdb: "{{ .Query.TMDBID }}"
+    taglist: "{{ .Query.Genre }}"
+    action: browse
+    group_results: 0
     order_by: "{{ .Config.sort }}"
     order_way: "{{ .Config.type }}"
-    action: advanced
-    searchsubmit: 1
-    # 1 freeleech, 2 neutral, 3 both, 0 normal
+    # 1 freeleech, 0 normal
     freetorrent: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
     # site does not support imdbid search or display imdb links in results
 
+  keywordsfilters:
+    # strip season
+    - name: re_replace
+      args: ["(?i)\\bS\\d{1,3}\\b", ""]
+    - name: trim
+
   rows:
-    selector: table#torrent_table > tbody > tr.torrent
+    selector: response.results
 
   fields:
+    _group_id:
+      selector: group.groupId
+    _torrent_id:
+      selector: torrentId
+    category:
+      selector: group.categoryId
+    categorydesc|append:
+      selector: group.releaseType
+      optional: true
+    details:
+      text: "torrents.php?id={{ .Result._group_id }}&torrentid={{ .Result._torrent_id }}"
     download:
-      selector: a[href^="torrents.php?action=download&"]
-      attribute: href
-    title_phase1:
-      selector: div.group_info
-      remove: span:nth-child(1), div.tags
+      text: "torrents.php?action=download&id={{ .Result._torrent_id }}"
+    genre:
+      selector: group.tags
+      filters:
+        - name: re_replace
+          args: ["(?i)(science.fiction)", "science_fiction"]
+    poster:
+      selector: group.cover
+      optional: true
+    tmdbid:
+      selector: group.tmdb
+    files:
+      selector: fileCount
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: snatches
+    size:
+      selector: size
+    date:
+      selector: time
+      filters:
+        - name: append
+          args: " +00:00" # GMT
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    year:
+      selector: group.groupYear
+      optional: true
+    _season:
+      selector: season
+      optional: true
+      filters:
+        - name: re_replace
+          args: ["^0$", ""]
+        - name: re_replace
+          args: ["^([1-9])$", "S0$1"]
+        - name: re_replace
+          args: ["^(\\d{2,})$", "S$1"]
+    _episode:
+      selector: episode
+      optional: true
+      filters:
+        - name: re_replace
+          args: ["^0$", ""]
+        - name: re_replace
+          args: ["^([1-9])$", "E0$1"]
+        - name: re_replace
+          args: ["^(\\d{2,})$", "E$1"]
+    _episode_info:
+      text: "{{ .Result._season }}{{ .Result._episode }}"
+    _format:
+      selector: format
       filters:
         - name: replace
-          args: ["\n", ""]
+          args: ["Blu-Ray Original", "COMPLETE BLURAY"]
         - name: re_replace
-          args: ["^(.+)                                                                            (.+)", "$2-$1"]
-        - name: replace
-          args: ["                         ", " "]
-        - name: replace
-          args: ["Blu-Ray Original", "Complete.BluRay"]
-        - name: replace
           args: ["Blu-Ray Remux", "Remux"]
-        - name: replace
-          args: ["Blu-Ray Rip", "BluRay.Rip"]
-        - name: replace
-          args: ["mHD", "mHD.BluRay.Rip"]
-        - name: replace
-          args: ["/ DC", "/ Directors.Cut"]
-        - name: replace
-          args: ["/ VL", "/ Extended"]
-        - name: replace
-          args: ["/ RM", "/ Remastered"]
-        - name: replace
-          args: ["/ UC", "/ Uncut"]
-        - name: replace
-          args: ["/ ES", "/ Special.Edition"]
-        - name: replace
-          args: [" / Cust_sub", ""]
-        - name: replace
-          args: [" / Cust", ""]
-        - name: replace
-          args: ["/ UN", "/ Unrated"]
-        - name: replace
-          args: [" / Crit", ""]
-        - name: replace
-          args: [" / WAC", ""]
-        - name: replace
-          args: [" / MoC", ""]
-        - name: replace
-          args: [" / BFI", ""]
-        - name: replace
-          args: [" / MUET", ""]
-        - name: replace
-          args: ["/ Exc NF", "/ NF"]
-        - name: replace
-          args: ["/ Exc AMZ", "/ AMZ"]
-        - name: replace
-          args: ["/ Exc YOU", "/ YT"]
-        - name: replace
-          args: [" / Freeleech!", ""]
-        - name: replace
-          args: [" / Complété!", ""]
-        - name: replace
-          args: [" / ", "."]
-        - name: trim
-        - name: replace
-          args: [".VFF.VFQ.stFR.MULTI", ".MULTI.VFF.VFQ"]
-        - name: replace
-          args: [".VFF.VFQ.VO.stFR.MULTI", ".MULTI.VFF.VFQ"]
-        - name: replace
-          args: [".VFF.VFQ.VO.stFR", ".MULTI.VFF.VFQ"]
-        - name: replace
-          args: [".VFQ.VO.stFR", ".MULTI.VFQ"]
-        - name: replace
-          args: [".VO.VFI.stFR", ".MULTI"]
-        - name: replace
-          args: [".VO.VF?.stFR", ".MULTI"]
-        - name: replace
-          args: [".VFF.VO.stFR", ".MULTI.VFF"]
-        - name: replace
-          args: [".VOF.stFR", ".FRENCH"]
-        - name: replace
-          args: [".VFQ.stFR", ".FRENCH"]
-        - name: replace
-          args: [".VFF.stFR.MULTI", ".MULTI.VFF"]
-        - name: replace
-          args: [".VFF.stFR", ".FRENCH"]
-        - name: replace
-          args: [".VFI.MULTI", ".MULTI"]
-        - name: replace
-          args: [".VO.stFR", ".VOSTFR"]
-        - name: replace
-          args: [".VFQ.VO", ".MULTI.VFQ"]
-        - name: replace
-          args: [".VFF.VO", ".MULTI.VFF"]
-        - name: replace
-          args: [".VO.VF?.stFR", ".MULTI"]
-        - name: replace
-          args: [".VFI.stFR", ".FRENCH"]
-        - name: replace
-          args: [".VOF.MULTI", ".MULTI.FRENCH"]
-        - name: replace
-          args: [".VOF", ".FRENCH"]
-        - name: replace
-          args: [".VFQ.MULTI", ".MULTI.VFQ"]
-        - name: replace
-          args: ["[Film]", ""]
-        - name: replace
-          args: ["[Dessin animé]", ""]
-        - name: replace
-          args: ["[Film d'animation]", ""]
-        - name: replace
-          args: ["[Concert]", ""]
-        - name: replace
-          args: ["[Documentaire]", ""]
-        - name: replace
-          args: ["[Court-métrage]", ""]
-        - name: replace
-          args: ["[Clip]", ""]
-        - name: replace
-          args: ["[Démonstration]", ""]
-        - name: replace
-          args: ["[Bonus de BD]", ""]
-        - name: replace
-          args: ["[Autre]", ""]
-        - name: replace
-          args: ["[Série Animée]", ""]
-        - name: replace
-          args: ["[Série]", ""]
         - name: re_replace
-          args: ["\\[(\\d{4})\\]", "$1"]
+          args: ["Blu-Ray Rip", "BluRay.Rip"]
+        - name: re_replace
+          args: ["mHD", "mHD.BluRay.Rip"]
+    _encoding:
+      selector: encoding
+    _release_group:
+      selector: team
+      optional: true
+    _media:
+      selector: media
+      optional: true
+    _vff:
+      selector: vff
+      optional: true
+    _vfq:
+      selector: vfq
+      optional: true
+    _vfi:
+      selector: vfi
+      optional: true
+    _vf:
+      selector: vf
+      optional: true
+    _vof:
+      selector: vof
+      optional: true
+    _hdr:
+      selector: hdr
+      optional: true
+    _hdr10plus:
+      selector: hdr10plus
+      optional: true
+    _dovi:
+      selector: dovi
+      optional: true
+    title_optional:
+      selector: group.groupName
+      filters:
+        - name: append
+          args: ".{{ .Result.year }}.{{ .Result._episode_info }}.{{ .Result._format }}.{{ .Result._encoding }}.{{ .Result._media }}{{ if eq .Result._hdr \"True\" }}.HDR{{ else }}{{ end }}.{{ if eq .Result._hdr10plus \"True\" }}.HDR10+{{ else }}{{ end }}.{{ if eq .Result._dovi \"True\" }}.DoVi{{ else }}{{ end }}"
+        - name: append
+          args: "{{ if or (eq .Result._vff \"True\") (eq .Result._vfq \"True\") }}.MULTI{{ else }}{{ end }}{{ if or (eq .Result._vfi \"True\") (eq .Result._vf \"True\") }}.MULTI{{ else }}{{ end }}"
+        - name: replace
+          args: [".MULTI.MULTI", ".MULTI"]
+        - name: append
+          args: "{{ if eq .Result._vof \"True\" }}.FRENCH{{ else }}{{ end }}"
+        - name: re_replace
+          args: ["[\\s.]+", "."]
+        - name: re_replace
+          args: ["\\.*([\\-:,])\\.*", "$1"]
+        - name: trim
+        - name: trim
+          args: .
+        - name: append
+          args: "{{ if .Result._release_group }}-{{ .Result._release_group }}{{ else }}{{ end }}"
+    _filename:
+      selector: "fileName"
+      optional: true
+      filters:
+        - name: replace
+          args: [".mkv", ""]
+        - 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 }}"
     title_vostfr:
       text: "{{ .Result.title_phase1 }}"
       filters:
@@ -252,72 +279,16 @@ search:
     title:
       text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
     description:
-      selector: div.group_info
-    poster:
-      selector: div.group_image img
-      attribute: src
-    details:
-      selector: a[href^="torrents.php?id="]
-      attribute: href
-    files:
-      selector: td:nth-child(3)
-    date:
-      selector: td:nth-child(4)
-      filters:
-        - name: replace
-          args: ["heures", "hours"]
-        - name: replace
-          args: ["heure", "hour"]
-        - name: replace
-          args: ["jours", "days"]
-        - name: replace
-          args: ["jour", "day"]
-        - name: replace
-          args: ["semaines", "weeks"]
-        - name: replace
-          args: ["semaine", "week"]
-        - name: replace
-          args: ["mois", "months"]
-        - name: replace
-          args: ["ans", "years"]
-        - name: replace
-          args: ["an", "year"]
-        - name: append
-          args: " ago"
-    size:
-      selector: td:nth-child(5)
-    grabs:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
+      text: "{{ .Result._filename }}"
+    _free:
+      selector: isFreeleech
     downloadvolumefactor:
-      case:
-        "div.group_info:contains(\"/ Freeleech!\")": 0
-        "*": 1
+      text: "{{ if eq .Result._free \"True\" }}0{{ else }}1{{ end }}"
     uploadvolumefactor:
       text: 1
-    category:
-      selector: div.group_info
-      remove: span, div, a
-      case:
-        ":contains(\"[Film]\")": 1
-        ":contains(\"[Dessin animé]\")": 3
-        ":contains(\"[Série]\")": 5
-        ":contains(\"[Série Animée]\")": 6
-        ":contains(\"[Film d'animation]\")": 7
-        ":contains(\"[Concert]\")": 9
-        ":contains(\"[Documentaire]\")": 11
-        ":contains(\"[Court-métrage]\")": 13
-        ":contains(\"[Clip]\")": 14
-        ":contains(\"[Démonstration]\")": 15
-        ":contains(\"[Bonus de BD]\")": 16
-        ":contains(\"[Autre]\")": 21
-        "*": 5
     minimumratio:
       text: 1.0
     minimumseedtime:
       # 3 days (as seconds = 3 x 24 x 60 x 60)
       text: 259200
-# Gazelle
+# JSON Gazelle

src/Jackett.Common/Definitions/hdpt.yml

@@ -196,4 +196,4 @@ search:
     description:
       selector: td.rowfollow:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.7.38 2023-05-14
+# NexusPHP v1.8.6 2023-08-18

src/Jackett.Common/Definitions/hdtorrentsit.yml

@@ -0,0 +1,172 @@
+---
+id: hdtorrentsit
+name: HDTorrents.it
+description: "HDTorrents.it is an ITALIAN Private site for TV / MOVIES"
+language: it-IT
+type: private
+encoding: UTF-8
+links:
+  - https://hdtorrents.eu/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 2, cat: TV, desc: "TV Series"}
+    - {id: 3, cat: Audio, desc: "Music"}
+    - {id: 4, cat: Console, desc: "Game"}
+    - {id: 5, cat: PC, desc: "Application"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
+    movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://hdtorrents.eu/\" target=\"_blank\">HDTorrents.it</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: sort
+    type: select
+    label: Sort requested from site
+    default: created_at
+    options:
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: /api/torrents
+  method: get
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
+search:
+  paths:
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    - path: "/api/torrents/filter"
+      response:
+        type: json
+
+  headers:
+    Authorization: ["Bearer {{ .Config.apikey }}"]
+
+  inputs:
+  # 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 }}"
+    perPage: 100
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+    - name: re_replace # S01 to Stagione 1
+      args: ["(?i)\\bS0*(\\d+)\\b", "Stagione $1"]
+
+  rows:
+    selector: data
+    attribute: attributes
+
+  fields:
+    category:
+      selector: category_id
+    title:
+      selector: name
+      filters:
+        - name: re_replace
+          args: ["\\.", " "]
+        - name: re_replace # Stagione X --> S0X
+          args: ["(?i)\\bStagion[ei]\\s?(\\d{1})\\b|\\bSeason'?s?\\s?(\\d{1})\\b", "S0$1$2"]
+        - name: re_replace # Stagione XX --> SXX
+          args: ["(?i)\\bStagion[ei]\\s?(\\d{2,})\\b|\\bSeason'?s?\\s?(\\d{2,})\\b", "S$1$2"]
+    details:
+      selector: details_link
+    download:
+      selector: download_link
+    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
+    genre:
+      selector: meta.genres
+      filters:
+        - name: re_replace
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
+        - name: re_replace
+          args: ["(?i)(TV Movie)", "TV_Movie"]
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
+    files:
+      selector: num_file
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    date:
+      # "created_at": "2021-10-18T00:34:50.000000Z" is returned by Newtonsoft.Json.Linq as 18/10/2021 00:34:50
+      selector: created_at
+      filters:
+        - name: append
+          args: " +00:00" # GMT
+        - name: dateparse
+          args: "MM/dd/yyyy HH:mm:ss zzz"
+    size:
+      selector: size
+    downloadvolumefactor:
+      # api returns 0%, 25%, 50%, 75%, 100%
+      selector: freeleech
+      case:
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
+    uploadvolumefactor:
+      # api returns False, True
+      selector: double_upload
+      case:
+        False: 1 # normal
+        True: 2 # double
+# as a pay site there is no MR or MST
+# json UNIT3D 7.0.3

src/Jackett.Common/Definitions/hdvbits.yml

@@ -1,24 +1,23 @@
 ---
-id: uploads
-name: Uploads
-description: "Uploads is a CHINESE Private torrent tracker for MOVIES / TV / GENERAL"
+id: hdvbits
+name: hdvbits
+description: "hdvbits is a CHINESE Private torrent tracker for MOVIES / TV / GENERAL"
 language: zh-CN
 type: private
 encoding: UTF-8
 links:
-  - http://uploads.ltd/
+  - https://hdvbits.com/
 
 caps:
   categorymappings:
-    - {id: 401, cat: Movies, desc: "Movies"}
-    - {id: 402, cat: TV, desc: "TV Series"}
-    - {id: 403, cat: TV, desc: "TV Shows"}
-    - {id: 404, cat: TV/Documentary, desc: "Documentaries"}
-    - {id: 405, cat: TV/Anime, desc: "Animations"}
-    - {id: 406, cat: Audio/Video, desc: "Music Videos"}
-    - {id: 407, cat: TV/Sport, desc: "Sports"}
-    - {id: 408, cat: Audio, desc: "HQ Audio"}
-    - {id: 409, cat: Other, desc: "Misc"}
+    - {id: 406, cat: Audio, desc: "HQ Audio/音轨"}
+    - {id: 408, cat: Audio, desc: "music/音乐"}
+    - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
+    - {id: 403, cat: TV, desc: "TV Shows/综艺"}
+    - {id: 405, cat: TV/Anime, desc: "Anime/动漫"}
+    - {id: 402, cat: TV, desc: "TV Series/电视剧"}
+    - {id: 401, cat: Movies, desc: "Movies/电影"}
 
   modes:
     search: [q]
@@ -39,7 +38,7 @@ settings:
   - name: info_2fa
     type: info
     label: "About 2FA code"
-    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the Uploads Web Site. Otherwise just leave it empty."
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the hdvbits Web Site. Otherwise just leave it empty."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -69,6 +68,10 @@ login:
   path: login.php
   method: form
   form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
   inputs:
     secret: ""
     username: "{{ .Config.username }}"
@@ -76,8 +79,8 @@ login:
     two_step_code: "{{ .Config.2facode }}"
     logout: ""
     securelogin: ""
-    ssl: ""
-    trackerssl: ""
+    ssl: yes
+    trackerssl: yes
   error:
     - selector: td.embedded:has(h2:contains("失败"))
   test:
@@ -96,7 +99,7 @@ search:
     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 }}"
-    # 0 AND, 1 OR, 2 exact
+    # 0 AND, 2 exact
     search_mode: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
@@ -125,9 +128,6 @@ search:
     download:
       selector: a[href^="download.php?id="]
       attribute: href
-    poster:
-      selector: img[data-src]
-      attribute: data-src
     imdbid:
       # site currently only has a badge and rating, the id is not present. just in case a future update.
       selector: a[href*="imdb.com/title/tt"]
@@ -182,4 +182,4 @@ search:
     description:
       selector: td:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.7.30 2022-11-05
+# NexusPHP v1.8.4 2023-06-18

src/Jackett.Common/Definitions/hebits.yml

@@ -112,9 +112,9 @@ search:
     title:
       text: "{{ if .Result.title_notenglish }}{{ .Result.title_notenglish }}{{ else }}{{ .Result.title_english }}{{ end }}"
     details:
-      text: "{{ .Config.sitelink }}torrents.php?torrentid={{ .Result._id }}"
+      text: "/torrents.php?torrentid={{ .Result._id }}"
     download:
-      text: "{{ .Config.sitelink }}torrents.php?action=download&id={{ .Result._id }}"
+      text: "/torrents.php?action=download&id={{ .Result._id }}"
     poster:
       selector: ..cover
     imdbid:

src/Jackett.Common/Definitions/hellashut.yml

@@ -103,11 +103,15 @@ settings:
 
 login:
   path: account-login.php
-  method: post
+  method: form
+  form: form[action="account-login.php"]
+  captcha:
+    type: image
+    selector: img[src="captcha.php?ext=.gif"]
+    input: captcha
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
-    returnto: /
   error:
     - selector: td.embedded:contains("Access Denied")
   test:

src/Jackett.Common/Definitions/hhanclub.yml

@@ -1,7 +1,7 @@
 ---
 id: hhanclub
 name: HHanClub
-description: "HHanClub (猪猪网) is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
+description: "HHanClub is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
 language: zh-CN
 type: private
 encoding: UTF-8

src/Jackett.Common/Definitions/hqmusic.yml

@@ -68,10 +68,10 @@ search:
     $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
     searchstr: "{{ .Keywords }}"
     artistname: "{{ if and (.Query.Artist) (ne .Query.Artist \"VA\") }}{{ .Query.Artist }}{{ else }}{{ end }}"
-    groupname: "{{ if .Query.Album }}{{ .Query.Album }}{{ else }}{{ end }}"
-    recordlabel: "{{ if .Query.Label }}{{ .Query.Label }}{{ else }}{{ end }}"
-    year: "{{ if .Query.Year }}{{ .Query.Year }}{{ else }}{{ end }}"
-    filelist: "{{ if .Query.Track }}{{ .Query.Track }}{{ else }}{{ end }}"
+    groupname: "{{ .Query.Album }}"
+    recordlabel: "{{ .Query.Label }}"
+    year: "{{ .Query.Year }}"
+    filelist: "{{ .Query.Track }}"
     freetorrent: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
     taglist: "{{ .Query.Genre }}"
     # 0 Any, 1 All

src/Jackett.Common/Definitions/icc2022.yml

@@ -189,4 +189,4 @@ search:
     description:
       selector: td.rowfollow:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.8.3 2023-05-14
+# NexusPHP v1.8.6 2023-08-18

src/Jackett.Common/Definitions/ilcorsaronero.yml

@@ -5,7 +5,6 @@ description: "Il Corsaro Nero is an ITALIAN Public site for TV / MOVIES / GENERA
 language: it-IT
 type: public
 encoding: Windows-1252
-followredirect: true
 requestDelay: 2
 links:
   - https://ilcorsaronero.link/

src/Jackett.Common/Definitions/ildragonero.yml

@@ -0,0 +1,201 @@
+---
+id: ildragonero
+name: ilDraGoNeRo
+description: "ilDraGoNeRo is an ITALIAN Semi-Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: it-IT
+type: semi-private
+encoding: UTF-8
+links:
+  - https://ildragonero2.info/
+
+caps:
+  # commented out categories are discussion-only forums
+  categorymappings:
+    # - {id: 10, cat: Other, desc: "..: REGOLAMENTO :.."}
+    # - {id: 2, cat: Other, desc: "..: PRESENTAZIONI :.."}
+    # - {id: 15, cat: Other, desc: "..: CAVERNA DEL DRAGO :.."}
+    # - {id: 1, cat: Other, desc: "[ RELEASES ]"}
+    # - {id: 35, cat: Other, desc: "..: GUIDE, ANNUNCI & REGOLE :.."}
+    # - {id: 19, cat: Movies, desc: "..: FILM :.."}
+    - {id: 52, cat: Movies, desc: "   ( RELEASES IDN_CREW )", default: true}
+    - {id: 77, cat: Movies/SD, desc: "   ( SD )", default: true}
+    - {id: 50, cat: Movies/HD, desc: "   ( HD )", default: true}
+    - {id: 78, cat: Movies/UHD, desc: "   ( 4K )", default: true}
+    - {id: 66, cat: Movies/Foreign, desc: "   ( FILM SUB ITA )", default: true}
+    # - {id: 56, cat: Movies, desc: "   ( FILMOGRAFIE )"}
+    # - {id: 12, cat: Movies, desc: "   ( RICHIESTE )"}
+    # - {id: 47, cat: Movies, desc: "      ( RICHIESTE EVASE )"}
+    - {id: 39, cat: XXX, desc: "..: FILM XXX :..", default: true}
+    # - {id: 32, cat: TV/Anime, desc: "..: CARTOON & ANIME :.."}
+    - {id: 63, cat: Movies/Other, desc: "   ( CARTOON & ANIME FILM )", default: true}
+    - {id: 61, cat: TV/Anime, desc: "   ( CARTOON & ANIME SERIE )", default: true}
+    - {id: 88, cat: TV/Anime, desc: "   ( CARTOON & ANIME SUB ITA )", default: true}
+    # - {id: 80, cat: TV/Anime, desc: "   ( RICHIESTE )"}
+    # - {id: 81, cat: TV/Anime, desc: "      ( RICHIESTE EVASE )"}
+    # - {id: 23, cat: TV, desc: "..: SERIE TV :.."}
+    # - {id: 33, cat: TV, desc: "   L'archivio di Pir8"}
+    - {id: 45, cat: TV/SD, desc: "   (SD 480p)", default: true}
+    - {id: 46, cat: TV/HD, desc: "   (HD 720p - 1080p - 2160p)", default: true}
+    - {id: 79, cat: TV/Foreign, desc: "   ( SERIE TV SUB ITA )", default: true}
+    # - {id: 74, cat: TV, desc: "   ( RICHIESTE )"}
+    # - {id: 75, cat: TV, desc: "      ( RICHIESTE EVASE )"}
+    # - {id: 54, cat: TV/Documentary, desc: "..: DOCUMENTARI & SPETTACOLI :.."}
+    - {id: 92, cat: TV/Documentary, desc: "   ( DOCUMENTARI )", default: true}
+    - {id: 53, cat: Audio/Video, desc: "   ( CONCERTI )", default: true}
+    - {id: 93, cat: TV/Other, desc: "   ( TV SHOW )", default: true}
+    # - {id: 85, cat: TV/Documentary, desc: "   ( RICHIESTE )"}
+    # - {id: 86, cat: TV/Documentary, desc: "      ( RICHIESTE EVASE )"}
+    # - {id: 8, cat: Audio, desc: "..: MUSICA :.."}
+    - {id: 41, cat: Audio/Foreign, desc: "   ( ARTISTI STRANIERI )", default: true}
+    - {id: 42, cat: Audio, desc: "   ( ARTISTI ITALIANI )", default: true}
+    - {id: 87, cat: Audio, desc: "   ( COLONNE SONORE )", default: true}
+    - {id: 89, cat: Audio/Other, desc: "   ( COMPILATION )", default: true}
+    # - {id: 57, cat: Audio, desc: "   ( DISCOGRAFIE )"}
+    # - {id: 72, cat: Audio, desc: "   ( RICHIESTE )"}
+    # - {id: 73, cat: Audio, desc: "      ( RICHIESTE EVASE )"}
+    # - {id: 34, cat: PC/Games, desc: "..: VIDEOGIOCHI :.."}
+    - {id: 91, cat: PC/Games, desc: "   ( VIDEOGIOCHI PER PC )", default: true}
+    - {id: 59, cat: PC/Games, desc: "   ( MODDING )", default: true}
+    # - {id: 94, cat: PC/Games, desc: "   ( COLLECTION )"}
+    # - {id: 70, cat: PC/Games, desc: "   ( RICHIESTE )"}
+    # - {id: 71, cat: PC/Games, desc: "      ( RICHIESTE EVASE )"}
+    # - {id: 36, cat: Books, desc: "..: SALA DI LETTURA :.."}
+    - {id: 67, cat: Books/EBook, desc: "   ( E-BOOK )", default: true}
+    - {id: 82, cat: Books/Comics, desc: "   ( FUMETTI )", default: true}
+    - {id: 62, cat: Audio/Audiobook, desc: "   ( AUDIO-BOOKS )", default: true}
+    - {id: 38, cat: Books/Mags, desc: "   ( QUOTIDIANI & PERIDOICI )", default: true}
+    # - {id: 68, cat: Books, desc: "   ( RICHIESTE )"}
+    # - {id: 69, cat: Books, desc: "      ( RICHIESTE EVASE )"}
+    # - {id: 9, cat: PC/0day, desc: "..: APPLICAZIONI :.."}
+    - {id: 20, cat: PC/0day, desc: "..:Software windows:..", default: true}
+    - {id: 21, cat: PC/Mac, desc: "..:Software mac:..", default: true}
+    - {id: 22, cat: PC/Mobile-Android, desc: "..:APK Android:..", default: true}
+    # - {id: 83, cat: PC/0day, desc: "   ( RICHIESTE )"}
+    # - {id: 84, cat: PC/0day, desc: "      ( RICHIESTE EVASE )"}
+    # - {id: 95, cat: Other, desc: "   ( COMMENTI FILM E SERIE )"}
+    # - {id: 30, cat: Other, desc: "..: RELEASES DA VERIFICARE :.."}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+login:
+  path: forum/ucp.php?mode=login
+  method: form
+  form: form#login
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    autologin: on
+    viewonline: on
+  error:
+    - selector: div.error
+  test:
+    path: forum/index.php
+    selector: a[href^="./ucp.php?mode=logout&sid="]
+
+download:
+  before:
+    # thankyou link: ./viewtopic.php?f=61&p=76522&thanks=76522&to_id=83&from_id=23462
+    pathselector:
+      selector: ul.post-buttons li:nth-last-child(2) a
+      attribute: href
+      filters:
+        - name: re_replace
+          args: ["^.", "forum"]
+  selectors:
+    - selector: script:contains(addLinkToDocument)
+      filters:
+        - name: regexp
+          args: "addLinkToDocument\\(\"(.*?)\""
+        - name: prepend
+          args: "magnet:?xt=urn:btih:"
+
+search:
+  paths:
+    - path: forum/search.php
+  keywordsfilters:
+    # strip season and/or ep
+    - name: re_replace
+      args: ["\\b(?:[SE]\\d{1,4}){1,2}\\b", ""]
+    - name: re_replace
+      args: ["(\\w+)", "+$1"] # prepend + to each word
+  inputs:
+    keywords: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+    # all, any
+    terms: all
+    # Search in subforums: yes 1, no 0
+    sc: 0
+    # Search For: all, msgonly, titleonly, firstpost
+    sf: titleonly
+    # Show Results as: posts, topics
+    sr: topics
+    # sort: a author, t post time, f forum, i title, s post subject
+    sk: t
+    # order: a ascending, d descending
+    sd: d
+    # Seach Posts For: all 0, 1day 1, week 7, fortnight 14, month 30, 3months 90, 6 months 180, year 365
+    st: 0
+    # Show first: all -1, 0, 25, 50, 100, 200, 300, 400, 500, 600, 700, 800, 900, 1000
+    ch: 300
+    # hidden
+    t: 0
+    # hidden
+    submit: Cerca
+    $raw: "{{ range .Categories }}&fid[]={{.}}{{end}}"
+
+  rows:
+    selector: li.row
+
+  fields:
+    category:
+      selector: a[href^="./viewforum.php?f="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: f
+    title:
+      selector: a.topictitle
+      filters:
+        # normalize Stagione xx to Sxx format
+        - name: re_replace
+          args: ["(?i)\\bS(?:tagion[ei] )?(\\d{1,3}(?:-\\d{1,3})?)\\b\\s*(.+?)\\s*(?:\\[IN CORSO\\])?\\s*\\[(\\d{1,3}(?:-\\d{1,3})?)\\/(\\d{1,3})\\]", "S$1E$3 of $4 $2"]
+        - name: re_replace
+          args: ["(?i)\\bS(?:tagion[ei] )?(\\d{1,3}(?:-\\d{1,3})?)\\b\\s*(.+?)\\s*(?:\\[IN CORSO\\])?\\s*\\[(\\d{1,3}(?:-\\d{1,3})?)\\]", "S$1E$3 $2"]
+        - name: re_replace
+          args: ["(?i)\\bS(?:tagion[ei] )?(\\d{1,3}(?:-\\d{1,3})?)\\s+(E\\d{1,3}(?:-\\d{1,3})?)\\/(\\d{1,3})\\b", "S$1$2 of $3"]
+        - name: re_replace
+          args: ["(?i)\\bStagion[ei] (\\d{1,3}(?:-\\d{1,3})?)\\b", "S$1"]
+        - name: re_replace
+          args: ["(?i)\\s*(?:\\[IN CORSO\\])?\\s*\\[(\\d{1,3}(?:-\\d{1,3})?)\\/(\\d{1,3})\\]", " E$1 of $2"]
+    details:
+      selector: a.topictitle
+      attribute: href
+    download:
+      selector: a.topictitle
+      attribute: href
+    poster:
+      selector: div[data-ot]
+      attribute: data-ot
+      filters:
+        - name: regexp
+          args: "src='(.*?)'"
+    size:
+      text: "512 MB"
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    date:
+      selector: time[datetime]
+      attribute: datetime
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+    description:
+      selector: a.topictitle
+# phpBB

src/Jackett.Common/Definitions/infire.yml

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

src/Jackett.Common/Definitions/itorrent.yml

@@ -5,7 +5,6 @@ description: "iTorrent is a Public HUNGARIAN site"
 language: hu-HU
 type: public
 encoding: UTF-8
-followredirect: true
 links:
   - https://itorrent.ws/
 legacylinks:

src/Jackett.Common/Definitions/jpopsuki.yml

@@ -5,6 +5,7 @@ description: "JPopSuki is a Private Torrent Tracker for ASIAN MUSIC"
 language: en-US
 type: private
 encoding: UTF-8
+requestDelay: 3
 links:
   - https://jpopsuki.eu/
 
@@ -75,7 +76,7 @@ search:
     - path: ajax.php
   inputs:
     $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}{{ if or .Query.Album .Query.Artist .Keywords }}action=advanced{{ else }}searchtags=japanese&tags_type=0{{ end }}"
-    artistname: "{{ if .Query.Artist }}{{ .Query.Artist }}{{ else }}{{ end }}"
+    artistname: "{{ .Query.Artist }}"
     torrentname: "{{ if .Query.Album }}{{ .Query.Album }}{{ else }}{{ .Keywords }}{{ end }}"
     freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
     order_by: "{{ .Config.sort }}"

src/Jackett.Common/Definitions/jptv.yml

@@ -12,10 +12,10 @@ caps:
   categorymappings:
     - {id: 1, cat: Movies, desc: "Movies"}
     - {id: 2, cat: TV, desc: "TV Shows"}
-    - {id: 6, cat: TV, desc: "TS Firehose (RAW TS)"}
+    - {id: 6, cat: TV, desc: "TS Firehose"}
     - {id: 7, cat: Movies/Other, desc: "Anime Movies"}
     - {id: 9, cat: TV/Anime, desc: "Anime Series"}
-    - {id: 8, cat: Audio, desc: "Music"}
+    - {id: 8, cat: Audio, desc: "Audio"}
     - {id: 10, cat: Books, desc: "Book"}
 
   modes:

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

@@ -5,7 +5,6 @@ description: "kickasstorrents.ws is a Public KickAssTorrent clone for TV / MOVIE
 language: en-US
 type: public
 encoding: UTF-8
-followredirect: true
 links:
   - https://kickass.ws/
   - https://kickasstorrents.bz/