sktorrent: undo title diacritics removal

This reverts commit 857278c724.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -2,6 +2,7 @@ name: Bug report
 description: Create a report of your issue
 body:
 - type: checkboxes
+  id: troubleshooting
   attributes:
     label: Have you checked our Troubleshooting page for your issue?
     description: Please read the <a href="https://github.com/Jackett/Jackett/wiki/Troubleshooting">Troubleshooting</a> page for steps to resolve common issues.
@@ -9,6 +10,7 @@ body:
       - label: I have checked the Troubleshooting page
         required: true
 - type: checkboxes
+  id: already-an-issue
   attributes:
     label: Is there already an issue for your problem?
     description: Please make sure you are not creating an already submitted <a href="https://github.com/Jackett/Jackett/issues">Issue</a>. Check closed issues as well, because your issue may have already been fixed.
@@ -16,6 +18,7 @@ body:
       - label: I have checked older issues, open and closed
         required: true
 - type: checkboxes
+  id: contributing-guidelines
   attributes:
     label: Have you read our Contributing Guidelines?
     description: Please read our <a href="https://github.com/Jackett/Jackett/blob/master/CONTRIBUTING.md">Contributing Guidelines</a> before submitting your issue to ensure a prompt response to your bug.
@@ -23,6 +26,7 @@ body:
       - label: I have read the Contributing Guidelines
         required: true
 - type: textarea
+  id: environment
   attributes:
     label: Environment
     description: Please provide the details of the system Jackett is running on. The best way to do this is to restart Jackett, access the dashboard, view the log, and copy/paste replacing the example below with the last 10 Info lines at the bottom of the log.
@@ -40,12 +44,14 @@ body:
   validations:
     required: true
 - type: textarea
+  id: description
   attributes:
     label: Description
     description: List steps to reproduce the error and details on what happens and what you expected to happen.
   validations:
     required: true
 - type: textarea
+  id: error-logs
   attributes:
     label: Logged Error Messages
     description: |
@@ -55,6 +61,7 @@ body:
   validations:
     required: true
 - type: textarea
+  id: screenshots
   attributes:
     label: Screenshots
     description: Place any screenshots of the issue here if needed

.github/ISSUE_TEMPLATE/indexer-request.yml

@@ -36,13 +36,13 @@ body:
       - Name: TrackerX
       - URL: https://trackerx.yz
       - Description: TrackerX is a Private Torrent Tracker for Movies, TV, and e-Learning
-      - Minimum Seeding Time and Minimum Ratio (if Private): MST 24hrs, MR 1.0
+      - Minimum Seeding Time and/or Minimum Seeding Ratio (if Private): MST 24hrs, MR 1.0
       - Additional Comments: IMDB search has to be enabled in account settings, often has hcaptcha at login
     value: |
       - Name: 
       - URL: 
       - Description: 
-      - Minimum Seeding Time and Minimum Ratio (if Private): 
+      - Minimum Seeding Time and/or Minimum Seeding Ratio (if Private): 
       - Additional Comments: 
     render: markdown
   validations:

.github/workflows/winget.yml

@@ -6,7 +6,7 @@ permissions:
   contents: read
 jobs:
   publish:
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     steps:
       - uses: vedantmgoyal2009/winget-releaser@v2
         with:

README.md

@@ -28,9 +28,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ØMagnet
  * 1337x
  * ACG.RIP
- * ACGsou (36DM)
  * Anidex
  * AniLibria
+ * Anime Time
  * Anime Tosho
  * AniRena
  * AniSource
@@ -63,8 +63,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ExtraTorrent.st
  * EZTV
  * FileListing
- * FireBit
- * freshMeat
  * Frozen Layer
  * GamesTorrents
  * GkTorrent
@@ -98,6 +96,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * NNTT
  * NoNaMe Club (NNM-Club)
  * Nyaa.si
+ * OKPT
  * OneJAV
  * ParnuXi
  * PC-torrent
@@ -113,6 +112,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Sexy-Pics
  * Shana Project
  * ShowRSS
+ * SimpleAnime
  * Solid Torrents
  * sosulki
  * SubsPlease
@@ -136,7 +136,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Torrents.csv
  * TorrentSir (토렌트썰)
  * TorrentView (토렌트뷰)
- * TorrentWhiz ( 토렌트위즈)
+ * TorrentWhiz (토렌트위즈)
  * Torrentz2eu
  * Torrentz2nz
  * TrahT
@@ -160,24 +160,19 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Anime-Free
  * AnimeLayer
  * ArenaBG
- * BitNova
  * BookTracker
  * BootyTape
  * Catorrent
- * Darmowe torrenty
  * Deildu
  * Demonoid
  * Devil-Torrents
- * DimeADozen (EzTorrent)
  * DXP (Deaf Experts)
  * Electro-Torrent
- * EliteTorrent-pl
  * EniaHD
  * Erai-Raws
  * Ex-torrenty
  * ExKinoRay
  * ExtremlymTorrents
- * Fenyarnyek-Tracker
  * File-Tracker
  * Gay-Torrents.net
  * Genesis-Movement
@@ -194,7 +189,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Masters-TB
  * Mazepa
  * Metal Tracker
- * Moviesite
+ * MovieWorld (Flicker)
+ * MuseBootlegs (MB)
  * MVGroup Forum
  * MVGroup Main
  * NetHD (VietTorrent)
@@ -223,7 +219,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TribalMixes
  * Union Fansub
  * UniOtaku
- * vTorrent
  * xTorrenty
  * YggTorrent (YGG)
  * ZOMB
@@ -238,6 +233,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * 2xFree
  * 3ChangTrai (3CT)
  * 3D Torrents (3DT)
+ * 3Wmg
  * 4thD (4th Dimension)
  * 52PT
  * 720pier
@@ -258,13 +254,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Araba Fenice (Phoenix) [![(invite needed)][inviteneeded]](#)
  * ArabP2P
  * ArabTorrents [![(invite needed)][inviteneeded]](#)
- * aro.lol
  * AsianCinema
  * AsianDVDClub
  * Audiences
  * AudioNews (AN)
  * Aussierul.es [![(invite needed)][inviteneeded]](#)
  * AvistaZ (AsiaTorrents)
+ * Azusa [![(invite needed)][inviteneeded]](#)
  * Back-ups
  * BakaBT
  * BeiTai
@@ -304,8 +300,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * CeskeForum
  * CGPeers [![(invite needed)][inviteneeded]](#)
  * CHDBits [![(invite needed)][inviteneeded]](#)
+ * cheggit
  * ChileBT
- * CiNEFiLHD
  * Cinemageddon [![(invite needed)][inviteneeded]](#)
  * CinemaMovieS_ZT
  * Cinematik [![(invite needed)][inviteneeded]](#)
@@ -316,18 +312,20 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * CrazyHD
  * CrazySpirits
  * CrnaBerza
+ * Dajiao (打胶) [![(invite needed)][inviteneeded]](#)
  * DANISH BYTES
  * Dark-Shadow
  * DataScene (DS)
- * DataTalli
  * DesiTorrents
  * Diablo Torrent [![(invite needed)][inviteneeded]](#)
  * DICMusic
  * DigitalCore
+ * DimeADozen (EzTorrent)
  * DiscFan
  * DivTeam
  * DocsPedia
  * Dream Tracker
+ * Drugari
  * Ebooks-Shares
  * Empornium (EMP) [![(invite needed)][inviteneeded]](#)
  * eShareNet
@@ -337,27 +335,30 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ExtremeTorrents
  * Falkon Vision Team
  * FANO.IN [![(invite needed)][inviteneeded]](#)
- * Fantastic Heaven
  * Fantastiko
+ * Fappaizuri
+ * FastScene
  * Femdomcult
  * FileList (FL)
- * FinElite (FE)
+ * FinElite (FE) [![(invite needed)][inviteneeded]](#)
  * FinVip
  * Flux-Zone
+ * Free Farm (自由农场)
  * FunFile (FF)
  * FunkyTorrents (FT)
+ * FutureTorrent [![(invite needed)][inviteneeded]](#)
  * Fuzer (FZ)
- * GainBound [![(invite needed)][inviteneeded]](#)
+ * Gamera (駕瞑羅)
  * Gay-Torrents.org
  * GAYtorrent.ru
  * GazelleGames (GGn)
- * Generation-Free
+ * Generation-Free [![(invite needed)][inviteneeded]](#)
  * GigaTorrents
  * GimmePeers (formerly ILT)
  * GiroTorrent
  * GreatPosterWall (GPW)
  * GreekDiamond
- * Greek Team [![(invite needed)][inviteneeded]](#)
+ * Greek Team
  * HaiDan
  * Haitang
  * HappyFappy
@@ -365,7 +366,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HD Dolby
  * HD-Forever (HDF)
  * HD-Olimpo
- * HD-Only (HDO) [![(invite needed)][inviteneeded]](#)
+ * HD-Only (HDO)
  * HD-Space (HDS)
  * HD-Torrents (HDT)
  * HD-UNiT3D
@@ -378,7 +379,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDFans
  * HDHome (HDBigger) [![(invite needed)][inviteneeded]](#)
  * HDMaYi
- * HDMonkey
+ * HDPT [![(invite needed)][inviteneeded]](#)
  * HDRoute [![(invite needed)][inviteneeded]](#)
  * HDSky [![(invite needed)][inviteneeded]](#)
  * HDTime
@@ -387,7 +388,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDVIDEO
  * HDZone
  * Hebits
+ * HellasHut
  * HHanClub
+ * HomePornTorrents (HPT)
  * House of Devil
  * HQMusic
  * iAnon
@@ -408,14 +411,16 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Keep Friends [![(invite needed)][inviteneeded]](#)
  * Korsar
  * KrazyZone
+ * Kufei (库非)
  * Kufirc
  * LastFiles
  * Le Saloon
+ * LaidBackManor
  * Lat-Team [![(invite needed)][inviteneeded]](#)
+ * Le-Cinephile
  * LearnBits
  * LearnFlakes
  * leech24
- * LemonHD
  * Les-Cinephiles
  * Lesbians4u
  * Libble
@@ -426,19 +431,18 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * LST
  * M-Team TP (MTTP)
  * MaDs Revolution
- * magic-heaven
  * Magico (Trellas) [![(invite needed)][inviteneeded]](#)
  * Majomparádé (TurkDepo)
  * Mansão dos Animes (MDAN)
  * MegamixTracker
  * MeseVilág (Fairytale World)
- * MetalGuru
+ * MetalGuru [![(invite needed)][inviteneeded]](#)
  * Milkie
  * MIRcrew
  * MMA-Torrents [![(invite needed)][inviteneeded]](#)
  * MNV (Max-New-Vision)
  * MOJBLiNK
- * MonikaDesign (MDU) [![(invite needed)][inviteneeded]](#)
+ * MonikaDesign (MDU)
  * MoreThanTV (MTV)
  * MouseBits
  * Movie-Torrentz
@@ -454,12 +458,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Old Toons World
  * OpenCD [![(invite needed)][inviteneeded]](#)
  * Orpheus
+ * OnlyEncodes
  * OshenPT
+ * Ostwiki
  * OurBits (HDPter)
  * P2PBG
- * Partis
+ * Panda
  * Party-Tracker
- * PassThePopcorn (PTP)
  * Peeratiko
  * Peers.FM
  * PigNetwork
@@ -474,37 +479,40 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Pretome
  * PrivateHD (PHD)
  * ProAudioTorrents (PAT)
+ * PT分享站 (itzmx)
+ * PTCafe
  * PTChina (铂金学院)
  * PTerClub
  * PTFiles (PTF)
  * PThome [![(invite needed)][inviteneeded]](#)
- * PT分享站 (itzmx)
+ * PTLSP
  * PTSBAO
  * PTtime
  * Punk's Horror Tracker
  * PuntoTorrent
  * PuTao
- * Puur-Hollands
  * PWTorrents (PWT)
- * R3V WTF! [![(invite needed)][inviteneeded]](#)
+ * R3V WTF!
  * Racing4Everyone (R4E)
  * RacingForMe (RFM)
  * RareShare2
  * Red Star Torrent (RST) [![(invite needed)][inviteneeded]](#)
  * Redacted (PassTheHeadphones)
  * RedBits
+ * Red Leaves [![(invite needed)][inviteneeded]](#)
  * ReelFlix
  * Resurrect The Net
  * RetroFlix
  * RevolutionTT
  * Romanian Metal Torrents (RMT) [![(invite needed)][inviteneeded]](#)
- * RPTorrents
+ * Rousi
  * SceneHD [![(invite needed)][inviteneeded]](#)
+ * SceneLinks (SL)
  * SceneRush
  * SceneTime
- * SDBits [![(invite needed)][inviteneeded]](#)
  * Secret Cinema
  * SeedFile
+ * Shadowflow (影) [![(invite needed)][inviteneeded]](#)
  * Shareisland
  * Shazbat
  * SiamBIT
@@ -517,7 +525,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * SpeedCD
  * Speedmaster HD [![(invite needed)][inviteneeded]](#)
  * SpeedTorrent Reloaded
- * SpiderTK
  * Spirit of Revolution [![(invite needed)][inviteneeded]](#)
  * SportHD
  * SportsCult
@@ -531,7 +538,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TeamHD
  * TeamOS
  * TEKNO3D [![(invite needed)][inviteneeded]](#)
- * TellyTorrent
  * teracod (Movie Zone)
  * The Falling Angels (TFA)
  * The Geeks
@@ -544,9 +550,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * The Vault [![(invite needed)][inviteneeded]](#)
  * The-Crazy-Ones
  * The-New-Fun
- * TheDarkCommunity (TDC)
  * TheEmpire (TE)
  * TheLeachZone (TLZ)
+ * TheRebels
  * TheScenePlace (TSP)
  * Thor's Land
  * TJUPT
@@ -574,6 +580,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TorrentSeeds (TS)
  * TotallyKids (TK)
  * ToTheGlory (TTG) [![(invite needed)][inviteneeded]](#)
+ * TrackerMK
  * TranceTraffic
  * TreZzoR [![(invite needed)][inviteneeded]](#)
  * TurkSeed
@@ -588,11 +595,12 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * UnionGang
  * UnleashTheCartoons
  * UnlimitZ
- * Uploads
  * UTOPIA
  * White Angel
+ * WinterSakura
  * World-In-HD [![(invite needed)][inviteneeded]](#)
  * World-of-Tomorrow
+ * Wukong
  * x-ite.me (XM)
  * xBytesV2
  * XSpeeds (XS)
@@ -607,7 +615,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ZonaQ
 </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 to get them fixed/improved.
+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.
 
 ### Aggregate indexers
 

jackett_launcher.bat

@@ -10,7 +10,7 @@ if errorlevel 1 (
   goto continue
 ) else (
   echo JackettUpdater is still running
-  ping -n 2 127.0.0.1 > nul
+  timeout /t 1 /nobreak > nul
   goto loop
 )
 

src/Directory.Build.props

@@ -0,0 +1,13 @@
+<Project>
+    <!-- Common to all Jackett Projects -->
+    <PropertyGroup>
+        <!-- Specifies whether it's one of our own libraries -->
+        <JackettProject>false</JackettProject>
+        <JackettProject Condition="$(MSBuildProjectName.StartsWith('Jackett'))">true</JackettProject>
+    </PropertyGroup>
+
+    <!-- Set the Product and Version info for our own projects -->
+    <PropertyGroup Condition="'$(JackettProject)'=='true'">
+        <PathMap>$(MSBuildProjectDirectory)=./$(MSBuildProjectName)/</PathMap>
+    </PropertyGroup>
+</Project>

src/Jackett.Common/Content/custom.js

@@ -120,6 +120,7 @@ function loadJackettSettings() {
 
         $("#jackett-savedir").val(data.blackholedir);
         $("#jackett-allowext").attr('checked', data.external);
+        $("#jackett-local-bind-address").val(data.local_bind_address);
         $("#jackett-allowcors").attr('checked', data.cors);
         $("#jackett-allowupdate").attr('checked', data.updatedisabled);
         $("#jackett-prerelease").attr('checked', data.prerelease);
@@ -1611,6 +1612,7 @@ function bindUIButtons() {
         var jackett_basepathoverride = $("#jackett-basepathoverride").val();
         var jackett_baseurloverride = $("#jackett-baseurloverride").val();
         var jackett_external = $("#jackett-allowext").is(':checked');
+        var jackett_local_bind_address = $("#jackett-local-bind-address").val();
         var jackett_cors = $("#jackett-allowcors").is(':checked');
         var jackett_update = $("#jackett-allowupdate").is(':checked');
         var jackett_prerelease = $("#jackett-prerelease").is(':checked');
@@ -1632,6 +1634,7 @@ function bindUIButtons() {
         var jsonObject = {
             port: jackett_port,
             external: jackett_external,
+            local_bind_address: jackett_local_bind_address,
             cors: jackett_cors,
             updatedisabled: jackett_update,
             prerelease: jackett_prerelease,

src/Jackett.Common/Content/index.html

@@ -179,6 +179,10 @@
             <span class="input-header">External access: </span>
             <input id="jackett-allowext" class="form-control input-right" type="checkbox" />
         </div>
+        <div class="input-area">
+            <span class="input-header">Local bind address: </span>
+            <input id="jackett-local-bind-address" class="form-control input-right" type="text" value="" placeholder="127.0.0.1">
+        </div>
         <div class="input-area">
             <span class="input-header">Allow CORS: </span>
             <input id="jackett-allowcors" class="form-control input-right" type="checkbox" />
@@ -756,6 +760,6 @@
     </script>
 
     <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=2023052701"></script>
+    <script type="text/javascript" src="../custom.js?changed=2023071401"></script>
 </body>
 </html>

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

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

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

@@ -5,7 +5,6 @@ description: "1337X is a Public torrent site that offers verified torrent downlo
 language: en-US
 type: public
 encoding: UTF-8
-followredirect: true
 requestDelay: 2
 links:
   - https://1337x.to/
@@ -13,17 +12,15 @@ links:
   - https://x1337x.ws/
   - https://x1337x.eu/
   - https://x1337x.se/
-  - https://1337x.unblockit.asia/
-  - https://1337x.unblockninja.com/
+  - https://1337x.so/
+  - https://1337x.unblockit.esq/
+  - https://1337x.ninjaproxy1.com/
+  - https://1337x.mrunblock.bond/
 legacylinks:
   - https://1337x.is/
   - https://1337x.nocensor.work/
-  - https://1337x.unblockit.cam/
   - https://1337x.nocensor.biz/
   - https://1337x.gd/
-  - https://1337x.unblockit.day/
-  - https://1337x.unblockit.llc/
-  - https://1337x.unblockit.blue/
   - https://1337x.unblockit.name/
   - https://1337x.nocensor.sbs/
   - https://1337x.unblockit.ist/
@@ -41,6 +38,11 @@ legacylinks:
   - https://1337x.mrunblock.guru/
   - https://1337x.mrunblock.life/ # cloudflare 403
   - https://1337x.unblockit.click/
+  - https://1337x.unblockit.asia/
+  - https://1337x.unblockit.mov/
+  - https://1337x.unblockit.rsvp/
+  - https://1337x.unblockninja.com/
+  - https://1337x.unblockit.vegas/
 
 caps:
   categorymappings:
@@ -188,6 +190,10 @@ search:
     - path: "{{ if or .Query.Album .Query.Artist .Keywords }}sort-search{{ else }}cat/Music{{ end }}{{ if or .Query.Album .Query.Artist }}/{{ or .Query.Album .Query.Artist }}{{ else }}/{{ .Keywords }}{{ end }}{{ if or .Query.Album .Query.Artist .Keywords }}/{{ else }}{{ end }}{{ .Config.sort }}/{{ .Config.type }}/{{ if or .Query.Album .Query.Artist .Keywords }}3{{ else }}1{{ end }}/"
     - path: "{{ if or .Query.Album .Query.Artist .Keywords }}sort-search{{ else }}cat/Other{{ end }}{{ if or .Query.Album .Query.Artist }}/{{ or .Query.Album .Query.Artist }}{{ else }}/{{ .Keywords }}{{ end }}{{ if or .Query.Album .Query.Artist .Keywords }}/{{ else }}{{ end }}{{ .Config.sort }}/{{ .Config.type }}/{{ if or .Query.Album .Query.Artist .Keywords }}4{{ else }}1{{ end }}/"
 
+  keywordsfilters:
+    - name: re_replace # daily standard S2023 > 2023
+      args: ["\\bS(20\\d{2})\\b", "$1"]
+
   rows:
     selector: tr:has(a[href^="/torrent/"])
 

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

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

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

@@ -144,6 +144,7 @@ login:
         remove: table
   test:
     path: torrents-search.php
+    selector: a[href="account-logout.php"]
 
 search:
   paths:

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

@@ -1,49 +1,29 @@
 ---
 id: 2xfree
 name: 2xFree
-description: "2xFree is a CHINESE Private Torrent Tracker for HD MOVIES / TV / GENERAL"
+description: "2xFree is a CHINESE Private Torrent Tracker for 3D MOVIES / TV"
 language: zh-CN
 type: private
 encoding: UTF-8
-requestDelay: 2
 links:
   - https://pt.2xfree.org/
 
 caps:
   categorymappings:
-    - {id: 401, cat: Movies, desc: "Movies(电影)", default: true}
-    - {id: 402, cat: TV, desc: "TV Series(电视剧)", default: true}
-    - {id: 403, cat: TV, desc: "TV Shows(综艺)", default: true}
-    - {id: 404, cat: TV/Documentary, desc: "Documentaries(纪录片)", default: true}
-    - {id: 405, cat: TV/Anime, desc: "Animations(动画)", default: true}
-    - {id: 406, cat: Audio/Video, desc: "Music Videos(MV)", default: true}
-    - {id: 407, cat: TV/Sport, desc: "Sports(体育运动)", default: true}
-    - {id: 408, cat: Audio, desc: "HQ Audio(音乐)", default: true}
-    - {id: 409, cat: Other, desc: "Misc(其他)", default: true}
-    - {id: 410, cat: Books, desc: "eBook(电子书)", default: true}
-    - {id: 411, cat: PC/Games, desc: "PCGame(游戏)", default: true}
-    - {id: 413, cat: Audio/Video, desc: "AV(无码)", default: true}
-    - {id: 414, cat: Audio/Video, desc: "AV(有码)", default: true}
-    - {id: 420, cat: XXX, desc: "HAnime(H动画)", default: true}
-    - {id: 421, cat: XXX, desc: "HComic(H漫画)", default: true}
-    - {id: 422, cat: XXX, desc: "HGame(H游戏)", default: true}
-    - {id: 423, cat: XXX, desc: "IV(写真影片)", default: true}
-    - {id: 424, cat: XXX, desc: "IV(写真图集)", default: true}
-    # special
-    - {id: 526, cat: Movies, desc: "VRMovies(3D/VR电影)", default: false}
-    - {id: 527, cat: TV, desc: "VRSeries(3D/VR剧集)", default: false}
-    - {id: 528, cat: Audio/Video, desc: "AV(VR无码)", default: false}
-    - {id: 529, cat: Audio/Video, desc: "AV(VR有码)", default: false}
-    - {id: 530, cat: Console, desc: "VRGame(VR一体机游戏)", default: false}
-    - {id: 531, cat: PC/Games, desc: "PCVRGame(PCVR游戏)", default: false}
-    - {id: 532, cat: Other, desc: "VRTools(VR工具软件)", default: false}
+
+    # torrents.php
+    - {id: 526, cat: Movies, desc: "3DMovies(3D电影)"}
+    - {id: 527, cat: TV, desc: "3DSeries(3D剧集)"}
+    - {id: 533, cat: Movies, desc: "VRMovies(VR电影)"}
+    - {id: 534, cat: TV, desc: "VRSeries(VR剧集)"}
+    - {id: 530, cat: Console, desc: "VRGame(VR一体机游戏)"}
+    - {id: 531, cat: PC/Games, desc: "PCVRGame(PCVR游戏)"}
+    - {id: 532, cat: Other, desc: "VRTools(VR工具软件)"}
 
   modes:
     search: [q]
     tv-search: [q, season, ep, imdbid, doubanid]
     movie-search: [q, imdbid, doubanid]
-    music-search: [q]
-    book-search: [q]
 
 settings:
   - name: username
@@ -58,7 +38,7 @@ settings:
   - name: info_2fa
     type: info
     label: "About 2FA code"
-    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the ICC2022 Web Site. Otherwise just leave it empty."
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the 2xFree Web Site. Otherwise just leave it empty."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -83,6 +63,10 @@ settings:
     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_ulslr
+    type: info
+    label: Upload Speed Limit Rule
+    default: The upload bandwidth shall not exceed 120Mbps, that is, the upload speed shall not exceed 15MB/s.
 
 login:
   path: login.php
@@ -110,9 +94,6 @@ login:
 search:
   paths:
     - path: torrents.php
-      categories: ["!", 526, 527, 528, 529, 530, 531, 532]
-    - path: special.php
-      categories: [526, 527, 528, 529, 530, 531, 532]
   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 }}"
@@ -206,11 +187,8 @@ search:
         img.pro_2up: 2
         "*": 1
     minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 1 day (as seconds = 24 x 60 x 60)
-      text: 86400
+      text: 0.8
     description:
       selector: td.rowfollow:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.8.2 2023-05-08
+# NexusPHP v1.8.6 2023-06-18

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

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

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

@@ -0,0 +1,200 @@
+---
+id: 3wmg
+name: 3Wmg
+description: "3Wmg is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: zh-CN
+type: private
+encoding: UTF-8
+requestDelay: 2
+links:
+  - https://www.3wmg.com/
+
+caps:
+  categorymappings:
+    - {id: 401, cat: Movies, desc: "Movies/电影", default: true}
+    - {id: 402, cat: TV, desc: "TV Series/电视剧", default: true}
+    - {id: 403, cat: TV, desc: "TV Shows/综艺", default: true}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片", default: true}
+    - {id: 405, cat: TV/Anime, desc: "Animations/动漫", default: true}
+    - {id: 406, cat: Audio, desc: "Music/音乐", default: true}
+    - {id: 407, cat: Other/Misc, desc: "Leanrning学习", default: true}
+    - {id: 409, cat: Books, desc: "Ebook电子书", default: true}
+    - {id: 410, cat: Other, desc: "Misc/其他", default: true}
+    # special
+    - {id: 411, cat: XXX, desc: "Uncensored无码", default: false}
+    - {id: 412, cat: XXX, desc: "Censored有码", default: false}
+    - {id: 413, cat: XXX, desc: "Lgbt同志", default: false}
+    - {id: 414, cat: XXX, desc: "III三级、写真", default: false}
+    - {id: 415, cat: XXX, desc: "Animations动漫", default: false}
+    - {id: 416, cat: XXX, desc: "Other其他", default: false}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
+    music-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: 2facode
+    type: text
+    label: 2FA code
+  - name: info_2fa
+    type: info
+    label: "About 2FA code"
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the 3Wmg Web Site. Otherwise just leave it empty."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+
+login:
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
+  inputs:
+    secret: ""
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    two_step_code: "{{ .Config.2facode }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
+  error:
+    - selector: td.embedded:has(h2:contains("失敗"))
+    - selector: td.embedded:has(h2:contains("失败"))
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+      categories: [401, 402, 403, 404, 405, 406, 407, 409, 410]
+    - path: special.php
+      categories: [411, 412, 413, 414, 415, 416]
+  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, 1 OR, 2 exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    notnewword: 1
+
+  rows:
+    selector: table.torrents > tbody > tr:has(a[href^="details.php?id="])
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_default:
+      selector: a[href^="details.php?id="]
+    title:
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+      optional: true
+      default: "{{ .Result.title_default }}"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    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]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    date_added:
+      # time added
+      selector: td.rowfollow:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-ddHH:mm:ss zzz"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td.rowfollow:nth-child(5)
+    seeders:
+      selector: td.rowfollow:nth-child(6)
+    leechers:
+      selector: td.rowfollow:nth-child(7)
+    grabs:
+      selector: td.rowfollow:nth-child(8)
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    minimumratio:
+      text: 1.0
+    description:
+      selector: td.rowfollow:nth-child(2)
+      remove: a, b, font, img, span
+# NexusPHP v1.8.5 2023-07-29

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

@@ -67,6 +67,7 @@ login:
     cookie: "{{ .Config.cookie }}"
   test:
     path: index.php
+    selector: a[href="usercp.php"]
 
 search:
   paths:

src/Jackett.Common/Definitions/Bittorrentfiles.yml

@@ -138,7 +138,8 @@ login:
   error:
     - selector: .error
   test:
-    path: browse.php
+    path: index.php
+    selector: a[href^="/logout.php?c="]
 
 search:
   path: browse.php

src/Jackett.Common/Definitions/abnormal.yml

@@ -93,6 +93,7 @@ login:
         text: " - Bad username/password."
   test:
     path: /
+    selector: form#logoutForm
 
 search:
   paths:

src/Jackett.Common/Definitions/abtorrents.yml

@@ -102,7 +102,8 @@ settings:
 login:
   method: cookie
   test:
-    path: browse.php
+    path: index.php
+    selector: a[href*="logout.php?hash_please="]
 
 search:
   paths:
@@ -139,20 +140,22 @@ search:
     files:
       selector: td:nth-last-child(9)
     date_day:
-      # Yesterday<br/>6:00 AM
-      selector: td:nth-last-child(7):contains("day")
       # auto adjusted by site account profile
+      # Yesterday, 6:00 AM
+      selector: td:nth-last-child(7) > span[title*="day"]
+      attribute: title
       optional: true
       filters:
         - name: fuzzytime
     date_year:
-      # Aug 6 2021<br/>7:25 PM
-      selector: td:nth-last-child(7):not(:contains("day"))
       # auto adjusted by site account profile
+      # Aug 6 2021, 7:25 PM
+      selector: td:nth-last-child(7) > span[title]:not([title*="day"])
+      attribute: title
       optional: true
       filters:
         - name: dateparse
-          args: "MMM d yyyy h:mm tt"
+          args: "MMM d yyyy, h: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/acgsou.yml

@@ -1,111 +0,0 @@
----
-id: acgsou
-name: ACGsou
-description: "ACGsou (36DM) is a CHINESE Public torrent tracker for ANIME"
-language: zh-CN
-type: public
-followredirect: true
-encoding: UTF-8
-requestDelay: 5
-links:
-  - https://www.36dm.club/
-  - https://www.36dm.com/
-legacylinks:
-  - https://www.acgsou.com/
-  - https://acgsou.com/
-  - http://www.acgsou.com/
-  - http://acgsou.com/
-  - http://www.36dm.club/
-  - https://36dm.com/
-  - http://36dm.com/
-  - http://www.36dm.com/
-
-caps:
-  categorymappings:
-    - {id: 2, cat: TV/Anime, desc: "动画分类 (Anime)"}
-    - {id: 7, cat: TV/Anime, desc: "新番连载 (Anime New Fan Series)"}
-    - {id: 8, cat: TV/Anime, desc: "完整动画 (Anime Collection)"}
-    - {id: 9, cat: Movies/Other, desc: "剧场版 (Anime Movie)"}
-    - {id: 10, cat: TV/Anime, desc: "DVDRIP (Anime DVDRIP)"}
-    - {id: 11, cat: TV/Anime, desc: "BDRIP (Anime BDRIP)"}
-    - {id: 5, cat: TV/Anime, desc: "RAW/ISO"}
-    - {id: 3, cat: Books/Comics, desc: "漫画分类 (Manga)"}
-    - {id: 12, cat: Books/Comics, desc: "连载漫画 (Manga Serial)"}
-    - {id: 13, cat: Books/Comics, desc: "完整漫画 (Manga Complete)"}
-    - {id: 14, cat: Books/Comics, desc: "原版漫画 (Manga Original)"}
-    - {id: 4, cat: Audio, desc: "动漫音乐 (Anime Music)"}
-    - {id: 15, cat: Audio/Video, desc: "动画MV (Music Video)"}
-    - {id: 20, cat: TV, desc: "日剧 (Drama Japanese)"}
-    - {id: 21, cat: TV, desc: "特摄片 (Drama Special)"}
-    - {id: 6, cat: Other, desc: "其他资源 (Other)"}
-    - {id: 16, cat: Other, desc: "其他动画 (Other Animation)"}
-    - {id: 17, cat: Other, desc: "声优视频 (Voice Video)"}
-    - {id: 19, cat: Other, desc: "动漫资讯 (Anime Information)"}
-    - {id: 18, cat: PC/Games, desc: "游戏 (Games)"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    music-search: [q]
-    book-search: [q]
-
-settings: []
-
-download:
-  selectors:
-    - selector: a[href^="magnet:?xt="]
-      attribute: href
-
-search:
-  paths:
-    # https://www.acgsou.com/1.html
-    # https://www.acgsou.com/search.php?keyword=test
-    - path: "{{ if .Keywords }}search.php?keyword={{ .Keywords }}{{ else }}1.html{{ end }}"
-
-  rows:
-    selector: table tbody tr[class^="alt"]:has(td:nth-child(3) a)
-
-  fields:
-    category:
-      selector: td:nth-child(2) a
-      attribute: href
-      filters:
-        - name: regexp
-          args: "sort-(\\d+)-1.html"
-    title:
-      selector: td:nth-child(3) a
-    details:
-      selector: td:nth-child(3) a
-      attribute: href
-    download:
-      selector: td:nth-child(3) a
-      attribute: href
-    date_year:
-      selector: td:nth-child(1):contains(":")
-      optional: true
-      filters:
-        - name: append
-          args: " +08:00" # CST
-        - name: dateparse
-          args: "MM/dd HH:mm zzz"
-    date_years:
-      selector: td:nth-child(1):not(:contains(":"))
-      optional: true
-      filters:
-        - name: append
-          args: " +08:00" # CST
-        - name: dateparse
-          args: "yyyy/MM/dd zzz"
-    date:
-      text: "{{ if or .Result.date_year .Result.date_years }}{{ or .Result.date_year .Result.date_years }}{{ else }}now{{ end }}"
-    size:
-      selector: td:nth-child(4)
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# BTMaster 2.1.1

src/Jackett.Common/Definitions/acidlounge.yml

@@ -105,7 +105,8 @@ login:
   error:
     - selector: div.errorWrap
   test:
-    path: browse.php
+    path: index.php
+    selector: a[href$="logout.php"]
 
 search:
   paths:

src/Jackett.Common/Definitions/acrossthetasman.yml

@@ -49,6 +49,7 @@ login:
     do: login
   test:
     path: torrents.php
+    selector: a[href*="logout.php"]
 
 search:
   paths:

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

@@ -60,8 +60,6 @@ settings:
 login:
   path: /api/torrents
   method: get
-  inputs:
-    api_token: "{{ .Config.apikey }}"
   error:
     - selector: a[href*="/login"]
       message:
@@ -69,15 +67,17 @@ login:
 
 search:
   paths:
-    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
     - path: "/api/torrents/filter"
       response:
         type: json
 
+  headers:
+    Authorization: ["Bearer {{ .Config.apikey }}"]
+
   inputs:
   # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
-    api_token: "{{ .Config.apikey }}"
     $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
     name: "{{ .Keywords }}"
     seasonNumber: "{{ .Query.Season }}"

src/Jackett.Common/Definitions/animetime.yml

@@ -0,0 +1,69 @@
+---
+id: animetime
+name: Anime Time
+description: "Anime Time is a PUBLIC torrent tracker for ANIME"
+language: en-US
+type: public
+encoding: UTF-8
+requestDelay: 2
+links:
+  - https://animetime.cc/
+
+caps:
+  categories:
+    Anime: TV/Anime
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+
+settings: []
+
+search:
+  paths:
+    # https://animetime.cc/search?query=
+    - path: "{{ if .Keywords }}search{{ else }}{{ end }}"
+
+  inputs:
+    query: "{{ .Keywords }}"
+
+  keywordsfilters:
+    - name: trim
+    - name: re_replace
+      args: ["\\W+", "%"]
+
+  rows:
+    selector: div.flow-root > div.divide-y > div.p-2.space-y-2
+
+  fields:
+    category:
+      text: Anime
+    title:
+      selector: div.flex.flex-wrap ~ p
+    details:
+      text: "{{ .Config.sitelink }}search?query={{ .Result.title }}"
+    download:
+      selector: a[href*="/download/"]
+      attribute: href
+    magnet:
+      selector: a[href^="magnet:?xt="]
+      attribute: href
+    date:
+      selector: span[data-tip]
+      attribute: data-tip
+      filters:
+        - name: append
+          args: " +02:00" # EET
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    size:
+      selector: span.badge.badge-ghost
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/animetracker.yml

@@ -62,8 +62,6 @@ settings:
 login:
   path: /api/torrents
   method: get
-  inputs:
-    api_token: "{{ .Config.apikey }}"
   error:
     - selector: a[href*="/login"]
       message:
@@ -71,15 +69,17 @@ login:
 
 search:
   paths:
-    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
     - path: "/api/torrents/filter"
       response:
         type: json
 
+  headers:
+    Authorization: ["Bearer {{ .Config.apikey }}"]
+
   inputs:
   # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
-    api_token: "{{ .Config.apikey }}"
     $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
     name: "{{ .Keywords }}"
     seasonNumber: "{{ .Query.Season }}"

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

@@ -65,8 +65,6 @@ settings:
 login:
   path: /api/torrents
   method: get
-  inputs:
-    api_token: "{{ .Config.apikey }}"
   error:
     - selector: a[href*="/login"]
       message:
@@ -74,15 +72,17 @@ login:
 
 search:
   paths:
-    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
     - path: "/api/torrents/filter"
       response:
         type: json
 
+  headers:
+    Authorization: ["Bearer {{ .Config.apikey }}"]
+
   inputs:
   # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
-    api_token: "{{ .Config.apikey }}"
     $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
     name: "{{ .Keywords }}"
     seasonNumber: "{{ .Query.Season }}"

src/Jackett.Common/Definitions/anisource.yml

@@ -52,12 +52,12 @@ search:
     details:
       selector: a[href*="/showprofile/"]
       attribute: href
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-    magnet:
-      selector: a[href^="magnet:?xt="]
+    infohash:
+      selector: a[href*="/showprofile/"]
       attribute: href
+      filters:
+        - name: regexp
+          args: ([A-F|a-f|0-9]{40})
     date:
       selector: font[color="Black"]
       filters:

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

@@ -108,7 +108,7 @@ search:
       optional: true
       filters:
         - name: trim
-    title:
+    title_optional:
       selector: title
       filters:
         - name: htmldecode
@@ -155,4 +155,11 @@ search:
     minimumseedtime:
       # 3 day (as seconds = 3 x 24 x 60 x 60)
       text: 259200
+    _filename:
+      selector: "files[0].name"
+      filters:
+        - name: htmldecode
+      optional: true
+    title:
+      text: "{{ if and (eq .Result.files \"1\") (.Result._filename) }}{{ .Result._filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
 # json api

src/Jackett.Common/Definitions/arabafenice.yml

@@ -124,6 +124,7 @@ login:
             args: ["');", ""]
   test:
     path: index.php
+    selector: a[href="logout.php"]
 
 download:
   before:

src/Jackett.Common/Definitions/asiandvdclub.yml

@@ -94,6 +94,8 @@ search:
     category:
       selector: img[class^="cat-"]
       attribute: class
+      optional: true
+      default: 12
       case:
         img.cat-anime: 1
         img.cat-hk: 2

src/Jackett.Common/Definitions/aussierules.yml

@@ -51,6 +51,7 @@ login:
     - selector: table:contains("An error has occured!")
   test:
     path: browse.php
+    selector: a[href*="logout.php"]
 
 search:
   paths:

src/Jackett.Common/Definitions/azusa.yml

@@ -0,0 +1,173 @@
+---
+id: azusa
+name: Azusa
+description: "Azusa is a CHINESE Torrent Tracker focusing on Comics"
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - https://azusa.wiki/
+
+caps:
+  categorymappings:
+    - {id: 404, cat: PC/Games, desc: "Game"}
+    - {id: 402, cat: Books/Comics, desc: "Comic"}
+    - {id: 403, cat: Books/EBook, desc: "Light Novel"}
+    - {id: 407, cat: Other, desc: "CG"}
+    - {id: 409, cat: Audio, desc: "Music"}
+
+  modes:
+    search: [q]
+    music-search: [q]
+    book-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 Uploads Web Site. Otherwise just leave it empty."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+
+login:
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
+  inputs:
+    secret: ""
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    two_step_code: "{{ .Config.2facode }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: ""
+  error:
+    - selector: td.embedded:has(h2:contains("失败"))
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # 0 incldead, 1 active, 2 dead
+    incldead: 0
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: 0
+    # 0 AND, 1 OR, 2 exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    notnewword: 1
+
+  rows:
+    selector: table.torrents > tbody > tr:has(table.torrentname)
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_default:
+      selector: a[href^="details.php?id="]
+    title:
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+      optional: true
+      default: "{{ .Result.title_default }}"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    date_elapsed:
+      # time type: time elapsed (default)
+      selector: td.rowfollow:nth-child(4) > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    date_added:
+      # time added
+      selector: td.rowfollow:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-ddHH:mm:ss zzz"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td.rowfollow:nth-child(5)
+    seeders:
+      selector: td.rowfollow:nth-child(6)
+    leechers:
+      selector: td.rowfollow:nth-child(7)
+    grabs:
+      selector: td.rowfollow:nth-child(8)
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    description:
+      selector: td:nth-child(2)
+      remove: a, b, font, img, span
+# NexusPHP v1.7.20 2022-08-05

src/Jackett.Common/Definitions/badasstorrents.yml

@@ -8,8 +8,8 @@ encoding: UTF-8
 requestDelay: 5
 links:
   - https://badasstorrents.com/
-  - https://badasstorrents.mrunblock.life/
-  - https://badasstorrents.nocensor.click/
+  - https://badasstorrents.mrunblock.bond/
+  - https://badasstorrents.nocensor.cloud/
 legacylinks:
   - https://badasstorrents.nocensor.work/
   - https://badasstorrents.nocensor.biz/
@@ -18,6 +18,8 @@ legacylinks:
   - https://badasstorrents.nocensor.lol/
   - https://badasstorrents.nocensor.art/
   - https://badasstorrents.mrunblock.guru/
+  - https://badasstorrents.mrunblock.life/
+  - https://badasstorrents.nocensor.click/
 
 caps:
   categories:

src/Jackett.Common/Definitions/bigfangroup.yml

@@ -90,14 +90,17 @@ settings:
 
 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
     # 0 active, 1 incldead, 2 onlydead, 3 gold, 4 noseed, 5 silver, 7 BFG
     incldead: 1
-    ajax: 1
     year: 0
     format: 0
     s: "{{ .Config.sort }}"

src/Jackett.Common/Definitions/bitbazis.yml

@@ -11,42 +11,30 @@ links:
 
 caps:
   categorymappings:
-    - {id: 85, cat: Movies/SD, desc: "Film/Cam/Hun", default: true}
-    - {id: 86, cat: Movies/SD, desc: "Film/Cam/Eng", default: true}
-    - {id: 15, cat: Movies/SD, desc: "Film/SD/Hun", default: true}
-    - {id: 16, cat: Movies/SD, desc: "Film/SD/Eng", default: true}
-    - {id: 17, cat: Movies/DVD, desc: "Film/DVD/Hun", default: true}
-    - {id: 19, cat: Movies/DVD, desc: "Film/DVD/Eng", default: true}
-    - {id: 83, cat: Movies/HD, desc: "Film/HD/Hun", default: true}
-    - {id: 82, cat: Movies/HD, desc: "Film/HD/Eng", default: true}
-    - {id: 94, cat: Movies/HD, desc: "Film/FHD/Hun", default: true}
-    - {id: 95, cat: Movies/HD, desc: "Film/FHD/Eng", default: true}
-    - {id: 92, cat: Movies/UHD, desc: "Film/UHD/Hun", default: true}
-    - {id: 93, cat: Movies/UHD, desc: "Film/UHD/Eng", default: true}
-    - {id: 22, cat: TV, desc: "Sorozat/Hun", default: true}
-    - {id: 58, cat: TV, desc: "Sorozat/Eng", default: true}
-    - {id: 64, cat: Movies, desc: "Film/Pack", default: true}
-    - {id: 66, cat: XXX/ImageSet, desc: "Képek/XXX", default: false}
-    - {id: 33, cat: XXX/SD, desc: "SD/XXX", default: false}
-    - {id: 89, cat: XXX/x264, desc: "HD/XXX", default: false}
+    - {id: 85, cat: Movies/SD, desc: "Film-Cam", default: true}
+    - {id: 15, cat: Movies/SD, desc: "Film-SD", default: true}
+    - {id: 17, cat: Movies/DVD, desc: "Film-DVD", default: true}
+    - {id: 83, cat: Movies/HD, desc: "Film-HD", default: true}
+    - {id: 94, cat: Movies/HD, desc: "Film-FHD", default: true}
+    - {id: 92, cat: Movies/UHD, desc: "Film-UHD", default: true}
+    - {id: 22, cat: TV, desc: "Sorozat-Hun", default: true}
+    - {id: 58, cat: TV, desc: "Sorozat-Eng", default: true}
+    - {id: 64, cat: Movies, desc: "Film-Pack", default: true}
+    - {id: 66, cat: XXX/ImageSet, desc: "XXX-Pics", default: false}
+    - {id: 33, cat: XXX/SD, desc: "XXX-SD", default: false}
+    - {id: 89, cat: XXX/x264, desc: "XXX-HD", default: false}
     - {id: 24, cat: Audio/Video, desc: "Videóklip", default: true}
     - {id: 70, cat: Audio/Audiobook, desc: "Hangoskönyv", default: true}
-    - {id: 27, cat: Books/EBook, desc: "Könyv/Hun", default: true}
-    - {id: 50, cat: Books/EBook, desc: "Könyv/Eng", default: true}
-    - {id: 69, cat: TV/Anime, desc: "Mese/SD", default: true}
-    - {id: 68, cat: TV/Anime, desc: "Mese/DVD", default: true}
-    - {id: 91, cat: TV/Anime, desc: "Mese/HD", default: true}
-    - {id: 25, cat: Audio/MP3, desc: "Mp3/Hun", default: true}
-    - {id: 26, cat: Audio/MP3, desc: "Mp3/Eng", default: true}
-    - {id: 84, cat: Audio/Lossless, desc: "Lossless/Hun", default: true}
-    - {id: 71, cat: Audio/Lossless, desc: "Lossless/Eng", default: true}
-    - {id: 31, cat: PC/Games, desc: "Játék/PC", default: true}
-    - {id: 54, cat: Console, desc: "Játék/Konzol", default: true}
-    - {id: 81, cat: PC/0day, desc: "Program/PC", default: true}
-    - {id: 67, cat: PC/Mobile-Android, desc: "Program/Mobil", default: true}
-    - {id: 49, cat: PC/0day, desc: "Program/Rip", default: true}
-    - {id: 14, cat: PC, desc: "Program/Egyéb", default: true}
-    - {id: 65, cat: Other, desc: "Egyéb", default: true}
+    - {id: 27, cat: Books/EBook, desc: "Könyv", default: true}
+    - {id: 69, cat: TV/Anime, desc: "Mese-SD", default: true}
+    - {id: 91, cat: TV/Anime, desc: "Mese-HD", default: true}
+    - {id: 25, cat: Audio/MP3, desc: "Mp3-Hun", default: true}
+    - {id: 26, cat: Audio/MP3, desc: "Mp3-Eng", default: true}
+    - {id: 84, cat: Audio/Lossless, desc: "FLAC-Hun", default: true}
+    - {id: 71, cat: Audio/Lossless, desc: "FLAC-Eng", default: true}
+    - {id: 31, cat: PC/Games, desc: "Játék", default: true}
+    - {id: 81, cat: PC/0day, desc: "Program", default: true}
+    - {id: 14, cat: PC, desc: "Program-Egyéb", default: true}
     - {id: 97, cat: TV/Anime, desc: "Sorozat/Mese", default: true}
 
   modes:
@@ -99,7 +87,7 @@ login:
 search:
   paths:
     - path: browse.php
-      categories: ["!", 33, 66, 89]
+      categories: [85, 86, 15, 16, 17, 19, 83, 82, 94, 95, 92, 93, 22, 58, 64, 24, 70, 27, 50, 69, 68, 91, 25, 26, 84, 71, 31, 54, 81, 67, 49, 14, 65, 97]
       inputs:
         # 0 all, 1 active, 2 deadonly, 3  myuploads, 4 zeroseed, 6 re-seeded
         incldead: 0
@@ -121,8 +109,11 @@ search:
 
   fields:
     categorydesc:
-      selector: img[src^="pic/kategoria/"]
-      attribute: title
+      selector: td[class^="catpic_"]
+      attribute: class
+      filters:
+        - name: replace
+          args: ["catpic_", ""]
     title:
       selector: font[class="tori"], a.preview
     _id:
@@ -153,7 +144,7 @@ search:
       # 2 napja  és 10 órája
       # 1 hete  és 1 napja
       # 1 éve  és 30 hete
-      selector: td[id^="t_added"] > span
+      selector: span.ellenorzes
       filters:
         - name: replace
           args: ["és ", " "]
@@ -169,11 +160,17 @@ search:
           args: ["éve", "year"]
         - name: timeago
     grabs:
-      selector: td:nth-child(5)
+      selector: td.letoltok
+      optional: true
+      default: 0
     seeders:
-      selector: td:nth-child(3)
+      selector: td.seeders
+      optional: true
+      default: 0
     leechers:
-      selector: td:nth-child(4)
+      selector: td.leechers
+      optional: true
+      default: 0
     genre:
       selector: span[style="font-size:small;"]
     description:

src/Jackett.Common/Definitions/bithorlo.yml

@@ -39,7 +39,7 @@ caps:
     - {id: 20, cat: Other, desc: "Képek"}
     - {id: 21, cat: PC/Mobile-Other, desc: "Mobil"}
     # Program
-    - {id: 22, cat: PC/0day, desc: "Win/Program/ISO"}
+    - {id: 54, cat: PC/0day, desc: "Win/Program/ISO"}
     - {id: 23, cat: PC/0day, desc: "Win/Program/Rip"}
     # Felnőtt tartalom
     - {id: 9, cat: XXX, desc: "XXX/Film"}
@@ -60,6 +60,13 @@ settings:
     type: info
     label: How to get the Cookie
     default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: useragent
+    type: text
+    label: User-Agent
+  - name: info_useragent
+    type: info
+    label: How to get the User-Agent
+    default: "<ol><li>From the same place you fetched the cookie,</li><li>Find <b>'user-agent:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole user-agent string <i>(everything after 'user-agent: ')</i> and <b>Paste</b> here.</li></ol>"
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -83,8 +90,11 @@ settings:
 
 login:
   method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
   test:
-    path: browse.php
+    path: index.php
+    selector: a[href="logout.php"]
 
 search:
   paths:
@@ -97,6 +107,9 @@ search:
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
 
+  headers:
+    User-Agent: ["{{ .Config.useragent }}"]
+
   rows:
     selector: tr[class^="browse"]
 

src/Jackett.Common/Definitions/bithumen.yml

@@ -58,6 +58,7 @@ login:
     - selector: td.embedded:has(h2:contains("bejelentkezés"))
   test:
     path: browse.php
+    selector: a[href*="logout.php"]
 
 search:
   paths:

src/Jackett.Common/Definitions/bitnova.yml

@@ -1,119 +0,0 @@
----
-id: bitnova
-name: BitNova
-description: "BitNova is a POLISH Semi-Private Torrent Tracker for 0DAY / GENERAL"
-language: pl-PL
-type: semi-private
-encoding: UTF-8
-links:
-  - https://bitnova.info/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: PC, desc: "Programy"}
-    - {id: 2, cat: PC/0day, desc: "Programy dla Windows"}
-    - {id: 3, cat: PC, desc: "Programy dla Linux"}
-    - {id: 4, cat: PC/Mac, desc: "Programy dla Mac"}
-    - {id: 5, cat: TV/Anime, desc: "Anime"}
-    - {id: 6, cat: Books, desc: "eBooki"}
-    - {id: 8, cat: Movies, desc: "Dla dzieci"}
-    - {id: 9, cat: Movies, desc: "Filmy"}
-    - {id: 10, cat: Movies/SD, desc: "Filmy (S)VCD"}
-    - {id: 11, cat: Movies/SD, desc: "DivX/XviD"}
-    - {id: 12, cat: Movies/DVD, desc: "Filmy DVD"}
-    - {id: 13, cat: Movies/BluRay, desc: "Filmy HDDVD/BluRay"}
-    - {id: 14, cat: Movies/SD, desc: "Filmy RMVB"}
-    - {id: 15, cat: Movies/HD, desc: "Filmy x264"}
-    - {id: 342, cat: Movies/3D, desc: "Filmy 3D"}
-    - {id: 16, cat: Console, desc: "Gry"}
-    - {id: 17, cat: Console, desc: "Gry na konsole"}
-    - {id: 18, cat: PC/Games, desc: "Gry komputerowe"}
-    - {id: 19, cat: PC/Mobile-Other, desc: "GSM/PDA"}
-    - {id: 20, cat: PC/Mobile-Other, desc: "GSM/PDA Dodatki"}
-    - {id: 21, cat: PC/Mobile-Other, desc: "GSM/PDA Filmy"}
-    - {id: 22, cat: PC/Mobile-Other, desc: "GSM/PDA Gry"}
-    - {id: 23, cat: PC/Mobile-Other, desc: "GSM/PDA Programy"}
-    - {id: 24, cat: Audio, desc: "Muzyka"}
-    - {id: 25, cat: Audio/MP3, desc: "Muzyka Albumy"}
-    - {id: 26, cat: Audio/Video, desc: "Muzyka Teledyski/Koncerty"}
-    - {id: 27, cat: Other, desc: "Różne"}
-    - {id: 28, cat: TV/Sport, desc: "Sport"}
-    - {id: 29, cat: TV, desc: "TV"}
-    - {id: 30, cat: XXX, desc: "Erotyka"}
-
-  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
-
-login:
-  path: login.php?act=login
-  method: post
-  inputs:
-    login: "{{ .Config.username }}"
-    pass: "{{ .Config.password }}"
-    remember: 1
-  error:
-    - selector: div#errmsg
-  test:
-    path: /
-    selector: a[href^="/login.php?act=logout"]
-
-search:
-  paths:
-    - path: search
-  inputs:
-    q: "{{ if .Query.Keywords }}{{ .Query.Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
-    cid: 0
-
-  rows:
-    selector: table#searchRes > tbody > tr
-
-  fields:
-    category:
-      selector: a[href^="/torrenty/"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: (\d+)-
-    title:
-      selector: a[href^="/torrent/"]
-    details:
-      selector: a[href^="/torrent/"]
-      attribute: href
-    download:
-      selector: a[href^="/torrent/"]
-      attribute: href
-      filters:
-        - name: replace
-          args: ["/torrent/", "/torrent/download/"]
-    size:
-      selector: td:nth-last-child(5)
-    seeders:
-      selector: td:nth-last-child(4)
-    leechers:
-      selector: td:nth-last-child(3)
-    grabs:
-      selector: td:nth-last-child(2)
-    date:
-      selector: td:nth-last-child(1)
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "yyyy-MM-dd HH:mm:ss zzz"
-    downloadvolumefactor:
-      text: 1
-    uploadvolumefactor:
-      text: 1
-# engine v2.0

src/Jackett.Common/Definitions/bitsearch.yml

@@ -8,14 +8,16 @@ encoding: UTF-8
 requestDelay: 2
 links:
   - https://bitsearch.to/
-  - https://bitsearch.mrunblock.life/
-  - https://bitsearch.nocensor.click/
+  - https://bitsearch.nocensor.cloud/
+  - https://bitsearch.mrunblock.bond/
 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/ # This web property is not accessible via this address.
+  - https://bitsearch.nocensor.click/
 
 caps:
   categories:
@@ -93,7 +95,7 @@ search:
     category:
       selector: a.category
     title:
-      selector: h5
+      selector: h5 a
     details:
       selector: h5 a
       attribute: href
@@ -106,8 +108,9 @@ search:
       filters:
         - name: regexp
           args: ([A-F|a-f|0-9]{40})
-    grabs:
-      selector: div.stats div:has(img[alt="Download"])
+    grabs_dot:
+      selector: div.stats div:has(img[alt="Download"]):contains(".")
+      optional: true
       filters:
         - name: replace
           args: [".", ""]
@@ -115,10 +118,41 @@ search:
           args: ["K", "00"]
         - name: replace
           args: ["M", "00000"]
+    grabs_nodot:
+      selector: div.stats div:has(img[alt="Download"]):not(:contains("."))
+      optional: true
+      filters:
+        - name: replace
+          args: ["K", "000"]
+        - name: replace
+          args: ["M", "000000"]
+    grabs:
+      text: "{{ if or .Result.grabs_dot .Result.grabs_nodot }}{{ or .Result.grabs_dot .Result.grabs_nodot }}{{ else }}0{{ end }}"
     size:
       selector: div.stats div:has(img[alt="Size"])
+    seeders_dot:
+      selector: div.stats div:has(img[alt="Seeder"]):contains(".")
+      optional: true
+      filters:
+        - name: replace
+          args: [".", ""]
+        - name: replace
+          args: ["K", "00"]
+        - name: replace
+          args: ["M", "00000"]
+    seeders_nodot:
+      selector: div.stats div:has(img[alt="Seeder"]):not(:contains("."))
+      optional: true
+      filters:
+        - name: replace
+          args: ["K", "000"]
+        - name: replace
+          args: ["M", "000000"]
     seeders:
-      selector: div.stats div:has(img[alt="Seeder"])
+      text: "{{ if or .Result.seeders_dot .Result.seeders_nodot }}{{ or .Result.seeders_dot .Result.seeders_nodot }}{{ else }}0{{ end }}"
+    leechers_dot:
+      selector: div.stats div:has(img[alt="Leecher"]):contains(".")
+      optional: true
       filters:
         - name: replace
           args: [".", ""]
@@ -126,15 +160,16 @@ search:
           args: ["K", "00"]
         - name: replace
           args: ["M", "00000"]
+    leechers_nodot:
+      selector: div.stats div:has(img[alt="Leecher"]):not(:contains("."))
+      optional: true
+      filters:
+        - name: replace
+          args: ["K", "000"]
+        - name: replace
+          args: ["M", "000000"]
     leechers:
-      selector: div.stats div:has(img[alt="Leecher"])
-      filters:
-        - name: replace
-          args: [".", ""]
-        - name: replace
-          args: ["K", "00"]
-        - name: replace
-          args: ["M", "00000"]
+      text: "{{ if or .Result.leechers_dot .Result.leechers_nodot }}{{ or .Result.leechers_dot .Result.leechers_nodot }}{{ else }}0{{ end }}"
     date:
       selector: div.stats div:has(img[alt="Date"])
       filters:

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

@@ -54,8 +54,6 @@ settings:
 login:
   path: /api/torrents
   method: get
-  inputs:
-    api_token: "{{ .Config.apikey }}"
   error:
     - selector: a[href*="/login"]
       message:
@@ -63,15 +61,17 @@ login:
 
 search:
   paths:
-    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
     - path: "/api/torrents/filter"
       response:
         type: json
 
+  headers:
+    Authorization: ["Bearer {{ .Config.apikey }}"]
+
   inputs:
   # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
-    api_token: "{{ .Config.apikey }}"
     $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
     name: "{{ .Keywords }}"
     seasonNumber: "{{ .Query.Season }}"

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

@@ -55,8 +55,6 @@ settings:
 login:
   path: /api/torrents
   method: get
-  inputs:
-    api_token: "{{ .Config.apikey }}"
   error:
     - selector: a[href*="/login"]
       message:
@@ -64,14 +62,16 @@ login:
 
 search:
   paths:
-    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
     - path: "/api/torrents/filter"
       response:
         type: json
 
+  headers:
+    Authorization: ["Bearer {{ .Config.apikey }}"]
+
   inputs:
-    api_token: "{{ .Config.apikey }}"
     $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
     name: "{{ .Keywords }}"
     "free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}"

src/Jackett.Common/Definitions/btsow.yml

@@ -7,12 +7,8 @@ type: public
 encoding: UTF-8
 # use https://tellme.pw/btsow to find the new domain
 links:
-  - https://btsow.bond/
+  - https://btsow.motorcycles/
 legacylinks:
-  - https://btsow.digital/
-  - https://btsow.shop/
-  - https://btsow.us/
-  - https://btsow.one/
   - https://btsow.rest/
   - https://btsow.bar/
   - https://btsow.click/
@@ -24,6 +20,10 @@ legacylinks:
   - https://btsow.mom/
   - https://btsow.boats/
   - https://btsow.hair/
+  - https://btsow.bond/
+  - https://btsow.skin/
+  - https://btsow.makeup/
+  - https://btsow.homes/
 
 caps:
   categories:

src/Jackett.Common/Definitions/bwtorrents.yml

@@ -124,6 +124,7 @@ caps:
     - {id: 218, cat: TV, desc: "TV-Ishara TV"}
     - {id: 219, cat: TV, desc: "TV-Bengali Tv"}
     - {id: 220, cat: TV, desc: "TV-Shemaroo Umang"}
+    - {id: 221, cat: TV, desc: "TV-JioTv"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/byrbt.yml

@@ -103,7 +103,7 @@ search:
 
   fields:
     category:
-      selector: a[href^="?cat="]
+      selector: a[href^="torrents.php?cat="]
       attribute: href
       filters:
         - name: querystring

src/Jackett.Common/Definitions/byrutor.yml

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

src/Jackett.Common/Definitions/carpathians.yml

@@ -73,7 +73,8 @@ login:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
   test:
-    path: browse.php
+    path: index.php
+    selector: a[href^="logout.php"]
 
 search:
   paths:

src/Jackett.Common/Definitions/carphunter.yml

@@ -89,7 +89,7 @@ login:
 search:
   paths:
     - path: browse.php
-      categories: ["!", 34, 39]
+      categories: [1, 2, 8, 7, 16, 15, 14, 13, 4, 3, 18, 17, 23, 19, 20, 24, 21, 22, 35, 36, 25, 30, 31, 33, 32, 29, 28, 27, 26]
     - path: browse.php
       categories: [34, 39]
       inputs:

src/Jackett.Common/Definitions/carpt.yml

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

src/Jackett.Common/Definitions/centraltorrent.yml

@@ -87,8 +87,12 @@ login:
   error:
     - selector: td.embedded:has(h2:contains("failed"))
     - selector: td.embedded:has(h2:contains("Error"))
+    - selector: form[action="takelogin.php"]
+      message:
+        text: "Login page detected at {{ .Config.sitelink }}."
   test:
-    path: my.php
+    path: index.php
+    selector: a[href="/my.php"]
 
 download:
   selectors:

src/Jackett.Common/Definitions/chdbits.yml

@@ -6,6 +6,8 @@ language: zh-CN
 type: private
 encoding: UTF-8
 links:
+  - https://ptchdbits.co/
+legacylinks:
   - https://chdbits.co/
 
 caps:
@@ -79,6 +81,7 @@ login:
     - selector: td.embedded:has(h2:contains("failed"))
   test:
     path: torrents.php
+    selector: a[href*="logout.php"]
 
 search:
   paths:

src/Jackett.Common/Definitions/cheggit.yml

@@ -0,0 +1,165 @@
+---
+id: cheggit
+name: cheggit
+description: "cheggit is a Private site for 3X"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://www.cheggit.me/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: XXX, desc: "Amateur"}
+    - {id: 2, cat: XXX, desc: "Anal"}
+    - {id: 5, cat: XXX, desc: "Asian"}
+    - {id: 6, cat: XXX, desc: "BBW"}
+    - {id: 30, cat: XXX, desc: "BDSM"}
+    - {id: 36, cat: XXX, desc: "Big Ass"}
+    - {id: 8, cat: XXX, desc: "Big Tits"}
+    - {id: 7, cat: XXX, desc: "Black"}
+    - {id: 9, cat: XXX, desc: "Classic"}
+    - {id: 37, cat: XXX, desc: "Creampie"}
+    - {id: 10, cat: XXX, desc: "Cumshot"}
+    - {id: 11, cat: XXX, desc: "DVD-R"}
+    - {id: 12, cat: XXX, desc: "Fetish"}
+    - {id: 14, cat: XXX, desc: "Gang Bang / Orgy"}
+    - {id: 39, cat: XXX, desc: "Gay / Bi"}
+    - {id: 56, cat: XXX, desc: "Hairy"}
+    - {id: 35, cat: XXX, desc: "Hardcore"}
+    - {id: 44, cat: XXX, desc: "HD Porn"}
+    - {id: 3, cat: XXX, desc: "Hentai / 3D"}
+    - {id: 25, cat: XXX, desc: "Homemade"}
+    - {id: 43, cat: XXX, desc: "Interracial"}
+    - {id: 16, cat: XXX, desc: "Latina"}
+    - {id: 23, cat: XXX, desc: "Lesbian"}
+    - {id: 52, cat: XXX, desc: "Lingerie"}
+    - {id: 27, cat: XXX, desc: "Magazines"}
+    - {id: 53, cat: XXX, desc: "Manga / Comic"}
+    - {id: 18, cat: XXX, desc: "Masturbation"}
+    - {id: 26, cat: XXX, desc: "Mature"}
+    - {id: 40, cat: XXX, desc: "Megapack"}
+    - {id: 41, cat: XXX, desc: "Natural Tits"}
+    - {id: 17, cat: XXX, desc: "Oral"}
+    - {id: 29, cat: XXX, desc: "Other"}
+    - {id: 47, cat: XXX, desc: "Parody"}
+    - {id: 21, cat: XXX, desc: "Pictures / Images"}
+    - {id: 50, cat: XXX, desc: "Piss"}
+    - {id: 55, cat: XXX, desc: "Porn Music Videos"}
+    - {id: 46, cat: XXX, desc: "Pregnant / Preggo"}
+    - {id: 15, cat: XXX, desc: "Shemale / TS"}
+    - {id: 22, cat: XXX, desc: "Siterip"}
+    - {id: 20, cat: XXX, desc: "Softcore"}
+    - {id: 49, cat: XXX, desc: "Squirt"}
+    - {id: 34, cat: XXX, desc: "Straight"}
+    - {id: 19, cat: XXX, desc: "Teen"}
+    - {id: 45, cat: XXX, desc: "Voyeur"}
+    - {id: 13, cat: PC/Games, desc: "XXX Games / Apps"}
+
+  modes:
+    search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: time
+    options:
+      time: created
+      seeders: seeders
+      size: size
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+
+login:
+  path: login.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    keeplogged: 1
+  error:
+    - selector: span.warning:contains(" was incorrect.")
+  test:
+    path: index.php
+    selector: a[href^="logout.php?auth="]
+
+search:
+  paths:
+    # https://www.cheggit.me/torrents.php?filter_cat[1]=1&order_by=time&order_way=desc&filter_freeleech=1&searchtext=&search_type=0&taglist=&tags_type=0
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
+    order_by: "{{ .Config.sort }}"
+    order_way: "{{ .Config.type }}"
+    filter_freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    searchtext: "{{ .Keywords }}"
+    # 0=any, 1=all
+    search_type: 1
+
+  rows:
+    selector: table#torrent_table > tbody > tr:not(tr.colhead)
+
+  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"]
+      attribute: href
+    description:
+      selector: div.tags
+    files:
+      selector: td:nth-child(3)
+    date:
+      selector: span.time
+      attribute: title
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "MMM dd yyyy, HH:mm zzz"
+    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:
+        img[src$="/freedownload.gif"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 0.51
+# engine n/a

src/Jackett.Common/Definitions/chilebt.yml

@@ -88,7 +88,7 @@ search:
     tmdb: "{{ .Query.TMDBID }}"
     sorting: "{{ .Config.sort }}"
     direction: "{{ .Config.type }}"
-    qty: 100
+    qty: 50
     page: 0
     view: list
     freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"

src/Jackett.Common/Definitions/cinefilhd.yml

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

src/Jackett.Common/Definitions/cinematik.yml

@@ -70,6 +70,7 @@ login:
     - selector: table:contains("Login failed!")
   test:
     path: my.php
+    selector: a[href="logout.php"]
 
 search:
   paths:

src/Jackett.Common/Definitions/classix.yml

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

src/Jackett.Common/Definitions/coastalcrew.yml

@@ -13,6 +13,7 @@ caps:
     - {id: 30, cat: TV/Anime, desc: "Filme - Animie"}
     - {id: 28, cat: Movies/BluRay, desc: "Filme - Bluray"}
     - {id: 31, cat: Movies/Other, desc: "Filme - Bollywood"}
+    - {id: 77, cat: TV/Documentary, desc: "Filme - DokusHD"}
     - {id: 32, cat: Movies/DVD, desc: "Filme - DVD"}
     - {id: 33, cat: Movies/HD, desc: "Filme - HD"}
     - {id: 34, cat: Movies, desc: "Filme - Klassiker"}

src/Jackett.Common/Definitions/cpabien.yml

@@ -7,33 +7,8 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://cpasbiens911.fr/
+  - https://cpasbien-vf.fr/
 legacylinks:
-  - https://labastidevivante.fr/
-  - http://www.cpasbiens.cc/
-  - http://www.cpabien.cm/
-  - http://cpabien.cm/
-  - http://cpasbiens1.com/
-  - http://cpabien.mx/
-  - http://www.cpabien.bz/
-  - http://cpabien.org/
-  - http://cpabien.cc/
-  - http://cpabien.co/
-  - http://cpabien.la/
-  - http://cpabien.club/
-  - http://www.cpabien.io/
-  - https://ww1.cpabien.io/
-  - https://wvw.cpabien.cm/
-  - https://www.cpabien.io/
-  - https://www.cpabien9.net/
-  - https://wwv.cpabien.cm/
-  - http://www.cpabien.cx/
-  - https://www.cpasbien.blue/
-  - https://www.cpabien.cx/
-  - https://www.cpasbien.re/
-  - http://www.cpasbien.io/
-  - https://www.cpabien.bz/
-  - https://www.cpabien.link/
   - https://www.cpasbiens.cz/
   - https://www.cpasbiens.bz/
   - https://www.cpasbien.vg/
@@ -46,6 +21,9 @@ legacylinks:
   - https://www.cpasbien-fr.nz/
   - https://vwwvwvwvvw.cpasbien-fr.nz/
   - https://cpasbiens3.fr/
+  - https://labastidevivante.fr/
+  - https://cpasbiens911.fr/
+  - https://jardattraction.fr/
 
 caps:
   categories:

src/Jackett.Common/Definitions/dajiao.yml

@@ -1,30 +1,33 @@
 ---
-id: uploads
-name: Uploads
-description: "Uploads is a CHINESE Private torrent tracker for MOVIES / TV / GENERAL"
+id: dajiao
+name: Dajiao
+description: "Dajiao (打胶) is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: zh-CN
 type: private
 encoding: UTF-8
 links:
-  - http://uploads.ltd/
+  - https://dajiao.cyou/
 
 caps:
   categorymappings:
-    - {id: 401, cat: Movies, desc: "Movies"}
-    - {id: 402, cat: TV, desc: "TV Series"}
-    - {id: 403, cat: TV, desc: "TV Shows"}
-    - {id: 404, cat: TV/Documentary, desc: "Documentaries"}
-    - {id: 405, cat: TV/Anime, desc: "Animations"}
-    - {id: 406, cat: Audio/Video, desc: "Music Videos"}
-    - {id: 407, cat: TV/Sport, desc: "Sports"}
-    - {id: 408, cat: Audio, desc: "HQ Audio"}
-    - {id: 409, cat: Other, desc: "Misc"}
+    - {id: 414, cat: Console, desc: "Games/游戏"}
+    - {id: 412, cat: Audio/Audiobook, desc: "Audio Books/有声书"}
+    - {id: 409, cat: Other, desc: "Others/音乐"}
+    - {id: 411, cat: Books/Comics, desc: "Manga/漫画"}
+    - {id: 413, cat: Books/EBook, desc: "E-Books/电子书"}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
+    - {id: 403, cat: TV, desc: "TV Variety Shows/综艺"}
+    - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
+    - {id: 402, cat: TV, desc: "TV Series/电视剧"}
+    - {id: 401, cat: Movies, desc: "Movies/电影"}
+    - {id: 416, cat: TV, desc: "TV Shows/电视节目"}
 
   modes:
     search: [q]
     tv-search: [q, season, ep, imdbid, doubanid]
     movie-search: [q, imdbid, doubanid]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -39,7 +42,7 @@ settings:
   - name: info_2fa
     type: info
     label: "About 2FA code"
-    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the Uploads Web Site. Otherwise just leave it empty."
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the Kufei Web Site. Otherwise just leave it empty."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -69,6 +72,10 @@ login:
   path: login.php
   method: form
   form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
   inputs:
     secret: ""
     username: "{{ .Config.username }}"
@@ -76,8 +83,8 @@ login:
     two_step_code: "{{ .Config.2facode }}"
     logout: ""
     securelogin: ""
-    ssl: ""
-    trackerssl: ""
+    ssl: yes
+    trackerssl: yes
   error:
     - selector: td.embedded:has(h2:contains("失败"))
   test:
@@ -96,7 +103,7 @@ search:
     spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
     # 0 title, 1 descr, 3 uploader, 4 imdburl
     search_area: "{{ if .Query.IMDBID }}4{{ else }}{{ end }}{{ if .Query.DoubanID }}1{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}0{{ end }}"
-    # 0 AND, 1 OR, 2 exact
+    # 0 AND, 2 exact
     search_mode: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
@@ -179,7 +186,9 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
+    minimumratio:
+      text: 1.0
     description:
       selector: td:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.7.30 2022-11-05
+# NexusPHP v1.8.4 2023-06-13

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

@@ -68,8 +68,6 @@ settings:
 login:
   path: /api/torrents
   method: get
-  inputs:
-    api_token: "{{ .Config.apikey }}"
   error:
     - selector: a[href*="/login"]
       message:
@@ -81,8 +79,10 @@ search:
       response:
         type: json
 
+  headers:
+    Authorization: ["Bearer {{ .Config.apikey }}"]
+
   inputs:
-    api_token: "{{ .Config.apikey }}"
     $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
     search: "{{ .Keywords }}"
     imdb: "{{ .Query.IMDBIDShort }}"

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

@@ -6,10 +6,10 @@ language: de-DE
 type: private
 encoding: UTF-8
 links:
-  - https://projekt.dark-shadow.me/
+  - https://dark-shadow.me/
 legacylinks:
   - https://dark-shadow.ml/
-  - https://dark-shadow.me/
+  - https://projekt.dark-shadow.me/
 
 caps:
   categorymappings:
@@ -109,7 +109,8 @@ login:
   error:
     - selector: div#login_error
   test:
-    path: selection.php
+    path: index.php
+    selector: a[href="logout.php"]
 
 search:
   paths:
@@ -138,6 +139,8 @@ search:
       selector: div.kat_cat_pic_name_b
     categorydesc:
       text: "{{ .Result.category_p1 }} {{ .Result.category_p2 }}"
+      optional: true
+      default: Internal Sonstiges
     title:
       selector: a.selection_a
       filters:

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

@@ -61,8 +61,6 @@ settings:
 login:
   path: /api/torrents
   method: get
-  inputs:
-    api_token: "{{ .Config.apikey }}"
   error:
     - selector: a[href*="/login"]
       message:
@@ -70,15 +68,17 @@ login:
 
 search:
   paths:
-    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
     - path: "/api/torrents/filter"
       response:
         type: json
 
+  headers:
+    Authorization: ["Bearer {{ .Config.apikey }}"]
+
   inputs:
   # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
-    api_token: "{{ .Config.apikey }}"
     $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
     name: "{{ .Keywords }}"
     seasonNumber: "{{ .Query.Season }}"

src/Jackett.Common/Definitions/datatalli.yml

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

src/Jackett.Common/Definitions/deildu.yml

@@ -63,7 +63,8 @@ login:
     password: "{{ .Config.password }}"
     keeplogged: 1
   test:
-    path: my.php
+    path: index.php
+    selector: a[href^="logout.php"]
 
 search:
   paths:

src/Jackett.Common/Definitions/demonoid.yml

@@ -5,21 +5,16 @@ description: "Demonoid is a Semi-Private torrent site for MOVIES / TV / GENERAL"
 language: en-US
 type: semi-private
 encoding: UTF-8
-followredirect: true
 links:
   - https://www.demonoid.is/
   - https://www.dnoid.to/
   - https://www.dnoid.pw/
-  - https://demonoid.unblockit.asia/
+  - https://demonoid.unblockit.esq/
   - https://demonoid.torrentbay.net/
-  - https://demonoid.mrunblock.life/
-  - https://demonoid.nocensor.click/
+  - https://demonoid.mrunblock.bond/
+  - https://demonoid.nocensor.cloud/
 legacylinks:
-  - https://demonoid.unblockit.cam/
   - https://demonoid.nocensor.biz/
-  - https://demonoid.unblockit.day/
-  - https://demonoid.unblockit.llc/
-  - https://demonoid.unblockit.blue/
   - https://demonoid.unblockit.name/
   - https://demonoid.nocensor.sbs/
   - https://demonoid.unblockit.ist/
@@ -42,6 +37,12 @@ legacylinks:
   - 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/
 
 caps:
   categorymappings:
@@ -327,7 +328,8 @@ login:
   inputs:
     cookie: "{{ .Config.cookie }}"
   test:
-    path: files/
+    path: /
+    selector: a[href^="/account_handler.php"]
 
 download:
   infohash:

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

@@ -54,8 +54,6 @@ settings:
 login:
   path: /api/torrents
   method: get
-  inputs:
-    api_token: "{{ .Config.apikey }}"
   error:
     - selector: a[href*="/login"]
       message:
@@ -63,15 +61,17 @@ login:
 
 search:
   paths:
-    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
     - path: "/api/torrents/filter"
       response:
         type: json
 
+  headers:
+    Authorization: ["Bearer {{ .Config.apikey }}"]
+
   inputs:
   # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
-    api_token: "{{ .Config.apikey }}"
     $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
     name: "{{ .Keywords }}"
     seasonNumber: "{{ .Query.Season }}"

src/Jackett.Common/Definitions/diablotorrent.yml

@@ -65,6 +65,7 @@ login:
     rhash: 123
   test:
     path: browse
+    selector: a[href*="logout"]
 
 search:
   paths:

src/Jackett.Common/Definitions/digitalcore.yml

@@ -75,6 +75,10 @@ settings:
     type: checkbox
     label: Search P2P releases only
     default: false
+  - name: unrar_releases_only
+    type: checkbox
+    label: Search UNRAR releases only
+    default: false
   - name: sort
     type: select
     label: Sort requested from site
@@ -119,6 +123,7 @@ search:
     section: all
     sort: "{{ .Config.sort }}"
     stereoscopic: false
+    unrar: "{{ if .Config.unrar_releases_only }}true{{ else }}{{ end }}"
     watchview: false
 
   rows:
@@ -212,6 +217,12 @@ search:
       case:
         0: ""
         1: P2P
+    _unrartag:
+      selector: unrar
+      case:
+        0: ""
+        1: UNRAR
+      optional: true
     _packtag:
       selector: pack
       case:
@@ -224,7 +235,7 @@ search:
         "*": Request
     _tag_desc:
       optional: true
-      text: "{{ if .Result._p2ptag }}{{ .Result._p2ptag }}, {{ else }}{{ end }}{{ if .Result._packtag }}{{ .Result._packtag }}, {{ else }}{{ end }}{{ if .Result._reqidtag }}{{ .Result._reqidtag }}{{ else }}{{ end }}"
+      text: "{{ if .Result._p2ptag }}{{ .Result._p2ptag }}, {{ else }}{{ end }}{{ if .Result._unrartag }}{{ .Result._unrartag }}, {{ else }}{{ end }}{{ if .Result._packtag }}{{ .Result._packtag }}, {{ else }}{{ end }}{{ if .Result._reqidtag }}{{ .Result._reqidtag }}{{ else }}{{ end }}"
       filters:
         - name: regexp
           args: "(.+?), $"

src/Jackett.Common/Definitions/dimeadozen.yml

@@ -1,9 +1,9 @@
 ---
 id: dimeadozen
 name: DimeADozen
-description: "DimeADozen (EzTorrent) is a Semi-Private Torrent Tracker for BOOTLEG MUSIC"
+description: "DimeADozen (EzTorrent) is a Private Torrent Tracker for BOOTLEG MUSIC"
 language: en-GB
-type: semi-private
+type: private
 encoding: UTF-8
 links:
   - http://www.dimeadozen.org/ # site does not support https ERR_CONNECTION_REFUSED

src/Jackett.Common/Definitions/discfan.yml

@@ -84,7 +84,7 @@ login:
         selector: td.text
   test:
     path: index.php
-    selector: a[href^="userdetails.php?id="]
+    selector: a[href*="userdetails.php?id="]
 
 search:
   paths:
@@ -184,4 +184,4 @@ search:
           args: "cat={{ .Result._cat }} - "
     minimumratio:
       text: 0.9
-# NexusPHP Standard v1.5 Beta 4
+# NexusPHP v1.8.4 2023-06-16

src/Jackett.Common/Definitions/divteam.yml

@@ -92,6 +92,7 @@ login:
     cookie: "{{ .Config.cookie }}"
   test:
     path: index.php
+    selector: a[href="logout.php"]
 
 search:
   paths:

src/Jackett.Common/Definitions/drugari.yml

@@ -0,0 +1,216 @@
+---
+id: drugari
+name: Drugari
+description: "Drugari is a CROATIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: hr-HR
+type: private
+encoding: UTF-8
+links:
+  - http://drugari.org/ # does not support https, ERR_CONNECTION_CLOSED
+
+caps:
+  categorymappings:
+    - {id: 3, cat: TV/Anime, desc: "ANIMIRANI"}
+    - {id: 4, cat: PC, desc: "Appz"}
+    - {id: 1, cat: Movies, desc: "BEZ PRAVILA"}
+    - {id: 39, cat: Movies, desc: "BEZ PREVODA"}
+    - {id: 41, cat: Movies, desc: "BEZ PREVODA Filmovi"}
+    - {id: 40, cat: TV, desc: "BEZ PREVODA Serije"}
+    - {id: 7, cat: TV/Documentary, desc: "DOKUMENTARNI"}
+    - {id: 18, cat: Movies, desc: "DOMACI FILMOVI"}
+    - {id: 49, cat: Movies, desc: "DOMACI FILMOVI Predstava"}
+    - {id: 10, cat: Movies/DVD, desc: "DVD FILMOVI"}
+    - {id: 37, cat: TV, desc: "Emisije"}
+    - {id: 8, cat: Movies, desc: "FILM"}
+    - {id: 34, cat: Movies, desc: "FILM Kolekcije"}
+    - {id: 56, cat: Movies, desc: "FILM Kratki"}
+    - {id: 48, cat: Movies, desc: "FILM Ruski Film"}
+    - {id: 23, cat: Movies/SD, desc: "FILM TS"}
+    - {id: 24, cat: Movies, desc: "FILM TV RIP"}
+    - {id: 38, cat: Movies, desc: "FILM- Western"}
+    - {id: 22, cat: Movies/HD, desc: "FILM x264/x265-Filmovi"}
+    - {id: 21, cat: Movies/SD, desc: "FILM XviD/Strani Filmovi"}
+    - {id: 15, cat: Console, desc: "IGRE"}
+    - {id: 19, cat: Books, desc: "KNJIGE"}
+    - {id: 53, cat: Audio/Audiobook, desc: "KNJIGE Audio"}
+    - {id: 52, cat: Books/Mags, desc: "KNJIGE Casopisi"}
+    - {id: 55, cat: Books/EBook, desc: "KNJIGE pdf"}
+    - {id: 14, cat: Audio, desc: "MUZIKA"}
+    - {id: 50, cat: Audio, desc: "MUZIKA Domaca Diskografija"}
+    - {id: 29, cat: Audio, desc: "MUZIKA DVD Muzika"}
+    - {id: 33, cat: Audio/Lossless, desc: "MUZIKA FLAC"}
+    - {id: 35, cat: Audio, desc: "MUZIKA Karaoke"}
+    - {id: 32, cat: Audio/MP3, desc: "MUZIKA MP3"}
+    - {id: 31, cat: Audio/Other, desc: "MUZIKA Muzika Ostalo"}
+    - {id: 51, cat: Audio, desc: "MUZIKA Strana Diskografija"}
+    - {id: 30, cat: Audio/Video, desc: "MUZIKA Video Muzika"}
+    - {id: 11, cat: Other, desc: "RAZNO"}
+    - {id: 20, cat: TV, desc: "SERIJE"}
+    - {id: 27, cat: TV, desc: "SERIJE Domace Serije"}
+    - {id: 54, cat: TV, desc: "SERIJE Ruske Serije"}
+    - {id: 28, cat: TV, desc: "SERIJE Strane Serije"}
+    - {id: 16, cat: Other, desc: "SLIKE"}
+    - {id: 12, cat: TV/Sport, desc: "SPORT"}
+    - {id: 6, cat: Other, desc: "STRANI TORENTI"}
+    - {id: 5, cat: Other, desc: "STRIP"}
+    - {id: 13, cat: Other, desc: "UPUTSTVA"}
+    - {id: 25, cat: XXX, desc: "XXX"}
+    - {id: 47, cat: XXX, desc: "XXX XXX-Strip"}
+    - {id: 42, cat: TV, desc: "Za Decu"}
+    - {id: 43, cat: TV, desc: "Za Decu Edukativni Programi"}
+    - {id: 44, cat: Console, desc: "Za Decu Igrice"}
+    - {id: 45, cat: Books, desc: "Za Decu Knjige"}
+    - {id: 46, cat: Audio, desc: "Za Decu Muzika"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    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: Filter freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: added
+    options:
+      added: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>40</b> on your account profile. The Default is <i>30</i>.
+  - name: info_results
+    type: info
+    label: Search results
+    default: "If you are getting the error <b>Found no results while trying to browse this tracker</b> then first access the site with your browser and read any new mail you may have received. You cannot browse torrents with unread mail outstanding."
+
+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="]
+
+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
+  keywordsfilters:
+    - name: re_replace
+      args: ["[\\s]+", "%"]
+  inputs:
+    do: search
+    keywords: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # t_name, t_description, t_both, t_uploader, t_genre
+    search_type: "{{ if .Query.IMDBID }}t_genre{{ else }}t_name{{ end }}"
+    # does not support multi category searching so defaulting to all.
+    category: 0
+    # yes, no
+    include_dead_torrents: yes
+    sort: "{{ if .Config.freeleech }}free{{ else }}{{ .Config.sort }}{{ end }}"
+    order: "{{ if .Config.freeleech }}asc{{ else }}{{ .Config.type }}{{ end }}"
+    # does not return imdb link in 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_default:
+      # is usually abbreaviated
+      selector: a[href*="/details.php?id="]
+    title:
+      # while still abbreviated, is usually longer than the default
+      selector: div.tooltip-content div
+      optional: true
+      default: "{{ .Result.title_default }}"
+    details:
+      selector: a[href*="/details.php?id="]
+      attribute: href
+    download:
+      selector: a[href*="/details.php?id="]
+      attribute: href
+    poster:
+      selector: img[src*="/torrents/images/"]
+      attribute: src
+    date:
+      selector: td:nth-child(2)
+      # auto adjusted by site account profile
+      filters:
+        - name: regexp
+          args: "(\\d{2}-\\d{2}-\\d{4} \\d{2}:\\d{2})"
+        - name: dateparse
+          args: "dd-MM-yyyy HH:mm"
+    size:
+      selector: td:nth-last-child(5)
+    grabs:
+      selector: td:nth-last-child(4)
+    seeders:
+      selector: td:nth-last-child(3)
+    leechers:
+      selector: td:nth-last-child(2)
+    description:
+      # Wait: 4 h
+      # 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
+    minimumratio:
+      text: 1.1
+    minimumseedtime:
+      # 60 hours (as seconds = 60 x 60 x 60)
+      text: 216000
+# TS Special Edition v.8.0

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

@@ -6,6 +6,8 @@ language: pl-PL
 type: semi-private
 encoding: UTF-8
 links:
+  - https://electro-torrent.pl/
+legacylinks:
   - http://electro-torrent.pl/
 
 caps:
@@ -49,12 +51,20 @@ caps:
     book-search: [q]
 
 settings:
-  - name: username
+  - name: cookie
     type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
+    label: Cookie
+  - name: info
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: useragent
+    type: text
+    label: User-Agent
+  - name: info_useragent
+    type: info
+    label: How to get the User-Agent
+    default: "<ol><li>From the same place you fetched the cookie,</li><li>Find <b>'user-agent:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole user-agent string <i>(everything after 'user-agent: ')</i> and <b>Paste</b> here.</li></ol>"
   - name: multilang
     type: checkbox
     label: Replace MULTi by another language in release name
@@ -68,25 +78,17 @@ settings:
       MULTi POLISH: MULTi POLISH
 
 login:
-  path: logowanie
-  method: form
-  form: form[action="takelogin.php"]
-  captcha:
-    type: image
-    selector: img[src^="img.php?size=3"]
-    input: vImageCodP
+  method: cookie
   inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    returnto: ""
-  error:
-    - selector: div#center-side:contains("Logowanie nie")
+    cookie: "{{ .Config.cookie }}"
   test:
     path: /
     selector: a[href$="/logout.php"]
 
 search:
   # http://electro-torrent.pl/szukaj.php?search=&typ=torrent&cat=0
+  headers:
+    User-Agent: ["{{ .Config.useragent }}"]
   paths:
     - path: szukaj.php
   allowEmptyInputs: true

src/Jackett.Common/Definitions/elitetorrent-pl.yml

@@ -1,153 +0,0 @@
----
-id: elitetorrent-pl
-name: EliteTorrent-pl
-description: "EliteTorrent-pl is a POLISH Semi-Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: pl-PL
-type: semi-private
-encoding: UTF-8
-links:
-  - https://elitetorrent.pl/
-
-caps:
-  categorymappings:
-    - {id: 13, cat: Movies, desc: "Filmy"}
-    - {id: 1, cat: Movies, desc: "DivX - XviD"}
-    - {id: 6, cat: Movies, desc: "RMVB"}
-    - {id: 41, cat: Movies, desc: "VCD - SVCD"}
-    - {id: 11, cat: Movies, desc: "DVD-R"}
-    - {id: 38, cat: Movies, desc: "HDTV-HD-DVD"}
-    - {id: 46, cat: Movies, desc: "x 264"}
-    - {id: 47, cat: Movies, desc: "3D"}
-    - {id: 48, cat: Movies, desc: "4K"}
-    - {id: 56, cat: Movies, desc: "Seriale"}
-    - {id: 14, cat: PC/Games, desc: "Gry"}
-    - {id: 3, cat: PC/Games, desc: "Gry PC"}
-    - {id: 15, cat: Console, desc: "Gry Konsole"}
-    - {id: 51, cat: Books, desc: "Poradniki i inne"}
-    - {id: 17, cat: Audio, desc: "Muzyka"}
-    - {id: 18, cat: Audio, desc: "Albumy"}
-    - {id: 19, cat: Audio/Video, desc: "Teledyski/Koncerty"}
-    - {id: 20, cat: TV/Documentary, desc: "Dokumenty"}
-    - {id: 21, cat: Books/EBook, desc: "E-Booki"}
-    - {id: 50, cat: Audio/Audiobook, desc: "Audiobooki"}
-    - {id: 23, cat: Books/Comics, desc: "Komiksy"}
-    - {id: 52, cat: Books/Mags, desc: "Czasopisma"}
-    - {id: 40, cat: PC, desc: "Programy"}
-    - {id: 7, cat: PC/0day, desc: "Windows"}
-    - {id: 39, cat: PC/Mac, desc: "Linux + Macintosh"}
-    - {id: 31, cat: Other, desc: "Inne"}
-    - {id: 8, cat: Other, desc: "Dla Dzieci"}
-    - {id: 9, cat: TV/Sport, desc: "Sport"}
-    - {id: 44, cat: PC/Mobile-Other, desc: "GSM - PDA"}
-    - {id: 43, cat: TV/Anime, desc: "Manga - Anime"}
-    - {id: 42, cat: Other/Misc, desc: "Pozostałe - Różne"}
-    - {id: 49, cat: XXX, desc: "Erotyka"}
-    - {id: 5, cat: XXX/x264, desc: "Filmy"}
-    - {id: 53, cat: XXX/ImageSet, desc: "Zdjęcia"}
-    - {id: 54, cat: XXX/Other, desc: "Czasopisma erotyczne"}
-    - {id: 55, cat: XXX/Other, desc: "Gry erotyczne"}
-
-  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: multilang
-    type: checkbox
-    label: Replace MULTi by another language in release name
-    default: false
-  - name: multilanguage
-    type: select
-    label: Replace MULTi by this language
-    default: POLISH
-    options:
-      POLISH: POLISH
-      MULTi POLISH: MULTIi POLISH
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrentów na stronę:</b> setting to <b>100</b> on your account profile.
-
-login:
-  path: login.php
-  method: form
-  form: form
-  inputs:
-    uid: "{{ .Config.username }}"
-    pwd: "{{ .Config.password }}"
-    keeplogged: 1
-  error:
-    - selector: font[color="#FF0000"]
-  test:
-    path: index.php
-    selector: a[href^="logout.php?check_hash="]
-
-search:
-  paths:
-    # https://elitetorrent.pl/torrents.php?erotyka=1&page=1
-    - path: torrents.php
-  inputs:
-    # does not support multi category selection. so using default for all
-    # $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    category: 0
-    search: "{{ .Keywords }}"
-    erotyka: 1
-    page: 1
-    # does not support sorting results, or imdbid searching, or have imdb in results
-
-  rows:
-    selector: table.lista[width="100%"]:not(table[align]) > tbody > tr:has(a[href^="details.php?id="])
-
-  fields:
-    category:
-      selector: a[href^="torrents.php?category="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    title_phase1:
-      selector: a[href^="details.php?id="]
-    title_multilang:
-      selector: a[href^="details.php?id="]
-      filters:
-        - name: re_replace
-          args: ["(?i)\\b(MULTI(?!.*(?:POLISH|ENGLISH|\\bPL\\b)))\\b", "{{ .Config.multilanguage }}"]
-        - name: re_replace
-          args: ["(?i)\\b(pl)\\b", "POLISH"]
-    title:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    poster:
-      selector: img
-      attribute: src
-    date:
-      selector: td:nth-child(6)
-      # auto adjusted by site account profile
-      filters:
-        - name: dateparse
-          args: "dd/MM/yyyy HH:mm:ss"
-    size:
-      selector: td:nth-child(7)
-    seeders:
-      selector: td:nth-child(9)
-    leechers:
-      selector: td:nth-child(10)
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/eniahd.yml

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

src/Jackett.Common/Definitions/estone.yml

@@ -83,7 +83,8 @@ login:
           - name: replace
             args: ["\");", ""]
   test:
-    path: letoltes.php
+    path: index.php
+    selector: a[href="logout.php"]
 
 search:
   paths:

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

@@ -7,16 +7,12 @@ type: public
 encoding: UTF-8
 links:
   - https://extratorrent.st/
-  - https://extratorrent.unblockit.asia/
-  - https://extratorrent.mrunblock.life/
-  - https://extratorrent.nocensor.click/
+  - https://extratorrent.unblockit.esq/
+  - https://extratorrent.mrunblock.bond/
+  - https://extratorrent.nocensor.cloud/
 legacylinks:
   - https://extratorrent.nocensor.work/
-  - https://extratorrent.unblockit.cam/
   - https://extratorrent.nocensor.biz/
-  - https://extratorrent.unblockit.day/
-  - https://extratorrent.unblockit.llc/
-  - https://extratorrent.unblockit.blue/
   - https://extratorrent.unblockit.name/
   - https://extratorrent.nocensor.sbs/
   - https://extratorrent.unblockit.ist/
@@ -33,6 +29,12 @@ legacylinks:
   - 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/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/exttorrents.yml

@@ -109,6 +109,7 @@ search:
   paths:
     - path: "{{ if .Keywords }}search/{{ .Keywords }}/?order={{ .Config.sort }}&sort={{ .Config.type }}{{ else }}latest/{{ end }}"
     - path: "{{ if .Keywords }}search/{{ .Keywords }}/2/?order={{ .Config.sort }}&sort={{ .Config.type }}{{ else }}latest/2/{{ end }}"
+      followredirect: true
 
   keywordsfilters:
     - name: tolower
@@ -123,6 +124,8 @@ search:
     category:
       selector: td:nth-child(1) div div a:last-child
       attribute: href
+      optional: true
+      default: "/other/"
     title:
       selector: td:nth-child(1) div a
     details:

src/Jackett.Common/Definitions/eztv.yml

@@ -5,7 +5,6 @@ description: "EZTV is a Public torrent site for TV shows"
 language: en-US
 type: public
 encoding: UTF-8
-followredirect: true
 links:
   - https://eztv.re/
   - https://eztv.wf/
@@ -13,18 +12,15 @@ links:
   - https://eztv.yt/
   - https://eztv1.xyz/
   - https://eztv.unblockninja.com/
-  - https://eztv.unblockit.asia/
-  - https://eztv.mrunblock.life/
-  - https://eztv.nocensor.click/
+  - https://eztv.unblockit.esq/
+  - https://eztv.mrunblock.bond/
+  - https://eztv.nocensor.cloud/
 legacylinks:
   - https://eztv.ag/ # redirects to .re
   - https://eztv.it/ # redirects to .re
   - https://eztv.ch/ # redirects to .re
   - https://eztv.io/
   - https://eztv.nocensor.biz/
-  - https://eztv.unblockit.day/
-  - https://eztv.unblockit.llc/
-  - https://eztv.unblockit.blue/
   - https://eztv.unblockit.name/
   - https://eztv.nocensor.sbs/
   - https://eztv.unblockit.ist/
@@ -41,6 +37,12 @@ legacylinks:
   - https://eztv.unblockit.boo/
   - 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/
 
 caps:
   categories:
@@ -59,7 +61,7 @@ search:
   keywordsfilters:
     - name: re_replace
       args: ["S[0-9]{2}([^E]|$)", ""] # remove season tag without episode (search doesn't support it)
-    # fixes for site search issues
+    # fixes for site search issues - Prowlarr #1094
     - name: replace
       args: ["-", ""]
     - name: replace

src/Jackett.Common/Definitions/fanoin.yml

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

src/Jackett.Common/Definitions/fantasticheaven.yml

@@ -1,181 +0,0 @@
----
-id: fantasticheaven
-name: Fantastic Heaven
-description: "Fantastic Heaven is a German Time based tracker"
-language: de-DE
-type: private
-encoding: UTF-8
-links:
-  - https://fantastic-heaven.eu/
-
-caps:
-  categorymappings:
-    - {id: 157, cat: TV/Documentary, desc: "Doku 1080p"}
-    - {id: 156, cat: TV/Documentary, desc: "Doku 720p"}
-    - {id: 155, cat: TV/Documentary, desc: "Doku SD x264/x265"}
-    - {id: 152, cat: Books, desc: "E-Books"}
-    - {id: 141, cat: Movies/HD, desc: "Filme HD 1080p"}
-    - {id: 154, cat: Movies/HD, desc: "Filme HD 720p"}
-    - {id: 139, cat: Movies/HD, desc: "Filme Packs HD 1080p"}
-    - {id: 106, cat: Movies/HD, desc: "Filme Packs HD 720p"}
-    - {id: 105, cat: Movies/SD, desc: "Filme Packs SD x264/x265"}
-    - {id: 119, cat: Movies/UHD, desc: "Filme Packs UHD 2160p"}
-    - {id: 153, cat: Movies/SD, desc: "Filme SD x264/x265"}
-    - {id: 140, cat: Movies/UHD, desc: "Filme UHD 2160p"}
-    - {id: 104, cat: Movies/HD, desc: "Filmklassiker HD 1080p"}
-    - {id: 103, cat: Movies/HD, desc: "Filmklassiker HD 720p"}
-    - {id: 124, cat: Movies/HD, desc: "Filmklassiker Packs HD 1080p"}
-    - {id: 121, cat: Movies/HD, desc: "Filmklassiker Packs HD 720p"}
-    - {id: 123, cat: Movies/UHD, desc: "Filmklassiker Packs UHD 2160p"}
-    - {id: 127, cat: Movies/SD, desc: "Filmklassiker Packs  x264/x265"}
-    - {id: 102, cat: Movies/SD, desc: "Filmklassiker SD x264/x265"}
-    - {id: 135, cat: Movies/UHD, desc: "Filmklassiker UHD 2160p"}
-    - {id: 118, cat: Audio/Audiobook, desc: "Hörbücher"}
-    - {id: 109, cat: Audio/Lossless, desc: "Musik Flac"}
-    - {id: 129, cat: Audio/MP3, desc: "Musik MP3"}
-    - {id: 111, cat: Audio/Lossless, desc: "Musik Packs Flac"}
-    - {id: 112, cat: Audio/MP3, desc: "Musik Packs MP3"}
-    - {id: 113, cat: TV/HD, desc: "Serie HD 1080p"}
-    - {id: 125, cat: TV/HD, desc: "Serie HD 720p"}
-    - {id: 115, cat: TV/Foreign, desc: "Serie International"}
-    - {id: 138, cat: TV/HD, desc: "Serie Packs HD 1080p"}
-    - {id: 116, cat: TV/HD, desc: "Serie Packs HD 720p"}
-    - {id: 144, cat: TV/Foreign, desc: "Serie Packs International"}
-    - {id: 137, cat: TV/SD, desc: "Serie Packs SD x264/x265"}
-    - {id: 143, cat: TV/UHD, desc: "Serie Packs UHD 2160p"}
-    - {id: 133, cat: TV/SD, desc: "Serie SD x264/x265"}
-    - {id: 114, cat: TV/UHD, desc: "Serie UHD 2160p"}
-    - {id: 150, cat: PC/0day, desc: "Windows Apps"}
-    - {id: 149, cat: PC/Games, desc: "Windows Spiele"}
-    - {id: 147, cat: XXX/x264, desc: "XXX HD 1080p"}
-    - {id: 146, cat: XXX/x264, desc: "XXX HD 720p"}
-    - {id: 148, cat: XXX/Pack, desc: "XXX Packs"}
-    - {id: 69, cat: XXX/SD, desc: "XXX SD x264/x265"}
-    - {id: 151, cat: Books/Mags, desc: "Zeitschriften"}
-
-  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: pin
-    type: text
-    label: Pin
-  - name: freeleech
-    type: checkbox
-    label: Filter FreeLeech only
-    default: false
-  - name: onlyupload
-    type: checkbox
-    label: Filter OnlyUpload only
-    default: false
-  - name: info_free
-    type: info
-    label: About Freeleech and OnlyUpload at Fantastic Heaven
-    default: "<ul><li>FreeLeech are torrents where neither the download or upload is counted. (On the Jackett dashboard search results these are tagged as NoUpload).</li><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>Torrents pro Seite:</b> setting to <b>100</b> on your Control Panel. The default is <i>15</i>.
-
-login:
-  path: login.php
-  method: form
-  form: form[action="../takelogin.php"]
-  cookies: ["JAVA=OK"] # avoid jscheck redirect
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    secure_pin: "{{ .Config.pin }}"
-  error:
-    - selector: table.tableinborder:contains("Anmeldung Gescheitert!") > tbody > tr > td.tablea
-  test:
-    path: index.php
-    selector: a[href="logout.php"]
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    showsearch: 1
-    search: "{{ .Keywords }}"
-    # 0 active, 1 all, 2 dead
-    incldead: 1
-    orderby: "{{ .Config.sort }}"
-    sort: "{{ .Config.type }}"
-
-  rows:
-    selector: "table.tableinborder[cellspacing=\"1\"][cellpadding=\"0\"] > tbody > tr:has(a[href^=\"download.php\"]){{ if .Config.freeleech }}:has(img[src=\"pic/freeleech.gif\"]){{ else }}{{ end }}{{ if .Config.onlyupload }}:has(img[src=\"pic/oupic.gif\"]){{ else }}{{ end }}"
-
-  fields:
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: a[href^="details.php?id="] > b
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?torrent="]
-      attribute: href
-    poster:
-      selector: div[id^="details"] img
-      attribute: src
-    size:
-      selector: td.content_wrap table tbody tr:nth-child(2) td:nth-child(1) b:nth-child(1)
-    files:
-      selector: td.content_wrap table tbody tr:nth-child(2) td:nth-child(1) b:nth-child(2)
-    seeders:
-      selector: td.content_wrap table tbody tr:nth-child(2) td:nth-child(2) b:nth-child(1)
-    leechers:
-      selector: td.content_wrap table tbody tr:nth-child(2) td:nth-child(2) > b:nth-of-type(2)
-    grabs:
-      selector: td.content_wrap table tbody tr:nth-child(2) td:nth-child(3) b:nth-child(1)
-    date:
-      selector: td.content_wrap table tbody tr:nth-child(2) td:nth-child(5)
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: replace
-          args: ["\xA0", " "]
-        - name: dateparse
-          args: "dd.MM.yyyy HH:mm:ss zzz"
-    downloadvolumefactor:
-      case:
-        img[src="pic/oupic.gif"]: 0 # only upload is counted
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[src="pic/freeleech.gif"]: 0 # nothing is counted
-        "*": 1
-# engine n/a

src/Jackett.Common/Definitions/fappaizuri.yml

@@ -0,0 +1,144 @@
+---
+id: fappaizuri
+name: Fappaizuri
+description: "Fappaizuri is a Private Torrent Tracker for HENTAI / JAV"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://fappaizuri.me/
+
+caps:
+  categorymappings:
+    - {id: 8, cat: TV/Anime, desc: "Hentai"}
+    - {id: 7, cat: Console, desc: "H-games"}
+    - {id: 5, cat: XXX, desc: "JAV"}
+    - {id: 6, cat: Books, desc: "Manga"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    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: lang
+    type: select
+    label: Language
+    default: 0
+    options:
+      0: All
+      4: Japanese
+      5: Chinese
+      6: Malaysia
+      7: North Korea
+      8: English
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: id
+    options:
+      id: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  method: post
+  path: account-login.php
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: b:contains("The specified username or password was incorrect.")
+  test:
+    path: index.php
+    selector: a[href="account-logout.php"]
+
+search:
+  paths:
+    # https://fappaizuri.me/torrents-search.php?search=&c8=1&c6=1&incldead=1&freeleech=0&lang=0
+    - path: torrents-search.php
+
+  inputs:
+    $raw: "{{ range .Categories }}&c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # 0 active, 1 incldead, 2 onlydead
+    incldead: 1
+    # 0 all, 1 notfree, 2 onlyfree
+    freeleech: "{{ if .Config.freeleech }}{{ .Config.freeleech }}2{{ else }}0{{ end }}"
+    lang: "{{ .Config.lang }}"
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+
+  rows:
+    selector: tr.t-row:has(a[href^="download.php?id="])
+
+  fields:
+    category:
+      selector: a[href^="search-torrents.php?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
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    poster:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: src=(.+?)>
+    _language:
+      selector: img[src*="images/languages/"]
+      attribute: alt
+      optional: true
+    description:
+      selector: font[color="red"]
+      filters:
+        - name: append
+          args: "{{ if .Result._language }} - {{ .Result._language }}{{ else }}{{ end }}"
+    size:
+      selector: td:nth-child(4)
+    seeders:
+      selector: td:nth-child(5)
+    leechers:
+      selector: td:nth-child(6)
+    date:
+      text: now
+    downloadvolumefactor:
+      case:
+        img[src="images/free.png"]: 0
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img[src="images/doubleupload.gif"]: 2
+        "*": 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 4 days (as seconds = 4 x 24 x 60 x 60)
+      text: 345600
+# evolution

src/Jackett.Common/Definitions/fastscene.yml

@@ -0,0 +1,130 @@
+---
+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
+
+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/fenyarnyek-tracker.yml

@@ -1,180 +0,0 @@
----
-id: fenyarnyek-tracker
-name: Fenyarnyek-Tracker
-description: "Fenyarnyek-Tracker is a HUNGARIAN semi private site for TV / MOVIES / GENERAL"
-language: hu-HU
-type: semi-private
-encoding: UTF-8
-links:
-  - http://tracker.fenyarnyek.com/
-legacylinks:
-  - https://tracker.fenyarnyek.com/  # site is forcing http
-
-caps:
-  categorymappings:
-    - {id: 13, cat: PC/ISO, desc: "Program/Iso"}
-    - {id: 14, cat: PC/0day, desc: "Program/Rip"}
-    - {id: 15, cat: TV, desc: "Sorozat/Eng"}
-    - {id: 16, cat: TV, desc: "Sorozat/Hun"}
-    - {id: 17, cat: Audio, desc: "Zene/Eng"}
-    - {id: 18, cat: Audio, desc: "Zene/Hun"}
-    - {id: 19, cat: PC/Games, desc: "Game/Rip"}
-    - {id: 20, cat: PC/Games, desc: "Game/Iso"}
-    - {id: 21, cat: Movies/SD, desc: "Xvid/Eng"}
-    - {id: 22, cat: Movies/SD, desc: "Xvid/hun"}
-    - {id: 23, cat: Other, desc: "Képek"}
-    - {id: 24, cat: Movies/SD, desc: "Cam/Hun"}
-    - {id: 25, cat: Movies/SD, desc: "Cam/Eng"}
-    - {id: 26, cat: TV/Anime, desc: "Animació"}
-    - {id: 27, cat: Books, desc: "E-book/Hun"}
-    - {id: 28, cat: Books, desc: "E-book/Eng"}
-    - {id: 29, cat: Movies/DVD, desc: "DVD/Hun"}
-    - {id: 31, cat: Movies/DVD, desc: "DVD/Eng"}
-    - {id: 32, cat: Movies/HD, desc: "Hd/Hun"}
-    - {id: 33, cat: Movies/HD, desc: "Hd/Eng"}
-    - {id: 34, cat: PC/Mobile-Other, desc: "Mobil"}
-    - {id: 35, cat: XXX, desc: "XXX/Film"}
-    - {id: 36, cat: XXX/ImageSet, desc: "XXX/Kep"}
-    - {id: 38, cat: Movies/SD, desc: "SD/Eng"}
-    - {id: 39, cat: Movies/SD, desc: "SD/Hun"}
-    - {id: 37, cat: Other, desc: "Egyéb"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 3
-    options:
-      3: created
-      5: seeders
-      4: size
-      2: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: 2
-    options:
-      2: desc
-      1: asc
-  - name: info
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
-
-login:
-  method: post
-  path: index.php?page=login
-  inputs:
-    uid: "{{ .Config.username }}"
-    pwd: "{{ .Config.password }}"
-  error:
-    - selector: td.lista span[style="color:#FF0000;"]
-  test:
-    path: index.php
-    selector: a[href="logout.php"]
-
-download:
-  before:
-    path: thanks.php
-    method: post
-    inputs:
-      infohash: "'{{ .DownloadUri.Query.id }}'"
-      thanks: 1
-      rndval: "1487013827343"
-  selectors:
-    - selector: a[href^="download.php?id="]
-      attribute: href
-
-search:
-  paths:
-    # http://tracker.fenyarnyek.com/index.php?page=torrents&search=&category=0&uploader=0&options=0&active=0&gold=0
-    - path: index.php
-  inputs:
-    page: torrents
-    search: "{{ .Keywords }}"
-    category: "{{ if .Categories }}{{ range .Categories }}{{.}};{{end}}{{ else }}0{{ end }}"
-    uploader: 0
-    # 0 filename, 1 file & desc, 2 description
-    options: 0
-    # 0 all, 1 active only, 2 dead only
-    active: 0
-    # 0 all, 1 classic, 2 silver, 3 gold, 4 silver & gold
-    gold: "{{ if .Config.freeleech }}3{{ else }}0{{ end }}"
-    order: "{{ .Config.sort }}"
-    by: "{{ .Config.type }}"
-
-  rows:
-    selector: td#mcol table.lista > tbody > tr:has(a[href*=bookmark])
-
-  fields:
-    category:
-      selector: a[href*="category="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    title:
-      selector: a[href^="index.php?page=torrent-details"]
-    details:
-      selector: a[href^="index.php?page=torrent-details"]
-      attribute: href
-    download:
-      selector: a[href^="index.php?page=torrent-details"]
-      attribute: href
-    poster:
-      selector: a[href^="index.php?page=torrent-details"]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=(.+?) "
-    date:
-      selector: td:nth-last-child(11)
-      # auto adjusted by site account profile
-      filters:
-        - name: dateparse
-          args: "dd/MM/yyyy"
-    size:
-      selector: td:nth-last-child(5)
-    seeders:
-      selector: td:nth-last-child(9)
-    leechers:
-      selector: td:nth-last-child(8)
-    downloadvolumefactor:
-      case:
-        img[src$="freeleech.gif"]: 0
-        img[src$="gold.gif"]: 0
-        img[src$="silver.gif"]: 0.5
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[src$="2x.gif"]: 2
-        img[src$="3x.gif"]: 3
-        img[src$="4x.gif"]: 4
-        img[src$="5x.gif"]: 5
-        img[src$="6x.gif"]: 6
-        img[src$="7x.gif"]: 7
-        img[src$="8x.gif"]: 8
-        img[src$="9x.gif"]: 9
-        img[src$="10x.gif"]: 10
-        "*": 1
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# xbtit

src/Jackett.Common/Definitions/filelisting.yml

@@ -7,8 +7,8 @@ type: public
 encoding: UTF-8
 links:
   - https://filelisting.com/
-  - https://filelisting.mrunblock.life/
-  - https://filelisting.nocensor.click/
+  - https://filelisting.mrunblock.bond/
+  - https://filelisting.nocensor.cloud/
 legacylinks:
   - https://filelisting.nocensor.biz/
   - https://filelisting.nocensor.sbs/
@@ -16,6 +16,8 @@ legacylinks:
   - https://filelisting.nocensor.lol/
   - https://filelisting.nocensor.art/
   - https://filelisting.mrunblock.guru/
+  - https://filelisting.mrunblock.life/
+  - https://filelisting.nocensor.click/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/firebit.yml

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

src/Jackett.Common/Definitions/freefarm.yml

@@ -0,0 +1,207 @@
+---
+id: freefarm
+name: Free Farm
+description: "Free Farm (自由农场) is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: zh-CN
+type: private
+encoding: UTF-8
+requestDelay: 2
+links:
+  - https://pt.0ff.cc/
+
+caps:
+  categorymappings:
+    - {id: 401, cat: Movies, desc: "Movies|电影", default: true}
+    - {id: 402, cat: TV, desc: "TV Series|电视剧", default: true}
+    - {id: 403, cat: TV/Documentary, desc: "Documentaries|纪录片", default: true}
+    - {id: 404, cat: TV, desc: "TV Shows|综艺", default: true}
+    - {id: 405, cat: TV/Anime, desc: "Animations|动漫", default: true}
+    - {id: 406, cat: Audio/Video, desc: "Music Videos|音乐视频", default: true}
+    - {id: 407, cat: Audio/Lossless, desc: "HD Music|无损音乐", default: true}
+    - {id: 408, cat: TV/Sport, desc: "Sports|体育", default: true}
+    - {id: 428, cat: Other, desc: "Others|其他", default: true}
+    # special
+    - {id: 413, cat: Other, desc: "Education|学习教育", default: false}
+    - {id: 414, cat: Other, desc: "Course|网络教程", default: false}
+    - {id: 415, cat: Books, desc: "book|书籍", default: false}
+    - {id: 416, cat: PC/0day, desc: "Resources|网络资源", default: false}
+    - {id: 417, cat: PC/Games, desc: "Game|游戏", default: false}
+    - {id: 426, cat: Other, desc: "Others|其他", default: false}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: 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: 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("失败"))
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+      categories: [401, 402, 403, 404, 405, 406, 407, 408, 428]
+    - path: special.php
+      categories: [413, 414, 415, 416, 417, 426]
+  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(a[href^="download.php?id="])
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_default:
+      selector: a[href^="details.php?id="]
+    title:
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+      optional: true
+      default: "{{ .Result.title_default }}"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    poster:
+      selector: 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]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    date_added:
+      # time added
+      selector: td.rowfollow:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-ddHH:mm:ss zzz"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td.rowfollow:nth-child(5)
+    seeders:
+      selector: td.rowfollow:nth-child(6)
+    leechers:
+      selector: td.rowfollow:nth-child(7)
+    grabs:
+      selector: td.rowfollow:nth-child(8)
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    minimumseedtime:
+      # special 7 days (as seconds = 7 x 24 x 60 x 60)
+      # normal 3 days (as seconds = 3 x 24 x 60 x 60)
+      case:
+        img[title="H&R"]: 604800
+        "*": 259200
+    description:
+      selector: td:nth-child(2)
+      remove: a, b, font, img, span
+# NexusPHP v1.8.7 2023-08-29

src/Jackett.Common/Definitions/freshmeat.yml

@@ -1,73 +0,0 @@
----
-id: freshmeat
-name: freshMeat
-description: "freshMeat is a Public torrent meta-search engine"
-language: en-US
-type: public
-encoding: UTF-8
-links:
-  - https://freshmeat.io/
-
-caps:
-  # unfortunately freshMeat does not display categories anywhere in its search results page :-(
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
-    - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: Other, desc: "Other"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-
-settings:
-  - name: info_8000
-    type: info
-    label: About freshMeat Categories
-    default: freshMeat does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
-
-download:
-  selectors:
-    - selector: a[href^="magnet:?xt="]
-      attribute: href
-
-search:
-  paths:
-    - path: "{{ if .Keywords }}s?q={{ .Keywords }}{{ else }}{{ end }}"
-
-  rows:
-    selector: table.torrent-list > tbody > tr
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      text: 3
-    title:
-      selector: td:nth-child(2)
-    details:
-      selector: td:nth-child(2) a
-      attribute: href
-    download:
-      selector: td:nth-child(2) a
-      attribute: href
-    date:
-      selector: td:nth-child(1)
-      attribute: data-sort-value
-      filters:
-        - name: dateparse
-          args: "yyyy-MM-dd HH:mm:ss"
-    description:
-      selector: td:nth-child(3) img
-      attribute: title
-    size:
-      selector: td:nth-child(4)
-    seeders:
-      selector: td:nth-child(5)
-    leechers:
-      text: 0
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/funkytorrents.yml

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

src/Jackett.Common/Definitions/futuretorrent.yml

@@ -0,0 +1,181 @@
+---
+id: futuretorrent
+name: FutureTorrent
+description: "FutureTorrent is an ITALIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: it-IT
+type: private
+encoding: UTF-8
+links:
+  - https://futuretorrent.org/
+
+caps:
+  categorymappings:
+    - {id: 3, cat: PC/Mobile-Android, desc: "Android"}
+    - {id: 4, cat: PC/Mobile-Android, desc: "  |-- Smartphone"}
+    - {id: 16, cat: Movies/HD, desc: "Bluray"}
+    - {id: 17, cat: Movies/HD, desc: "  |-- 1080p"}
+    - {id: 18, cat: Movies/3D, desc: "  |-- 3D"}
+    - {id: 19, cat: Movies/HD, desc: "  |-- 720p"}
+    - {id: 20, cat: Movies/HD, desc: "  |-- H.265 1080p"}
+    - {id: 21, cat: Movies/HD, desc: "  |-- H.265 720p"}
+    - {id: 53, cat: Movies/BluRay, desc: "  |-- Untouched"}
+    - {id: 30, cat: Movies/Other, desc: "Cartoons"}
+    - {id: 56, cat: Movies/Other, desc: "  |-- Anime"}
+    - {id: 31, cat: Movies/Other, desc: "  |-- Disney"}
+    - {id: 32, cat: Books/Comics, desc: "  |-- Manga"}
+    - {id: 5, cat: Movies/WEB-DL, desc: "Cinema-News"}
+    - {id: 58, cat: Movies/SD, desc: "  |-- Cinema News"}
+    - {id: 59, cat: Movies/WEB-DL, desc: "  |-- WEBDL"}
+    - {id: 60, cat: Movies/WEB-DL, desc: "  |-- WEBDL 1080p"}
+    - {id: 62, cat: Movies/WEB-DL, desc: "  |-- WEBDL 2160p"}
+    - {id: 61, cat: Movies/WEB-DL, desc: "  |-- WEBDL 720p"}
+    - {id: 22, cat: TV/Documentary, desc: "Documentari"}
+    - {id: 33, cat: Movies/DVD, desc: "DvD"}
+    - {id: 35, cat: Movies/DVD, desc: "  |-- DvD5"}
+    - {id: 34, cat: Movies/DVD, desc: "  |-- DvD9"}
+    - {id: 6, cat: Movies/SD, desc: "DvDRip"}
+    - {id: 8, cat: Movies/SD, desc: "  |-- BDRip"}
+    - {id: 9, cat: Movies/SD, desc: "  |-- Cult"}
+    - {id: 7, cat: Movies/SD, desc: "  |-- DvDRip"}
+    - {id: 10, cat: Movies/SD, desc: "  |-- DvDRip_Old"}
+    - {id: 11, cat: Movies/SD, desc: "  |-- Film_mp4"}
+    - {id: 12, cat: Movies/Foreign, desc: "  |-- Subbed"}
+    - {id: 52, cat: Movies/WEB-DL, desc: "  |-- WebRip"}
+    - {id: 23, cat: Books, desc: "Edicola"}
+    - {id: 66, cat: Audio/Audiobook, desc: "  |-- Audiobook"}
+    - {id: 25, cat: Books/EBook, desc: "  |-- Ebook"}
+    - {id: 24, cat: Books/Mags, desc: "  |-- Edicola"}
+    - {id: 54, cat: Audio/Lossless, desc: "Flac"}
+    - {id: 55, cat: Other/Misc, desc: "FutureCrew"}
+    - {id: 36, cat: Console, desc: "Games"}
+    - {id: 39, cat: Console/Other, desc: "  |-- N.Switch"}
+    - {id: 40, cat: Console/NDS, desc: "  |-- Nds"}
+    - {id: 41, cat: PC/Games, desc: "  |-- Pc"}
+    - {id: 42, cat: Console/PS3, desc: "  |-- Ps3"}
+    - {id: 43, cat: Console/PS4, desc: "  |-- Ps4"}
+    - {id: 44, cat: Console/Wii, desc: "  |-- Wii"}
+    - {id: 45, cat: Console/WiiU, desc: "  |-- Wii-U"}
+    - {id: 46, cat: Console/XBox, desc: "  |-- Xbox"}
+    - {id: 13, cat: Audio, desc: "Musica"}
+    - {id: 14, cat: Audio/Other, desc: "  |-- Compilation"}
+    - {id: 15, cat: Audio/MP3, desc: "  |-- Mp3"}
+    - {id: 65, cat: Audio/Video, desc: "  |-- Video Concerti"}
+    - {id: 26, cat: PC, desc: "Programmi Pc"}
+    - {id: 27, cat: PC/Mac, desc: "  |-- Mac"}
+    - {id: 28, cat: PC/0day, desc: "  |-- Windows"}
+    - {id: 47, cat: TV, desc: "Serie TV"}
+    - {id: 57, cat: TV/SD, desc: "  |-- S.TV Complete"}
+    - {id: 48, cat: TV/HD, desc: "  |-- Serie TV 1080p"}
+    - {id: 49, cat: TV/SD, desc: "  |-- Serie TV 264p"}
+    - {id: 50, cat: TV/HD, desc: "  |-- Serie TV 720p"}
+    - {id: 29, cat: Movies/UHD, desc: "UHD 4K"}
+    - {id: 51, cat: Other, desc: "Varie"}
+    - {id: 64, cat: Other, desc: "  |-- Torrent Free"}
+    - {id: 63, cat: Other, desc: "  |-- Video Corsi"}
+
+  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: sort
+    type: select
+    label: Sort requested from site
+    default: added
+    options:
+      added: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>40</b> on your account profile.
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  test:
+    path: index.php
+    selector: a[href*="/logout.php"]
+
+search:
+  paths:
+    - path: browse.php
+  inputs:
+    do: search
+    keywords: "{{ .Keywords }}"
+    # t_name, t_description, t_both, t_uploader, t_genre (not used)
+    search_type: t_name
+    category: 0 # multi cat search not supported
+    # yes, no
+    include_dead_torrents: yes
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+    # does not return imdb link in results
+
+  rows:
+    selector: table.sortable tbody tr:has(a[href*="/details.php?id="])
+
+  fields:
+    category:
+      selector: a[href*="/browse.php?category="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: category
+    title_default:
+      selector: a[href*="/details.php?id="]
+    title:
+      selector: div.tooltip-content > div
+      optional: true
+      default: "{{ .Result.title_default }}"
+    details:
+      selector: a[href*="/details.php?id="]
+      attribute: href
+    download:
+      selector: a[href*="/download.php?id="]
+      attribute: href
+    poster:
+      selector: div.tooltip-content > img
+      attribute: src
+    date:
+      selector: td:nth-child(2) > div:last-child
+      remove: span
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - 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:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# TS Special Edition v.8.0

src/Jackett.Common/Definitions/fuzer.yml

@@ -100,7 +100,8 @@ login:
   inputs:
     cookie: "{{ .Config.cookie }}"
   test:
-    path: browse.php
+    path: index.php
+    selector: a[href^="/login.php?do=logout&logouthash="]
 
 search:
   paths:

src/Jackett.Common/Definitions/gamera.yml

@@ -1,31 +1,32 @@
 ---
-id: lemonhd
-name: LemonHD
-description: "LemonHD is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
+id: gamera
+name: Gamera
+description: "Gamera (駕瞑羅) is a CHINESE Private Torrent Tracker for Japanese Monster and Superhero MOVIES / TV"
 language: zh-CN
 type: private
 encoding: UTF-8
 links:
-  - https://lemonhd.org/
-legacylinks:
-  - https://leaguehd.com/
+  - https://gamerapt.link/
 
 caps:
   categorymappings:
-    - {id: animate, cat: TV/Anime, desc: "动漫 Anime"}
-    - {id: doc, cat: TV/Documentary, desc: "纪录片 Documentary"}
-    - {id: movie, cat: Movies, desc: "电影 Movie"}
-    - {id: mv, cat: Audio/Video, desc: "MV Music Video"}
-    - {id: music, cat: Audio, desc: "音乐 Music"}
-    - {id: tv, cat: TV, desc: "剧集综艺 TV"}
-    - {id: other, cat: Other, desc: "艺术 Other"}
+    - {id: 410, cat: Movies, desc: "Monster怪兽"}
+    - {id: 410, cat: TV, desc: "Monster怪兽"}
+    - {id: 411, cat: Movies, desc: "Kamen Rider假面骑士"}
+    - {id: 411, cat: TV, desc: "Kamen Rider假面骑士"}
+    - {id: 412, cat: Movies, desc: "Ultraman奥特曼"}
+    - {id: 412, cat: TV, desc: "Ultraman奥特曼"}
+    - {id: 413, cat: Movies, desc: "Team战队"}
+    - {id: 413, cat: TV, desc: "Team战队"}
+    - {id: 414, cat: Movies, desc: "Other其他特摄"}
+    - {id: 414, cat: TV, desc: "Other其他特摄"}
+    - {id: 415, cat: Movies, desc: "Musical特摄音乐"}
+    - {id: 415, cat: TV, desc: "Musical特摄音乐"}
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, doubanid]
+    tv-search: [q, season, ep]
     movie-search: [q, imdbid, doubanid]
-    music-search: [q]
-    book-search: [q]
 
 settings:
   - name: cookie
@@ -42,12 +43,12 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: added
+    default: 4
     options:
-      added: created
-      seeders: seeders
-      size: size
-      name: title
+      4: created
+      7: seeders
+      5: size
+      1: title
   - name: type
     type: select
     label: Order requested from site
@@ -66,62 +67,73 @@ login:
     cookie: "{{ .Config.cookie }}"
   test:
     path: index.php
+    selector: a[href="logout.php"]
 
 search:
   paths:
     - path: torrents.php
-
-  allowEmptyInputs: true
   inputs:
-    # currently supports only one query id at one time.
+    $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 }}"
-    # name, imdb, douban
-    search_area: "{{ if .Query.IMDBID }}imdb{{ else }}{{ end }}{{ if .Query.DoubanID }}douban{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}name{{ end }}"
-    suggest: 0
-    column: "{{ .Config.sort }}"
-    sort: "{{ .Config.type }}"
-    $raw: "{{ if .Config.freeleech }}&free{{ 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
+    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(a[href^="download.php?"])
+    selector: table.torrents > tbody > tr:has(table.torrentname)
 
   fields:
     category:
-      selector: img[class^="cat_"]
-      attribute: class
+      selector: a[href^="?cat="]
+      attribute: href
       filters:
-        - name: regexp
-          args: "cat_(.+?)$"
+        - name: querystring
+          args: cat
     title_default:
-      selector: a[href^="details_"] > b
+      selector: a[href^="details.php?id="]
     title:
-      selector: a[title][href^="details_"]
+      selector: a[title][href^="details.php?id="]
       attribute: title
       optional: true
       default: "{{ .Result.title_default }}"
     details:
-      selector: a[href^="details_"]
+      selector: a[href^="details.php?id="]
       attribute: href
     download:
-      selector: a[href^="download.php?"]
+      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-last-child(7) > span[title]
+      selector: td.rowfollow:nth-last-of-type(5) > span[title]
       attribute: title
       optional: true
       filters:
         - name: append
-          args: " +08:00" # CST
+          args: " +08:00"
         - name: dateparse
           args: "yyyy-MM-dd HH:mm:ss zzz"
     date_added:
       # time added
-      selector: td:nth-last-child(7):not(:has(span[title])):not(:has(a))
+      selector: td.rowfollow:nth-last-of-type(5):not(:has(span))
       optional: true
       filters:
         - name: append
@@ -131,13 +143,13 @@ search:
     date:
       text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
     size:
-      selector: td:nth-last-child(6)
+      selector: td.rowfollow:nth-last-of-type(4)
     seeders:
-      selector: td:nth-last-child(5)
+      selector: td.rowfollow:nth-last-of-type(3)
     leechers:
-      selector: td:nth-last-child(4)
+      selector: td.rowfollow:nth-last-of-type(2)
     grabs:
-      selector: td:nth-last-child(3)
+      selector: td.rowfollow:nth-last-of-type(1)
     downloadvolumefactor:
       case:
         img.pro_free: 0
@@ -153,6 +165,8 @@ search:
         img.pro_2up: 2
         "*": 1
     description:
-      selector: a[href^="details_"]
+      selector: td:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP Standard v1.5 Beta 4 (customised)
+    minimumratio:
+      text: 0.2
+# NexusPHP KEMURIKUSA 2019-01-09

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

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

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

@@ -99,7 +99,8 @@ login:
   error:
     - selector: div.fixed_width:nth-child(4) > span:contains("Incorrect")
   test:
-    path: usercp.php
+    path: index.php
+    selector: a[href*="logout.php"]
 
 search:
   paths:

src/Jackett.Common/Definitions/gaytorrentru.yml

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

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

@@ -81,11 +81,10 @@ settings:
     type: info
     label: Reminder from GF-Free Admin
     default: "Attention users of third-party software like Jackett or Radarr, Sonarr or similar:<br>Despite your seed downloads you must physically connect to the web site with your browser or risk being <b>Banned for non-participation</b>...<br><ol>We ask :<li>Remain in seed at least 48 hours on the media to avoid H$R</li><li>And much more depending on your storage means</li><li>Participate in the life of the site shout forum...</li><li>Connect regularly to possibly read your private messages.</li></ol>"
+
 login:
   path: /api/torrents
   method: get
-  inputs:
-    api_token: "{{ .Config.apikey }}"
   error:
     - selector: a[href*="/login"]
       message:
@@ -93,15 +92,17 @@ login:
 
 search:
   paths:
-    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
     - path: "/api/torrents/filter"
       response:
         type: json
 
+  headers:
+    Authorization: ["Bearer {{ .Config.apikey }}"]
+
   inputs:
   # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
-    api_token: "{{ .Config.apikey }}"
     $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
     name: "{{ .Keywords }}"
     seasonNumber: "{{ .Query.Season }}"
@@ -152,13 +153,10 @@ search:
       selector: details_link
     download:
       selector: download_link
-    magnet:
-      selector: magnet_link
-      optional: true
     infohash:
       selector: info_hash
     poster:
-      selector: poster
+      selector: meta.poster
       filters:
         - name: replace
           args: ["https://via.placeholder.com/90x135", ""]
@@ -168,6 +166,13 @@ search:
       selector: tmdb_id
     tvdbid:
       selector: tvdb_id
+    genre:
+      selector: meta.genres
+      filters:
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
     files:
       selector: num_file
     seeders:
@@ -205,4 +210,4 @@ search:
     minimumseedtime:
       # 2 days (as seconds = 2 x 24 x 60 x 60)
       text: 172800
-# json UNIT3D 6.3.0
+# json UNIT3D 6.5.0

src/Jackett.Common/Definitions/gigatorrents.yml

@@ -93,7 +93,8 @@ login:
   error:
     - selector: div.box:has(div.title:contains("bejelentkez"))
   test:
-    path: torrentek.php
+    path: index.php
+    selector: a[href^="logout.php"]
 
 search:
   paths:

src/Jackett.Common/Definitions/gimmepeers.yml

@@ -104,7 +104,7 @@ search:
     type: "{{ .Config.type }}"
 
   rows:
-    selector: table.browsetable:not(:has(td.gp_sub_nav):contains("Top 20")) tbody tr:has(a[href^="download.php"])
+    selector: table.browsetable:not(:has(td.gp_sub_nav):contains("Top 25")) tbody tr:has(a[href^="download.php"])
 
   fields:
     category:

src/Jackett.Common/Definitions/gktorrent.yml

@@ -6,10 +6,11 @@ language: fr-FR
 type: public
 encoding: UTF-8
 followredirect: true
-# to fetch current domain use https://www.protege-liens.com/Gktorrent
+# to fetch current domain use https://www.protege-torrent.com/Gktorrent
 links:
-  - https://www.gktorrents.cc/
-  - https://gktorrent.nocensor.click/
+  - https://www.gktorrent.ac/
+  - https://gktorrent.nocensor.cloud/
+  - https://gktorrent.mrunblock.bond/
 legacylinks:
   - https://www.gktorrent.org/
   - https://www.gktorrent.me/
@@ -34,6 +35,8 @@ legacylinks:
   - https://gktorrent.nocensor.lol/
   - https://gktorrent.mrunblock.guru/
   - https://gktorrent.mrunblock.life/ # cloudflare 403
+  - https://gktorrent.nocensor.click/
+  - https://www.gktorrents.cc/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/glodls.yml

@@ -5,23 +5,17 @@ description: "GloDLS is a Public Torrent Tracker for MOVIES / TV / GENERAL"
 language: en-US
 type: public
 encoding: UTF-8
-followredirect: true
 links:
   - https://glodls.to/
-  - https://gtdb.cc/
   - https://www.gtdb.to/
-  - https://glotorrents.unblockit.asia/
-  - https://glotorrents.mrunblock.life/
+  - https://glotorrents.unblockit.esq/
+  - https://glotorrents.mrunblock.bond/
   - https://glodls.unblockninja.com/
-  - https://glotorrents.nocensor.click/
+  - https://glotorrents.nocensor.cloud/
 legacylinks:
   - https://glodls.rocks/
   - https://gtdb.to/
-  - https://glotorrents.unblockit.cam/
   - https://glotorrents.nocensor.biz/
-  - https://glotorrents.unblockit.day/
-  - https://glotorrents.unblockit.llc/
-  - https://glotorrents.unblockit.blue/
   - https://glotorrents.unblockit.name/
   - https://glotorrents.nocensor.sbs/
   - https://glotorrents.unblockit.ist/
@@ -38,6 +32,13 @@ legacylinks:
   - 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/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/greekteam.yml

@@ -12,65 +12,95 @@ legacylinks:
 
 caps:
   categorymappings:
-    - {id: 59, cat: TV/Anime, desc: "Anime DVD/BR-rip Gr Sub - Emb"}
-    - {id: 35, cat: TV/Anime, desc: "Anime DVDRip/BR-rip"}
-    - {id: 9, cat: TV/Anime, desc: "Anime HD"}
-    - {id: 63, cat: TV/Anime, desc: "Anime HDTV"}
-    - {id: 57, cat: TV/Anime, desc: "Anime TV"}
-    - {id: 10, cat: Books, desc: "Books Magazines"}
+    - {id: 9, cat: TV/Anime, desc: "Anime/Cartoon HD"}
+    - {id: 63, cat: TV/Anime, desc: "Anime/Cartoon HDTV"}
+    - {id: 35, cat: TV/Anime, desc: "Anime/Cartoon SD"}
+    - {id: 59, cat: TV/Anime, desc: "Anime/Cartoon SD Emb"}
+    - {id: 57, cat: TV/Anime, desc: "Anime/Cartoon TV"}
+    - {id: 46, cat: PC, desc: "Applications Linux"}
+    - {id: 45, cat: PC, desc: "Applications MAC"}
+    - {id: 23, cat: PC, desc: "Applications Windows"}
+    - {id: 10, cat: Books, desc: "Books/Magazines/English"}
+    - {id: 12, cat: Books, desc: "Books/Magazines/Greek"}
+    - {id: 8, cat: TV/Documentary, desc: "Documentaries"}
+    - {id: 5, cat: TV/Documentary, desc: "Documentaries Greek"}
+    - {id: 25, cat: TV/Documentary, desc: "Documentaries HD"}
+    - {id: 27, cat: Movies/DVD, desc: "Movies DVD-R"}
     - {id: 31, cat: Console/Other, desc: "Games Other"}
-    - {id: 30, cat: Console/PS4, desc: "Games PSx"}
     - {id: 20, cat: PC/Games, desc: "Games Windows"}
-    - {id: 29, cat: Console/XBox, desc: "Games XBOX"}
     - {id: 11, cat: Other, desc: "Misc"}
     - {id: 47, cat: PC/Mobile-Other, desc: "Mobile"}
-    - {id: 27, cat: Movies/DVD, desc: "Movies DVD-R"}
     - {id: 53, cat: Movies/3D, desc: "Movies 3D"}
     - {id: 15, cat: Movies/UHD, desc: "Movies 4K"}
     - {id: 18, cat: Movies/BluRay, desc: "Movies Bluray"}
-    - {id: 40, cat: Movies/HD, desc: "Movies DVD-rip x264"}
-    - {id: 60, cat: Movies/HD, desc: "Movies DVD-rip x264 Packages"}
-    - {id: 39, cat: Movies/SD, desc: "Movies DVD/BR-rip"}
-    - {id: 14, cat: Movies/SD, desc: "Movies DVD/BR-rip Gr Sub - Emb"}
-    - {id: 61, cat: Movies/SD, desc: "Movies DVD/BR-rip XviD Packs"}
-    - {id: 12, cat: Movies/SD, desc: "Movies Greek DVD/BRrip"}
+    - {id: 29, cat: Movies, desc: "Movies Emb Packs"}
     - {id: 19, cat: Movies/HD, desc: "Movies HD"}
-    - {id: 52, cat: Movies/HD, desc: "Movies HD Packages"}
+    - {id: 13, cat: Movies/HD, desc: "Movies HD Emb"}
+    - {id: 52, cat: Movies/HD, desc: "Movies HD Packs"}
+    - {id: 40, cat: Movies/SD, desc: "Movies SD"}
+    - {id: 14, cat: Movies/SD, desc: "Movies SD Emb"}
+    - {id: 60, cat: Movies/SD, desc: "Movies SD Packs"}
+    - {id: 22, cat: Audio, desc: "Music"}
+    - {id: 2, cat: Audio, desc: "Music Discographies"}
     - {id: 48, cat: Audio, desc: "Music DJ & Promos"}
-    - {id: 22, cat: Audio, desc: "Music Foreign"}
-    - {id: 2, cat: Audio, desc: "Music Foreign Discographies"}
-    - {id: 33, cat: Audio/Lossless, desc: "Music Foreign Flac"}
+    - {id: 33, cat: Audio/Lossless, desc: "Music Flac"}
     - {id: 1, cat: Audio, desc: "Music Greek"}
     - {id: 21, cat: Audio, desc: "Music Greek Discographies"}
     - {id: 50, cat: Audio/Lossless, desc: "Music Greek Flac"}
     - {id: 16, cat: Audio/Video, desc: "Music Videos"}
-    - {id: 46, cat: PC, desc: "Programs Linux"}
-    - {id: 45, cat: PC, desc: "Programs MAC"}
-    - {id: 23, cat: PC, desc: "Programs Windows"}
-    - {id: 8, cat: TV/Documentary, desc: "Documentaries Foreign"}
-    - {id: 25, cat: TV/Documentary, desc: "Documentaries Foreign HD"}
-    - {id: 5, cat: TV/Documentary, desc: "Documentaries Greek"}
-    - {id: 6, cat: TV/Sport, desc: "TV Sports"}
-    - {id: 54, cat: TV/Sport, desc: "TV Sports HD"}
-    - {id: 34, cat: TV/SD, desc: "TV Foreign Series"}
-    - {id: 7, cat: TV/SD, desc: "TV Foreign Series Emb"}
-    - {id: 36, cat: TV/HD, desc: "TV Foreign Series HD"}
-    - {id: 62, cat: TV/HD, desc: "TV Foreign Series HD Packages"}
-    - {id: 42, cat: TV/SD, desc: "TV Foreign Series Packages"}
+    - {id: 6, cat: TV/Sport, desc: "Sports"}
+    - {id: 54, cat: TV/Sport, desc: "Sports HD"}
     - {id: 55, cat: TV/SD, desc: "TV Greek Movies"}
     - {id: 49, cat: TV/HD, desc: "TV Greek Movies HD"}
-    - {id: 26, cat: TV/SD, desc: "TV Greek Other"}
     - {id: 3, cat: TV/SD, desc: "TV Greek Series"}
-    - {id: 44, cat: TV/SD, desc: "TV Greek Packages"}
+    - {id: 44, cat: TV/SD, desc: "TV Greek Packs"}
     - {id: 4, cat: TV/SD, desc: "TV Greek Shows"}
+    - {id: 34, cat: TV/SD, desc: "TV Series"}
+    - {id: 7, cat: TV/SD, desc: "TV Series Emb"}
+    - {id: 26, cat: TV/SD, desc: "TV Series Emb Packs"}
+    - {id: 36, cat: TV/HD, desc: "TV Series HD"}
+    - {id: 62, cat: TV/HD, desc: "TV  Series HD Packs"}
+    - {id: 42, cat: TV/SD, desc: "TV Series Packs"}
 
   modes:
     search: [q]
     tv-search: [q, season, ep]
-    movie-search: [q]
+    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: 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
+    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. The default is <i>25</i>.
+
 login:
   path: login.php
   method: post
@@ -82,16 +112,22 @@ login:
   error:
     - selector: td.embedded:has(h2:contains("failed"))
   test:
-    path: browse.php
+    path: index.php
+    selector: a[href="logout.php"]
 
 search:
   paths:
     - path: browse.php
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    incldead: 1
-    blah: 0
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 active, 1 incldead, 2 onlydead, 3 free (gold)
+    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
+    # 0 name, 1 descr, 2 uploader
+    blah: "{{ if .Query.IMDBID }}1{{ else }}0{{ end }}"
+    sort: "{{ .Config.sort }}"
+    d: "{{ .Config.type }}"
+    # does not show IMDB but can support searching with it in descriptions
 
   rows:
     selector: table.row1 > tbody > tr:has(a.torname)
@@ -133,10 +169,25 @@ search:
       selector: td:has(a[href$="filelist=1"]) ~ td ~ td ~ td ~ td ~ td ~ td
     leechers:
       selector: td:has(a[href$="filelist=1"]) ~ td ~ td ~ td ~ td ~ td ~ td ~ td
+      optional: true
+      default: 0
     downloadvolumefactor:
       case:
-        "img[src=\"pic/free.png\"]": 0
+        img[src="pic/free.png"]: 0
+        img[src="pic/freedownload.gif"]: 0 # freeleech slot exchange
+        img[src="pic/personal_free.png"]: 0 # applies to VIPs only
         "*": 1
     uploadvolumefactor:
-      text: 1
-# engine tbc
+      case:
+        img[src="pic/x2new.png"]: 0 # double uploaded with a freleech slot exchange
+        "*": 1
+    minimumratio:
+      case:
+        img[src="pic/hnrfree.png"]: 0 # exempt from H&R
+        img[src="pic/hnr-50.png"]: 0.5 # min ratio is 0.5
+        "*": 0.5 # rules say 0.3 but FAQ says 0.4 but H&R says 0.5 !#?
+    minimumseedtime:
+      case:
+        img[src="pic/hnrfree.png"]: 0 # exempt from H&R
+        "*": 432000 # 5 days (as seconds = 5 x 24 x 60 x 60)
+# engine n/a