torrentsir: bump domain

Co-authored-by: ilike2burnthing <59480337+ilike2burnthing@users.noreply.github.com>

.github/ISSUE_TEMPLATE/bug_report.yml

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

.github/workflows/codeql-analysis.yml

@@ -33,11 +33,16 @@ on:
       - '!src/Jackett.Test/**'
   schedule:
     - cron: '00 00 * * 5'
+  
+concurrency: 
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   analyze:
     name: Analyze
     runs-on: windows-2022
+    if: github.repository == 'Jackett/Jackett'
     permissions:
       actions: read
       contents: read
@@ -52,11 +57,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -68,7 +73,7 @@ jobs:
     # If this step fails, then you should remove it and run the build manually (see below)
 
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -82,4 +87,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/issuebot.yml

@@ -16,6 +16,7 @@ jobs:
   redeliver-failed-deliveries:
     name: Redeliver failed deliveries
     runs-on: ubuntu-latest
+    if: github.repository == 'Jackett/Jackett'
     steps:
       # This workflow will run a script that is stored in the repository. This step checks out the repository contents so that the workflow can access the script.
       - name: Check out repo content
@@ -23,7 +24,7 @@ jobs:
 
       # This step sets up Node.js. The script that this workflow will run uses Node.js.
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '18.x'
 
@@ -47,4 +48,4 @@ jobs:
           WORKFLOW_REPO: ${{ github.event.repository.name }}
           WORKFLOW_REPO_OWNER: ${{ github.repository_owner }}
         run: |
-          node .github/workflows/scripts/redeliver-failed-deliveries.js
+          node .github/workflows/scripts/redeliver-failed-deliveries.mjs

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

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

README.md

@@ -19,14 +19,15 @@ Developer note: The software implements the [Torznab](https://torznab.github.io/
 A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](https://github.com/webtor-io/go-jackett)
 
 #### Supported Systems
-* Windows 7 SP1 or greater
-* Linux [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/6.0/supported-os.md#linux)
-* macOS 10.15+ or greater
+* Windows 10 Version 1607+ or greater [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md#windows)
+* Linux [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md#linux)
+* macOS 12.0+ (Monterey) or greater [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md#macos)
 
 <details> <summary> <b> Supported Public Trackers </b> </summary>
 
  * ØMagnet
  * 1337x
+ * 52BT
  * ACG.RIP
  * Anidex
  * AniLibria
@@ -49,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
@@ -75,7 +75,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Knaben
  * LePorno.info
  * LimeTorrents
- * LimeTorrents clone
  * LinuxTracker
  * Mac Torrents Download
  * MegaPeer
@@ -92,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
@@ -104,7 +104,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Seedoff
  * Sexy-Pics
  * Shana Project
- * ShizaProject
  * ShowRSS
  * SimpleAnime
  * Solid Torrents
@@ -120,8 +119,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * torrent.by
  * torrent-pirat
  * Torrent9
- * Torrent9 clone
- * Torrent911
  * TorrentFunk
  * TorrentDownloads
  * TorrentGalaxy (TGx)
@@ -135,6 +132,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Torrentz2nz
  * TrahT
  * truPornolabs
+ * U3C3
  * UnionDHT
  * VSTHouse
  * VST Torrentz
@@ -153,11 +151,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * AniDUB
  * AnimeLayer
  * ArenaBG
+ * BitMagnet (Local DHT) [[site](https://github.com/bitmagnet-io/bitmagnet)]
  * BookTracker
  * BootyTape
  * Catorrent
  * Deildu
- * Demonoid
  * Devil-Torrents
  * DreamingTree
  * DXP (Deaf Experts)
@@ -179,12 +177,12 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Kinorun
  * Kinozal
  * LostFilm.tv
+ * Magnetico (Local DHT) [[site](https://github.com/boramalper/magnetico)]
  * Marine Tracker
  * Masters-TB
  * Mazepa
  * Metal Tracker
  * MIRcrew
- * MovieWorld (Flicker)
  * MuseBootlegs (MB)
  * MVGroup Forum
  * MVGroup Main
@@ -200,20 +198,22 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * RockBox
  * RUDUB (ex-BaibaKoTV)
  * Rustorka
- * RuTracker
+ * RuTracker.org
  * seleZen
  * Sharewood
  * SkTorrent
  * SkTorrent-org
  * themixingbowl (TMB)
  * Toloka.to
+ * Torrent911
+ * Torrent9-tel
  * TorrentMasters
  * Torrents-Local
+ * TorrentDownload
  * TribalMixes
  * Union Fansub
  * UniOtaku
  * xTorrenty
- * YggTorrent (YGG)
  * ZOMB
  * Ztracker
 </details>
@@ -223,10 +223,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * 0day.kiev
  * 1ptbar
  * 2 Fast 4 You [![(invite needed)][inviteneeded]](#)
- * 2xFree
  * 3ChangTrai (3CT)
  * 3D Torrents (3DT)
- * 4thD (4th Dimension)
+ * 4thD (4th Dimension) [![(invite needed)][inviteneeded]](#)
  * 52PT
  * 720pier
  * Abnormal
@@ -249,44 +248,41 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ArabTorrents [![(invite needed)][inviteneeded]](#)
  * AsianCinema
  * AsianDVDClub
- * AT-12 Project
  * Audiences
  * AudioNews (AN)
  * Aussierul.es [![(invite needed)][inviteneeded]](#)
  * AvistaZ (AsiaTorrents)
  * Azusa (梓喵) [![(invite needed)][inviteneeded]](#)
  * Back-ups
- * BakaBT
- * BeiTai (备胎)
+ * BakaBT [![(invite needed)][inviteneeded]](#)
  * Beload
  * Best-Core
  * BeyondHD (BHD)
- * Bibliotik
+ * Bibliotik [![(invite needed)][inviteneeded]](#)
  * Bit-Bázis
  * BIT-HDTV
  * Bitded
  * Bithorlo (BHO)
  * BitHUmen [![(invite needed)][inviteneeded]](#)
- * BitMagnet (Local DHT) [[site](https://github.com/bitmagnet-io/bitmagnet)]
+ * Bitpalace
  * BitPorn
  * Bitspyder
  * BitTorrentFiles
  * BiTTuRK
- * BJ-Share (BJ)
+ * BJ-Share (BJ) [![(invite needed)][inviteneeded]](#)
  * BlueBird
  * Blutopia (BLU)
  * Borgzelle [![(invite needed)][inviteneeded]](#)
  * Boxing Torrents
  * Brasil Tracker
- * BroadcasTheNet (BTN)
- * BroadCity
+ * BroadcasTheNet (BTN) [![(invite needed)][inviteneeded]](#)
  * BrokenStones [![(invite needed)][inviteneeded]](#)
- * BrSociety
  * BTArg
  * BTNext (BTNT) [![(invite needed)][inviteneeded]](#)
  * BTSCHOOL
  * BWTorrents
  * BYRBT
+ * CapybaraBR
  * Carp-Hunter
  * Carpathians
  * CarPT
@@ -307,22 +303,24 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * CrabPT (蟹黄堡)
  * CrazySpirits
  * CrnaBerza
+ * cyanbug (大青虫)
  * Dajiao (打胶) [![(invite needed)][inviteneeded]](#)
  * DANISH BYTES
  * Darius Tracker
  * Dark-Shadow
+ * Das Unerwartete (D-U)
  * DataScene (DS)
  * DesiTorrents
  * Diablo Torrent
- * DICMusic
+ * DICMusic [![(invite needed)][inviteneeded]](#)
  * DigitalCore
  * DimeADozen (EzTorrent)
- * DiscFan
+ * DiscFan [![(invite needed)][inviteneeded]](#)
  * DivTeam
  * DocsPedia
  * Dream Tracker [![(invite needed)][inviteneeded]](#)
  * Drugari
- * Ebooks-Shares
+ * Ebooks-Shares [![(invite needed)][inviteneeded]](#)
  * Empornium (EMP) [![(invite needed)][inviteneeded]](#)
  * Enthralled
  * eShareNet
@@ -330,15 +328,15 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Exitorrent.org [![(invite needed)][inviteneeded]](#)
  * ExoticaZ (YourExotic)
  * ExtremeBits
- * Falkon Vision Team
+ * F1Carreras
  * FANO.IN [![(invite needed)][inviteneeded]](#)
- * Fantastiko
+ * Fantastiko [![(invite needed)][inviteneeded]](#)
  * Fappaizuri
- * FastScene
  * FearNoPeer
  * Femdomcult
+ * File-Shack
  * FileList (FL)
- * FinElite (FE) [![(invite needed)][inviteneeded]](#)
+ * FinElite (FE)
  * FinVip
  * Flux-Zone
  * Free Farm (自由农场)
@@ -351,23 +349,25 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Gay-Torrents.org
  * GAYtorrent.ru
  * GazelleGames (GGn)
- * Generation-Free [![(invite needed)][inviteneeded]](#)
+ * Generation-Free
  * GigaTorrents
  * GimmePeers (formerly ILT)
  * GiroTorrent
  * GreatPosterWall (GPW)
  * GreekDiamond
+ * H-P2P
  * HaiDan
  * Hǎitáng (海棠PT)
  * HappyFappy
  * Hares Club (白兔俱乐部) [![(invite needed)][inviteneeded]](#)
  * Hawke-uno
- * HD-Club
- * HD-Forever (HDF)
- * HD-Olimpo
+ * HD Dolby
+ * HD-Club [![(invite needed)][inviteneeded]](#)
+ * HD-Forever (HDF) [![(invite needed)][inviteneeded]](#)
+ * 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)
@@ -377,48 +377,53 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDFans
  * HDFun (HDZone)
  * HDHome (HDBigger) [![(invite needed)][inviteneeded]](#)
+ * HDKylin (麒麟)
  * HDMaYi (小蚂蚁PT站)
  * HDPT (明教) [![(invite needed)][inviteneeded]](#)
  * HDRoute [![(invite needed)][inviteneeded]](#)
  * HDSky [![(invite needed)][inviteneeded]](#)
+ * HDT-LaFenice
  * HDtime
  * HDTorrents.it [![(invite needed)][inviteneeded]](#)
  * HDTurk
  * HDU
  * hdvbits
  * HDVIDEO
- * Heavens-Hell
  * Hebits
  * HellasHut
  * HHanClub
  * House of Devil
  * HQMusic
+ * HUDBT (蝴蝶) [![(invite needed)][inviteneeded]](#)
  * iAnon
  * ICC2022 (冰淇淋)
+ * ilolicon PT
  * ImmortalSeed (iS)
  * Immortuos
  * Indietorrents [![(invite needed)][inviteneeded]](#)
  * Infire
  * Insane Tracker
  * IPTorrents (IPT)
+ * IrishTV
  * ItaTorrents
  * JME-REUNIT3D
  * JoyHD [![(invite needed)][inviteneeded]](#)
  * JPopsuki
  * JPTV
  * KamePT [![(invite needed)][inviteneeded]](#)
- * Karagarga
+ * Karagarga [![(invite needed)][inviteneeded]](#)
  * Keep Friends [![(invite needed)][inviteneeded]](#)
+ * Kelu
  * KIMOJI
- * Korsar
+ * Korsar [![(invite needed)][inviteneeded]](#)
  * KrazyZone
  * Kufei (库非)
  * Kufirc
  * Last Digital Underground (LDU)
  * LastFiles
- * Le Saloon
  * LaidBackManor
- * Lat-Team [![(invite needed)][inviteneeded]](#)
+ * Lat-Team
+ * Le Saloon [![(invite needed)][inviteneeded]](#)
  * Le-Cinephile
  * LearnBits
  * LearnFlakes
@@ -432,27 +437,26 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Locadora
  * LosslessClub [![(invite needed)][inviteneeded]](#)
  * LST
- * M-Team TP (MTTP)
+ * M-Team TP (MTTP) [![(invite needed)][inviteneeded]](#)
  * MaDs Revolution
- * Magnetico (Local DHT) [[site](https://github.com/boramalper/magnetico)]
  * Majomparádé (TurkDepo)
  * Making Off
  * Mansão dos Animes (MDAN)
  * MegamixTracker
- * Mendigos da WEB
  * MeseVilág (Fairytale World)
  * MetalGuru [![(invite needed)][inviteneeded]](#)
+ * METALWRKS
  * Milkie
  * MMA-Torrents [![(invite needed)][inviteneeded]](#)
  * MNV (Max-New-Vision)
  * MOJBLiNK
  * MonikaDesign (MDU)
- * MoreThanTV (MTV)
+ * MoreThanTV (MTV) [![(invite needed)][inviteneeded]](#)
  * MouseBits
  * Movie-Torrentz
  * MyAnonamouse (MAM)
  * MySpleen [![(invite needed)][inviteneeded]](#)
- * NCore
+ * NCore [![(invite needed)][inviteneeded]](#)
  * Nebulance (NBL) (TransmiTheNet)
  * NicePT
  * NorBits
@@ -463,22 +467,22 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Old Toons World
  * OpenCD [![(invite needed)][inviteneeded]](#)
  * Orpheus
- * OnlyEncodes
+ * OnlyEncodes+
  * OshenPT
  * Ostwiki
  * OurBits (HDPter)
  * P2PBG
  * Panda
  * Party-Tracker
- * PassThePopcorn (PTP)
+ * PassThePopcorn (PTP) [![(invite needed)][inviteneeded]](#)
  * Peeratiko
  * Peers.FM
  * PigNetwork (猪猪网)
  * PixelCove (Ultimate Gamer)
  * PiXELHD (PxHD) [![(invite needed)][inviteneeded]](#)
+ * Plusteca
  * Polish Torrent (PTT)
- * PolishSource (PS)
- * PolishTracker
+ * PolishTracker [![(invite needed)][inviteneeded]](#)
  * Pornbay [![(invite needed)][inviteneeded]](#)
  * Portugas
  * PotUK
@@ -493,26 +497,29 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * PTFiles (PTF)
  * PThome [![(invite needed)][inviteneeded]](#)
  * PTLSP
- * PTSBAO (烧包)
+ * PTSBAO (烧包) [![(invite needed)][inviteneeded]](#)
  * PTtime
+ * PTVicomo
  * Punk's Horror Tracker
- * PuntoTorrent
+ * PuntoTorrent [![(invite needed)][inviteneeded]](#)
  * PuTao (葡萄)
  * PWTorrents (PWT)
- * R3V WTF!
+ * Qingwa (青蛙)
+ * R3V WTF! [![(invite needed)][inviteneeded]](#)
  * Racing4Everyone (R4E)
  * RacingForMe (RFM)
  * RareShare2
+ * Red Leaves (红叶) [![(invite needed)][inviteneeded]](#)
  * Red Star Torrent (RST) [![(invite needed)][inviteneeded]](#)
  * Redacted (PassTheHeadphones)
  * RedBits
- * Red Leaves (红叶) [![(invite needed)][inviteneeded]](#)
  * ReelFlix
  * Resurrect The Net [![(invite needed)][inviteneeded]](#)
  * RetroFlix
- * RevolutionTT
- * RM-HD
+ * RevolutionTT [![(invite needed)][inviteneeded]](#)
+ * RocketHD
  * Romanian Metal Torrents (RMT)
+ * RoTorrent
  * Rousi
  * RPTScene (RPTorrents)
  * SATClubbing
@@ -522,6 +529,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * SceneTime
  * Secret Cinema
  * SeedFile
+ * SFP (Share Friends Projekt)
  * Shadowflow (影) [![(invite needed)][inviteneeded]](#)
  * Shareisland
  * SharkPT
@@ -564,15 +572,14 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * The-New-Fun
  * TheEmpire (TE)
  * TheLeachZone (TLZ)
- * TheRebels
  * TheScenePlace (TSP)
- * Thor's Land
  * TJUPT (北洋园PT)
  * TLFBits [![(invite needed)][inviteneeded]](#)
- * TmGHuB
+ * TmGHuB [![(invite needed)][inviteneeded]](#)
  * Toca Share
  * Tormac
  * Tornado
+ * Torrent Heaven (Dutch)
  * Torrent Network (TN)
  * Torrent Sector Crew (TSC)
  * Torrent Trader [![(invite needed)][inviteneeded]](#)
@@ -581,34 +588,33 @@ 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
  * Torrenteros (TTR)
  * TorrentHeaven (German) [![(invite needed)][inviteneeded]](#)
- * Torrent Heaven (Dutch)
  * TorrentHR [![(invite needed)][inviteneeded]](#)
  * Torrenting (TT)
  * Torrentland
  * TorrentLeech (TL)
  * TorrentLeech.pl
  * TorrentSeeds (TS)
+ * ToSky
  * ToTheGlory (TTG) [![(invite needed)][inviteneeded]](#)
  * TrackerMK
  * TranceTraffic
  * Trellas (Magico) [![(invite needed)][inviteneeded]](#)
- * TreZzoR [![(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
@@ -619,63 +625,26 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * World-of-Tomorrow
  * Wukong (悟空问道)
  * x-ite.me (XM)
- * xBytesV2
  * 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.
 
-### Aggregate indexers
+### Jackett Torznab query syntax
 
-A special "all" indexer is available at `/api/v2.0/indexers/all/results/torznab`.
-It will query all configured indexers and return the combined results.
-
-If your client supports multiple feeds it's recommended to add each indexer directly instead of using the all indexer.
-Using the all indexer has no advantages (besides reduced management overhead), the only disadvantages:
-* you lose control over indexer specific settings (categories, search modes, etc.)
-* mixing search modes (IMDB, query, etc.) might cause low-quality results
-* indexer specific categories (>= 100000) can't be used.
-* slow indexers will slow down the overall result
-* total results are limited to 1000
-
-To get all Jackett indexers including their capabilities you can use `t=indexers` on the all indexer. To get only configured/unconfigured indexers you can also add `configured=true/false` as a query parameter.
-
-### Filter indexers
-
-Another special "filter" indexer is available at `/api/v2.0/indexers/<filter>/results/torznab`
-It will query the configured indexers that match the `<filter>` expression criteria and return the combined results as "all".
-
-Supported filters
-Filter | Condition
--|-
-`type:<type>` | where the indexer type is equal to `<type>`
-`tag:<tag>` | where the indexer tags contains `<tag>`
-`lang:<tag>` | where the indexer language start with `<lang>`
-`test:{passed\|failed}` | where the last indexer test performed `passed` or `failed`
-`status:{healthy\|failing\|unknown}` | where the indexer state is `healthy` (successfully operates in the last minutes), `failing` (generates errors in the recent call) or `unknown` (unused for a while)
-
-Supported operators
-Operator | Condition
--|-
-`!<expr>` | where not `<expr>`
-`<expr1>+<expr2>[+<expr3>...]` | where `<expr1>` and `<expr2>` [and `<expr3>`...]
-`<expr1>,<expr2>[,<expr3>...]` | where `<expr1>` or `<expr2>` [or `<expr3>`...]
-
-Example 1:
-The "filter" indexer at `/api/v2.0/indexers/tag:group1,!type:private+lang:en/results/torznab` will query all the configured indexers tagged with `group1` or all the indexers not private and with `en` language (`en-en`,`en-us`,...)
-
-Example 2:
-The "filter" indexer at `/api/v2.0/indexers/!status:failing,test:passed` will query all the configured indexers not `failing` or which `passed` its last test.
+Jackett accepts Torznab queries following the specifications described in the [Torznab document](https://torznab.github.io/spec-1.3-draft/index.html).
+For example, `.../api/v2.0/indexers/<aJackettIndexerName>/results/torznab/api?apikey=<yourJackettApiKey>&t=caps` would return the capabilities of the indexer, and `.../api/v2.0/indexers/<aJackettIndexerName>/results/torznab/api?apikey=<yourJackettApiKey>&t=search&q=keywords` would perform a free text search on that indexer.
 
 ### Search modes and parameters
 
@@ -710,12 +679,54 @@ Examples:
 .../api?apikey=APIKEY&t=book&cat=5,6&genre=horror&publisher=Stuff
 ```
 
+### Filter indexers
+
+A special "filter" indexer is available at `.../api/v2.0/indexers/<filter>/results/torznab`
+It will query the configured indexers that match the `<filter>` expression criteria and return the combined results as "all".
+
+Supported filters
+Filter | Condition
+-|-
+`type:<type>` | where the indexer type is equal to `<type>`
+`tag:<tag>` | where the indexer tags contain `<tag>`
+`lang:<tag>` | where the indexer language start with `<lang>`
+`test:{passed\|failed}` | where the last indexer test performed `passed` or `failed`
+`status:{healthy\|failing\|unknown}` | where the indexer state is `healthy` (successfully operates in the last minutes), `failing` (generates errors in the recent call) or `unknown` (unused for a while)
+
+Supported operators
+Operator | Condition
+-|-
+`!<expr>` | where not `<expr>`
+`<expr1>+<expr2>[+<expr3>...]` | where `<expr1>` and `<expr2>` [and `<expr3>`...]
+`<expr1>,<expr2>[,<expr3>...]` | where `<expr1>` or `<expr2>` [or `<expr3>`...]
+
+Example 1:
+The "filter" indexer at `.../api/v2.0/indexers/tag:group1,!type:private+lang:en/results/torznab` will query all the configured indexers tagged with `group1` or all the indexers not private and with `en` language (`en-en`,`en-us`,...)
+
+Example 2:
+The "filter" indexer at `/api/v2.0/indexers/!status:failing,test:passed` will query all the configured indexers not `failing` or which `passed` its last test.
+
+### Aggregate indexers
+
+A special "all" indexer is available at `/api/v2.0/indexers/all/results/torznab`.
+It will query all configured indexers and return the combined results.
+
+If your client supports multiple feeds it's recommended to add each indexer directly instead of using the "all" indexer.
+Using the "all" indexer has no advantages (besides reduced management overhead), the only disadvantages:
+* you lose control over indexer specific settings (categories, search modes, etc.)
+* mixing search modes (IMDB, query, etc.) might cause low-quality results
+* indexer specific categories (>= 100000) can't be used.
+* slow indexers will slow down the overall result
+* total results are limited to 1000
+
+To get all Jackett indexers including their capabilities you can use `t=indexers` on the "all" indexer. To get only configured/unconfigured indexers you can also add `configured=true/false` as a query parameter.
+
 ## Installation on Windows
 We recommend you install Jackett as a Windows service using the supplied installer. You may also download the zipped version if you would like to configure everything manually.
 
 To get started with using the installer for Jackett, follow the steps below:
 
-1. Check if you need any .NET prerequisites installed, see https://docs.microsoft.com/en-us/dotnet/core/install/windows?tabs=net60#dependencies
+1. Check if you need any .NET prerequisites installed, see https://docs.microsoft.com/en-us/dotnet/core/install/windows?tabs=net80#dependencies
 2. Download the latest version of the Windows installer, "Jackett.Installer.Windows.exe" from the [releases](https://github.com/Jackett/Jackett/releases/latest) page.
 3. When prompted if you would like this app to make changes to your computer, select "yes".
 4. If you would like to install Jackett as a Windows Service, make sure the "Install as Windows Service" checkbox is filled.
@@ -728,35 +739,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.
@@ -770,7 +781,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.
@@ -785,18 +796,17 @@ On a CentOS/RedHat 7 system: [jewflix.jackett](https://galaxy.ansible.com/jewfli
 On an Ubuntu 16 system: [chrisjohnson00.jackett](https://galaxy.ansible.com/chrisjohnson00/jackett)
 
 
-### Installation on Linux or macOS via Homebrew
-
-[Homebrew Formulae - Jackett](https://formulae.brew.sh/formula/jackett)
+## Uninstallation on Linux
+`wget https://raw.githubusercontent.com/Jackett/Jackett/master/uninstall_service_systemd.sh --quiet -O -|sudo bash`
 
 
 ## Installation on macOS
 
 ### Prerequisites
-macOS 10.15+ or greater
+macOS 12.0+ (Monterey) or greater
 
 ### Install as service
-1. Download and extract the latest `Jackett.Binaries.macOS.tar.gz` or `Jackett.Binaries.macOSARM64.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases).
+1. Download and extract the latest `Jackett.Binaries.macOS.tar.gz` or `Jackett.Binaries.macOSARM64.tar.gz` release from the [releases](https://github.com/Jackett/Jackett/releases/latest) page.
 2. Open the extracted folder and double-click on `install_service_macos`.
 3. If the installation was a success, you can close the Terminal window.
 
@@ -804,7 +814,16 @@ The service will start on each logon. You can always stop it by running `launchc
 Logs are stored as usual under `~/.config/Jackett/log.txt`.
 
 ### Run without installing as a service
-Download and extract the latest `Jackett.Binaries.macOS.tar.gz` or `Jackett.Binaries.macOSARM64.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases) and run Jackett with the command `./jackett`.
+Download and extract the latest `Jackett.Binaries.macOS.tar.gz` or `Jackett.Binaries.macOSARM64.tar.gz` release from the [releases](https://github.com/Jackett/Jackett/releases/latest) page and run Jackett with the command `./jackett`.
+
+
+## Uninstallation on macOS
+`curl -sSL https://raw.githubusercontent.com/Jackett/Jackett/master/uninstall_jackett_macos| bash`
+
+
+## Installation on Linux or macOS via Homebrew
+
+[Homebrew Formulae - Jackett](https://formulae.brew.sh/formula/jackett)
 
 
 ## Installation using Docker
@@ -861,7 +880,7 @@ If you have enabled the Jackett internal cache, but have an indexer for which yo
 ## Configuring FlareSolverr
 Some indexers are protected by Cloudflare or similar services and Jackett is not able to solve the challenges.
 For these cases, [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr) has been integrated into Jackett. This service is in charge of solving the challenges and configuring Jackett with the necessary cookies.
-Setting up this service is optional, most indexers don't need it.
+Setting up this service is optional; most indexers don't need it.
 * Install FlareSolverr service (following their instructions)
 * Configure **FlareSolverr API URL** in Jackett. For example: http://172.17.0.2:8191
 * It is recommended to keep the default value in **FlareSolverr Max Timeout (ms)**
@@ -930,8 +949,8 @@ git clone https://github.com/Jackett/Jackett.git
 cd Jackett/src
 
 # dotnet core version
-dotnet publish Jackett.Server -f net6.0 --self-contained -r osx-x64 -c Debug # takes care of everything
-./Jackett.Server/bin/Debug/net6.0/osx-x64/jackett # run jackett
+dotnet publish Jackett.Server -f net8.0 --self-contained -r osx-x64 -c Debug # takes care of everything
+./Jackett.Server/bin/Debug/net8.0/osx-x64/jackett # run jackett
 ```
 
 ### Linux
@@ -943,8 +962,8 @@ git clone https://github.com/Jackett/Jackett.git
 cd Jackett/src
 
 # dotnet core version
-dotnet publish Jackett.Server -f net6.0 --self-contained -r linux-x64 -c Debug # takes care of everything
-./Jackett.Server/bin/Debug/net6.0/linux-x64/jackett # run jackett
+dotnet publish Jackett.Server -f net8.0 --self-contained -r linux-x64 -c Debug # takes care of everything
+./Jackett.Server/bin/Debug/net8.0/linux-x64/jackett # run jackett
 ```
 
 ## Screenshots

azure-pipelines.yml

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

install_service_systemd.sh

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

install_service_systemd_mono.sh

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

nuget.config

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

src/Directory.Build.props

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

src/Jackett.Common/Content/custom.js

@@ -147,7 +147,7 @@ function loadJackettSettings() {
             $("#can-upgrade-from-mono").show();
         }
 
-        if (data.external != null && data.external === true && data.password === '') {
+        if (data.external != null && data.external === true && data.password === '' && !localStorage.getItem('external-access-warning-hidden')) {
             $("#warning-external-access").show();
         }
 
@@ -1477,6 +1477,15 @@ function bindUIButtons() {
         return false;
     });
 
+    $('#remind-external-access-button').click(function () {
+      $("#warning-external-access").hide();
+    });
+
+    $('#dismiss-external-access-button').click(function () {
+      localStorage.setItem('external-access-warning-hidden', true);
+      $("#warning-external-access").hide();
+    });
+
     $('#api-key-copy-button').click(function () {
         var apiKey = api.key;
         if (apiKey !== null || apiKey !== undefined) {

src/Jackett.Common/Content/index.html

@@ -53,6 +53,12 @@
         <div id="warning-external-access" hidden class="alert alert-danger text-center" role="alert">
             <strong>
                 <span class="glyphicon glyphicon-alert"></span> Security Risk: Your instance has external access enabled without using an admin password. <span class="glyphicon glyphicon-alert"></span>
+              <button id="remind-external-access-button" title="Remind me again later" class="btn btn-success btn-xs">
+                  <span class="glyphicon glyphicon-hourglass" aria-hidden="true"></span>
+              </button>
+              <button id="dismiss-external-access-button" title="Do not show again" class="btn btn-danger btn-xs">
+                  <span class="glyphicon glyphicon-eye-close" aria-hidden="true"></span>
+              </button>
             </strong>
         </div>
 
@@ -787,6 +793,6 @@
     </script>
 
     <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=20240229v1"></script>
+    <script type="text/javascript" src="../custom.js?changed=20240420v1"></script>
 </body>
 </html>

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

@@ -15,12 +15,12 @@ caps:
     - {id: 10, cat: Movies, desc: "Фильмы (Movies)"}
     - {id: 16, cat: Movies/HD, desc: "HD / Фильмы (HD / Movies)"}
     - {id: 30, cat: TV/HD, desc: "HD / Сериалы (HD / TV Shows)"}
-    - {id: 27, cat: TV/HD, desc: "HD / Мультфильмы (HD / Cartoons)"}
+    - {id: 27, cat: Movies/HD, desc: "HD / Мультфильмы (HD / Cartoons)"}
     - {id: 17, cat: PC/Games, desc: "Игры / ПК (Games / PC)"}
     - {id: 14, cat: Audio, desc: "Музыка / Аудио (Music / Audio)"}
     - {id: 29, cat: TV, desc: "Мультсериалы (TV Series)"}
-    - {id: 11, cat: TV, desc: "Мультфильмы (Cartoons)"}
-    - {id: 28, cat: TV/HD, desc: "HD / Документальное (HD / Documentary)"}
+    - {id: 11, cat: Movies, desc: "Мультфильмы (Cartoons)"}
+    - {id: 28, cat: TV/Documentary, desc: "HD / Документальное (HD / Documentary)"}
     - {id: 18, cat: PC/0day, desc: "Софт / Windows (Software / Windows)"}
     - {id: 19, cat: TV, desc: "TV / Сериалы (TV shows)"}
     - {id: 31, cat: Other, desc: "Прочее (Other)"}

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

@@ -6,29 +6,24 @@ language: en-US
 type: public
 encoding: UTF-8
 requestDelay: 2
+# get status and news on domains at the official site https://1337x-status.org/
 links:
   - https://1337x.to/
   - https://1337x.st/
   - https://x1337x.ws/
   - https://x1337x.eu/
   - https://x1337x.se/
-  - https://1337x.so/
-  - https://1337x.unblockit.africa/
+  - https://x1337x.cc/
   - https://1337x.unblockninja.com/
   - https://1337x.ninjaproxy1.com/
   - https://1337x.proxyninja.org/
+  - https://1337x.proxyninja.net/
   - https://1337x.torrentbay.st/
+  - https://1337x.torrentsbay.org/
 legacylinks:
   - https://1337x.is/
   - https://1337x.gd/
-  - https://1337x.nocensor.lol/
-  - https://1337x.unblockit.ink/
-  - https://1337x.nocensor.art/
-  - https://1337x.unblockit.bio/
-  - https://1337x.unblockit.boo/
-  - https://1337x.mrunblock.guru/
   - https://1337x.mrunblock.life/
-  - https://1337x.unblockit.click/
   - https://1337x.unblockit.asia/
   - https://1337x.unblockit.mov/
   - https://1337x.unblockit.rsvp/
@@ -40,6 +35,13 @@ legacylinks:
   - https://1337x.mrunblock.bond/
   - https://1337x.unblockit.date/
   - https://1337x.unblockit.dad/
+  - https://1337x.unblockit.africa/
+  - https://1337x.unblockit.casa/ # 502
+  - https://1337x.unblockit.sbs/ # 502
+  - https://1337x.unblockit.ong/ # 502
+  - https://1337x.unblockit.black/ # 502
+  - https://1337x.abcproxy.org/
+  - https://1337x.so/
 
 caps:
   categorymappings:
@@ -133,10 +135,8 @@ caps:
   allowrawsearch: true
 
 settings:
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr
   - name: downloadlink
     type: select
     label: Download link

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

@@ -63,6 +63,8 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_flaresolverr
+    type: info_flaresolverr
   - name: info_tpp
     type: info
     label: Results Per Page
@@ -70,7 +72,7 @@ settings:
   - name: info_activity
     type: info
     label: Account Inactivity
-    default: "Cherish your user account. Inactive accounts would be deleted based on the following rules:<ol><li>Veteran User or above would never be deleted.</li><li>Elite User or above would never be deleted if packed (at User CP).</li><li>Packed accounts would be deleted if users have not logged in for more than 400 days in a row.</li><li>Unpacked accounts would be deleted if users have not logged in for more than 150 days in a row.</li><li>Accounts with both uploaded and downloaded amount being 0 would be deleted if users have not logged in for more than 100 days in a row.</li></ol>"
+    default: "Cherish your user account. Inactive accounts would be deleted based on the following rules:<ol><li>Veteran User or above would never be deleted.</li><li>Elite User or above would never be deleted if parked (at User CP).</li><li>Parked accounts would be deleted if users have not logged in for more than 400 days in a row.</li><li>Unparked accounts would be deleted if users have not logged in for more than 150 days in a row.</li><li>Accounts with both uploaded and downloaded amount being 0 would be deleted if users have not logged in for more than 100 days in a row.</li></ol>"
 
 login:
   path: login.php
@@ -193,4 +195,4 @@ search:
     description:
       selector: td:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.8.9 2023-11-15
+# NexusPHP v1.8.12 2024-05-20

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

@@ -56,6 +56,8 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_flaresolverr
+    type: info_flaresolverr
   - name: info_tpp
     type: info
     label: Results Per Page

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

@@ -0,0 +1,102 @@
+---
+id: 52bt
+name: 52BT
+description: "52BT is a CHINESE Public tracker for TV / MOVIES / MUSIC / GENERAL"
+language: zh-CN
+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://www.529052.xyz/
+  - https://www.529053.xyz/
+legacylinks:
+  - https://529050.xyz/
+  - https://529048.xyz/
+  - https://529049.xyz/
+
+caps:
+  categorymappings:
+    - {id: 影视, cat: TV, desc: 影视}
+    - {id: 影视, cat: Movies, desc: 影视}
+    - {id: 音乐, cat: Audio, desc: 音乐}
+    - {id: 图像, cat: Other, desc: 图像}
+    - {id: 文档书籍, cat: Books, desc: 文档书籍}
+    - {id: 压缩文件, cat: Other, desc: 压缩文件}
+    - {id: 安装包, cat: PC, desc: 安装包}
+    - {id: 其他, cat: Other, desc: 其他}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: cat-id
+    type: select
+    label: Category
+    default: 0
+    options:
+      0: All categories
+      1: Film and Television
+      2: Music
+      3: Images
+      4: Books
+      5: Zip Files
+      6: Software
+      7: Other
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 2
+    options:
+      2: created
+      1: size
+      0: relevance
+  - name: info_flaresolverr
+    type: info_flaresolverr
+
+search:
+  paths:
+    - path: "search-{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}-{{ .Config.cat-id }}-{{ .Config.sort }}-1.html"
+  error:
+    - selector: :root:contains("Internal Server Error")
+
+  rows:
+    selector: div.ssbox
+
+  fields:
+    categorydesc:
+      selector: div.title > h3 > span
+      filters:
+        - name: re_replace
+          args: ["([\\[\\]]+)", ""]
+    title:
+      selector: a[href^="/hash/"]
+    details:
+      selector: a[href^="/hash/"]
+      attribute: href
+    magnet:
+      selector: a[href^="magnet:?xt="]
+      attribute: href
+    date:
+      selector: div.sbar > span:contains("添加时间:")
+      filters:
+        - name: replace
+          args: ["添加时间:", ""]
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-dd zzz"
+    size:
+      selector: div.sbar > span:contains("大小:")
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/Bittorrentfiles.yml

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

src/Jackett.Common/Definitions/abtorrents.yml

@@ -86,10 +86,8 @@ settings:
   - name: cookie
     type: text
     label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -157,7 +155,7 @@ search:
       optional: true
       filters:
         - name: dateparse
-          args: "MMM d yyyy h:mm tt"
+          args: "MMM d yyyyh:mm tt"
     date:
       text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
     size:

src/Jackett.Common/Definitions/agsvpt.yml

@@ -7,6 +7,7 @@ type: private
 encoding: UTF-8
 requestDelay: 2
 links:
+  - https://www.agsvpt.com/
   - https://abroad.agsvpt.com/
 
 caps:
@@ -80,9 +81,8 @@ settings:
     default: "Account retention rules:<ol><li>Elite User and above will not have their account deleted after parking (in the Control Panel)</li><li>Users who do not log in for 400 consecutive days will be disabled.</li><li>Users with a parked account will be disabled if they do not log in for 150 consecutive days</li><li>Users who have no traffic (i.e., uploading/downloading data is 0) within 7 days of new registration will be disabled</li><li>Users with no traffic (i.e. both upload/download data is 0) who do not log in for 30 consecutive days will be disabled.</li></ol>"
 
 login:
-  path: agsvpt
-  method: form
-  form: form[action="takelogin.php"]
+  path: takelogin.php
+  method: post
   inputs:
     secret: ""
     username: "{{ .Config.username }}"
@@ -206,4 +206,4 @@ search:
       filters:
         - name: prepend
           args: "{{ .Result.description_verified }} "
-# NexusPHP v1.8.8 2023-09-25
+# NexusPHP v1.8.12 2024-04-05

src/Jackett.Common/Definitions/aidoruonline.yml

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

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

@@ -34,6 +34,10 @@ 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
@@ -65,8 +69,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # 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
@@ -99,8 +103,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:
@@ -121,8 +132,6 @@ search:
     genre:
       selector: meta.genres
       filters:
-        - name: re_replace
-          args: ["(?i)^None$", ""]
         - name: re_replace
           args: ["(?i)(Science Fiction)", "Science_Fiction"]
         - name: re_replace
@@ -131,8 +140,6 @@ search:
           args: [" & ", "_&_"]
     description:
       text: "{{ .Result.genre }}"
-    files:
-      selector: num_file
     seeders:
       selector: seeders
     leechers:
@@ -171,4 +178,4 @@ search:
     minimumseedtime:
       # 5 days (as seconds = 5 x 24 x 60 x 60)
       text: 432000
-# json UNIT3D 7.2.5
+# json UNIT3D 8.1.3

src/Jackett.Common/Definitions/anilibria.yml

@@ -23,6 +23,10 @@ settings:
     type: checkbox
     label: Strip Cyrillic Letters
     default: false
+  - name: sonarr_compatibility
+    type: checkbox
+    label: Improve Sonarr compatibility by trying to better parse Season information in release titles.
+    default: false
   - name: addrussiantotitle
     type: checkbox
     label: Add RUS to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
@@ -60,6 +64,58 @@ search:
       selector: ..names.ru
     title_en:
       selector: ..names.en
+    title_en_parsed:
+      selector: ..names.en
+      filters:
+        - name: re_replace
+          args: ["(?i)\\bPart\\s*1\\b", "Part One"]
+        - name: re_replace
+          args: ["(?i)\\bPart\\s*2\\b", "Part Two"]
+        - name: re_replace
+          args: ["(?i)\\bPart\\s*3\\b", "Part Three"]
+        - name: re_replace
+          args: ["(?i)\\bPart\\s*4\\b", "Part Four"]
+        - name: re_replace
+          args: ["(?i)\\bPart\\s*5\\b", "Part Five"]
+        - name: re_replace
+          args: ["(?i)\\bPart\\s*6\\b", "Part Six"]
+        - name: re_replace
+          args: ["(?i)\\bPart\\s*7\\b", "Part Seven"]
+        - name: re_replace
+          args: ["(?i)\\bPart\\s*8\\b", "Part Eight"]
+        - name: re_replace
+          args: ["(?i)\\bPart\\s*9\\b", "Part Nine"]
+        - name: re_replace
+          args: ["(?i)\\bseason\\s*(\\d+)\\b", ""]
+        - name: re_replace
+          args: ["(?i)\\b(\\d+)(st|nd|rd|th)\\s*season[\\s\\.]*", ""]
+        - name: re_replace
+          args: ["(?i)\\b(\\d+)\\s*season\\b[\\s\\.]*", ""]
+        - name: re_replace
+          args: ["(?i)\\bseason\\s*([IVXLCDM]+)\\b", ""]
+        - name: re_replace
+          args: ["\\bI$", ""]
+        - name: re_replace
+          args: ["\\bII$", ""]
+        - name: re_replace
+          args: ["\\bIII$", ""]
+        - name: re_replace
+          args: ["\\bIV$", ""]
+        - name: re_replace
+          args: ["\\bV$", ""]
+        - name: re_replace
+          args: ["\\bVI$", ""]
+        - name: re_replace
+          args: ["\\bVII$", ""]
+        - name: re_replace
+          args: ["\\bVIII$", ""]
+        - name: re_replace
+          args: ["\\bIX$", ""]
+        - name: re_replace
+          args: ["\\bX$", ""]
+        - name: re_replace
+          args: ["(?i)\\b(\\d+)(?:st|nd|rd|th)?\\b", ""]
+        - name: trim
     title_alternative:
       selector: ..names.alternative
       optional: true
@@ -72,19 +128,143 @@ search:
           args: ["^[\\s&,\\.!\\?\\+\\-_\\|\\/':]+", ""]
         - name: re_replace
           args: ["^OVA$", ""]
+    _season_number_en:
+      selector: ..names.en
+      filters:
+        - name: re_replace
+          args: ["(?i)\\bPart\\s*\\d+\\s*$", ""]
+        - name: re_replace
+          args: ["(?i)(^.*\\bseason\\s*(\\d+)\\b\\s*$)", "S$2"]
+        - name: re_replace
+          args: ["(?i)(^.*\\b(\\d+)(st|nd|rd|th)\\s*season\\b.*$)", "S$2"]
+        - name: re_replace
+          args: ["(?i)(^.*\\b(\\d+)\\s*season\\b.*$)", "S$2"]
+        - name: re_replace
+          args: ["(?i)(^.*\\bseason\\s*([IVXLCDM]+)\\b\\s*$)", "$1"]
+        - name: re_replace
+          args: ["(^.*X$)", "S10"]
+        - name: re_replace
+          args: ["(^.*IX$)", "S9"]
+        - name: re_replace
+          args: ["(^.*VIII$)", "S8"]
+        - name: re_replace
+          args: ["(^.*VII$)", "S7"]
+        - name: re_replace
+          args: ["(^.*VI$)", "S6"]
+        - name: re_replace
+          args: ["(^.*V$)", "S5"]
+        - name: re_replace
+          args: ["(^.*IV$)", "S4"]
+        - name: re_replace
+          args: ["(^.*III$)", "S3"]
+        - name: re_replace
+          args: ["(^.*II$)", "S2"]
+        - name: re_replace
+          args: ["(^.*I$)", "S1"]
+        - name: re_replace
+          args: ["(?i)(^.*\\b(\\d+)(?:st|nd|rd|th)?\\b\\s*$)", "S$2"]
+        - name: re_replace
+          args: ["(?i)^(?!S\\d+).*", ""]
+    _season_number_alternative:
+      selector: ..names.alternative
+      optional: true
+      filters:
+        - name: re_replace
+          args: ["(?i)\\bPart\\s*\\d+\\s*$", ""]
+        - name: re_replace
+          args: ["(?i)(^.*\\bseason\\s*(\\d+)\\b\\s*$)", "S$2"]
+        - name: re_replace
+          args: ["(?i)(^.*\\b(\\d+)(st|nd|rd|th)\\s*season\\b\\s*$)", "S$2"]
+        - name: re_replace
+          args: ["(?i)(^.*\\b(\\d+)\\s*season\\b\\s*$)", "S$2"]
+        - name: re_replace
+          args: ["(?i)(^.*\\bseason\\s*([IVXLCDM]+)\\b\\s*$)", "$1"]
+        - name: re_replace
+          args: ["(^.*X$)", "S10"]
+        - name: re_replace
+          args: ["(^.*IX$)", "S9"]
+        - name: re_replace
+          args: ["(^.*VIII$)", "S8"]
+        - name: re_replace
+          args: ["(^.*VII$)", "S7"]
+        - name: re_replace
+          args: ["(^.*VI$)", "S6"]
+        - name: re_replace
+          args: ["(^.*V$)", "S5"]
+        - name: re_replace
+          args: ["(^.*IV$)", "S4"]
+        - name: re_replace
+          args: ["(^.*III$)", "S3"]
+        - name: re_replace
+          args: ["(^.*II$)", "S2"]
+        - name: re_replace
+          args: ["(^.*I$)", "S1"]
+        - name: re_replace
+          args: ["(?i)(^.*\\b(\\d+)(?:st|nd|rd|th)?\\b\\s*$)", "S$2"]
+        - name: re_replace
+          args: ["(?i)^(?!S\\d+).*", ""]
+    _season_number:
+      text: "{{ .Result._season_number_en }}"
+      filters:
+        - name: append
+          args: "{{ .Result._season_number_alternative }}"
+        - name: re_replace
+          args: ["^S1S1$", "S1"]
+        - name: re_replace
+          args: ["^S1(.+)$", "$1"]
+        - name: re_replace
+          args: ["^(S\\d+).*$", "$1"]
+        - name: re_replace
+          args: ["^$", "S1"]
     year:
       selector: ..season.year
     _quality:
       selector: quality.string
-    title:
+    _quality_type:
+      selector: quality.type
+    _quality_resolution:
+      selector: quality.resolution
+    _quality_encoder:
+      selector: quality.encoder
+      filters:
+        - name: re_replace
+          args: ["(?i)^h", "x"]
+    title_parsed:
+      text: "{{ if .Config.stripcyrillic }}{{ else }}{{ .Result.title_ru }} / {{ end }}{{ .Result.title_en_parsed }} {{ .Result._season_number}}E{{ .Result._episodes }} [{{ .Result._quality_type }} {{ .Result._quality_resolution }} {{ .Result._quality_encoder }}]"
+      filters:
+        - name: re_replace
+          args: ["\\bS\\d+EФильм\\b", "({{ .Result.year }}) MOVIE"]
+        - name: re_replace
+          args: ["\\bS\\d+EOVA\\b", "({{ .Result.year }}) OVA"]
+        - name: re_replace
+          args: ["\\bS\\d+EONA\\b", "({{ .Result.year }}) ONA"]
+        - name: re_replace
+          args: ["\\bS\\d+EMovie\\b", "({{ .Result.year }}) MOVIE"]
+        - name: re_replace
+          args: ["\\bS\\d+EП/м фильм\\b", "({{ .Result.year }}) MOVIE"]
+        - name: re_replace
+          args: ["\\bS\\d+EРекап\\b", "({{ .Result.year }}) RECAP"]
+        - name: re_replace
+          args: ["\\bS\\d+ETV-Special\\b", "({{ .Result.year }}) SPECIAL"]
+        - name: append
+          args: "{{ if .Config.addrussiantotitle }} - RUS{{ else }}{{ end }}"
+    title_original:
       text: "{{ if .Config.stripcyrillic }}{{ else }}{{ .Result.title_ru }} / {{ end }}{{ .Result.title_en }}{{ if .Result.title_alternative }} / AKA {{ .Result.title_alternative }}{{ else }}{{ end }} ({{ .Result.year }}) [{{ .Result._quality }}]{{ if .Result._episodes }} - E{{ .Result._episodes }}{{ else }}{{ end }}"
       filters:
         - name: re_replace
           args: [" - \\bEФильм\\b", " - MOVIE"]
+        - name: re_replace
+          args: [" - \\bEMovie\\b", " - MOVIE"]
+        - name: re_replace
+          args: [" - \\bEП/м фильм\\b", " - MOVIE"]
         - name: re_replace
           args: [" - \\bEOVA\\b", " - OVA"]
+        - name: re_replace
+          args: [" - \\bEONA\\b", " - ONA"]
         - name: append
           args: "{{ if .Config.addrussiantotitle }} - RUS{{ else }}{{ end }}"
+    title:
+      text: "{{ if .Config.sonarr_compatibility }}{{ .Result.title_parsed }}{{ else }}{{ .Result.title_original }}{{ end }}"
     _code:
       selector: ..code
     details:

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
@@ -76,8 +80,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # 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
@@ -110,8 +114,15 @@ search:
   fields:
     category:
       selector: category_id
-    title:
+    title_optional:
       selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    files:
+      selector: num_file
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
     details:
       selector: details_link
     download:
@@ -133,17 +144,11 @@ search:
       selector: meta.genres
       filters:
         - name: re_replace
-          args: ["(?i)^None$", ""]
-        - name: re_replace
-          args: ["(?i)(Cinema TV)", "Cinema_TV"]
-        - name: re_replace
-          args: ["(?i)(Ficção científica)", "Ficção_científica"]
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
         - name: replace
           args: [" & ", "_&_"]
     description:
       text: "{{ .Result.genre }}"
-    files:
-      selector: num_file
     seeders:
       selector: seeders
     leechers:
@@ -171,12 +176,15 @@ search:
         100%: 0 # freeleech
         "*": 0 # catch errors
     uploadvolumefactor:
-      # api returns 0=false, 1=true
+      # api returns False, True
       selector: double_upload
       case:
-        0: 1 # normal
-        1: 2 # double
+        False: 1 # normal
+        True: 2 # double
+# global MR is 1.0 but torrents must be seeded for 7 days regardless of ratio
+#    minimumratio:
+#      text: 1.0
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 6.5.0
+# json UNIT3D 8.0.0

src/Jackett.Common/Definitions/anirena.yml

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

src/Jackett.Common/Definitions/audiences.yml

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

src/Jackett.Common/Definitions/audionews.yml

@@ -306,7 +306,7 @@ search:
         - name: querystring
           args: f
     size:
-      selector: td:contains(\00a0GB), td:contains(\00a0MB), td:contains(\00a0kB), td:contains(\00a0B)
+      selector: td:contains(\00a0GB), td:contains(\00a0MB), td:contains(\00a0KB), td:contains(\00a0B)
       optional: true
       default: 0
     seeders:

src/Jackett.Common/Definitions/badasstorrents.yml

@@ -9,15 +9,6 @@ requestDelay: 5
 links:
   - https://badasstorrents.com/
 legacylinks:
-  - https://badasstorrents.nocensor.work/
-  - https://badasstorrents.nocensor.biz/
-  - https://badasstorrents.nocensor.sbs/
-  - https://badasstorrents.nocensor.world/
-  - https://badasstorrents.nocensor.lol/
-  - https://badasstorrents.nocensor.art/
-  - https://badasstorrents.mrunblock.guru/
-  - https://badasstorrents.mrunblock.life/
-  - https://badasstorrents.nocensor.click/
   - https://badasstorrents.mrunblock.bond/
   - https://badasstorrents.nocensor.cloud/
 
@@ -39,20 +30,21 @@ caps:
     movie-search: [q]
     music-search: [q, album, artist]
     book-search: [q]
+
 settings:
   - name: downloadlink
     type: select
     label: Download link
     default: "magnet:?xt="
     options:
-      "/download/": ".torrent"
+      "/d/": ".torrent"
       "magnet:?xt=": "magnet"
   - name: downloadlink2
     type: select
     label: Download link (fallback)
-    default: "/download/"
+    default: "/d/"
     options:
-      "/download/": ".torrent"
+      "/d/": ".torrent"
       "magnet:?xt=": "magnet"
   - name: info_download
     type: info
@@ -69,32 +61,36 @@ download:
 search:
   paths:
     # search has 10 torrents per page, latest has 100 torrents per page.
-    - path: "{{ if .Keywords }}search/{{ .Keywords }}{{ else }}latest.html{{ end }}"
-    - path: "{{ if .Keywords }}/search/{{ .Keywords }}&page=10{{ else }}{{ end }}"
+    - path: "{{ if .Keywords }}s/{{ .Keywords }}{{ else }}latest.html{{ end }}"
+    - path: "{{ if .Keywords }}s/{{ .Keywords }}&page=10{{ else }}{{ end }}"
   keywordsfilters:
     - name: re_replace
       args: ["[\\s]+", "-"]
+    - name: tolower
 
   rows:
-    selector: table.table-hover > tbody > tr:has(a[href*="/torrent/"])
+    selector: table.table-hover > tbody > tr
     filters:
       - name: andmatch
 
   fields:
     category:
-      selector: a[href*="/category/"]
+      selector: a[href^="/c/"]
     title:
-      selector: a[href*="/torrent/"]
+      selector: a[href*="/v/"]
     details:
-      selector: a[href*="/torrent/"]
+      selector: a[href*="/v/"]
       attribute: href
     download:
-      selector: a[href*="/torrent/"]
+      selector: a[href*="/v/"]
       attribute: href
     date:
       selector: td:nth-child(3)
       filters:
-        - name: timeago
+        - name: append
+          args: " +00:00" # GMT
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
     size:
       selector: td:nth-child(4)
     seeders:

src/Jackett.Common/Definitions/beload.yml

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

src/Jackett.Common/Definitions/bigfangroup.yml

@@ -89,22 +89,19 @@ settings:
       asc: asc
 
 search:
-  # https://bigfangroup.org/browse.php?search=black+lightning&cat=0&incldead=0&year=0&format=0
-  headers:
-    Referer: ["{{ .Config.sitelink }}browse.php?search={{ .Keywords }}&cat=0&incldead=1&year=0&format=0"]
   paths:
     # https://bigfangroup.org/browse.php?ajax=1&search=the+librarian&cat=0&incldead=0&year=0&format=0
     - path: browse.php
   inputs:
     ajax: 1
     search: "{{ .Keywords }}"
-    cat: 0
+    cat: "{{ if .Keywords }}0{{ else }}{{ end }}"
     # 0 active, 1 incldead, 2 onlydead, 3 gold, 4 noseed, 5 silver, 7 BFG
-    incldead: 1
-    year: 0
-    format: 0
-    s: "{{ .Config.sort }}"
-    d: "{{ .Config.type }}"
+    incldead: "{{ if .Keywords }}1{{ else }}{{ end }}"
+    year: "{{ if .Keywords }}0{{ else }}1{{ end }}"
+    format: "{{ if .Keywords }}0{{ else }}{{ end }}"
+    s: "{{ if .Keywords }}{{ .Config.sort }}{{ else }}{{ end }}"
+    d: "{{ if .Keywords }}{{ .Config.type }}{{ else }}{{ end }}"
 
   keywordsfilters:
     # strip season and/or ep

src/Jackett.Common/Definitions/bitbazis.yml

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

src/Jackett.Common/Definitions/bithorlo.yml

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

src/Jackett.Common/Definitions/bitmagnet.yml

@@ -3,7 +3,7 @@ id: bitmagnet
 name: BitMagnet (Local DHT)
 description: "BitMagnet is a self-hosted BitTorrent DHT search engine"
 language: en-US
-type: private
+type: semi-private
 encoding: UTF-8
 links:
   - http://127.0.0.1:3333/

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]):not(:contains(\"Törölt\")){{ 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/bitsearch.yml

@@ -9,13 +9,6 @@ requestDelay: 2
 links:
   - https://bitsearch.to/
 legacylinks:
-  - https://bitsearch.nocensor.biz/
-  - https://bitsearch.nocensor.sbs/
-  - https://bitsearch.nocensor.world/
-  - https://bitsearch.nocensor.lol/
-  - https://bitsearch.mrunblock.guru/
-  - https://bitsearch.mrunblock.life/
-  - https://bitsearch.nocensor.click/
   - https://bitsearch.nocensor.cloud/
   - https://bitsearch.mrunblock.bond/
 
@@ -43,7 +36,7 @@ caps:
     "Other/Program": PC/0day
     "Other/Sourcecode": PC
     "Other/Source Code": PC
-    "Other/Video": TV
+    "Other/Video": Other
     Softwares: PC/0day
     "Softwares/Windows": PC/0day
     TV: TV
@@ -77,6 +70,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_8000
+    type: info
+    label: About BitSearch Categories
+    default: BitSearch does not properly return categories in its search results for some releases.</br>To add to your Apps' Torznab indexer, you will need to include the 8000(Other) category.
 
 search:
   paths:

src/Jackett.Common/Definitions/bitturk.yml

@@ -14,7 +14,6 @@ legacylinks:
 caps:
   categorymappings:
     - {id: 56, cat: Movies, desc: "BTRG"}
-    - {id: 95, cat: Movies, desc: "BTRG HMAX"}
     - {id: 57, cat: Movies, desc: "Yerli Dizi"}
     - {id: 62, cat: Movies, desc: "Yab@ncı Dizi"}
     - {id: 63, cat: Movies, desc: "Türkçe Film"}
@@ -29,12 +28,14 @@ caps:
     - {id: 91, cat: TV, desc: "Prime Video"}
     - {id: 93, cat: TV, desc: "Gain"}
     - {id: 94, cat: TV, desc: "ATVP"}
+    - {id: 95, cat: Movies, desc: "HMAX"}
+    - {id: 98, cat: Movies, desc: "PUHUTV"}
     - {id: 58, cat: Movies, desc: "Film"}
     - {id: 72, cat: Movies, desc: "Belgesel"}
     - {id: 60, cat: Movies/3D, desc: "3D"}
     - {id: 76, cat: Movies/UHD, desc: "4K UHD"}
     - {id: 80, cat: TV/Sport, desc: "Formula-1"}
-    - {id: 45, cat: Other, desc: "Eğitim / Prog"}
+    - {id: 45, cat: Other, desc: "Eğitim/Prog"}
     - {id: 1, cat: Movies, desc: "Filmler"}
     - {id: 14, cat: Movies/3D, desc: "3D Film"}
     - {id: 77, cat: Movies/UHD, desc: "4K UHD"}
@@ -67,7 +68,6 @@ caps:
     - {id: 88, cat: Console/Other, desc: "Oyun NEO-GEO"}
     - {id: 89, cat: Console/Wii, desc: "Oyun Nintendo Wii"}
     - {id: 6, cat: PC/0day, desc: "Program"}
-    - {id: 92, cat: PC/Mobile-Android, desc: "Android"}
     - {id: 47, cat: Other, desc: "Resimler"}
     - {id: 48, cat: TV, desc: "Televizyon"}
     - {id: 49, cat: TV/HD, desc: "Tv HD"}

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

@@ -34,6 +34,10 @@ 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
@@ -65,8 +69,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # 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
@@ -99,8 +103,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:
@@ -129,8 +140,6 @@ search:
           args: [" & ", "_&_"]
     description:
       text: "{{ .Result.genre }}"
-    files:
-      selector: num_file
     seeders:
       selector: seeders
     leechers:
@@ -169,4 +178,4 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 8.0.0b
+# json UNIT3D 8.1.3

src/Jackett.Common/Definitions/bootytape.yml

@@ -5,6 +5,7 @@ description: "BootyTape is a Semi-Private site for 3X"
 language: en-US
 type: semi-private
 encoding: UTF-8
+requestDelay: 3
 links:
   - https://ssl.bootytape.com/
 

src/Jackett.Common/Definitions/broadcity.yml

@@ -1,139 +0,0 @@
----
-id: broadcity
-name: BroadCity
-description: "BroadCity is a TURKISH Private Torrent Tracker for MOVIES and TV"
-language: tr-TR
-type: private
-encoding: UTF-8
-links:
-  - https://broadcity.in/ # site is forcing to https
-legacylinks:
-  - http://broadcity.in/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies/UHD, desc: "UHD"}
-    - {id: 2, cat: Movies/UHD, desc: "UHD - BluRay"}
-    - {id: 8, cat: Movies/UHD, desc: "UHD - TV"}
-    - {id: 6, cat: Movies/WEB-DL, desc: "UHD - WEB-DL"}
-    - {id: 16, cat: Movies/UHD, desc: "UHD - WEBRip"}
-    - {id: 31, cat: Movies/BluRay, desc: "BluRay Disk"}
-    - {id: 3, cat: Movies/HD, desc: "HD"}
-    - {id: 25, cat: Movies/3D, desc: "HD - 3D"}
-    - {id: 4, cat: Movies/HD, desc: "HD - BluRay"}
-    - {id: 7, cat: Movies/HD, desc: "HD - TV"}
-    - {id: 5, cat: Movies/WEB-DL, desc: "HD - WEB-DL"}
-    - {id: 14, cat: Movies/HD, desc: "HD - WEBRip"}
-    - {id: 40, cat: Movies/HD, desc: "PTer"}
-    - {id: 9, cat: Movies/SD, desc: "SD"}
-    - {id: 23, cat: Movies/SD, desc: "SD - BluRay"}
-    - {id: 10, cat: Movies/DVD, desc: "SD - DVD"}
-    - {id: 36, cat: Movies/SD, desc: "SD - DVDRip"}
-    - {id: 12, cat: Movies/SD, desc: "SD - TV"}
-    - {id: 13, cat: Movies/WEB-DL, desc: "SD - WEB-DL"}
-    - {id: 15, cat: Movies/SD, desc: "SD - WEBRip"}
-    - {id: 17, cat: TV, desc: "TV"}
-    - {id: 26, cat: TV/Other, desc: "TV - TV Program"}
-    - {id: 19, cat: TV, desc: "TV - Yabanci Dizi"}
-    - {id: 18, cat: TV, desc: "TV - Yerli Dizi"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-
-settings:
-  - name: cookie
-    type: text
-    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
-  - name: freeleech
-    type: checkbox
-    label: Filter freeleech only
-    default: false
-
-login:
-  method: cookie
-  inputs:
-    cookie: "{{ .Config.cookie }}"
-  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
-  inputs:
-    # does not support multi categories so defaulting to ALL
-    do: search
-    keywords: "{{ .Keywords }}"
-    category: 0
-    search_type: t_name
-    include_dead_torrents: yes
-
-  rows:
-    selector: "table#sortabletable tbody tr:has(div[id^=\"port-target-\"]){{ 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: div[id^="port-target-"] a
-    details:
-      selector: div[id^="port-target-"] a
-      attribute: href
-    download:
-      selector: div[id^="port-target-"] a
-      attribute: href
-    poster:
-      selector: div[id^="port-content-"] img
-      attribute: src
-    date:
-      selector: td:nth-child(2)
-      filters:
-        - name: regexp
-          args: (\d{2}-\d{2}-\d{4} \d{2}:\d{2})
-        - name: append
-          args: " +03:00" # TRT
-        - name: dateparse
-          args: "dd-MM-yyyy HH:mm zzz"
-    size:
-      selector: td:nth-child(5)
-    grabs:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
-    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:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# TS Special Edition v.7.5

src/Jackett.Common/Definitions/btschool.yml

@@ -39,10 +39,8 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr
   - name: info_tpp
     type: info
     label: Results Per Page
@@ -50,7 +48,7 @@ settings:
   - name: info_activity
     type: info
     label: Account Inactivity
-    default: "Cherish your user account. Inactive accounts would be deleted based on the following rules:<ol><li>Extreme User or above would never be deleted.</li><li>Veteran User or above would never be deleted if packed (at User CP).</li><li>Packed accounts would be deleted if users have not logged in for more than 365 days in a row.</li><li>Unpacked accounts would be deleted if users have not logged in for more than 150 days in a row.</li><li>Accounts with both uploaded and downloaded amount being 0 would be deleted if users have not logged in for more than 30 days in a row.</li></ol>"
+    default: "Cherish your user account. Inactive accounts would be deleted based on the following rules:<ol><li>Extreme User or above would never be deleted.</li><li>Veteran User or above would never be deleted if parked (at User CP).</li><li>Parked accounts would be deleted if users have not logged in for more than 365 days in a row.</li><li>Unparked accounts would be deleted if users have not logged in for more than 150 days in a row.</li><li>Accounts with both uploaded and downloaded amount being 0 would be deleted if users have not logged in for more than 30 days in a row.</li></ol>"
 
 login:
   path: login.php

src/Jackett.Common/Definitions/bwtorrents.yml

@@ -7,13 +7,15 @@ type: private
 encoding: UTF-8
 links:
   - https://bwtorrents.tv/
-  - https://bwtorrents.co/
+  - https://www.bwtorrents.life/
+  - https://www.bwtorrents.pro/
   - https://bwtorrents.cc/
 legacylinks:
   - https://bwtorrents.fun/
   - https://bwtorrents.xyz/
   - https://bwtorrents.us/
   - https://bwtorrents.live/
+  - https://bwtorrents.co/
 
 caps:
   categorymappings:

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

@@ -1,31 +1,33 @@
 ---
-id: mendigosdaweb
-name: Mendigos da WEB
-description: "Mendigos da WEB is a PORTUGUESE Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: pt-PT
+id: capybarabr
+name: CapybaraBR
+description: "CapybaraBR is a BRAZILIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: pt-BR
 type: private
 encoding: UTF-8
 links:
-  - https://mendigosdaweb.cc/
+  - https://capybarabr.com/
 
 caps:
   categorymappings:
-    - {id: 6, cat: Other, desc: "Cursos"}
-    - {id: 7, cat: Books/EBook, desc: "Livros"}
-    - {id: 8, cat: Audio/Audiobook, desc: "AudioBooks"}
-    - {id: 9, cat: Other, desc: "Material de Apoio"}
     - {id: 1, cat: Movies, desc: "Filmes"}
-    - {id: 2, cat: TV, desc: "TV Séries"}
-    - {id: 10, cat: Console, desc: "Jogos"}
-    - {id: 5, cat: PC, desc: "Aplicativos"}
-    - {id: 12, cat: XXX, desc: "Adulto"}
+    - {id: 2, cat: TV, desc: "Series"}
+    - {id: 4, cat: TV/Anime, desc: "Animes"}
+    - {id: 8, cat: TV/Sport, desc: "Esportes"}
+    - {id: 6, cat: Movies, desc: "Desenhos Animados"}
+    - {id: 5, cat: Console, desc: "Jogos"}
+    - {id: 9, cat: PC, desc: "Programas"}
+    - {id: 10, cat: Audio, desc: "HQs"}
+    - {id: 11, cat: Books/EBook, desc: "Livros"}
+    - {id: 12, cat: Other, desc: "Cursos"}
+    - {id: 13, cat: Books/Mags, desc: "Revistas"}
 
   modes:
     search: [q]
     tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
-    book-search: [q]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: apikey
@@ -34,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://mendigosdaweb.cc/\" target=\"_blank\">Mendigos da WEB</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://capybarabr.com/\" target=\"_blank\">CapybaraBR</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: use_single_file_release_use_filename
+    type: checkbox
+    label: Use filename as the title for single file releases
+    default: false
   - name: sort
     type: select
     label: Sort requested from site
@@ -58,7 +64,7 @@ settings:
   - name: info_activity
     type: info
     label: Account Inactivity
-    default: "Your account will be considered inactive if it goes more than 90 days without you logging into the website. After 90 days of inactivity (that is, 90 days without logging in) it will be deleted from the tracker. Attention: The groups that suffer due to inactivity are: Homeless and Leech."
+    default: "The system automatically makes an account inactive when not logged in for a period of 90 days. So just log in within this time so that it is not inactivated."
 
 login:
   path: /api/torrents
@@ -70,8 +76,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # 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
@@ -104,8 +110,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.use_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:
@@ -126,8 +139,6 @@ search:
     genre:
       selector: meta.genres
       filters:
-        - name: re_replace
-          args: ["(?i)^None$", ""]
         - name: re_replace
           args: ["(?i)(Ficção científica)", "Ficção_científica"]
         - name: re_replace
@@ -136,8 +147,6 @@ search:
           args: [" & ", "_&_"]
     description:
       text: "{{ .Result.genre }}"
-    files:
-      selector: num_file
     seeders:
       selector: seeders
     leechers:
@@ -176,4 +185,4 @@ search:
     minimumseedtime:
       # 7 days (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 7.1.0
+# json UNIT3D 8.0.2 (custom)

src/Jackett.Common/Definitions/carphunter.yml

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

src/Jackett.Common/Definitions/carpt.yml

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

src/Jackett.Common/Definitions/cinemamovies.yml

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

src/Jackett.Common/Definitions/cinematik.yml

@@ -12,8 +12,12 @@ legacylinks:
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies, desc: "Movie"}
+    - {id: 1, cat: Movies, desc: "Film"}
     - {id: 2, cat: TV, desc: "TV"}
+    - {id: 3, cat: Movies/Foreign, desc: "Foreign Film"}
+    - {id: 4, cat: TV/Foreign, desc: "Foreign TV"}
+    - {id: 5, cat: Movies/Other, desc: "Opera & Musical"}
+    - {id: 6, cat: Movies/Foreign, desc: "Asian Film"}
 
   modes:
     search: [q]
@@ -32,6 +36,10 @@ 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
@@ -63,8 +71,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # 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
@@ -97,8 +105,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:
@@ -127,8 +142,6 @@ search:
           args: [" & ", "_&_"]
     description:
       text: "{{ .Result.genre }}"
-    files:
-      selector: num_file
     seeders:
       selector: seeders
     leechers:
@@ -161,10 +174,10 @@ search:
       case:
         False: 1 # normal
         True: 2 # double
-# global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
+# global MR is 0.6 but torrents must be seeded for 7 days regardless of ratio
 #    minimumratio:
-#      text: 0.4
+#      text: 0.6
     minimumseedtime:
-      # 7 days (as seconds = 7 x 24 x 60 x 60)
-      text: 604800
-# json UNIT3D 8.0.0
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# json UNIT3D 8.1.0

src/Jackett.Common/Definitions/cpabien.yml

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

src/Jackett.Common/Definitions/crabpt.yml

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

src/Jackett.Common/Definitions/crazyspirits.yml

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

src/Jackett.Common/Definitions/crnaberza.yml

@@ -17,6 +17,8 @@ caps:
     - {id: 79, cat: PC/Mobile-Android, desc: "Android"}
     - {id: 37, cat: Movies, desc: "Deca"}
     - {id: 43, cat: TV/Documentary, desc: "Dokumentarci"}
+    - {id: 83, cat: Movies/BluRay, desc: "Film/BluRay Domaće"}
+    - {id: 84, cat: Movies/BluRay, desc: "Film/Digitalno Restaurisani"}
     - {id: 52, cat: Movies/DVD, desc: "Film/DVD Domaće"}
     - {id: 20, cat: Movies/DVD, desc: "Film/DVD Strano"}
     - {id: 73, cat: Movies/HD, desc: "Film/HD Domaće"}

src/Jackett.Common/Definitions/crt2fa.yml

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

src/Jackett.Common/Definitions/cyanbug.yml

@@ -0,0 +1,206 @@
+---
+id: cyanbug
+name: cyanbug (大青虫)
+description: "cyanbug (大青虫) is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - https://cyanbug.net/
+
+caps:
+  categorymappings:
+    - {id: 409, cat: Other, desc: "Others/其他"}
+    - {id: 408, cat: Audio, desc: "Music/音轨"}
+    - {id: 406, cat: Audio/Video, desc: "Music Videos/MV"}
+    - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
+    - {id: 403, cat: TV, desc: "TV Shows/综艺"}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
+    - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
+    - {id: 402, cat: TV, desc: "TV Series/电视剧"}
+    - {id: 401, cat: Movies, desc: "Movies/电影"}
+
+  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: 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 cyanbug Web Site. Otherwise just leave it empty."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - 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 will be deleted if they do not log in for 150 consecutive days</li><li>Users who have no traffic (i.e. upload/download data are both 0) will be deleted if they do not log in for 100 consecutive days.</li></ol>"
+
+login:
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
+  inputs:
+    secret: ""
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    two_step_code: "{{ .Config.2facode }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
+  error:
+    - selector: td.embedded:has(h2:contains("失败"))
+      message:
+        selector: td.text
+  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
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}{{ end }}{{ if .Query.DoubanID }}1{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}0{{ end }}"
+    # 0 AND, 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
+    poster:
+      selector: img[data-src]
+      attribute: data-src
+    imdbid:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
+      selector: a[href*="imdb.com/title/tt"]
+      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
+    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.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
+    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:"
+        span[title="未审"], span[title="未審"], span[title="Not reviewed"]: "Unverified:"
+        span[title="拒绝"], span[title="拒絕"], span[title="Denied"]: "Banned:"
+    description:
+      selector: td:nth-child(2)
+      remove: a, b, font, img, span
+      filters:
+        - name: prepend
+          args: "{{ .Result.description_verified }} "
+# NexusPHP v1.8.9 2023-09-29

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

@@ -9,9 +9,9 @@ links:
   - https://danishbytes.club/
   - https://danishbytes2.org/
   - https://dbytes.org/
-  - https://danishbytes.art/
 legacylinks:
   - https://danishbytes.org/
+  - https://danishbytes.art/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/dark-shadow.yml

@@ -195,7 +195,7 @@ search:
       selector: div.selection_unter_aaa
     downloadvolumefactor:
       case:
-        ":root:has(div.onlyup)": 0
+        ":root:has(div.onlyup)": 0 # GLobal Freeleech event
         "*": 1
     uploadvolumefactor:
       text: 1

src/Jackett.Common/Definitions/dasunerwartete.yml

@@ -0,0 +1,199 @@
+---
+id: dasunerwartete
+name: Das Unerwartete
+description: "Das Unerwartete (D-U) is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: de-DE
+type: private
+encoding: UTF-8
+links:
+  - https://dasunerwartete.biz/
+
+caps:
+  categorymappings:
+    # Filme
+    - {id: 28, cat: Movies/SD, desc: "SD"}
+    - {id: 32, cat: Movies/HD, desc: "HD"}
+    - {id: 114, cat: Movies/UHD, desc: "UHD"}
+    - {id: 140, cat: Movies/BluRay, desc: "BluRay"}
+    - {id: 138, cat: Movies, desc: "Pack`s"}
+    # Serien
+    - {id: 60, cat: TV/SD, desc: "SD"}
+    - {id: 57, cat: TV/HD, desc: "HD"}
+    - {id: 139, cat: TV/UHD, desc: "UHD"}
+    - {id: 59, cat: TV, desc: "Pack`s"}
+    # Audio
+    - {id: 110, cat: Audio/MP3, desc: "MP3"}
+    - {id: 48, cat: Audio/Lossless, desc: "Flac"}
+    - {id: 52, cat: Audio, desc: "Pack"}
+    - {id: 63, cat: Audio/Audiobook, desc: "Hörbuch"}
+    - {id: 120, cat: Audio/Video, desc: "Videos"}
+    # Apps
+    - {id: 12, cat: PC/0day, desc: "Windows"}
+    - {id: 125, cat: PC/Mac, desc: "Mac-OSX"}
+    - {id: 11, cat: PC/Mobile-Other, desc: "Mobil"}
+    - {id: 141, cat: PC, desc: "PC"}
+    # Doku
+    - {id: 15, cat: TV/Documentary, desc: "SD"}
+    - {id: 14, cat: TV/Documentary, desc: "HD"}
+    - {id: 123, cat: TV/Documentary, desc: "Reihe"}
+    # Spiel
+    - {id: 126, cat: PC/Mobile-Other, desc: "Mobil"}
+    - {id: 17, cat: PC/Games, desc: "PC"}
+    - {id: 24, cat: Console, desc: "Konsole"}
+    - {id: 121, cat: Console, desc: "Wimmelbild"}
+    # Sport
+    - {id: 61, cat: TV/Sport, desc: "HD"}
+    - {id: 62, cat: TV/Sport, desc: "SD"}
+    # ePaper
+    - {id: 96, cat: Books/Mags, desc: "Zeitungen"}
+    - {id: 136, cat: Books/EBook, desc: "E-Book"}
+    - {id: 137, cat: Books/Comics, desc: "Comics"}
+    # XXX
+    - {id: 76, cat: XXX/SD, desc: "SD"}
+    - {id: 73, cat: XXX/x264, desc: "HD"}
+    - {id: 75, cat: XXX/Pack, desc: "Pack"}
+    - {id: 142, cat: XXX/ImageSet, desc: "Pic´s"}
+    # Internal
+    - {id: 129, cat: Movies/SD, desc: "Film SD"}
+    - {id: 128, cat: Movies/HD, desc: "Film HD"}
+    - {id: 131, cat: TV/SD, desc: "Serie SD"}
+    - {id: 130, cat: TV/HD, desc: "Serien HD"}
+    - {id: 132, cat: Other, desc: "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: onlyupload
+    type: checkbox
+    label: Filter OnlyUpload only
+    default: false
+  - name: info_free
+    type: info
+    label: About OnlyUpload at D-U
+    default: "<ul><li>OnlyUpload are torrents where download is not counted but upload is. Good for building your Ratio up. (On the Jackett dashboard search results these are tagged as Freeleech).</li></ul>"
+  - 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> setting to <b>60</b> on your Control Panel. 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: logintracker.php
+  method: post
+  inputs:
+    login_identifier: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    loggiin: Login
+  error:
+    - selector: div.error-message
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  # https://dasunerwartete.biz/selection.php?scat[]=60&scat[]=15&search=&blah=0&orderby=added&sort=desc
+  path: selection.php
+  inputs:
+    $raw: "{{ range .Categories }}scat[]={{.}}&{{end}}"
+    search: "{{ .Keywords }}"
+    # 0 name, 1 descr, 2 both
+    blah: 0
+    orderby: "{{ .Config.sort }}"
+    sort: "{{ .Config.type }}"
+    # site does not support imdbid search from the browse.php page or return imdb links in results
+
+  rows:
+    selector: "div.selection_wrap{{ if .Config.onlyupload }}:has(img[src=\"/pic/free.gif\"]){{ else }}{{ end }}"
+
+  fields:
+    category:
+      selector: a[href^="selection.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download_ssl.php?torrent="]
+      attribute: href
+    poster:
+      selector: img[src^="cloud-data/to_cover/"]
+      attribute: src
+    size:
+      selector: div.selection_unter_ad
+    grabs:
+      selector: div.selection_unter_ae
+    seeders:
+      selector: div.selection_unter_aa > b
+    leechers:
+      selector: div.selection_unter_aaa > b
+    date_day:
+      # Heute 03:27:27
+      # Gestern 21:00:59
+      selector: div.selection_unter_ab:contains("Heute"), div.selection_unter_ab:contains("Gestern")
+      optional: true
+      filters:
+        - name: replace
+          args: ["Heute ", "Today"]
+        - name: replace
+          args: ["Gestern ", "Yesterday"]
+        - name: fuzzytime
+    date_year:
+      # 14.03.2024 um 20:43:07
+      selector: div.selection_unter_ab:not(:contains("Heute")):not(:contains("Gestern"))
+      optional: true
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: replace
+          args: ["um ", ""]
+        - 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 }}"
+    downloadvolumefactor:
+      case:
+        img[src="/pic/free.gif"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# THX custom

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

@@ -94,8 +94,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # 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

src/Jackett.Common/Definitions/demonoid.yml

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

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

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

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

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

src/Jackett.Common/Definitions/digitalcore.yml

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

src/Jackett.Common/Definitions/discfan.yml

@@ -184,4 +184,4 @@ search:
           args: "cat={{ .Result.category_title }} - "
     minimumratio:
       text: 0.9
-# NexusPHP v1.8.8 2023-09-25
+# NexusPHP v1.8.12 2024-05-10

src/Jackett.Common/Definitions/divteam.yml

@@ -59,12 +59,10 @@ settings:
     type: text
     label: Cookie
   - name: info_cookie
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+    type: info_cookie
   - name: freeleech
     type: checkbox
-    label: Search freeleech only
+    label: Filter freeleech only
     default: false
   - name: sort
     type: select
@@ -107,16 +105,17 @@ search:
     page: torrents
     category: "{{ range .Categories }}{{.}};{{end}}"
     search: "{{ .Keywords }}"
+    # 0 title, 1 title&desc, 2 descr, 3 uploaders, 5 gold, 6 silver, 9 2x, 10 3x, 11 4x, 12 5x
+    # note the options are exclusive, so searching for gold means the search keywords are ignored
+    options: 0
     # 0 all, 1 activeonly, 2 deadonly
     active: 0
-    # 0 title, 1 title&desc, 2 descr, 3 uploaders, 5 gold, 6 silver, 9 2x, 10 3x, 11 4x, 12 5x
-    options: "{{ if .Config.freeleech }}5{{ else }}0{{ end }}"
     order: "{{ .Config.sort }}"
     by: "{{ .Config.type }}"
     # does not support imdbid search and does not supply imdb link in results.
 
   rows:
-    selector: table.table.table-bordered > tbody > tr:has(a[href^="download.php?id="])
+    selector: "table.table.table-bordered > tbody > tr:has(a[href^=\"download.php?id=\"]){{ if .Config.freeleech }}:has(img[src$=\"gold.gif\"]){{ else }}{{ end }}, table.table.table-bordered > tbody > tr:has(a[href^=\"download.php?id=\"]){{ if .Config.freeleech }}:has(img[src$=\"freeleech.gif\"]){{ else }}{{ end }}"
 
   fields:
     download:

src/Jackett.Common/Definitions/dmhy.yml

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

src/Jackett.Common/Definitions/dreamtracker.yml

@@ -1,7 +1,7 @@
 ---
 id: dreamtracker
 name: Dream Tracker
-description: "Dream Tracker is a GREEK Private tracker for TV / MOVIES / GENERAL"
+description: "Dream Tracker is a Subscription only GREEK Private tracker for TV / MOVIES / GENERAL"
 language: en-US
 type: private
 encoding: UTF-8

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

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

src/Jackett.Common/Definitions/empornium2fa.yml

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

src/Jackett.Common/Definitions/enthralled2fa.yml

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

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

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

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

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

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

@@ -7,22 +7,14 @@ type: public
 encoding: UTF-8
 links:
   - https://extratorrent.st/
-  - https://extratorrent.unblockit.africa/
   - https://extratorrent.ninjaproxy1.com/
   - https://extratorrent.proxyninja.org/
+  - https://extratorrent.proxyninja.net/
 legacylinks:
-  - https://extratorrent.nocensor.lol/
-  - https://extratorrent.unblockit.ink/
-  - https://extratorrent.nocensor.art/
-  - https://extratorrent.unblockit.bio/
-  - https://extratorrent.unblockit.boo/
-  - https://extratorrent.mrunblock.guru/
-  - https://extratorrent.unblockit.click/
   - https://extratorrent.unblockit.asia/
   - 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/
@@ -32,6 +24,11 @@ legacylinks:
   - https://extratorrent.nocensor.cloud/
   - https://extratorrent.unblockit.date/
   - https://extratorrent.unblockit.dad/
+  - https://extratorrent.unblockit.africa/
+  - https://extratorrent.unblockit.casa/ # 502
+  - https://extratorrent.unblockit.sbs/ # 502
+  - https://extratorrent.unblockit.ong/ # 502
+  - https://extratorrent.unblockit.black/ # 502
 
 caps:
   categorymappings:
@@ -88,10 +85,8 @@ caps:
     book-search: [q]
 
 settings:
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+  - name: info_flaresolverr
+    type: info_flaresolverr
 
 search:
   paths:

src/Jackett.Common/Definitions/exttorrents.yml

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

src/Jackett.Common/Definitions/eztv.yml

@@ -11,22 +11,16 @@ links:
   - https://eztv.tf/
   - https://eztv.yt/
   - https://eztv1.xyz/
-  - https://eztv.unblockit.africa/
-  - https://eztv.unblockninja.com/
-  - https://eztv.ninjaproxy1.com/
-  - https://eztv.proxyninja.org/
+  - https://eztv.unblockit.black/
 legacylinks:
   - https://eztv.ag/ # redirects to .re
   - https://eztv.it/ # redirects to .re
   - https://eztv.ch/ # redirects to .re
   - https://eztv.io/
-  - https://eztv.mrunblock.guru/
-  - https://eztv.unblockit.click/
   - https://eztv.unblockit.asia/
   - 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/
@@ -38,6 +32,14 @@ legacylinks:
   - https://eztv.nocensor.cloud/
   - https://eztv.unblockit.date/
   - https://eztv.unblockit.dad/
+  - https://eztv.unblockit.africa/
+  - https://eztv.unblockit.casa/
+  - https://eztv.unblockit.sbs/
+  - https://eztv.unblockninja.com/ # layout=def_wlinks not working
+  - https://eztv.ninjaproxy1.com/ # layout=def_wlinks not working
+  - https://eztv.proxyninja.org/ # layout=def_wlinks not working
+  - https://eztv.abcproxy.org/
+  - https://eztv.unblockit.ong/
 
 caps:
   categories:

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

@@ -1,27 +1,30 @@
 ---
-id: brsociety-api
-name: BrSociety (API)
-description: "BrSociety (SemeandoCC) is a BRAZILIAN Private Torrent Tracker for E-LEARNING"
-language: pt-BR
+id: f1carreras-api
+name: F1Carreras (API)
+description: "F1Carreras is a Spanish Private Torrent Tracker for Motor Racing TV Releases"
+language: es-ES
 type: private
 encoding: UTF-8
 links:
-  - https://brsociety.club/
+  - https://f1carreras.xyz/
 
 caps:
   categorymappings:
-    - {id: 1, cat: Other, desc: "Cursos"}
-    - {id: 2, cat: Books/EBook, desc: "eBooks"}
-    - {id: 5, cat: Books/Mags, desc: "Revistas"}
-    - {id: 3, cat: Audio/Audiobook, desc: "Audiobooks"}
-    - {id: 4, cat: Other, desc: "Arquivos de Auxilio"}
-    - {id: 6, cat: Other, desc: "Graduação"}
-    - {id: 7, cat: TV/Documentary, desc: "Documentários"}
+    - {id: 1, cat: TV/Sport, desc: "Movies"}
+    - {id: 2, cat: TV/Sport, desc: "TV"}
+    - {id: 3, cat: TV/Sport, desc: "Formula 1"}
+    - {id: 4, cat: TV/Sport, desc: "IndyCar Series"}
+    - {id: 5, cat: TV/Sport, desc: "Formula 2"}
+    - {id: 6, cat: TV/Sport, desc: "Formula E"}
+    - {id: 7, cat: TV/Sport, desc: "MotoGP"}
+    - {id: 8, cat: TV/Sport, desc: "Nascar"}
+    - {id: 9, cat: TV/Sport, desc: "Formula 3"}
+    - {id: 10, cat: TV/Sport, desc: "DTM"}
+    - {id: 11, cat: TV/Sport, desc: "Rally"}
 
   modes:
     search: [q]
-    tv-search: [q, season, ep]
-    book-search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
 
 settings:
   - name: apikey
@@ -30,7 +33,7 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://brsociety.club/\" target=\"_blank\">BrSociety</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://f1carreras.xyz/\" target=\"_blank\">F1Carreras</a> account <i>Settings</i> page and clicking on the <b>API Key</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -51,10 +54,6 @@ settings:
     options:
       desc: desc
       asc: asc
-  - name: info_activity
-    type: info
-    label: Account Inactivity
-    default: "Your account will be considered inactive if it exceeds 90 days without you logging in to the Website. After 90 days of inactivity (i.e., 180 days without login) it will be deleted from the tracker."
 
 login:
   path: /api/torrents
@@ -66,8 +65,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # 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
@@ -76,8 +75,14 @@ search:
     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 }}"
@@ -100,11 +105,19 @@ search:
       selector: details_link
     download:
       selector: download_link
-    magnet:
-      selector: magnet_link
-      optional: true
     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
     files:
       selector: num_file
     seeders:
@@ -139,10 +152,7 @@ search:
       case:
         False: 1 # normal
         True: 2 # double
-# global MR is 0.7 but torrents must be seeded for 4 days regardless of ratio
-#    minimumratio:
-#      text: 0.7
     minimumseedtime:
-      # 4 days (as seconds = 4 x 24 x 60 x 60)
-      text: 345600
-# json UNIT3D 7.1.3 (custom)
+      # 6 hours (as seconds = 6 x 60 x 60)
+      text: 21600
+# json UNIT3D 7.2.5

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

@@ -1,134 +0,0 @@
----
-id: fastscene
-name: FastScene
-description: "FastScene is a ROMANIAN / ENGLISH Private site for MOVIES / TV / GENERAL"
-language: ro-RO
-type: private
-encoding: UTF-8
-links:
-  - https://fastscene.net/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: TV/Anime, desc: "Anime"}
-    - {id: 2, cat: TV/Anime, desc: "Anime-Ro"}
-    - {id: 3, cat: Movies/BluRay, desc: "BluRay"}
-    - {id: 4, cat: Movies/BluRay, desc: "BluRay-Ro"}
-    - {id: 5, cat: Movies/UHD, desc: "4K"}
-    - {id: 6, cat: Movies/UHD, desc: "4K-Ro"}
-    - {id: 7, cat: Movies/3D, desc: "3D"}
-    - {id: 8, cat: Movies/3D, desc: "3D-Ro"}
-    - {id: 9, cat: Movies/HD, desc: "HD"}
-    - {id: 10, cat: Movies/HD, desc: "HD-Ro"}
-    - {id: 11, cat: Movies/SD, desc: "XVID"}
-    - {id: 12, cat: Movies/SD, desc: "XVID-Ro"}
-    - {id: 13, cat: Movies, desc: "Oldies"}
-    - {id: 14, cat: Movies, desc: "Oldies-Ro"}
-    - {id: 15, cat: Movies, desc: "Packs Movies"}
-    - {id: 16, cat: Movies, desc: "Packs Movies-Ro"}
-    - {id: 17, cat: TV, desc: "TV-Episodes"}
-    - {id: 18, cat: TV, desc: "TV-Episodes-Ro"}
-    - {id: 19, cat: PC/Games, desc: "Games PC"}
-    - {id: 20, cat: PC/Games, desc: "Games Packs"}
-    - {id: 21, cat: Audio/MP3, desc: "Music MP3"}
-    - {id: 22, cat: Movies, desc: "APPZ"}
-    - {id: 23, cat: TV/Sport, desc: "Sports"}
-    - {id: 24, cat: PC/Mobile-Android, desc: "Android"}
-    - {id: 25, cat: TV/Documentary, desc: "Docs"}
-    - {id: 26, cat: Other, desc: "Images"}
-    - {id: 27, cat: XXX, desc: "XXX"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    book-search: [q]
-
-settings:
-  - name: cookie
-    type: text
-    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: info_activity
-    type: info
-    label: Account Inactivity
-    default: "Accounts with ZERO activity (0 bytes downloaded and 0 bytes uploaded) will automatically be deleted after 90 days. Inactive accounts (Lower than VIP class) will be automatically deleted after 150 days."
-
-login:
-  method: cookie
-  inputs:
-    cookie: "{{ .Config.cookie }}"
-  test:
-    path: /
-    selector: a[href="account-logout.php"]
-
-search:
-  paths:
-    - path: torrents-search.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    # 0 active, 1 incldead, 2 onlydead
-    incldead: 1
-    # 0 all, 1 nofree, 2 onlyfree
-    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # does not support imdbid searches or provide sort options
-
-  rows:
-    selector: table.ttable_headinner > tbody > tr
-
-  fields:
-    category:
-      selector: a[href*="cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: a[href^="torrents-details.php?id="] b
-    details:
-      selector: a[href^="torrents-details.php?id="]
-      attribute: href
-      filters:
-        - name: replace
-          args: ["&hit=1", ""] # avoid redirect
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    poster:
-      selector: a[onMouseover] img
-      attribute: src
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    date:
-      text: now
-    size:
-      selector: td:nth-child(5)
-    seeders:
-      selector: td:nth-child(6)
-    leechers:
-      selector: td:nth-child(7)
-    genre:
-      selector: b:contains("Genre") font:nth-child(2)
-    description:
-      text: "{{ .Result.genre }}"
-    downloadvolumefactor:
-      case:
-        img[src$="/FREE.png"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.1
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# TorrentTrader (custom 3.0)

src/Jackett.Common/Definitions/fearnopeer.yml

@@ -38,6 +38,10 @@ 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
@@ -65,8 +69,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # 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
@@ -99,8 +103,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:
@@ -121,8 +132,6 @@ search:
     genre:
       selector: meta.genres
       filters:
-        - name: re_replace
-          args: ["(?i)^None$", ""]
         - name: re_replace
           args: ["(?i)(Science Fiction)", "Science_Fiction"]
         - name: re_replace
@@ -131,8 +140,6 @@ search:
           args: [" & ", "_&_"]
     description:
       text: "{{ .Result.genre }}"
-    files:
-      selector: num_file
     seeders:
       selector: seeders
     leechers:
@@ -168,4 +175,4 @@ search:
 # Maintain global ratio above 0.5 or downloads will get disabled. No MST.
     minimumratio:
       text: 0.51
-# json UNIT3D 7.2.5
+# json UNIT3D 8.1.3

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

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

src/Jackett.Common/Definitions/finelite.yml

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

src/Jackett.Common/Definitions/freefarm.yml

@@ -69,6 +69,8 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_flaresolverr
+    type: info_flaresolverr
   - name: info_tpp
     type: info
     label: Results Per Page
@@ -76,7 +78,7 @@ settings:
   - name: info_activity
     type: info
     label: Account Inactivity
-    default: "Cherish your user account. Inactive accounts would be deleted based on the following rules:<ol><li>Veteran User or above would never be deleted.</li><li>Elite User or above would never be deleted if packed (at User CP).</li><li>Packed accounts would be deleted if users have not logged in for more than 400 days in a row.</li><li>Unpacked accounts would be deleted if users have not logged in for more than 150 days in a row.</li><li>Accounts with both uploaded and downloaded amount being 0 would be deleted if users have not logged in for more than 100 days in a row.</li></ol>"
+    default: "Cherish your user account. Inactive accounts would be deleted based on the following rules:<ol><li>Veteran User or above would never be deleted.</li><li>Elite User or above would never be deleted if parked (at User CP).</li><li>Parked accounts would be deleted if users have not logged in for more than 400 days in a row.</li><li>Unparked accounts would be deleted if users have not logged in for more than 150 days in a row.</li><li>Accounts with both uploaded and downloaded amount being 0 would be deleted if users have not logged in for more than 100 days in a row.</li></ol>"
 
 login:
   path: login.php
@@ -216,4 +218,4 @@ search:
       filters:
         - name: prepend
           args: "{{ .Result.description_verified }} "
-# NexusPHP v1.8.9 2023-09-29
+# NexusPHP v1.8.12 2024-04-13

src/Jackett.Common/Definitions/frozenlayer.yml

@@ -6,8 +6,6 @@ language: es-ES
 type: public
 encoding: UTF-8
 requestDelay: 2
-certificates:
-  - b738ae9ae55c5553b1ff7d3004d807229be3a091  # Expired 4 Dec 2023
 links:
   - https://www.frozen-layer.com/
 

src/Jackett.Common/Definitions/fsm.yml

@@ -30,14 +30,14 @@ settings:
   - name: info_token
     type: info
     label: About your API Token
-    default: "Beta API Token applications have now closed. If you haven't already received one by private message, please wait for the official launch."
+    default: "Generate your API token on the <a href=\"https://fsm.name/API\" target=\"_blank\">FSM API</a> page."
   - name: passkey
     type: text
     label: Passkey
   - name: info_passkey
     type: info
     label: About your Passkey
-    default: "Find your Passkey by accessing the <a href=\"https://fsm.name/Rss\" target=\"_blank\">FSM RSS</a> page."
+    default: "Find your Passkey on the <a href=\"https://fsm.name/Rss\" target=\"_blank\">FSM RSS</a> page."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -88,8 +88,6 @@ search:
       selector: tags
     description:
       text: "{{ .Result.genre }}"
-    files:
-      selector: fileCount
     seeders:
       selector: peers.upload
     leechers:
@@ -97,21 +95,7 @@ search:
     grabs:
       selector: finish
     date:
-      selector: createdAt
-      filters:
-        - name: replace
-          args: ["年", "years"]
-        - name: replace
-          args: ["月", "months"]
-        - name: replace
-          args: ["天", "days"]
-        - name: re_replace
-          args: ["小?时", "hours"]
-        - name: replace
-          args: ["分", "minutes"]
-        - name: replace
-          args: ["前", " ago"]
-        - name: timeago
+      selector: createdTs
     size:
       selector: fileSize
     downloadvolumefactor:

src/Jackett.Common/Definitions/fuzer.yml

@@ -61,7 +61,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid]
+    tv-search: [q, season, ep]
     movie-search: [q, imdbid]
     music-search: [q]
     book-search: [q]
@@ -70,10 +70,8 @@ settings:
   - name: cookie
     type: text
     label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: info_cookie
+    type: info_cookie
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -110,6 +108,7 @@ search:
     query: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
     order: "{{ .Config.sort }}"
     sort: "{{ .Config.type }}"
+    # any (every word), phr (any match), all (exact match)
     matchquery: any
     freeleech: "{{ if .Config.freeleech }}1{{ else }}0{{ end }}"
     # on, off, only_dead

src/Jackett.Common/Definitions/gamera.yml

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

src/Jackett.Common/Definitions/gamestorrents.yml

@@ -11,11 +11,6 @@ legacylinks:
   - https://www.gamestorrents.com/
   - https://www.gamestorrents.tv/
   - https://www.gamestorrents.nu/
-  - https://gamestorrents.nocensor.space/
-  - https://gamestorrents.nocensor.work/
-  - https://gamestorrents.nocensor.biz/
-  - https://gamestorrents.nocensor.sbs/
-  - https://gamestorrents.nocensor.world/
 
 caps:
   categorymappings:

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

@@ -92,8 +92,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # 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

src/Jackett.Common/Definitions/girotorrent.yml

@@ -96,7 +96,7 @@ settings:
     label: Password
   - name: freeleech
     type: checkbox
-    label: Search freeleech only
+    label: Filter freeleech only
     default: false
   - name: sort
     type: select
@@ -152,13 +152,14 @@ search:
     # 15 results per page fetch 5 (site is slow, dont be greedy and fetch more)
     - path: index.php
   inputs:
+    page: torrents
     search: "{{ .Keywords }}"
     category: "{{ range .Categories }}{{.}};{{end}}"
-    page: torrents
+    # 0 name, 1 name&descr, 2 descr, 3 uploader, 5 gold, 6 silver, 7 bronze
+    # note the options are exclusive, so searching for gold means the search keywords are ignored
+    options: 0
     # 0 all, 1 activeonly, 2 deadonly
     active: 0
-    # 0 name, 1 name&descr, 2 descr, 3 uploader, 5 gold, 6 silver, 7 bronze
-    options: "{{ if .Config.freeleech }}5{{ else }}0{{ end }}"
     order: "{{ .Config.sort }}"
     by: "{{ .Config.type }}"
   keywordsfilters:
@@ -171,7 +172,7 @@ search:
   # does not support imdbid search and does not return imdb link in results
 
   rows:
-    selector: div.b-content > table > tbody > tr > td > table.lista > tbody > tr:has(a[href^="index.php?page=torrent-details&id="])
+    selector: "div.b-content > table > tbody > tr > td > table.lista > tbody > tr:has(a[href^=\"index.php?page=torrent-details&id=\"]){{ if .Config.freeleech }}:has(img[alt=\"Gold 100% Free\"]){{ else }}{{ end }}, div.b-content > table > tbody > tr > td > table.lista > tbody > tr:has(a[href^=\"index.php?page=torrent-details&id=\"]){{ if .Config.freeleech }}:has(img[alt=\"Free Leech\"]){{ else }}{{ end }}"
     filters:
       - name: andmatch
 

src/Jackett.Common/Definitions/gktorrent.yml

@@ -1,26 +1,18 @@
 ---
 id: gktorrent
 name: GkTorrent
-description: "GkTorrent is a French Public site for TV / MOVIES / GENERAL"
+description: "GkTorrent is a French Semi-Private site for TV / MOVIES / GENERAL"
 language: fr-FR
-type: public
+type: semi-private
 encoding: UTF-8
 followredirect: true
 # to fetch current domain use https://www.protege-torrent.com/Gktorrent
 links:
-  - https://www.gktorrent.lol/
+  - https://www.gktorrent.tw/
 legacylinks:
   - https://www.rantop.org/
-  - https://gktorrent.nocensor.work/
-  - https://gktorrent.nocensor.biz/
-  - https://www.gktorrents.org/
-  - https://gktorrent.nocensor.sbs/
-  - https://gktorrent.nocensor.world/
-  - https://gktorrent.nocensor.lol/
-  - https://gktorrent.mrunblock.guru/
-  - https://gktorrent.mrunblock.life/
+  - https://www.torrent.ws/
   - https://gktorrent.nocensor.click/
-  - https://www.gktorrents.cc/
   - https://www.gktorrent.ac/
   - https://www.gktorrent.ph/
   - https://www.gktorrent.vc/
@@ -31,10 +23,16 @@ legacylinks:
   - https://gktorrent.mrunblock.bond/
   - https://www.gktorrent.wtf/
   - https://www.gktorrent.vg/
+  - https://www.gktorrent.lol/
+  - https://www.gktorrent.sh/
+  - https://www.gktorrent.eu/
+  - https://www.gktorrent.xyz/
+  - https://www.gktorrent.pm/
 
 caps:
   categorymappings:
     - {id: Films, cat: Movies, desc: "Movies"}
+    - {id: Vidéos, cat: Movies, desc: "Vidéos"}
     - {id: Animes, cat: TV/Anime, desc: "Anime"}
     - {id: Séries, cat: TV, desc: "TV Series"}
     - {id: Spectacles, cat: TV, desc: "TV Shows"}
@@ -57,6 +55,12 @@ caps:
   allowrawsearch: true
 
 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
@@ -77,6 +81,22 @@ settings:
     label: Replace VOSTFR and SUBFRENCH with ENGLISH
     default: false
 
+login:
+  path: login
+  method: form
+  form: form#formLogin
+  inputs:
+    user: "{{ .Config.username }}"
+    pass: "{{ .Config.password }}"
+    submit: submit
+  error:
+    - selector: :root:contains("Pseudo ou Mot de passe erron")
+      message:
+        text: "Pseudo ou Mot de passe erroné"
+  test:
+    path: /
+    selector: a[href="/index.php?page=logout"]
+
 download:
   selectors:
     - selector: a[href^="magnet:?"]
@@ -97,7 +117,7 @@ search:
       args: ["(?i)(S)(\\d{1,3})$", "saison $2"]
 
   rows:
-    selector: table.table-hover > tbody > tr:has(a[onclick*="torrent/"])
+    selector: table.table-hover > tbody > tr:has(td a[href])
 
   fields:
     category:
@@ -124,7 +144,7 @@ search:
       text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
     details:
       selector: td:nth-child(1) a
-      attribute: onclick
+      attribute: href
       filters:
         - name: regexp
           args: (/?torrent/\d+)

src/Jackett.Common/Definitions/glodls.yml

@@ -8,21 +8,13 @@ encoding: UTF-8
 links:
   - https://glodls.to/
   - https://gtso.cc/
-  - https://glotorrents.unblockit.africa/
-  - https://glodls.unblockninja.com/
-  - https://glodls.ninjaproxy1.com/
+  - https://glotorrents.unblockit.black/
 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/
@@ -34,6 +26,12 @@ legacylinks:
   - https://glotorrents.nocensor.cloud/
   - https://glotorrents.unblockit.date/
   - https://glotorrents.unblockit.dad/
+  - https://glotorrents.unblockit.africa/
+  - https://glotorrents.unblockit.casa/
+  - https://glotorrents.unblockit.sbs/
+  - https://glotorrents.unblockit.ong/
+  - https://glodls.unblockninja.com/ # blank
+  - https://glodls.ninjaproxy1.com/ # blank
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/gtorrentpro.yml

@@ -1,14 +1,15 @@
 ---
 id: gtorrentpro
-name: GTorrent.ru
-description: "GTorrent.ru is a RUSSIAN Public Torrent Tracker for MOVIES / TV / GENERAL"
+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:
-  - http://gtorrent.ru/
+  - https://gtorrent.club/
 legacylinks:
   - http://gtorrent.pro/
+  - http://gtorrent.ru/
 
 caps:
   categorymappings:
@@ -22,7 +23,9 @@ caps:
   modes:
     search: [q]
 
-settings: []
+settings:
+  - name: info_flaresolverr
+    type: info_flaresolverr
 
 download:
   selectors:

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

@@ -0,0 +1,166 @@
+---
+id: h-p2p
+name: H-P2P
+description: "H-P2P is a Private Torrent Tracker for OnlyFans XXX"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://h-p2p.xyz/
+legacylinks:
+  - https://h-p2p.cam/
+
+caps:
+  categorymappings:
+    - {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]
+
+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://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
+    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:
+    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
+    name: "{{ .Keywords }}"
+    "free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 75
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
+  rows:
+    selector: data
+    attribute: attributes
+
+  fields:
+    _id:
+      selector: ..id
+    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:
+      text: "{{ .Config.sitelink }}files/img/torrent-cover_{{ .Result._id }}.jpg"
+    genre:
+      selector: meta.genres
+      filters:
+        - name: re_replace
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
+        - name: replace
+          args: [" & ", "_&_"]
+    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
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# json UNIT3D 8.1.3 (custom)

src/Jackett.Common/Definitions/happyfappy.yml

@@ -11,10 +11,11 @@ links:
 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: 6, cat: XXX, desc: "Onlyfans"}
     - {id: 9, cat: XXX, desc: "Packs"}
     - {id: 10, cat: XXX, desc: "Pics"}
     - {id: 1, cat: XXX, desc: "Pron"}

src/Jackett.Common/Definitions/happyfappy2fa.yml

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

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

@@ -1,7 +1,7 @@
 ---
 id: hawke-uno
 name: hawke-uno
-description: "hawke-uno is a Private Torrent Tracker for (X265 / HEVC) MOVIES / TV"
+description: "hawke-uno (HUNO) is a Private Torrent Tracker for (X265 / HEVC) MOVIES / TV"
 language: en-US
 type: private
 encoding: UTF-8
@@ -63,8 +63,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # 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

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

@@ -33,6 +33,10 @@ 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
@@ -64,8 +68,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # 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
@@ -98,8 +102,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:
@@ -120,8 +131,6 @@ search:
     genre:
       selector: meta.genres
       filters:
-        - name: re_replace
-          args: ["(?i)^None$", ""]
         - name: re_replace
           args: ["(?i)(Science Fiction)", "Science_Fiction"]
         - name: re_replace
@@ -130,8 +139,6 @@ search:
           args: [" & ", "_&_"]
     description:
       text: "{{ .Result.genre }}"
-    files:
-      selector: num_file
     seeders:
       selector: seeders
     leechers:
@@ -167,4 +174,4 @@ search:
     minimumseedtime:
       # 3 days (as seconds = 3 x 24 x 60 x 60)
       text: 259200
-# json UNIT3D 7.2.5
+# json UNIT3D 8.1.3

src/Jackett.Common/Definitions/hd4fans.yml

@@ -22,8 +22,8 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
     music-search: [q]
 
 settings:
@@ -33,30 +33,57 @@ 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 Free Farm Web Site. Otherwise just leave it empty."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
     default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
   - name: info_tpp
     type: info
     label: Results Per Page
     default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
 
 login:
-  path: takelogin.php
-  method: post
-  cookies: ["c_lang_folder=en"]
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
   inputs:
+    secret: ""
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
+    two_step_code: "{{ .Config.2facode }}"
     logout: ""
     securelogin: ""
     ssl: yes
     trackerssl: yes
   error:
     - selector: td.embedded:has(h2:contains("失败"))
-      message:
-        selector: td.text
   test:
     path: index.php
     selector: a[href="logout.php"]
@@ -66,21 +93,29 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    # 0=incldead, 1=active, 2=dead
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }} {{ else }}{{ .Keywords }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
     incldead: 0
-    # show promotions: 0=all, 1=normal, 2=free, 3=2x, 4=2xFree, 5=50%, 6=2x50%, 7=30%
+    # 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=imdb URL
-    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
-    # 0=AND, 1=OR, 2=Exact
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}{{ end }}{{ if .Query.DoubanID }}1{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}0{{ end }}"
+    # 0 AND, 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^="download.php?id="])
 
   fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
     title_default:
       selector: a[href^="details.php?id="]
     title:
@@ -88,18 +123,23 @@ 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
+    poster:
+      selector: img[data-src]
+      attribute: data-src
+    imdbid:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
+      selector: a[href*="imdb.com/title/tt"]
+      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
     date_elapsed:
       # time type: time elapsed (default)
       selector: td.rowfollow:nth-child(4) > span[title]
@@ -146,4 +186,4 @@ search:
     description:
       selector: td.rowfollow:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP Standard v1.5 Beta 4
+# NexusPHP  v1.8.8 2023-09-25

src/Jackett.Common/Definitions/hdarea.yml

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

src/Jackett.Common/Definitions/hdatmos.yml

@@ -65,7 +65,7 @@ settings:
   - name: info_activity
     type: info
     label: Account Inactivity
-    default: "Cherish your user account. Inactive accounts would be deleted based on the following rules:<ol><li>Veteran User or above would never be deleted.</li><li>Elite User or above would never be deleted if packed (at User CP).</li><li>Packed accounts would be deleted if users have not logged in for more than 400 days in a row.</li><li>Unpacked accounts would be deleted if users have not logged in for more than 150 days in a row.</li><li>Accounts with both uploaded and downloaded amount being 0 would be deleted if users have not logged in for more than 100 days in a row.</li></ol>"
+    default: "Cherish your user account. Inactive accounts would be deleted based on the following rules:<ol><li>Veteran User or above would never be deleted.</li><li>Elite User or above would never be deleted if parked (at User CP).</li><li>Parked accounts would be deleted if users have not logged in for more than 400 days in a row.</li><li>Unparked accounts would be deleted if users have not logged in for more than 150 days in a row.</li><li>Accounts with both uploaded and downloaded amount being 0 would be deleted if users have not logged in for more than 100 days in a row.</li></ol>"
 
 login:
   path: login.php

src/Jackett.Common/Definitions/hdc.yml

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