frozenlayer: removed. resolves #1556

some domains are now blocked

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
 
@@ -43,7 +43,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BT.etree
  * BTMET
  * BTSOW
- * BullTorrent
  * Byrutor
  * Cinecalidad
  * comicat
@@ -61,8 +60,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * EXT Torrents
  * ExtraTorrent.st
  * EZTV
- * FileListing
- * Frozen Layer
  * GamesTorrents
  * GkTorrent
  * GloDLS
@@ -87,7 +84,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * MioBT
  * MixTapeTorrent
  * MoviesDVDR
- * MovieTorrent
  * MyPornClub
  * NextJAV
  * Newstudio
@@ -100,6 +96,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ParnuXi
  * PC-torrent
  * PornoTorrent
+ * Postman
  * ProPorn
  * Rapidzona
  * RinTorNeT
@@ -147,7 +144,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * xxxAdultTorrent
  * XXXClub
  * xxxtor
- * xxxtorrents
  * YourBittorrent
  * YTS.ag
  * zetorrents
@@ -165,6 +161,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
@@ -175,6 +172,7 @@ 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
@@ -197,7 +195,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
@@ -215,6 +212,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
@@ -249,8 +247,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
@@ -265,6 +264,7 @@ 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
@@ -273,13 +273,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * 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
@@ -308,17 +308,17 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * 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
  * Dark-Shadow
  * DataScene (DS)
  * DesiTorrents
- * Diablo Torrent [![(invite needed)][inviteneeded]](#)
+ * Diablo Torrent
  * DICMusic
  * DigitalCore
  * DimeADozen (EzTorrent)
@@ -328,28 +328,28 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Dream Tracker
  * Drugari
  * Ebooks-Shares
- * Emmid Tracker
  * Empornium (EMP) [![(invite needed)][inviteneeded]](#)
+ * Enthralled
  * eShareNet
- * eStone (XiDER, BeLoad, BigTorrent)
+ * eStone (BigTorrent)
  * Exitorrent.org [![(invite needed)][inviteneeded]](#)
  * ExoticaZ (YourExotic)
  * ExtremeBits
- * ExtremeTorrents
  * Falkon Vision Team
  * FANO.IN [![(invite needed)][inviteneeded]](#)
  * Fantastiko
  * Fappaizuri
  * FastScene
+ * FearNoPeer
  * Femdomcult
  * FileList (FL)
  * FinElite (FE) [![(invite needed)][inviteneeded]](#)
  * FinVip
  * Flux-Zone
  * Free Farm (自由农场)
+ * FSM
  * FunFile (FF)
  * FunkyTorrents (FT)
- * FusionMayhem
  * FutureTorrent [![(invite needed)][inviteneeded]](#)
  * Fuzer (FZ)
  * Gamera (駕瞑羅)
@@ -366,6 +366,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HaiDan
  * Haitang
  * HappyFappy
+ * Hares Club (白兔俱乐部) [![(invite needed)][inviteneeded]](#)
  * Hawke-uno
  * HD Dolby
  * HD-Forever (HDF)
@@ -381,6 +382,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDC (HDCiTY) [![(invite needed)][inviteneeded]](#)
  * HDChina (HDWing) [![(invite needed)][inviteneeded]](#)
  * HDFans
+ * HDFun (HDZone)
  * HDHome (HDBigger) [![(invite needed)][inviteneeded]](#)
  * HDMaYi
  * HDPT [![(invite needed)][inviteneeded]](#)
@@ -392,7 +394,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDU
  * hdvbits
  * HDVIDEO
- * HDZone
  * Hebits
  * HellasHut
  * HHanClub
@@ -431,7 +432,7 @@ 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
@@ -439,6 +440,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * MaDs Revolution
  * Magico (Trellas) [![(invite needed)][inviteneeded]](#)
  * Majomparádé (TurkDepo)
+ * Making Off
  * Mansão dos Animes (MDAN)
  * MegamixTracker
  * MeseVilág (Fairytale World)
@@ -451,7 +453,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * MoreThanTV (MTV)
  * MouseBits
  * Movie-Torrentz
- * MuziekFabriek
  * MyAnonamouse (MAM)
  * MySpleen [![(invite needed)][inviteneeded]](#)
  * NCore
@@ -474,7 +475,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Peeratiko
  * Peers.FM
  * PigNetwork
- * PirateTheNet (PTN)
  * PixelCove (Ultimate Gamer)
  * PiXELHD (PxHD) [![(invite needed)][inviteneeded]](#)
  * PolishSource (PS)
@@ -507,10 +507,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * RedBits
  * Red Leaves [![(invite needed)][inviteneeded]](#)
  * ReelFlix
- * Resurrect The Net
+ * Resurrect The Net [![(invite needed)][inviteneeded]](#)
  * RetroFlix
  * RevolutionTT
- * Romanian Metal Torrents (RMT) [![(invite needed)][inviteneeded]](#)
+ * Romanian Metal Torrents (RMT)
  * Rousi
  * SceneHD [![(invite needed)][inviteneeded]](#)
  * SceneLinks (SL)
@@ -532,7 +532,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Speedmaster HD [![(invite needed)][inviteneeded]](#)
  * SpeedTorrent Reloaded
  * Spirit of Revolution [![(invite needed)][inviteneeded]](#)
- * SportHD
  * SportsCult
  * SpringSunday [![(invite needed)][inviteneeded]](#)
  * SugoiMusic
@@ -545,6 +544,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TeamOS
  * TEKNO3D [![(invite needed)][inviteneeded]](#)
  * teracod (Movie Zone)
+ * The Crazy Ones
  * The Falling Angels (TFA)
  * The Geeks
  * The New Retro
@@ -566,6 +566,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 +575,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]](#)
@@ -591,13 +593,15 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TurkSeed
  * TurkTorrent (TT)
  * TV Chaos UK (TVCUK)
+ * TvRoad
  * TVstore
+ * Twisted-Music
  * U2 (U2分享園@動漫花園) [![(invite needed)][inviteneeded]](#)
  * UBits
  * UHDBits
  * UltraHD
  * UnionGang
- * UnleashTheCartoons
+ * Universal-Torrents
  * UnlimitZ
  * Upload.cx [![(invite needed)][inviteneeded]](#)
  * UTOPIA
@@ -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`
@@ -773,6 +778,11 @@ On a CentOS/RedHat 7 system: [jewflix.jackett](https://galaxy.ansible.com/jewfli
 On an Ubuntu 16 system: [chrisjohnson00.jackett](https://galaxy.ansible.com/chrisjohnson00/jackett)
 
 
+### Installation on Linux or macOS via Homebrew
+
+[Homebrew Formulae - Jackett](https://formulae.brew.sh/formula/jackett)
+
+
 ## Installation on macOS
 
 ### Prerequisites
@@ -832,11 +842,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 +896,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 +910,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/1337x.yml

@@ -13,7 +13,7 @@ links:
   - https://x1337x.eu/
   - https://x1337x.se/
   - https://1337x.so/
-  - https://1337x.unblockit.zip/
+  - https://1337x.unblockit.ing/
   - https://1337x.ninjaproxy1.com/
   - https://1337x.mrunblock.bond/
 legacylinks:
@@ -22,8 +22,6 @@ legacylinks:
   - https://1337x.nocensor.biz/
   - https://1337x.gd/
   - https://1337x.nocensor.sbs/
-  - https://1337x.unblockit.ist/
-  - https://1337x.unblockit.bet/
   - https://1337x.unblockit.cat/
   - https://1337x.unblockit.nz/
   - https://1337x.nocensor.world/
@@ -43,6 +41,8 @@ legacylinks:
   - https://1337x.unblockninja.com/
   - https://1337x.unblockit.vegas/
   - https://1337x.unblockit.esq/
+  - https://1337x.unblockit.zip/
+  - https://1337x.unblockit.foo/
 
 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.9 2023-11-15

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

@@ -16,6 +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: 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工具软件)"}

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

@@ -29,13 +29,12 @@ caps:
     music-search: [q]
 
 settings:
-  - name: cookie
+  - name: username
     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>"
+    label: Username
+  - name: password
+    type: password
+    label: Password
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -62,9 +61,23 @@ settings:
     default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
 
 login:
-  method: cookie
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
   inputs:
-    cookie: "{{ .Config.cookie }}"
+    secret: ""
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
+  error:
+    - selector: td.embedded:has(h2:contains("失败"))
   test:
     path: index.php
     selector: a[href="usercp.php"]

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: td:nth-last-child(3) div:nth-last-child(2)
     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/
 
@@ -141,7 +143,6 @@ search:
       selector: a[href^="download.php?"]
       attribute: href
     description:
-      optional: true
       selector: span.torrent_small_desc
     genre:
       selector: span.torrent_small_desc

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.2

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/anime-free.yml

@@ -124,7 +124,6 @@ search:
       attribute: src
     description:
       selector: div[itemprop="description"]
-      optional: true
     date:
       selector: li:has(img#adddate)
       filters:

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,29 +1,23 @@
 ---
-id: emmidtracker
-name: Emmid Tracker
-description: "Emmid Tracker is a BRAZILIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+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://emmidtracker.online/
+  - https://anitoons.xyz/
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies, desc: "FILMES"}
-    - {id: 2, cat: TV, desc: "SÉRIES"}
-    - {id: 3, cat: Audio, desc: "MÚSICAS"}
-    - {id: 4, cat: PC/Games, desc: "JOGOS"}
-    - {id: 5, cat: PC/0day, desc: "APPS"}
-    - {id: 6, cat: TV/Anime, desc: "ANIME SÉRIES"}
-    - {id: 7, cat: XXX, desc: "ADULTO"}
-    - {id: 8, cat: Movies/Other, desc: "ANIME FILMES"}
+    - {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]
 
 settings:
   - name: apikey
@@ -32,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://emmidtracker.online/\" target=\"_blank\">Emmid Tracker</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
@@ -120,8 +114,6 @@ search:
     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
@@ -157,9 +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
-# json UNIT3D 6.5.0
+        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 = 5 x 24 x 60 x 60)
+      text: 432000
+# json UNIT3D 7.0.3

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

@@ -60,7 +60,8 @@ search:
     q: "{{ .Keywords }}"
     tmdb: "{{ .Query.TMDBID }}"
     imdb: "{{ .Query.IMDBIDShort }}"
-    cat: "{{ join .Categories \",\" }}"
+    # category filtering is disabled since it seems to rely on the AND operator that prevents some releases to show on search.
+    # cat: "{{ join .Categories \",\" }}"
     limit: 100
     offset: 0
 
@@ -113,7 +114,7 @@ search:
       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:

src/Jackett.Common/Definitions/asiancinema.yml

@@ -127,8 +127,42 @@ search:
     date:
       selector: time
       filters:
-        - name: append
-          args: " ago"
+        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
+        - name: re_replace
+          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
+        - name: re_replace
+          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
+        - name: re_replace
+          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
+        - name: re_replace
+          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
+        - name: re_replace
+          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
+        - name: re_replace
+          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
+        - name: re_replace
+          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
+        - name: re_replace
+          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
+        - name: re_replace
+          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
+        - name: re_replace
+          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
+        - name: re_replace
+          args: ["(?i) (ay)", "month"]
+        - name: re_replace
+          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
+        - name: re_replace
+          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
+        - name: re_replace
+          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
+        - name: re_replace
+          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
+        - name: re_replace
+          args: ["(?i) (an)", "year"]
+        - name: re_replace
+          args: ["(?i)(För |und)", ""] # Misc removals
+        - name: timeago
     downloadvolumefactor:
       case:
         i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store

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"}
@@ -316,6 +317,10 @@ search:
       selector: td[title^="Replies:"]
       optional: true
       default: 0
+    description:
+      case:
+        span.tor-approved: Verified
+        span.tor-not-approved: Unverified
     downloadvolumefactor:
       text: 1
     uploadvolumefactor:

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

@@ -5,6 +5,7 @@ description: "Bangumi Moe is a Public torrent site for ANIME"
 language: en-US
 type: public
 encoding: UTF-8
+requestDelay: 3
 links:
   - https://bangumi.moe/
 
@@ -50,7 +51,7 @@ search:
     title:
       selector: title
     details:
-      text: "{{ .Config.sitelink }}"
+      text: /
     infohash:
       selector: infoHash
     poster:
@@ -60,7 +61,6 @@ search:
           args: "src=\\\"(.+?)\\\""
     description:
       selector: category_tag.locale.en
-      optional: true
     date:
       # 2021-10-19T06:10:15.772Z
       selector: publish_time

src/Jackett.Common/Definitions/beload.yml

@@ -0,0 +1,161 @@
+---
+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)
+    description:
+      case:
+        i.fa-check: Verified
+        i.fa-question: Unverified
+    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/bestcore.yml

@@ -181,6 +181,10 @@ search:
       selector: td:nth-child(8)
     leechers:
       selector: td:nth-child(9)
+    description:
+      case:
+        img[src="pic/yes.png"]: Verified
+        img[src="pic/nincs.png"]: Unverified
     downloadvolumefactor:
       case:
         img[src="pic/free.png"]: 0

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

@@ -151,6 +151,10 @@ search:
           args: " +01:00" # CET
         - name: dateparse
           args: "yyyy-MM-dd HH:mm:ss zzz"
+    description:
+      case:
+        img[src="./themes/Born/nemlatta.png"]: Unverified
+        "*": Verified
     downloadvolumefactor:
       case:
         img[title="Ingyenes letöltés"]: 0

src/Jackett.Common/Definitions/bitofvalor.yml

@@ -1,161 +0,0 @@
----
-id: bitofvalor
-name: Bit Of Valor
-description: "Bit Of Valor is a HUNGARIAN Private Tracker for MOVIES / TV"
-language: hu-HU
-type: private
-encoding: ISO-8859-2
-links:
-  - https://bitvalor.hu/
-
-caps:
-  categorymappings:
-    - {id: 26, cat: Books, desc: "E-Book/ENG"}
-    - {id: 27, cat: Books, desc: "E-Book/HUN"}
-    - {id: 28, cat: PC/Games, desc: "Játék/ISO"}
-    - {id: 29, cat: PC/Games, desc: "Játék/RIP"}
-    - {id: 30, cat: Movies/SD, desc: "Cam/ENG"}
-    - {id: 31, cat: Movies/SD, desc: "Cam/HUN"}
-    - {id: 32, cat: Movies/HD, desc: "HD/ENG"}
-    - {id: 33, cat: Movies/HD, desc: "HD/HUN"}
-    - {id: 34, cat: Movies/DVD, desc: "Dvd9/HUN"}
-    - {id: 35, cat: Movies/DVD, desc: "DVD/ENG"}
-    - {id: 36, cat: Movies/DVD, desc: "DVD/HUN"}
-    - {id: 37, cat: TV, desc: "Sorozat/ENG"}
-    - {id: 38, cat: TV, desc: "Sorozat/HUN"}
-    - {id: 39, cat: Movies/SD, desc: "Xvid/ENG"}
-    - {id: 40, cat: Movies/SD, desc: "Xvid/HUN"}
-    - {id: 41, cat: Audio, desc: "Zene/ENG"}
-    - {id: 42, cat: Audio, desc: "Zene/HUN"}
-    - {id: 43, cat: Other, desc: "Képek"}
-    - {id: 44, cat: PC/Mobile-Other, desc: "Mobil"}
-    - {id: 45, cat: PC, desc: "Program/ISO/RIP"}
-    - {id: 46, cat: XXX/WEB-DL, desc: "XXX/Film"}
-    - {id: 47, cat: XXX/ImageSet, desc: "XXX/Kép"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    book-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:
-      1: title
-      4: added
-      5: size
-      7: seeders
-  - 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én:</b> setting to <b>100</b> on your account profile.
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: div.error
-  test:
-    path: /
-    selector: a[href^="logout.php"]
-
-download:
-  selectors:
-    - selector: a[href^="download.php?id="]
-      attribute: href
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    # 0 active, 1 all, 2 deadonly, 3 freeleech, 4 seedless
-    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-    # does not support imdbid search nor has imdbid link in results
-
-  rows:
-    selector: tr:has(a[onmouseover]):not(:has(td.outer))
-
-  fields:
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: a[onmouseover]
-    details:
-      selector: a[onmouseover]
-      attribute: href
-    poster:
-      selector: a[onmouseover]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=(.*?) "
-    download:
-      selector: a[onmouseover]
-      attribute: href
-    date:
-      selector: td:nth-child(4)
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "yyyy-MM-dd HH:mm:ss zzz"
-    size:
-      selector: td:nth-child(5)
-    grabs:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
-    genre:
-      selector: i
-      filters:
-        - name: replace
-          args: ["\xA0", " "]
-        - name: validate
-          args: "Akció, Animációs, Kaland, Életrajzi, Vígjáték, Krimi, Dokumentum, Dráma, Családi, Fantasztikus, Film-noir, Bünügyi, Történelmi, Horror, Musical, Zenés, Misztikus, Hírek, Valóságshow, Romantikus, Sci-fi, Rövidfilm, Sport, Talkshow, Thriller, Háborús, Bemutató, XXX, Western, 60s, 70s, 80s, 90s, Alternative, Blues, Breaks, Classic, Country, Dance, Electronic, Folk, Funk, Hardcore, Hip.Hop, Haus, Metal, Pop, Pop.Rock, Rock, Soul, Techno, Disco, Trance, Live, Latin, Jazz"
-    description:
-      text: "{{ .Result.genre }}"
-    downloadvolumefactor:
-      case:
-        img[src="pic/free.png"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumseedtime:
-      # 4 days (as seconds = 4 x 24 x 60 x 60)
-      text: 345600
-# Engine n/a

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/bitspyder.yml

@@ -176,7 +176,6 @@ search:
     uploadvolumefactor:
       text: 1
     description:
-      optional: true
       selector: font[color="#990000"]
     minimumratio:
       text: 1.0

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.3

src/Jackett.Common/Definitions/boxingtorrents.yml

@@ -27,6 +27,7 @@ caps:
     - {id: 14, cat: TV/Sport, desc: "HD"}
     - {id: 7, cat: TV/Sport, desc: "Misc"}
     - {id: 18, cat: TV/Sport, desc: "Instructional"}
+    - {id: 19, cat: TV/Documentary, desc: "Documentary"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/btsow.yml

@@ -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/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:
@@ -137,7 +137,9 @@ search:
       selector: small[title]
       attribute: title
     description:
-      text: "{{ .Result.genre }}"
+      case:
+        img[src="/pic/yes.png"]: "Verified: {{ .Result.genre }}"
+        img[src="/pic/nincs.png"]: "Unverified: {{ .Result.genre }}"
     poster:
       selector: a[onmouseover]
       attribute: onmouseover

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:
@@ -127,8 +125,12 @@ search:
       filters:
         - 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_tags:
+      selector: div.tags
     description:
-      text: "{{ .Result.genre }}"
+      case:
+        span.icon_okay: "Verified: {{ .Result.description_tags }}"
+        "*": "Unverified: {{ .Result.description_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/classix.yml

@@ -149,6 +149,12 @@ search:
     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
@@ -156,7 +162,7 @@ search:
         - name: regexp
           args: "Date Added: </b>(\\d{2}-\\d{2}-\\d{4})<br />"
         - name: dateparse
-          args: "dd-MM-yyyy"
+          args: "MM-dd-yyyy"
     size:
       selector: td:nth-child(7)
     seeders:

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

@@ -0,0 +1,293 @@
+---
+id: crazyspirits
+name: CrazySpirits
+description: "Crazy Spirits is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: fr-FR
+type: private
+encoding: UTF-8
+links:
+  - https://www.crazyspirits.com/
+
+caps:
+  categorymappings:
+    # Films
+    - {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: 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: 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: 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: 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: 72, cat: Movies/WEB-DL, desc: "Films WEBRip-DL"}
+    # Jeux
+    - {id: 114, cat: PC/Games, desc: "Jeux PC"}
+    - {id: 115, cat: Console/PS3, desc: "Jeux PS3"}
+    - {id: 116, cat: Console/PSP, desc: "Jeux PSP- PSX"}
+    - {id: 117, cat: Console, desc: "Jeux Roms"}
+    - {id: 118, cat: Console, desc: "Jeux Switch"}
+    - {id: 119, cat: Console/Wii, desc: "Jeux Wii"}
+    - {id: 120, cat: Console/WiiU, desc: "Jeux WiiU"}
+    - {id: 121, cat: Console/XBox, desc: "Jeux Xbox"}
+    # Livre
+    - {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: 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: 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: 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: 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: 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"}
+
+  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: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: multilang
+    type: checkbox
+    label: Replace MULTi by another language in release name
+    default: false
+  - name: multilanguage
+    type: select
+    label: Replace MULTi by this language
+    default: FRENCH
+    options:
+      FRENCH: FRENCH
+      MULTi FRENCH: MULTi FRENCH
+      ENGLISH: ENGLISH
+      MULTi ENGLISH: MULTi ENGLISH
+      VOSTFR: VOSTFR
+      MULTi VOSTFR: MULTi VOSTFR
+  - name: vostfr
+    type: checkbox
+    label: Replace VOSTFR and SUBFRENCH with ENGLISH
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: id
+    options:
+      id: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
+  test:
+    path: torrents-search.php
+    selector: a[href="account-logout.php"]
+
+download:
+  before:
+    path: thanks.php
+    inputs:
+      id: "{{ .DownloadUri.Query.id }}"
+      to: give
+      torrent: "{{ .DownloadUri.Query.id }}"
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
+
+search:
+  paths:
+    # https://www.crazyspirits.com/torrents-search.php?search=&cat=0&incldead=1&freeleech=0&recommended=0&lang=0
+    - path: torrents-search.php
+  inputs:
+# 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 not recommended, 2 only recommended
+    recommended: 0
+    # 0 all, 1 french, 2 english, etc
+    lang: 0
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+    # imdb search not supported and imdb links not in results.
+
+  rows:
+    selector: table.border_table > tbody > tr.t-row
+
+  fields:
+    title_phase0:
+      # title can be abbreviated
+      selector: a[href^="torrents-details.php?id="] b
+    title_phase1:
+      # if available, the youtube link has a full title
+      selector: a[rel="prettyPhoto"] img
+      attribute: alt
+      optional: true
+      filters:
+        - name: replace
+          args: ["-NoTag", ""]
+    title_phase2:
+      text: "{{ if .Result.title_phase1 }}{{ .Result.title_phase1 }}{{ else }}{{ .Result.title_phase0 }}{{ end }}"
+    title_vostfr:
+      text: "{{ .Result.title_phase2 }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)\\b(vostfr|subfrench)\\b", "ENGLISH"]
+    title_phase3:
+      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
+    title_multilang:
+      text: "{{ .Result.title_phase3 }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)\\b(MULTI(?!.*(?:FRENCH|ENGLISH|VOSTFR)))\\b", "{{ .Config.multilanguage }}"]
+    title:
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase3 }}{{ end }}"
+    category:
+      selector: a[href^="torrents.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    details:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: href
+    poster:
+      selector: a[onmouseover][href^="torrents-details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "src=(.*?)><"
+    grabs:
+      selector: a[onmouseover][href^="torrents-details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "Completé : </b>(\\d+)<"
+    seeders:
+      selector: a[onmouseover][href^="torrents-details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "=greene>(\\d+)<"
+    leechers:
+      selector: a[onmouseover][href^="torrents-details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "=red>(\\d+)<"
+    size:
+      selector: a[onmouseover][href^="torrents-details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "Taille : </b>(.*?)<br"
+    date:
+      selector: a[onmouseover][href^="torrents-details.php?id="]
+      attribute: onmouseover
+      # auto adjusted by site account profile
+      filters:
+        - name: regexp
+          args: "Partagé Voilà : </b>(.*?)<br"
+        - name: dateparse
+          args: "MM-dd-yyyy"
+    downloadvolumefactor:
+      case:
+        img[src="images/Torrents/free.png"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 2 day (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# TT3.1

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:
@@ -117,8 +115,12 @@ search:
       filters:
         - 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_tags:
+      selector: div.tags
     description:
-      text: "{{ .Result.genre }}"
+      case:
+        span.icon_okay: "Verified: {{ .Result.description_tags }}"
+        "*": "Unverified: {{ .Result.description_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/dark-shadow.yml

@@ -14,15 +14,15 @@ legacylinks:
 caps:
   categorymappings:
     # Movie
-    - {id: 28, cat: Movies/SD, desc: "Filme SD"}
     - {id: 32, cat: Movies/HD, desc: "Filme HD"}
     - {id: 114, cat: Movies/UHD, desc: "Filme UHD"}
     - {id: 140, cat: Movies/BluRay, desc: "Filme BluRay"}
+    - {id: 28, cat: Movies/SD, desc: "Filme SD"}
     - {id: 138, cat: Movies, desc: "Filme Pack`s"}
     # Serien
-    - {id: 60, cat: TV/SD, desc: "Serien SD"}
     - {id: 57, cat: TV/HD, desc: "Serien HD"}
     - {id: 139, cat: TV/UHD, desc: "Serien UHD"}
+    - {id: 60, cat: TV/SD, desc: "Serien SD"}
     - {id: 59, cat: TV, desc: "Serien Pack`s"}
     # Audio
     - {id: 110, cat: Audio/MP3, desc: "Audio MP3"}
@@ -36,31 +36,31 @@ caps:
     - {id: 11, cat: PC/Mobile-Other, desc: "Apps Mobil"}
     - {id: 141, cat: PC/ISO, desc: "Apps Other"}
     # Doku
-    - {id: 15, cat: TV/Documentary, desc: "Doku SD"}
     - {id: 14, cat: TV/Documentary, desc: "Doku HD"}
-    - {id: 123, cat: TV/Documentary, desc: "Doku Reihe"}
+    - {id: 15, cat: TV/Documentary, desc: "Doku SD"}
+    - {id: 123, cat: TV/Documentary, desc: "Doku Pack`s"}
     # Spiel
-    - {id: 126, cat: Console/Other, desc: "Spiel Mobil"}
     - {id: 17, cat: PC/Games, desc: "Spiel PC"}
     - {id: 24, cat: Console, desc: "Spiel Konsole"}
+    - {id: 126, cat: Console/Other, desc: "Spiel Mobil"}
     - {id: 121, cat: Console, desc: "Spiel Wimmelbild"}
     # Sport
     - {id: 61, cat: TV/Sport, desc: "Sport HD"}
     - {id: 62, cat: TV/Sport, desc: "Sport SD"}
+    - {id: 144, cat: TV/Sport, desc: "Sport Wrestling"}
     # ePaper
     - {id: 96, cat: Books/Mags, desc: "ePaper Zeitungen"}
     - {id: 136, cat: Books/EBook, desc: "ePaper E-Book"}
     - {id: 137, cat: Books/Comics, desc: "ePaper Comics"}
     # XXX
-    - {id: 76, cat: XXX/XviD, desc: "XXX SD"}
-    - {id: 73, cat: XXX/x264, desc: "XXX HD"}
-    - {id: 75, cat: XXX/Pack, desc: "XXX Pack"}
-    - {id: 142, cat: XXX/ImageSet, desc: "XXX Pic´s"}
+    - {id: 143, cat: XXX/x264, desc: "XXX HD / SD"}
+    - {id: 75, cat: XXX/Pack, desc: "XXX Pack's"}
+    - {id: 142, cat: XXX/ImageSet, desc: "XXX Pic's"}
     #  Internal
-    - {id: 129, cat: Movies/SD, desc: "Internal Film SD"}
     - {id: 128, cat: Movies/HD, desc: "Internal Film HD"}
-    - {id: 131, cat: TV/SD, desc: "Internal Serie SD"}
+    - {id: 129, cat: Movies/SD, desc: "Internal Film SD"}
     - {id: 130, cat: TV/HD, desc: "Internal Serien HD"}
+    - {id: 131, cat: TV/SD, desc: "Internal Serie SD"}
     - {id: 132, cat: Other, desc: "Internal Sonstiges"}
 
   modes:

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/demonoid.yml

@@ -9,15 +9,13 @@ links:
   - https://www.demonoid.is/
   - https://www.dnoid.to/
   - https://www.dnoid.pw/
-  - https://demonoid.unblockit.zip/
+  - https://demonoid.unblockit.ing/
   - https://demonoid.torrentbay.net/
   - https://demonoid.mrunblock.bond/
   - https://demonoid.nocensor.cloud/
 legacylinks:
   - https://demonoid.nocensor.biz/
   - https://demonoid.nocensor.sbs/
-  - https://demonoid.unblockit.ist/
-  - https://demonoid.unblockit.bet/
   - https://demonoid.unblockit.cat/
   - https://demonoid.unblockit.nz/
   - https://demonoid.nocensor.world/
@@ -43,6 +41,8 @@ legacylinks:
   - https://demonoid.nocensor.click/
   - https://demonoid.unblockit.vegas/
   - https://demonoid.unblockit.esq/
+  - https://demonoid.unblockit.zip/
+  - https://demonoid.unblockit.foo/
 
 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

@@ -1,56 +1,93 @@
 ---
 id: diablotorrent
 name: Diablo Torrent
-description: " Diablo Torrent is a Hungarian Private site for TV / MOVIES / GENERAL"
+description: "Diablo Torrent is a Hungarian Private site for TV / MOVIES / GENERAL"
 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
@@ -121,11 +162,18 @@ search:
     imdbid:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
-    description:
+    description_text:
       selector: div.torrent_row_magyarcim
       remove: span.torrent_row_new
+    description:
+      case:
+        img[src="/pic/browse/yes.png"]: "Verified: {{ .Result.description_text}}"
+        "*": "Unverified: {{ .Result.description_text}}"
     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

@@ -128,6 +128,8 @@ search:
 
   rows:
     selector: $
+    filters:
+      - name: andmatch
 
   fields:
     category:
@@ -137,9 +139,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 +152,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

@@ -173,7 +173,7 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
-    _cat:
+    category_title:
       selector: a[href^="?cat="] > img
       attribute: title
     description:
@@ -181,7 +181,7 @@ search:
       remove: a, img
       filters:
         - name: prepend
-          args: "cat={{ .Result._cat }} - "
+          args: "cat={{ .Result.category_title }} - "
     minimumratio:
       text: 0.9
-# NexusPHP v1.8.6 2023-08-18
+# NexusPHP v1.8.8 2023-09-25

src/Jackett.Common/Definitions/divteam.yml

@@ -45,6 +45,7 @@ caps:
     - {id: 49, cat: Books/Technical, desc: "eLearning"}
     - {id: 68, cat: Books/Technical, desc: "eLearning Multimedia"}
     - {id: 87, cat: Audio/Audiobook, desc: "Audiolibros"}
+    - {id: 0, cat: Other, desc: "Otros"} # results can have a category of 0, but searching by category 0 returns all results
 
   modes:
     search: [q]

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/empornium.yml

@@ -106,16 +106,18 @@ search:
     taglist: ""
 
   rows:
-    # exclude redbar torrents
-    selector: table#torrent_table > tbody > tr[class^="torrent row"]
+    selector: table#torrent_table > tbody > tr[class^="torrent row"]:has(a[href*="action=download"])
 
   fields:
     download:
       selector: a[href^="/torrents.php?action=download&id="]
       attribute: href
-    description:
-      optional: true
+    description_tags:
       selector: div.tags
+    description:
+      case:
+        span.icon_okay: "Verified: {{ .Result.description_tags }}"
+        "*": "Unverified: {{ .Result.description_tags }}"
     title:
       selector: a[href^="/torrents.php?id="]
     category:
@@ -159,7 +161,10 @@ search:
         "img[alt=\"Freeleech\"]": 0
         "*": 1
     uploadvolumefactor:
-      text: 1
+      case:
+        span.icon[title*="DoubleSeed"]: 2
+        "img[alt=\"DoubleSeed\"]": 2
+        "*": 1
     minimumratio:
       text: 0.5
 # Luminance

src/Jackett.Common/Definitions/empornium2fa.yml

@@ -101,16 +101,18 @@ search:
     taglist: ""
 
   rows:
-    # exclude redbar torrents
-    selector: table#torrent_table > tbody > tr[class^="torrent row"]
+    selector: table#torrent_table > tbody > tr[class^="torrent row"]:has(a[href*="action=download"])
 
   fields:
     download:
       selector: a[href^="/torrents.php?action=download&id="]
       attribute: href
-    description:
-      optional: true
+    description_tags:
       selector: div.tags
+    description:
+      case:
+        span.icon_okay: "Verified: {{ .Result.description_tags }}"
+        "*": "Unverified: {{ .Result.description_tags }}"
     title:
       selector: a[href^="/torrents.php?id="]
     category:
@@ -154,7 +156,10 @@ search:
         "img[alt=\"Freeleech\"]": 0
         "*": 1
     uploadvolumefactor:
-      text: 1
+      case:
+        span.icon[title*="DoubleSeed"]: 2
+        "img[alt=\"DoubleSeed\"]": 2
+        "*": 1
     minimumratio:
       text: 0.5
 # Luminance

src/Jackett.Common/Definitions/enthralled.yml

@@ -0,0 +1,140 @@
+---
+id: enthralled
+name: Enthralled
+description: "Enthralled is a Private Torrent Tracker for FETISH 3X"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://www.enthralled.me/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: XXX, desc: "FemDom"}
+    - {id: 2, cat: XXX, desc: "LezDom"}
+    - {id: 4, cat: XXX, desc: "POV"}
+    - {id: 5, cat: XXX, desc: "Scat"}
+    - {id: 3, cat: XXX, desc: "TransDom"}
+
+  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: 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>Torrents per page:</b> setting to <b>100</b> on your account profile.
+
+login:
+  path: login
+  method: form
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    cinfo: "2550|1350|24|-60"
+    keeploggedin: 1
+  error:
+    - selector: div.error
+  test:
+    path: index.php
+    selector: "#nav_userinfo"
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
+    title: "{{ .Keywords }}"
+    order_by: "{{ .Config.sort }}"
+    order_way: "{{ .Config.type }}"
+    action: advanced
+    filter_freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+
+  rows:
+    selector: table#torrent_table > tbody > tr[class^="torrent row"]:has(a[href*="action=download"])
+
+  fields:
+    category:
+      selector: a[href*="filter_cat"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: "(\\d+)]=1"
+    title:
+      selector: a[href^="/torrents.php?id="]
+    details:
+      selector: a[href^="/torrents.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="/torrents.php?action=download&id="]
+      attribute: href
+    description_tags:
+      selector: div.tags
+    description:
+      case:
+        span.icon_okay: "Verified: {{ .Result.description_tags }}"
+        "*": "Unverified: {{ .Result.description_tags }}"
+    poster:
+      selector: td:nth-child(2) > script
+      filters:
+        - name: regexp
+          args: "src=\\\\\"(.*?)\\\\\""
+        - name: re_replace
+          args: ["\\\\(.)", "$1"]
+        - name: replace
+          args: ["/static/common/noartwork/noimage.png", ""]
+    files:
+      selector: td:nth-child(3)
+    date:
+      selector: td:nth-child(5) > span
+      attribute: title
+      # auto adjusted by site account profile
+      filters:
+        - name: dateparse
+          args: "MMM dd yyyy, HH:mm"
+    size:
+      selector: td:nth-child(6)
+    grabs:
+      selector: td:nth-child(7)
+    seeders:
+      selector: td:nth-child(8)
+    leechers:
+      selector: td:nth-child(9)
+    downloadvolumefactor:
+      case:
+        span.icon[title*="Freeleech"]: 0
+        "img[alt=\"Freeleech\"]": 0
+        "*": 1
+    uploadvolumefactor:
+      case:
+        span.icon[title*="DoubleSeed"]: 2
+        "img[alt=\"DoubleSeed\"]": 2
+        "*": 1
+    minimumratio:
+      text: 0.5
+# Luminance

src/Jackett.Common/Definitions/enthralled2fa.yml

@@ -0,0 +1,135 @@
+---
+id: enthralled2fa
+name: Enthralled2FA
+description: "Enthralled is a Private Torrent Tracker for FETISH 3X.  Cookie Login for 2FA use."
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://www.enthralled.me/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: XXX, desc: "FemDom"}
+    - {id: 2, cat: XXX, desc: "LezDom"}
+    - {id: 4, cat: XXX, desc: "POV"}
+    - {id: 5, cat: XXX, desc: "Scat"}
+    - {id: 3, cat: XXX, desc: "TransDom"}
+
+  modes:
+    search: [q]
+
+settings:
+  - name: cookie
+    type: text
+    label: Cookie
+  - name: info_cookie
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - 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>Torrents per page:</b> setting to <b>100</b> on your account profile.
+
+login:
+  method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
+  test:
+    path: index.php
+    selector: "#nav_userinfo"
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
+    title: "{{ .Keywords }}"
+    order_by: "{{ .Config.sort }}"
+    order_way: "{{ .Config.type }}"
+    action: advanced
+    filter_freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+
+  rows:
+    selector: table#torrent_table > tbody > tr[class^="torrent row"]:has(a[href*="action=download"])
+
+  fields:
+    category:
+      selector: a[href*="filter_cat"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: "(\\d+)]=1"
+    title:
+      selector: a[href^="/torrents.php?id="]
+    details:
+      selector: a[href^="/torrents.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="/torrents.php?action=download&id="]
+      attribute: href
+    description_tags:
+      selector: div.tags
+    description:
+      case:
+        span.icon_okay: "Verified: {{ .Result.description_tags }}"
+        "*": "Unverified: {{ .Result.description_tags }}"
+    poster:
+      selector: td:nth-child(2) > script
+      filters:
+        - name: regexp
+          args: "src=\\\\\"(.*?)\\\\\""
+        - name: re_replace
+          args: ["\\\\(.)", "$1"]
+        - name: replace
+          args: ["/static/common/noartwork/noimage.png", ""]
+    files:
+      selector: td:nth-child(3)
+    date:
+      selector: td:nth-child(5) > span
+      attribute: title
+      # auto adjusted by site account profile
+      filters:
+        - name: dateparse
+          args: "MMM dd yyyy, HH:mm"
+    size:
+      selector: td:nth-child(6)
+    grabs:
+      selector: td:nth-child(7)
+    seeders:
+      selector: td:nth-child(8)
+    leechers:
+      selector: td:nth-child(9)
+    downloadvolumefactor:
+      case:
+        span.icon[title*="Freeleech"]: 0
+        "img[alt=\"Freeleech\"]": 0
+        "*": 1
+    uploadvolumefactor:
+      case:
+        span.icon[title*="DoubleSeed"]: 2
+        "img[alt=\"DoubleSeed\"]": 2
+        "*": 1
+    minimumratio:
+      text: 0.5
+# Luminance

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
@@ -160,7 +160,9 @@ search:
         - name: regexp
           args: "\\((.+?)\\)"
     description:
-      text: "{{ .Result.genre }}"
+      case:
+        img[src="pic/yes.png"]: "Verified: {{ .Result.genre }}"
+        img[src="pic/nincs.png"]: "Unverified: {{ .Result.genre }}"
     minimumratio:
       text: 1.0
     minimumseedtime:

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

@@ -7,15 +7,13 @@ type: public
 encoding: UTF-8
 links:
   - https://extratorrent.st/
-  - https://extratorrent.unblockit.zip/
+  - https://extratorrent.unblockit.ing/
   - https://extratorrent.mrunblock.bond/
   - https://extratorrent.nocensor.cloud/
 legacylinks:
   - https://extratorrent.nocensor.work/
   - https://extratorrent.nocensor.biz/
   - https://extratorrent.nocensor.sbs/
-  - https://extratorrent.unblockit.ist/
-  - https://extratorrent.unblockit.bet/
   - https://extratorrent.unblockit.cat/
   - https://extratorrent.unblockit.nz/
   - https://extratorrent.nocensor.world/
@@ -35,6 +33,8 @@ legacylinks:
   - https://extratorrent.nocensor.click/
   - https://extratorrent.unblockit.vegas/
   - https://extratorrent.unblockit.esq/
+  - https://extratorrent.unblockit.zip/
+  - https://extratorrent.unblockit.foo/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/extremebits.yml

@@ -135,14 +135,14 @@ search:
     size:
       selector: td:nth-of-type(10)
       remove: a
-    _cat:
+    category_title:
       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="
+          args: "cat={{ .Result.category_title }}, wait="
     downloadvolumefactor:
       case:
         img[src="img/freedownload.png"]: 0

src/Jackett.Common/Definitions/eztv.yml

@@ -6,13 +6,13 @@ language: en-US
 type: public
 encoding: UTF-8
 links:
-  - https://eztv.re/
+  - https://eztvx.to/
   - https://eztv.wf/
   - https://eztv.tf/
   - https://eztv.yt/
   - https://eztv1.xyz/
+  - https://eztv.unblockit.ing/
   - https://eztv.unblockninja.com/
-  - https://eztv.unblockit.zip/
   - https://eztv.mrunblock.bond/
   - https://eztv.nocensor.cloud/
 legacylinks:
@@ -22,8 +22,6 @@ legacylinks:
   - https://eztv.io/
   - https://eztv.nocensor.biz/
   - https://eztv.nocensor.sbs/
-  - https://eztv.unblockit.ist/
-  - https://eztv.unblockit.bet/
   - https://eztv.unblockit.cat/
   - https://eztv.unblockit.nz/
   - https://eztv.nocensor.world/
@@ -43,6 +41,10 @@ legacylinks:
   - https://eztv.nocensor.click/
   - https://eztv.unblockit.vegas/
   - https://eztv.unblockit.esq/
+  - https://eztv.unblockit.zip/
+  - https://eztv.re/
+  - https://eztv.li/
+  - https://eztv.unblockit.foo/
 
 caps:
   categories:
@@ -56,7 +58,7 @@ settings: []
 
 search:
   paths:
-    - path: "{{ if .Keywords }}search/{{ .Keywords }}{{ else }}{{ end }}"
+    - path: "{{ if .Keywords }}search/{{ .Keywords }}{{ else }}home{{ end }}"
 
   keywordsfilters:
     - name: re_replace
@@ -70,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/fearnopeer.yml

@@ -1,34 +1,30 @@
 ---
-id: animetracker
-name: AnimeTracker (API)
-description: "AnimeTracker is a Private Torrent Tracker for HD ANIME / MANGA / HENTAI"
+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://animetracker.cc/
+  - https://fearnopeer.com/
 
 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: 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]
-    book-search: [q]
 
 settings:
   - name: apikey
@@ -37,7 +33,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://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
@@ -87,7 +83,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
@@ -127,6 +123,8 @@ search:
       filters:
         - name: re_replace
           args: ["(?i)(Science Fiction)", "Science_Fiction"]
+        - name: re_replace
+          args: ["(?i)(TV Movie)", "TV_Movie"]
         - name: replace
           args: [" & ", "_&_"]
     description:
@@ -160,15 +158,12 @@ search:
         100%: 0 # freeleech
         "*": 0 # catch errors
     uploadvolumefactor:
-      # api returns 0=false, 1=true
+      # api returns False, True
       selector: double_upload
       case:
-        0: 1 # normal
-        1: 2 # double
-# 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)
-      text: 432000
-# json UNIT3D 6.4.0
+        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.1.2

src/Jackett.Common/Definitions/femdomcult.yml

@@ -90,15 +90,18 @@ search:
     filter_freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
   rows:
-    # exclude redbar torrents
-    selector: table#torrent_table > tbody > tr[class^="torrent row"]
+    selector: table#torrent_table > tbody > tr[class^="torrent row"]:has(a[href*="action=download"])
 
   fields:
     download:
       selector: a[href^="torrents.php?action=download&id="]
       attribute: href
-    description:
+    description_tags:
       selector: div.tags
+    description:
+      case:
+        span.icon_okay: "Verified: {{ .Result.description_tags }}"
+        "*": "Unverified: {{ .Result.description_tags }}"
     title:
       selector: a[href^="torrents.php?id="]
     category:
@@ -143,7 +146,10 @@ search:
         "img[alt=\"Freeleech\"]": 0
         "*": 1
     uploadvolumefactor:
-      text: 1
+      case:
+        span.icon[title*="DoubleSeed"]: 2
+        "img[alt=\"DoubleSeed\"]": 2
+        "*": 1
     minimumratio:
       text: 0.5
     # MR is reduced but not removed if MST is met

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/freefarm.yml

@@ -201,7 +201,15 @@ search:
       case:
         img[title="H&R"]: 604800
         "*": 259200
+    description_verified:
+      case:
+        span[title="通过"], span[title="通過"], span[title="Allowed"]: "Verified:"
+        span[title="未审"], span[title="未審"], span[title="Not reviewed"]: "Unverified:"
+        span[title="拒绝"], span[title="拒絕"], span[title="Denied"]: "Banned:"
     description:
       selector: td:nth-child(2)
       remove: a, b, font, img, span
+      filters:
+        - name: prepend
+          args: "{{ .Result.description_verified }} "
 # NexusPHP v1.8.9 2023-09-29

src/Jackett.Common/Definitions/frozenlayer.yml

@@ -1,121 +0,0 @@
----
-id: frozenlayer
-name: Frozen Layer
-description: "Frozen Layer is a SPANISH Public torrent site focused on ANIME"
-language: es-ES
-type: public
-encoding: UTF-8
-requestDelay: 2
-links:
-  - https://www.frozen-layer.com/
-
-settings:
-  - name: category
-    type: select
-    label: Category
-    default: todos
-    options:
-      todos: todos
-      anime: anime
-      manga: manga
-      dorama: dorama
-      videojuego: videojuego
-      BSO: BSO
-      PV: PV
-      otros: otros
-  - name: info
-    type: info
-    label: Direct Downloads
-    default: This definition filters for search results that contain .torrent and magnet only. Results for Direct Download are not supported.
-
-caps:
-  categorymappings:
-    - {id: Anime, cat: TV/Anime, desc: "anime"}
-    - {id: Manga, cat: TV/Anime, desc: "manga"}
-    - {id: Dorama, cat: TV/Anime, desc: "dorama"}
-    - {id: Videojuego, cat: TV/Anime, desc: "videojuego"}
-    - {id: Bso, cat: TV/Anime, desc: "BSO"}
-    - {id: Pv, cat: TV/Anime, desc: "PV"}
-    - {id: Otros, cat: TV/Anime, desc: "otros"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-
-search:
-  paths:
-    - path: "{{ if .Keywords }}buscar/descargas/{{ .Config.category }}/{{ .Keywords }}?search=Buscar{{ else }}descargas{{ end }}"
-    - path: "{{ if .Keywords }}buscar/descargas/{{ .Config.category }}/{{ .Keywords }}?search=Buscar&{{ else }}descargas?{{ end }}page=2"
-  keywordsfilters:
-    - name: re_replace # remove first season from search string
-      args: ["(?i)(S1)", ""]
-    - name: re_replace # switch second season from search string
-      args: ["(?i)(S2)", "segunda temporada"]
-    - name: re_replace # switch third season from search string
-      args: ["(?i)(S3)", "tercera temporada"]
-    - name: re_replace # remove E from episode number from search string
-      args: ["(?i)E([0-9]+)", "$1"]
-
-  rows:
-    selector: table#descargas > tbody > tr:has(td:has(a[href^="magnet:?"]))
-
-  fields:
-    category:
-      text: "{{ if eq .Config.category \"todos\" }}Anime{{ else }}{{ .Config.category }}{{ end }}"
-    title:
-      selector: td.tit a
-      filters:
-        - name: re_replace
-          args: ["\\/|\\(|\\)", " "]
-        - name: re_replace
-          args: ["([A-z]*) temporada", ""]
-        - name: re_replace
-          args: ["(?i)Sprimera|Ssegunda|Stercera", ""]
-        - name: re_replace
-          args: ["S([0-9]+) - Episodio ([0-9]+)", "$2"]
-        - name: re_replace
-          args: ["- Episodio ([0-9]*)", "$1"]
-        - name: append
-          args: " Spanish"
-    details:
-      selector: td.tit a
-      attribute: href
-    download:
-      selector: td:nth-child(1) a[href$=".torrent"]
-      attribute: href
-    magnet:
-      selector: td:nth-child(1) a[href^="magnet:?"]
-      attribute: href
-    date_day:
-      # 1d
-      # 2d 3h
-      # 3 dias
-      # 3h 14m
-      optional: true
-      selector: td.fecha:not(:contains("Jan:")):not(:contains("Feb")):not(:contains("Mar:")):not(:contains("Apr")):not(:contains("May:")):not(:contains("Jun")):not(:contains("Jul:")):not(:contains("Aug")):not(:contains("Sep:")):not(:contains("Oct")):not(:contains("Nov:")):not(:contains("Dec"))
-      filters:
-        - name: replace
-          args: ["días", "days ago"]
-        - name: timeago
-    date_year:
-      # 29 Oct 17
-      optional: true
-      selector: td.fecha:not(:contains("d")):not(:contains("h")):not(:contains("m"))
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "dd MMM yy zzz"
-    date:
-      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
-    size:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/fsm.yml

@@ -0,0 +1,118 @@
+---
+id: fsm
+name: FSM
+description: "FSM is a CHINESE Private Torrent Tracker for 3X"
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - https://fsm.name/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: XXX, desc: "日本AV"}
+    - {id: 2, cat: XXX, desc: "国产视频"}
+    - {id: 3, cat: XXX/ImageSet, desc: "写真"}
+    - {id: 4, cat: XXX/Other, desc: "黄油"}
+    - {id: 5, cat: XXX, desc: "里番"}
+    - {id: 6, cat: XXX/Other, desc: "黄色漫画"}
+    - {id: 7, cat: XXX, desc: "欧美视频"}
+    - {id: 8, cat: XXX, desc: "其他"}
+
+  modes:
+    search: [q]
+
+settings:
+  - name: apitoken
+    type: text
+    label: API Token
+  - name: info_token
+    type: info
+    label: About your API Token
+    default: "Request a new API Token in the <a href=\"https://fsm.name/Forums/details?tid=296\" target=\"_blank\">FSM Forum</a> and checking your <a href=\"https://fsm.name/Mail\" target=\"_blank\">Mail</a> after."
+  - name: passkey
+    type: text
+    label: Passkey
+  - name: info_passkey
+    type: info
+    label: About your Passkey
+    default: "Find your Passkey by accessing the <a href=\"https://fsm.name/Rss\" target=\"_blank\">FSM RSS</a> page."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+
+login:
+  path: https://api.fsm.name/Torrents/listTorrents
+  method: get
+
+search:
+  paths:
+    - path: https://api.fsm.name/Torrents/listTorrents
+      response:
+        type: json
+
+  headers:
+    APITOKEN: ["{{ .Config.apitoken }}"]
+
+  inputs:
+    type: 0
+    keyword: "{{ .Keywords }}"
+    # 0 all, 1 2xfree, 2 free
+    systematics: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+
+  rows:
+    selector: data.list
+
+  fields:
+    category:
+      selector: type.id
+    title:
+      selector: title
+    _id:
+      selector: tid
+    details:
+      text: "{{ .Config.sitelink }}Torrents/details?tid={{ .Result._id }}"
+    download:
+      text: "/Torrents/download?tid={{ .Result._id }}&passkey={{ .Config.passkey }}"
+    infohash:
+      selector: fileHash
+    poster:
+      selector: cover
+    genre:
+      selector: tags
+    description:
+      text: "{{ .Result.genre }}"
+    files:
+      selector: fileCount
+    seeders:
+      selector: peers.upload
+    leechers:
+      selector: peers.download
+    grabs:
+      selector: finish
+    date:
+      selector: createdAt
+      filters:
+        - name: replace
+          args: ["年", "years"]
+        - name: replace
+          args: ["月", "months"]
+        - name: replace
+          args: ["天", "days"]
+        - name: re_replace
+          args: ["小?时", "hours"]
+        - name: replace
+          args: ["分", "minutes"]
+        - name: replace
+          args: ["前", " ago"]
+        - name: timeago
+    size:
+      selector: fileSize
+    downloadvolumefactor:
+      selector: status.downCoefficient
+    uploadvolumefactor:
+      selector: status.upCoefficient
+    minimumratio:
+      text: 1.0
+# json TNode

src/Jackett.Common/Definitions/fusionmayhem.yml

@@ -1,158 +0,0 @@
----
-id: fusionmayhem
-name: FusionMayhem
-description: "FusionMayhem is a Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://fusionmayhem.net/
-
-caps:
-  categorymappings:
-    - {id: 3, cat: PC, desc: "Apps"}
-    - {id: 19, cat: Books, desc: "EBooks"}
-    - {id: 32, cat: Console, desc: "Games"}
-    - {id: 36, cat: Console/NDS, desc: "Nintendo"}
-    - {id: 33, cat: PC/Games, desc: "PC Games"}
-    - {id: 34, cat: Console/PS4, desc: "Playstation"}
-    - {id: 35, cat: Console/XBox, desc: "Xbox"}
-    - {id: 5, cat: Movies, desc: "Movies"}
-    - {id: 9, cat: Movies/UHD, desc: "Movies 4K"}
-    - {id: 6, cat: Movies/BluRay, desc: "Movies Bluray"}
-    - {id: 7, cat: Movies/DVD, desc: "Movies DVDR"}
-    - {id: 11, cat: Movies/Foreign, desc: "Movies Non-English"}
-    - {id: 13, cat: Movies, desc: "Movies Packs"}
-    - {id: 8, cat: Movies/WEB-DL, desc: "Movies WEB-DL/Webrip"}
-    - {id: 10, cat: Movies/SD, desc: "Movies XVID"}
-    - {id: 20, cat: Audio, desc: "Music"}
-    - {id: 21, cat: Audio, desc: "Music DMC"}
-    - {id: 26, cat: Audio/Lossless, desc: "Music Flac"}
-    - {id: 23, cat: Audio, desc: "Music Karaoke"}
-    - {id: 22, cat: Audio, desc: "Music MasterMix"}
-    - {id: 27, cat: Audio/MP3, desc: "Music MP3"}
-    - {id: 24, cat: Audio/MP3, desc: "Music mp3 weekly"}
-    - {id: 30, cat: Audio, desc: "Music Packs"}
-    - {id: 25, cat: Audio, desc: "Music Top 40/200 Albums/Singles"}
-    - {id: 21, cat: Audio/Video, desc: "Music Videos"}
-    - {id: 12, cat: TV, desc: "TV"}
-    - {id: 16, cat: TV/Foreign, desc: "TV Non--English"}
-    - {id: 17, cat: TV, desc: "TV Seasons"}
-    - {id: 18, cat: TV/Sport, desc: "TV Sports"}
-    - {id: 14, cat: TV/HD, desc: "TV x265"}
-    - {id: 15, cat: TV/SD, desc: "TV xvid"}
-    - {id: 37, cat: Other, desc: "VIP"}
-
-  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: 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>40</b> on your account profile.
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    logout: ""
-  error:
-    - selector: td:contains("You will now be redirected...")
-      message:
-        text: "Error: Its likely your Username or Password is incorrect"
-  test:
-    path: /
-    selector: a[href*="/logout.php"]
-
-search:
-  paths:
-    - path: browse.php
-  keywordsfilters:
-    # remove words <= 3 characters and surrounding special characters
-    - name: re_replace
-      args: ["(?:^|\\s)[_\\+\\/\\.\\-\\(\\)]*[\\S]{0,3}[_\\+\\/\\.\\-\\(\\)]*(?:\\s|$)", " "]
-  inputs:
-    do: search
-    keywords: "{{ .Keywords }}"
-    # t_name, t_description, t_both, t_uploader, t_genre
-    search_type: t_name
-    category: 0 # multi cat search not supported
-    # yes, no
-    include_dead_torrents: yes
-    # sort is done via do=quick_sort, and freeleech sorting is part of that set
-
-  rows:
-    selector: "table#sortabletable > tbody > tr:has(a[href*=\"/details.php?id=\"]){{ if .Config.freeleech }}:has(img[src$=\"freedownload.gif\"]){{ else }}{{ end }}"
-    filters:
-      - name: andmatch
-        args: 66
-
-  fields:
-    category:
-      selector: a[href*="/browse.php?category="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    title_default:
-      selector: a[href*="/details.php?id="]
-    title:
-      selector: div.tooltip-content > div
-      optional: true
-      default: "{{ .Result.title_default }}"
-    details:
-      selector: a[href*="/details.php?id="]
-      attribute: href
-    download:
-      selector: a[href*="/download.php?id="]
-      attribute: href
-    size:
-      selector: td:nth-child(5)
-    grabs:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
-    poster:
-      selector: div.tooltip-content > img
-      attribute: src
-    downloadvolumefactor:
-      case:
-        img[src$="freedownload.gif"]: 0
-        img[src$="silverdownload.gif"]: 0.5
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[src$="x2.gif"]: 2
-        "*": 1
-    date:
-      selector: "td:nth-child(2) > div:has(span[style=\"float: right;\"])"
-      remove: span
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "dd-MM-yyyy HH:mm zzz"
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 1 day (as seconds = 24 x 60 x 60)
-      text: 86400
-# TS Special Edition v.8.0

src/Jackett.Common/Definitions/gigatorrents.yml

@@ -151,6 +151,10 @@ search:
       selector: td:nth-child(7)
     files:
       selector: td:nth-child(4)
+    description:
+      case:
+        img[src="pic/staff/yes.png"]: Verified
+        "*": Unverified
     downloadvolumefactor:
       selector: td:nth-child(6) > span:nth-last-child(2)
       optional: true

src/Jackett.Common/Definitions/gktorrent.yml

@@ -8,14 +8,11 @@ encoding: UTF-8
 followredirect: true
 # to fetch current domain use https://www.protege-torrent.com/Gktorrent
 links:
-  - https://www.gktorrent.ac/
+  - https://www.gktorrent.fi/
   - 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/
   - https://www.gktorrent.net/
   - https://www.gktorrent.biz/
@@ -37,6 +34,9 @@ legacylinks:
   - https://gktorrent.mrunblock.life/ # cloudflare 403
   - https://gktorrent.nocensor.click/
   - https://www.gktorrents.cc/
+  - https://www.gktorrent.ac/
+  - https://www.gktorrent.ph/
+  - https://www.gktorrent.vc/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/glodls.yml

@@ -8,7 +8,7 @@ encoding: UTF-8
 links:
   - https://glodls.to/
   - https://www.gtdb.to/
-  - https://glotorrents.unblockit.zip/
+  - https://glotorrents.unblockit.ing/
   - https://glotorrents.mrunblock.bond/
   - https://glodls.unblockninja.com/
   - https://glotorrents.nocensor.cloud/
@@ -17,8 +17,6 @@ legacylinks:
   - https://gtdb.to/
   - https://glotorrents.nocensor.biz/
   - https://glotorrents.nocensor.sbs/
-  - https://glotorrents.unblockit.ist/
-  - https://glotorrents.unblockit.bet/
   - https://glotorrents.unblockit.cat/
   - https://glotorrents.unblockit.nz/
   - https://glotorrents.nocensor.world/
@@ -39,6 +37,8 @@ legacylinks:
   - https://gtdb.cc/
   - https://glotorrents.unblockit.vegas/
   - https://glotorrents.unblockit.esq/
+  - https://glotorrents.unblockit.zip/
+  - https://glotorrents.unblockit.foo/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/greekteam.yml

@@ -171,6 +171,10 @@ search:
       selector: td:has(a[href$="filelist=1"]) ~ td ~ td ~ td ~ td ~ td ~ td ~ td
       optional: true
       default: 0
+    description:
+      case:
+        img[src="pic/checked2.png"]: Verified
+        img[src="pic/notchecked.png"]: Unverified
     downloadvolumefactor:
       case:
         img[src="pic/free.png"]: 0

src/Jackett.Common/Definitions/haidan.yml

@@ -131,7 +131,6 @@ search:
       selector: a[href^="download.php?id="]
       attribute: href
     description:
-      optional: true
       selector: div.torrent_name_col > a
     poster:
       selector: img#poster

src/Jackett.Common/Definitions/happyfappy.yml

@@ -19,6 +19,7 @@ caps:
     - {id: 10, cat: XXX, desc: "Pics"}
     - {id: 1, cat: XXX, desc: "Pron"}
     - {id: 8, cat: XXX, desc: "Retro"}
+    - {id: 12, cat: XXX, desc: "Transsexual"}
     - {id: 7, cat: XXX, desc: "VR"}
 
   modes:
@@ -82,7 +83,7 @@ search:
     filter_freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
   rows:
-    selector: table#torrent_table > tbody > tr[class^="torrent row"]
+    selector: table#torrent_table > tbody > tr[class^="torrent row"]:has(a[href*="action=download"])
 
   fields:
     category:
@@ -99,9 +100,12 @@ search:
     download:
       selector: a[href^="torrents.php?action=download&id="]
       attribute: href
-    description:
-      optional: true
+    description_tags:
       selector: div.tags
+    description:
+      case:
+        span.icon_okay: "Verified: {{ .Result.description_tags }}"
+        "*": "Unverified: {{ .Result.description_tags }}"
     poster:
       selector: td:nth-child(2) > script
       filters:
@@ -134,7 +138,10 @@ search:
         "img[alt=\"Freeleech\"]": 0
         "*": 1
     uploadvolumefactor:
-      text: 1
+      case:
+        span.icon[title*="DoubleSeed"]: 2
+        "img[alt=\"DoubleSeed\"]": 2
+        "*": 1
     minimumratio:
       text: 0.5
     minimumseedtime:

src/Jackett.Common/Definitions/haresclub.yml

@@ -0,0 +1,195 @@
+---
+id: haresclub
+name: Hares Club
+description: "Hares Club (白兔俱乐部) is a CHINESE site that focuses on 4K media."
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - https://club.hares.top/
+
+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: 409, cat: Audio/Video, desc: "Concert | 演唱会"}
+    - {id: 416, cat: TV, desc: "Show LIVE | 现场LIVE"}
+    - {id: 415, cat: Other, desc: "Others | 其他"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
+    music-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: 2facode
+    type: text
+    label: 2FA code
+  - 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 Hares Club Web Site. Otherwise just leave it empty."
+  - 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: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
+  inputs:
+    secret: ""
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    two_step_code: "{{ .Config.2facode }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
+  error:
+    - selector: script:contains("'失败'")
+      message:
+        text: "图片代码无效！The Image code is invalid. Close the config and start again."
+    - selector: script:contains("'登录失败！'")
+      message:
+        text: "用户名或密码不正确！或者你还没有通过验证。The username or password is incorrect! Close the config and start again."
+  test:
+    path: index.php
+    selector: a[href*="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if .Query.DoubanID }}/{{ .Query.DoubanID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
+    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: "{{ if or .Query.IMDBID .Query.DoubanID }}1{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    notnewword: 1
+
+  rows:
+    selector: table.torrents > tbody > tr:has(a[href*="download.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: div.layui-torrents-Stills > a
+      attribute: rel
+      filters:
+        - name: replace
+          args: ["re.php?cache=", ""]
+    date_elapsed:
+      # time type: time elapsed (default)
+      selector: td:nth-last-child(6) > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    date_added:
+      # time added
+      selector: td:nth-last-child(6):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-ddHH:mm:ss zzz"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td:nth-last-child(5)
+    seeders:
+      selector: td:nth-last-child(4)
+    leechers:
+      selector: td:nth-last-child(3)
+    grabs:
+      selector: td:nth-last-child(2)
+    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
+    description_text:
+      selector: td:nth-child(2)
+      remove: a, b, font, img, span
+    description:
+      case:
+        i.fa-check: "Verified: {{ .Result.description_text }}"
+        i.fa-question: "Unverified: {{ .Result.description_text }}"
+        i.fa-times: "Banned: {{ .Result.description_text }}"
+# NexusPHP v1.6.2 2022-03-19

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

@@ -6,6 +6,8 @@ language: en-US
 type: private
 encoding: UTF-8
 links:
+  - https://hawke.uno/
+legacylinks:
   - https://www.hawke.uno/
 
 caps:
@@ -92,9 +94,9 @@ search:
       selector: name
       filters:
         - name: re_replace
-          args: ["\\(((?>[^()]+|(?<o>)\\(|(?<-o>)\\))*(?(o)(?!)))\\)$", "$1"]
+          args: ["\\(((?>[^()]+|(?<o>)\\(|(?<-o>)\\))*(?(o)(?!)))(?<!\\bHONE)(?<=\\s*- [\\w]+)\\)$", "$1"]
         - name: re_replace
-          args: ["- (\\w+)$", "-$1"]
+          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/hdatmos.yml

@@ -175,4 +175,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/hdcztorrent.yml

@@ -35,6 +35,8 @@ caps:
     - {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í"}

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/hdfans.yml

@@ -192,7 +192,15 @@ search:
         "*": 1
     minimumratio:
       text: 0.81
+    description_verified:
+      case:
+        span[title="通过"], span[title="通過"], span[title="Allowed"]: "Verified:"
+        span[title="未审"], span[title="未審"], span[title="Not reviewed"]: "Unverified:"
+        span[title="拒绝"], span[title="拒絕"], span[title="Denied"]: "Banned:"
     description:
       selector: td:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.8.4 2023-05-27
+      filters:
+        - name: prepend
+          args: "{{ .Result.description_verified }} "
+# NexusPHP v1.8.9 2023-11-15

src/Jackett.Common/Definitions/hdfun.yml

@@ -1,7 +1,7 @@
 ---
-id: hdzone
-name: HDZone
-description: "HDZone is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
+id: hdfun
+name: HDFun
+description: "HDFun (HDZone) is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
 language: zh-CN
 type: private
 encoding: UTF-8
@@ -69,13 +69,12 @@ caps:
     music-search: [q]
 
 settings:
-  - name: cookie
+  - name: username
     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>"
+    label: Username
+  - name: password
+    type: password
+    label: Password
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -102,9 +101,23 @@ settings:
     default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
 
 login:
-  method: cookie
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
   inputs:
-    cookie: "{{ .Config.cookie }}"
+    secret: ""
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
+  error:
+    - selector: td.embedded:has(h2:contains("失败"))
   test:
     path: torrents.php
     selector: a[href="logout.php"]

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

@@ -30,13 +30,19 @@ caps:
     music-search: [q]
 
 settings:
-  - name: cookie
+  - name: username
     type: text
-    label: Cookie
-  - name: info
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: 2facode
+    type: text
+    label: 2FA code
+  - name: info_2fa
     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>"
+    label: "About 2FA code"
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the HDMaYi Web Site. Otherwise just leave it empty."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -63,9 +69,24 @@ settings:
     default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
 
 login:
-  method: cookie
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
   inputs:
-    cookie: "{{ .Config.cookie }}"
+    secret: ""
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    two_step_code: "{{ .Config.2facode }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
+  error:
+    - selector: td.embedded:has(h2:contains("失败"))
   test:
     path: index.php
     selector: a[href="logout.php"]
@@ -170,7 +191,15 @@ search:
     minimumseedtime:
       # 1 day (as seconds = 24 x 60 x 60)
       text: 86400
+    description_verified:
+      case:
+        span[title="通过"], span[title="通過"], span[title="Allowed"]: "Verified:"
+        span[title="未审"], span[title="未審"], span[title="Not reviewed"]: "Unverified:"
+        span[title="拒绝"], span[title="拒絕"], span[title="Denied"]: "Banned:"
     description:
       selector: td.rowfollow:nth-child(2)
       remove: a, b, font, img, span
+      filters:
+        - name: prepend
+          args: "{{ .Result.description_verified }} "
 # NexusPHP v1.8.6 2023-08-18

src/Jackett.Common/Definitions/hdtorrentsit.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://hdtorrents.eu/\" target=\"_blank\">HDTorrents.it</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://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
@@ -163,10 +163,10 @@ 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
 # as a pay site there is no MR or MST
-# json UNIT3D 6.5.0
+# json UNIT3D 7.1.3

src/Jackett.Common/Definitions/hdvbits.yml

@@ -179,7 +179,15 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
+    description_verified:
+      case:
+        span[title="通过"], span[title="通過"], span[title="Allowed"]: "Verified:"
+        span[title="未审"], span[title="未審"], span[title="Not reviewed"]: "Unverified:"
+        span[title="拒绝"], span[title="拒絕"], span[title="Denied"]: "Banned:"
     description:
       selector: td:nth-child(2)
       remove: a, b, font, img, span
+      filters:
+        - name: prepend
+          args: "{{ .Result.description_verified }} "
 # NexusPHP v1.8.4 2023-06-18

src/Jackett.Common/Definitions/hdvideo.yml

@@ -179,7 +179,15 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
+    description_verified:
+      case:
+        span[title="通过"], span[title="通過"], span[title="Allowed"]: "Verified:"
+        span[title="未审"], span[title="未審"], span[title="Not reviewed"]: "Unverified:"
+        span[title="拒绝"], span[title="拒絕"], span[title="Denied"]: "Banned:"
     description:
       selector: td:nth-child(2)
       remove: a, b, font, img, span
+      filters:
+        - name: prepend
+          args: "{{ .Result.description_verified }} "
 # 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,16 @@ 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: input[name^="captcha"]
   inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    returnto: /
+    input[name="username"]: "{{ .Config.username }}"
+    input[name="password"]: "{{ .Config.password }}"
+  selectors: true
   error:
     - selector: td.embedded:contains("Access Denied")
   test:
@@ -181,6 +186,10 @@ search:
       selector: td:nth-last-child(4)
     leechers:
       selector: td:nth-last-child(3)
+    description:
+      case:
+        img[src="pic/tick.png"]: Verified
+        img[src="pic/unchecked.png"]: Unverified
     downloadvolumefactor:
       case:
         img[src="pic/freedownload.gif"]: 0

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/infire.yml

@@ -123,16 +123,22 @@ settings:
       ASC: asc
 
 login:
-  method: post
   path: login.php
+  method: form
+  form: form[action^="login.php"]
   inputs:
     uid: "{{ .Config.username }}"
     pwd: "{{ .Config.password }}"
+    login: "Prijavi se"
+  selectorinputs:
+    csrf_token:
+      selector: input[name="csrf_token"]
+      attribute: value
   error:
     - selector: font[color="#FF0000"]
   test:
     path: index.php
-    selector: a[href^="logout.php"]
+    selector: a[href="logout.php"]
 
 search:
   paths:

src/Jackett.Common/Definitions/insanetracker.yml

@@ -135,9 +135,6 @@ search:
       selector: td.center.data > a:first-child
     leechers:
       selector: td.center.data > a:nth-child(2)
-    grabs:
-      selector: td.center.data
-      remove: div.uploader, div.moderation, a.leftborder
     date:
       selector: td.center.date
       filters:
@@ -155,9 +152,17 @@ search:
         a[href^="?doubleup=three"]: 3
         a[href^="?doubleup=two"]: 2
         "*": 1
-    description:
+    description_text:
       selector: div.contenttext
+      optional: true
       remove: div.contenttitle
+    description:
+      case:
+        span.accepted: "Verified: {{ .Result.description_text }}"
+        span.notchecked: "Unverified: {{ .Result.description_text }}"
+    grabs:
+      selector: td.center.data
+      remove: div.uploader, div.moderation, a.leftborder
     minimumratio:
       text: 1.0
     minimumseedtime:

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/kinozal-magnet.yml

@@ -0,0 +1,312 @@
+---
+id: kinozal-magnet
+name: Kinozal (M)
+description: "Kinozal is a RUSSIAN Semi-Private Torrent Tracker for MOVIES / TV / MUSIC. This indexer uses magnet links."
+language: ru-RU
+type: semi-private
+encoding: windows-1251
+links:
+  - https://kinozal.tv/
+  - https://kinozal.guru/
+  - https://kinozal-guru.appspot.com/
+legacylinks:
+  - https://kinozal-tv.appspot.com/
+  - http://kinozal.tv/
+
+caps:
+  categorymappings:
+    # TV
+    - {id: 1001, cat: TV, desc: "All TV Shows"}
+    - {id: 45, cat: TV, desc: "Russian TV Series"}
+    - {id: 46, cat: TV, desc: "TV Series"}
+    # Movies
+    - {id: 1002, cat: Movies, desc: "All Movies"}
+    - {id: 8, cat: Movies, desc: "Movies - Comedy"}
+    - {id: 6, cat: Movies, desc: "Movies - Action / War"}
+    - {id: 15, cat: Movies, desc: "Movies - Thriller / Detective"}
+    - {id: 17, cat: Movies, desc: "Movies - Drama"}
+    - {id: 35, cat: Movies, desc: "Movies - Melodrama"}
+    - {id: 39, cat: Movies, desc: "Movies - Indian"}
+    - {id: 13, cat: Movies, desc: "Movies - Science Fiction"}
+    - {id: 14, cat: Movies, desc: "Movies - Fantasy"}
+    - {id: 24, cat: Movies, desc: "Movies - Horror / Mystery"}
+    - {id: 11, cat: Movies, desc: "Movies - Adventure"}
+    - {id: 10, cat: Movies, desc: "Movies - Russian Movies"}
+    - {id: 9, cat: Movies, desc: "Movies - Historical"}
+    - {id: 47, cat: Movies, desc: "Movies - Asian"}
+    - {id: 18, cat: Movies, desc: "Movies - Documentaries"}
+    - {id: 37, cat: Movies, desc: "Movies - Sport"}
+    - {id: 12, cat: Movies, desc: "Movies - Kids / Family"}
+    - {id: 7, cat: Movies, desc: "Movies - Classic"}
+    - {id: 48, cat: Movies, desc: "Movies - Concerts"}
+    - {id: 49, cat: Movies, desc: "Movies - Shows / TV Shows"}
+    - {id: 50, cat: Movies, desc: "Movies - TV Show Mir"}
+    - {id: 38, cat: Movies, desc: "Movies - Theatre, Opera, Ballet"}
+    - {id: 16, cat: Movies, desc: "Movies - Erotica"}
+    # Cartoons
+    - {id: 1003, cat: TV/Anime, desc: "All Cartoons/Anime"}
+    - {id: 21, cat: TV/Anime, desc: "Cartoons"}
+    - {id: 22, cat: TV/Anime, desc: "Cartoons - Russian"}
+    - {id: 20, cat: TV/Anime, desc: "Cartoons - Anime"}
+    # Music
+    - {id: 1004, cat: Audio, desc: "All Music"}
+    - {id: 3, cat: Audio, desc: "Music"}
+    - {id: 4, cat: Audio, desc: "Music - Russian"}
+    - {id: 5, cat: Audio, desc: "Music - Collections"}
+    - {id: 42, cat: Audio, desc: "Music - Classical"}
+    # Other
+    - {id: 1006, cat: TV/Other, desc: "Shows, Concerts, Sports"}
+    - {id: 2, cat: Audio/Audiobook, desc: "Other - AudioBooks"}
+    - {id: 1, cat: Audio/Video, desc: "Other - Music Video's"}
+    - {id: 23, cat: Console, desc: "Other - Games"}
+    - {id: 32, cat: PC, desc: "Other - Programs"}
+    - {id: 40, cat: Other, desc: "Other - Design / Graphics"}
+    - {id: 41, cat: Books, desc: "Other - Library"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+  allowrawsearch: true
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: info_sid
+    type: info
+    label: How to get your SID
+    default: "This is only needed when using *.appspot.com mirrors, otherwise just leave blank. Access the tracker's <i>Раздачи</i> page in browser, and in the address bar you will see something like <b>?sid=abC1de2F</b>. Those last 8 characters are your SID."
+  - name: sid
+    type: text
+    label: SID
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: striprussian
+    type: checkbox
+    label: Strip Russian Letters
+    default: true
+  - name: addrussian
+    type: checkbox
+    label: Add RUSSIAN to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
+    default: true
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 0
+    options:
+      0: created
+      1: seeders
+      3: size
+  - name: type
+    type: select
+    label: Order requested from site
+    default: 0
+    options:
+      0: desc
+      1: asc
+  - name: info_magnets
+    type: info
+    label: Magnets
+    default: "This tracker limits the number of torrents a user can download each day without paying. This indexer uses <b>magnet links</b> to bypass that limit, however this doesn't include the passkey, so any download/upload is not recorded. To download with torrents, use <b>Kinozal</b>."
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: div.bx1:has(div.red)
+      message:
+        selector: div.bx1 div.red
+  test:
+    path: my.php
+    selector: a[href*="logout.php?hash4u="]
+
+download:
+  before:
+    path: get_srv_details.php
+    inputs:
+      action: 2
+      id: "{{ .DownloadUri.Query.id }}"
+  infohash:
+    usebeforeresponse: true
+    hash:
+      selector: li:first-child
+      filters:
+        - name: regexp
+          args: ([A-F|a-f|0-9]{40})
+    title:
+      selector: div.b
+      filters:
+        - name: trim
+        - name: validfilename
+
+search:
+  paths:
+    # http://kinozal.tv/browse.php?s=lucifer+2017&g=0&c=0&v=0&d=0&w=0&t=0&f=0
+    - path: browse.php
+      # required for the appspot domain.
+      followredirect: true
+  keywordsfilters:
+#    - name: diacritics # 8686
+#      args: replace
+    - name: re_replace
+      args: ["[^a-zA-Zа-яА-Я0-9]+", " "]
+    - name: re_replace # S01 to 1
+      args: ["(?i)\\bS0*(\\d+)\\b", "$1"]
+    - name: re_replace # S01E01 to 1 1
+      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "$1 $2"]
+  inputs:
+    # multi cat is not supported. so defaulting to ALL
+    c: 0
+    s: "{{ .Keywords }}"
+    # where 0 title, 1 person, 2 genres, 3 regular expression
+    g: 0
+    # format 0 all
+    v: 0
+    # released 0 all
+    d: 0
+    # filter 0 all, 1 today, 2 yesterday, 3 in 3 days, 4 this week, 5 per month, 6-10 size rages, 11 gold, 12 silver
+    w: "{{ if .Config.freeleech }}11{{ else }}0{{ end }}"
+    t: "{{ .Config.sort }}"
+    f: "{{ .Config.type }}"
+    sid: "{{ if .Config.sid }}{{ .Config.sid }}{{ else }}{{ end }}"
+
+  rows:
+    selector: table > tbody > tr:has(td.bt)
+
+  fields:
+    title:
+      selector: td.nam a[href^="/details.php?"]
+      filters:
+        # normalize to SXXEYY format
+        - name: replace
+          args: ["Кураж-Бамбей", "kurazh"]
+        - name: replace
+          args: ["Кубик в Кубе", "Kubik"]
+        - name: replace
+          args: ["Кравец", "Kravec"]
+        - name: replace
+          args: ["Пифагор", "Pifagor"]
+        - name: replace
+          args: ["Невафильм", "Nevafilm"]
+        - name: replace
+          args: ["АП", "AVO"]
+        - name: replace
+          args: ["ЛО", "VO"]
+        - name: replace
+          args: ["ЛД", "DVO"]
+        - name: replace
+          args: ["ЛМ", "MVO"]
+        - name: replace
+          args: ["ПО", "VO"]
+        - name: replace
+          args: ["ПД", "DVO"]
+        - name: replace
+          args: ["ПМ", "MVO"]
+        - name: replace
+          args: ["ДБ", "DUB"]
+        - name: replace
+          args: ["СТ", "Sub"]
+        - name: re_replace
+          args: ["\\((\\d+-*\\d*)\\s+[Сс]езоны?:?\\s+(?:(\\d+-*\\d*)\\s+(?:[Сс]ери[ийя]|выпуски?(?:ов)?)(?:.*\\d+)?)?\\)(.*)\\s+((?:[12][0-9]{3}-?){1,})(.*)", "$3 - S$1E$2 - $4 $5"]
+        - name: re_replace
+          args: ["\\((?:(\\d+-*\\d*)\\s+(?:[Сс]ери[ийя]|выпуски?(?:ов)?)(?:.*\\d+)?)?\\)(.*)\\s+((?:[12][0-9]{3}-?){1,})(.*)", "$2 - E$1 - $3 $4"]
+        - name: re_replace
+          args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ ((?:[12][0-9]{3}-?){1,}))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$0{{ end }}"]
+        - name: replace
+          args: [" / ", " "]
+        - name: re_replace
+          args: ["^-\\s+", " "]
+        - name: re_replace
+          args: ["\\((\\d+[pi])\\)", "$1"]
+        - name: re_replace
+          args: ["(.*)(Blu-Ray\\s*(?:Disc|EUR|CEE)?)\\s*(\\d+[pi])", "$1 BR-DISK $3"]
+        - name: append
+          args: "{{ if .Config.addrussian }} - RUSSIAN{{ else }}{{ end }}"
+        - name: replace
+          args: ["-Rip", "Rip"]
+        - name: replace
+          args: ["WEB-DL", "WEBDL"]
+        - name: replace
+          args: ["WEBDLRip", "WEBDL"]
+        - name: replace
+          args: ["HDTVRip", "HDTV"]
+    details:
+      selector: td.nam a[href^="/details.php?"]
+      attribute: href
+    category:
+      selector: td.bt img
+      attribute: onclick
+      filters:
+        - name: re_replace
+          args: ["[^\\d+]", ""]
+    download:
+      selector: td.nam a[href^="/details.php?"]
+      attribute: href
+      filters:
+        - name: replace
+          args: ["details", "download"]
+    size:
+      selector: td:nth-child(4)
+      filters:
+        - name: replace
+          args: ["ТБ", "TB"]
+        - name: replace
+          args: ["ГБ", "GB"]
+        - name: replace
+          args: ["МБ", "MB"]
+        - name: replace
+          args: ["КБ", "KB"]
+    seeders:
+      selector: td:nth-child(5)
+    leechers:
+      selector: td:nth-child(6)
+    # dates come in four flavours:
+    date_day:
+      # now
+      # Today 09:10
+      # Yesterday 13:04
+      selector: td:nth-child(7):not(:contains("."))
+      # auto adjusted by site account profile
+      optional: true
+      filters:
+        - name: replace
+          args: [" в", ""]
+        - name: replace
+          args: ["сейчас", "now"]
+        - name: replace
+          args: ["сегодня", "Today"]
+        - name: replace
+          args: ["вчера", "Yesterday"]
+    date_year:
+      # 24.10.2017 at 23:44
+      selector: td:nth-child(7):contains(".")
+      # auto adjusted by site account profile
+      optional: true
+      filters:
+        - name: replace
+          args: [" в", ""]
+        - name: dateparse
+          args: "dd.MM.yyyy HH:mm"
+    date:
+      text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
+    downloadvolumefactor:
+      case:
+        a.r1: 0 # gold
+        a.r2: 0.5 # silver
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+# engine n/a

src/Jackett.Common/Definitions/kinozal.yml

@@ -1,7 +1,7 @@
 ---
 id: kinozal
 name: Kinozal
-description: "Kinozal is a RUSSIAN Semi-Private Torrent Tracker for MOVIES / TV / MUSIC"
+description: "Kinozal is a RUSSIAN Semi-Private Torrent Tracker for MOVIES / TV / MUSIC. This indexer uses torrents."
 language: ru-RU
 type: semi-private
 encoding: windows-1251
@@ -69,6 +69,7 @@ caps:
     movie-search: [q]
     music-search: [q]
     book-search: [q]
+  allowrawsearch: true
 
 settings:
   - name: username
@@ -111,6 +112,10 @@ settings:
     options:
       0: desc
       1: asc
+  - name: info_torrent
+    type: info
+    label: Torrents
+    default: "This tracker limits the number of torrents a user can download each day without paying. This indexer uses <b>torrent files</b> with the user's passkey, so any download/upload is recorded. If you receive errors when downloading torrent files, you may have reached this limit. To bypass the limit with magnet links, use <b>Kinozal (M)</b>."
 
 login:
   path: takelogin.php
@@ -126,25 +131,6 @@ login:
     path: my.php
     selector: a[href*="logout.php?hash4u="]
 
-download:
-  before:
-    path: get_srv_details.php
-    inputs:
-      action: 2
-      id: "{{ .DownloadUri.Query.id }}"
-  infohash:
-    usebeforeresponse: true
-    hash:
-      selector: li:first-child
-      filters:
-        - name: regexp
-          args: ([A-F|a-f|0-9]{40})
-    title:
-      selector: div.b
-      filters:
-        - name: trim
-        - name: validfilename
-
 search:
   paths:
     # http://kinozal.tv/browse.php?s=lucifer+2017&g=0&c=0&v=0&d=0&w=0&t=0&f=0

src/Jackett.Common/Definitions/korsar.yml

@@ -468,7 +468,7 @@ login:
   inputs:
     cookie: "{{ .Config.cookie }}"
   test:
-    path: index.php
+    path: /
     selector: a[href*="ucp.php?mode=logout"]
 
 search:
@@ -501,7 +501,7 @@ search:
 
   fields:
     category:
-      selector: a[href$=".html"]
+      selector: dt > a[href$=".html"]
       attribute: href
       filters:
         - name: regexp

src/Jackett.Common/Definitions/krazyzone.yml

@@ -175,7 +175,9 @@ search:
         - name: validate
           args: "Action, Adventure, Animation, Biography, Chat_Show, Comedy, Crime, Documentary, Drama, Family, Fantasy, Game_Show, History, Horror, Kids, Medical, Music, Mystery, Nature, News, Panel_Show, Reality, Romance, Science_Fiction, Science-Fiction, SciFi, Soap, Supernatural, Talk_Show, Thriller, War, Western"
     description:
-      text: "{{ .Result.genre }}"
+      case:
+        img[src="images/ro-eng-flag.png"]: "Verified: {{ .Result.genre }}"
+        "*": "Unverified: {{ .Result.genre }}"
     imdbid:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href