hawke-uno; add alternate domain .#14890

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

CONTRIBUTING.md

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

README.md

@@ -8,7 +8,7 @@
 
 _Our [![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60&style=flat-square)](https://discord.gg/J865QuA) server is no longer maintained. If you have a problem, request, or question then please open a new issue here._
 
-This project is a new fork and is recruiting development help.  If you are able to help out please [contact us](https://github.com/Jackett/Jackett/issues/8180).
+This project is a new fork and is recruiting development help.  If you can help out please [contact us](https://github.com/Jackett/Jackett/issues/8180).
 
 Please see our [troubleshooting and contributing guidelines](CONTRIBUTING.md) before submitting any issues or pull requests
 
@@ -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,7 +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
@@ -87,7 +85,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * MioBT
  * MixTapeTorrent
  * MoviesDVDR
- * MovieTorrent
  * MyPornClub
  * NextJAV
  * Newstudio
@@ -100,6 +97,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 +145,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * xxxAdultTorrent
  * XXXClub
  * xxxtor
- * xxxtorrents
  * YourBittorrent
  * YTS.ag
  * zetorrents
@@ -176,6 +173,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
@@ -215,6 +213,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * SkTorrent-org
  * themixingbowl (TMB)
  * Toloka.to
+ * TorrentMasters
  * Torrents-Local
  * TorrentDownload
  * TribalMixes
@@ -250,8 +249,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * AnimeBytes (AB)
  * AnimeTorrents (AnT)
  * AnimeTorrents.ro (Anime Torrents Romania)
- * AnimeTracker
  * AnimeWorld
+ * AniToons
  * Anthelion
  * Araba Fenice (Phoenix) [![(invite needed)][inviteneeded]](#)
  * ArabP2P
@@ -266,6 +265,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
@@ -275,6 +275,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Bithorlo (BHO)
  * BitHUmen [![(invite needed)][inviteneeded]](#)
  * Bit Of Valor
+ * BitPorn
  * BitSexy
  * Bitspyder
  * BitTorrentFiles
@@ -309,17 +310,16 @@ 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
  * DataScene (DS)
  * DesiTorrents
- * Diablo Torrent [![(invite needed)][inviteneeded]](#)
+ * Diablo Torrent
  * DICMusic
  * DigitalCore
  * DimeADozen (EzTorrent)
@@ -329,14 +329,12 @@ 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]](#)
  * 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
@@ -351,7 +349,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Free Farm (自由农场)
  * FunFile (FF)
  * FunkyTorrents (FT)
- * FusionMayhem
  * FutureTorrent [![(invite needed)][inviteneeded]](#)
  * Fuzer (FZ)
  * Gamera (駕瞑羅)
@@ -433,7 +430,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
@@ -441,6 +438,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)
@@ -511,7 +509,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Resurrect The Net
  * RetroFlix
  * RevolutionTT
- * Romanian Metal Torrents (RMT) [![(invite needed)][inviteneeded]](#)
+ * Romanian Metal Torrents (RMT)
  * Rousi
  * SceneHD [![(invite needed)][inviteneeded]](#)
  * SceneLinks (SL)
@@ -567,6 +565,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Tornado
  * Torrent Network (TN)
  * Torrent Sector Crew (TSC)
+ * Torrent Trader [![(invite needed)][inviteneeded]](#)
  * Torrent-Explosiv
  * Torrent-Syndikat [![(invite needed)][inviteneeded]](#)
  * TOrrent-tuRK (TORK)
@@ -575,14 +574,15 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TorrentBytes (TBy)
  * TorrentCCF (TCCF)
  * TorrentDay (TD)
+ * TorrentDD
  * Torrenteros (TTR)
- * TorrentHeaven [![(invite needed)][inviteneeded]](#)
+ * TorrentHeaven (German) [![(invite needed)][inviteneeded]](#)
+ * Torrent Heaven (Dutch)
  * TorrentHR [![(invite needed)][inviteneeded]](#)
  * Torrenting (TT)
  * Torrentland
  * TorrentLeech (TL)
  * TorrentLeech.pl
- * TorrentMasters
  * TorrentSeeds (TS)
  * TotallyKids (TK)
  * ToTheGlory (TTG) [![(invite needed)][inviteneeded]](#)
@@ -592,12 +592,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
+ * Universal-Torrents
  * UnleashTheCartoons
  * UnlimitZ
  * Upload.cx [![(invite needed)][inviteneeded]](#)
@@ -610,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
@@ -630,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.
@@ -721,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.
@@ -742,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`
@@ -833,11 +837,11 @@ location /jackett {
 ```
 
 ## Search Cache
-Jackett has an internal cache to increase search speed and to reduce the number of requests to the torrent sites.
+Jackett has an internal cache to increase search speed and reduce the number of requests to torrent sites.
 The default values should be good for most users. If you have problems, you can reduce the TTL value in the
 configuration or even disable the cache. Keep in mind that you can be banned by the sites if you make a lot of requests.
 * **Cache TTL (seconds)**: (default 2100 / 35 minutes) It indicates how long the results can remain in the cache.
-* **Cache max results per indexer**: (default 1000) How many results are kept in cache for each indexer. This limit is used to limit the use of RAM. If you make many requests and you have enough memory, increase this number.
+* **Cache max results per indexer**: (default 1000) How many results are kept in the cache for each indexer? This limit is used to limit the use of RAM. If you make many requests and you have enough memory, increase this number.
 
 ## Torznab cache
 If you have enabled the Jackett internal cache, but have an indexer for which you would prefer to fetch fresh results (thus ignoring the internal cache) then add the **&cache=false** parameter to your torznab query.
@@ -887,9 +891,9 @@ To use it, please just request a free API key on [OMDb](http://www.omdbapi.com/a
     - e.g. --DataFolder="D:\Your Data\Jackett\".
     - Don't use this on Unix (mono) systems. On Unix just adjust the HOME directory of the user to the data folder or set the XDG_CONFIG_HOME environment variable.
 
--   `--NoRestart`              Don't restart after update
+-   `--NoRestart`              Don't restart after the update
 
--   `--PIDFile`                Specify the location of PID file
+-   `--PIDFile`                Specify the location of the PID file
 
 -   `--NoUpdates`              Disable automatic updates
 
@@ -901,16 +905,7 @@ To use it, please just request a free API key on [OMDb](http://www.omdbapi.com/a
 ## Building from source
 
 ### Windows
-* Install the .NET 6 [SDK](https://www.microsoft.com/net/download/windows)
-* Clone Jackett
-* Open PowerShell and from the `src` directory:
-* - run `dotnet msbuild /restore`
-* - then run `dotnet restore`
-* - and run `dotnet build`
-* Open the Jackett solution in Visual Studio 2019 (version 16.9 or above)
-* Select **Jackett.Server** as the startup project
-* In the drop-down menu of the run button select **Jackett.Server** instead of _IIS Express_
-* Build/Start the project
+[See our contributing guide.](https://github.com/Jackett/Jackett/blob/master/CONTRIBUTING.md#contributing-code)
 
 ### OSX
 

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

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

src/Jackett.Common/Definitions/acidlounge.yml

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

src/Jackett.Common/Definitions/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

@@ -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://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
@@ -165,4 +165,4 @@ search:
     minimumseedtime:
       # 5 days (as seconds = 3 x 24 x 60 x 60)
       text: 432000
-# json UNIT3D 7.0.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/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/animetracker.yml

@@ -1,174 +0,0 @@
----
-id: animetracker
-name: AnimeTracker (API)
-description: "AnimeTracker is a Private Torrent Tracker for HD ANIME / MANGA / HENTAI"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://animetracker.cc/
-
-caps:
-  categorymappings:
-    - {id: 7, cat: TV/Anime, desc: "Series English"}
-    - {id: 16, cat: TV/Anime, desc: "Ongoing"}
-    - {id: 11, cat: TV/Anime, desc: "Series Non-English"}
-    - {id: 1, cat: TV/Anime, desc: "Raws"}
-    - {id: 2, cat: TV/Anime, desc: "OVA"}
-    - {id: 4, cat: Movies, desc: "Movie"}
-    - {id: 15, cat: Books/Comics, desc: "Manga"}
-    - {id: 6, cat: XXX, desc: "Hentai Censored"}
-    - {id: 14, cat: XXX, desc: "Hentai Uncensored"}
-    - {id: 9, cat: XXX, desc: "Hentai Manga"}
-    - {id: 10, cat: Movies, desc: "Live Action"}
-    - {id: 3, cat: Audio, desc: "Music"}
-
-  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
-    type: text
-    label: APIKey
-  - name: info_key
-    type: info
-    label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://animetracker.cc/\" target=\"_blank\">AnimeTracker</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: created_at
-    options:
-      created_at: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: /api/torrents
-  method: get
-  error:
-    - selector: a[href*="/login"]
-      message:
-        text: "The API key was not accepted by {{ .Config.sitelink }}."
-
-search:
-  paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
-    - path: "/api/torrents/filter"
-      response:
-        type: json
-
-  headers:
-    Authorization: ["Bearer {{ .Config.apikey }}"]
-
-  inputs:
-  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
-    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
-    name: "{{ .Keywords }}"
-    seasonNumber: "{{ .Query.Season }}"
-    episodeNumber: "{{ .Query.Ep }}"
-    imdbId: "{{ .Query.IMDBIDShort }}"
-    tmdbId: "{{ .Query.TMDBID }}"
-    tvdbId: "{{ .Query.TVDBID }}"
-    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 100
-
-  keywordsfilters:
-    - name: re_replace
-      args: ["\\.", " "]
-
-  rows:
-    selector: data
-    attribute: attributes
-
-  fields:
-    category:
-      selector: category_id
-    title:
-      selector: name
-    details:
-      selector: details_link
-    download:
-      selector: download_link
-    infohash:
-      selector: info_hash
-    poster:
-      selector: meta.poster
-      filters:
-        - name: replace
-          args: ["https://via.placeholder.com/90x135", ""]
-    imdbid:
-      selector: imdb_id
-    tmdbid:
-      selector: tmdb_id
-    tvdbid:
-      selector: tvdb_id
-    genre:
-      selector: meta.genres
-      filters:
-        - name: re_replace
-          args: ["(?i)(Science Fiction)", "Science_Fiction"]
-        - name: replace
-          args: [" & ", "_&_"]
-    description:
-      text: "{{ .Result.genre }}"
-    files:
-      selector: num_file
-    seeders:
-      selector: seeders
-    leechers:
-      selector: leechers
-    grabs:
-      selector: times_completed
-    date:
-      # "created_at": "2021-10-18T00:34:50.000000Z" is returned by Newtonsoft.Json.Linq as 18/10/2021 00:34:50
-      selector: created_at
-      filters:
-        - name: append
-          args: " +00:00" # GMT
-        - name: dateparse
-          args: "MM/dd/yyyy HH:mm:ss zzz"
-    size:
-      selector: size
-    downloadvolumefactor:
-      # api returns 0%, 25%, 50%, 75%, 100%
-      selector: freeleech
-      case:
-        0%: 1 # not free
-        25%: 0.75
-        50%: 0.5
-        75%: 0.25
-        100%: 0 # freeleech
-        "*": 0 # catch errors
-    uploadvolumefactor:
-      # api returns 0=false, 1=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.1

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,30 +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: 9, cat: Other, desc: "CURSOS"}
+    - {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
@@ -33,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
@@ -121,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
@@ -163,4 +154,10 @@ search:
       case:
         False: 1 # normal
         True: 2 # double
-# json UNIT3D 7.0.0
+# 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/audionews.yml

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

src/Jackett.Common/Definitions/badasstorrents.yml

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

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

@@ -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:

src/Jackett.Common/Definitions/beload.yml

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

src/Jackett.Common/Definitions/bitbazis.yml

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

src/Jackett.Common/Definitions/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/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
@@ -165,4 +165,4 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 7.0.0b
+# json UNIT3D 7.1.2

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:

src/Jackett.Common/Definitions/cathoderaytube.yml

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

src/Jackett.Common/Definitions/chdbits.yml

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

src/Jackett.Common/Definitions/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

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

src/Jackett.Common/Definitions/crt2fa.yml

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

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

@@ -107,9 +107,9 @@ 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:

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: "18+"}
+    - {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

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

src/Jackett.Common/Definitions/digitalcore.yml

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

src/Jackett.Common/Definitions/discfan.yml

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

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

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

src/Jackett.Common/Definitions/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/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

@@ -18,6 +18,7 @@ caps:
     - {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]
@@ -32,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://fearnopeer.com/\" target=\"_blank\">FearNoPeer</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
@@ -162,10 +163,7 @@ search:
       case:
         False: 1 # normal
         True: 2 # double
-# global MR is 0.5 but torrents must be seeded for 4 days regardless of ratio
-#    minimumratio:
-#      text: 0.5
-    minimumseedtime:
-      # 4 day (as seconds = 4 x 24 x 60 x 60)
-      text: 345600
-# json UNIT3D 7.0.0
+# Maintain global ratio above 0.5 or downloads will get disabled. No MST.
+    minimumratio:
+      text: 0.51
+# json UNIT3D 7.0.3

src/Jackett.Common/Definitions/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/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/gktorrent.yml

@@ -8,11 +8,10 @@ encoding: UTF-8
 followredirect: true
 # to fetch current domain use https://www.protege-torrent.com/Gktorrent
 links:
-  - https://www.gktorrent.ph/
+  - https://www.gktorrent.vc/
   - https://gktorrent.nocensor.cloud/
   - https://gktorrent.mrunblock.bond/
 legacylinks:
-  - https://www.gktorrent.me/
   - https://www.rantop.org/
   - https://www.gktorrent.cx/
   - https://www.gktorrent.tv/
@@ -37,6 +36,7 @@ legacylinks:
   - https://gktorrent.nocensor.click/
   - https://www.gktorrents.cc/
   - https://www.gktorrent.ac/
+  - https://www.gktorrent.ph/
 
 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/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:

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

@@ -7,6 +7,7 @@ type: private
 encoding: UTF-8
 links:
   - https://www.hawke.uno/
+  - https://hawke.uno/
 
 caps:
   categorymappings:
@@ -92,7 +93,7 @@ search:
       selector: name
       filters:
         - name: re_replace
-          args: ["\\(((?>[^()]+|(?<o>)\\(|(?<-o>)\\))*(?(o)(?!)))\\)$", "$1"]
+          args: ["\\(((?>[^()]+|(?<o>)\\(|(?<-o>)\\))*(?(o)(?!)))(?<!\\bHONE)(?<=\\s*- [\\w]+)\\)$", "$1"]
         - name: re_replace
           args: ["\\s*-\\s+(\\w+)$", "-$1"]
     details:

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

@@ -195,4 +195,4 @@ search:
     description:
       selector: td:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.8.4 2023-05-27
+# NexusPHP v1.8.9 2023-11-15

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/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.0.3

src/Jackett.Common/Definitions/hebits.yml

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

src/Jackett.Common/Definitions/hellashut.yml

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

src/Jackett.Common/Definitions/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/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/kinozal-magnet.yml

@@ -0,0 +1,311 @@
+---
+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]
+
+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
@@ -111,6 +111,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 +130,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:

src/Jackett.Common/Definitions/kufei.yml

@@ -196,4 +196,4 @@ search:
     description:
       selector: td:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.8.8 2023-09-25
+# NexusPHP v1.8.9 2023-11-15

src/Jackett.Common/Definitions/lesaloon.yml

@@ -6,10 +6,11 @@ language: fr-FR
 type: private
 encoding: UTF-8
 links:
-  - https://lesaloonv2-0.xyz/
-legacylinks:
+  - https://lesaloonv2-0.lol/
   - https://lesaloonv2-0.net/
+legacylinks:
   - http://lesaloonv2-0.net/ # site forces https
+  - https://lesaloonv2-0.xyz/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/limetorrents.yml

@@ -8,7 +8,7 @@ encoding: UTF-8
 # changes to this indexer should also be made to limetorrentsclone
 links:
   - https://www.limetorrents.lol/
-  - https://limetorrents.unblockit.zip/
+  - https://limetorrents.unblockit.ing/
   - https://limetorrents.ninjaproxy1.com/
   - https://limetorrents.mrunblock.bond/
   - https://limetorrents.nocensor.cloud/
@@ -23,8 +23,6 @@ legacylinks:
   - https://limetor.com/
   - https://www.limetor.pro/
   - https://www.limetorrents.pro/
-  - https://limetorrents.unblockit.ist/
-  - https://limetorrents.unblockit.bet/
   - https://limetorrents.unblockit.cat/
   - https://limetorrents.unblockit.nz/
   - https://limetorrents.nocensor.world/
@@ -45,6 +43,8 @@ legacylinks:
   - https://limetorrents.unblockninja.com/
   - https://limetorrents.unblockit.vegas/
   - https://limetorrents.unblockit.esq/
+  - https://limetorrents.unblockit.zip/
+  - https://limetorrents.unblockit.foo/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/linkomanija.yml

@@ -44,8 +44,8 @@ caps:
 
   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]
 
@@ -60,10 +60,26 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
-  - name: searchindesc
-    type: checkbox
-    label: Search in torrent description (get more results)
-    default: true
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: added
+    options:
+      name: title
+      added: 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>Torrentų puslapyje</b> setting to <b>100</b> on your account profile.
 
 login:
   path: takelogin.php
@@ -82,12 +98,17 @@ search:
     - path: browse.php
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 active, 1 incldead, 2 dead
     incldead: 1
     freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-    searchindesc: "{{ .Config.searchindesc }}"
+    searchindesc: "{{ if .Query.IMDBID }}1{{ else }}{{ end }}"
+    sort: "{{ .Config.sort }}"
+    d: "{{ .Config.type }}"
 
   keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
     - name: re_replace
       args: ["(\\w+)", "+$1"] # prepend + to each word
 
@@ -109,8 +130,12 @@ search:
     download:
       selector: a[href^="download.php?id="]
       attribute: href
+    genre:
+      selector: td:nth-child(2) > span
+      filters:
+        - name: re_replace
+          args: [" \\| .+", ""]
     description:
-      optional: true
       selector: td:nth-child(2) > span
     files:
       selector: td:nth-child(3)
@@ -131,8 +156,10 @@ search:
       selector: td:nth-child(9)
     downloadvolumefactor:
       case:
-        img[src="//static.linkomanija.net/images/flag_green.gif"]: 0
+        img[src$="/images/flag_green.gif"]: 0
         "*": 1
     uploadvolumefactor:
       text: 1
+    minimumratio:
+      text: 0.3
 # engine tbd

src/Jackett.Common/Definitions/lst.yml

@@ -16,7 +16,6 @@ caps:
     - {id: 3, cat: Audio, desc: "Music"}
     - {id: 4, cat: Console, desc: "Game"}
     - {id: 5, cat: PC, desc: "Application"}
-    - {id: 7, cat: Other, desc: "Packs"}
     - {id: 8, cat: XXX, desc: "XXX"}
     - {id: 9, cat: Books/EBook, desc: "Ebook/Manga"}
     - {id: 10, cat: Other, desc: "Education"}
@@ -34,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://lst.gg/\" target=\"_blank\">LST</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://lst.gg/\" target=\"_blank\">LST</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -102,9 +101,6 @@ search:
       selector: category_id
     title:
       selector: name
-      filters:
-        - name: re_replace
-          args: ["\\.", " "]
     details:
       selector: details_link
     download:
@@ -162,15 +158,15 @@ search:
         100%: 0 # freeleech
         "*": 0 # catch errors
     uploadvolumefactor:
-      # api returns 0=false, 1=true
+      # api returns False, True
       selector: double_upload
       case:
-        0: 1 # normal
-        1: 2 # double
+        False: 1 # normal
+        True: 2 # double
 # global MR is 1.0 but torrents must be seeded for 5 days regardless of ratio
 #    minimumratio:
 #      text: 1.0
     minimumseedtime:
-      # 5 days (as seconds = 5 x 24 x 60 x 60)
-      text: 432000
-# json UNIT3D 6.5.0
+      # 7 days (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
+# json UNIT3D 7.1.2

src/Jackett.Common/Definitions/madsrevolution.yml

@@ -124,7 +124,7 @@ search:
     $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
     action: "{{ if .Config.freeleech }}uploadonly{{ else }}{{ end }}"
     searchstr: "{{ .Keywords }}"
-    searchtags: "{{ if .Query.Genre }}{{ .Query.Genre }}{{ else }}{{ end }}"
+    searchtags: "{{ .Query.Genre }}"
     # 0 any, 1 all
     tags_type: 0
     order_by: "{{ .Config.sort }}"

src/Jackett.Common/Definitions/marinetracker.yml

@@ -76,6 +76,7 @@ caps:
     - {id: 327, cat: Books, desc: "Technical Books (Not maritime)-Mechanics"}
     - {id: 326, cat: Books, desc: "Technical Books (Not maritime)-Electricity"}
     - {id: 10, cat: Books, desc: "English for seamen"}
+    - {id: 265, cat: Books, desc: "English for seamen-Marine dictionaries and glossaries RU↔RU/EN↔EN"}
     - {id: 266, cat: Books, desc: "English for seamen-English for Deck Officers"}
     - {id: 267, cat: Books, desc: "English for seamen-English for Marine Engineers"}
     - {id: 268, cat: Books, desc: "English for seamen-English for ETO's"}
@@ -95,7 +96,6 @@ caps:
     - {id: 37, cat: Books, desc: "Organization and management of maritime transport"}
     - {id: 11, cat: Books, desc: "Section for cadets"}
     - {id: 285, cat: Books, desc: "Section for cadets-Encyclopedias and atlases"}
-    - {id: 265, cat: Books, desc: "Section for cadets-Marine dictionaries and glossaries RU↔RU/EN↔EN"}
     - {id: 191, cat: Books, desc: "Maritime Law"}
     - {id: 329, cat: Books, desc: "Maritime Law-Lloyd's, ABS, BV, DNV-GL, TÜV, NKK, RMRS and other approvals"}
     - {id: 240, cat: Books, desc: "Maritime Law-IMO Resolutions"}
@@ -111,6 +111,7 @@ caps:
     - {id: 54, cat: Books, desc: "Purpose-built ships-Passenger ships"}
     - {id: 248, cat: Books, desc: "Purpose-built ships-Fishing vessels"}
     - {id: 239, cat: Books, desc: "Purpose-built ships-Offshore"}
+    - {id: 349, cat: Books, desc: "Purpose-built ships-Dynamic positioning vessels"}
     - {id: 330, cat: Books, desc: "Examinations"}
     - {id: 333, cat: Books, desc: "Examinations-IMU CET"}
     - {id: 334, cat: Books, desc: "Examinations-NCV"}
@@ -181,6 +182,7 @@ caps:
     - {id: 245, cat: Books, desc: "Rarity-1800 - 1900"}
     - {id: 246, cat: Books, desc: "Rarity-1700 - 1800"}
     - {id: 247, cat: Books, desc: "Rarity-1600 - 1700"}
+    - {id: 350, cat: Other, desc: "Art"}
     - {id: 324, cat: Other, desc: "Posters, placards, signs"}
     - {id: 187, cat: Books, desc: "Others (not maritime)"}
     - {id: 38, cat: Books, desc: "Archive-Uncategorized"}

src/Jackett.Common/Definitions/masters-tb.yml

@@ -104,7 +104,7 @@ search:
     type: "{{ .Config.type }}"
 
   rows:
-    selector: "table[width=\"65%\"] > tbody > tr[onmouseover]{{ if .Config.freeleech }}:has(img[src=\"pic/freeleech.png\"]){{ else }}{{ end }}"
+    selector: "table[width=\"65%\"]:nth-child(3) > tbody > tr[onmouseover]{{ if .Config.freeleech }}:has(img[src=\"pic/freeleech.png\"]){{ else }}{{ end }}"
 
   fields:
     category:
@@ -113,8 +113,19 @@ search:
       filters:
         - name: querystring
           args: cat
+    title_default:
+      selector: a[href^="download.php?id="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: name
+        - name: regexp
+          args: ^(.+?)\.torrent
+        - name: htmldecode
     title:
       selector: a[href^="details.php?id="]
+      optional: true
+      default: "{{ .Result.title_default }}"
     details:
       selector: a[href^="details.php?id="]
       attribute: href
@@ -131,6 +142,8 @@ search:
       filters:
         - name: regexp
           args: src=([^\s]+)
+        - name: replace
+          args: ["pic/not-available.jpg>');", ""]
     files:
       selector: td:nth-last-child(8)
     date:
@@ -157,4 +170,7 @@ search:
       text: 1
     minimumratio:
       text: 1.0
+    description:
+      selector: td:has(a[href^="details.php?id="])
+      remove: a
 # engine tbd

src/Jackett.Common/Definitions/mazepa.yml

@@ -11,33 +11,39 @@ links:
 caps:
   categorymappings:
     # note: when refreshing cats use the tracker.php not the search.php!
-    - {id: 37, cat: Movies, desc: "Українські фільми HD, UHD"}
-    - {id: 7, cat: Movies, desc: "Українські фільми HD, UHD Українські фільми"}
-    - {id: 38, cat: TV, desc: "Українські серіали HD, UHD"}
-    - {id: 8, cat: TV, desc: "Українські серіали HD, UHD Українські серіали"}
+    # Колекція українського контенту
+    - {id: 37, cat: Movies/UHD, desc: "Українські фільми UHD"}
+    - {id: 37, cat: Movies/HD, desc: "Українські фільми HD"}
+    - {id: 7, cat: Movies/SD, desc: "Українські фільми SD"}
+    - {id: 38, cat: TV/UHD, desc: "Українські серіали UHD"}
+    - {id: 38, cat: TV/HD, desc: "Українські серіали HD"}
+    - {id: 8, cat: TV/SD, desc: "Українські серіали SD"}
     - {id: 35, cat: TV/Anime, desc: "Українські мультфільми HD, UHD"}
-    - {id: 5, cat: TV/Anime, desc: "Українські мультфільми HD, UHD Українські мультфільми"}
+    - {id: 5, cat: TV/Anime, desc: "Українські мультфільми SD"}
     - {id: 36, cat: TV/Anime, desc: "Українські мультсеріали HD, UHD"}
-    - {id: 6, cat: TV/Anime, desc: "Українські мультсеріали HD, UHD Українські мультсеріали"}
+    - {id: 6, cat: TV/Anime, desc: "Українські мультсеріали SD"}
     - {id: 39, cat: TV/Documentary, desc: "Українська документалістика HD, UHD"}
-    - {id: 9, cat: TV/Documentary, desc: "Українська документалістика HD, UHD Українська документалістика"}
-    - {id: 175, cat: Movies/HD, desc: "Озвучений контент Новинки фільмів HD, UHD"}
-    - {id: 13, cat: Movies/SD, desc: "Озвучений контент Фільми SD"}
+    - {id: 9, cat: TV/Documentary, desc: "Українська документалістика SD"}
+    # Озвучений контент
+    - {id: 175, cat: Movies/UHD, desc: "Озвучений контент Новинки фільмів UHD"}
+    - {id: 175, cat: Movies/HD, desc: "Озвучений контент Новинки фільмів HD"}
+    - {id: 147, cat: Movies/UHD, desc: "Озвучений контент фільмів UHD"}
     - {id: 12, cat: Movies/HD, desc: "Озвучений контент Фільми HD"}
-    - {id: 147, cat: Movies/UHD, desc: "Озвучений контент Фільми UHD"}
+    - {id: 13, cat: Movies/SD, desc: "Озвучений контент Фільми SD"}
     - {id: 174, cat: Movies, desc: "Озвучений контент Субтитровані фільми"}
-    - {id: 14, cat: TV/SD, desc: "Озвучений контент Серіали SD"}
-    - {id: 44, cat: TV/HD, desc: "Озвучений контент Серіали HD"}
     - {id: 152, cat: TV/UHD, desc: "Озвучений контент Серіали UHD"}
-    - {id: 10, cat: TV/Anime, desc: "Озвучений контент Мультфільми SD"}
-    - {id: 41, cat: TV/Anime, desc: "Озвучений контент Мультфільми HD"}
+    - {id: 44, cat: TV/HD, desc: "Озвучений контент Серіали HD"}
+    - {id: 14, cat: TV/SD, desc: "Озвучений контент Серіали SD"}
     - {id: 155, cat: TV/Anime, desc: "Озвучений контент Мультфільми UHD"}
-    - {id: 11, cat: TV/Anime, desc: "Озвучений контент Мультсеріали SD"}
+    - {id: 41, cat: TV/Anime, desc: "Озвучений контент Мультфільми HD"}
+    - {id: 10, cat: TV/Anime, desc: "Озвучений контент Мультфільми SD"}
     - {id: 43, cat: TV/Anime, desc: "Озвучений контент Мультсеріали HD"}
+    - {id: 11, cat: TV/Anime, desc: "Озвучений контент Мультсеріали SD"}
     - {id: 16, cat: TV/Anime, desc: "Аніме"}
-    - {id: 15, cat: TV/Documentary, desc: "Аніме Документальне SD"}
-    - {id: 42, cat: TV/Documentary, desc: "Аніме Документальне HD"}
     - {id: 157, cat: TV/Documentary, desc: "Аніме Документальне UHD"}
+    - {id: 42, cat: TV/Documentary, desc: "Аніме Документальне HD"}
+    - {id: 15, cat: TV/Documentary, desc: "Аніме Документальне SD"}
+    # Спорт
     - {id: 20, cat: TV/Sport, desc: "Спорт Формула 1 Сезон 2023"}
     - {id: 167, cat: TV/Sport, desc: "Спорт Формула 1 Сезон 2022"}
     - {id: 79, cat: TV/Sport, desc: "Спорт Формула 1 Сезони 2017-2021"}
@@ -50,8 +56,10 @@ caps:
     - {id: 49, cat: TV/Sport, desc: "Автоспорт Чемпіонат Європи"}
     - {id: 53, cat: TV/Sport, desc: "Автоспорт Закордонні чемпіонати"}
     - {id: 19, cat: TV/Sport, desc: "Бокс"}
+    # Телевізійні передачі
     - {id: 29, cat: Audio/Video, desc: "Концерти, відеокліпи"}
     - {id: 30, cat: TV, desc: "Теле-Шоу"}
+    # Музика
     - {id: 65, cat: Audio, desc: "Музика Рок"}
     - {id: 63, cat: Audio, desc: "Музика Поп, Диско"}
     - {id: 66, cat: Audio, desc: "Музика Фольк, Етно, Народна, Бардівська"}
@@ -62,11 +70,14 @@ caps:
     - {id: 82, cat: Audio, desc: "Музика Невидане"}
     - {id: 160, cat: Audio, desc: "Музика Rock, Alternative, Punk, Metal"}
     - {id: 161, cat: Audio, desc: "Музика Pop"}
+    - {id: 181, cat: Audio, desc: "Музика Synthpop, Futurepop, New Wave, Electropop"}
     - {id: 165, cat: Audio, desc: "Музика Jazz, Blues, Soul"}
+    - {id: 180, cat: Audio, desc: "Музика New Age & Meditative"}
     - {id: 163, cat: Audio, desc: "Музика Rap, Hip-hop, RnB, Reggae"}
     - {id: 166, cat: Audio, desc: "Музика Country, Country pop, Bluegrass, Southern rock"}
     - {id: 162, cat: Audio, desc: "Музика Electronic"}
     - {id: 164, cat: Audio, desc: "Музика Other Styles"}
+    # Література
     - {id: 93, cat: Books, desc: "Література Українська художня література [до 1991 р.]"}
     - {id: 92, cat: Books, desc: "Література Українська художня література (після 1991 р.)"}
     - {id: 91, cat: Books, desc: "Література Зарубіжна художня література"}
@@ -80,6 +91,7 @@ caps:
     - {id: 96, cat: Books, desc: "Література Українська художня література"}
     - {id: 95, cat: Books, desc: "Література Зарубіжна художня література"}
     - {id: 94, cat: Books, desc: "Література Історія, біографістика, спогади"}
+    # Програмне забезпечення
     - {id: 168, cat: PC, desc: "Програмне забезпечення Операційні системи"}
     - {id: 169, cat: PC, desc: "Програмне забезпечення Системні програми"}
     - {id: 170, cat: PC, desc: "Програмне забезпечення Офіс, текстові редактори"}
@@ -285,7 +297,7 @@ search:
       selector: a[href^="./dl.php?id="]
       attribute: href
     size:
-      selector: td:nth-last-child(5) > u
+      selector: a[href^="./dl.php?id="]
     seeders:
       selector: td.seedmed
     leechers:
@@ -293,8 +305,43 @@ search:
     grabs:
       selector: td:nth-last-child(2)
     date:
-      # unix
-      selector: td:last-child > u
+      # 11:51 31-Жов-23
+      # Вчора 00:04 3-Лис-23
+      # Сьогодні 06:40 4-Лис-23
+      selector: td:last-child
+      filters:
+        - name: regexp
+          args: (\d{2}:\d{2}\s\d{1,2}-\D{3}-\d{2})
+        - name: re_replace
+          args: ["\\s", " "]
+        - name: re_replace
+          args: ["(?i)Січ", "Jan"]
+        - name: re_replace
+          args: ["(?i)Лют", "Feb"]
+        - name: re_replace
+          args: ["(?i)Бер", "Mar"]
+        - name: re_replace
+          args: ["(?i)Кві", "Apr"]
+        - name: re_replace
+          args: ["(?i)Тра", "May"]
+        - name: re_replace
+          args: ["(?i)Чер", "Jun"]
+        - name: re_replace
+          args: ["(?i)Лип", "Jul"]
+        - name: re_replace
+          args: ["(?i)Сер", "Aug"]
+        - name: re_replace
+          args: ["(?i)Вер", "Sep"]
+        - name: re_replace
+          args: ["(?i)Жов", "Oct"]
+        - name: re_replace
+          args: ["(?i)Лис", "Nov"]
+        - name: re_replace
+          args: ["(?i)Гру", "Dec"]
+        - name: append
+          args: " +02:00" # EET
+        - name: dateparse
+          args: "HH:mm d-MMM-yy zzz"
     downloadvolumefactor:
       text: 0
     uploadvolumefactor:

src/Jackett.Common/Definitions/milkie.yml

@@ -61,13 +61,13 @@ search:
     title:
       selector: releaseName
     details:
-      text: "{{ .Config.sitelink }}browse/{{ .Result._id }}"
+      text: "/browse/{{ .Result._id }}"
     _apikey:
       text: "{{ .Config.apikey }}"
       filters:
         - name: urlencode
     download:
-      text: "{{ .Config.sitelink }}api/v1/torrents/{{ .Result._id }}/torrent?key={{ .Result._apikey }}"
+      text: "/api/v1/torrents/{{ .Result._id }}/torrent?key={{ .Result._apikey }}"
     date:
       selector: createdAt
     size:

src/Jackett.Common/Definitions/movietorrent.yml

@@ -1,127 +0,0 @@
----
-id: movietorrent
-name: MovieTorrent
-description: "MovieTorrent is a Public site for Bollywood, Hollywood, Hindi Dubbed, Tamil , Punjabi, Pakistani MOVIES"
-language: en-US
-type: public
-encoding: UTF-8
-requestDelay: 2
-links:
-  - https://movietorrent.co/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Bollywood"}
-    - {id: 2, cat: Movies/HD, desc: "1080p"}
-    - {id: 3, cat: Movies/HD, desc: "2016"}
-    - {id: 4, cat: Movies/HD, desc: "2017"}
-    - {id: 5, cat: Movies/HD, desc: "2018"}
-    - {id: 6, cat: Movies/HD, desc: "2019"}
-    - {id: 7, cat: Movies/HD, desc: "720p"}
-    - {id: 8, cat: Movies/HD, desc: "480p"}
-    - {id: 9, cat: Movies/HD, desc: "Action"}
-    - {id: 10, cat: Movies, desc: "Adventure"}
-    - {id: 11, cat: Movies, desc: "Animation"}
-    - {id: 14, cat: Movies, desc: "Comedy"}
-    - {id: 15, cat: Movies, desc: "Crime"}
-    - {id: 18, cat: Movies, desc: "Drama"}
-    - {id: 19, cat: Movies, desc: "Dubbed"}
-    - {id: 23, cat: Movies, desc: "Hindi"}
-    - {id: 26, cat: Movies, desc: "Hollywood"}
-    - {id: 27, cat: Movies, desc: "Horror"}
-    - {id: 32, cat: Movies, desc: "Pakistani"}
-    - {id: 35, cat: Movies, desc: "Punjabi"}
-    - {id: 36, cat: Movies, desc: "Religious"}
-    - {id: 38, cat: Movies, desc: "Romance"}
-    - {id: 42, cat: Movies, desc: "Sport"}
-    - {id: 44, cat: Movies, desc: "Superhero"}
-    - {id: 47, cat: Movies, desc: "Tamil Telugu"}
-    - {id: 48, cat: Movies, desc: "Thriller"}
-    - {id: 49, cat: Movies, desc: "Trending"}
-    - {id: 53, cat: Movies/WEB-DL, desc: "Web Series"}
-    - {id: 59, cat: Movies, desc: "2019"}
-    - {id: 5143, cat: Movies, desc: "2012"}
-    - {id: 5247, cat: Movies, desc: "2015"}
-    - {id: 8758, cat: Movies, desc: "2020"}
-    - {id: 8808, cat: Movies, desc: "2013"}
-    - {id: 8809, cat: Movies, desc: "2014"}
-    - {id: 9938, cat: Movies, desc: "Turkish Dramas"}
-    - {id: 10293, cat: Movies, desc: "2021"}
-    - {id: 8569, cat: Movies, desc: "2021"}
-    - {id: 8610, cat: Movies, desc: "2022"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-
-settings: []
-
-download:
-  infohash:
-    hash:
-      selector: a[href^="magnet:"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: ([A-F|a-f|0-9]{40})
-    title:
-      selector: th[colspan="5"]
-      filters:
-        - name: replace
-          args: [" – movietorrent", ""]
-        - name: trim
-        - name: validfilename
-
-search:
-  paths:
-    - path: "?s={{ .Keywords }}"
-    - path: "/page/2/?s={{ .Keywords }}"
-    - path: "/page/3/?s={{ .Keywords }}"
-
-  rows:
-    selector: article:has(h2)
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: span.term-badge
-      attribute: class
-      filters:
-        - name: regexp
-          args: (\d+)
-    title:
-      selector: h2
-      filters:
-        - name: replace
-          args: ["Full Movie ", ""]
-        - name: replace
-          args: ["Torrent Magnet ", ""]
-        - name: replace
-          args: ["Download", ""]
-        - name: replace
-          args: ["…", ""]
-    details:
-      selector: h2 > a
-      attribute: href
-    download:
-      selector: h2 > a
-      attribute: href
-    poster:
-      selector: a[data-src]
-      attribute: data-src
-    date:
-      selector: time
-      attribute: datetime
-    size:
-      text: "5 GB"
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine wordpress 5.8

src/Jackett.Common/Definitions/movieworld.yml

@@ -10,6 +10,7 @@ links:
 
 caps:
   categorymappings:
+    - {id: 37, cat: Movies, desc: "Freeleech"}
     - {id: 14, cat: Movies/WEB-DL, desc: "Movie/WEB"}
     - {id: 36, cat: Movies/UHD, desc: "Movie/4K Disc"}
     - {id: 5, cat: Movies/UHD, desc: "Movie/4K Rip"}
@@ -19,17 +20,16 @@ caps:
     - {id: 15, cat: Movies, desc: "Movie/Packs"}
     - {id: 20, cat: Movies/SD, desc: "Movie/CAM"}
     - {id: 21, cat: XXX, desc: "Movie/XXX"}
-    - {id: 33, cat: Audio/Video, desc: "Music"}
     - {id: 28, cat: TV, desc: "Tv Packs"}
     - {id: 31, cat: TV, desc: "Tv Mini Series"}
     - {id: 30, cat: TV/HD, desc: "Tv Episodes"}
     - {id: 26, cat: TV/Sport, desc: "Tv Sport"}
+    - {id: 18, cat: Other, desc: "Other"}
 
   modes:
     search: [q]
     tv-search: [q, season, ep]
     movie-search: [q]
-    music-search: [q]
 
 settings:
   - name: username
@@ -40,7 +40,7 @@ settings:
     label: Password
   - name: freeleech
     type: checkbox
-    label: Filter freeleech only
+    label: Search freeleech only
     default: false
   - name: sort
     type: select
@@ -83,8 +83,8 @@ search:
     page: torrents
     search: "{{ .Keywords }}"
     category: "{{ range .Categories }}{{.}};{{end}}"
-    # 0 filename, 1 file&descr, 2 descr, 3 uploaders, 18 genre, 4 imdb, 8-17 upload multiplier 1x-10x
-    options: 0
+    # 0 filename, 1 file&descr, 2 descr, 3 uploaders, 18 genre, 4 imdb, 5 gold, 6 silver, 7 bronze, 8-17 upload multiplier 1x-10x
+    options: "{{ if .Config.freeleech }}5{{ else }}0{{ end }}"
     # 0 all, 1 active only, 2 dead only
     active: 0
     order: "{{ .Config.sort }}"
@@ -96,7 +96,7 @@ search:
       args: ["\\.", " "]
 
   rows:
-    selector: "table.lista > tbody > tr:has(a[href^=\"download.php?id=\"]):not(:has(a[href^=\"index.php?page=userdetails\"])){{ if .Config.freeleech }}:has(img[src=\"images/freeleech.gif\"]){{ else }}{{ end }}"
+    selector: "table.lista > tbody > tr:has(a[href^=\"download.php?id=\"]):not(:has(a[href^=\"index.php?page=userdetails\"]))"
 
   fields:
     category:
@@ -148,7 +148,9 @@ search:
       selector: "td:has(a[href^=\"download.php?id=\"]) ~ td ~ td ~ td ~ td ~ td ~ td"
     downloadvolumefactor:
       case:
-        img[src="images/freeleech.gif"]: 0
+        img[src="images/gold.gif"]: 0
+        img[src="images/silver.gif"]: 0.5
+        img[src="images/bronze.gif"]: 0.75
         "*": 1
     uploadvolumefactor:
       case:
@@ -165,4 +167,4 @@ search:
     minimumseedtime:
       # 3 days (as seconds = 3 x 24 x 60 x 60)
       text: 259200
-#  xbtitFM v4.1.26
+#  xbtitFM v4.1.28

src/Jackett.Common/Definitions/mteamtp.yml

@@ -5,7 +5,7 @@ description: "M-Team TP (MTTP) is a CHINESE Private Torrent Tracker for HD MOVIE
 language: zh-CN
 type: private
 encoding: UTF-8
-requestDelay: 4
+requestDelay: 5
 links:
   - https://kp.m-team.cc/
   - https://tp.m-team.cc/

src/Jackett.Common/Definitions/mteamtp2fa.yml

@@ -5,7 +5,7 @@ description: "This indexer uses a cookie login for M-Team TP (MTTP) for those th
 language: zh-CN
 type: private
 encoding: UTF-8
-requestDelay: 4
+requestDelay: 5
 links:
   - https://kp.m-team.cc/
   - https://tp.m-team.cc/

src/Jackett.Common/Definitions/newretro.yml

@@ -1,10 +1,10 @@
 ---
 id: newretro
 name: The New Retro
-description: "The New Retro is a GERMAN Private Torrent Tracker for MOVIES / GENERAL"
+description: "The New Retro is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: de-DE
 type: private
-encoding: windows-1252
+encoding: UTF-8
 links:
   - https://new-retro.eu/
 

src/Jackett.Common/Definitions/nipponsei.yml

@@ -38,7 +38,7 @@ search:
         - name: replace
           args: ["[Nipponsei] ", ""]
     details:
-      text: "{{ .Config.sitelink }}"
+      text: /
     download:
       selector: a
       attribute: href

src/Jackett.Common/Definitions/ntelogo.yml

@@ -35,7 +35,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://ntelogo.org/\" target=\"_blank\">Ntelogo</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://ntelogo.org/\" target=\"_blank\">Ntelogo</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -171,4 +171,4 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 7.0.0
+# json UNIT3D 7.0.3

src/Jackett.Common/Definitions/okpt.yml

@@ -199,4 +199,4 @@ search:
     description:
       selector: td.rowfollow:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.8.3 2023-05-14
+# NexusPHP v1.8.8 2023-09-25

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

@@ -25,7 +25,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://onlyencodes.cc/\" target=\"_blank\">OnlyEncodes</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://onlyencodes.cc/\" target=\"_blank\">OnlyEncodes</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -161,4 +161,4 @@ search:
     minimumseedtime:
       # 2 days (as seconds = 2 x 24 x 60 x 60)
       text: 172800
-# json UNIT3D 7.0.0
+# json UNIT3D 7.1.2

src/Jackett.Common/Definitions/oshenpt.yml

@@ -188,4 +188,4 @@ search:
     description:
       selector: td:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.8.8 2023-09-25
+# NexusPHP v1.8.9 2023-11-15

src/Jackett.Common/Definitions/ourbits.yml

@@ -172,4 +172,4 @@ search:
       filters:
         - name: replace
           args: [" 剩余时间：", ""]
-# Ourbits 1.1.0 (Based on NexusPHP Standard v1.5 Beta 4) 3feac18 2023-05-30
+# Ourbits 1.1.0 (Based on NexusPHP Standard v1.5 Beta 4) 9169dad 2023-11-20

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

@@ -112,7 +112,7 @@ search:
     details:
       text: "{{ .Config.sitelink }}torrents/{{ .Result._id }}"
     download:
-      text: "https://api.pte.nu/torrents/download/{{ .Result._id }}"
+      text: "/download/{{ .Result._id }}"
     imdbid:
       selector: imdb_id
     genre:

src/Jackett.Common/Definitions/postman.yml

@@ -0,0 +1,127 @@
+---
+id: postman
+name: Postman
+description: Postman is a Public I2P Torrent Tracker for MOVIES / TV / GENERAL
+language: en-US
+type: public
+encoding: UTF-8
+links:
+  - http://tracker2.postman.i2p/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 2, cat: Audio, desc: "Music"}
+    - {id: 3, cat: TV, desc: "TV"}
+    - {id: 4, cat: PC/Games, desc: "Games"}
+    - {id: 5, cat: PC/0day, desc: "Apps"}
+    - {id: 6, cat: Other/Misc, desc: "Misc."}
+    - {id: 8, cat: TV, desc: "Pictures"}
+    - {id: 9, cat: TV/Anime, desc: "Anime"}
+    - {id: 10, cat: Books/Comics, desc: "Comics"}
+    - {id: 11, cat: Books, desc: "Books"}
+    - {id: 17, cat: Audio/Audiobook, desc: "Audio Books"}
+    - {id: 20, cat: Books/EBook, desc: "E-Books"}
+    - {id: 21, cat: Other, desc: "Course/Lesson"}
+    - {id: 22, cat: Other, desc: "Essay/Op-Ed"}
+    - {id: 23, cat: Other, desc: "Cad/3D Printing"}
+    - {id: 13, cat: Audio/Video, desc: "Music Vid."}
+    - {id: 14, cat: XXX, desc: "Pr0n"}
+    - {id: 15, cat: TV/Documentary, desc: "Documentary"}
+    - {id: 16, cat: Other, desc: "Leaked Documents"}
+    - {id: 18, cat: Other, desc: "Conspiracy"}
+    - {id: 19, cat: Other, desc: "Religious Content"}
+
+  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: 1
+    options:
+      1: created
+      5: seeders
+      7: size
+
+search:
+  paths:
+    - path: /
+  inputs:
+    view: Main
+    search: "{{ .Keywords }}"
+    category: -1
+    orderby: "{{ .Config.sort }}"
+    lastactive: -1
+    lang: -1
+
+  rows:
+    selector: table#torrentView tbody tr
+
+  fields:
+    category:
+      selector: td.category a
+      attribute: href
+      filters:
+        - name: querystring
+          args: category
+    title:
+      selector: td.torrentname a
+      attribute: title
+    details:
+      selector: td.torrentname a
+      attribute: href
+    download:
+      selector: a[href^="index.php?action=Download&id="]
+      attribute: href
+    magnet:
+      selector: a[href^="magnet:?xt"]
+      attribute: href
+    description:
+      selector: td.torrentname span
+    imdbid:
+      text: "{{ .Result.description }}"
+      filters:
+        - name: regexp
+          args: "(https?:\\/\\/www\\.imdb\\.com\\/title\\/tt\\d+)"
+    tmdbid:
+      text: "{{ .Result.description }}"
+      filters:
+        - name: regexp
+          args: "(https?:\\/\\/www\\.themoviedb\\.org\\/(movie|tv)\\/.+?)\\n"
+    date:
+      selector: td.added
+      filters:
+        - name: dateparse
+          args: "yyyy-MM-dd"
+    files:
+      selector: span.filecount
+    size:
+      selector: span.size
+      remove: span
+      filters:
+        - name: append
+          args: B
+    grabs:
+      selector: span.badge.downloadcount
+    seeders:
+      selector: span.swarm
+      filters:
+        - name: split
+          args: ["/", 0]
+    leechers:
+      selector: span.swarm
+      remove: span
+      filters:
+        - name: split
+          args: ["/", 1]
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# PaTracker 1.7.5

src/Jackett.Common/Definitions/ptchina.yml

@@ -185,4 +185,4 @@ search:
     description:
       selector: td.rowfollow:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.8.4 2023-05-27
+# NexusPHP v1.8.9 2023-11-15

src/Jackett.Common/Definitions/ptlsp.yml

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

src/Jackett.Common/Definitions/putao.yml

@@ -51,10 +51,6 @@ settings:
   - name: password
     type: password
     label: Password
-  - name: info_captcha
-    type: info
-    label: About the Captcha
-    default: If the Captcha image is missing then set the <b>checkcode</b> to <b>XxXx</b>
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -84,13 +80,10 @@ login:
   path: login.php
   method: form
   form: form[action="takelogin.php"]
-  captcha:
-    type: image
-    selector: img[src^="getcheckcode.php?"]
-    input: checkcode
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
+    checkcode: XxXx
     logout: ""
   error:
     - selector: td.embedded:has(h2:contains("失败"))

src/Jackett.Common/Definitions/redleaves.yml

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

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

@@ -28,7 +28,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://reelflix.xyz/\" target=\"_blank\">ReelFlix</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://reelflix.xyz/\" target=\"_blank\">ReelFlix</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -153,11 +153,11 @@ 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
     minimumratio:
       text: 1.0
-# json UNIT3D 6.5.0
+# json UNIT3D 7.1.2

src/Jackett.Common/Definitions/romanianmetaltorrents.yml

@@ -42,7 +42,7 @@ caps:
 
   modes:
     search: [q]
-    music-search: [q, artist]
+    music-search: [q]
 
 settings:
   - name: username
@@ -55,6 +55,21 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: _
+    options:
+      _: created
+      7: seeders
+      5: size
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
 
 login:
   path: login.php
@@ -73,7 +88,7 @@ login:
         text: The security code is incorrect.
     - selector: table.main:contains("Login failed!")
   test:
-    path: browse.php
+    path: index.php
     selector: a[href="logout.php"]
 
 download:
@@ -88,11 +103,14 @@ search:
   paths:
     - path: browse.php
   inputs:
-    search: "{{ if .Query.Artist }}{{ .Query.Artist }}{{ else }}{{ .Keywords }}{{ end }}"
-    # 50 title, 100 description, 150 band
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # 50 title, 100 description, 150 band - band is OR search instead of AND
     tlt: 50
     # 0 active, 1 recommended, 2 incldead, 3 lossy, 4 lossless, 5 req, 6 free or half, 7 videos, 8 int RMT
     incldead: "{{ if .Config.freeleech }}6{{ else }}2{{ end }}"
+    sort: "{{ re_replace .Config.sort \"_\" \"\" }}"
+    type: "{{ .Config.type }}"
 
   rows:
     selector: table.torrents_table tbody tr:has(a[href^="download2.php?id="])
@@ -128,22 +146,28 @@ search:
     date:
       text: now
     size:
-      selector: td:nth-child(5)
+      selector: td:nth-child(6)
+    artist:
+      selector: span.bandpropaganda a font
+      optional: true
+    description:
+      selector: span.bandpropaganda
+      remove: font
     seeders:
-      selector: td:nth-child(6)
+      selector: td:nth-child(7)
       filters:
         - name: regexp
-          args: '([\d]+) seeders?'
+          args: "(\\d+) seeders"
     leechers:
+      selector: td:nth-child(7)
+      filters:
+        - name: regexp
+          args: "(\\d+) leechers"
+    grabs:
       selector: td:nth-child(6)
       filters:
         - name: regexp
-          args: '([\d]+) leechers?'
-    grabs:
-      selector: td:nth-child(5)
-      filters:
-        - name: regexp
-          args: '([\d]+) times'
+          args: "(\\d+) times"
     downloadvolumefactor:
       case:
         img[src$="pic/freedownload.gif"]: 0
@@ -153,6 +177,8 @@ search:
       case:
         img[src$="pic/sticky2.gif"]: 1.5
         "*": 1
+    minimumratio:
+      text: 1.0
     minimumseedtime:
       # 2 days (as seconds = 2 x 24 x 60 x 60)
       text: 172800

src/Jackett.Common/Definitions/rudub.yml

@@ -6,12 +6,13 @@ language: ru-RU
 type: semi-private
 encoding: windows-1251
 links:
-  - http://rudub.co/ # https is unsupported ERR_CONNECTION_REFUSED
+  - https://rudub.net/
 legacylinks:
   - http://baibako.tv/
   - https://baibako.tv/
   - http://bko.baibako.tv/
-  - http://rudub.tv/ # redirects to *.co
+  - http://rudub.tv/ # redirects to *.net
+  - http://rudub.co/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/scenelinks.yml

@@ -5,70 +5,64 @@ description: "SceneLinks (SL) is a ROMANIAN Private Torrent Tracker for MOVIES /
 language: ro-RO
 type: private
 encoding: UTF-8
-requestDelay: 2
 links:
-  - https://www.scenelinks.io/
+  - https://scenelinks.me/
 legacylinks:
   - https://scenelinks.io/
+  - https://www.scenelinks.io/
 
 caps:
   categorymappings:
-    # when adding or removing cats don't forget the path categories
-    - {id: 163, cat: TV/Anime, desc: "Anime / Hentai", default: true}
-    - {id: 146, cat: PC, desc: "Applications", default: true}
-    - {id: 151, cat: Books/EBook, desc: "E-books", default: true}
-    - {id: 103, cat: PC/Games, desc: "Games: PC", default: true}
-    - {id: 174, cat: TV/HD, desc: "HDTV Episodes", default: true}
-    - {id: 175, cat: TV/HD, desc: "HDTV Episodes-Ro", default: true}
-    - {id: 149, cat: Other, desc: "Images", default: true}
-    - {id: 165, cat: PC, desc: "Linux", default: true}
-    - {id: 164, cat: PC/Mobile-Other, desc: "Mobile", default: true}
-    - {id: 161, cat: Movies/UHD, desc: "Movies: 4K(2160p)", default: true}
-    - {id: 162, cat: Movies/UHD, desc: "Movies: 4K-RO(2160p)", default: true}
-    - {id: 138, cat: Movies/BluRay, desc: "Movies: BluRay", default: true}
-    - {id: 148, cat: Movies/BluRay, desc: "Movies: BluRay-RO", default: true}
-    - {id: 82, cat: Movies/DVD, desc: "Movies: DVD", default: true}
-    - {id: 83, cat: Movies/DVD, desc: "Movies: DVD-Ro", default: true}
-    - {id: 147, cat: Movies/HD, desc: "Movies: HD", default: true}
-    - {id: 108, cat: Movies/HD, desc: "Movies: HD-Ro", default: true}
-    - {id: 1, cat: Movies/SD, desc: "Movies: SD", default: true}
-    - {id: 2, cat: Movies/SD, desc: "Movies: SD-Ro", default: true}
-    - {id: 142, cat: Audio, desc: "Music", default: true}
-    - {id: 143, cat: Audio/Video, desc: "Music Video", default: true}
-    - {id: 160, cat: Movies, desc: "Ro Movies", default: true}
-    - {id: 159, cat: TV, desc: "Ro TV", default: true}
-    - {id: 166, cat: TV/Sport, desc: "Sports", default: true}
-    - {id: 158, cat: TV/SD, desc: "TV Episodes (SD)", default: true}
-    - {id: 153, cat: TV/SD, desc: "TV Episodes-Ro (SD)", default: true}
-    - {id: 3, cat: XXX, desc: "XXX", default: false}
+    - {id: 1, cat: Movies/HD, desc: "Movies: HD"}
+    - {id: 2, cat: TV, desc: "TV Episodes"}
+    - {id: 6, cat: TV, desc: "RO TV"}
+    - {id: 7, cat: Movies, desc: "Ro Movies"}
+    - {id: 8, cat: TV, desc: "TV Episodes-RO"}
+    - {id: 9, cat: Movies/HD, desc: "Movies: HD-Ro"}
+    - {id: 11, cat: Movies/BluRay, desc: "Movies: BluRay"}
+    - {id: 12, cat: Movies/BluRay, desc: "Movies: BluRay-RO"}
+    - {id: 13, cat: Movies/UHD, desc: "Movies: 4K"}
+    - {id: 14, cat: Movies/UHD, desc: "Movies: 4K-RO"}
+    - {id: 15, cat: TV, desc: "TV Packs RO"}
+    - {id: 20, cat: Movies/DVD, desc: "Movies: DVD"}
+    - {id: 21, cat: Movies/DVD, desc: "Movies: DVD-Ro"}
+    - {id: 19, cat: TV/Documentary, desc: "Docs"}
+    - {id: 18, cat: Other, desc: "Wallpapers"}
+    - {id: 17, cat: Audio/Video, desc: "Videos"}
+    - {id: 3, cat: Audio, desc: "Music"}
+    - {id: 16, cat: Console, desc: "Games: Console"}
+    - {id: 4, cat: PC/Games, desc: "Games PC"}
+    - {id: 5, cat: PC, desc: "Application"}
+    - {id: 10, cat: XXX, desc: "XXX"}
 
   modes:
     search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
+    movie-search: [q, imdbid, tmdbid]
     music-search: [q]
     book-search: [q]
 
 settings:
-  - name: username
+  - name: apikey
     type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://www.scenelinks.me/\" target=\"_blank\">SceneLinks</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
   - name: freeleech
     type: checkbox
-    label: Filter freeleech only
+    label: Search freeleech only
     default: false
   - name: sort
     type: select
     label: Sort requested from site
-    default: 4
+    default: created_at
     options:
-      4: created
-      7: seeders
-      5: size
-      1: title
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
   - name: type
     type: select
     label: Order requested from site
@@ -76,109 +70,119 @@ settings:
     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:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
+  path: /api/torrents
+  method: get
   error:
-    - selector: td.embedded:has(h2:contains("failed"))
-  test:
-    path: /
-    selector: a[href="logout.php"]
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
 
 search:
   paths:
-    - path: browse.php
-      categories: [163, 146, 151, 103, 174, 175, 149, 165. 164, 161, 162, 138, 148, 82, 83, 147, 108, 1, 2, 142, 143, 160, 159, 166, 158, 153]
-      inputs:
-        # 0 name, 1 descr, 2 genre (not reliable)
-        blah: 0
-    - path: browseadult.php
-      categories: [3]
-      inputs:
-        incldead: 1
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    - path: "/api/torrents/filter"
+      response:
+        type: json
+
+  headers:
+    Authorization: ["Bearer {{ .Config.apikey }}"]
+
   inputs:
-    $raw: "{{ if .Categories}}{{ range .Categories }}c{{.}}=1&{{end}}{{ else }}cat=0{{ end }}"
-    search: "{{ .Keywords }}"
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-    # does not support imdbid searching or return imdb in results.
-    Search: Search
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
+    name: "{{ .Keywords }}"
+    seasonNumber: "{{ .Query.Season }}"
+    episodeNumber: "{{ .Query.Ep }}"
+    imdbId: "{{ .Query.IMDBIDShort }}"
+    tmdbId: "{{ .Query.TMDBID }}"
+    tvdbId: "{{ .Query.TVDBID }}"
+    "free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
 
   rows:
-    selector: "table[border=\"1\"] > tbody > tr:has(a[href^=\"download.php?id=\"]){{ if .Config.freeleech }}:has(a#free-btn){{ else }}{{ end }}, table[width=\"1005\"] > tbody > tr:has(a[href^=\"download.php?id=\"]){{ if .Config.freeleech }}:has(a#free-btn){{ else }}{{ end }}"
+    selector: data
+    attribute: attributes
 
   fields:
     category:
-      selector: a[href*=".php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
+      selector: category_id
     title:
-      selector: a[href^="download.php?id="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: name
-        - name: replace
-          args: [".torrent", ""]
+      selector: name
     details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    poster:
-      selector: a[href^="details.php?id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: src=([^\s]+)
+      selector: details_link
     download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    date:
-      selector: td:nth-last-child(5)
+      selector: download_link
+    infohash:
+      selector: info_hash
+    poster:
+      selector: meta.poster
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "yyyy-MM-ddHH:mm:ss zzz"
-    size:
-      selector: td:nth-last-child(4)
-    grabs:
-      selector: td:nth-last-child(3)
-    seeders:
-      selector: td:nth-last-child(2)
-    leechers:
-      selector: td:nth-last-child(1)
+        - name: replace
+          args: ["https://via.placeholder.com/90x135", ""]
+    imdbid:
+      selector: imdb_id
+    tmdbid:
+      selector: tmdb_id
+    tvdbid:
+      selector: tvdb_id
     genre:
-      selector: td:nth-child(2) > i:nth-last-child(1)
+      selector: meta.genres
       filters:
-        - name: re_replace
-          args: ["(?i)(All Sex)", "All_Sex"]
         - name: re_replace
           args: ["(?i)(Science Fiction)", "Science_Fiction"]
+        - name: re_replace
+          args: ["(?i)(TV Movie)", "TV_Movie"]
         - name: replace
           args: [" & ", "_&_"]
     description:
       text: "{{ .Result.genre }}"
+    files:
+      selector: num_file
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    date:
+      # "created_at": "2021-10-18T00:34:50.000000Z" is returned by Newtonsoft.Json.Linq as 18/10/2021 00:34:50
+      selector: created_at
+      filters:
+        - name: append
+          args: " +00:00" # GMT
+        - name: dateparse
+          args: "MM/dd/yyyy HH:mm:ss zzz"
+    size:
+      selector: size
     downloadvolumefactor:
+      # api returns 0%, 25%, 50%, 75%, 100%
+      selector: freeleech
       case:
-        "a#free-btn": 0
-        "*": 1
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
     uploadvolumefactor:
+      # api returns False, True
+      selector: double_upload
       case:
-        "a#double-btn": 2
-        "*": 1
-    minimumratio:
-      text: 1.0
+        False: 1 # normal
+        True: 2 # double
+# global MR is 0.4 but torrents must be seeded for 1 day regardless of ratio
+#    minimumratio:
+#      text: 0.4
     minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
-# TBDEV
+      # 1 day (as seconds = 1 x 24 x 60 x 60)
+      text: 86400
+# json UNIT3D 7.0.3

src/Jackett.Common/Definitions/schema.json

@@ -17,7 +17,7 @@
                 },
                 "language": {
                     "type": "string",
-                    "enum": ["af", "af-ZA", "ar", "ar-AE", "ar-BH", "ar-DZ", "ar-EG", "ar-IQ", "ar-JO", "ar-KW", "ar-LB", "ar-LY", "ar-MA", "ar-OM", "ar-QA", "ar-SA", "ar-SY", "ar-TN", "ar-YE", "az", "az-AZ", "be", "be-BY", "bg", "bg-BG", "bs-BA", "ca", "ca-ES", "cs", "cs-CZ", "cy", "cy-GB", "da", "da-DK", "de", "de-AT", "de-CH", "de-DE", "de-LI", "de-LU", "dv", "dv-MV", "el", "el-GR", "en", "en-AU", "en-BZ", "en-CA", "en-CB", "en-GB", "en-IE", "en-JM", "en-NZ", "en-PH", "en-TT", "en-US", "en-ZA", "en-ZW", "eo", "es", "es-AR", "es-BO", "es-CL", "es-CO", "es-CR", "es-DO", "es-EC", "es-ES", "es-GT", "es-HN", "es-MX", "es-NI", "es-PA", "es-PE", "es-PR", "es-PY", "es-SV", "es-UY", "es-VE", "et", "et-EE", "eu", "eu-ES", "fa", "fa-IR", "fi", "fi-FI", "fo", "fo-FO", "fr", "fr-BE", "fr-CA", "fr-CH", "fr-FR", "fr-LU", "fr-MC", "gl", "gl-ES", "gu", "gu-IN", "he", "he-IL", "hi", "hi-IN", "hr", "hr-BA", "hr-HR", "hu", "hu-HU", "hy", "hy-AM", "id", "id-ID", "is", "is-IS", "it", "it-CH", "it-IT", "ja", "ja-JP", "ka", "ka-GE", "kk", "kk-KZ", "kn", "kn-IN", "ko", "ko-KR", "kok", "kok-IN", "ky", "ky-KG", "lt", "lt-LT", "lv", "lv-LV", "mi", "mi-NZ", "mk", "mk-MK", "mn", "mn-MN", "mr", "mr-IN", "ms", "ms-BN", "ms-MY", "mt", "mt-MT", "nb", "nb-NO", "nl", "nl-BE", "nl-NL", "nn-NO", "ns", "ns-ZA", "pa", "pa-IN", "pl", "pl-PL", "ps", "ps-AR", "pt", "pt-BR", "pt-PT", "qu", "qu-BO", "qu-EC", "qu-PE", "ro", "ro-RO", "ru", "ru-RU", "sa", "sa-IN", "se", "se-FI", "se-NO", "se-SE", "sk", "sk-SK", "sl", "sl-SI", "sq", "sq-AL", "sr-BA", "sr-SP", "sv", "sv-FI", "sv-SE", "sw", "sw-KE", "syr", "syr-SY", "ta", "ta-IN", "te", "te-IN", "th", "th-TH", "tl", "tl-PH", "tn", "tn-ZA", "tr", "tr-TR", "tt", "tt-RU", "ts", "uk", "uk-UA", "ur", "ur-PK", "uz", "uz-UZ", "vi", "vi-VN", "xh", "xh-ZA", "zh", "zh-CN", "zh-HK", "zh-MO", "zh-SG", "zh-TW", "zu", "zu-ZA", "af", "af-ZA", "ar", "ar-AE", "ar-BH", "ar-DZ", "ar-EG", "ar-IQ", "ar-JO", "ar-KW", "ar-LB", "ar-LY", "ar-MA", "ar-OM", "ar-QA", "ar-SA", "ar-SY", "ar-TN", "ar-YE", "az", "az-AZ", "be", "be-BY", "bg", "bg-BG", "bs-BA", "ca", "ca-ES", "cs", "cs-CZ", "cy", "cy-GB", "da", "da-DK", "de", "de-AT", "de-CH", "de-DE", "de-LI", "de-LU", "dv", "dv-MV", "el", "el-GR", "en", "en-AU", "en-BZ", "en-CA", "en-CB", "en-GB", "en-IE", "en-JM", "en-NZ", "en-PH", "en-TT", "en-US", "en-ZA", "en-ZW", "eo", "es", "es-AR", "es-BO", "es-CL", "es-CO", "es-CR", "es-DO", "es-EC", "es-ES", "es-GT", "es-HN", "es-MX", "es-NI", "es-PA", "es-PE", "es-PR", "es-PY", "es-SV", "es-UY", "es-VE", "et", "et-EE", "eu", "eu-ES", "fa", "fa-IR", "fi", "fi-FI", "fo", "fo-FO", "fr", "fr-BE", "fr-CA", "fr-CH", "fr-FR", "fr-LU", "fr-MC", "gl", "gl-ES", "gu", "gu-IN", "he", "he-IL", "hi", "hi-IN", "hr", "hr-BA", "hr-HR", "hu", "hu-HU", "hy", "hy-AM", "id", "id-ID", "is", "is-IS", "it", "it-CH", "it-IT", "ja", "ja-JP", "ka", "ka-GE", "kk", "kk-KZ", "kn", "kn-IN", "ko", "ko-KR", "kok", "kok-IN", "ky", "ky-KG", "lt", "lt-LT", "lv", "lv-LV", "mi", "mi-NZ", "mk", "mk-MK", "mn", "mn-MN", "mr", "mr-IN", "ms", "ms-BN", "ms-MY", "mt", "mt-MT", "nb", "nb-NO", "nl", "nl-BE", "nl-NL", "nn-NO", "ns", "ns-ZA", "pa", "pa-IN", "pl", "pl-PL", "ps", "ps-AR", "pt", "pt-BR", "pt-PT", "qu", "qu-BO", "qu-EC", "qu-PE", "ro", "ro-RO", "ru", "ru-RU", "sa", "sa-IN", "se", "se-FI", "se-NO", "se-SE", "sk", "sk-SK", "sl", "sl-SI", "sq", "sq-AL", "sr-BA", "sr-SP", "sv", "sv-FI", "sv-SE", "sw", "sw-KE", "syr", "syr-SY", "ta", "ta-IN", "te", "te-IN", "th", "th-TH", "tl", "tl-PH", "tn", "tn-ZA", "tr", "tr-TR", "tt", "tt-RU", "ts", "uk", "uk-UA", "ur", "ur-PK", "uz", "uz-UZ", "vi", "vi-VN", "xh", "xh-ZA", "zh", "zh-CN", "zh-HK", "zh-MO", "zh-SG", "zh-TW", "zu", "zu-ZA"]
+                    "enum": ["af", "af-ZA", "ar", "ar-AE", "ar-BH", "ar-DZ", "ar-EG", "ar-IQ", "ar-JO", "ar-KW", "ar-LB", "ar-LY", "ar-MA", "ar-OM", "ar-QA", "ar-SA", "ar-SY", "ar-TN", "ar-YE", "az", "az-AZ", "be", "be-BY", "bg", "bg-BG", "bs-BA", "ca", "ca-ES", "cs", "cs-CZ", "cy", "cy-GB", "da", "da-DK", "de", "de-AT", "de-CH", "de-DE", "de-LI", "de-LU", "dv", "dv-MV", "el", "el-GR", "en", "en-AU", "en-BZ", "en-CA", "en-CB", "en-GB", "en-IE", "en-JM", "en-NZ", "en-PH", "en-TT", "en-US", "en-ZA", "en-ZW", "eo", "es", "es-AR", "es-BO", "es-CL", "es-CO", "es-CR", "es-DO", "es-EC", "es-ES", "es-GT", "es-HN", "es-MX", "es-NI", "es-PA", "es-PE", "es-PR", "es-PY", "es-SV", "es-UY", "es-VE", "et", "et-EE", "eu", "eu-ES", "fa", "fa-IR", "fi", "fi-FI", "fo", "fo-FO", "fr", "fr-BE", "fr-CA", "fr-CH", "fr-FR", "fr-LU", "fr-MC", "gl", "gl-ES", "gu", "gu-IN", "he", "he-IL", "hi", "hi-IN", "hr", "hr-BA", "hr-HR", "hu", "hu-HU", "hy", "hy-AM", "id", "id-ID", "is", "is-IS", "it", "it-CH", "it-IT", "ja", "ja-JP", "ka", "ka-GE", "kk", "kk-KZ", "kn", "kn-IN", "ko", "ko-KR", "kok", "kok-IN", "ky", "ky-KG", "lt", "lt-LT", "lv", "lv-LV", "mi", "mi-NZ", "mk", "mk-MK", "mn", "mn-MN", "mr", "mr-IN", "ms", "ms-BN", "ms-MY", "mt", "mt-MT", "nb", "nb-NO", "nl", "nl-BE", "nl-NL", "nn-NO", "ns", "ns-ZA", "pa", "pa-IN", "pl", "pl-PL", "ps", "ps-AR", "pt", "pt-BR", "pt-PT", "qu", "qu-BO", "qu-EC", "qu-PE", "ro", "ro-RO", "ru", "ru-RU", "sa", "sa-IN", "se", "se-FI", "se-NO", "se-SE", "sk", "sk-SK", "sl", "sl-SI", "sq", "sq-AL", "sr-BA", "sr-SP", "sv", "sv-FI", "sv-SE", "sw", "sw-KE", "syr", "syr-SY", "ta", "ta-IN", "te", "te-IN", "th", "th-TH", "tl", "tl-PH", "tn", "tn-ZA", "tr", "tr-TR", "tt", "tt-RU", "ts", "uk", "uk-UA", "ur", "ur-PK", "uz", "uz-UZ", "vi", "vi-VN", "xh", "xh-ZA", "zh", "zh-CN", "zh-HK", "zh-MO", "zh-SG", "zh-TW", "zu", "zu-ZA"]
                 },
                 "type": {
                     "type": "string",

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

@@ -21,6 +21,7 @@ caps:
     - {id: 3, cat: Audio, desc: "Music"}
     - {id: 7, cat: PC/Games, desc: "Games"}
     - {id: 23, cat: PC, desc: "Software"}
+    - {id: 24, cat: TV/Sport, desc: "EVENTI SPORTIVI"}
 
   modes:
     search: [q]
@@ -36,7 +37,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://shareisland.org/\" target=\"_blank\">Shareisland</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://shareisland.org/\" target=\"_blank\">Shareisland</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -197,6 +198,6 @@ search:
 #    minimumratio:
 #      text: 0.4
     minimumseedtime:
-      # 7 day (as seconds = 7 x 24 x 60 x 60)
-      text: 604800
-# json UNIT3D 7.0.0 (custom)
+      # 6 day (as seconds = 6 x 24 x 60 x 60)
+      text: 518400
+# json UNIT3D 7.0.3 (custom)