torrentqq. bump domain

This reverts commit acaceb2c14.

README.md

@@ -50,7 +50,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * cpasbien
  * cpasbienClone
  * CrackingPatching
- * Demonoid
  * DivxTotal
  * dmhy
  * DonTorrent
@@ -64,6 +63,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * GamesTorrents
  * GkTorrent
  * GloDLS
+ * GTorrent.pro
  * Idope
  * Il Corsaro Nero
  * Internet Archive (archive.org)
@@ -91,6 +91,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * NoNaMe Club (NNM-Club)
  * Nyaa.si
  * OneJAV
+ * OxTorrent
  * ParnuXi
  * PC-torrent
  * PornoTorrent
@@ -214,7 +215,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Union Fansub
  * UniOtaku
  * xTorrenty
- * YggTorrent (YGG)
  * ZOMB
  * Ztracker
 </details>
@@ -227,7 +227,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * 2xFree
  * 3ChangTrai (3CT)
  * 3D Torrents (3DT)
- * 4thD (4th Dimension)
+ * 4thD (4th Dimension) [![(invite needed)][inviteneeded]](#)
  * 52PT
  * 720pier
  * Abnormal
@@ -257,16 +257,16 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Azusa (梓喵) [![(invite needed)][inviteneeded]](#)
  * Back-ups
  * BakaBT [![(invite needed)][inviteneeded]](#)
- * BeiTai (备胎)
  * Beload
  * Best-Core
  * BeyondHD (BHD)
- * Bibliotik
+ * Bibliotik [![(invite needed)][inviteneeded]](#)
  * Bit-Bázis
  * BIT-HDTV
  * Bitded
  * Bithorlo (BHO)
  * BitHUmen [![(invite needed)][inviteneeded]](#)
+ * Bitpalace
  * BitPorn
  * Bitspyder
  * BitTorrentFiles
@@ -322,7 +322,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * DocsPedia
  * Dream Tracker [![(invite needed)][inviteneeded]](#)
  * Drugari
- * Ebooks-Shares
+ * Ebooks-Shares [![(invite needed)][inviteneeded]](#)
  * Empornium (EMP) [![(invite needed)][inviteneeded]](#)
  * Enthralled
  * eShareNet
@@ -331,14 +331,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ExoticaZ (YourExotic)
  * ExtremeBits
  * F1Carreras
- * Falkon Vision Team
  * FANO.IN [![(invite needed)][inviteneeded]](#)
  * Fantastiko [![(invite needed)][inviteneeded]](#)
  * Fappaizuri
  * FearNoPeer
  * Femdomcult
  * FileList (FL)
- * FinElite (FE) [![(invite needed)][inviteneeded]](#)
+ * FinElite (FE)
  * FinVip
  * Flux-Zone
  * Free Farm (自由农场)
@@ -363,12 +362,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HappyFappy
  * Hares Club (白兔俱乐部) [![(invite needed)][inviteneeded]](#)
  * Hawke-uno
+ * HD Dolby
  * HD-Club [![(invite needed)][inviteneeded]](#)
  * HD-Forever (HDF) [![(invite needed)][inviteneeded]](#)
- * HD-Olimpo
+ * HD-Olimpo [![(invite needed)][inviteneeded]](#)
  * HD-Only (HDO)
  * HD-Space (HDS)
- * HD-Torrents (HDT)
+ * HD-Torrents (HDT) [![(invite needed)][inviteneeded]](#)
  * HD-UNiT3D
  * HD4FANS [![(invite needed)][inviteneeded]](#)
  * HDArea (HDA)
@@ -389,12 +389,12 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDU
  * hdvbits
  * HDVIDEO
- * Heavens-Hell
  * Hebits
  * HellasHut
  * HHanClub
  * House of Devil
  * HQMusic
+ * HUDBT (蝴蝶) [![(invite needed)][inviteneeded]](#)
  * iAnon
  * ICC2022 (冰淇淋)
  * ilolicon PT
@@ -450,7 +450,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * MNV (Max-New-Vision)
  * MOJBLiNK
  * MonikaDesign (MDU)
- * MoreThanTV (MTV)
+ * MoreThanTV (MTV) [![(invite needed)][inviteneeded]](#)
  * MouseBits
  * Movie-Torrentz
  * MyAnonamouse (MAM)
@@ -481,7 +481,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * PiXELHD (PxHD) [![(invite needed)][inviteneeded]](#)
  * Plusteca
  * Polish Torrent (PTT)
- * PolishTracker
+ * PolishTracker [![(invite needed)][inviteneeded]](#)
  * Pornbay [![(invite needed)][inviteneeded]](#)
  * Portugas
  * PotUK
@@ -498,12 +498,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * PTLSP
  * PTSBAO (烧包) [![(invite needed)][inviteneeded]](#)
  * PTtime
+ * PTVicomo
  * Punk's Horror Tracker
- * PuntoTorrent
+ * PuntoTorrent [![(invite needed)][inviteneeded]](#)
  * PuTao (葡萄)
  * PWTorrents (PWT)
  * Qingwa (青蛙)
- * R3V WTF!
+ * R3V WTF! [![(invite needed)][inviteneeded]](#)
  * Racing4Everyone (R4E)
  * RacingForMe (RFM)
  * RareShare2
@@ -514,8 +515,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ReelFlix
  * Resurrect The Net [![(invite needed)][inviteneeded]](#)
  * RetroFlix
- * RevolutionTT
- * RM-HD
+ * RevolutionTT [![(invite needed)][inviteneeded]](#)
  * RocketHD
  * Romanian Metal Torrents (RMT)
  * RoTorrent
@@ -587,7 +587,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TOrrent-tuRK (TORK)
  * Torrent.LT
  * TorrentBD
- * TorrentBytes (TBy)
+ * TorrentBytes (TBy) [![(invite needed)][inviteneeded]](#)
  * TorrentCCF (TCCF)
  * TorrentDay (TD)
  * TorrentDD
@@ -604,16 +604,15 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TranceTraffic
  * Trellas (Magico) [![(invite needed)][inviteneeded]](#)
  * TreZzoR
+ * TurkSeed
  * TurkTorrent (TT)
  * TV Chaos UK (TVCUK)
- * TvRoad
  * TVstore
  * U2 (U2分享園@動漫花園) [![(invite needed)][inviteneeded]](#)
  * UBits
  * UHDBits
  * UltraHD
  * UnionGang
- * Universal-Torrents
  * UnlimitZ
  * upload.cx
  * UTOPIA
@@ -626,18 +625,19 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * x-ite.me (XM)
  * Xider-Torrent
  * XSpeeds (XS)
- * Xthor
+ * Xthor [![(invite needed)][inviteneeded]](#)
  * XtremeBytes
  * XWT-Classics
  * XWTorrents (XWT)
  * YDYPT (伊甸园PT)
+ * YggTorrent (YGG)
  * Zamunda.net
  * Zelka.org
  * ZmPT (织梦)
- * ZonaQ
+ * ZonaQ [![(invite needed)][inviteneeded]](#)
 </details>
 
-Trackers marked with [![(invite needed)][inviteneeded]](#) have no active maintainer and may be missing features or be broken. If you have an invite for them please send it to garfieldsixtynine -at- gmail.com or jacketttest -at- gmail.com to get them fixed/improved.
+Trackers marked with [![(invite needed)][inviteneeded]](#) have no active maintainer and may be broken or missing features. If you have an invite please send it to jacketttest [at] gmail [dot] com or garfieldsixtynine [at] gmail [dot] com get them fixed/improved.
 
 ### Jackett Torznab query syntax
 
@@ -737,35 +737,35 @@ When installed as a service the tray icon acts as a way to open/start/stop Jacke
 Jackett can also be run from the command line if you would like to see log messages (Ensure the server isn't already running from the tray/service). This can be done by using "JackettConsole.exe" (for Command Prompt), found in the Jackett data folder: "%ProgramData%\Jackett".
 
 
-## Install on Linux (AMDx64)
+## Installation on Linux (AMDx64)
 On most operating systems all the required dependencies will already be present. In case they are not, you can refer to this page https://github.com/dotnet/core/blob/master/Documentation/linux-prereqs.md
 
 ### Install as service
 A) Command to download and install the latest package and run the Jackett service:
 
-`cd /opt && f=Jackett.Binaries.LinuxAMDx64.tar.gz && release=$(wget -q https://github.com/Jackett/Jackett/releases/latest -O - | grep "title>Release" | cut -d " " -f 4) && sudo wget -Nc https://github.com/Jackett/Jackett/releases/download/$release/"$f" && sudo tar -xzf "$f" && sudo rm -f "$f" && cd Jackett* && sudo ./install_service_systemd.sh && systemctl status jackett.service && cd - && echo -e "\nVisit http://127.0.0.1:9117"`
+`cd /opt && f=Jackett.Binaries.LinuxAMDx64.tar.gz && sudo wget -Nc https://github.com/Jackett/Jackett/releases/latest/download/"$f" && sudo tar -xzf "$f" && sudo rm -f "$f" && cd Jackett* && sudo ./install_service_systemd.sh && systemctl status jackett.service && cd - && echo -e "\nVisit http://127.0.0.1:9117"`
 
 B) Or manually:
 
-1. Download and extract the latest `Jackett.Binaries.LinuxAMDx64.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases)
+1. Download and extract the latest `Jackett.Binaries.LinuxAMDx64.tar.gz` release from the [releases](https://github.com/Jackett/Jackett/releases/latest) page
 2. To install Jackett as a service, open a Terminal, cd to the jackett folder, and run `sudo ./install_service_systemd.sh` You need root permissions to install the service. The service will start on each logon. You can always stop it by running `systemctl stop jackett.service` from Terminal. You can start it again using `systemctl start jackett.service`. Logs are stored as usual under `~/.config/Jackett/log.txt` and also in `journalctl -u jackett.service`.
 
 ### Run without installing as a service
-Download and extract the latest `Jackett.Binaries.LinuxAMDx64.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases), open a Terminal, cd to the jackett folder, and run Jackett with the command `./jackett`
+Download and extract the latest `Jackett.Binaries.LinuxAMDx64.tar.gz` release from the [releases](https://github.com/Jackett/Jackett/releases/latest) page, open a Terminal, cd to the jackett folder, and run Jackett with the command `./jackett`
 
 ### home directory
 If you want to run it with a user without a /home directory you need to add `Environment=XDG_CONFIG_HOME=/path/to/folder` to your systemd file, this folder will be used to store your config files.
 
 
-## Install on Linux (ARMv7 or above)
+## Installation on Linux (ARMv7 or above)
 On most operating systems all the required dependencies will already be present. In case they are not, you can refer to this page https://github.com/dotnet/core/blob/master/Documentation/linux-prereqs.md
 
 ### Install as service
-1. Download and extract the latest `Jackett.Binaries.LinuxARM32.tar.gz` or `Jackett.Binaries.LinuxARM64.tar.gz` (32 bit is the most common on ARM) release from the [releases page](https://github.com/Jackett/Jackett/releases)
+1. Download and extract the latest `Jackett.Binaries.LinuxARM32.tar.gz` or `Jackett.Binaries.LinuxARM64.tar.gz` (32 bit is the most common on ARM) release from the [releases](https://github.com/Jackett/Jackett/releases/latest) page
 2. To install Jackett as a service, open a Terminal, cd to the jackett folder, and run `sudo ./install_service_systemd.sh` You need root permissions to install the service. The service will start on each logon. You can always stop it by running `systemctl stop jackett.service` from Terminal. You can start it again using `systemctl start jackett.service`. Logs are stored as usual under `~/.config/Jackett/log.txt` and also in `journalctl -u jackett.service`.
 
 ### Run without installing as a service
-Download and extract the latest `Jackett.Binaries.LinuxARM32.tar.gz` or `Jackett.Binaries.LinuxARM64.tar.gz` (32 bit is the most common on ARM) release from the [releases page](https://github.com/Jackett/Jackett/releases), open a Terminal, cd to the jackett folder and run Jackett with the command `./jackett`
+Download and extract the latest `Jackett.Binaries.LinuxARM32.tar.gz` or `Jackett.Binaries.LinuxARM64.tar.gz` (32 bit is the most common on ARM) release from the [releases](https://github.com/Jackett/Jackett/releases/latest) page, open a Terminal, cd to the jackett folder and run Jackett with the command `./jackett`
 
 ### home directory
 If you want to run it with a user without a /home directory you need to add `Environment=XDG_CONFIG_HOME=/path/to/folder` to your systemd file, this folder will be used to store your config files.
@@ -779,7 +779,7 @@ If you want to run it with a user without a /home directory you need to add `Env
        * Debian/Ubuntu: `apt-get install libcurl4-openssl-dev`
        * Redhat/Fedora: `yum install libcurl-devel`
        * For other distros see the  [Curl docs](http://curl.haxx.se/dlwiz/?type=devel).
- 3. Download and extract the latest `Jackett.Binaries.Mono.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases) and run Jackett using mono with the command `mono --debug JackettConsole.exe`.
+ 3. Download and extract the latest `Jackett.Binaries.Mono.tar.gz` release from the [releases](https://github.com/Jackett/Jackett/releases/latest) page and run Jackett using mono with the command `mono --debug JackettConsole.exe`.
  4. (Optional) To install Jackett as a service, open the Terminal and run `sudo ./install_service_systemd_mono.sh` You need root permissions to install the service. The service will start on each logon. You can always stop it by running `systemctl stop jackett.service` from Terminal. You can start it again it using `systemctl start jackett.service`. Logs are stored as usual under `~/.config/Jackett/log.txt` and also in `journalctl -u jackett.service`.
 
 If you want to run it with a user without a /home directory you need to add `Environment=XDG_CONFIG_HOME=/path/to/folder` to your systemd file, this folder will be used to store your config files.
@@ -794,9 +794,8 @@ On a CentOS/RedHat 7 system: [jewflix.jackett](https://galaxy.ansible.com/jewfli
 On an Ubuntu 16 system: [chrisjohnson00.jackett](https://galaxy.ansible.com/chrisjohnson00/jackett)
 
 
-### Installation on Linux or macOS via Homebrew
-
-[Homebrew Formulae - Jackett](https://formulae.brew.sh/formula/jackett)
+## Unistallation on Linux
+`wget https://raw.githubusercontent.com/Jackett/Jackett/master/uninstall_service_systemd.sh --quiet -O -|sudo bash`
 
 
 ## Installation on macOS
@@ -805,7 +804,7 @@ On an Ubuntu 16 system: [chrisjohnson00.jackett](https://galaxy.ansible.com/chri
 macOS 10.15+ or greater
 
 ### Install as service
-1. Download and extract the latest `Jackett.Binaries.macOS.tar.gz` or `Jackett.Binaries.macOSARM64.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases).
+1. Download and extract the latest `Jackett.Binaries.macOS.tar.gz` or `Jackett.Binaries.macOSARM64.tar.gz` release from the [releases](https://github.com/Jackett/Jackett/releases/latest) page.
 2. Open the extracted folder and double-click on `install_service_macos`.
 3. If the installation was a success, you can close the Terminal window.
 
@@ -813,7 +812,16 @@ The service will start on each logon. You can always stop it by running `launchc
 Logs are stored as usual under `~/.config/Jackett/log.txt`.
 
 ### Run without installing as a service
-Download and extract the latest `Jackett.Binaries.macOS.tar.gz` or `Jackett.Binaries.macOSARM64.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases) and run Jackett with the command `./jackett`.
+Download and extract the latest `Jackett.Binaries.macOS.tar.gz` or `Jackett.Binaries.macOSARM64.tar.gz` release from the [releases](https://github.com/Jackett/Jackett/releases/latest) page and run Jackett with the command `./jackett`.
+
+
+## Unistallation on macOS
+`curl -sSL https://raw.githubusercontent.com/Jackett/Jackett/master/uninstall_jackett_macos| bash`
+
+
+## Installation on Linux or macOS via Homebrew
+
+[Homebrew Formulae - Jackett](https://formulae.brew.sh/formula/jackett)
 
 
 ## Installation using Docker

install_service_systemd.sh

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

install_service_systemd_mono.sh

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

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

@@ -21,9 +21,6 @@ links:
 legacylinks:
   - https://1337x.is/
   - https://1337x.gd/
-  - https://1337x.nocensor.art/
-  - https://1337x.unblockit.bio/
-  - https://1337x.unblockit.boo/
   - https://1337x.mrunblock.guru/
   - https://1337x.mrunblock.life/
   - https://1337x.unblockit.click/
@@ -40,6 +37,8 @@ legacylinks:
   - https://1337x.unblockit.dad/
   - https://1337x.unblockit.africa/
   - https://1337x.unblockit.casa/ # 502
+  - https://unblockit.sbs/ # 502
+  - https://unblockit.ong/ # 502
 
 caps:
   categorymappings:

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

@@ -7,11 +7,12 @@ type: public
 encoding: UTF-8
 links:
   # Send any content to 52btbtbt@gmail.com to get the latest address. or visit https://521.52btbt.cyou/
-  - https://529048.xyz/
-  - https://529049.xyz/
   - https://www.529052.xyz/
+  - https://www.529053.xyz/
 legacylinks:
   - https://529050.xyz/
+  - https://529048.xyz/
+  - https://529049.xyz/
 
 caps:
   categorymappings:
@@ -61,6 +62,8 @@ settings:
 search:
   paths:
     - path: "search-{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}-{{ .Config.cat-id }}-{{ .Config.sort }}-1.html"
+  error:
+    - selector: :root:contains("Internal Server Error")
 
   rows:
     selector: div.ssbox

src/Jackett.Common/Definitions/Bittorrentfiles.yml

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

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

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

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

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

src/Jackett.Common/Definitions/bitpalace.yml

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

src/Jackett.Common/Definitions/bitporn.yml

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

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

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

src/Jackett.Common/Definitions/byrutor.yml

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

src/Jackett.Common/Definitions/capybarabr.yml

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

src/Jackett.Common/Definitions/carpt.yml

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

src/Jackett.Common/Definitions/cinematik.yml

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

src/Jackett.Common/Definitions/cpabien.yml

@@ -80,11 +80,16 @@ search:
   inputs:
     story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ end }}"
   # does not support imdbid search and does not return imdb link in results.
+
   keywordsfilters:
     # if searching for season packs with S01 to saison 1 #9712
     - name: re_replace
       args: ["(?i)\\b(?:S0?)(\\d{1,3})\\b", "saison $1"]
 
+  headers:
+    # site blocks Linux UAs, so slightly alter the Windows UA here (e.g. Safari/537.36 > Safari/537.35)
+    User-Agent: ["Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.35"]
+
   rows:
     selector: div#gauche > table > tbody > tr:has(a), div#dle-content > a.cover2
 

src/Jackett.Common/Definitions/crt2fa.yml

@@ -1,7 +1,7 @@
 ---
 id: crt2fa
 name: CRT2FA
-description: "Cathode-Ray.Tube (CRT) is a Private Torrent Tracker for CLASSIC MOVIES / TV.  Cookie Login for 2FA use."
+description: "Cathode-Ray.Tube (CRT) is a Private Torrent Tracker for CLASSIC MOVIES / TV. This indexer uses cookie login for 2FA."
 language: en-GB
 type: private
 encoding: UTF-8

src/Jackett.Common/Definitions/demonoid.yml

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

src/Jackett.Common/Definitions/discfan.yml

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

src/Jackett.Common/Definitions/empornium2fa.yml

@@ -1,7 +1,7 @@
 ---
 id: empornium2fa
 name: Empornium2FA
-description: "this indexer uses a cookie login for Empornium for those that want to use 2FA"
+description: "Empornium (EMP) is a Private Torrent Tracker for 3X. This indexer uses cookie login for 2FA."
 language: en-US
 type: private
 encoding: UTF-8

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

@@ -10,8 +10,6 @@ links:
   - https://extratorrent.ninjaproxy1.com/
   - https://extratorrent.proxyninja.org/
 legacylinks:
-  - https://extratorrent.nocensor.art/
-  - https://extratorrent.unblockit.bio/
   - https://extratorrent.unblockit.boo/
   - https://extratorrent.mrunblock.guru/
   - https://extratorrent.unblockit.click/
@@ -19,7 +17,6 @@ legacylinks:
   - https://extratorrent.unblockit.mov/
   - https://extratorrent.mrunblock.life/
   - https://extratorrent.unblockit.rsvp/
-  - https://extratorrent.nocensor.click/
   - https://extratorrent.unblockit.vegas/
   - https://extratorrent.unblockit.esq/
   - https://extratorrent.unblockit.zip/
@@ -31,6 +28,8 @@ legacylinks:
   - https://extratorrent.unblockit.dad/
   - https://extratorrent.unblockit.africa/
   - https://extratorrent.unblockit.casa/ # 502
+  - https://unblockit.sbs/ # 502
+  - https://unblockit.ong/ # 502
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/eztv.yml

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

src/Jackett.Common/Definitions/falkonvisionteam.yml

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

src/Jackett.Common/Definitions/fearnopeer.yml

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

src/Jackett.Common/Definitions/finelite.yml

@@ -9,12 +9,13 @@ links:
   - https://finelite.org/
 
 settings:
-  - name: username
+  - name: cookie
     type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
+    label: Cookie
+  - name: info
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -35,6 +36,14 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Julkaisuja per sivu</b> setting to <b>100</b> on your account profile.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Unused IDs in the User and Power User categories are automatically deleted after 90 days. The account can be parked and stored on the site for 180 days."
 
 caps:
   categorymappings:
@@ -43,8 +52,7 @@ caps:
     - {id: 24, cat: Books/EBook, desc: "Ebooks"}
     - {id: 10, cat: Console, desc: "Games - Console"}
     - {id: 11, cat: PC/Games, desc: "Games - PC"}
-    - {id: 26, cat: Movies, desc: "Kids"}
-    - {id: 9, cat: PC/Mobile-Other, desc: "Mobile"}
+    - {id: 26, cat: Movies/Other, desc: "Kids"}
     - {id: 12, cat: Movies, desc: "Movie Pack"}
     - {id: 31, cat: Movies/UHD, desc: "Movies 4K"}
     - {id: 38, cat: Movies/BluRay, desc: "Movies BD"}
@@ -69,29 +77,23 @@ caps:
     book-search: [q]
 
 login:
-  path: login.php
-  method: form
-  form: form#login
+  method: cookie
   inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: td.embedded:contains("Virhe") # error
-    - selector: td.embedded:contains("epäonnistui") # falied
+    cookie: "{{ .Config.cookie }}"
   test:
     path: /
-    selector: a[href="ulos.php"]
+    selector: a[href="/logout.php"]
 
 search:
   paths:
-    # https://finelite.org/selaa.php?c14=1&c15=1&c31=1&search=tt6591554&hae=2&type=desc&cat=0&incldead=1&sort=1
-    # https://finelite.org/selaa.php?search=&hae=0&type=desc&cat=0&incldead=1&freeleech=yes&sort=1
-    - path: selaa.php
+    # https://finelite.org/browse.php?c14=1&c15=1&c31=1&search=tt6591554&hae=2&type=desc&cat=0&incldead=1&sort=1
+    # https://finelite.org/browse.php?search=&hae=0&type=desc&cat=0&incldead=1&freeleech=yes&sort=1
+    - path: browse.php
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
     # 0 name&descr, 1 name, 2 descr, 3 tags, 4 imdb with rating
-    hae: "{{ if .Query.IMDBID }}2{{ else }}1{{ end }}"
+    hae: "{{ if .Query.IMDBID }}4{{ else }}1{{ end }}"
     # 0 active, 1 incldead, 2 deadonly
     incldead: 1
     freeleech: "{{ if .Config.freeleech }}yes{{ else }}{{ end }}"
@@ -99,23 +101,26 @@ search:
     type: "{{ .Config.type }}"
 
   rows:
-    selector: table.main > tbody >  tr:has(a[href^="/lataa.php/"])
+    selector: table.main > tbody >  tr:has(a[href^="/lataa/"])
 
   fields:
     category:
-      selector: a[href^="selaa.php?c"]
+      selector: a[href^="/browse.php?c"]
       attribute: href
       filters:
         - name: regexp
           args: c(\d+)=1
     title:
-      selector: a[href^="julkaisu.php?id="]
+      selector: a[href^="/details/"]
     details:
-      selector: a[href^="julkaisu.php?id="]
+      selector: a[href^="/details/"]
       attribute: href
     download:
-      selector: a[href^="/lataa.php/"]
+      selector: a[href^="/lataa/"]
       attribute: href
+    poster:
+      selector: a[href^="/details/"] img
+      attribute: src
     imdbid:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
@@ -128,7 +133,7 @@ search:
         - name: append
           args: " +02:00" # EET
         - name: dateparse
-          args: "d.M.yyyy HH:mm zzz"
+          args: "d.M.yyyy  HH:mm zzz"
     size:
       selector: td:nth-last-child(3)
     seeders:
@@ -137,7 +142,7 @@ search:
       selector: td:nth-last-child(1)
     downloadvolumefactor:
       case:
-        span.label-free: 0
+        span[title="Freeleech"]: 0
         "*": 1
     uploadvolumefactor:
       text: 1
@@ -146,4 +151,4 @@ search:
     minimumseedtime:
       # 3 days (as seconds = 3 x 24 x 60 x 60)
       text: 259200
-# custom 3.6.8
+# custom 4.0.0

src/Jackett.Common/Definitions/gktorrent.yml

@@ -8,14 +8,9 @@ encoding: UTF-8
 followredirect: true
 # to fetch current domain use https://www.protege-torrent.com/Gktorrent
 links:
-  - https://www.gktorrent.eu/
+  - https://www.gktorrent.xyz/
 legacylinks:
   - https://www.rantop.org/
-  - https://gktorrent.nocensor.work/
-  - https://gktorrent.nocensor.biz/
-  - https://gktorrent.nocensor.sbs/
-  - https://gktorrent.nocensor.world/
-  - https://gktorrent.nocensor.lol/
   - https://gktorrent.mrunblock.guru/
   - https://gktorrent.mrunblock.life/
   - https://gktorrent.nocensor.click/
@@ -31,6 +26,7 @@ legacylinks:
   - https://www.gktorrent.vg/
   - https://www.gktorrent.lol/
   - https://www.gktorrent.sh/
+  - https://www.gktorrent.eu/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/glodls.yml

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

src/Jackett.Common/Definitions/gtorrentpro.yml

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

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

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

src/Jackett.Common/Definitions/happyfappy2fa.yml

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

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

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

src/Jackett.Common/Definitions/hddolby.yml

@@ -0,0 +1,178 @@
+---
+id: hddolby
+name: HD Dolby
+description: "HD Dolby is a CHINESE Private Torrent Tracker for HD MOVIES / TV / GENERAL"
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - https://www.hddolby.com/
+
+caps:
+  categorymappings:
+    - {id: 401, cat: Movies, desc: "Movies电影"}
+    - {id: 402, cat: TV, desc: "TV Series电视剧"}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries纪录片"}
+    - {id: 405, cat: TV/Anime, desc: "Animations动漫"}
+    - {id: 403, cat: TV, desc: "TV Shows综艺"}
+    - {id: 406, cat: Audio/Video, desc: "Music Videos"}
+    - {id: 407, cat: TV/Sport, desc: "Sports体育"}
+    - {id: 408, cat: Audio, desc: "HQ Audio音乐"}
+    - {id: 410, cat: PC/Games, desc: "Games游戏"}
+    - {id: 411, cat: Other, desc: "Study学习"}
+    - {id: 409, cat: Other, desc: "Others其他"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
+    music-search: [q]
+
+settings:
+  - name: cookie
+    type: text
+    label: Cookie
+  - name: info_cookie
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 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: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Account retention rules:<ol><li>(Division Commander) Extreme User and above will be retained forever</li><li>(Brigadier Commander) Veteran Users and above will not be deleted after their account has been parked (in the Control Panel)</li><li>Users who have parked their accounts will be disabled if they do not log in for 180 consecutive days</li><li>Users with a non-parked account will have their account disabled if they do not log in for 90 consecutive days</li><li>Newly registered users who do not have traffic (i.e., upload and download data is 0) and do not log in for 5 consecutive days will be disabld.</li></ol>"
+
+login:
+  method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }} {{ else }}{{ .Keywords }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}"
+    # 0=incldead, 1=active, 2=dead
+    incldead: 0
+    # show promotions: 0=all, 1=normal, 2=free, 3=2x, 4=2xFree, 5=50%, 6=2x50%, 7=30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0=title, 1=descr, 3=uploader
+    search_area: "{{ if or .Query.IMDBID .Query.DoubanID }}1{{ else }}0{{ end }}"
+    # 0=AND, 1=OR, 2=Exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    notnewword: 1
+
+  rows:
+    selector: table.torrents > tbody > tr:has(table.torrentname)
+
+  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
+    tmdbid:
+      selector: a[href*="themoviedb.org/movie/"], a[href*="themoviedb.org/tv/"]
+      attribute: href
+    date_elapsed:
+      # time type: time elapsed (default)
+      selector: td.rowfollow:nth-child(4) > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    date_added:
+      # time added
+      selector: td.rowfollow:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-ddHH:mm:ss zzz"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td.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.5
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+    description:
+      selector: td.rowfollow:nth-child(2)
+      remove: a, b, font, img, span.tags
+      filters:
+        - name: re_replace
+          args: ["(?i)\\s*(剩余时间:|剩餘時間：|will end in)\\s*", ""]
+# NexusPHP 59e6a24 2024-5-9

src/Jackett.Common/Definitions/hdfans.yml

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

src/Jackett.Common/Definitions/hdhome.yml

@@ -102,7 +102,6 @@ search:
     search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
     incldead: 1
     spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    inclbookmarked: 0
     search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
     search_mode: 0
     notnewword: 1

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

@@ -111,7 +111,7 @@ search:
         - name: re_replace
           args: ["(?i)\\b(es-(ja|ja?p)|(ja|ja?p)-es)\\b", "MULTi SPANiSH JAPANES"] # misspelled to accomodate negative lookback, corrected later
         - name: re_replace
-          args: ["(?i)\\b(es-fr[ae]n?|fr[ae]n?-es)\\b", "MULTi SPANiSH FRENCHx"] # misspelled to accomodate negative lookback, corrected later
+          args: ["(?i)\\b(es-fr[ae]?n?|fr[ae]?n?-es)\\b", "MULTi SPANiSH FRENCHx"] # misspelled to accomodate negative lookback, corrected later
         - name: re_replace
           args: ["(?i)\\b(es-ita?|ita?-es)\\b", "MULTi SPANiSH iTALiAN"]
         - name: re_replace
@@ -127,7 +127,7 @@ search:
         - name: re_replace
           args: ["(?i)\\bcat\\b", "CATALAN"]
         - name: re_replace
-          args: ["(?i)\\bfr[ae]n?\\b", "FRENCHx"] # misspelled to accomodate negative lookback, corrected later
+          args: ["(?i)\\bfr[ae]?n?\\b", "FRENCHx"] # misspelled to accomodate negative lookback, corrected later
         - name: re_replace
           args: ["(?i)\\b(jap|jp)\\b", "JAPANES"] # misspelled to accomodate negative lookback, corrected later
         - name: re_replace
@@ -152,7 +152,7 @@ search:
       text: "{{ .Result.title_phase1 }}"
       filters:
         - name: regexp
-          args: "(?i)spanish"
+          args: "(?i)(spanish)"
     title:
       text: "{{ .Result.title_phase1 }}"
       filters:

src/Jackett.Common/Definitions/hdtorrentsit.yml

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

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

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

src/Jackett.Common/Definitions/hudbt.yml

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

src/Jackett.Common/Definitions/itatorrents.yml

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

src/Jackett.Common/Definitions/joyhd.yml

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

src/Jackett.Common/Definitions/jpopsuki.yml

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

src/Jackett.Common/Definitions/lastdigitalunderground.yml

@@ -6,6 +6,8 @@ language: en-US
 type: private
 encoding: UTF-8
 links:
+  - https://theldu.to/
+legacylinks:
   - https://theldu.net/
 
 caps:
@@ -18,7 +20,7 @@ caps:
     - {id: 19, cat: Movies/Other, desc: "Films: Shorts"}
     - {id: 17, cat: TV/Documentary, desc: "Films: Documentary"}
     - {id: 12, cat: Movies/Other, desc: "Films: FanEdits/Restorations"}
-    - {id: 33, cat: Movies/Other, desc: "Films: [No TMDB]"}
+    - {id: 33, cat: Movies/Other, desc: "Films: [TMDB UnListed]"}
     - {id: 27, cat: Movies/Foreign, desc: "Films SP1: Dub or Vid issues"}
     - {id: 22, cat: Movies/Foreign, desc: "Films SP2: No English"}
     - {id: 28, cat: Movies/Other, desc: "Films SP3: Other"}
@@ -28,17 +30,21 @@ caps:
     - {id: 31, cat: TV/Foreign, desc: "Series/TV SP1: Dub"}
     - {id: 29, cat: TV/Foreign, desc: "Series/TV SP2: No English"}
     - {id: 32, cat: TV/Other, desc: "Series/TV SP3: Other"}
+    - {id: 38, cat: TV/Other, desc: "Series/TV [TMDB unlisted]"}
     - {id: 20, cat: TV/Other, desc: "Culture: Stand-up"}
     - {id: 7, cat: Books/EBook, desc: "Culture: Ebooks"}
     - {id: 3, cat: Audio, desc: "Culture: Music"}
     - {id: 16, cat: Audio/Video, desc: "Culture: Music Videos"}
     - {id: 34, cat: Audio/Audiobook, desc: "Culture: Audio Books"}
     - {id: 35, cat: TV/Sport, desc: "Culture: Sports"}
-    - {id: 6, cat: XXX, desc: "XXX: Mainstream Smut [TMDB]"}
-    - {id: 30, cat: XXX, desc: "XXX: Filthy Smut [No TMDB]"}
+    - {id: 37, cat: TV/Other, desc: "Culture: Firearms and Freedom"}
+    - {id: 36, cat: TV/Other, desc: "Culture: Roms"}
+    - {id: 6, cat: XXX, desc: "XXX: Smut [TMDB Listed]"}
+    - {id: 30, cat: XXX, desc: "XXX: Smut [TMDB UnListed]"}
     - {id: 15, cat: XXX/Pack, desc: "XXX: MegaPacks"}
     - {id: 10, cat: XXX, desc: "XXX: Hentai"}
     - {id: 14, cat: XXX/Other, desc: "XXX: Creators Corner"}
+    - {id: 39, cat: XXX/Other, desc: "XXX: Pain and Violence"}
     - {id: 13, cat: XXX/Other, desc: "XXX: Other"}
     - {id: 11, cat: XXX/Other, desc: "XXX: Zoo"}
     - {id: 26, cat: Other, desc: "FuckedUpShit"}
@@ -58,7 +64,7 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://theldu.net/\" target=\"_blank\">Last Digital Underground</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://theldu.to/\" target=\"_blank\">Last Digital Underground</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only

src/Jackett.Common/Definitions/lat-team-api.yml

@@ -25,7 +25,6 @@ caps:
     - {id: 11, cat: Audio/Audiobook, desc: "Audiolibros"}
     - {id: 4, cat: Console, desc: "Juegos"}
     - {id: 24, cat: Other, desc: "Cursos"}
-    - {id: 28, cat: TV/Documentary, desc: "Documental"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/le-cinephile.yml

@@ -12,6 +12,7 @@ caps:
   categorymappings:
     # FILM
     - {id: 2, cat: Movies/DVD, desc: "FILM DVD"}
+    - {id: 107, cat: Movies, desc: "FILM ANIME"}
     - {id: 104, cat: Movies, desc: "FILM DVDRip"}
     - {id: 101, cat: TV/Documentary, desc: "FILM Documentaire"}
     - {id: 75, cat: Movies/UHD, desc: "FILM 2160 P"}
@@ -27,9 +28,10 @@ caps:
     - {id: 26, cat: Movies/BluRay, desc: "FILM BluRay"}
     - {id: 25, cat: Movies/BluRay, desc: "FILM ISO"}
     - {id: 4, cat: Movies/HD, desc: "FILM 1080"}
-    - {id: 107, cat: Movies, desc: "FILM ANIME"}
+    - {id: 111, cat: Movies, desc: "FILM Nouveautés 2024"}
     # SERIE
     - {id: 9, cat: TV/SD, desc: "SERIE DVD"}
+    - {id: 108, cat: TV/HD, desc: "SERIE BlueRay"}
     - {id: 106, cat: TV/Anime, desc: "SERIE ANIME"}
     - {id: 105, cat: TV, desc: "SERIE Pack"}
     - {id: 102, cat: TV/Documentary, desc: "SERIE Documentaire"}
@@ -43,7 +45,7 @@ caps:
     - {id: 15, cat: TV/WEB-DL, desc: "SERIE WEB.1080p"}
     - {id: 14, cat: TV/WEB-DL, desc: "SERIE WEB.720p"}
     - {id: 12, cat: TV/WEB-DL, desc: "SERIE WEB"}
-    - {id: 108, cat: TV/HD, desc: "SERIE BlueRay"}
+    - {id: 110, cat: TV, desc: "SERIE Nouveautés 2024"}
     # LOGICIELS
     - {id: 56, cat: PC/ISO, desc: "LOGICIELS Linux"}
     - {id: 24, cat: PC/Mac, desc: "LOGICIELS Apple"}

src/Jackett.Common/Definitions/lilleskyorg.yml

@@ -175,4 +175,4 @@ search:
     minimumseedtime:
       # 7 days (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 8.0.2
+# json UNIT3D 8.1.1

src/Jackett.Common/Definitions/limetorrents.yml

@@ -9,22 +9,18 @@ encoding: UTF-8
 links:
   - https://www.limetorrents.lol/
   - https://limetorrents.abcproxy.org/
-  - https://limetorrents.unblockit.casa/
+  - https://limetorrents.unblockit.ong/
   - https://limetorrents.unblockninja.com/
   - https://limetorrents.ninjaproxy1.com/
   - https://limetorrents.proxyninja.org/
   - https://limetorrents.torrentbay.st/
 legacylinks:
-  - https://limetorrents.nocensor.art/
-  - https://limetorrents.unblockit.bio/
-  - https://limetorrents.unblockit.boo/
   - https://limetorrents.mrunblock.guru/
   - https://limetorrents.unblockit.click/
   - https://limetorrents.unblockit.asia/
   - https://limetorrents.unblockit.mov/
   - https://limetorrents.mrunblock.life/
   - https://limetorrents.unblockit.rsvp/
-  - https://limetorrents.nocensor.click/
   - https://limetorrents.unblockit.vegas/
   - https://limetorrents.unblockit.esq/
   - https://limetorrents.unblockit.zip/
@@ -35,6 +31,8 @@ legacylinks:
   - https://limetorrents.unblockit.date/
   - https://limetorrents.unblockit.dad/
   - https://limetorrents.unblockit.africa/
+  - https://limetorrents.unblockit.casa/
+  - https://limetorrents.unblockit.sbs/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/mazepa.yml

@@ -202,13 +202,13 @@ search:
 
   fields:
     category:
-      selector: a[href^="tracker.php?f="]
-      attribute: href
+      selector: a[onclick]
+      attribute: onclick
       filters:
-        - name: querystring
-          args: f
+        - name: regexp
+          args: f=(\d+)
     title:
-      selector: a[href^="./viewtopic.php?t="]
+      selector: a.genmed
       filters:
         # normalize to SXXEYY format
         # Ukrainian
@@ -290,11 +290,14 @@ search:
         - name: re_replace
           args: ["(?i)^\\(\\s*([SE]\\d+.*?)\\s*\\)[\\s\\/\\|]*(.+)", "$2 $1"]
     details:
-      selector: a[href^="./viewtopic.php?t="]
+      selector: a.genmed
       attribute: href
     download:
       selector: a[href^="./dl.php?id="]
       attribute: href
+    magnet:
+      selector: a[href^="magnet:?xt="]
+      attribute: href
     size:
       selector: a[href^="./dl.php?id="]
     seeders:
@@ -346,5 +349,8 @@ search:
     uploadvolumefactor:
       text: 1
     description:
-      selector: a[href^="./viewtopic.php?t="]
+      case:
+        span.tor-approved: Verified
+        span.tor-not-approved: Unverified
+        span.tor-dup: Temporary
 # TorrentPier

src/Jackett.Common/Definitions/nicept.yml

@@ -187,4 +187,4 @@ search:
       filters:
         - name: prepend
           args: "{{ .Result.description_verified }} "
-# NexusPHP v1.8.8 2023-09-25
+# NexusPHP v1.8.11 2024-03-27

src/Jackett.Common/Definitions/ntelogo.yml

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

src/Jackett.Common/Definitions/okpt.yml

@@ -190,4 +190,4 @@ search:
       filters:
         - name: prepend
           args: "{{ .Result.description_verified }} "
-# NexusPHP v1.8.9 2024-03-17
+# NexusPHP v1.8.11 2024-03-27

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

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

src/Jackett.Common/Definitions/oshenpt.yml

@@ -1,14 +1,14 @@
 ---
 id: oshenpt
 name: OshenPT
-description: "OshenPT is a CHINESE Private Torrent Tracker for HD Movies, TV, Music"
+description: "OshenPT is a CHINESE Private Torrent Tracker for HD MOVIES / TV / GENERAL"
 language: zh-CN
 type: private
 encoding: UTF-8
 links:
-  - http://www.oshen.win/
+  - https://www.oshen.win/
 legacylinks:
-  - https://www.oshen.win/ # forces http
+  - http://www.oshen.win/
 
 caps:
   categorymappings:
@@ -192,4 +192,4 @@ search:
     description:
       selector: td:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.8.11 2024-03-27
+# NexusPHP v1.8.12 2024-05-10

src/Jackett.Common/Definitions/oxtorrent-co.yml

@@ -0,0 +1,118 @@
+---
+id: oxtorrent-co
+name: OxTorrent
+description: "OxTorrent is a FRENCH Public Torrent Tracker for TV / MOVIES / GENERAL"
+language: fr-FR
+type: public
+encoding: UTF-8
+links:
+  - https://www.oxtorrent.co/
+  - https://oxtorrent.unblockit.ong/
+legacylinks:
+  - https://oxtorrent.unblockit.casa/
+  - https://oxtorrent.unblockit.sbs/
+
+caps:
+  categorymappings:
+    - {id: Films, cat: Movies, desc: "Movies"}
+    - {id: Séries, cat: TV, desc: "TV"}
+    - {id: Musique, cat: Audio, desc: "Music"}
+    - {id: Ebook, cat: Books, desc: "EBooks"}
+    - {id: Logiciels, cat: PC, desc: "Software"}
+    - {id: Jeux-PC, cat: PC/Games, desc: "PC Games"}
+    - {id: Jeux-Consoles, cat: Console, desc: "Console Games"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+  allowrawsearch: true
+
+settings:
+  - name: multilang
+    type: checkbox
+    label: Replace MULTi by another language in release name
+    default: false
+  - name: multilanguage
+    type: select
+    label: Replace MULTi by this language
+    default: FRENCH
+    options:
+      FRENCH: FRENCH
+      MULTi FRENCH: MULTi FRENCH
+      ENGLISH: ENGLISH
+      MULTi ENGLISH: MULTi ENGLISH
+      VOSTFR: VOSTFR
+      MULTi VOSTFR: MULTi VOSTFR
+  - name: vostfr
+    type: checkbox
+    label: Replace VOSTFR and SUBFRENCH with ENGLISH
+    default: false
+
+download:
+  selectors:
+    - selector: a[href^="magnet:?"]
+      attribute: href
+    - selector: script:contains("magnet:?")
+      filters:
+        - name: regexp
+          args: "\\s'(magnet:\\?.+?)';"
+
+search:
+  paths:
+    - path: "{{ if .Keywords }}recherche/{{ .Keywords }}{{ else }}{{ end }}"
+  keywordsfilters:
+    # if searching for season packs switch S01 to saison 1 #9712
+    - name: re_replace
+      args: ["(?i)(S0)(\\d{1,2})$", "saison $2"]
+    - name: re_replace
+      args: ["(?i)(S)(\\d{1,3})$", "saison $2"]
+
+  rows:
+    selector: table.table-hover > tbody > tr
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      selector: td:nth-child(1) i
+      attribute: class
+    title_phase1:
+      selector: td:nth-child(1) a
+      filters:
+        - name: re_replace
+          args: ["(?i)\\b(FRENCH|MULTI|TRUEFRENCH|VOSTFR|SUBFRENCH)\\b(.+?)(\\b(19|20\\d{2})\\b)$", "$3 $1$2"]
+    title_vostfr:
+      text: "{{ .Result.title_phase1 }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)\\b(vostfr|subfrench)\\b", "ENGLISH"]
+    title_phase2:
+      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
+    title_multilang:
+      text: "{{ .Result.title_phase2 }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)\\b(MULTI(?!.*(?:FRENCH|ENGLISH|VOSTFR)))\\b", "{{ .Config.multilanguage }}"]
+    title:
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
+    details:
+      selector: td:nth-child(1) a
+      attribute: href
+    download:
+      text: "{{ .Result.details }}"
+    size:
+      selector: td:nth-child(2)
+    date:
+      text: now
+    seeders:
+      selector: td:nth-child(3)
+    leechers:
+      selector: td:nth-child(4)
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/plusteca.yml

@@ -14,12 +14,17 @@ caps:
     - {id: 2, cat: TV, desc: "Seriado"}
     - {id: 4, cat: PC/Games, desc: "Jogo"}
     - {id: 5, cat: PC/0day, desc: "Aplicativo"}
-    - {id: 6, cat: XXX, desc: "XXX"}
+    - {id: 6, cat: Other, desc: "Cursos"}
+    - {id: 7, cat: XXX, desc: "XXX"}
+    - {id: 8, cat: Books/EBook, desc: "Livros"}
+    - {id: 9, cat: Books/Mags, desc: "História em Quadrinhos"}
+    - {id: 10, cat: TV, desc: "Shows"}
 
   modes:
     search: [q]
     tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
+    book-search: [q]
 
 settings:
   - name: apikey

src/Jackett.Common/Definitions/ptcafe.yml

@@ -183,4 +183,4 @@ search:
     description:
       selector: td:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.8.11 2023-04-27
+# NexusPHP v1.8.11 2024-03-27

src/Jackett.Common/Definitions/pttime.yml

@@ -5,7 +5,7 @@ description: "PTTime is a ratioless CHINESE Private Torrent Tracker for HD MOVIE
 language: zh-CN
 type: private
 encoding: UTF-8
-requestDelay: 2
+requestDelay: 5
 links:
   - https://www.pttime.org/
 

src/Jackett.Common/Definitions/ptvicomo.yml

@@ -1,24 +1,23 @@
 ---
-id: beitai
-name: BeiTai (备胎)
-description: "BeiTai (备胎) is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
+id: ptvicomo
+name: PTVicomo
+description: "PTVicomo is a CHINESE Private torrent tracker for MOVIES / TV / GENERAL"
 language: zh-CN
 type: private
 encoding: UTF-8
 links:
-  - https://www.beitai.pt/
+  - https://ptvicomo.net/
 
 caps:
   categorymappings:
-    - {id: 401, cat: Movies, desc: "Movies/电影"}
-    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
-    - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
-    - {id: 402, cat: TV, desc: "TV Series/剧集"}
-    - {id: 403, cat: TV, desc: "TV Shows/综艺"}
-    - {id: 406, cat: Audio/Video, desc: "MusicVideo/音乐MV"}
-    - {id: 407, cat: TV/Sport, desc: "Sports/运体"}
-    - {id: 409, cat: Other, desc: "Misc/其他"}
-    - {id: 408, cat: Audio, desc: "HQ Audio/无损音乐"}
+    - {id: 401, cat: Movies, desc: "电影"}
+    - {id: 402, cat: TV, desc: "剧集"}
+    - {id: 405, cat: TV/Anime, desc: "动漫"}
+    - {id: 415, cat: TV, desc: "短剧"}
+    - {id: 404, cat: TV/Documentary, desc: "纪录片"}
+    - {id: 403, cat: TV, desc: "综艺"}
+    - {id: 409, cat: Audio, desc: "音乐"}
+    - {id: 406, cat: Audio/Video, desc: "MV"}
 
   modes:
     search: [q]
@@ -33,6 +32,13 @@ settings:
   - name: password
     type: password
     label: Password
+  - name: 2facode
+    type: text
+    label: 2FA code
+  - name: info_2fa
+    type: info
+    label: "About 2FA code"
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the PTVicomo Web Site. Otherwise just leave it empty."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -60,14 +66,21 @@ settings:
   - name: info_activity
     type: info
     label: Account Inactivity
-    default: "Account retention rules:<ol><li>Veteran User and above will be retained forever</li><li>Elite User and above will not have their account deleted after parking (in the control panel)</li><li>Users with a parked account will be deleted if they do not log in for 400 consecutive days</li><li>Users with a non-parked account be deleted if they do not log in for 150 consecutive days</li><li>Users with no traffic (ie, upload/download data are both 0) will be deleted if they do not log in for 100 consecutive days.</li></ol>"
+    default: "Account retention rules:<ol><li>Extreme User (county road) and above will be retained forever</li><li>Veteran User (rural rank) and above will be retained forever if parked</li><li>Users with a parked account will be banned if they do not log in for 0 consecutive days</li><li><li>Users with no traffic (ie, upload/download data are both 0) will be banned if they do not log in for 90 consecutive days.</li></ol>"
 
 login:
-  path: takelogin.php
-  method: post
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
   inputs:
+    secret: ""
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
+    two_step_code: "{{ .Config.2facode }}"
     logout: ""
     securelogin: ""
     ssl: yes
@@ -83,23 +96,29 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if .Query.DoubanID }}/{{ .Query.DoubanID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}{{ .Keywords }}{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }} {{ else }}{{ .Keywords }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}"
     # 0 incldead, 1 active, 2 dead
     incldead: 0
     # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
     spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 title, 1 descr, 3 uploader, 4 imdburl (4 does not appear to work).
+    # 0 title, 1 descr, 3 uploader, 4 imdburl (working but not for douban)
     search_area: "{{ if or .Query.IMDBID .Query.DoubanID }}1{{ else }}0{{ end }}"
-    # 0 AND, 1 OR, 2 exact
+    # 0 AND, 2 exact
     search_mode: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
     notnewword: 1
 
   rows:
-    selector: table.torrents > tbody > tr:has(table.torrentname)
+    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:
@@ -107,24 +126,28 @@ search:
       attribute: title
       optional: true
       default: "{{ .Result.title_default }}"
-    category:
-      selector: a[href^="?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
     details:
       selector: a[href^="details.php?id="]
       attribute: href
     download:
       selector: a[href^="download.php?id="]
       attribute: href
+    # site does not have posters enabled. just in case a future update.
+    poster:
+      selector: img[data-src]
+      attribute: data-src
     imdbid:
-      selector: div.imdb_100 > a
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
+    doubanid:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
+      selector: a[href*="movie.douban.com/subject/"]
+      attribute: href
+    # the number of comments do not show up despite user web settings option to enable, throws child count off by 1
     date_elapsed:
       # time type: time elapsed (default)
-      selector: td:nth-child(4) > span[title]
+      selector: td.rowfollow:nth-child(3) span[title]
       attribute: title
       optional: true
       filters:
@@ -134,7 +157,7 @@ search:
           args: "yyyy-MM-dd HH:mm:ss zzz"
     date_added:
       # time added
-      selector: td:nth-child(4):not(:has(span))
+      selector: td.rowfollow:nth-child(3):not(:has(span))
       optional: true
       filters:
         - name: append
@@ -144,13 +167,13 @@ search:
     date:
       text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
     size:
-      selector: td:nth-child(5)
+      selector: td.rowfollow:nth-child(4)
     seeders:
-      selector: td:nth-child(6)
+      selector: td.rowfollow:nth-child(5)
     leechers:
-      selector: td:nth-child(7)
+      selector: td.rowfollow:nth-child(6)
     grabs:
-      selector: td:nth-child(8)
+      selector: td.rowfollow:nth-child(7)
     downloadvolumefactor:
       case:
         img.pro_free: 0
@@ -165,7 +188,20 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 1 day (as seconds = 24 x 60 x 60)
+      text: 86400
+    description_verified:
+      case:
+        span[title="通过"], span[title="Allowed"]: "Verified:"
+        span[title="未审"], span[title="Not reviewed"]: "Unverified:"
+        span[title="拒绝"], span[title="Denied"]: "Banned:"
     description:
-      selector: td:nth-child(2)
+      selector: td.rowfollow:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP Standard v1.5 Beta 4
+      filters:
+        - name: prepend
+          args: "{{ .Result.description_verified }} "
+# NexusPHP v1.8.12 2024-04-05 (custom)

src/Jackett.Common/Definitions/pwtorrents.yml

@@ -110,6 +110,8 @@ search:
           args: cat
     title:
       selector: a[href^="details.php?id="]
+      optional: true
+      default: No Title
     details:
       selector: a[href^="details.php?id="]
       attribute: href

src/Jackett.Common/Definitions/qingwa.yml

@@ -6,10 +6,10 @@ language: zh-CN
 type: private
 encoding: UTF-8
 links:
-  - https://qingwapt.com/
-legacylinks:
-  - https://new.qingwa.pro/
   - https://www.qingwapt.com/
+legacylinks:
+  - https://qingwapt.com/
+  - https://new.qingwa.pro/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/rapidzona.yml

@@ -102,6 +102,8 @@ search:
   fields:
     category:
       selector: p a:nth-child(3), p:has(a:nth-child(3):empty) a:nth-child(2)
+      optional: true
+      default: 71
       case:
         a[href$="/porno-xxx-adult-torrent/"]: 71
         a[href$="/porno-video-movies-torrent/"]: 73
@@ -166,6 +168,9 @@ search:
       text: 1
     description:
       selector: div.news
+      filters:
+        - name: re_replace
+          args: ["^...$", ""]
     date:
       selector: p.title-footer
       filters:

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

@@ -173,4 +173,4 @@ search:
         True: 2 # double
     minimumratio:
       text: 1.0
-# json UNIT3D 8.0.2
+# json UNIT3D 8.1.3

src/Jackett.Common/Definitions/rmhd.yml

@@ -1,180 +0,0 @@
----
-id: rmhd
-name: RM-HD
-description: "RM-HD (remastered-hd) is a UKRAINIAN Private tracker for remastered MOVIES / TV / MUSIC"
-language: uk-UA
-type: private
-encoding: UTF-8
-links:
-  - https://remastered-hd.org/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Audio, desc: "HD Audio"}
-    - {id: 2, cat: Audio/Video, desc: "Music Video"}
-    - {id: 3, cat: TV/Anime, desc: "Animation"}
-    - {id: 4, cat: Movies, desc: "Movie"}
-    - {id: 5, cat: TV, desc: "TV Show"}
-    - {id: 6, cat: TV/Documentary, desc: "Documentary"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
-    music-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 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_activity
-    type: info
-    label: Account Inactivity
-    default: "Inactive users are deleted on a regular basis. If you haven't downloaded or given anything away during your 90-day stay on RM-HD, then you are an accidental guest on our resource. The resource needs active users who know exactly what they came here for. Therefore, automatic inactivity clean-ups are carried out on a regular basis. Users with a 1080p class are not deleted by the system."
-
-login:
-  path: /
-  method: form
-  form: form#login
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    do_login: ""
-  error:
-    - selector: table:contains("Login failed")
-    - selector: table:contains("Error")
-  test:
-    path: /
-    selector: a[href="logout"]
-
-search:
-  paths:
-    - path: browse
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    # search in title
-    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    # search in description
-    dsearch: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}"
-    # 0 all, 1 simple, 2 silver, 3 gold, 4 diamond, 5 without seeders
-    incldead: "{{ if .Config.freeleech }}3{{ else }}0{{ end }}"
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-
-  rows:
-    selector: table#pager > tbody[style="background:none;"] > tr:has(a[href^="details_"])
-
-  fields:
-    category:
-      selector: img
-      case:
-        img.audio: 1
-        img.musvid: 2
-        img.anime: 3
-        img.movie: 4
-        img.tvshow: 5
-        img.docum: 6
-    _ru:
-      selector: a[href="RU"]
-      optional: true
-    _ua:
-      selector: a[href="UA"]
-      optional: true
-    title:
-      selector: a[href^="details_"]
-      filters:
-        - name: append
-          args: "{{ if .Result._ru}} {{ .Result._ru }}{{ else }}{{ end }}"
-        - name: append
-          args: "{{ if .Result._ua}} {{ .Result._ua }}{{ else }}{{ end }}"
-    details:
-      selector: a[href^="details_"]
-      attribute: href
-    download:
-      selector: a[href^="details_"]
-      attribute: href
-      filters:
-        - name: replace
-          args: ["details_", "download_"]
-    date:
-      # Релиз залит: 1 января 2024 в 20:16:09
-      selector: span:contains("Релиз залит")
-      filters:
-        - name: replace
-          args: ["Релиз залит:\xA0", ""]
-        - name: replace
-          args: [" в ", " "]
-        - name: replace
-          args: ["января", "January"]
-        - name: replace
-          args: ["февраля", "February"]
-        - name: replace
-          args: ["марта", "March"]
-        - name: replace
-          args: ["апреля", "April"]
-        - name: replace
-          args: ["мая", "May"]
-        - name: replace
-          args: ["июня", "June"]
-        - name: replace
-          args: ["июля", "July"]
-        - name: replace
-          args: ["августа", "August"]
-        - name: replace
-          args: ["сентября", "September"]
-        - name: replace
-          args: ["октября", "October"]
-        - name: replace
-          args: ["ноября", "November"]
-        - name: replace
-          args: ["декабря", "December"]
-        - name: append
-          args: " +03:00" # MSK
-        - name: dateparse
-          args: "d MMMM yyyy HH:mm:ss zzz"
-    grabs:
-      selector: span[title="Релиз скачен"]
-    size:
-      selector: div[valign="bottom"] > b
-    seeders:
-      selector: b[title^="Сидируют:"]
-    leechers:
-      selector: b[title^="Качают:"]
-    genre:
-      selector: table:last-of-type > tbody > tr:nth-child(2) > td
-    description:
-      text: "{{ .Result.genre }}"
-    downloadvolumefactor:
-      case:
-        b[style="color:#d08700"]: 0 # gold
-        b[style="color:#778899"]: 0.5 # silver
-        b[style="color:blue"]: 0 # diamond
-        "*": 1
-    uploadvolumefactor:
-      case:
-        b[style="color:blue"]: 2 # diamond
-        "*": 1
-# TBDev

src/Jackett.Common/Definitions/rudub.yml

@@ -7,32 +7,39 @@ type: semi-private
 encoding: windows-1251
 followredirect: true
 links:
-  - https://28april.rudub.online/
+  - https://23may.rudub.online/
 legacylinks:
   - https://rudub.online/
-  - https://06april.rudub.online/
-  - https://07april.rudub.online/
-  - https://08april.rudub.online/
-  - https://09april.rudub.online/
-  - https://10april.rudub.online/
-  - https://11april.rudub.online/
-  - https://12april.rudub.online/
-  - https://13april.rudub.online/
-  - https://14april.rudub.online/
-  - https://15april.rudub.online/
-  - https://16april.rudub.online/
-  - https://17april.rudub.online/
-  - https://18april.rudub.online/
-  - https://19april.rudub.online/
-  - https://20april.rudub.online/
-  - https://21april.rudub.online/
-  - https://22april.rudub.online/
-  - https://23april.rudub.online/
   - https://24april.rudub.online/
   - https://25pril.rudub.online/ # typo
   - https://25april.rudub.online/
   - https://26april.rudub.online/
   - https://27april.rudub.online/
+  - https://28april.rudub.online/
+  - https://29april.rudub.online/
+  - https://30april.rudub.online/
+  - https://01may.rudub.online/
+  - https://02may.rudub.online/
+  - https://03may.rudub.online/
+  - https://04may.rudub.online/
+  - https://05may.rudub.online/
+  - https://06may.rudub.online/
+  - https://07may.rudub.online/
+  - https://08may.rudub.online/
+  - https://09may.rudub.online/
+  - https://10may.rudub.online/
+  - https://11may.rudub.online/
+  - https://12may.rudub.online/
+  - https://13may.rudub.online/
+  - https://14may.rudub.online/
+  - https://15may.rudub.online/
+  - https://16may.rudub.online/
+  - https://17may.rudub.online/
+  - https://18may.rudub.online/
+  - https://19may.rudub.online/
+  - https://20may.rudub.online/
+  - https://21may.rudub.online/
+  - https://22may.rudub.online/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/sexypics.yml

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

src/Jackett.Common/Definitions/siambit.yml

@@ -127,7 +127,7 @@ download:
 
 search:
   paths:
-    - path: viewno18sb.php
+    - path: viewno18sbx.php
       categories: [1, 75, 10, 9, 110, 7, 40, 16, 3, 70, 100, 85, 105, 8, 56, 19, 20, 55, 21, 2, 130, 60, 90, 91, 92, 89, 93, 4, 50, 18, 17, 11, 5, 54, 51, 52, 57, 53]
     - path: viewbrsb.php
       categories: [901, 902, 903, 904, 905, 906, 907, 908, 910, 911, 912]
@@ -143,7 +143,8 @@ search:
 
   fields:
     category:
-      selector: a[href^="viewno18sb.php?cat="], a[href^="viewbrsb.php?cat="]
+      # the last selector is temporary as the site has apparently not yet updated their html for the cat links ;-)
+      selector: a[href^="viewno18sbx.php?cat="], a[href^="viewbrsb.php?cat="], a[href^="viewno18sb.php?cat="]
       attribute: href
       filters:
         - name: querystring

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

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

src/Jackett.Common/Definitions/sportscult.yml

@@ -20,22 +20,21 @@ caps:
     - {id: 29, cat: TV/Sport, desc: "Boxing"}
     - {id: 19, cat: TV/Sport, desc: "BrainGames"}
     - {id: 36, cat: TV/Sport, desc: "BreakDance"}
-    - {id: 40, cat: TV/Sport, desc: "Golf"}
     - {id: 23, cat: TV/Sport, desc: "Cycling"}
     - {id: 31, cat: TV/Sport, desc: "Documentary"}
     - {id: 1, cat: TV/Sport, desc: "European Basketball"}
-    - {id: 6, cat: TV/Sport, desc: "European Soccer"}
     - {id: 37, cat: TV/Sport, desc: "Extreme Sports"}
     - {id: 9, cat: TV/Sport, desc: "Fight Sports"}
     - {id: 32, cat: TV/Sport, desc: "Formula1"}
     - {id: 45, cat: TV/Sport, desc: "GAA (Gaelic)"}
-    - {id: 8, cat: TV/Sport, desc: "Golf"}
     - {id: 22, cat: TV/Sport, desc: "Gymnastics"}
+    - {id: 59, cat: TV/Sport, desc: "UFL"}
     - {id: 39, cat: TV/Sport, desc: "Handball"}
     - {id: 2, cat: TV/Sport, desc: "International Basket"}
     - {id: 25, cat: TV/Sport, desc: "IceHockey"}
     - {id: 4, cat: TV/Sport, desc: "International Soccer"}
     - {id: 42, cat: TV/Sport, desc: "KHL"}
+    - {id: 55, cat: TV/Sport, desc: "MotoGP"}
     - {id: 35, cat: TV/Sport, desc: "KickBoxing/Muay Thai"}
     - {id: 43, cat: TV/Sport, desc: "La Liga"}
     - {id: 15, cat: TV/Sport, desc: "MotorSport"}
@@ -51,14 +50,56 @@ caps:
     - {id: 38, cat: TV/Sport, desc: "Snooker/Pool"}
     - {id: 30, cat: TV/Sport, desc: "Streetball"}
     - {id: 18, cat: TV/Sport, desc: "Swimming/Aquatics"}
+    - {id: 56, cat: TV/Sport, desc: "Ligue1"}
     - {id: 46, cat: TV/Sport, desc: "AFL(AustralianFB)"}
     - {id: 12, cat: TV/Sport, desc: "Tennis"}
-    - {id: 20, cat: TV/Sport, desc: "Volleyball/Beach"}
+    - {id: 20, cat: TV/Sport, desc: "Volleyball"}
     - {id: 21, cat: TV/Sport, desc: "Weightlifting"}
     - {id: 16, cat: TV/Sport, desc: "WinterSport"}
     - {id: 33, cat: TV/Sport, desc: "Wrestling/Grapling"}
     - {id: 48, cat: TV/Sport, desc: "Uncategorised"}
+    - {id: 60, cat: TV/Sport, desc: "Champions League"}
+    - {id: 61, cat: TV/Sport, desc: "Europa League"}
+    - {id: 63, cat: TV/Sport, desc: "WNBA"}
+    - {id: 64, cat: TV/Sport, desc: "NASCAR"}
+    - {id: 65, cat: TV/Sport, desc: "FIBA 3x3 Basketball"}
+    - {id: 67, cat: TV/Sport, desc: "Bundesliga"}
+    - {id: 68, cat: TV/Sport, desc: "MLS"}
+    - {id: 69, cat: TV/Sport, desc: "EuroLeague Basketbal"}
+    - {id: 70, cat: TV/Sport, desc: "ELC"}
+    - {id: 71, cat: TV/Sport, desc: "RhythmicGymnastics"}
+    - {id: 72, cat: TV/Sport, desc: "BeachVolleyball"}
+    - {id: 73, cat: TV/Sport, desc: "BeachSoccer"}
+    - {id: 74, cat: TV/Sport, desc: "Chess"}
+    - {id: 75, cat: TV/Sport, desc: "Bowling"}
+    - {id: 76, cat: TV/Sport, desc: "BelgianProLeague"}
+    - {id: 77, cat: TV/Sport, desc: "Bellator"}
+    - {id: 78, cat: TV/Sport, desc: "Billard"}
+    - {id: 79, cat: TV/Sport, desc: "Climbing"}
+    - {id: 80, cat: TV/Sport, desc: "CrossFit"}
+    - {id: 81, cat: TV/Sport, desc: "DutchEredivisie"}
+    - {id: 82, cat: TV/Sport, desc: "IndyCar"}
+    - {id: 83, cat: TV/Sport, desc: "NbaGLeague"}
+    - {id: 84, cat: TV/Sport, desc: "NCAABasketball"}
+    - {id: 85, cat: TV/Sport, desc: "NCAAFootball"}
+    - {id: 86, cat: TV/Sport, desc: "Sailing"}
+    - {id: 87, cat: TV/Sport, desc: "Surfing"}
+    - {id: 88, cat: TV/Sport, desc: "TableTennis"}
+    - {id: 89, cat: TV/Sport, desc: "TourDeFrance"}
+    - {id: 90, cat: TV/Sport, desc: "LaVuelta"}
+    - {id: 91, cat: TV/Sport, desc: "Girod'Italia"}
+    - {id: 92, cat: TV/Sport, desc: "UefaConferenceLeague"}
+    - {id: 93, cat: TV/Sport, desc: "UEFAEuro"}
+    - {id: 94, cat: TV/Sport, desc: "OlympicGamesParis24"}
+    - {id: 95, cat: TV/Sport, desc: "WRCRally"}
+    - {id: 96, cat: TV/Sport, desc: "CPL"}
+    - {id: 97, cat: TV/Sport, desc: "CFL"}
+    - {id: 98, cat: TV/Sport, desc: "PrimeiraPortugal"}
     - {id: 53, cat: TV/Sport, desc: "Cricket"}
+    - {id: 6, cat: TV/Sport, desc: "European Soccer"}
+    - {id: 52, cat: TV/Sport, desc: "Field Hockey"}
+    - {id: 58, cat: TV/Sport, desc: "UFC"}
+    - {id: 57, cat: TV/Sport, desc: "NRL"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/teamctgame.yml

@@ -158,7 +158,6 @@ search:
     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 }}"
-    inclbookmarked: 0
     # 0 title, 1 descr, 3 uploader, 4 imdburl
     search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
     # 0 AND, 1 OR, 2 exact

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

@@ -0,0 +1,176 @@
+---
+id: theleachzone-api
+name: TheLeachZone (API)
+description: "The Leach Zone (TLZ) is a Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://tlzdigital.com/
+legacylinks:
+  - https://tlz.digital/
+
+caps:
+  categorymappings:
+    - {id: 2, cat: TV, desc: "TV"}
+    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 3, cat: Audio, desc: "Music"}
+    - {id: 4, cat: Books, desc: "Books"}
+    - {id: 5, cat: Console, desc: "Games"}
+    - {id: 6, cat: PC, desc: "Application"}
+    - {id: 7, cat: Other, desc: "Other"}
+
+  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://tlzdigital.com/\" target=\"_blank\">TLZ</a> account <i>Settings</i> page and clicking on the <b>API Key</b> tab."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: created_at
+    options:
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: /api/torrents
+  method: get
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
+search:
+  paths:
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
+    - path: "/api/torrents/filter"
+      response:
+        type: json
+
+  headers:
+    Authorization: ["Bearer {{ .Config.apikey }}"]
+
+  inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
+    name: "{{ .Keywords }}"
+    seasonNumber: "{{ .Query.Season }}"
+    episodeNumber: "{{ .Query.Ep }}"
+    imdbId: "{{ .Query.IMDBIDShort }}"
+    tmdbId: "{{ .Query.TMDBID }}"
+    tvdbId: "{{ .Query.TVDBID }}"
+    "free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
+  rows:
+    selector: data
+    attribute: attributes
+
+  fields:
+    category:
+      selector: category_id
+    title:
+      selector: name
+    details:
+      selector: details_link
+    download:
+      selector: download_link
+    infohash:
+      selector: info_hash
+    poster:
+      selector: meta.poster
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/90x135", ""]
+    imdbid:
+      selector: imdb_id
+    tmdbid:
+      selector: tmdb_id
+    tvdbid:
+      selector: tvdb_id
+    genre:
+      selector: meta.genres
+      filters:
+        - name: re_replace
+          args: ["(?i)^None$", ""]
+        - name: re_replace
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
+        - name: re_replace
+          args: ["(?i)(TV Movie)", "TV_Movie"]
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
+    files:
+      selector: num_file
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    date:
+      # "created_at": "2021-10-18T00:34:50.000000Z" is returned by Newtonsoft.Json.Linq as 18/10/2021 00:34:50
+      selector: created_at
+      filters:
+        - name: append
+          args: " +00:00" # GMT
+        - name: dateparse
+          args: "MM/dd/yyyy HH:mm:ss zzz"
+    size:
+      selector: size
+    downloadvolumefactor:
+      # api returns 0%, 25%, 50%, 75%, 100%
+      selector: freeleech
+      case:
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
+    uploadvolumefactor:
+      # api returns False, True
+      selector: double_upload
+      case:
+        False: 1 # normal
+        True: 2 # double
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      selector: freeleech
+      case:
+        100%: 172800 # freeleech 2 days (as seconds = 2 x 24 x 60 x 60)
+        "*": 129600 # normal 36h (as seconds = 36 x 60 x 60)
+# json UNIT3D 7.2.5

src/Jackett.Common/Definitions/theleachzone.yml

@@ -1,188 +0,0 @@
----
-id: theleachzone
-name: TheLeachZone
-description: "The Leach Zone (TLZ) is a Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://tlz.digital/
-
-caps:
-  categorymappings:
-    - {id: 21, cat: PC, desc: "Appz"}
-    - {id: 35, cat: Books/Comics, desc: "Comics/Mags"}
-    - {id: 27, cat: Books/EBook, desc: "E-Books"}
-    - {id: 28, cat: Console, desc: "Games/Console"}
-    - {id: 22, cat: PC/Games, desc: "Games"}
-    - {id: 33, cat: PC/Games, desc: "Games/PC"}
-    - {id: 23, cat: Other, desc: "Misc"}
-    - {id: 26, cat: Movies/SD, desc: "Movies/Cam"}
-    - {id: 36, cat: Movies/Foreign, desc: "Movies/Foreign"}
-    - {id: 11, cat: Movies/HD, desc: "Movies/HD"}
-    - {id: 3, cat: Movies, desc: "Movies/Packs"}
-    - {id: 24, cat: Movies/SD, desc: "Movies/SD"}
-    - {id: 30, cat: Movies/UHD, desc: "Movies/UHD"}
-    - {id: 37, cat: Movies/WEB-DL, desc: "Movies/Web-DL"}
-    - {id: 20, cat: Audio/Lossless, desc: "Music/FLAC"}
-    - {id: 4, cat: Audio/MP3, desc: "Music/MP3"}
-    - {id: 17, cat: Audio, desc: "Music/Packs"}
-    - {id: 34, cat: Audio/Video, desc: "Music/Video"}
-    - {id: 31, cat: TV/Anime, desc: "TV/Anime"}
-    - {id: 18, cat: TV/HD, desc: "TV/HD"}
-    - {id: 16, cat: TV, desc: "TV/Packs"}
-    - {id: 19, cat: TV/SD, desc: "TV/SD"}
-    - {id: 29, cat: TV/UHD, desc: "TV/UHD"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, genre]
-    movie-search: [q, genre]
-    music-search: [q, genre]
-    book-search: [q, genre]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 4
-    options:
-      4: created
-      7: seeders
-      5: size
-      1: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
-  - name: info_activity
-    type: info
-    label: Account Inactivity
-    default: "Accounts inactive for more than 42 days are automatically deleted."
-
-login:
-  path: login.php
-  method: form
-  form: form[action="takelogin.php"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    use_ssl: 1
-    perm_ssl: ""
-    returnto: /
-  error:
-    - selector: table.main:contains("Login failed!")
-      message:
-        selector: table tr td.colhead2
-  test:
-    path: /
-    selector: a[href*="logout.php?hash_please="]
-
-search:
-  paths:
-    # https://tlz.digital/browse.php?c21=1&c22=1&c23=1&search=&searchin=title&incldead=0&sort=4&type=desc
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.Genre }}{{ .Query.Genre }} {{ else }}{{ end }}{{ .Keywords }}"
-    # title, descr, genre, all
-    searchin: "{{ if .Query.Genre }}all{{ else }}title{{ end }}"
-    # 0 active, 1 incldead, 2 onlydead
-    incldead: 1
-    only_free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-
-  keywordsfilters:
-    - name: re_replace
-      args: ["(\\w+)", "+$1"] # prepend + to each word
-
-  rows:
-    selector: table.table-bordered tr:has(a[href^="download.php?torrent="])
-
-  fields:
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: a[href^="details.php?id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "Tip\\('<b>(.+?)</b>"
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?torrent="]
-      attribute: href
-    poster:
-      selector: a[href^="details.php?id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: src=\\'(.+?)\\'
-        - name: replace
-          args: ["./pic/noposter.png", ""]
-    genre:
-      selector: i
-    description:
-      text: "{{ .Result.genre }}"
-    files:
-      selector: td:nth-child(5)
-    date_day:
-      selector: td:nth-child(7):contains("day")
-      # auto adjusted by site account profile
-      optional: true
-      filters:
-        - name: fuzzytime
-    date_year:
-      selector: td:nth-child(7):not(:contains("day"))
-      # auto adjusted by site account profile
-      optional: true
-      filters:
-        - name: dateparse
-          args: "MMM d yyyy hh:mm tt"
-    date:
-      text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
-    size:
-      selector: td:nth-child(8)
-    grabs:
-      selector: td:nth-child(9)
-    seeders:
-      selector: td:nth-child(10)
-    leechers:
-      selector: td:nth-child(11)
-    downloadvolumefactor:
-      case:
-        "a.info:contains(\"[FREE]\")": 0
-        "a.info:contains(\"[SILVER]\")": 0.5
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# U-232 V5

src/Jackett.Common/Definitions/tocashare.yml

@@ -42,10 +42,6 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
-  - name: single_file_release_use_filename
-    type: checkbox
-    label: Use filename as title for single file releases
-    default: true
   - name: sort
     type: select
     label: Sort requested from site
@@ -98,7 +94,7 @@ search:
     "free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
-    perPage: 75
+    perPage: 100
 
   keywordsfilters:
     - name: re_replace
@@ -111,15 +107,10 @@ search:
   fields:
     category:
       selector: category_id
-    title_optional:
+    title:
       selector: name
-    title_filename:
-      selector: "files[0].name"
-      optional: true
     files:
       selector: num_file
-    title:
-      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
     details:
       selector: details_link
     download:
@@ -140,6 +131,8 @@ search:
     genre:
       selector: meta.genres
       filters:
+        - name: re_replace
+          args: ["(?i)^None$", ""]
         - name: re_replace
           args: ["(?i)(Cinema TV)", "Cinema_TV"]
         - name: re_replace
@@ -186,4 +179,4 @@ search:
     minimumseedtime:
       # 5 days (as seconds = 5 x 24 x 60 x 60)
       text: 432000
-# json UNIT3D 8.0.2
+# json UNIT3D 7.2.0

src/Jackett.Common/Definitions/torlock.yml

@@ -6,24 +6,18 @@ language: en-US
 type: public
 encoding: UTF-8
 requestDelay: 2
-certificates:
-  - 1fe945ddaa652aa3c5fd894a569873aa62cc6937 # expired 12 Apr 2024
 links:
   - https://www.torlock.com/
   - https://www.torlock2.com/
-  - https://torlock.unblockit.casa/
 legacylinks:
   - https://torlock.com/
   - https://www.torlock.icu/
-  - https://torlock.unblockit.bio/
-  - https://torlock.unblockit.boo/
   - https://torlock.mrunblock.guru/
   - https://torlock.unblockit.click/
   - https://torlock.unblockit.asia/
   - https://torlock.mrunblock.life/
   - https://torlock.unblockit.mov/
   - https://torlock.unblockit.rsvp/
-  - https://torlock.nocensor.click/
   - https://torlock.unblockit.vegas/
   - https://torlock.unblockit.esq/
   - https://torlock.unblockit.zip/
@@ -34,6 +28,9 @@ legacylinks:
   - https://torlock.unblockit.date/
   - https://torlock.unblockit.dad/
   - https://torlock.unblockit.africa/
+  - https://torlock.unblockit.casa/
+  - https://torlock.unblockit.sbs/
+  - https://torlock.unblockit.ong/ # 502
 
 caps:
   # dont forget to update the search fields category case block

src/Jackett.Common/Definitions/tormac.yml

@@ -237,6 +237,7 @@ search:
       case:
         span.tor-approved: "Verified:"
         span.tor-not-approved: "Unverified:"
+        span.tor-dup: "Temporary:"
     description:
       selector: a[href^="./viewtopic.php?t="]
       filters:

src/Jackett.Common/Definitions/torrent9.yml

@@ -9,7 +9,7 @@ followredirect: true
 testlinktorrent: false
 links:
   - https://www.torrent9.se/
-  - https://torrent9.ninjaproxy1.com/
+  - https://torrent9.to/
   - https://torrent9.proxyninja.org/
 legacylinks:
   - https://ww1.torrent9.uno/
@@ -32,8 +32,8 @@ legacylinks:
   - https://www.torrent9.fi/ # this is the torrent9clone domain
   - https://torrent9.unblockninja.com/ # is a proxy for torrent9clone
   - https://www.torrent9.fm/
-  - https://torrent9.to/ # no response data
   - https://torrent9.se/ # redirect to www.
+  - https://torrent9.ninjaproxy1.com/ # no response data
 
 caps:
   # dont forget to update the search fields category case block

src/Jackett.Common/Definitions/torrent911.yml

@@ -7,17 +7,15 @@ type: public
 encoding: UTF-8
 # to fetch current domain use https://www.protege-torrent.com/Torrent911 and https://www.protege-torrent.com/T911 and https://www.protege-torrent.com/Oxtorrent
 links:
-  - https://www.oxtorrent.tf/
+  - https://www.oxtorrent.day/
   - https://oxtorrent.proxyninja.org/ # proxy for oxtorrent
 legacylinks:
   - https://www.protege-liens.com/
   - https://www.rantop.org/
-  - https://www.t911.me/
   - https://www.t911.tv/
   - https://torrent911.ws/
   - http://www.torrent911.ws/
   - https://www.torrent911.ws/
-  - https://www.torrent911.me/
   - https://t911.org/
   - https://www.torrent911.io/
   - https://www.torrent911.biz/
@@ -36,6 +34,7 @@ legacylinks:
   - https://www.oxtorrent.nl/
   - https://www.oxtorrent.sbs/
   - https://www.oxtorrent.wtf/
+  - https://www.oxtorrent.tf/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrent9clone.yml

@@ -8,15 +8,12 @@ encoding: UTF-8
 followredirect: true
 # to fetch current domain use https://www.protege-torrent.com/Torrent9
 links:
-  - https://www.torrent9.sb/
+  - https://www.torrent9.day/
   - https://torrent9.unblockninja.com/
 legacylinks:
   - https://www.protege-liens.net/
   - https://www.rantop.org/
   - https://torrent9.nocensor.click/
-  - https://wwv.torrent9.moe/
-  - https://www.torrent9.pro/
-  - https://www.torrent9.gs/
   - https://www.torrent9.ps/
   - https://www.torrent9.ms/
   - https://www.torrent9.ink/
@@ -32,6 +29,8 @@ legacylinks:
   - https://www.torrent9.city/
   - https://www.torrent9.gy/
   - https://www.torrent9.sbs/
+  - https://www.torrent9.sb/
+  - https://www.torrent9.tf/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentby.yml

@@ -6,8 +6,6 @@ language: ru-RU
 type: public
 encoding: UTF-8
 requestDelay: 5
-certificates:
-  - e924fc934b93f71f6af6b9c525fd78f2ee587879 # expired 27 Apr 2024
 links:
   - https://torrent.by/
 legacylinks:

src/Jackett.Common/Definitions/torrentdownload.yml

@@ -7,17 +7,14 @@ type: public
 encoding: UTF-8
 links:
   - https://www.torrentdownload.info/
-  - https://torrentdownload.unblockit.casa/
+  - https://torrentdownload.unblockit.ong/
 legacylinks:
-  - https://torrentdownload.unblockit.bio/
-  - https://torrentdownload.unblockit.boo/
   - https://torrentdownload.mrunblock.guru/
   - https://torrentdownload.unblockit.click/
   - https://torrentdownload.unblockit.asia/
   - https://torrentdownload.unblockit.mov/
   - https://torrentdownload.mrunblock.life/
   - https://torrentdownload.unblockit.rsvp/
-  - https://torrentdownload.nocensor.click/
   - https://torrentdownload.unblockit.vegas/
   - https://torrentdownload.unblockit.esq/
   - https://torrentdownload.unblockit.zip/
@@ -28,6 +25,8 @@ legacylinks:
   - https://torrentdownload.unblockit.date/
   - https://torrentdownload.unblockit.dad/
   - https://torrentdownload.unblockit.africa/
+  - https://torrentdownload.unblockit.casa/
+  - https://torrentdownload.unblockit.sbs/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentdownloads.yml

@@ -7,14 +7,12 @@ type: public
 encoding: UTF-8
 links:
   - https://www.torrentdownloads.pro/
-  - https://torrentdownloads.unblockit.casa/
+  - https://torrentdownloads.unblockit.ong/
   - https://torrentdownloads.unblockninja.com/
   - https://torrentdownloads.ninjaproxy1.com/
   - https://torrentdownloads.proxyninja.org/
 legacylinks:
   - https://www.torrentdownloads.me/
-  - https://torrentdownloads.unblockit.bio/
-  - https://torrentdownloads.unblockit.boo/
   - https://www.torrentdownloads.info/
   - https://torrentdownloads.mrunblock.guru/
   - https://torrentdownloads.unblockit.click/
@@ -22,7 +20,6 @@ legacylinks:
   - https://torrentdownloads.unblockit.mov/
   - https://torrentdownloads.mrunblock.life/
   - https://torrentdownloads.unblockit.rsvp/
-  - https://torrentdownloads.nocensor.click/
   - https://torrentdownloads.unblockit.vegas/
   - https://torrentdownloads.unblockit.esq/
   - https://torrentdownloads.unblockit.zip/
@@ -33,6 +30,8 @@ legacylinks:
   - https://torrentdownloads.unblockit.date/
   - https://torrentdownloads.unblockit.dad/
   - https://torrentdownloads.unblockit.africa/
+  - https://torrentdownloads.unblockit.casa/
+  - https://torrentdownloads.unblockit.sbs/
 
 caps:
   categorymappings:

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

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

src/Jackett.Common/Definitions/torrentfunk.yml

@@ -8,19 +8,15 @@ encoding: UTF-8
 links:
   - https://www.torrentfunk.com/
   - https://www.torrentfunk2.com/
-  - https://torrentfunk.unblockit.casa/
   - https://torrentfunk.ninjaproxy1.com/
   - https://torrentfunk.proxyninja.org/
 legacylinks:
-  - https://torrentfunk.unblockit.bio/
-  - https://torrentfunk.unblockit.boo/
   - https://torrentfunk.mrunblock.guru/
   - https://torrentfunk.unblockit.click/
   - https://torrentfunk.unblockit.asia/
   - https://torrentfunk.mrunblock.life/
   - https://torrentfunk.unblockit.mov/
   - https://torrentfunk.unblockit.rsvp/
-  - https://torrentfunk.nocensor.click/
   - https://torrentfunk.unblockit.vegas/
   - https://torrentfunk.unblockit.esq/
   - https://torrentfunk.unblockit.zip/
@@ -31,6 +27,9 @@ legacylinks:
   - https://torrentfunk.unblockit.date/
   - https://torrentfunk.unblockit.dad/
   - https://torrentfunk.unblockit.africa/
+  - https://torrentfunk.unblockit.casa/
+  - https://torrentfunk.unblockit.sbs/
+  - https://torrentfunk.unblockit.ong/ # 502
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentgalaxy.yml

@@ -20,12 +20,6 @@ legacylinks:
   - https://torrentgalaxy.nocensor.biz/
   - https://torrentgalaxy.nocensor.sbs/
   - https://torrentgalaxy.nocensor.world/
-  - https://torrentgalaxy.unblockit.cat/
-  - https://torrentgalaxy.unblockit.nz/
-  - https://torrentgalaxy.unblockit.page/
-  - https://torrentgalaxy.unblockit.pet/
-  - https://torrentgalaxy.unblockit.ink/
-  - https://torrentgalaxy.unblockit.bio/
   - https://torrentgalaxy.su/
   - https://torrentgalaxy.unblockit.click/
   - https://torrentgalaxy.unblockit.asia/

src/Jackett.Common/Definitions/torrentqq.yml

@@ -7,23 +7,23 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentqq308.com/
+  - https://torrentqq317.com/
 legacylinks:
-  - https://torrentqq292.com/
-  - https://torrentqq293.com/
-  - https://torrentqq294.com/
-  - https://torrentqq295.com/
-  - https://torrentqq296.com/
-  - https://torrentqq297.com/
-  - https://torrentqq298.com/
-  - https://torrentqq299.com/
-  - https://torrentqq301.com/
   - https://torrentqq302.com/
   - https://torrentqq303.com/
   - https://torrentqq304.com/
   - https://torrentqq305.com/
   - https://torrentqq306.com/
   - https://torrentqq307.com/
+  - https://torrentqq308.com/
+  - https://torrentqq309.com/
+  - https://torrentqq310.com/
+  - https://torrentqq311.com/
+  - https://torrentqq312.com/
+  - https://torrentqq313.com/
+  - https://torrentqq314.com/
+  - https://torrentqq315.com/
+  - https://torrentqq316.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentsir.yml

@@ -7,14 +7,8 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentsir142.com/
+  - https://torrentsir145.com/
 legacylinks:
-  - http://torrentsir133.com/
-  - https://torrentsir133.com/
-  - http://torrentsir134.com/
-  - https://torrentsir134.com/
-  - http://torrentsir135.com/
-  - https://torrentsir135.com/
   - http://torrentsir136.com/
   - https://torrentsir136.com/
   - http://torrentsir137.com/
@@ -28,6 +22,12 @@ legacylinks:
   - http://torrentsir141.com/
   - https://torrentsir141.com/
   - http://torrentsir142.com/
+  - https://torrentsir142.com/
+  - http://torrentsir143.com/
+  - https://torrentsir143.com/
+  - http://torrentsir144.com/
+  - https://torrentsir144.com/
+  - http://torrentsir145.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/traht.yml

@@ -6,6 +6,8 @@ language: ru-RU
 type: public
 encoding: windows-1251
 links:
+  - https://traht.org/
+legacylinks:
   - http://traht.org/
 
 caps:

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

@@ -0,0 +1,191 @@
+---
+id: turkseed-api
+name: TurkSeed
+description: "TurkSeed is a TURKISH Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: tr-TR
+type: private
+encoding: UTF-8
+links:
+  - https://turkseed.com/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Film"}
+    - {id: 6, cat: TV, desc: "Dizi Show"}
+    - {id: 2, cat: Movies, desc: "Yerli Film"}
+    - {id: 5, cat: TV/Foreign, desc: "Yabanci Dizi"}
+    - {id: 3, cat: Console, desc: "Oyunlar"}
+    - {id: 13, cat: TV, desc: "AMAZON"}
+    - {id: 14, cat: TV, desc: "NETFLİX DIZI"}
+    - {id: 15, cat: TV, desc: "DİSNEY+ MOVIE"}
+    - {id: 16, cat: TV, desc: "TODD"}
+    - {id: 17, cat: TV, desc: "TV+"}
+    - {id: 18, cat: TV, desc: "BLUTV"}
+    - {id: 19, cat: TV, desc: "EXXEN"}
+    - {id: 20, cat: TV, desc: "NETFLIX BELGESEL"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
+    movie-search: [q, imdbid, tmdbid]
+
+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://turkseed.com/\" target=\"_blank\">TurkSeed</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: single_file_release_use_filename
+    type: checkbox
+    label: Use filename as title for single file releases
+    default: true
+  - name: sort
+    type: select
+    label: Sort requested from site
+    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
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Accounts that do not download a 15GB torrent from our site within a month will receive a warning (will be closed)! Accounts that do not upload (seed, share) 20gb on our site within a month will receive a warning (will be closed)! The account that receives three warnings will be automatically closed! No objections are accepted to the deletion of accounts that have not been on our site for six months and have not been active in any way!"
+
+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-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
+    - path: "/api/torrents/filter"
+      response:
+        type: json
+
+  headers:
+    Authorization: ["Bearer {{ .Config.apikey }}"]
+
+  inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
+    name: "{{ .Keywords }}"
+    seasonNumber: "{{ .Query.Season }}"
+    episodeNumber: "{{ .Query.Ep }}"
+    imdbId: "{{ .Query.IMDBIDShort }}"
+    tmdbId: "{{ .Query.TMDBID }}"
+    tvdbId: "{{ .Query.TVDBID }}"
+    "free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
+  rows:
+    selector: data
+    attribute: attributes
+
+  fields:
+    category:
+      selector: category_id
+    title_optional:
+      selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    files:
+      selector: num_file
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
+    details:
+      selector: details_link
+    download:
+      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)(Bilim Kurgu)", "Bilim_Kurgu"]
+        - name: re_replace
+          args: ["(?i)(Pembe Dizi)", "Pembe_Dizi"]
+        - name: re_replace
+          args: ["(?i)(TV film)", "TV_film"]
+        - name: re_replace
+          args: ["(?i)(Vahşi Batı)", "Vahşi_Batı"]
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    date:
+      # "created_at": "2021-10-18T00:34:50.000000Z" is returned by Newtonsoft.Json.Linq as 18/10/2021 00:34:50
+      selector: created_at
+      filters:
+        - name: append
+          args: " +00:00" # GMT
+        - name: dateparse
+          args: "MM/dd/yyyy HH:mm:ss zzz"
+    size:
+      selector: size
+    downloadvolumefactor:
+      # api returns 0%, 25%, 50%, 75%, 100%
+      selector: freeleech
+      case:
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
+    uploadvolumefactor:
+      # api returns False, True
+      selector: double_upload
+      case:
+        False: 1 # normal
+        True: 2 # double
+    minimumratio:
+      text: 0.6
+    minimumseedtime:
+      # 7 days (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
+# json UNIT3D 8.1.3

src/Jackett.Common/Definitions/tvroad.yml

@@ -1,240 +0,0 @@
----
-id: tvroad
-name: TvRoad
-description: "TvRoad is a FRENCH Private Torrent Tracker for TV"
-language: fr-FR
-type: private
-encoding: UTF-8
-links:
-  - https://tvroad.info/
-
-caps:
-  categorymappings:
-    - {id: anime-fr-720-non-non, cat: TV/Anime, desc: "Anime FR 720p"}
-    - {id: anime-fr-720-non-pack, cat: TV/Anime, desc: "Anime FR 720p Pack"}
-    - {id: anime-fr-720-web-non, cat: TV/Anime, desc: "Anime FR 720p"}
-    - {id: anime-fr-720-web-pack, cat: TV/Anime, desc: "Anime FR 720p Pack"}
-    - {id: anime-fr-1080-non-non, cat: TV/Anime, desc: "Anime FR 1080p"}
-    - {id: anime-fr-1080-non-pack, cat: TV/Anime, desc: "Anime FR 1080p Pack"}
-    - {id: anime-fr-1080-web-non, cat: TV/Anime, desc: "Anime FR 1080p WEB-DL"}
-    - {id: anime-fr-1080-web-pack, cat: TV/Anime, desc: "Anime FR 1080p Pack WEB-DL"}
-    - {id: anime-fr-sd-non-non, cat: TV/Anime, desc: "Anime FR SD"}
-    - {id: anime-fr-sd-non-pack, cat: TV/Anime, desc: "Anime FR SD Pack"}
-    - {id: anime-fr-sd-web-non, cat: TV/Anime, desc: "Anime FR SD WEB-DL"}
-    - {id: anime-fr-sd-web-pack, cat: TV/Anime, desc: "Anime FR SD Pack WEB-DL"}
-    - {id: anime-vostf-720-non-non, cat: TV/Anime, desc: "Anime VOSTFR 720p"}
-    - {id: anime-vostf-720-non-pack, cat: TV/Anime, desc: "Anime VOSTFR 720p Pack"}
-    - {id: anime-vostf-720-web-non, cat: TV/Anime, desc: "Anime VOSTFR 720p WEB-DL"}
-    - {id: anime-vostf-720-web-pack, cat: TV/Anime, desc: "Anime VOSTFR 720p Pack WEB-DL"}
-    - {id: anime-vostf-1080-non-non, cat: TV/Anime, desc: "Anime VOSTFR 1080p"}
-    - {id: anime-vostf-1080-non-pack, cat: TV/Anime, desc: "Anime VOSTFR 1080p Pack"}
-    - {id: anime-vostf-1080-web-non, cat: TV/Anime, desc: "Anime VOSTFR 1080p WEB-DL"}
-    - {id: anime-vostf-1080-web-pack, cat: TV/Anime, desc: "Anime VOSTFR 1080p Pack WEB-DL"}
-    - {id: anime-vostf-sd-non-non, cat: TV/Anime, desc: "Anime VOSTFR SD"}
-    - {id: anime-vostf-sd-non-pack, cat: TV/Anime, desc: "Anime VOSTFR SD Pack"}
-    - {id: anime-vostf-sd-web-non, cat: TV/Anime, desc: "Anime VOSTFR SD WEB-DL"}
-    - {id: anime-vostf-sd-web-pack, cat: TV/Anime, desc: "Anime VOSTFR SD Pack WEB-DL"}
-    - {id: anime-fr-2160-non-non, cat: TV/Anime, desc: "Anime FR 2160p"}
-    - {id: anime-fr-2160-non-pack, cat: TV/Anime, desc: "Anime FR 2160p Pack"}
-    - {id: anime-fr-2160-web-non, cat: TV/Anime, desc: "Anime FR 2160p WEB-DL"}
-    - {id: anime-fr-2160-web-pack, cat: TV/Anime, desc: "Anime FR 2160p Pack WEB-DL"}
-    - {id: anime-vostf-2160-non-non, cat: TV/Anime, desc: "Anime VOSTFR 2160p"}
-    - {id: anime-vostf-2160-non-pack, cat: TV/Anime, desc: "Anime VOSTFR 2160p Pack"}
-    - {id: anime-vostf-2160-web-non, cat: TV/Anime, desc: "Anime VOSTFR 2160p WEB-DL"}
-    - {id: anime-vostf-2160-web-pack, cat: TV/Anime, desc: "Anime VOSTFR 2160p Pack WEB-DL"}
-    - {id: docs-fr-720-non-non, cat: TV/Documentary, desc: "Docs FR 720p"}
-    - {id: docs-fr-720-non-pack, cat: TV/Documentary, desc: "Docs FR 720p Pack"}
-    - {id: docs-fr-720-web-non, cat: TV/Documentary, desc: "Docs FR 720p WEB-DL"}
-    - {id: docs-fr-720-web-pack, cat: TV/Documentary, desc: "Docs FR 720p Pack WEB-DL"}
-    - {id: docs-fr-1080-non-non, cat: TV/Documentary, desc: "Docs FR 1080p"}
-    - {id: docs-fr-1080-non-pack, cat: TV/Documentary, desc: "Docs FR 1080p Pack"}
-    - {id: docs-fr-1080-web-non, cat: TV/Documentary, desc: "Docs FR 1080p WEB-DL"}
-    - {id: docs-fr-1080-web-pack, cat: TV/Documentary, desc: "Docs FR 1080p Pack WEB-DL"}
-    - {id: docs-fr-sd-non-non, cat: TV/Documentary, desc: "Docs FR SD"}
-    - {id: docs-fr-sd-non-pack, cat: TV/Documentary, desc: "Docs FR SD Pack"}
-    - {id: docs-fr-sd-web-non, cat: TV/Documentary, desc: "Docs FR SD WEB-DL"}
-    - {id: docs-fr-sd-web-pack, cat: TV/Documentary, desc: "Docs FR SD Pack WEB-DL"}
-    - {id: docs-vostf-720-non-non, cat: TV/Documentary, desc: "Docs VOSTFR 720p"}
-    - {id: docs-vostf-720-non-pack, cat: TV/Documentary, desc: "Docs VOSTFR 720p Pack"}
-    - {id: docs-vostf-720-web-non, cat: TV/Documentary, desc: "Docs VOSTFR 720p WEB-DL"}
-    - {id: docs-vostf-720-web-pack, cat: TV/Documentary, desc: "Docs VOSTFR 720p Pack WEB-DL"}
-    - {id: docs-vostf-1080-non-non, cat: TV/Documentary, desc: "Docs VOSTFR 1080p"}
-    - {id: docs-vostf-1080-non-pack, cat: TV/Documentary, desc: "Docs VOSTFR 1080p Pack"}
-    - {id: docs-vostf-1080-web-non, cat: TV/Documentary, desc: "Docs VOSTFR 1080p WEB-DL"}
-    - {id: docs-vostf-1080-web-pack, cat: TV/Documentary, desc: "Docs VOSTFR 1080p Pack WEB-DL"}
-    - {id: docs-vostf-sd-non-non, cat: TV/Documentary, desc: "Docs VOSTFR SD"}
-    - {id: docs-vostf-sd-non-pack, cat: TV/Documentary, desc: "Docs VOSTFR SD Pack"}
-    - {id: docs-vostf-sd-web-non, cat: TV/Documentary, desc: "Docs VOSTFR SD WEB-DL"}
-    - {id: docs-vostf-sd-web-pack, cat: TV/Documentary, desc: "Docs VOSTFR SD Pack WEB-DL"}
-    - {id: docs-vostf-2160-non-non, cat: TV/Documentary, desc: "Docs VOSTFR 2160p"}
-    - {id: docs-vostf-2160-non-pack, cat: TV/Documentary, desc: "Docs VOSTFR 2160p Pack"}
-    - {id: docs-vostf-2160-web-non, cat: TV/Documentary, desc: "Docs VOSTFR 2160p WEB-DL"}
-    - {id: docs-vostf-2160-web-pack, cat: TV/Documentary, desc: "Docs VOSTFR 2160p Pack WEB-DL"}
-    - {id: docs-fr-2160-non-non, cat: TV/Documentary, desc: "Docs FR 2160p"}
-    - {id: docs-fr-2160-non-pack, cat: TV/Documentary, desc: "Docs FR 2160p Pack"}
-    - {id: docs-fr-2160-web-non, cat: TV/Documentary, desc: "Docs FR 2160p WEB-DL"}
-    - {id: docs-fr-2160-web-pack, cat: TV/Documentary, desc: "Docs FR 2160p Pack WEB-DL"}
-    - {id: serie-fr-720-non-non, cat: TV/HD, desc: "Serie FR 720p"}
-    - {id: serie-fr-720-non-pack, cat: TV/HD, desc: "Serie FR 720p Pack"}
-    - {id: serie-fr-720-web-non, cat: TV/HD, desc: "Serie FR 720p WEB-DL"}
-    - {id: serie-fr-720-web-pack, cat: TV/HD, desc: "Serie FR 720p Pack WEB-DL"}
-    - {id: serie-fr-1080-non-non, cat: TV/HD, desc: "Serie FR 1080p"}
-    - {id: serie-fr-1080-non-pack, cat: TV/HD, desc: "Serie FR 1080p Pack"}
-    - {id: serie-fr-1080-web-non, cat: TV/HD, desc: "Serie FR 1080p WEB-DL"}
-    - {id: serie-fr-1080-web-pack, cat: TV/HD, desc: "Serie FR 1080p Pack WEB-DL"}
-    - {id: serie-fr-sd-non-non, cat: TV/SD, desc: "Serie FR SD"}
-    - {id: serie-fr-sd-non-pack, cat: TV/SD, desc: "Serie FR SD Pack"}
-    - {id: serie-fr-sd-web-non, cat: TV/SD, desc: "Serie FR SD WEB-DL"}
-    - {id: serie-fr-sd-web-pack, cat: TV/SD, desc: "Serie FR SD Pack WEB-DL"}
-    - {id: serie-vostf-720-non-non, cat: TV/HD, desc: "Serie VOSTFR 720p"}
-    - {id: serie-vostf-720-non-pack, cat: TV/HD, desc: "Serie VOSTFR 720p Pack"}
-    - {id: serie-vostf-720-web-non, cat: TV/HD, desc: "Serie VOSTFR 720p WEB-DL"}
-    - {id: serie-vostf-720-web-pack, cat: TV/HD, desc: "Serie VOSTFR 720p Pack WEB-DL"}
-    - {id: serie-vostf-1080-non-non, cat: TV/HD, desc: "Serie VOSTFR 1080p"}
-    - {id: serie-vostf-1080-non-pack, cat: TV/HD, desc: "Serie VOSTFR 1080p Pack"}
-    - {id: serie-vostf-1080-web-non, cat: TV/HD, desc: "Serie VOSTFR 1080p WEB-DL"}
-    - {id: serie-vostf-1080-web-pack, cat: TV/HD, desc: "Serie VOSTFR 1080p Pack WEB-DL"}
-    - {id: serie-vostf-sd-non-non, cat: TV/SD, desc: "Serie VOSTFR SD"}
-    - {id: serie-vostf-sd-non-pack, cat: TV/SD, desc: "Serie VOSTFR SD Pack"}
-    - {id: serie-vostf-sd-web-non, cat: TV/SD, desc: "Serie VOSTFR SD WEB-DL"}
-    - {id: serie-vostf-sd-web-pack, cat: TV/SD, desc: "Serie VOSTFR SD Pack WEB-DL"}
-    - {id: serie-fr-2160-non-non, cat: TV/UHD, desc: "Serie FR 2160p"}
-    - {id: serie-fr-2160-non-pack, cat: TV/UHD, desc: "Serie FR 2160p Pack"}
-    - {id: serie-fr-2160-web-non, cat: TV/UHD, desc: "Serie FR 2160p WEB-DL"}
-    - {id: serie-fr-2160-web-pack, cat: TV/UHD, desc: "Serie FR 2160p Pack WEB-DL"}
-    - {id: serie-vostf-2160-non-non, cat: TV/UHD, desc: "Serie VOSTFR 2160p"}
-    - {id: serie-vostf-2160-non-pack, cat: TV/UHD, desc: "Serie VOSTFR 2160p Pack"}
-    - {id: serie-vostf-2160-web-non, cat: TV/UHD, desc: "Serie VOSTFR 2160p WEB-DL"}
-    - {id: serie-vostf-2160-web-pack, cat: TV/UHD, desc: "Serie VOSTFR 2160p Pack WEB-DL"}
-    - {id: tvreal-fr-720-non-non, cat: TV/HD, desc: "TvReal FR 720p"}
-    - {id: tvreal-fr-720-non-pack, cat: TV/HD, desc: "TvReal FR 720p Pack"}
-    - {id: tvreal-fr-720-web-non, cat: TV/HD, desc: "TvReal FR 720p WEB-DL"}
-    - {id: tvreal-fr-720-web-pack, cat: TV/HD, desc: "TvReal FR 720p Pack WEB-DL"}
-    - {id: tvreal-fr-1080-non-non, cat: TV/HD, desc: "TvReal FR 1080p"}
-    - {id: tvreal-fr-1080-non-pack, cat: TV/HD, desc: "TvReal FR 1080p"}
-    - {id: tvreal-fr-1080-web-non, cat: TV/HD, desc: "TvReal FR 1080p WEB-DL"}
-    - {id: tvreal-fr-1080-web-pack, cat: TV/HD, desc: "TvReal FR 1080p WEB-DL"}
-    - {id: tvreal-fr-sd-non-non, cat: TV/SD, desc: "TvReal FR SD"}
-    - {id: tvreal-fr-sd-non-pack, cat: TV/SD, desc: "TvReal FR SD Pack"}
-    - {id: tvreal-fr-sd-web-non, cat: TV/SD, desc: "TvReal FR SD WEB-DL"}
-    - {id: tvreal-fr-sd-web-pack, cat: TV/SD, desc: "TvReal FR SD Pack WEB-DL"}
-    - {id: tvreal-fr-2160-web-pack, cat: TV/UHD, desc: "TvReal FR 2160p Pack WEB-DL"}
-    - {id: other, cat: TV, desc: "Other - category was not specified"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: multilang
-    type: checkbox
-    label: Replace MULTi by another language in release name
-    default: false
-  - name: multilanguage
-    type: select
-    label: Replace MULTi by this language
-    default: FRENCH
-    options:
-      FRENCH: FRENCH
-      MULTi.FRENCH: MULTi.FRENCH
-      ENGLISH: ENGLISH
-      MULTi.ENGLISH: MULTi.ENGLISH
-      VOSTFR: VOSTFR
-      MULTi.VOSTFR: MULTi.VOSTFR
-  - name: vostfr
-    type: checkbox
-    label: Replace VOSTFR and SUBFRENCH with ENGLISH
-    default: false
-  - name: info_activity
-    type: info
-    label: Account Inactivity
-    default: "Any inactive account will be permanently deleted depending on your rank:<ul><li>User : Deletion after three months of inactivity</li><li>PowerUser : Deletion after six months of inactivity<li>Uploader : Deletion after six months of inactivity</li><li>TvRoadien : Deletion after twelve months of inactivity.</li></ul>"
-
-login:
-  path: TvRoad/Connexion
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: font[color="red"]
-  test:
-    path: TvRoad/Bienvenue
-    selector: a[href$="/TvRoad/Deconnexion"]
-
-search:
-  paths:
-    # https://tvroad.info/TvRoad/Torrents/Recherche?recherche=
-    - path: TvRoad/Torrents/Recherche
-  inputs:
-    recherche: "{{ .Keywords }}"
-    # type of search: un one of the words), tout (all of the words), exacte (exact match)
-    type: tout
-    # search location: nomtorrent (name), desctorrent (descr)
-    endroit: nomtorrent
-    # seeded: non (no), oui (yes), peuimporte (either)
-    tl: peuimporte
-    # does not support imdbid searches and does not return imdb link in results
-
-  rows:
-    selector: tr:has(a[href*="/Torrents/Telechargement/"])
-
-  fields:
-    category:
-      selector: a[href*="/SousCategories/"]
-      attribute: href
-      optional: true
-      default: other
-      filters:
-        - name: split
-          args: ["/", -1]
-    title_phase1:
-      selector: a.infobulletorrent
-      attribute: title
-    title_vostfr:
-      text: "{{ .Result.title_phase1 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)\\b(vostfr|subfrench)\\b", "ENGLISH"]
-    title_phase2:
-      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
-    title_multilang:
-      text: "{{ .Result.title_phase2 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)\\b(MULTI(?!.*(?:FRENCH|ENGLISH|VOSTFR)))\\b", "{{ .Config.multilanguage }}"]
-    title:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
-    details:
-      selector: a.infobulletorrent
-      attribute: href
-    download:
-      selector: a[href*="/Torrents/Telechargement/"]
-      attribute: href
-    poster:
-      selector: a.infobulletorrent img
-      attribute: src
-    date:
-      text: now
-    size:
-      selector: td.taillejour
-    grabs:
-      selector: td:nth-last-child(3)
-    seeders:
-      selector: b.seed
-    leechers:
-      selector: b.leech
-    downloadvolumefactor:
-      text: 1
-    uploadvolumefactor:
-      text: 1
-    minimumseedtime:
-      # 4 days (as seconds = 4 x 24 x 60 x 60)
-      text: 345600
-# TT3.0 FRENCH custom

src/Jackett.Common/Definitions/uniongang.yml

@@ -6,9 +6,10 @@ language: ru-RU
 type: private
 encoding: UTF-8
 links:
-  - https://www.uniongang.net/
+  - https://uniongang.net/
 legacylinks:
   - http://www.uniongang.net/
+  - https://www.uniongang.net/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/universaltorrents.yml

@@ -1,192 +0,0 @@
----
-id: universaltorrents
-name: Universal-Torrents
-description: "Universal-Torrents is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: de-DE
-type: private
-encoding: UTF-8
-links:
-  - https://uni-track.org/
-
-caps:
-  categorymappings:
-    - {id: 28, cat: Movies/SD, desc: "Filme SD"}
-    - {id: 32, cat: Movies/HD, desc: "Filme HD"}
-    - {id: 114, cat: Movies/UHD, desc: "Filme UHD"}
-    - {id: 140, cat: Movies/BluRay, desc: "Filme BluRay"}
-    - {id: 138, cat: Movies, desc: "Filme Pack`s"}
-    - {id: 60, cat: TV/SD, desc: "Serien SD"}
-    - {id: 57, cat: TV/HD, desc: "Serien HD"}
-    - {id: 139, cat: TV/UHD, desc: "Serien UHD"}
-    - {id: 59, cat: TV, desc: "Serien Pack`s"}
-    - {id: 110, cat: Audio/MP3, desc: "Audio MP3"}
-    - {id: 48, cat: Audio/Lossless, desc: "Audio Flac"}
-    - {id: 52, cat: Audio, desc: "Audio Pack"}
-    - {id: 63, cat: Audio/Audiobook, desc: "Audio Hörbuch"}
-    - {id: 120, cat: Audio/Video, desc: "Audio Videos"}
-    - {id: 12, cat: PC/0day, desc: "Apps Windows"}
-    - {id: 125, cat: PC/Mac, desc: "Apps Mac-OSX"}
-    - {id: 11, cat: PC/Mobile-Android, desc: "Apps Mobil"}
-    - {id: 141, cat: PC, desc: "Apps Other"}
-    - {id: 15, cat: TV/Documentary, desc: "Doku SD"}
-    - {id: 14, cat: TV/Documentary, desc: "Doku HD"}
-    - {id: 123, cat: TV/Documentary, desc: "Doku Reihe"}
-    - {id: 126, cat: PC/Mobile-Android, desc: "Spiel Mobil"}
-    - {id: 17, cat: PC/Games, desc: "Spiel PC"}
-    - {id: 24, cat: Console, desc: "Spiel Konsole"}
-    - {id: 121, cat: PC/Games, desc: "Spiel Wimmelbild"}
-    - {id: 61, cat: TV/Sport, desc: "Sport HD"}
-    - {id: 62, cat: TV/Sport, desc: "Sport SD"}
-    - {id: 96, cat: Books/Mags, desc: "ePaper Zeitungen"}
-    - {id: 136, cat: Books/EBook, desc: "ePaper E-Book"}
-    - {id: 137, cat: Books/Comics, desc: "ePaper Comics"}
-    - {id: 143, cat: Movies/Other, desc: "Trickfilm Anime"}
-    - {id: 144, cat: TV/Anime, desc: "Trickfilm Anime Serien"}
-    - {id: 145, cat: Movies/Other, desc: "Trickfilm Kids"}
-    - {id: 76, cat: XXX/SD, desc: "XXX SD"}
-    - {id: 73, cat: XXX/x264, desc: "XXX HD"}
-    - {id: 75, cat: XXX/Pack, desc: "XXX Pack"}
-    - {id: 142, cat: XXX/ImageSet, desc: "XXX Pic´s"}
-    - {id: 129, cat: Movies/SD, desc: "Internal Film SD"}
-    - {id: 128, cat: Movies/HD, desc: "Internal Film HD"}
-    - {id: 131, cat: TV/SD, desc: "Internal Serie SD"}
-    - {id: 130, cat: TV/HD, desc: "Internal Serien HD"}
-    - {id: 132, cat: Other, desc: "Internal Sonstiges"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Filter freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: added
-    options:
-      added: created
-      seeds: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Anzahl der Torrents beim Durchsuchen</b> <i>Torrents per page:</i> setting to <b>60</b> on your account profile. The default is <i>15</i>.
-  - name: info_activity
-    type: info
-    label: Account Inactivity
-    default: "Inactive accounts will be deactivated after 7 weeks and deleted after another 3 weeks."
-
-login:
-  path: login.php
-  method: form
-  cookies: ["JAVA=OK"] # avoid jscheck redirect
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: div#login_error
-  test:
-    path: index.php
-    selector: a[href="logout.php"]
-
-search:
-  paths:
-    - path: selection.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    # 0 name, 1 descr, 2 both
-    blah: 2
-    orderby: "{{ .Config.sort }}"
-    sort: "{{ .Config.type }}"
-    # site does not support imdbid searching or display imdb links in results.
-
-  rows:
-    selector: "div.selection_wrap{{ if .Config.freeleech }}:has(:root:has(div.onlyup)){{ else }}{{ end }}"
-    filters:
-      - name: andmatch
-
-  fields:
-    category_p1:
-      selector: div.kat_cat_pic_name
-    category_p2:
-      selector: div.kat_cat_pic_name_b
-    categorydesc:
-      text: "{{ .Result.category_p1 }} {{ .Result.category_p2 }}"
-    title:
-      selector: a[href^="details.php?id="]
-      filters:
-        - name: re_replace
-          args: ["^\\[.+?\\]\\s?", ""]
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download_ssl.php?torrent="]
-      attribute: href
-    poster:
-      selector: div[id^="details"] img
-      attribute: src
-    size:
-      selector: div.selection_unter_ad
-    date_day:
-      # Heute 13:30:04
-      # Gestern 09:10:10
-      selector: div.selection_unter_ab:not(:contains("."))
-      optional: true
-      filters:
-        - name: replace
-          args: ["Heute", "Today"]
-        - name: replace
-          args: ["Gestern", "Yesterday"]
-    date_year:
-      # 30.02.2018 um 23:12:50
-      selector: div.selection_unter_ab:contains(".")
-      optional: true
-      filters:
-        - name: replace
-          args: [" um", ""]
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "dd.MM.yyyy HH:mm:ss zzz"
-    date:
-      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
-    grabs:
-      selector: div.selection_unter_ae
-    seeders:
-      selector: div.selection_unter_aa
-    leechers:
-      selector: div.selection_unter_aaa
-    downloadvolumefactor:
-      case:
-        ":root:has(div.onlyup)": 0 # GLobal Freeleech event
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# 3xT

src/Jackett.Common/Definitions/uploadcx.yml

@@ -53,7 +53,7 @@ settings:
   - name: info_activity
     type: info
     label: Account Inactivity
-    default: "All members of ULCX must engage with the site, through either logging in or navigating upload.cx. Any account that remains inactive for over four months will be deactivated and pruned after an additional four months of deactivation."
+    default: "All members must engage with the site, through either logging in or navigating upload.cx. Any account that remains inactive for over two months will be deactivated and pruned after an additional two months of deactivation."
 
 login:
   path: /api/torrents
@@ -86,7 +86,7 @@ search:
     "free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
-    perPage: 100
+    perPage: 25
 
   keywordsfilters:
     - name: re_replace
@@ -168,10 +168,10 @@ search:
       case:
         False: 1 # normal
         True: 2 # double
-# global MR is 0.6 but torrents must be seeded for 2 days regardless of ratio
+# global MR is 0.4 but torrents must be seeded for 2 days regardless of ratio
 #    minimumratio:
-#      text: 0.6
+#      text: 0.4
     minimumseedtime:
       # 2 day (as seconds = 2 x 24 x 60 x 60)
       text: 172800
-# json UNIT3D 8.0.2
+# json UNIT3D 8.0.2 (custom)

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

@@ -142,7 +142,8 @@ search:
     files:
       selector: a[href$="filelist=1"]
     date:
-      selector: td:nth-child(7)
+      selector: td:nth-child(7) span
+      attribute: title
       filters:
         - name: append
           args: " +01:00" # CET

src/Jackett.Common/Definitions/yggcookie.yml

@@ -1,17 +1,15 @@
 ---
 id: yggcookie
-name: YGGcookie
-description: "YGGTorrent is a FRENCH Semi-Private Torrent Tracker for 0DAY / GENERAL"
+name: YGG cookie
+description: "YggTorrent (YGG) is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL. This indexer uses cookie login."
 language: fr-FR
-type: semi-private
+type: private
 encoding: UTF-8
 followredirect: true
 requestDelay: 2
 links:
-  - https://www3.yggtorrent.cool/
+  - https://www.ygg.re/
 legacylinks:
-  - https://ww3.yggtorrent.si/
-  - https://yggtorrent.si/
   - http://www2.yggtorrent.si/
   - https://www2.yggtorrent.si/
   - https://www.yggtorrent.li/
@@ -26,6 +24,7 @@ legacylinks:
   - https://www3.yggtorrent.do/
   - https://www3.yggtorrent.wtf/
   - https://www3.yggtorrent.qa/
+  - https://www3.yggtorrent.cool/
 
 caps:
   # dont forget to update the search fields category case block
@@ -182,7 +181,7 @@ login:
     cookie: "{{ .Config.cookie }}"
   test:
     path: /
-    selector: div#top_panel:contains("Déconnexion")
+    selector: a[href$="/user/logout"]
 
 search:
   paths:

src/Jackett.Common/Definitions/yggtorrent.yml

@@ -1,17 +1,15 @@
 ---
 id: yggtorrent
-name: YGGtorrent
-description: "YGGTorrent is a FRENCH Semi-Private Torrent Tracker for 0DAY / GENERAL"
+name: YggTorrent
+description: "YggTorrent (YGG) is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: fr-FR
-type: semi-private
+type: private
 encoding: UTF-8
 followredirect: true
 requestDelay: 2
 links:
-  - https://www3.yggtorrent.cool/
+  - https://www.ygg.re/
 legacylinks:
-  - https://ww3.yggtorrent.si/
-  - https://yggtorrent.si/
   - http://www2.yggtorrent.si/
   - https://www2.yggtorrent.si/
   - https://www.yggtorrent.li/
@@ -26,6 +24,7 @@ legacylinks:
   - https://www3.yggtorrent.do/
   - https://www3.yggtorrent.wtf/
   - https://www3.yggtorrent.qa/
+  - https://www3.yggtorrent.cool/
 
 caps:
   # dont forget to update the search fields category case block
@@ -170,16 +169,13 @@ settings:
 
 login:
   method: form
-  path: /
-  form: "#user-login"
+  path: /auth/login
+  form: form[action="/auth/process_login"]
   inputs:
     id: "{{ .Config.username }}"
     pass: "{{ .Config.password }}"
-    ci_csrf_token: ""
   error:
-    - selector: "#login_msg_pass[style=\"\"][style] > center"
-    - selector: "#ban_msg_login[style=\"\"][style] > center"
-    - selector: "#login_msg_mail[style=\"\"][style] > center"
+    - selector: p.error-form
     - selector: a[href$="/user/disabled"]
       message:
         # Compte Inactif
@@ -189,7 +185,7 @@ login:
             args: " - Dès que vous passez en dessous d'un ratio inférieur à 1, Votre compte devient inactif et le site vous coupe les téléchargements."
   test:
     path: /
-    selector: div#top_panel:contains("Déconnexion")
+    selector: a[href$="/user/logout"]
 
 search:
   paths:

src/Jackett.Common/Definitions/yts.yml

@@ -14,14 +14,12 @@ links:
   - https://yts.am/
   - https://yts.ag/
   - https://yts.abcproxy.org/
-  - https://yts.unblockit.casa/
+  - https://yts.unblockit.ong/
   - https://yts.unblockninja.com/
   - https://yts.ninjaproxy1.com/
   - https://yts.proxyninja.org/
   - https://yts.torrentbay.st/
 legacylinks:
-  - https://yts.nocensor.art/
-  - https://yts.unblockit.bio/
   - https://yts.unblockit.boo/
   - https://yts.mrunblock.guru/
   - https://yts.unblockit.click/
@@ -29,7 +27,6 @@ legacylinks:
   - https://yts.unblockit.mov/
   - https://yts.mrunblock.life/
   - https://yts.unblockit.rsvp/
-  - https://yts.nocensor.click/
   - https://yts.unblockit.vegas/
   - https://yts.unblockit.esq/
   - https://yts.unblockit.zip/
@@ -40,6 +37,8 @@ legacylinks:
   - https://yts.unblockit.date/
   - https://yts.unblockit.dad/
   - https://yts.unblockit.africa/
+  - https://yts.unblockit.casa/
+  - https://yts.unblockit.sbs/
 
 caps:
   categorymappings:

src/Jackett.Common/Indexers/DonTorrent.cs

@@ -27,10 +27,10 @@ namespace Jackett.Common.Indexers
         public override string Name => "DonTorrent";
         public override string Description => "DonTorrent is a SPANISH public tracker for MOVIES / TV / GENERAL";
         // in the event the redirect is inactive https://t.me/s/dontorrent should have the latest working domain
-        public override string SiteLink { get; protected set; } = "https://dontorrent.miami/";
+        public override string SiteLink { get; protected set; } = "https://dontorrent.icu/";
         public override string[] AlternativeSiteLinks => new[]
         {
-            "https://dontorrent.miami/",
+            "https://dontorrent.icu/",
             "https://todotorrents.org/",
             "https://tomadivx.net/",
             "https://seriesblanco.one/",
@@ -39,9 +39,6 @@ namespace Jackett.Common.Indexers
         };
         public override string[] LegacySiteLinks => new[]
         {
-            "https://dontorrent.wales/",
-            "https://dontorrent.nagoya/",
-            "https://dontorrent.contact/",
             "https://dontorrent.cymru/",
             "https://dontorrent.capetown/",
             "https://dontorrent.yokohama/",
@@ -54,6 +51,9 @@ namespace Jackett.Common.Indexers
             "https://dontorrent.skin/",
             "https://dontorrent.directory/",
             "https://dontorrent.boutique/",
+            "https://dontorrent.miami/",
+            "https://dontorrent.business/",
+            "https://dontorrent.clothing/",
         };
         public override string Language => "es-ES";
         public override string Type => "public";
@@ -275,8 +275,7 @@ namespace Jackett.Common.Indexers
         private async Task<List<ReleaseInfo>> PerformQuerySearch(TorznabQuery query, bool matchWords)
         {
             var releases = new List<ReleaseInfo>();
-            // search only the longest word, we filter the results later
-            var searchTerm = GetLongestWord(query.SearchTerm);
+            var searchTerm = query.SearchTerm;
             var url = SiteLink + SearchUrl + searchTerm;
             var result = await RequestWithCookiesAsync(url, referer: url);
             if (result.Status != HttpStatusCode.OK)
@@ -737,18 +736,6 @@ namespace Jackett.Common.Indexers
                 .FirstOrDefault();
         }
 
-        private static string GetLongestWord(string text)
-        {
-            var words = text.Split(' ');
-            if (!words.Any())
-                return null;
-            var longestWord = words.First();
-            foreach (var word in words)
-                if (word.Length >= longestWord.Length)
-                    longestWord = word;
-            return longestWord;
-        }
-
         private static DateTime TryToParseDate(string dateToParse, DateTime dateDefault)
         {
             try

src/Jackett.Common/Indexers/EpubLibre.cs

@@ -26,13 +26,10 @@ namespace Jackett.Common.Indexers
         public override string[] AlternativeSiteLinks => new[]
         {
             "https://www.epublibre.org/",
-            "https://epublibre.unblockit.casa/"
         };
         public override string[] LegacySiteLinks => new[]
         {
             "https://epublibre.org/",
-            "https://epublibre.unblockit.bio/",
-            "https://epublibre.unblockit.boo/",
             "https://epublibre.unblockit.click/",
             "https://epublibre.unblockit.asia/",
             "https://epublibre.unblockit.mov/",
@@ -45,6 +42,9 @@ namespace Jackett.Common.Indexers
             "https://epublibre.unblockit.date/",
             "https://epublibre.unblockit.dad/",
             "https://epublibre.unblockit.africa/",
+            "https://epublibre.unblockit.casa/",
+            "https://epublibre.unblockit.sbs/", // empty response
+            "https://epublibre.unblockit.ong/", // empty response
         };
         public override string Language => "es-ES";
         public override string Type => "public";

src/Jackett.Common/Indexers/LostFilm.cs

@@ -24,19 +24,21 @@ namespace Jackett.Common.Indexers
         public override string Id => "lostfilm";
         public override string Name => "LostFilm.tv";
         public override string Description => "Unique portal about foreign series";
-        public override string SiteLink { get; protected set; } = "https://www.lostfilm.life/";
+        public override string SiteLink { get; protected set; } = "https://www.lostfilm.tv/";
         public override string[] AlternativeSiteLinks => new[]
         {
-            // Uptrends.com uptime checkpoints // Uptimia.com availability locations
-            "https://www.lostfilm.life/", // 43/43 // 41/47
-            "https://www.lostfilmtv5.site/", // 43/43 // 40/42
-            "https://www.lostfilmtv2.site/", // 43/43 // 38/46
-            "https://www.lostfilmtv3.site/", // 43/43 // 33/40
-            "https://www.lostfilm.tv/", // 39/43 // 32/42
-            "https://www.lostfilm.uno/", // 27/43 // 30/46
-            "https://www.lostfilm.win/", // 27/43 // 29/42
-            "https://www.lostfilm.tw/", // 26/43 // 33/46
-            "https://www.lostfilmtv.site/", // 18/43 // 17/45
+            // Uptrends.com uptime checkpoints // Uptime.com availability locations
+            "https://www.lostfilm.tv/", // 43/43 // 9/9
+            "https://www.lostfilmtv.site/", // 43/43 // 9/9
+            "https://www.lostfilmtv5.site/", // 43/43 // 9/9
+            "https://www.lostfilmtv2.site/", // 43/43 // 9/9
+            "https://www.lostfilmtv3.site/", // 43/43 // 9/9
+            "https://www.lostfilm.today/", // 43/43 // 9/9
+            "https://www.lostfilm.download/", // 43/43 // 9/9
+            "https://www.lostfilm.life/", // 27/43 // 6/9
+            "https://www.lostfilm.uno/", // 25/43 // 7/9
+            "https://www.lostfilm.win/", // 25/43 // 7/9
+            "https://www.lostfilm.tw/", // 25/43 // 7/9
         };
         public override string[] LegacySiteLinks => new[]
         {

src/Jackett.Common/Indexers/Wolfmax4K.cs

@@ -213,7 +213,7 @@ namespace Jackett.Common.Indexers
             // replace punctuation symbols with spaces
             // searchTerm = Marco Polo 2014
             searchTerm = Regex.Replace(searchTerm, @"[-._\(\)@/\\\[\]\+\%]", " ");
-            searchTerm = Regex.Replace(searchTerm, @"\s+", " ");
+            searchTerm = Regex.Replace(searchTerm, @"\s+", "+");
             searchTerm = searchTerm.Trim();
 
             // we parse the year and remove it from search

src/Jackett.Common/Jackett.Common.csproj

@@ -24,7 +24,7 @@
     <PackageReference Include="MimeMapping" Version="1.0.1.50" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NLog" Version="5.1.2" />
-    <PackageReference Include="Polly" Version="8.3.1" />
+    <PackageReference Include="Polly" Version="8.4.0" />
     <PackageReference Include="SharpZipLib" Version="1.4.2" />
     <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
     <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.1" />

src/Jackett.IntegrationTests/Jackett.IntegrationTests.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
     <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
     <PackageReference Include="Selenium.Chrome.WebDriver" Version="85.0.0" />