wukong: add Chinese private tracker. resolves #14595 (#14596)

there isn't actually a 1 day MST for non-H&R torrents, but putting it at zero would then screw with ratios, as a global MR of 0.4 is still required

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
@@ -64,7 +64,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * EZTV
  * FileListing
  * FireBit
- * freshMeat
  * Frozen Layer
  * GamesTorrents
  * GkTorrent
@@ -98,6 +97,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 +113,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
@@ -160,23 +161,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
  * DXP (Deaf Experts)
  * Electro-Torrent
- * EliteTorrent-pl
  * EniaHD
  * Erai-Raws
  * Ex-torrenty
  * ExKinoRay
  * ExtremlymTorrents
- * Fenyarnyek-Tracker
  * File-Tracker
  * Gay-Torrents.net
  * Genesis-Movement
@@ -224,7 +221,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
@@ -260,7 +256,6 @@ 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
@@ -274,6 +269,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Best-Core
  * BeyondHD (BHD)
  * Bibliotik
+ * biho (必火pt)
  * Bit-Bázis
  * BIT-HDTV
  * Bitded
@@ -307,6 +303,7 @@ 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]](#)
@@ -321,6 +318,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * CrnaBerza
  * Dajiao (打胶) [![(invite needed)][inviteneeded]](#)
  * DANISH BYTES
+ * Darius Tracker
  * Dark-Shadow
  * DataScene (DS)
  * DataTalli
@@ -346,6 +344,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Fantastic Heaven
  * Fantastiko
  * Fappaizuri
+ * FastScene
  * Femdomcult
  * FileList (FL)
  * FinElite (FE)
@@ -365,7 +364,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * GiroTorrent
  * GreatPosterWall (GPW)
  * GreekDiamond
- * Greek Team [![(invite needed)][inviteneeded]](#)
+ * Greek Team
  * HaiDan
  * Haitang
  * HappyFappy
@@ -386,7 +385,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
@@ -396,6 +395,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDZone
  * Hebits
  * HHanClub
+ * HomePornTorrents (HPT)
  * House of Devil
  * HQMusic
  * iAnon
@@ -420,11 +420,12 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Kufirc
  * LastFiles
  * Le Saloon
+ * LaidBackManor
  * Lat-Team [![(invite needed)][inviteneeded]](#)
+ * Le-Cinephile
  * LearnBits
  * LearnFlakes
  * leech24
- * LemonHD
  * Les-Cinephiles
  * Lesbians4u
  * Libble
@@ -467,7 +468,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * OurBits (HDPter)
  * P2PBG
  * Panda
- * Partis
  * Party-Tracker
  * PassThePopcorn (PTP)
  * Peeratiko
@@ -494,7 +494,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Punk's Horror Tracker
  * PuntoTorrent
  * PuTao
- * Puur-Hollands
  * PWTorrents (PWT)
  * R3V WTF! [![(invite needed)][inviteneeded]](#)
  * Racing4Everyone (R4E)
@@ -508,11 +507,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * RetroFlix
  * RevolutionTT
  * Romanian Metal Torrents (RMT) [![(invite needed)][inviteneeded]](#)
- * RPTorrents
+ * Rousi
  * SceneHD [![(invite needed)][inviteneeded]](#)
  * SceneRush
  * SceneTime
- * SDBits [![(invite needed)][inviteneeded]](#)
  * Secret Cinema
  * SeedFile
  * Shadowflow (影) [![(invite needed)][inviteneeded]](#)
@@ -604,6 +602,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * White Angel
  * World-In-HD [![(invite needed)][inviteneeded]](#)
  * World-of-Tomorrow
+ * Wukong
  * x-ite.me (XM)
  * xBytesV2
  * XSpeeds (XS)

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

@@ -6,6 +6,8 @@ language: ru-RU
 type: private
 encoding: windows-1251
 links:
+  - https://tracker.0day.community/
+legacylinks:
   - https://tracker.0day.kiev.ua/
 
 caps:

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

@@ -13,14 +13,14 @@ links:
   - https://x1337x.ws/
   - https://x1337x.eu/
   - https://x1337x.se/
-  - https://1337x.unblockit.mov/
+  - https://1337x.unblockit.rsvp/
   - https://1337x.unblockninja.com/
+  - https://1337x.mrunblock.bond/
 legacylinks:
   - https://1337x.is/
   - https://1337x.nocensor.work/
   - https://1337x.nocensor.biz/
   - https://1337x.gd/
-  - https://1337x.unblockit.day/
   - https://1337x.unblockit.llc/
   - https://1337x.unblockit.blue/
   - https://1337x.unblockit.name/
@@ -41,6 +41,7 @@ legacylinks:
   - https://1337x.mrunblock.life/ # cloudflare 403
   - https://1337x.unblockit.click/
   - https://1337x.unblockit.asia/
+  - https://1337x.unblockit.mov/
 
 caps:
   categorymappings:
@@ -188,6 +189,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.4 2023-06-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

@@ -11,6 +11,7 @@ links:
 
 caps:
   categorymappings:
+    # special.php
     - {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}
@@ -19,7 +20,6 @@ caps:
     - {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}
@@ -29,9 +29,12 @@ caps:
     - {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: 409, cat: Other, desc: "Misc(其他)", default: true}
-    - {id: 526, cat: Movies, desc: "VRMovies(3D/VR电影)", default: false}
+    # torrents.php
-    - {id: 527, cat: TV, desc: "VRSeries(3D/VR剧集)", default: false}
+    - {id: 526, cat: Movies, desc: "3DMovies(3D电影)", default: false}
+    - {id: 527, cat: TV, desc: "3DSeries(3D剧集)", default: false}
+    - {id: 533, cat: Movies, desc: "VRMovies(VR电影)", default: false}
+    - {id: 534, cat: TV, desc: "VRSeries(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}
@@ -58,7 +61,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 +86,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
@@ -109,10 +116,10 @@ login:
 
 search:
   paths:
-    - path: torrents.php
-      categories: [401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 413, 420, 421, 422, 423, 424]
     - path: special.php
-      categories: [526, 527, 528, 529, 530, 531, 532]
+      categories: [401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 413, 420, 421, 422, 423, 424]
+    - path: torrents.php
+      categories: [526, 527, 533, 534, 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 }}"

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

@@ -47,7 +47,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 3Wmg Web Site. Otherwise just leave it empty."
   - name: freeleech
     type: checkbox
     label: Search freeleech only

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:

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

@@ -5,6 +5,8 @@ description: "Aftershock is a HUNGARIAN Private Torrent Tracker for MOVIES / GEN
 language: hu-HU
 type: private
 encoding: iso-8859-1
+certificates:
+  - b4950382d327e06126231edb455062842c717727 # expired 26 July 2023
 links:
   - https://aftershock-tracker.net/
 legacylinks:

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

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

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

@@ -8,7 +8,7 @@ encoding: UTF-8
 requestDelay: 5
 links:
   - https://badasstorrents.com/
-  - https://badasstorrents.mrunblock.life/
+  - https://badasstorrents.mrunblock.bond/
   - https://badasstorrents.nocensor.click/
 legacylinks:
   - https://badasstorrents.nocensor.work/
@@ -18,6 +18,7 @@ legacylinks:
   - https://badasstorrents.nocensor.lol/
   - https://badasstorrents.nocensor.art/
   - https://badasstorrents.mrunblock.guru/
+  - https://badasstorrents.mrunblock.life/
 
 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/biho.yml

@@ -0,0 +1,190 @@
+---
+id: biho
+name: biho
+description: "biho (必火pt) is a CHINESE Private site for MOVIES / TV / GENERAL"
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - https://www.biho.xyz/
+
+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: "MusicVideo/音乐视频"}
+    - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
+    - {id: 408, cat: Console, desc: "Games/游戏"}
+    - {id: 409, cat: PC, desc: "Software/软件"}
+    - {id: 410, cat: Books, desc: "Ebook/电子书"}
+    - {id: 411, cat: Other, desc: "Travel/旅游"}
+    - {id: 412, cat: Other, desc: "Misc/其他"}
+
+  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 biho 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
+  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(table.torrentname)
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    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-last-of-type(6) > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00"
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    date_added:
+      # time added
+      selector: td.rowfollow:nth-last-of-type(6):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-ddHH:mm:ss zzz"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td.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.0 2022-12-08

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: 85, cat: Movies/SD, desc: "Film/Cam", default: true}
-    - {id: 86, cat: Movies/SD, desc: "Film/Cam/Eng", default: true}
+    - {id: 15, cat: Movies/SD, desc: "Film/SD", default: true}
-    - {id: 15, cat: Movies/SD, desc: "Film/SD/Hun", default: true}
+    - {id: 17, cat: Movies/DVD, desc: "Film/DVD", default: true}
-    - {id: 16, cat: Movies/SD, desc: "Film/SD/Eng", default: true}
+    - {id: 83, cat: Movies/HD, desc: "Film/HD", default: true}
-    - {id: 17, cat: Movies/DVD, desc: "Film/DVD/Hun", default: true}
+    - {id: 94, cat: Movies/HD, desc: "Film/FHD", default: true}
-    - {id: 19, cat: Movies/DVD, desc: "Film/DVD/Eng", default: true}
+    - {id: 92, cat: Movies/UHD, desc: "Film/UHD", 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: 66, cat: XXX/ImageSet, desc: "XXX/Pics", default: false}
-    - {id: 33, cat: XXX/SD, desc: "SD/XXX", default: false}
+    - {id: 33, cat: XXX/SD, desc: "XXX/SD", default: false}
-    - {id: 89, cat: XXX/x264, desc: "HD/XXX", 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: 27, cat: Books/EBook, desc: "Könyv", 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: 31, cat: PC/Games, desc: "Játék", default: true}
-    - {id: 54, cat: Console, desc: "Játék/Konzol", default: true}
+    - {id: 81, cat: PC/0day, desc: "Program", 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: 97, cat: TV/Anime, desc: "Sorozat/Mese", default: true}
 
   modes:

src/Jackett.Common/Definitions/bithorlo.yml

@@ -84,7 +84,8 @@ settings:
 login:
   method: cookie
   test:
-    path: browse.php
+    path: index.php
+    selector: a[href="logout.php"]
 
 search:
   paths:

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

@@ -9,6 +9,7 @@ requestDelay: 2
 links:
   - https://bitsearch.to/
   - https://bitsearch.nocensor.click/
+  - https://bitsearch.mrunblock.bond/
 legacylinks:
   - https://bitsearch.nocensor.biz/
   - https://bitsearch.nocensor.sbs/

src/Jackett.Common/Definitions/btsow.yml

@@ -7,9 +7,8 @@ type: public
 encoding: UTF-8
 # use https://tellme.pw/btsow to find the new domain
 links:
-  - https://btsow.skin/
+  - https://btsow.makeup/
 legacylinks:
-  - https://btsow.shop/
   - https://btsow.us/
   - https://btsow.one/
   - https://btsow.rest/
@@ -24,6 +23,7 @@ legacylinks:
   - https://btsow.boats/
   - https://btsow.hair/
   - https://btsow.bond/
+  - https://btsow.skin/
 
 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,10 +6,10 @@ language: ru-RU
 type: public
 encoding: UTF-8
 links:
-  - https://byrutdb.org/
+  - https://byrut.org/
 legacylinks:
   - https://byrutor.org/
-  - https://byrut.org/
+  - https://byrutdb.org/
 
 caps:
   categorymappings:

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

@@ -79,6 +79,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

@@ -131,16 +131,16 @@ search:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
     files:
-      selector: td:nth-child(4)
+      selector: td:nth-child(5)
     date_day:
       # Today<br/>10:20 AM
       # Yesterday<br/>08:03 PM
-      selector: td:nth-child(6):contains("day")
+      selector: td:nth-child(7):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"))
+      selector: td:nth-child(7):not(:contains("day"))
       # auto adjusted by site account profile
       optional: true
       filters:
@@ -149,13 +149,13 @@ search:
     date:
       text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
     size:
-      selector: td:nth-child(7)
-    grabs:
       selector: td:nth-child(8)
-    seeders:
+    grabs:
       selector: td:nth-child(9)
-    leechers:
+    seeders:
       selector: td:nth-child(10)
+    leechers:
+      selector: td:nth-child(11)
     genre:
       selector: td:nth-child(2)
       remove: a, font

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

@@ -26,6 +26,7 @@ login:
     - selector: div.myContent:contains("Access Denied")
   test:
     path: index.php
+    selector: a[href="account-logout.php"]
 
 download:
   selectors:

src/Jackett.Common/Definitions/cpabien.yml

@@ -7,33 +7,8 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://cpasbiens911.fr/
+  - https://jardattraction.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,8 @@ legacylinks:
   - https://www.cpasbien-fr.nz/
   - https://vwwvwvwvvw.cpasbien-fr.nz/
   - https://cpasbiens3.fr/
+  - https://labastidevivante.fr/
+  - https://cpasbiens911.fr/
 
 caps:
   categories:

src/Jackett.Common/Definitions/dariustracker.yml

@@ -0,0 +1,177 @@
+---
+id: dariustracker
+name: Darius Tracker
+description: "Darius Tracker is a HUNGARIAN Private Tracker for MOVIES / TV / GENERAL"
+language: hu-HU
+type: private
+encoding: UTF-8
+links:
+  - https://dariustracker.hu/
+
+caps:
+  categorymappings:
+    - {id: 86, cat: Movies/SD, desc: "Film/Cam/XviD/Eng"}
+    - {id: 85, cat: Movies/SD, desc: "Film/Cam/XviD/Hun"}
+    - {id: 19, cat: Movies/DVD, desc: "Film/DVD-R/Eng"}
+    - {id: 17, cat: Movies/DVD, desc: "Film/DVD-R/Hun"}
+    - {id: 88, cat: XXX, desc: "Film/DVD/XXX"}
+    - {id: 62, cat: Movies/DVD, desc: "Film/DVD9/Hun"}
+    - {id: 82, cat: Movies/HD, desc: "Film/HD/Eng"}
+    - {id: 83, cat: Movies/HD, desc: "Film/HD/Hun"}
+    - {id: 89, cat: XXX, desc: "Film/HD/XXX"}
+    - {id: 48, cat: Movies/HD, desc: "Film/x264/Eng"}
+    - {id: 34, cat: Movies/HD, desc: "Film/x264/Hun"}
+    - {id: 16, cat: Movies/SD, desc: "Film/XviD/Eng"}
+    - {id: 15, cat: Movies/SD, desc: "Film/XviD/Hun"}
+    - {id: 64, cat: Movies/SD, desc: "Film/XviD/Pack"}
+    - {id: 70, cat: TV/Sport, desc: "Film/XviD/Sport"}
+    - {id: 33, cat: XXX, desc: "Film/XviD/XXX"}
+    - {id: 90, cat: Audio/Audiobook, desc: "Hangoskönyv"}
+    - {id: 31, cat: PC/Games, desc: "Játék/Pc/Iso"}
+    - {id: 29, cat: PC/Games, desc: "Játék/Pc/Rip"}
+    - {id: 54, cat: Console/PS3, desc: "Játék/PS2/PS3"}
+    - {id: 32, cat: Console/XBox, desc: "Játék/XBOX"}
+    - {id: 50, cat: Books, desc: "Könyv/Eng"}
+    - {id: 27, cat: Books, desc: "Könyv/Hun"}
+    - {id: 65, cat: Other, desc: "Képek"}
+    - {id: 66, cat: XXX, desc: "Képek/XXX"}
+    - {id: 71, cat: Audio/Lossless, desc: "Lossless/Eng"}
+    - {id: 84, cat: Audio/Lossless, desc: "Lossless/Hun"}
+    - {id: 68, cat: Movies/DVD, desc: "Mese/DVD"}
+    - {id: 69, cat: Movies/SD, desc: "Mese/XviD"}
+    - {id: 67, cat: PC/Mobile-Other, desc: "Mobiltelefon"}
+    - {id: 26, cat: Audio/MP3, desc: "Mp3/Eng"}
+    - {id: 25, cat: Audio/MP3, desc: "Mp3/Hun"}
+    - {id: 14, cat: PC, desc: "Program/Egyéb"}
+    - {id: 81, cat: PC/ISO, desc: "Program/Iso"}
+    - {id: 49, cat: PC, desc: "Program/Rip"}
+    - {id: 58, cat: TV, desc: "Sorozat/Eng"}
+    - {id: 22, cat: TV, desc: "Sorozat/Hun"}
+    - {id: 24, cat: Audio/Video, desc: "Videóklipp"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Filter freeleech only
+    default: false
+  - name: 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:
+      1: name
+      5: size
+      4: added
+      7: seeders
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: login.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: table[cellpadding="5"]:contains("Hiba")
+  test:
+    path: index.php
+    selector: a[href^="logout.php"]
+
+search:
+  paths:
+    # https://dariustracker.hu/browse.php?viewMode=&c68=1&c69=1&search=&incldead=1&sort=4&type=desc
+    - path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c[{{.}}]=1&{{end}}"
+    viewMode: ""
+    search: "{{ .Keywords }}"
+    # 0 active, 1 active and dead, 2 deadonly,  3 my torrents, 4 seedless
+    incldead: 1
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    # does not support imdbid searches
+
+  rows:
+    selector: "table[cellpadding=\"5\"] > tbody > tr > td > table[cellpadding=\"5\"] > tbody > tr:has(a[href^=\"download.php?torrent=\"]){{ if .Config.freeleech }}:has(img[src$=\"/arrowdown.png\"] ~ span:contains(\"0x\")){{ else }}{{ end }}"
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+      attribute: title
+      filters:
+        - name: re_replace
+          args: ["(?i)(Név: |Első név: -)|Második név: -", ""]
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?torrent="]
+      attribute: href
+    poster:
+      selector: a.preview
+      attribute: href
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    files:
+      selector: td:nth-last-child(7)
+    date:
+      selector: td:nth-last-child(5)
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    size:
+      selector: td:nth-last-child(4) b
+    grabs:
+      selector: td:nth-last-child(3)
+    seeders:
+      selector: td:nth-last-child(2)
+    leechers:
+      selector: td:nth-last-child(1)
+    downloadvolumefactor:
+      selector: img[src$="/arrowdown.png"] ~ span
+      filters:
+        - name: regexp
+          args: (\d+)
+    uploadvolumefactor:
+      selector: img[src$="/arrowup.png"] ~ span
+      filters:
+        - name: regexp
+          args: (\d+)
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# engine n/a

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:

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

@@ -10,13 +10,12 @@ links:
   - https://www.demonoid.is/
   - https://www.dnoid.to/
   - https://www.dnoid.pw/
-  - https://demonoid.unblockit.mov/
+  - https://demonoid.unblockit.rsvp/
   - https://demonoid.torrentbay.net/
-  - https://demonoid.mrunblock.life/
+  - https://demonoid.mrunblock.bond/
   - https://demonoid.nocensor.click/
 legacylinks:
   - https://demonoid.nocensor.biz/
-  - https://demonoid.unblockit.day/
   - https://demonoid.unblockit.llc/
   - https://demonoid.unblockit.blue/
   - https://demonoid.unblockit.name/
@@ -42,6 +41,8 @@ legacylinks:
   - https://demonoid.torrentbay.to/
   - https://demonoid.unblockit.click/
   - https://demonoid.unblockit.asia/
+  - https://demonoid.unblockit.mov/
+  - https://demonoid.mrunblock.life/
 
 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/diablotorrent.yml

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

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

@@ -23,6 +23,7 @@ caps:
     - {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"}
@@ -153,8 +154,6 @@ search:
 
   rows:
     selector: "table.sortable tr:has(a[href*=\"/download.php?id=\"]){{ if .Config.freeleech }}:has(img[src$=\"/freedownload.gif\"]){{ else }}{{ end }}"
-    filters:
-      - name: strdump
 
   fields:
     category:

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/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,13 +7,12 @@ type: public
 encoding: UTF-8
 links:
   - https://extratorrent.st/
-  - https://extratorrent.unblockit.mov/
+  - https://extratorrent.unblockit.rsvp/
-  - https://extratorrent.mrunblock.life/
+  - https://extratorrent.mrunblock.bond/
   - https://extratorrent.nocensor.click/
 legacylinks:
   - https://extratorrent.nocensor.work/
   - https://extratorrent.nocensor.biz/
-  - https://extratorrent.unblockit.day/
   - https://extratorrent.unblockit.llc/
   - https://extratorrent.unblockit.blue/
   - https://extratorrent.unblockit.name/
@@ -33,6 +32,8 @@ legacylinks:
   - https://extratorrent.mrunblock.guru/
   - https://extratorrent.unblockit.click/
   - https://extratorrent.unblockit.asia/
+  - https://extratorrent.unblockit.mov/
+  - https://extratorrent.mrunblock.life/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/eztv.yml

@@ -13,8 +13,8 @@ links:
   - https://eztv.yt/
   - https://eztv1.xyz/
   - https://eztv.unblockninja.com/
-  - https://eztv.unblockit.mov/
+  - https://eztv.unblockit.rsvp/
-  - https://eztv.mrunblock.life/
+  - https://eztv.mrunblock.bond/
   - https://eztv.nocensor.click/
 legacylinks:
   - https://eztv.ag/ # redirects to .re
@@ -22,7 +22,6 @@ legacylinks:
   - 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/
@@ -42,6 +41,8 @@ legacylinks:
   - https://eztv.mrunblock.guru/
   - https://eztv.unblockit.click/
   - https://eztv.unblockit.asia/
+  - https://eztv.unblockit.mov/
+  - https://eztv.mrunblock.life/
 
 caps:
   categories:

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

@@ -68,7 +68,8 @@ login:
   error:
     - selector: b:contains("The specified username or password was incorrect.")
   test:
-    path: account.php
+    path: index.php
+    selector: a[href="account-logout.php"]
 
 search:
   paths:
@@ -113,11 +114,12 @@ search:
     _language:
       selector: img[src*="images/languages/"]
       attribute: alt
+      optional: true
     description:
       selector: font[color="red"]
       filters:
         - name: append
-          args: " - {{ .Result._language }}"
+          args: "{{ if .Result._language }} - {{ .Result._language }}{{ else }}{{ end }}"
     size:
       selector: td:nth-child(4)
     seeders:
@@ -136,4 +138,7 @@ search:
         "*": 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,7 +7,7 @@ type: public
 encoding: UTF-8
 links:
   - https://filelisting.com/
-  - https://filelisting.mrunblock.life/
+  - https://filelisting.mrunblock.bond/
   - https://filelisting.nocensor.click/
 legacylinks:
   - https://filelisting.nocensor.biz/
@@ -16,6 +16,7 @@ legacylinks:
   - https://filelisting.nocensor.lol/
   - https://filelisting.nocensor.art/
   - https://filelisting.mrunblock.guru/
+  - https://filelisting.mrunblock.life/
 
 caps:
   categorymappings:

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

@@ -6,8 +6,6 @@ language: es-ES
 type: public
 encoding: UTF-8
 requestDelay: 2
-certificates:
-  - 1c5fd7a2e0464ac60f947eda247c2fe209768834 # expired 18 June 2023
 links:
   - https://www.frozen-layer.com/
 

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/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/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/generationfree-api.yml

@@ -81,6 +81,7 @@ 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
@@ -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/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://gktorrent.mrunblock.bond/
 legacylinks:
   - https://www.gktorrent.org/
   - https://www.gktorrent.me/

src/Jackett.Common/Definitions/glodls.yml

@@ -10,15 +10,14 @@ links:
   - https://glodls.to/
   - https://gtdb.cc/
   - https://www.gtdb.to/
-  - https://glotorrents.unblockit.mov/
+  - https://glotorrents.unblockit.rsvp/
-  - https://glotorrents.mrunblock.life/
+  - https://glotorrents.mrunblock.bond/
   - https://glodls.unblockninja.com/
   - https://glotorrents.nocensor.click/
 legacylinks:
   - https://glodls.rocks/
   - https://gtdb.to/
   - https://glotorrents.nocensor.biz/
-  - https://glotorrents.unblockit.day/
   - https://glotorrents.unblockit.llc/
   - https://glotorrents.unblockit.blue/
   - https://glotorrents.unblockit.name/
@@ -38,6 +37,8 @@ legacylinks:
   - https://glotorrents.mrunblock.guru/
   - https://glotorrents.unblockit.click/
   - https://glotorrents.unblockit.asia/
+  - https://glotorrents.unblockit.mov/
+  - https://glotorrents.mrunblock.life/
 
 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: 9, cat: TV/Anime, desc: "Anime/Cartoon HD"}
-    - {id: 35, cat: TV/Anime, desc: "Anime DVDRip/BR-rip"}
+    - {id: 63, cat: TV/Anime, desc: "Anime/Cartoon HDTV"}
-    - {id: 9, cat: TV/Anime, desc: "Anime HD"}
+    - {id: 35, cat: TV/Anime, desc: "Anime/Cartoon SD"}
-    - {id: 63, cat: TV/Anime, desc: "Anime HDTV"}
+    - {id: 59, cat: TV/Anime, desc: "Anime/Cartoon SD Emb"}
-    - {id: 57, cat: TV/Anime, desc: "Anime TV"}
+    - {id: 57, cat: TV/Anime, desc: "Anime/Cartoon TV"}
-    - {id: 10, cat: Books, desc: "Books Magazines"}
+    - {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: 29, cat: Movies, desc: "Movies Emb Packs"}
-    - {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: 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: 33, cat: Audio/Lossless, desc: "Music Flac"}
-    - {id: 2, cat: Audio, desc: "Music Foreign Discographies"}
-    - {id: 33, cat: Audio/Lossless, desc: "Music Foreign 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: 6, cat: TV/Sport, desc: "Sports"}
-    - {id: 45, cat: PC, desc: "Programs MAC"}
+    - {id: 54, cat: TV/Sport, desc: "Sports HD"}
-    - {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: 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 }}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    incldead: 1
+    # 0 active, 1 incldead, 2 onlydead, 3 free (gold)
-    blah: 0
+    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)
@@ -135,8 +171,21 @@ search:
       selector: td:has(a[href$="filelist=1"]) ~ td ~ td ~ td ~ td ~ td ~ td ~ td
     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
+      case:
-# engine tbc
+        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

src/Jackett.Common/Definitions/hdarea.yml

@@ -6,6 +6,8 @@ language: zh-CN
 type: private
 encoding: UTF-8
 links:
+  - https://www.hdarea.club/
+legacylinks:
   - https://www.hdarea.co/
 
 caps:
@@ -74,6 +76,7 @@ login:
     cookie: "{{ .Config.cookie }}"
   test:
     path: index.php
+    selector: a[href="usercp.php"]
 
 search:
   paths:

src/Jackett.Common/Definitions/hdchina.yml

@@ -12,32 +12,32 @@ legacylinks:
 
 caps:
   categorymappings:
-    - {id: 20, cat: Movies/BluRay, desc: "Movie Full BD"}
+    - {id: 20, cat: Movies/BluRay, desc: "Movie Full BD/原盘"}
-    - {id: 17, cat: Movies/HD, desc: "Movie 1080p"}
+    - {id: 17, cat: Movies/HD, desc: "Movie 1080p/电影"}
-    - {id: 16, cat: Movies/HD, desc: "Movie 1080i"}
+    - {id: 16, cat: Movies/HD, desc: "Movie 1080i/电影"}
-    - {id: 9, cat: Movies/HD, desc: "Movie 720p"}
+    - {id: 9, cat: Movies/HD, desc: "Movie 720p/电影"}
-    - {id: 13, cat: TV, desc: "EU/US TV series"}
+    - {id: 13, cat: TV, desc: "EU/US TV series/欧美剧"}
-    - {id: 25, cat: TV, desc: "Chinese TV series"}
+    - {id: 25, cat: TV, desc: "Chinese TV series/中港台剧集"}
-    - {id: 26, cat: TV, desc: "Kor Drama"}
+    - {id: 26, cat: TV, desc: "Kor Drama/韩剧"}
-    - {id: 24, cat: TV, desc: "Jpn Drama"}
+    - {id: 24, cat: TV, desc: "Jpn Drama/日剧"}
-    - {id: 21, cat: TV, desc: "EU/US TV series pack"}
+    - {id: 21, cat: TV, desc: "EU/US TV series pack/欧美剧集包"}
-    - {id: 22, cat: TV, desc: "Chinese TV series pack"}
+    - {id: 22, cat: TV, desc: "Chinese TV series pack/中港台剧集包"}
-    - {id: 23, cat: TV, desc: "JPN/KOR drama pack"}
+    - {id: 23, cat: TV, desc: "JPN/KOR drama pack/日韩剧集包"}
-    - {id: 27, cat: Movies/SD, desc: "iPad Video"}
+    - {id: 27, cat: Movies/SD, desc: "iPad Video/iPad视频"}
-    - {id: 5, cat: TV/Documentary, desc: "Documentary"}
+    - {id: 5, cat: TV/Documentary, desc: "Documentary/纪录片"}
-    - {id: 15, cat: TV/Sport, desc: "Sports"}
+    - {id: 15, cat: TV/Sport, desc: "Sports/体育节目"}
-    - {id: 14, cat: TV/Anime, desc: "Animation"}
+    - {id: 14, cat: TV/Anime, desc: "Animation/动画片"}
-    - {id: 401, cat: TV, desc: "TV Shows"}
+    - {id: 401, cat: TV, desc: "TV Shows/综艺"}
-    - {id: 402, cat: Audio, desc: "Vocal Concert"}
+    - {id: 402, cat: Audio, desc: "Vocal Concert/演唱会"}
-    - {id: 406, cat: Audio, desc: "Music Video"}
+    - {id: 406, cat: Audio, desc: "Music Video/MV"}
-    - {id: 408, cat: Audio, desc: "Music"}
+    - {id: 408, cat: Audio, desc: "Music/音乐"}
-    - {id: 19, cat: Audio, desc: "Audio Track"}
+    - {id: 19, cat: Audio, desc: "Audio Track/补充音轨"}
-    - {id: 405, cat: Audio, desc: "Drama"}
+    - {id: 405, cat: Audio, desc: "Drama/戏剧"}
-    - {id: 404, cat: Books, desc: "Book"}
+    - {id: 404, cat: Books, desc: "Book/书籍"}
-    - {id: 409, cat: Other, desc: "Other"}
+    - {id: 409, cat: Other, desc: "Other/其他"}
     - {id: 410, cat: Movies/HD, desc: "4K UltraHD"}
-    - {id: 411, cat: TV, desc: "Travel"}
+    - {id: 411, cat: TV, desc: "Travel/旅游"}
-    - {id: 412, cat: TV, desc: "Food"}
+    - {id: 412, cat: TV, desc: "Food/饮食"}
 
   modes:
     search: [q]
@@ -54,10 +54,6 @@ 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: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
   - name: info_tpp
     type: info
     label: Results Per Page
@@ -69,6 +65,7 @@ login:
     cookie: "{{ .Config.cookie }}"
   test:
     path: torrents.php
+    selector: a[href^="logout.php"]
 
 search:
   paths:
@@ -79,7 +76,7 @@ search:
     # 0=incldead, 1=active, 2=dead
     incldead: 0
     # 0=all, 1=normal, 2=free, 3=2x, 4=2x free, 5=50%, 6=2x 50%, 7=30%
-    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    spstate: 0
     # 0=title, 1=descr, 3=uploader, 4=imdb URL
     search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
     # 0=AND, 1=OR, 2=Exact
@@ -117,33 +114,30 @@ search:
       selector: td.t_torrents
     leechers:
       selector: td.t_leech
-    date:
+    date_elapsed:
-      selector: td.t_time
+      # time type: time elapsed (default)
+      selector: td.t_time > span[title]
+      attribute: title
+      optional: true
       filters:
-        - name: replace
-          args: ["时", " hours"]
-        - name: replace
-          args: ["分", " minutes"]
-        - name: replace
-          args: ["天", " days"]
-        - name: replace
-          args: ["年", " year"]
-        - name: replace
-          args: ["月", " months"]
         - name: append
-          args: " ago"
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    date_added:
+      # time added
+      selector: td.t_time: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 }}"
     downloadvolumefactor:
-      case:
+      # DLVF and ULVF are dynamically presented via javascript so not available to cardigann
-        img.pro_free: 0
+      text: 1
-        img.pro_free2up: 0
-        img.pro_50pctdown: 0.5
-        img.pro_50pctdown2up: 0.5
-        img.pro_30pctdown: 0.3
-        "*": 1
     uploadvolumefactor:
-      case:
+      text: 1
-        img.pro_50pctdown2up: 2
-        img.pro_free2up: 2
-        img.pro_2up: 2
-        "*": 1
 # NexusPHP 4e16128 (Customised)

src/Jackett.Common/Definitions/hdcztorrent.yml

@@ -30,6 +30,8 @@ caps:
     - {id: 91, cat: TV, desc: "Serial titulky"}
     - {id: 45, cat: TV, desc: "SERIALY CZ"}
     - {id: 81, cat: Movies, desc: "ORIGINAL JAZYK"}
+    # Animované
+    - {id: 47, cat: TV/Other, desc: "Animované"}
     # HUDBA
     - {id: 57, cat: Audio/Lossless, desc: "Hudba flac"}
     - {id: 58, cat: Audio/MP3, desc: "Hudba mp3"}
@@ -122,7 +124,7 @@ search:
     by: "{{ .Config.type }}"
 
   rows:
-    selector: td#mcol table.lista > tbody > tr:has(a[href^="magnet:?xt="])
+    selector: td#mcol table.lista > tbody > tr:has(a[href^="index.php?page=torrent_history"])
 
   fields:
     category:
@@ -139,29 +141,28 @@ search:
     download:
       selector: a[href^="download.php"]
       attribute: href
-    magnet:
-      selector: a[href^="magnet:?xt="]
-      attribute: href
     poster:
       selector: a[href^="index.php?page=torrent-details"]
       attribute: onmouseover
       filters:
         - name: regexp
           args: "src=(.+?) "
+        - name: replace
+          args: ["torrentimg/nocover.jpg", ""]
     date:
-      selector: td:nth-child(7)
+      selector: td:nth-child(6)
       # auto adjusted by site account profile
       filters:
         - name: dateparse
           args: "dd/MM/yyyy"
     size:
-      selector: td:nth-child(12)
-    seeders:
-      selector: td:nth-child(9)
-    leechers:
-      selector: td:nth-child(10)
-    grabs:
       selector: td:nth-child(11)
+    seeders:
+      selector: td:nth-child(8)
+    leechers:
+      selector: td:nth-child(9)
+    grabs:
+      selector: td:nth-child(10)
     downloadvolumefactor:
       case:
         img[src$="freeleech.gif"]: 0

src/Jackett.Common/Definitions/hdforever.yml

@@ -95,11 +95,11 @@ login:
     selector: a[href^="logout.php?auth="]
 
 search:
-  # https://hdf.world/torrents.php?groupname=blood&freetorrent=1&order_by=time&order_way=desc&action=advanced&searchsubmit=1
+  # https://hdf.world/torrents.php?searchstr=Un+Singe+en+hiver+1962&freetorrent=1&order_by=time&order_way=desc&action=advanced&searchsubmit=1
   path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
-    groupname: "{{ .Keywords }}"
+    searchstr: "{{ .Keywords }}"
     order_by: "{{ .Config.sort }}"
     order_way: "{{ .Config.type }}"
     action: advanced

src/Jackett.Common/Definitions/hdgalaktik.yml

@@ -86,7 +86,7 @@ login:
     selector: a[href="mybonus.php"]
 
 search:
-  # https://hdgalaktik.com/browse.php?search=&stype=0&s=0&cat=0&gr=0&kp=0&im=0&incldead=1&sort=0&type=desc
+  # https://www.trackerpmr.com/browse.php?search=&stype=0&s=0&cat=0&gr=0&kp=0&im=0&incldead=1&sort=0&type=desc
   paths:
     - path: browse.php
   inputs:
@@ -221,28 +221,39 @@ search:
       filters:
         - name: split
           args: ["|", 0]
-    date:
+    date_today:
-      # 1 day ago
+      # Сегодня в 18:22
-      selector: a[href^="browse.php?date="]
+      selector: a[href^="browse.php?date="]:contains("Сегодня")
+      optional: true
       filters:
-        # translations for Russian|Romanian|Ukrainian
+        - name: regexp
-        - name: re_replace
+          args: "(Сегодня в \\d{2}:\\d{2})"
-          args: ["(?i)\\b(назад|În urmă)\\b", "ago"]
+        - name: replace
-        - name: re_replace
+          args: ["Сегодня в", "Today"]
-          args: ["(?i)\\b(секунд(а|и|ы)?|secund(a|ă|e))\\b", "seconds"]
+        - name: fuzzytime
-        - name: re_replace
+    date_yday:
-          args: ["(?i)\\b(минуты?|minute?|хвилини?)\\b", "minutes"]
+      # Вчера в 20:52
-        - name: re_replace
+      selector: a[href^="browse.php?date="]:contains("Вчера")
-          args: ["(?i)\\b(час(а|ов)?|or(e|ă)|години?)\\b", "hours"]
+      optional: true
-        - name: re_replace
+      filters:
-          args: ["(?i)\\b(де?не?(ь|я|й|ів)|zi(le)?)\\b", "days"]
+        - name: regexp
-        - name: re_replace
+          args: "(Вчера в \\d{2}:\\d{2})"
-          args: ["(?i)\\b(недел(ю|и)|săptămân(ă|i)|тиж(день|ні))\\b", "weeks"]
+        - name: replace
-        - name: re_replace
+          args: ["Вчера в", "Yesterday"]
-          args: ["(?i)\\b(месяц(а|ев)?|lun(ă|i)|місяц(ь|я|ів))\\b", "months"]
+        - name: fuzzytime
-        - name: re_replace
+    date_year:
-          args: ["(?i)\\b(года?|an|р(ік|оки))\\b", "years"]
+      # 23:48 24/07
-        - name: timeago
+      selector: a[href^="browse.php?date="]:contains("/")
+      optional: true
+      filters:
+        - name: regexp
+          args: "(\\d{2}:\\d{2} \\d{2}/\\d{2})"
+        - name: append
+          args: " +03:00" # MSK
+        - name: dateparse
+          args: "HH:mm dd/MM zzz"
+    date:
+      text: "{{ if or .Result.date_year .Result.date_today .Result.date_yday }}{{ or .Result.date_year .Result.date_today .Result.date_yday }}{{ else }}now{{ end }}"
     downloadvolumefactor:
       case:
         img[src="/pic/freedownload.gif"]: 0

src/Jackett.Common/Definitions/hdhome.yml

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

src/Jackett.Common/Definitions/hdmayi.yml

@@ -6,7 +6,9 @@ language: zh-CN
 type: private
 encoding: UTF-8
 links:
-  - http://hdmayi.com/ # does not support https properly
+  - https://hdmayi.com/
+legacylinks:
+  - http://hdmayi.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/hdmonkey.yml

@@ -1,171 +0,0 @@
----
-id: hdmonkey
-name: HDMonkey
-description: "HDMonkey is a ROMANIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: ro-RO
-type: private
-encoding: UTF-8
-links:
-  - https://hdmonkey.org/
-
-caps:
-  categorymappings:
-    - {id: 6, cat: PC/0day, desc: "Apps: Windows"}
-    - {id: 7, cat: PC/Mac, desc: "Apps: Mac"}
-    - {id: 8, cat: PC, desc: "Apps: Linux"}
-    - {id: 75, cat: Movies/DVD, desc: "Movies: DVD"}
-    - {id: 26, cat: Movies/BluRay, desc: "Movies: Blu-Ray"}
-    - {id: 42, cat: Movies/HD, desc: "Movies: FHD-HD"}
-    - {id: 50, cat: Movies/WEB-DL, desc: "Movies: Web-Dl"}
-    - {id: 74, cat: Movies/SD, desc: "Movies: SD"}
-    - {id: 49, cat: Movies/UHD, desc: "Movies: 4k"}
-    - {id: 46, cat: Movies/3D, desc: "Movies: 3D"}
-    - {id: 24, cat: Movies, desc: "Movies: Packs"}
-    - {id: 28, cat: Movies, desc: "Movies: Cartoons"}
-    - {id: 47, cat: XXX, desc: "Movies: XXX"}
-    - {id: 41, cat: TV/HD, desc: "TV: HD"}
-    - {id: 52, cat: TV/WEB-DL, desc: "TV: WEB-DL"}
-    - {id: 48, cat: TV, desc: "TV: Packs"}
-    - {id: 9, cat: TV/Documentary, desc: "TV: Documentaries"}
-    - {id: 22, cat: Audio/MP3, desc: "Music: MP3"}
-    - {id: 23, cat: Audio/Lossless, desc: "Music: FLAC"}
-    - {id: 25, cat: Audio/Video, desc: "Music: Video"}
-    - {id: 27, cat: Audio, desc: "Music: Pack"}
-    - {id: 53, cat: PC/Games, desc: "Games: Pc"}
-    - {id: 54, cat: Console, desc: "Games: PsP"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
-    music-search: [q]
-#    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: id
-    options:
-      id: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_results
-    type: info
-    label: Search results
-    default: "If you are not getting results, then access the site with your browser and mark as read all PMs."
-
-login:
-  path: account-login.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: div.myBlock:contains("Access Denied")
-  test:
-    path: index.php
-    selector: a[href^="account-logout.php"]
-
-search:
-  paths:
-    - path: torrents-search.php
-  inputs:
-    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
-    # 0 both 1 local 2 external
-    inclexternal: 0
-    # 0 only active 1 incl dead 2 only dead
-    incldead: 1
-    # 0 all 1 not freeleech 2 only freeleech
-    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 all 1 english 2 french 3 german 4 italian 5 japanese 6 spanish 7 russian 8 other
-    sort: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
-    # can search for only one at a time of name, genre or imdbid
-
-  rows:
-    selector: table.ttable_headinner > tbody > tr
-
-  fields:
-    category:
-      selector: a[href^="torrents.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: a[href^="torrents-details.php?id="]
-      attribute: title
-    details:
-      selector: a[href^="torrents-details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    poster:
-      selector: a[href^="torrents-details.php?id="]:not(a[onmouseover*="images/nocover.png"])
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: src=([^\s]+)
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    size:
-      selector: td:nth-child(4)
-    date:
-      # 15.11.21<br>07:47
-      selector: td:nth-child(5)
-      # auto adjusted by site account profile
-      filters:
-        - name: dateparse
-          args: "d.MM.yyHH:mm"
-    grabs:
-      selector: td:nth-child(7)
-    seeders:
-      selector: td:nth-child(8)
-    leechers:
-      selector: td:nth-child(9)
-    genre:
-      selector: a:contains("Genre:")
-      filters:
-        - name: replace
-          args: ["Genre: ", ""]
-    _source:
-      case:
-        img[src="images/t_extern.png"]: External
-        "*": Local
-    description:
-      text: "{{ .Result._source }} - {{ .Result.genre }}"
-    downloadvolumefactor:
-      case:
-        img[src="images/t_extern.png"]: 0
-        img[src="images/free.png"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 1 day (as seconds = 24 x 60 x 60)
-      text: 86400
-# engine n/a

src/Jackett.Common/Definitions/hdpt.yml

@@ -0,0 +1,199 @@
+---
+id: hdpt
+name: HDPT
+description: "HDPT is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - https://hdpt.xyz/
+
+caps:
+  categorymappings:
+    - {id: 401, cat: Movies, desc: "Movies/电影"}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
+    - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
+    - {id: 402, cat: TV, desc: "TV Series/电视剧"}
+    - {id: 403, cat: TV, desc: "TV Shows/综艺"}
+    - {id: 406, cat: Audio/Video, desc: "Music Videos/音乐 视频"}
+    - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
+    - {id: 409, cat: Other, desc: "Misc/其他"}
+    - {id: 408, cat: Audio, desc: "HQ Audio/高清音轨"}
+    - {id: 410, cat: PC, desc: "Software/软件"}
+    - {id: 411, cat: Books/EBook, desc: "E-book/电子书"}
+    - {id: 412, cat: Books/Comics, desc: "Comics/漫画"}
+    - {id: 413, cat: Other/Misc, desc: "Learning/学习资料"}
+    - {id: 414, cat: Console, desc: "Games/游戏"}
+    - {id: 415, cat: Other/Misc, desc: "gallery/图库"}
+    - {id: 416, cat: Audio, desc: "Quyi/曲艺"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: 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 CarPT 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
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
+    incldead: 0
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ 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
+    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
+    minimumratio:
+      text: 1.0
+    description:
+      selector: td.rowfollow:nth-child(2)
+      remove: a, b, font, img, span
+# NexusPHP v1.7.38 2023-05-14

src/Jackett.Common/Definitions/hdroute.yml

@@ -36,6 +36,7 @@ login:
     - selector: :contains("密码错误")
   test:
     path: index.php
+    selector: a[href="logout.php"]
 
 search:
   paths:

src/Jackett.Common/Definitions/hdsky.yml

@@ -55,6 +55,7 @@ login:
     cookie: "{{ .Config.cookie }}"
   test:
     path: torrents.php
+    selector: a[href="logout.php"]
 
 download:
   method: post

src/Jackett.Common/Definitions/hdtime.yml

@@ -107,7 +107,7 @@ search:
     notnewword: 1
 
   rows:
-    selector: table.torrents > tbody > tr:has(a[href^="details.php?id="])
+    selector: table.torrents > tbody > tr:has(a[href^="download.php?id="])
 
   fields:
     category:
@@ -188,4 +188,4 @@ search:
     description:
       selector: td.rowfollow:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.8.4 2023-06-04
+# NexusPHP v1.8.5 2023-07-15

src/Jackett.Common/Definitions/hdvideo.yml

@@ -182,4 +182,4 @@ search:
     description:
       selector: td:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.8.1 2023-04-21
+# NexusPHP v1.8.4 2023-06-18

src/Jackett.Common/Definitions/hdzone.yml

@@ -7,6 +7,7 @@ type: private
 encoding: UTF-8
 links:
   - https://hdzone.me/
+  - https://hdfun.me/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/hhanclub.yml

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

src/Jackett.Common/Definitions/homeporntorrents.yml

@@ -0,0 +1,150 @@
+---
+id: homeporntorrents
+name: HomePornTorrents
+description: "HomePornTorrents (HPT) is a Private Torrent Tracker for Amateur 3X"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://www.homeporntorrents.club/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: XXX, desc: "Anal"}
+    - {id: 3, cat: XXX, desc: "Asian"}
+    - {id: 4, cat: XXX, desc: "BBW"}
+    - {id: 2, cat: XXX, desc: "BDSM"}
+    - {id: 31, cat: XXX, desc: "Big Boobs"}
+    - {id: 5, cat: XXX, desc: "Black"}
+    - {id: 7, cat: XXX, desc: "Creampie"}
+    - {id: 8, cat: XXX, desc: "Cumshot"}
+    - {id: 9, cat: XXX, desc: "Fetish"}
+    - {id: 32, cat: XXX, desc: "Fisting"}
+    - {id: 10, cat: XXX, desc: "Gangbang"}
+    - {id: 11, cat: XXX, desc: "Gay"}
+    - {id: 25, cat: XXX, desc: "Hardcore"}
+    - {id: 12, cat: XXX, desc: "Interracial"}
+    - {id: 13, cat: XXX, desc: "Latina"}
+    - {id: 14, cat: XXX, desc: "Lesbian"}
+    - {id: 26, cat: XXX, desc: "Masturbation"}
+    - {id: 15, cat: XXX, desc: "Mature"}
+    - {id: 16, cat: XXX, desc: "Oral"}
+    - {id: 19, cat: XXX, desc: "Other"}
+    - {id: 24, cat: XXX, desc: "Pictures"}
+    - {id: 27, cat: XXX, desc: "Pissing"}
+    - {id: 21, cat: XXX, desc: "Pregnant"}
+    - {id: 28, cat: XXX, desc: "Softcore"}
+    - {id: 22, cat: XXX, desc: "Squirt"}
+    - {id: 18, cat: XXX, desc: "Teen (18+)"}
+    - {id: 17, cat: XXX, desc: "Transsexual"}
+    - {id: 30, cat: XXX, desc: "VIP"}
+    - {id: 23, cat: XXX, desc: "Voyeur"}
+    - {id: 29, cat: XXX, desc: "Webcam"}
+
+  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: 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 User Settings. The default is <i>25</i>.
+
+login:
+  path: login.php
+  method: form
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    keeplogged: 1
+  error:
+    - selector: form#loginform > span.warning
+  test:
+    path: index.php
+    selector: "#nav_useredit"
+
+search:
+  paths:
+    # https://www.homeporntorrents.club/torrents.php?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}}"
+    searchtext: ""
+    title: "{{ .Keywords }}"
+    order_by: time
+    order_way: desc
+    action: advanced
+    filter_freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    filelist: ""
+    taglist: ""
+
+  rows:
+    # exclude redbar torrents
+    selector: table#torrent_table > tbody > tr[class^="torrent row"]
+
+  fields:
+    category:
+      selector: a[href*="filter_cat"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: \[(\d+?)\]
+    title:
+      selector: a[href^="torrents.php?id="]
+    details:
+      selector: a[href^="torrents.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="torrents.php?action=download&id="]
+      attribute: href
+    description:
+      selector: div.tags
+    poster:
+    # src=https:\/\/fapping.empornium.sx\/images\/2023\/05\/30\/MrLuckyPOV2023AlexisFawxXXX720pHEVCx265PRTmp4snapshot0950.jpg>
+      selector: td:nth-child(2) > script
+      filters:
+        - name: regexp
+          args: "src=(.*?)>"
+        - name: re_replace
+          args: ["\\\\(.)", "$1"]
+        - name: replace
+          args: ["/static/common/noartwork/noimage.png", ""]
+    files:
+      selector: td:nth-child(3)
+    date:
+      selector: td:nth-child(5) > span
+      attribute: title
+      filters:
+        # auto adjusted by site account profile
+        - name: append
+          args: " +00:00" # GMT
+        - 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:
+        span.icon[title*="Freeleech"]: 0
+        img[alt="Freeleech"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 0.7
+# Project Gazelle

src/Jackett.Common/Definitions/hqmusic.yml

@@ -55,6 +55,7 @@ login:
     - selector: form#loginform > span.warning
   test:
     path: torrents.php
+    selector: a[href^="logout.php?auth="]
 
 search:
   # http://hqmusic.info/ajax.php?artistname=John&groupname=Born&recordlabel=Sony&year=2012&filelist=Queen&freetorrent=&taglist=rock&tags_type=1&order_by=time&order_way=desc&filter_cat%5B1%5D=1&group_results=1&action=browse

src/Jackett.Common/Definitions/icc2022.yml

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

src/Jackett.Common/Definitions/ilcorsaronero.yml

@@ -10,7 +10,7 @@ requestDelay: 2
 links:
   - https://ilcorsaronero.link/
   - https://ilcorsaronero.torrentbay.net/
-  - https://ilcorsaronero.mrunblock.guru/
+  - https://ilcorsaronero.mrunblock.bond/
   - https://ilcorsaronero.nocensor.click/
 legacylinks:
   - https://ilcorsaronero.live/
@@ -35,6 +35,8 @@ legacylinks:
   - https://ilcorsaronero.torrentbay.to/
   - https://ilcorsaronero.fun/
   - https://ilcorsaronero.pro/
+  - https://ilcorsaronero.mrunblock.guru/
+  - https://ilcorsaronero.mrunblock.life/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/infire.yml

@@ -10,43 +10,79 @@ links:
 
 caps:
   categorymappings:
-    - {id: 14, cat: Movies/SD, desc: "XviD"}
+    # Filmi
-    - {id: 15, cat: Movies/HD, desc: "HD 720p"}
+    - {id: 14, cat: Movies/SD, desc: "Filmi XviD"}
-    - {id: 16, cat: Movies/HD, desc: "HD 1080p"}
+    - {id: 15, cat: Movies/HD, desc: "Filmi HD 720p"}
-    - {id: 17, cat: Movies/DVD, desc: "DVD"}
+    - {id: 16, cat: Movies/HD, desc: "Filmi HD 1080p"}
-    - {id: 18, cat: TV/Documentary, desc: "Dokumentarci"}
+    - {id: 20, cat: Movies/WEB-DL, desc: "Filmi WEB/Rip"}
-    - {id: 19, cat: Movies/DVD, desc: "DVD/R5"}
+    - {id: 21, cat: Movies/WEB-DL, desc: "Filmi WEB-DL 720p"}
-    - {id: 20, cat: Movies/WEB-DL, desc: "WEB/Rip"}
+    - {id: 49, cat: Movies/UHD, desc: "Filmi HD 2160p"}
-    - {id: 21, cat: Movies/WEB-DL, desc: "WEB-DL 720p"}
+    - {id: 50, cat: Movies/HD, desc: "Filmi BluRay 1080p"}
-    - {id: 32, cat: XXX, desc: "XXX"}
+    - {id: 51, cat: Movies/HD, desc: "Filmi 720p H265"}
-    - {id: 49, cat: Movies/UHD, desc: "HD 2160p"}
+    - {id: 52, cat: Movies/HD, desc: "Filmi 1080p H265"}
-    - {id: 50, cat: Movies/BluRay, desc: "BluRay 1080p"}
+    - {id: 55, cat: Movies/WEB-DL, desc: "Filmi WEB-DL 1080p"}
-    - {id: 51, cat: Movies/HD, desc: "720p H265"}
+    - {id: 71, cat: Movies/WEB-DL, desc: "Filmi WEB-DL 2160p"}
-    - {id: 52, cat: Movies/HD, desc: "1080p H265"}
+    - {id: 72, cat: Movies/HD, desc: "Filmi BluRay 720p"}
-    - {id: 55, cat: Movies/WEB-DL, desc: "WEB-DL 1080p"}
+    - {id: 73, cat: Movies/HD, desc: "Filmi BluRay Remux"}
+    - {id: 74, cat: Movies/UHD, desc: "Filmi UHD Remux"}
+    - {id: 77, cat: Movies/HD, desc: "Filmi DrSi"}
+    - {id: 97, cat: Movies/UHD, desc: "Filmi BluRay 2160p"}
+    # TV
     - {id: 23, cat: TV, desc: "TV"}
-    - {id: 24, cat: TV/HD, desc: "HD TV"}
+    - {id: 24, cat: TV/HD, desc: "TV HDTV 720p"}
-    - {id: 26, cat: TV/Anime, desc: "Animirano"}
+    - {id: 75, cat: TV/HD, desc: "TV HDTV 1080p"}
-    - {id: 28, cat: PC/Games, desc: "PC Igre"}
+    - {id: 76, cat: TV/WEB-DL, desc: "TV WEB/Rip"}
-    - {id: 29, cat: PC/Games, desc: "PC ISO Igre"}
+    - {id: 78, cat: TV/WEB-DL, desc: "TV WEB-DL 720p"}
-    - {id: 30, cat: Console/Other, desc: "GBA"}
+    - {id: 79, cat: TV/WEB-DL, desc: "TV WEB-DL 1080p"}
-    - {id: 31, cat: Console/PS3, desc: "PS2"}
+    - {id: 80, cat: TV/WEB-DL, desc: "TV WEB-DL 2160p"}
+    - {id: 81, cat: TV/HD, desc: "TV BluRay 720p"}
+    - {id: 82, cat: TV/HD, desc: "TV BluRay 1080p"}
+    # Risanke
+    - {id: 26, cat: Movies/Other, desc: "Animirano"}
+    - {id: 56, cat: TV/Anime, desc: "Anime"}
+    - {id: 93, cat: Movies/Other, desc: "SLOSiNH"}
+    # Igre
+    - {id: 29, cat: PC/Games, desc: "Igre PC ISO"}
+    - {id: 30, cat: Console/Wii, desc: "Igre Nintendo"}
+    - {id: 31, cat: Console/PS3, desc: "Igre Playstation"}
+    - {id: 34, cat: Console/XBox One, desc: "Igre Xbox"}
+    - {id: 83, cat: PC/Games, desc: "Igre Repack"}
+    # Glasba
+    - {id: 42, cat: Audio/Video, desc: "Music DVD"}
+    - {id: 43, cat: Audio/Video, desc: "Glasba Videospoti"}
     - {id: 53, cat: Audio/MP3, desc: "Glasba MP3"}
     - {id: 54, cat: Audio/Lossless, desc: "Glasba FLAC"}
-    - {id: 34, cat: Console/PS3, desc: "PS3"}
+    - {id: 62, cat: Audio/Video, desc: "Koncerti"}
-    - {id: 35, cat: Console/XBox, desc: "Xbox"}
+    # Sport
-    - {id: 36, cat: Console/PSP, desc: "PSP"}
     - {id: 37, cat: TV/Sport, desc: "Sport"}
-    - {id: 38, cat: PC, desc: "Programi"}
+    # XXX
+    - {id: 60, cat: XXX/Other, desc: "XXX Revije"}
+    - {id: 61, cat: XXX/Pack, desc: "XXX Packs"}
+    - {id: 66, cat: XXX/SD, desc: "XXX 480p"}
+    - {id: 67, cat: XXX/x264, desc: "XXX 720p"}
+    - {id: 68, cat: XXX/x264, desc: "XXX 1080p"}
+    - {id: 69, cat: XXX/UHD, desc: "XXX 2160p"}
+    - {id: 84, cat: XXX/ImageSet, desc: "XXX Slike"}
+    # Disc
+    - {id: 85, cat: Movies/DVD, desc: "DVD 5"}
+    - {id: 86, cat: Movies/DVD, desc: "DVD 9"}
+    - {id: 87, cat: Movies/BluRay, desc: "BD 25"}
+    - {id: 88, cat: Movies/BluRay, desc: "BD 50"}
+    - {id: 89, cat: Movies/BluRay, desc: "UHD 50"}
+    - {id: 90, cat: Movies/BluRay, desc: "UHD 66"}
+    - {id: 91, cat: Movies/BluRay, desc: "UHD 100"}
+    # Razno
+    - {id: 38, cat: PC/0day, desc: "Programi"}
     - {id: 39, cat: Books/EBook, desc: "eKnjige"}
     - {id: 40, cat: Other, desc: "Slike"}
     - {id: 41, cat: Audio/Audiobook, desc: "AudioBook"}
-    - {id: 42, cat: Audio/Video, desc: "Music DVD"}
-    - {id: 43, cat: TV/Other, desc: "Videospoti"}
     - {id: 44, cat: PC/Mobile-Android, desc: "Android"}
     - {id: 45, cat: PC/Mobile-iOS, desc: "iOS"}
     - {id: 46, cat: PC/Mac, desc: "Mac"}
-    - {id: 47, cat: PC, desc: "Linux"}
+    - {id: 47, cat: PC/ISO, desc: "Linux"}
+    # Dokumentarni
+    - {id: 95, cat: TV/Documentary, desc: "Dokumentarni Film"}
+    - {id: 96, cat: TV/Documentary, desc: "Dokumentarna Serija"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/insanetracker.yml

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

src/Jackett.Common/Definitions/internetarchive.yml

@@ -74,12 +74,14 @@ search:
       selector: response.numFound
 
   fields:
+    _id:
+      selector: identifier
     category:
       selector: mediatype
     title:
       selector: title
-    _id:
+      optional: true
-      selector: identifier
+      default: "Missing title for {{ .Result._id }}"
     details:
       text: "details/{{ .Result._id }}"
     download:

src/Jackett.Common/Definitions/jpopsuki.yml

@@ -66,7 +66,8 @@ login:
   error:
     - selector: form#loginform > span.warning, font[color="red"]
   test:
-    path: torrents.php
+    path: index.php
+    selector: a[href^="logout.php?auth="]
 
 search:
     # https://jpopsuki.eu/ajax.php?section=torrents&artistname=&action=advanced&torrentname=snow+man&remastertitle=&filelist=&bitrate=&format=&media=&year=&freeleech=&remastered=&searchtags=&tags_type=0&order_by=s3&order_way=desc&enablegrouping=1

src/Jackett.Common/Definitions/karagarga.yml

@@ -48,6 +48,7 @@ login:
     - selector: table:contains("Login unsuccessful")
   test:
     path: index.php
+    selector: a[href*="logout.php"]
 
 search:
   paths:

src/Jackett.Common/Definitions/korsar.yml

@@ -469,6 +469,7 @@ login:
     cookie: "{{ .Config.cookie }}"
   test:
     path: index.php
+    selector: a[href*="ucp.php?mode=logout"]
 
 search:
   headers:

src/Jackett.Common/Definitions/kufei.yml

@@ -196,4 +196,4 @@ search:
     description:
       selector: td:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.8.4 2023-06-13
+# NexusPHP v1.8.5 2023-07-22

src/Jackett.Common/Definitions/laidbackmanor.yml

@@ -0,0 +1,154 @@
+---
+id: laidbackmanor
+name: LaidBackManor (API)
+description: "LaidBackManor (LBM) is a Private site for MOVIES / TV / GENERAL"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://laidbackmanor.xyz/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Movie"}
+    - {id: 2, cat: TV, desc: "TV"}
+    - {id: 3, cat: Audio, desc: "Music"}
+    - {id: 4, cat: Console, desc: "Game"}
+    - {id: 5, cat: PC, desc: "Application"}
+    - {id: 6, cat: Books, desc: "Books"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
+    movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://laidbackmanor.xyz/\" target=\"_blank\">LaidBackManor</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: created_at
+    options:
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: /api/torrents
+  method: get
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
+search:
+  paths:
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    - path: "/api/torrents/filter"
+      response:
+        type: json
+
+  headers:
+    Authorization: ["Bearer {{ .Config.apikey }}"]
+
+  inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
+    name: "{{ .Keywords }}"
+    seasonNumber: "{{ .Query.Season }}"
+    episodeNumber: "{{ .Query.Ep }}"
+    imdbId: "{{ .Query.IMDBIDShort }}"
+    tmdbId: "{{ .Query.TMDBID }}"
+    tvdbId: "{{ .Query.TVDBID }}"
+    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
+  rows:
+    selector: data
+    attribute: attributes
+
+  fields:
+    category:
+      selector: category_id
+    title:
+      selector: name
+    details:
+      selector: details_link
+    download:
+      selector: download_link
+    poster:
+      selector: poster
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/90x135", ""]
+    imdbid:
+      selector: imdb_id
+    tmdbid:
+      selector: tmdb_id
+    tvdbid:
+      selector: tvdb_id
+    files:
+      selector: num_file
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    date:
+      # "created_at": "2021-10-18T00:34:50.000000Z" is returned by Newtonsoft.Json.Linq as 18/10/2021 00:34:50
+      selector: created_at
+      filters:
+        - name: append
+          args: " +00:00" # GMT
+        - name: dateparse
+          args: "MM/dd/yyyy HH:mm:ss zzz"
+    size:
+      selector: size
+    downloadvolumefactor:
+      # api returns 0%, 25%, 50%, 75%, 100%
+      selector: freeleech
+      case:
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
+    uploadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: double_upload
+      case:
+        0: 1 # normal
+        1: 2 # double
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# json UNIT3D 6.4.1

src/Jackett.Common/Definitions/lastfiles.yml

@@ -105,10 +105,9 @@ login:
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
-    submitme: Login
+    submitme: Login!
     use_ssl: 1
-    perm_ssl: 2
+    perm_ssl: 1
-    returnto: /
   error:
     - selector: td.embedded:contains("Login failed")
   test:

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

@@ -90,7 +90,7 @@ search:
     imdbId: "{{ .Query.IMDBIDShort }}"
     tmdbId: "{{ .Query.TMDBID }}"
     tvdbId: "{{ .Query.TVDBID }}"
-    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    free[]: "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
@@ -188,4 +188,4 @@ search:
     minimumseedtime:
       # 2 days (as seconds = 2 x 24 x 60 x 60)
       text: 172800
-# json UNIT3D 6.4.1
+# json UNIT3D 6.5.0

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

@@ -0,0 +1,241 @@
+---
+id: le-cinephile
+name: Le-Cinephile
+description: "Le-Cinephile is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: fr-FR
+type: private
+encoding: UTF-8
+links:
+  - https://le-cinephile.de/
+
+caps:
+  categorymappings:
+    # FILM
+    - {id: 2, cat: Movies/DVD, desc: "FILM DVD"}
+    - {id: 101, cat: TV/Documentary, desc: "FILM Documentaire"}
+    - {id: 75, cat: Movies/UHD, desc: "FILM 2160 P"}
+    - {id: 63, cat: Movies/WEB-DL, desc: "FILM WEB"}
+    - {id: 62, cat: Movies/WEB-DL, desc: "FILM WEB"}
+    - {id: 66, cat: Movies/HD, desc: "FILM HDRip"}
+    - {id: 34, cat: Movies/SD, desc: "FILM TVRip"}
+    - {id: 33, cat: Movies/SD, desc: "FILM HDTV"}
+    - {id: 31, cat: Movies/Other, desc: "FILM MUET"}
+    - {id: 30, cat: Movies/Foreign, desc: "FILM VOST"}
+    - {id: 29, cat: Movies/SD, desc: "FILM VHS"}
+    - {id: 28, cat: Movies/HD, desc: "FILM 720"}
+    - {id: 27, cat: Movies/HD, desc: "FILM BDRip"}
+    - {id: 26, cat: Movies/BluRay, desc: "FILM BluRay"}
+    - {id: 25, cat: Movies/BluRay, desc: "FILM ISO"}
+    - {id: 4, cat: Movies/HD, desc: "FILM 1080"}
+    - {id: 104, cat: Movies, desc: "FILM DVDRip"}
+    # SERIE
+    - {id: 9, cat: TV/SD, desc: "SERIE DVD"}
+    - {id: 102, cat: TV/Documentary, desc: "SERIE Documentaire"}
+    - {id: 72, cat: TV/UHD, desc: "SERIE 2160 P"}
+    - {id: 65, cat: TV/SD, desc: "SERIE HDRip"}
+    - {id: 21, cat: TV/HD, desc: "SERIE HDTV.1080p"}
+    - {id: 20, cat: TV/HD, desc: "SERIE HDTV.720p"}
+    - {id: 19, cat: TV/SD, desc: "SERIE HDTV"}
+    - {id: 17, cat: TV/SD, desc: "SERIE VHS"}
+    - {id: 16, cat: TV/SD, desc: "SERIE TVRip"}
+    - {id: 15, cat: TV/WEB-DL, desc: "SERIE WEB.1080p"}
+    - {id: 14, cat: TV/WEB-DL, desc: "SERIE WEB.720p"}
+    - {id: 12, cat: TV/WEB-DL, desc: "SERIE WEB"}
+    - {id: 105, cat: TV, desc: "SERIE Pack"}
+    # LOGICIELS
+    - {id: 56, cat: PC/ISO, desc: "LOGICIELS Linux"}
+    - {id: 24, cat: PC/Mac, desc: "LOGICIELS Apple"}
+    - {id: 58, cat: PC/0day, desc: "LOGICIELS Windows"}
+    # EBOOK
+    - {id: 44, cat: Books/Mags, desc: "EBOOK Journaux"}
+    - {id: 46, cat: Books/Technical, desc: "EBOOK Documents"}
+    - {id: 48, cat: XXX/Other, desc: "EBOOK XXX"}
+    - {id: 49, cat: Books/EBook, desc: "EBOOK Livres"}
+    # MUSIC
+    - {id: 5, cat: Audio/Video, desc: "MUSIC clip video"}
+    # JEUX
+    - {id: 96, cat: PC/Games, desc: "JEUX Apple"}
+    - {id: 8, cat: Console/PS3, desc: "JEUX PS3"}
+    - {id: 45, cat: PC/Games, desc: "JEUX PC"}
+
+  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: FRENCH
+    options:
+      FRENCH: FRENCH
+      MULTI.FRENCH: MULTI.FRENCH
+      ENGLISH: ENGLISH
+      MULTI.ENGLISH: MULTI.ENGLISH
+      VOSTFR: VOSTFR
+      MULTI.VOSTFR: MULTI.VOSTFR
+  - name: vostfr
+    type: checkbox
+    label: Replace VOSTFR with ENGLISH
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: added
+    options:
+      added: created
+      seeds: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: countdown
+    type: info
+    label: Countdown Timer
+    default: "This site is a Tracker based on Time: to keep your account the time must not be at 0000-00-00-00-00-00. Read <a href=\"https://le-cinephile.de/faq.php\" target=\"_blank\">Le-Cinephile FAQ</a> on how to keep the timer active."
+  - name: registration
+    type: info
+    label: Registration Confirmation
+    default: After you register you will receive a confirmation email that contains a link to activate your account. If you have not received it check your Junk mail / Spam mail folder.
+
+login:
+  path: login.php
+  method: form
+  form: form[action="/login.php"]
+  cookies: ["JAVA=OK"] # avoid jscheck redirect
+  captcha:
+    type: image
+    selector: img[src^="cap/captcha_math.php?codeCaptcha="]
+    input: stringCaptcha
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: div#login_error
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+download:
+  before:
+    path: ajax_det_poll.php
+    method: post
+    inputs:
+      set_thanks: Merci
+      det_id: "{{ .DownloadUri.Query.id }}"
+      ajax: yes
+  selectors:
+    - selector: a[href^="download.php?torrent="]
+      attribute: href
+
+search:
+  paths:
+    - path: selection.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # 0 name, 1 descr, 2 both
+    blah: 0
+    orderby: "{{ .Config.sort }}"
+    sort: "{{ .Config.type }}"
+
+  rows:
+    selector: "div.selection_wrap"
+
+  fields:
+    category_p1:
+      selector: div.kat_cat_pic_name
+    category_p2:
+      selector: div.kat_cat_pic_name_b
+    categorydesc:
+      text: "{{ .Result.category_p1 }} {{ .Result.category_p2 }}"
+    title_phase1:
+      selector: a.selection_a
+    title_multilang:
+      text: "{{ .Result.title_phase1 }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)([\\s|\\.|-]multi[\\s|\\.|-])", ".{{ .Config.multilanguage }}."]
+    title_phase2:
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
+    title_vostfr:
+      text: "{{ .Result.title_phase2 }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)([\\s|\\.|-]vostfr[\\s|\\.|-])", ".ENGLISH."]
+        - name: re_replace
+          args: ["(?i)([\\s|\\.|-]subfrench[\\s|\\.|-])", ".ENGLISH."]
+    title:
+      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
+    details:
+      selector: a.selection_a
+      attribute: href
+    download:
+      selector: a.selection_a
+      attribute: href
+    poster:
+      selector: div[id^="details"] img
+      attribute: src
+    size:
+      selector: div.selection_unter_ad
+    grabs:
+      selector: div.selection_unter_ae
+    date_day:
+      # Aujourd'hui à 13:30:04
+      # Hier à 09:10:10
+      selector: div.selection_unter_ab:not(:contains("."))
+      optional: true
+      filters:
+        - name: replace
+          args: ["Aujourd'hui à", "Today"]
+        - name: replace
+          args: ["Hier à", "Yesterday"]
+        - name: append
+          args: " +01:00" # CET
+    date_year:
+      # Le 30.02.2018 à 23:12:50
+      selector: div.selection_unter_ab:contains(".")
+      optional: true
+      filters:
+        - name: replace
+          args: ["Le ", ""]
+        - name: replace
+          args: [" à", ""]
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "dd.MM.yyyy HH:mm:ss zzz"
+    date:
+      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+    seeders:
+      selector: div.selection_unter_aa
+    leechers:
+      selector: div.selection_unter_aaa
+    downloadvolumefactor:
+      text: 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 60 hours (as seconds = 60 x 60 x 60)
+      text: 216000
+# 3xT