hdcztorrent: update cats & row selector

x-ite.me: add cert exception
aftershock: remove old cert exception
2025-09-12 23:14:08 +02:00 · 2023-09-10 00:18:42 +01:00 · 2023-09-09 23:47:47 +01:00 · 2023-09-09 23:47:29 +01:00 · 2023-09-10 06:56:39 +12:00 · 2023-09-10 04:44:48 +12:00
128 changed files with 2240 additions and 2458 deletions
--- a/.github/ISSUE_TEMPLATE/indexer-request.yml
+++ b/.github/ISSUE_TEMPLATE/indexer-request.yml
@@ -36,13 +36,13 @@ body:
      - Name: TrackerX
      - URL: https://trackerx.yz
      - Description: TrackerX is a Private Torrent Tracker for Movies, TV, and e-Learning
-      - Minimum Seeding Time and Minimum Ratio (if Private): MST 24hrs, MR 1.0
+      - Minimum Seeding Time and/or Minimum Seeding Ratio (if Private): MST 24hrs, MR 1.0
      - Additional Comments: IMDB search has to be enabled in account settings, often has hcaptcha at login
    value: |
      - Name: 
      - URL: 
      - Description: 
-      - Minimum Seeding Time and Minimum Ratio (if Private): 
+      - Minimum Seeding Time and/or Minimum Seeding Ratio (if Private): 
      - Additional Comments: 
    render: markdown
  validations:
--- a/.github/workflows/winget.yml
+++ b/.github/workflows/winget.yml
@@ -6,7 +6,7 @@ permissions:
  contents: read
 jobs:
  publish:
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
    steps:
      - uses: vedantmgoyal2009/winget-releaser@v2
        with:
--- a/README.md
+++ b/README.md
@@ -63,7 +63,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * ExtraTorrent.st
 * EZTV
 * FileListing
- * FireBit
 * Frozen Layer
 * GamesTorrents
 * GkTorrent
@@ -190,7 +189,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Masters-TB
 * Mazepa
 * Metal Tracker
- * Moviesite
 * MovieWorld (Flicker)
 * MuseBootlegs (MB)
 * MVGroup Forum
@@ -269,7 +267,6 @@ 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
@@ -305,7 +302,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * CHDBits [![(invite needed)][inviteneeded]](#)
 * cheggit
 * ChileBT
- * CiNEFiLHD
 * Cinemageddon [![(invite needed)][inviteneeded]](#)
 * CinemaMovieS_ZT
 * Cinematik [![(invite needed)][inviteneeded]](#)
@@ -318,10 +314,8 @@ 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
 * DesiTorrents
 * Diablo Torrent [![(invite needed)][inviteneeded]](#)
 * DICMusic
@@ -341,24 +335,24 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * ExtremeTorrents
 * Falkon Vision Team
 * FANO.IN [![(invite needed)][inviteneeded]](#)
- * Fantastic Heaven
 * Fantastiko
 * Fappaizuri
 * FastScene
 * Femdomcult
 * FileList (FL)
- * FinElite (FE)
+ * FinElite (FE) [![(invite needed)][inviteneeded]](#)
 * FinVip
 * Flux-Zone
 * Free Farm (自由农场)
 * FunFile (FF)
 * FunkyTorrents (FT)
+ * FutureTorrent [![(invite needed)][inviteneeded]](#)
 * Fuzer (FZ)
- * GainBound [![(invite needed)][inviteneeded]](#)
+ * Gamera (駕瞑羅)
 * Gay-Torrents.org
 * GAYtorrent.ru
 * GazelleGames (GGn)
- * Generation-Free
+ * Generation-Free [![(invite needed)][inviteneeded]](#)
 * GigaTorrents
 * GimmePeers (formerly ILT)
 * GiroTorrent
@@ -394,6 +388,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * HDVIDEO
 * HDZone
 * Hebits
+ * HellasHut
 * HHanClub
 * HomePornTorrents (HPT)
 * House of Devil
@@ -442,7 +437,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Mansão dos Animes (MDAN)
 * MegamixTracker
 * MeseVilág (Fairytale World)
- * MetalGuru
+ * MetalGuru [![(invite needed)][inviteneeded]](#)
 * Milkie
 * MIRcrew
 * MMA-Torrents [![(invite needed)][inviteneeded]](#)
@@ -464,12 +459,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Old Toons World
 * OpenCD [![(invite needed)][inviteneeded]](#)
 * Orpheus
+ * OnlyEncodes
 * OshenPT
+ * Ostwiki
 * OurBits (HDPter)
 * P2PBG
 * Panda
 * Party-Tracker
- * PassThePopcorn (PTP)
 * Peeratiko
 * Peers.FM
 * PigNetwork
@@ -484,24 +480,27 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Pretome
 * PrivateHD (PHD)
 * ProAudioTorrents (PAT)
+ * PT分享站 (itzmx)
+ * PTCafe
 * PTChina (铂金学院)
 * PTerClub
 * PTFiles (PTF)
 * PThome [![(invite needed)][inviteneeded]](#)
- * PT分享站 (itzmx)
+ * PTLSP
 * PTSBAO
 * PTtime
 * Punk's Horror Tracker
 * PuntoTorrent
 * PuTao
 * PWTorrents (PWT)
- * R3V WTF! [![(invite needed)][inviteneeded]](#)
+ * R3V WTF!
 * Racing4Everyone (R4E)
 * RacingForMe (RFM)
 * RareShare2
 * Red Star Torrent (RST) [![(invite needed)][inviteneeded]](#)
 * Redacted (PassTheHeadphones)
 * RedBits
+ * Red Leaves [![(invite needed)][inviteneeded]](#)
 * ReelFlix
 * Resurrect The Net
 * RetroFlix
@@ -526,7 +525,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * SpeedCD
 * Speedmaster HD [![(invite needed)][inviteneeded]](#)
 * SpeedTorrent Reloaded
- * SpiderTK
 * Spirit of Revolution [![(invite needed)][inviteneeded]](#)
 * SportHD
 * SportsCult
@@ -540,7 +538,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * TeamHD
 * TeamOS
 * TEKNO3D [![(invite needed)][inviteneeded]](#)
- * TellyTorrent
 * teracod (Movie Zone)
 * The Falling Angels (TFA)
 * The Geeks
@@ -583,6 +580,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * TorrentSeeds (TS)
 * TotallyKids (TK)
 * ToTheGlory (TTG) [![(invite needed)][inviteneeded]](#)
+ * TrackerMK
 * TranceTraffic
 * TreZzoR [![(invite needed)][inviteneeded]](#)
 * TurkSeed
@@ -597,9 +595,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * UnionGang
 * UnleashTheCartoons
 * UnlimitZ
- * Uploads
 * UTOPIA
 * White Angel
+ * WinterSakura
 * World-In-HD [![(invite needed)][inviteneeded]](#)
 * World-of-Tomorrow
 * Wukong
--- a/src/Jackett.Common/Definitions/1337x.yml
+++ b/src/Jackett.Common/Definitions/1337x.yml
@@ -5,7 +5,6 @@ description: "1337X is a Public torrent site that offers verified torrent downlo
 language: en-US
 type: public
 encoding: UTF-8
-followredirect: true
 requestDelay: 2
 links:
  - https://1337x.to/
@@ -13,16 +12,15 @@ links:
  - https://x1337x.ws/
  - https://x1337x.eu/
  - https://x1337x.se/
-  - https://1337x.unblockit.rsvp/
-  - https://1337x.unblockninja.com/
+  - https://1337x.so/
+  - https://1337x.unblockit.esq/
+  - https://1337x.ninjaproxy1.com/
  - https://1337x.mrunblock.bond/
 legacylinks:
  - https://1337x.is/
  - https://1337x.nocensor.work/
  - https://1337x.nocensor.biz/
  - https://1337x.gd/
-  - https://1337x.unblockit.llc/
-  - https://1337x.unblockit.blue/
  - https://1337x.unblockit.name/
  - https://1337x.nocensor.sbs/
  - https://1337x.unblockit.ist/
@@ -42,6 +40,9 @@ legacylinks:
  - https://1337x.unblockit.click/
  - https://1337x.unblockit.asia/
  - https://1337x.unblockit.mov/
+  - https://1337x.unblockit.rsvp/
+  - https://1337x.unblockninja.com/
+  - https://1337x.unblockit.vegas/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/1ptbar.yml
+++ b/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.4 2023-06-18
+# NexusPHP v1.8.6 2023-08-18
--- a/src/Jackett.Common/Definitions/2xfree.yml
+++ b/src/Jackett.Common/Definitions/2xfree.yml
@@ -1,52 +1,29 @@
 ---
 id: 2xfree
 name: 2xFree
-description: "2xFree is a CHINESE Private Torrent Tracker for HD MOVIES / TV / GENERAL"
+description: "2xFree is a CHINESE Private Torrent Tracker for 3D MOVIES / TV"
 language: zh-CN
 type: private
 encoding: UTF-8
-requestDelay: 2
 links:
  - https://pt.2xfree.org/

 caps:
  categorymappings:
-    # 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}
-    - {id: 404, cat: TV/Documentary, desc: "Documentaries(纪录片)", default: true}
-    - {id: 405, cat: TV/Anime, desc: "Animations(动画)", default: true}
-    - {id: 406, cat: Audio/Video, desc: "Music Videos(MV)", default: true}
-    - {id: 407, cat: TV/Sport, desc: "Sports(体育运动)", default: true}
-    - {id: 408, cat: Audio, desc: "HQ Audio(音乐)", default: true}
-    - {id: 410, cat: Books, desc: "eBook(电子书)", default: true}
-    - {id: 411, cat: PC/Games, desc: "PCGame(游戏)", default: true}
-    - {id: 413, cat: Audio/Video, desc: "AV(无码)", default: true}
-    - {id: 414, cat: Audio/Video, desc: "AV(有码)", default: true}
-    - {id: 420, cat: XXX, desc: "HAnime(H动画)", default: true}
-    - {id: 421, cat: XXX, desc: "HComic(H漫画)", default: true}
-    - {id: 422, cat: XXX, desc: "HGame(H游戏)", default: true}
-    - {id: 423, cat: XXX, desc: "IV(写真影片)", default: true}
-    - {id: 424, cat: XXX, desc: "IV(写真图集)", default: true}
-    - {id: 409, cat: Other, desc: "Misc(其他)", default: true}
+
    # torrents.php
-    - {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}
-    - {id: 531, cat: PC/Games, desc: "PCVRGame(PCVR游戏)", default: false}
-    - {id: 532, cat: Other, desc: "VRTools(VR工具软件)", default: false}
+    - {id: 526, cat: Movies, desc: "3DMovies(3D电影)"}
+    - {id: 527, cat: TV, desc: "3DSeries(3D剧集)"}
+    - {id: 533, cat: Movies, desc: "VRMovies(VR电影)"}
+    - {id: 534, cat: TV, desc: "VRSeries(VR剧集)"}
+    - {id: 530, cat: Console, desc: "VRGame(VR一体机游戏)"}
+    - {id: 531, cat: PC/Games, desc: "PCVRGame(PCVR游戏)"}
+    - {id: 532, cat: Other, desc: "VRTools(VR工具软件)"}

  modes:
    search: [q]
    tv-search: [q, season, ep, imdbid, doubanid]
    movie-search: [q, imdbid, doubanid]
-    music-search: [q]
-    book-search: [q]

 settings:
  - name: username
@@ -116,10 +93,7 @@ login:

 search:
  paths:
-    - path: special.php
-      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 }}"
@@ -213,11 +187,8 @@ search:
        img.pro_2up: 2
        "*": 1
    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 1 day (as seconds = 24 x 60 x 60)
-      text: 86400
+      text: 0.8
    description:
      selector: td.rowfollow:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP v1.8.2 2023-05-08
+# NexusPHP v1.8.6 2023-06-18
--- a/src/Jackett.Common/Definitions/3dtorrents.yml
+++ b/src/Jackett.Common/Definitions/3dtorrents.yml
@@ -42,6 +42,10 @@ settings:
  - name: password
    type: password
    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Filter freeleech only
+    default: false
  - name: sort
    type: select
    label: Sort requested from site
@@ -95,7 +99,7 @@ search:
    by: "{{ .Config.type }}"

  rows:
-    selector: table[cellspacing!="1"].lista > tbody > tr:has(a[href^="index.php?page=torrents&category="])
+    selector: "table[cellspacing!=\"1\"].lista > tbody > tr:has(a[href^=\"index.php?page=torrents&category=\"]){{ if .Config.freeleech }}:has(img[src=\"images/sign_free.png\"]){{ else }}{{ end }}"

  fields:
    category:
@@ -106,7 +110,6 @@ search:
          args: category
        - name: re_replace
          args: ["(\\b0\\b)", "31"]
-
    title:
      selector: a[href^="index.php?page=torrent-details&id="]
    details:
@@ -147,6 +150,7 @@ search:
      default: 0
    downloadvolumefactor:
      case:
+        img[src="images/sign_free.png"]: 0
        img[src="images/50off.png"]: 0.5
        "*": 1
    uploadvolumefactor:
--- a/src/Jackett.Common/Definitions/3wmg.yml
+++ b/src/Jackett.Common/Definitions/3wmg.yml
@@ -141,6 +141,14 @@ search:
    download:
      selector: a[href^="download.php?id="]
      attribute: href
+    imdbid:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    doubanid:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
+      selector: a[href*="movie.douban.com/subject/"]
+      attribute: href
    date_elapsed:
      # time type: time elapsed (default)
      selector: td.rowfollow:nth-child(4) > span[title]
@@ -189,4 +197,4 @@ search:
    description:
      selector: td.rowfollow:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP v1.6.0-beta12 2020-06-23
+# NexusPHP v1.8.5 2023-07-29
--- a/src/Jackett.Common/Definitions/aftershock.yml
+++ b/src/Jackett.Common/Definitions/aftershock.yml
@@ -5,8 +5,6 @@ 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:
--- a/src/Jackett.Common/Definitions/anthelion-api.yml
+++ b/src/Jackett.Common/Definitions/anthelion-api.yml
@@ -108,7 +108,7 @@ search:
      optional: true
      filters:
        - name: trim
-    title:
+    title_optional:
      selector: title
      filters:
        - name: htmldecode
@@ -155,4 +155,11 @@ search:
    minimumseedtime:
      # 3 day (as seconds = 3 x 24 x 60 x 60)
      text: 259200
+    _filename:
+      selector: "files[0].name"
+      filters:
+        - name: htmldecode
+      optional: true
+    title:
+      text: "{{ if and (eq .Result.files \"1\") (.Result._filename) }}{{ .Result._filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
 # json api
--- a/src/Jackett.Common/Definitions/badasstorrents.yml
+++ b/src/Jackett.Common/Definitions/badasstorrents.yml
@@ -9,7 +9,7 @@ requestDelay: 5
 links:
  - https://badasstorrents.com/
  - https://badasstorrents.mrunblock.bond/
-  - https://badasstorrents.nocensor.click/
+  - https://badasstorrents.nocensor.cloud/
 legacylinks:
  - https://badasstorrents.nocensor.work/
  - https://badasstorrents.nocensor.biz/
@@ -19,6 +19,7 @@ legacylinks:
  - https://badasstorrents.nocensor.art/
  - https://badasstorrents.mrunblock.guru/
  - https://badasstorrents.mrunblock.life/
+  - https://badasstorrents.nocensor.click/

 caps:
  categories:
--- a/src/Jackett.Common/Definitions/bitbazis.yml
+++ b/src/Jackett.Common/Definitions/bitbazis.yml
@@ -11,30 +11,30 @@ links:

 caps:
  categorymappings:
-    - {id: 85, cat: Movies/SD, desc: "Film/Cam", default: true}
-    - {id: 15, cat: Movies/SD, desc: "Film/SD", default: true}
-    - {id: 17, cat: Movies/DVD, desc: "Film/DVD", default: true}
-    - {id: 83, cat: Movies/HD, desc: "Film/HD", default: true}
-    - {id: 94, cat: Movies/HD, desc: "Film/FHD", default: true}
-    - {id: 92, cat: Movies/UHD, desc: "Film/UHD", default: true}
-    - {id: 22, cat: TV, desc: "Sorozat/Hun", default: true}
-    - {id: 58, cat: TV, desc: "Sorozat/Eng", default: true}
-    - {id: 64, cat: Movies, desc: "Film/Pack", default: true}
-    - {id: 66, cat: XXX/ImageSet, desc: "XXX/Pics", default: false}
-    - {id: 33, cat: XXX/SD, desc: "XXX/SD", default: false}
-    - {id: 89, cat: XXX/x264, desc: "XXX/HD", default: false}
+    - {id: 85, cat: Movies/SD, desc: "Film-Cam", default: true}
+    - {id: 15, cat: Movies/SD, desc: "Film-SD", default: true}
+    - {id: 17, cat: Movies/DVD, desc: "Film-DVD", default: true}
+    - {id: 83, cat: Movies/HD, desc: "Film-HD", default: true}
+    - {id: 94, cat: Movies/HD, desc: "Film-FHD", default: true}
+    - {id: 92, cat: Movies/UHD, desc: "Film-UHD", default: true}
+    - {id: 22, cat: TV, desc: "Sorozat-Hun", default: true}
+    - {id: 58, cat: TV, desc: "Sorozat-Eng", default: true}
+    - {id: 64, cat: Movies, desc: "Film-Pack", default: true}
+    - {id: 66, cat: XXX/ImageSet, desc: "XXX-Pics", default: false}
+    - {id: 33, cat: XXX/SD, desc: "XXX-SD", default: false}
+    - {id: 89, cat: XXX/x264, desc: "XXX-HD", default: false}
    - {id: 24, cat: Audio/Video, desc: "Videóklip", default: true}
    - {id: 70, cat: Audio/Audiobook, desc: "Hangoskönyv", default: true}
    - {id: 27, cat: Books/EBook, desc: "Könyv", default: true}
-    - {id: 69, cat: TV/Anime, desc: "Mese/SD", default: true}
-    - {id: 91, cat: TV/Anime, desc: "Mese/HD", default: true}
-    - {id: 25, cat: Audio/MP3, desc: "Mp3/Hun", default: true}
-    - {id: 26, cat: Audio/MP3, desc: "Mp3/Eng", default: true}
-    - {id: 84, cat: Audio/Lossless, desc: "Lossless/Hun", default: true}
-    - {id: 71, cat: Audio/Lossless, desc: "Lossless/Eng", default: true}
+    - {id: 69, cat: TV/Anime, desc: "Mese-SD", default: true}
+    - {id: 91, cat: TV/Anime, desc: "Mese-HD", default: true}
+    - {id: 25, cat: Audio/MP3, desc: "Mp3-Hun", default: true}
+    - {id: 26, cat: Audio/MP3, desc: "Mp3-Eng", default: true}
+    - {id: 84, cat: Audio/Lossless, desc: "FLAC-Hun", default: true}
+    - {id: 71, cat: Audio/Lossless, desc: "FLAC-Eng", default: true}
    - {id: 31, cat: PC/Games, desc: "Játék", default: true}
    - {id: 81, cat: PC/0day, desc: "Program", default: true}
-    - {id: 14, cat: PC, desc: "Program/Egyéb", default: true}
+    - {id: 14, cat: PC, desc: "Program-Egyéb", default: true}
    - {id: 97, cat: TV/Anime, desc: "Sorozat/Mese", default: true}

  modes:
@@ -109,8 +109,11 @@ search:

  fields:
    categorydesc:
-      selector: img[src^="pic/kategoria/"]
-      attribute: title
+      selector: td[class^="catpic_"]
+      attribute: class
+      filters:
+        - name: replace
+          args: ["catpic_", ""]
    title:
      selector: font[class="tori"], a.preview
    _id:
@@ -141,7 +144,7 @@ search:
      # 2 napja  és 10 órája
      # 1 hete  és 1 napja
      # 1 éve  és 30 hete
-      selector: td[id^="t_added"] > span
+      selector: span.ellenorzes
      filters:
        - name: replace
          args: ["és ", " "]
@@ -157,11 +160,17 @@ search:
          args: ["éve", "year"]
        - name: timeago
    grabs:
-      selector: td:nth-child(5)
+      selector: td.letoltok
+      optional: true
+      default: 0
    seeders:
-      selector: td:nth-child(3)
+      selector: td.seeders
+      optional: true
+      default: 0
    leechers:
-      selector: td:nth-child(4)
+      selector: td.leechers
+      optional: true
+      default: 0
    genre:
      selector: span[style="font-size:small;"]
    description:
--- a/src/Jackett.Common/Definitions/bithorlo.yml
+++ b/src/Jackett.Common/Definitions/bithorlo.yml
@@ -39,7 +39,7 @@ caps:
    - {id: 20, cat: Other, desc: "Képek"}
    - {id: 21, cat: PC/Mobile-Other, desc: "Mobil"}
    # Program
-    - {id: 22, cat: PC/0day, desc: "Win/Program/ISO"}
+    - {id: 54, cat: PC/0day, desc: "Win/Program/ISO"}
    - {id: 23, cat: PC/0day, desc: "Win/Program/Rip"}
    # Felnőtt tartalom
    - {id: 9, cat: XXX, desc: "XXX/Film"}
--- a/src/Jackett.Common/Definitions/bitsearch.yml
+++ b/src/Jackett.Common/Definitions/bitsearch.yml
@@ -8,7 +8,7 @@ encoding: UTF-8
 requestDelay: 2
 links:
  - https://bitsearch.to/
-  - https://bitsearch.nocensor.click/
+  - https://bitsearch.nocensor.cloud/
  - https://bitsearch.mrunblock.bond/
 legacylinks:
  - https://bitsearch.nocensor.biz/
@@ -17,6 +17,7 @@ legacylinks:
  - https://bitsearch.nocensor.lol/
  - https://bitsearch.mrunblock.guru/
  - https://bitsearch.mrunblock.life/ # This web property is not accessible via this address.
+  - https://bitsearch.nocensor.click/

 caps:
  categories:
@@ -107,8 +108,9 @@ search:
      filters:
        - name: regexp
          args: ([A-F|a-f|0-9]{40})
-    grabs:
-      selector: div.stats div:has(img[alt="Download"])
+    grabs_dot:
+      selector: div.stats div:has(img[alt="Download"]):contains(".")
+      optional: true
      filters:
        - name: replace
          args: [".", ""]
@@ -116,10 +118,41 @@ search:
          args: ["K", "00"]
        - name: replace
          args: ["M", "00000"]
+    grabs_nodot:
+      selector: div.stats div:has(img[alt="Download"]):not(:contains("."))
+      optional: true
+      filters:
+        - name: replace
+          args: ["K", "000"]
+        - name: replace
+          args: ["M", "000000"]
+    grabs:
+      text: "{{ if or .Result.grabs_dot .Result.grabs_nodot }}{{ or .Result.grabs_dot .Result.grabs_nodot }}{{ else }}0{{ end }}"
    size:
      selector: div.stats div:has(img[alt="Size"])
+    seeders_dot:
+      selector: div.stats div:has(img[alt="Seeder"]):contains(".")
+      optional: true
+      filters:
+        - name: replace
+          args: [".", ""]
+        - name: replace
+          args: ["K", "00"]
+        - name: replace
+          args: ["M", "00000"]
+    seeders_nodot:
+      selector: div.stats div:has(img[alt="Seeder"]):not(:contains("."))
+      optional: true
+      filters:
+        - name: replace
+          args: ["K", "000"]
+        - name: replace
+          args: ["M", "000000"]
    seeders:
-      selector: div.stats div:has(img[alt="Seeder"])
+      text: "{{ if or .Result.seeders_dot .Result.seeders_nodot }}{{ or .Result.seeders_dot .Result.seeders_nodot }}{{ else }}0{{ end }}"
+    leechers_dot:
+      selector: div.stats div:has(img[alt="Leecher"]):contains(".")
+      optional: true
      filters:
        - name: replace
          args: [".", ""]
@@ -127,15 +160,16 @@ search:
          args: ["K", "00"]
        - name: replace
          args: ["M", "00000"]
+    leechers_nodot:
+      selector: div.stats div:has(img[alt="Leecher"]):not(:contains("."))
+      optional: true
+      filters:
+        - name: replace
+          args: ["K", "000"]
+        - name: replace
+          args: ["M", "000000"]
    leechers:
-      selector: div.stats div:has(img[alt="Leecher"])
-      filters:
-        - name: replace
-          args: [".", ""]
-        - name: replace
-          args: ["K", "00"]
-        - name: replace
-          args: ["M", "00000"]
+      text: "{{ if or .Result.leechers_dot .Result.leechers_nodot }}{{ or .Result.leechers_dot .Result.leechers_nodot }}{{ else }}0{{ end }}"
    date:
      selector: div.stats div:has(img[alt="Date"])
      filters:
--- a/src/Jackett.Common/Definitions/btsow.yml
+++ b/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.makeup/
+  - https://btsow.homes/
 legacylinks:
-  - https://btsow.us/
  - https://btsow.one/
  - https://btsow.rest/
  - https://btsow.bar/
@@ -24,6 +23,7 @@ legacylinks:
  - https://btsow.hair/
  - https://btsow.bond/
  - https://btsow.skin/
+  - https://btsow.makeup/

 caps:
  categories:
--- a/src/Jackett.Common/Definitions/byrutor.yml
+++ b/src/Jackett.Common/Definitions/byrutor.yml
@@ -6,10 +6,11 @@ language: ru-RU
 type: public
 encoding: UTF-8
 links:
-  - https://byrut.org/
+  - https://thebyrut.org/
 legacylinks:
  - https://byrutor.org/
  - https://byrutdb.org/
+  - https://byrut.org/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/chdbits.yml
+++ b/src/Jackett.Common/Definitions/chdbits.yml
@@ -6,6 +6,8 @@ language: zh-CN
 type: private
 encoding: UTF-8
 links:
+  - https://ptchdbits.co/
+legacylinks:
  - https://chdbits.co/

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

 caps:
  categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 59, cat: PC/0day, desc: "Apps: Movies: Misc"}
+    - {id: 55, cat: PC/0day, desc: "Apps: Graphics Editing GNU/Linux"}
+    - {id: 53, cat: PC/0day, desc: "Apps: Apps DVD/Blu-Ray Copy Mac"}
+    - {id: 57, cat: PC/0day, desc: "Apps: DVD/Blu-Ray Copy GNU/Linux"}
+    - {id: 51, cat: PC/0day, desc: "Apps: Graphics Editing Mac"}
+    - {id: 58, cat: PC/0day, desc: "Apps: Music Editing & Recording GNU/"}
+    - {id: 52, cat: PC/0day, desc: "Apps: Apps DVD Editing Mac"}
+    - {id: 56, cat: PC/0day, desc: "Apps: DVD Editing GNU/Linux"}
+    - {id: 54, cat: PC/0day, desc: "Apps: Music Editing & Recording Mac"}
+    - {id: 18, cat: PC/0day, desc: "Apps: Graphics Editing PC"}
+    - {id: 19, cat: PC/0day, desc: "Apps: DVD Editing PC"}
+    - {id: 20, cat: PC/0day, desc: "Apps: DVD/Blu-Ray Copying PC"}
+    - {id: 21, cat: PC/0day, desc: "Apps: Music Editing & Recording PC"}
+    - {id: 66, cat: Other, desc: "grumpyman: pending torrents"}
+    - {id: 67, cat: Books/EBook, desc: "Media: pdf"}
+    - {id: 49, cat: Movies/HD, desc: "Movies: HD-Compressed Or Stripped"}
+    - {id: 47, cat: Movies/Other, desc: "Movies: Covers & Artwork"}
+    - {id: 48, cat: Movies/SD, desc: "Movies: DVD-Compressed Or Stripped"}
+    - {id: 1, cat: Movies/DVD, desc: "Movies: DVD-Untouched"}
+    - {id: 50, cat: Movies, desc: "Movies: Made For TV"}
+    - {id: 2, cat: Movies/SD, desc: "Movies: Divx/Xvid/Avi"}
+    - {id: 60, cat: Movies/HD, desc: "Movies: HD-mkv/mts"}
+    - {id: 65, cat: Movies/Foreign, desc: "Movies: Movies - w/additional lang/sub"}
+    - {id: 42, cat: Movies/HD, desc: "Movies: HD-Untouched"}
+    - {id: 3, cat: Movies/SD, desc: "Movies: SVCD/VCD"}
+    - {id: 71, cat: Movies/UHD, desc: "Movies: 4K-Untouched"}
+    - {id: 4, cat: Movies/Other, desc: "Movies: Other"}
+    - {id: 22, cat: Audio/MP3, desc: "Music: MP3"}
+    - {id: 23, cat: Audio/Lossless, desc: "Music: Lossless"}
+    - {id: 24, cat: Audio/Video, desc: "Music: DVD"}
+    - {id: 70, cat: Audio/Video, desc: "Music: HD"}
+    - {id: 25, cat: Audio/Video, desc: "Music: Video"}
+    - {id: 27, cat: Audio/Other, desc: "Music: Other"}
+    - {id: 63, cat: Other, desc: "Other: Educational/Instructional"}
+    - {id: 61, cat: Books/EBook, desc: "Other: Related Material"}
+    - {id: 37, cat: Other, desc: "Other: Images"}
+    - {id: 62, cat: TV, desc: "TV: Mini-Series"}
+    - {id: 64, cat: TV/Other, desc: "TV: Covers & Art Work"}
+    - {id: 69, cat: TV/SD, desc: "TV: Series - Compressed"}
+    - {id: 5, cat: TV/SD, desc: "TV: Series: DVD"}
+    - {id: 73, cat: TV/HD, desc: "TV: Complete Series HD"}
+    - {id: 72, cat: TV/SD, desc: "TV: Complete Series DVD"}
+    - {id: 41, cat: TV/HD, desc: "TV: Series: HD"}
+    - {id: 74, cat: TV, desc: "TV: Series Compilation: DVD or HD"}
+    - {id: 6, cat: TV/SD, desc: "TV: Divx/Xvid/AVI"}
+    - {id: 7, cat: TV/SD, desc: "TV: SVCD/VCD"}
+    - {id: 68, cat: TV, desc: "TV: .mkv"}

  modes:
    search: [q]
+    tv-search: [q, season, ep]
    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: info_free
+    type: info
+    label: About Freeleech at Classix
+    default: This appears to only be uploads by the admin <b>grumpyman57</b>.
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: id
+    options:
+      id: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc

 login:
  path: account-login.php
@@ -28,43 +109,72 @@ login:
    path: index.php
    selector: a[href="account-logout.php"]

-download:
-  selectors:
-    - selector: a[href^="download.php?id="]
-      attribute: href
-
 search:
  paths:
    - path: torrents-search.php
  inputs:
-    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
-    search: "{{ if .Keywords }}\"{{ .Keywords }}\"{{ else }}{{ end }}"
+# category search returns results from unrelated categories
+#     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    cat: 0
+    # 0 incldead, 1 active, 2 dead
+    incldead: 0
+    # 0 all, 1 notfree, 2 onlyfree
+    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 all, 1 english, etc
+    lang: 0
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+    # does not support imdbid search and does not return imdb link in results
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["(\\w+)", "+$1"] # prepend + to each word

  rows:
    selector: table > tbody > tr:has(a[href^="torrents.php?cat="])

  fields:
    category:
-      text: 1
-    title:
-      selector: td:nth-child(3)
-    download:
-      selector: a[href^="torrents-details.php?id="]
+      selector: a[href^="torrents.php?cat="]
      attribute: href
      filters:
-        - name: replace
-          args: ["torrents-details.php?id=", "download.php?id="]
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="torrents-details.php?id="]
    details:
      selector: a[href^="torrents-details.php?id="]
      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    date:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "Date Added: </b>(\\d{2}-\\d{2}-\\d{4})<br />"
+        - name: dateparse
+          args: "dd-MM-yyyy"
    size:
      selector: td:nth-child(7)
    seeders:
      selector: td:nth-child(8)
    leechers:
      selector: td:nth-child(9)
+    genre:
+      selector: a[href^="torrents.php?gen="]
+    description:
+      text: "{{ .Result.genre }}"
    downloadvolumefactor:
-      text: 1
+      # returned results not marked as freeleech
+      text: "{{ if .Config.freeleech }}0{{ else }}1{{ end }}"
    uploadvolumefactor:
      text: 1
-# engine tbd
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 2 day (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# engine TorrentTrader v2-svn
--- a/src/Jackett.Common/Definitions/cpabien.yml
+++ b/src/Jackett.Common/Definitions/cpabien.yml
@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://jardattraction.fr/
+  - https://cpasbien-vf.fr/
 legacylinks:
  - https://www.cpasbiens.cz/
  - https://www.cpasbiens.bz/
@@ -23,6 +23,7 @@ legacylinks:
  - https://cpasbiens3.fr/
  - https://labastidevivante.fr/
  - https://cpasbiens911.fr/
+  - https://jardattraction.fr/

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

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/digitalcore.yml
+++ b/src/Jackett.Common/Definitions/digitalcore.yml
@@ -75,6 +75,10 @@ settings:
    type: checkbox
    label: Search P2P releases only
    default: false
+  - name: unrar_releases_only
+    type: checkbox
+    label: Search UNRAR releases only
+    default: false
  - name: sort
    type: select
    label: Sort requested from site
@@ -119,6 +123,7 @@ search:
    section: all
    sort: "{{ .Config.sort }}"
    stereoscopic: false
+    unrar: "{{ if .Config.unrar_releases_only }}true{{ else }}{{ end }}"
    watchview: false

  rows:
@@ -212,6 +217,12 @@ search:
      case:
        0: ""
        1: P2P
+    _unrartag:
+      selector: unrar
+      case:
+        0: ""
+        1: UNRAR
+      optional: true
    _packtag:
      selector: pack
      case:
@@ -224,7 +235,7 @@ search:
        "*": Request
    _tag_desc:
      optional: true
-      text: "{{ if .Result._p2ptag }}{{ .Result._p2ptag }}, {{ else }}{{ end }}{{ if .Result._packtag }}{{ .Result._packtag }}, {{ else }}{{ end }}{{ if .Result._reqidtag }}{{ .Result._reqidtag }}{{ else }}{{ end }}"
+      text: "{{ if .Result._p2ptag }}{{ .Result._p2ptag }}, {{ else }}{{ end }}{{ if .Result._unrartag }}{{ .Result._unrartag }}, {{ else }}{{ end }}{{ if .Result._packtag }}{{ .Result._packtag }}, {{ else }}{{ end }}{{ if .Result._reqidtag }}{{ .Result._reqidtag }}{{ else }}{{ end }}"
      filters:
        - name: regexp
          args: "(.+?), $"
--- a/src/Jackett.Common/Definitions/eniahd.yml
+++ b/src/Jackett.Common/Definitions/eniahd.yml
@@ -16,6 +16,9 @@ caps:
    - {id: 13, cat: Movies/HD, desc: "Зарубежное кино HD"}
    - {id: 11, cat: Movies, desc: "Зарубежное кино"}
    - {id: 12, cat: Movies, desc: "Наше кино"}
+    - {id: 66, cat: Movies, desc: "Зарубежное кино | VIP"}
+    - {id: 67, cat: Movies, desc: "Зарубежное кино HD | VIP"}
+    - {id: 68, cat: Movies, desc: "Фабельманы / The Fabelmans"}
    # TV
    - {id: 2, cat: TV/HD, desc: "Зарубежные сериалы HD"}
    - {id: 65, cat: TV/HD, desc: "Майя МС / Майянцы / Mayans M.C."}
--- a/src/Jackett.Common/Definitions/extratorrent-st.yml
+++ b/src/Jackett.Common/Definitions/extratorrent-st.yml
@@ -7,14 +7,12 @@ type: public
 encoding: UTF-8
 links:
  - https://extratorrent.st/
-  - https://extratorrent.unblockit.rsvp/
+  - https://extratorrent.unblockit.esq/
  - https://extratorrent.mrunblock.bond/
-  - https://extratorrent.nocensor.click/
+  - https://extratorrent.nocensor.cloud/
 legacylinks:
  - https://extratorrent.nocensor.work/
  - https://extratorrent.nocensor.biz/
-  - https://extratorrent.unblockit.llc/
-  - https://extratorrent.unblockit.blue/
  - https://extratorrent.unblockit.name/
  - https://extratorrent.nocensor.sbs/
  - https://extratorrent.unblockit.ist/
@@ -34,6 +32,9 @@ legacylinks:
  - https://extratorrent.unblockit.asia/
  - https://extratorrent.unblockit.mov/
  - https://extratorrent.mrunblock.life/
+  - https://extratorrent.unblockit.rsvp/
+  - https://extratorrent.nocensor.click/
+  - https://extratorrent.unblockit.vegas/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/exttorrents.yml
+++ b/src/Jackett.Common/Definitions/exttorrents.yml
@@ -109,6 +109,7 @@ search:
  paths:
    - path: "{{ if .Keywords }}search/{{ .Keywords }}/?order={{ .Config.sort }}&sort={{ .Config.type }}{{ else }}latest/{{ end }}"
    - path: "{{ if .Keywords }}search/{{ .Keywords }}/2/?order={{ .Config.sort }}&sort={{ .Config.type }}{{ else }}latest/2/{{ end }}"
+      followredirect: true

  keywordsfilters:
    - name: tolower
--- a/src/Jackett.Common/Definitions/eztv.yml
+++ b/src/Jackett.Common/Definitions/eztv.yml
@@ -13,17 +13,15 @@ links:
  - https://eztv.yt/
  - https://eztv1.xyz/
  - https://eztv.unblockninja.com/
-  - https://eztv.unblockit.rsvp/
+  - https://eztv.unblockit.esq/
  - https://eztv.mrunblock.bond/
-  - https://eztv.nocensor.click/
+  - https://eztv.nocensor.cloud/
 legacylinks:
  - https://eztv.ag/ # redirects to .re
  - https://eztv.it/ # redirects to .re
  - https://eztv.ch/ # redirects to .re
  - https://eztv.io/
  - https://eztv.nocensor.biz/
-  - https://eztv.unblockit.llc/
-  - https://eztv.unblockit.blue/
  - https://eztv.unblockit.name/
  - https://eztv.nocensor.sbs/
  - https://eztv.unblockit.ist/
@@ -43,6 +41,9 @@ legacylinks:
  - https://eztv.unblockit.asia/
  - https://eztv.unblockit.mov/
  - https://eztv.mrunblock.life/
+  - https://eztv.unblockit.rsvp/
+  - https://eztv.nocensor.click/
+  - https://eztv.unblockit.vegas/

 caps:
  categories:
@@ -61,7 +62,7 @@ search:
  keywordsfilters:
    - name: re_replace
      args: ["S[0-9]{2}([^E]|$)", ""] # remove season tag without episode (search doesn't support it)
-    # fixes for site search issues
+    # fixes for site search issues - Prowlarr #1094
    - name: replace
      args: ["-", ""]
    - name: replace
--- a/src/Jackett.Common/Definitions/fantasticheaven.yml
+++ b/src/Jackett.Common/Definitions/fantasticheaven.yml
@@ -1,181 +0,0 @@
---
-id: fantasticheaven
-name: Fantastic Heaven
-description: "Fantastic Heaven is a German Time based tracker"
-language: de-DE
-type: private
-encoding: UTF-8
-links:
-  - https://fantastic-heaven.eu/
-
-caps:
-  categorymappings:
-    - {id: 157, cat: TV/Documentary, desc: "Doku 1080p"}
-    - {id: 156, cat: TV/Documentary, desc: "Doku 720p"}
-    - {id: 155, cat: TV/Documentary, desc: "Doku SD x264/x265"}
-    - {id: 152, cat: Books, desc: "E-Books"}
-    - {id: 141, cat: Movies/HD, desc: "Filme HD 1080p"}
-    - {id: 154, cat: Movies/HD, desc: "Filme HD 720p"}
-    - {id: 139, cat: Movies/HD, desc: "Filme Packs HD 1080p"}
-    - {id: 106, cat: Movies/HD, desc: "Filme Packs HD 720p"}
-    - {id: 105, cat: Movies/SD, desc: "Filme Packs SD x264/x265"}
-    - {id: 119, cat: Movies/UHD, desc: "Filme Packs UHD 2160p"}
-    - {id: 153, cat: Movies/SD, desc: "Filme SD x264/x265"}
-    - {id: 140, cat: Movies/UHD, desc: "Filme UHD 2160p"}
-    - {id: 104, cat: Movies/HD, desc: "Filmklassiker HD 1080p"}
-    - {id: 103, cat: Movies/HD, desc: "Filmklassiker HD 720p"}
-    - {id: 124, cat: Movies/HD, desc: "Filmklassiker Packs HD 1080p"}
-    - {id: 121, cat: Movies/HD, desc: "Filmklassiker Packs HD 720p"}
-    - {id: 123, cat: Movies/UHD, desc: "Filmklassiker Packs UHD 2160p"}
-    - {id: 127, cat: Movies/SD, desc: "Filmklassiker Packs  x264/x265"}
-    - {id: 102, cat: Movies/SD, desc: "Filmklassiker SD x264/x265"}
-    - {id: 135, cat: Movies/UHD, desc: "Filmklassiker UHD 2160p"}
-    - {id: 118, cat: Audio/Audiobook, desc: "Hörbücher"}
-    - {id: 109, cat: Audio/Lossless, desc: "Musik Flac"}
-    - {id: 129, cat: Audio/MP3, desc: "Musik MP3"}
-    - {id: 111, cat: Audio/Lossless, desc: "Musik Packs Flac"}
-    - {id: 112, cat: Audio/MP3, desc: "Musik Packs MP3"}
-    - {id: 113, cat: TV/HD, desc: "Serie HD 1080p"}
-    - {id: 125, cat: TV/HD, desc: "Serie HD 720p"}
-    - {id: 115, cat: TV/Foreign, desc: "Serie International"}
-    - {id: 138, cat: TV/HD, desc: "Serie Packs HD 1080p"}
-    - {id: 116, cat: TV/HD, desc: "Serie Packs HD 720p"}
-    - {id: 144, cat: TV/Foreign, desc: "Serie Packs International"}
-    - {id: 137, cat: TV/SD, desc: "Serie Packs SD x264/x265"}
-    - {id: 143, cat: TV/UHD, desc: "Serie Packs UHD 2160p"}
-    - {id: 133, cat: TV/SD, desc: "Serie SD x264/x265"}
-    - {id: 114, cat: TV/UHD, desc: "Serie UHD 2160p"}
-    - {id: 150, cat: PC/0day, desc: "Windows Apps"}
-    - {id: 149, cat: PC/Games, desc: "Windows Spiele"}
-    - {id: 147, cat: XXX/x264, desc: "XXX HD 1080p"}
-    - {id: 146, cat: XXX/x264, desc: "XXX HD 720p"}
-    - {id: 148, cat: XXX/Pack, desc: "XXX Packs"}
-    - {id: 69, cat: XXX/SD, desc: "XXX SD x264/x265"}
-    - {id: 151, cat: Books/Mags, desc: "Zeitschriften"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: pin
-    type: text
-    label: Pin
-  - name: freeleech
-    type: checkbox
-    label: Filter FreeLeech only
-    default: false
-  - name: onlyupload
-    type: checkbox
-    label: Filter OnlyUpload only
-    default: false
-  - name: info_free
-    type: info
-    label: About Freeleech and OnlyUpload at Fantastic Heaven
-    default: "<ul><li>FreeLeech are torrents where neither the download or upload is counted. (On the Jackett dashboard search results these are tagged as NoUpload).</li><li>OnlyUpload are torrents where download is not counted but upload is. Good for building your Ratio up. (On the Jackett dashboard search results these are tagged as Freeleech).</li></ul>"
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: added
-    options:
-      added: created
-      seeds: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents pro Seite:</b> setting to <b>100</b> on your Control Panel. The default is <i>15</i>.
-
-login:
-  path: login.php
-  method: form
-  form: form[action="../takelogin.php"]
-  cookies: ["JAVA=OK"] # avoid jscheck redirect
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    secure_pin: "{{ .Config.pin }}"
-  error:
-    - selector: table.tableinborder:contains("Anmeldung Gescheitert!") > tbody > tr > td.tablea
-  test:
-    path: index.php
-    selector: a[href="logout.php"]
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    showsearch: 1
-    search: "{{ .Keywords }}"
-    # 0 active, 1 all, 2 dead
-    incldead: 1
-    orderby: "{{ .Config.sort }}"
-    sort: "{{ .Config.type }}"
-
-  rows:
-    selector: "table.tableinborder[cellspacing=\"1\"][cellpadding=\"0\"] > tbody > tr:has(a[href^=\"download.php\"]){{ if .Config.freeleech }}:has(img[src=\"pic/freeleech.gif\"]){{ else }}{{ end }}{{ if .Config.onlyupload }}:has(img[src=\"pic/oupic.gif\"]){{ else }}{{ end }}"
-
-  fields:
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: a[href^="details.php?id="] > b
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?torrent="]
-      attribute: href
-    poster:
-      selector: div[id^="details"] img
-      attribute: src
-    size:
-      selector: td.content_wrap table tbody tr:nth-child(2) td:nth-child(1) b:nth-child(1)
-    files:
-      selector: td.content_wrap table tbody tr:nth-child(2) td:nth-child(1) b:nth-child(2)
-    seeders:
-      selector: td.content_wrap table tbody tr:nth-child(2) td:nth-child(2) b:nth-child(1)
-    leechers:
-      selector: td.content_wrap table tbody tr:nth-child(2) td:nth-child(2) > b:nth-of-type(2)
-    grabs:
-      selector: td.content_wrap table tbody tr:nth-child(2) td:nth-child(3) b:nth-child(1)
-    date:
-      selector: td.content_wrap table tbody tr:nth-child(2) td:nth-child(5)
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: replace
-          args: ["\xA0", " "]
-        - name: dateparse
-          args: "dd.MM.yyyy HH:mm:ss zzz"
-    downloadvolumefactor:
-      case:
-        img[src="pic/oupic.gif"]: 0 # only upload is counted
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[src="pic/freeleech.gif"]: 0 # nothing is counted
-        "*": 1
-# engine n/a
--- a/src/Jackett.Common/Definitions/filelisting.yml
+++ b/src/Jackett.Common/Definitions/filelisting.yml
@@ -8,7 +8,7 @@ encoding: UTF-8
 links:
  - https://filelisting.com/
  - https://filelisting.mrunblock.bond/
-  - https://filelisting.nocensor.click/
+  - https://filelisting.nocensor.cloud/
 legacylinks:
  - https://filelisting.nocensor.biz/
  - https://filelisting.nocensor.sbs/
@@ -17,6 +17,7 @@ legacylinks:
  - https://filelisting.nocensor.art/
  - https://filelisting.mrunblock.guru/
  - https://filelisting.mrunblock.life/
+  - https://filelisting.nocensor.click/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/firebit.yml
+++ b/src/Jackett.Common/Definitions/firebit.yml
@@ -1,198 +0,0 @@
---
-id: firebit
-name: FireBit
-description: "FireBit is an UKRAINIAN / RUSSIAN Public Torrent Tracker for MOVIES / TV / GENERAL"
-language: ru-RU
-type: public
-encoding: UTF-8
-requestDelay: 2
-links:
-  - https://firebit.net/
-legacylinks:
-  - https://firebit.name/
-  - https://firebit.biz/
-  - http://firebit.net/
-  - http://firebit.info/
-  - http://firebit.name/
-  - http://firebit.pro/
-  - http://firebit.club/
-  - http://firebit.biz/
-  - https://firebit.pro/
-  - https://firebit.club/
-  - https://firebit.info/
-
-caps:
-  categorymappings:
-    - {id: "Мультфильмы", cat: TV/Anime, desc: "Мультфильмы"}
-    - {id: "Программы", cat: PC, desc: "Программы"}
-    - {id: "Программы Видео", cat: PC, desc: "Программы Видео"}
-    - {id: "Программы FAQ", cat: PC, desc: "Программы FAQ"}
-    - {id: "Программы Web Оформление", cat: PC, desc: "Программы Web Оформление"}
-    - {id: "Linux", cat: PC, desc: "Linux"}
-    - {id: "Мобилка", cat: PC/Mobile-Other, desc: "Мобилка"}
-    - {id: "Мобилка Игры", cat: PC/Mobile-Other, desc: "Мобилка Игры"}
-    - {id: "Литература", cat: Books, desc: "Литература"}
-    - {id: "Игры", cat: PC/Games, desc: "Игры"}
-    - {id: "Игры Мобилка", cat: PC/Games, desc: "Игры Мобилка"}
-    - {id: "Фильмы", cat: Movies, desc: "Фильмы"}
-    - {id: "Фильмы Видео", cat: Movies, desc: "Фильмы Видео"}
-    - {id: "Фильмы Сериалы", cat: Movies, desc: "Фильмы Сериалы"}
-    - {id: "Фильмы Скоро на трекере", cat: Movies, desc: "Фильмы Скоро на трекере"}
-    - {id: "Видео", cat: Movies, desc: "Видео"}
-    - {id: "Музыка", cat: Audio, desc: "Музыка"}
-    - {id: "Музыка Фильмы", cat: Audio, desc: "Музыка Фильмы"}
-    - {id: "Видео Музыка", cat: Audio/Video, desc: "Видео Музыка"}
-    - {id: "Фильмы Музыка Видео", cat: Audio/Video, desc: "Фильмы Музыка Видео"}
-    - {id: "Музыка Видео", cat: Audio/Video, desc: "Музыка Видео"}
-    - {id: "Другие категории", cat: Other, desc: "Другие категории"}
-    - {id: "Сериалы", cat: TV, desc: "Сериалы"}
-    - {id: "18+", cat: TV, desc: "18+"}
-    - {id: "-", cat: Other, desc: "Другие категории"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: stripcyrillic
-    type: checkbox
-    label: Strip Cyrillic Letters
-    default: false
-  - name: addrussiantotitle
-    type: checkbox
-    label: Add RUS to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
-    default: false
-
-download:
-  selectors:
-    - selector: a[href^="/download.php?id="]
-      attribute: href
-
-search:
-  # http://firebit.net/index.php?do=search&type=simple&q=2022
-  paths:
-    - path: "{{ if .Keywords }}index.php?do=search&type=simple&q={{ .Keywords }}{{ else }}{{ end }}"
-    - path: "{{ if .Keywords }}index.php?do=search&type=simple&q={{ .Keywords }}&cstart=2{{ else }}%D1%81%D1%82%D1%80%D0%B0%D0%BD%D0%B8%D1%86%D0%B0/2/{{ end }}"
-
-  keywordsfilters:
-    # strip season and/or ep
-    - name: re_replace
-      args: ["(?i)\\b(?:[SE]\\d{1,4}){1,2}\\b\\s?", ""]
-
-  rows:
-    selector: "{{ if .Keywords }}table.torrents tbody tr:has(td.td-size){{ else }}div[id^=\"post-id-\"]:has(li.meta-size){{ end }}"
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: td:nth-child(1), div.article-indent div b
-      optional: true
-      default: "-"
-      filters:
-        - name: replace
-          args: ["Новинки", ""]
-        - name: re_replace
-          args: [",", ""]
-        - name: trim
-    title:
-      selector: td:nth-child(2), span.article-title
-      filters:
-        # normalize to SXXEYY format
-        - name: re_replace
-          args: ["(?i)[CС]езон[ыи]?[\\s:;]*(\\d+(?:-\\d+)?).+?(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))[\\s:;]*(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)", "S$1E$2 of $3"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езон[ыи]?.+?(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))?", "S$1E$2 of $3"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езон[ыи]?.+?(\\d+(?:-\\d+)?)\\s*(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))\\s+из\\s*(\\w?)", "S$1E$2 of $3"]
-        - name: re_replace
-          args: ["(?i)[CС]езон[ыи]?[\\s:;]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))?", "S$1E$2 of $3"]
-        - name: re_replace
-          args: ["(?i)[CС]езон[ыи]?[\\s:;]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)\\s*(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))\\s+из\\s*(\\w?)", "S$1E$2 of $3"]
-        - name: re_replace
-          args: ["(?i)[CС]езон[ыи]?[\\s:;]*(\\d+(?:-\\d+)?).+?(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))[\\s:;]*(\\d+(?:-\\d+)?)", "S$1E$2"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езон[ыи]?.+?(\\d+(?:-\\d+)?)(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))", "S$1E$2"]
-        - name: re_replace
-          args: ["(?i)[CС]езон[ыи]?[\\s:;]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))", "S$1E$2"]
-        - name: re_replace
-          args: ["(?i)[CС]езон[ыи]?[\\s:;]*(\\d+(?:-\\d+)?)", "S$1"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s+[CС]езон[ыи]?", "S$1"]
-        - name: re_replace
-          args: ["(?i)(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))[\\s:;]*(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)", "E$1 of $2"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))", "E$1 of $2"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s+(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))\\s+из\\s*(\\w?)", "E$1 of $2"]
-        - name: re_replace
-          args: ["(?i)(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))[\\s:;]*(\\d+(?:-\\d+)?)", "E$1"]
-        - name: re_replace
-          args: ["(?i)(\\d+(?:-\\d+)?)\\s+(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))", "E$1"]
-        - name: re_replace
-          args: ["(\\([\\p{IsCyrillic}\\W]+\\))|(^[\\p{IsCyrillic}\\W\\d]+\\/ )|([\\p{IsCyrillic} \\-]+,+)|([\\p{IsCyrillic}]+)", "{{ if .Config.stripcyrillic }}{{ else }}$1$2$3$4{{ end }}"]
-        - name: re_replace
-          args: ["(?i)\\bHDTV[-\\s]?Rip\\b", "HDTV"]
-        - name: re_replace
-          args: ["(?i)\\bSAT[-\\s]?Rip\\b", "HDTV"]
-        - name: re_replace
-          args: ["(?i)\\bWEB[-\\s]?DL[-\\s]?Rip\\b", "WEB-DL"]
-        - name: re_replace
-          args: ["(?i)\\bWEB\\sRip\\b", "WEBRip"]
-        - name: re_replace
-          args: ["(?i)\\bWEB\\sDL\\b", "WEB-DL"]
-        - name: re_replace
-          args: ["[\\[\\(\\{<«][\\s\\W]*[\\]\\)\\}>»]", ""]
-        - name: re_replace
-          args: ["^[\\s&,\\.!\\?\\+\\-_\\|\\/':]+", ""]
-#        - name: re_replace
-#          args: ["(?i)^\\(\\s*([SE]\\d+.*?)\\s*\\)[\\s\\/\\|]*(.+)", "$2 $1"]
-        - name: append
-          args: "{{ if .Config.addrussiantotitle }} RUS{{ else }}{{ end }}"
-    details:
-      selector: td:nth-child(2) a, span.article-title a
-      attribute: href
-    download:
-      selector: td:nth-child(2) a, span.article-title a
-      attribute: href
-    size:
-      selector: td.td-size, li.meta-size
-      filters:
-        - name: replace
-          args: ["-", "0 B"]
-    date_day:
-      # Вчера, 08:01:41
-      # 2 дня назад, 19:33:51
-      selector: td:nth-child(5):contains(","), li.meta-date:contains(",")
-      optional: true
-      filters:
-        - name: replace
-          args: ["Вчера,", "Yesterday"]
-        - name: replace
-          args: ["дня назад,", "days"]
-        - name: fuzzytime
-    date_year:
-      # 16.08.2021 20:29:39
-      selector: td:nth-child(5):not(:contains(",")), li.meta-date:not(:contains(","))
-      optional: true
-      filters:
-        - name: append
-          args: " +03:00" # MSK
-        - name: dateparse
-          args: "dd.MM.yyyy HH:mm:ss zzz"
-    date:
-      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
-    seeders:
-      selector: td.l1, li.meta-sead
-    leechers:
-      selector: td.l2, li.meta-leech
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-    description:
-      selector: td:nth-child(2), span.article-title
-# engine n/a
--- a/src/Jackett.Common/Definitions/freefarm.yml
+++ b/src/Jackett.Common/Definitions/freefarm.yml
@@ -204,4 +204,4 @@ search:
    description:
      selector: td:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP v1.8.4 2023-06-18
+# NexusPHP v1.8.7 2023-08-29
--- a/src/Jackett.Common/Definitions/futuretorrent.yml
+++ b/src/Jackett.Common/Definitions/futuretorrent.yml
@@ -0,0 +1,181 @@
+---
+id: futuretorrent
+name: FutureTorrent
+description: "FutureTorrent is an ITALIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: it-IT
+type: private
+encoding: UTF-8
+links:
+  - https://futuretorrent.org/
+
+caps:
+  categorymappings:
+    - {id: 3, cat: PC/Mobile-Android, desc: "Android"}
+    - {id: 4, cat: PC/Mobile-Android, desc: "  |-- Smartphone"}
+    - {id: 16, cat: Movies/HD, desc: "Bluray"}
+    - {id: 17, cat: Movies/HD, desc: "  |-- 1080p"}
+    - {id: 18, cat: Movies/3D, desc: "  |-- 3D"}
+    - {id: 19, cat: Movies/HD, desc: "  |-- 720p"}
+    - {id: 20, cat: Movies/HD, desc: "  |-- H.265 1080p"}
+    - {id: 21, cat: Movies/HD, desc: "  |-- H.265 720p"}
+    - {id: 53, cat: Movies/BluRay, desc: "  |-- Untouched"}
+    - {id: 30, cat: Movies/Other, desc: "Cartoons"}
+    - {id: 56, cat: Movies/Other, desc: "  |-- Anime"}
+    - {id: 31, cat: Movies/Other, desc: "  |-- Disney"}
+    - {id: 32, cat: Books/Comics, desc: "  |-- Manga"}
+    - {id: 5, cat: Movies/WEB-DL, desc: "Cinema-News"}
+    - {id: 58, cat: Movies/SD, desc: "  |-- Cinema News"}
+    - {id: 59, cat: Movies/WEB-DL, desc: "  |-- WEBDL"}
+    - {id: 60, cat: Movies/WEB-DL, desc: "  |-- WEBDL 1080p"}
+    - {id: 62, cat: Movies/WEB-DL, desc: "  |-- WEBDL 2160p"}
+    - {id: 61, cat: Movies/WEB-DL, desc: "  |-- WEBDL 720p"}
+    - {id: 22, cat: TV/Documentary, desc: "Documentari"}
+    - {id: 33, cat: Movies/DVD, desc: "DvD"}
+    - {id: 35, cat: Movies/DVD, desc: "  |-- DvD5"}
+    - {id: 34, cat: Movies/DVD, desc: "  |-- DvD9"}
+    - {id: 6, cat: Movies/SD, desc: "DvDRip"}
+    - {id: 8, cat: Movies/SD, desc: "  |-- BDRip"}
+    - {id: 9, cat: Movies/SD, desc: "  |-- Cult"}
+    - {id: 7, cat: Movies/SD, desc: "  |-- DvDRip"}
+    - {id: 10, cat: Movies/SD, desc: "  |-- DvDRip_Old"}
+    - {id: 11, cat: Movies/SD, desc: "  |-- Film_mp4"}
+    - {id: 12, cat: Movies/Foreign, desc: "  |-- Subbed"}
+    - {id: 52, cat: Movies/WEB-DL, desc: "  |-- WebRip"}
+    - {id: 23, cat: Books, desc: "Edicola"}
+    - {id: 66, cat: Audio/Audiobook, desc: "  |-- Audiobook"}
+    - {id: 25, cat: Books/EBook, desc: "  |-- Ebook"}
+    - {id: 24, cat: Books/Mags, desc: "  |-- Edicola"}
+    - {id: 54, cat: Audio/Lossless, desc: "Flac"}
+    - {id: 55, cat: Other/Misc, desc: "FutureCrew"}
+    - {id: 36, cat: Console, desc: "Games"}
+    - {id: 39, cat: Console/Other, desc: "  |-- N.Switch"}
+    - {id: 40, cat: Console/NDS, desc: "  |-- Nds"}
+    - {id: 41, cat: PC/Games, desc: "  |-- Pc"}
+    - {id: 42, cat: Console/PS3, desc: "  |-- Ps3"}
+    - {id: 43, cat: Console/PS4, desc: "  |-- Ps4"}
+    - {id: 44, cat: Console/Wii, desc: "  |-- Wii"}
+    - {id: 45, cat: Console/WiiU, desc: "  |-- Wii-U"}
+    - {id: 46, cat: Console/XBox, desc: "  |-- Xbox"}
+    - {id: 13, cat: Audio, desc: "Musica"}
+    - {id: 14, cat: Audio/Other, desc: "  |-- Compilation"}
+    - {id: 15, cat: Audio/MP3, desc: "  |-- Mp3"}
+    - {id: 65, cat: Audio/Video, desc: "  |-- Video Concerti"}
+    - {id: 26, cat: PC, desc: "Programmi Pc"}
+    - {id: 27, cat: PC/Mac, desc: "  |-- Mac"}
+    - {id: 28, cat: PC/0day, desc: "  |-- Windows"}
+    - {id: 47, cat: TV, desc: "Serie TV"}
+    - {id: 57, cat: TV/SD, desc: "  |-- S.TV Complete"}
+    - {id: 48, cat: TV/HD, desc: "  |-- Serie TV 1080p"}
+    - {id: 49, cat: TV/SD, desc: "  |-- Serie TV 264p"}
+    - {id: 50, cat: TV/HD, desc: "  |-- Serie TV 720p"}
+    - {id: 29, cat: Movies/UHD, desc: "UHD 4K"}
+    - {id: 51, cat: Other, desc: "Varie"}
+    - {id: 64, cat: Other, desc: "  |-- Torrent Free"}
+    - {id: 63, cat: Other, desc: "  |-- Video Corsi"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: added
+    options:
+      added: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>40</b> on your account profile.
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  test:
+    path: index.php
+    selector: a[href*="/logout.php"]
+
+search:
+  paths:
+    - path: browse.php
+  inputs:
+    do: search
+    keywords: "{{ .Keywords }}"
+    # t_name, t_description, t_both, t_uploader, t_genre (not used)
+    search_type: t_name
+    category: 0 # multi cat search not supported
+    # yes, no
+    include_dead_torrents: yes
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+    # does not return imdb link in results
+
+  rows:
+    selector: table.sortable tbody tr:has(a[href*="/details.php?id="])
+
+  fields:
+    category:
+      selector: a[href*="/browse.php?category="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: category
+    title_default:
+      selector: a[href*="/details.php?id="]
+    title:
+      selector: div.tooltip-content > div
+      optional: true
+      default: "{{ .Result.title_default }}"
+    details:
+      selector: a[href*="/details.php?id="]
+      attribute: href
+    download:
+      selector: a[href*="/download.php?id="]
+      attribute: href
+    poster:
+      selector: div.tooltip-content > img
+      attribute: src
+    date:
+      selector: td:nth-child(2) > div:last-child
+      remove: span
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "dd-MM-yyyy HH:mm zzz"
+    size:
+      selector: td:nth-child(5)
+    grabs:
+      selector: td:nth-child(6)
+    seeders:
+      selector: td:nth-child(7)
+    leechers:
+      selector: td:nth-child(8)
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# TS Special Edition v.8.0
--- a/src/Jackett.Common/Definitions/gainbound.yml
+++ b/src/Jackett.Common/Definitions/gainbound.yml
@@ -1,25 +1,32 @@
 ---
-id: gainbound
-name: GainBound
-description: "GainBound is a CHINESE Private Tracker for MOVIES especially from Hong Kong."
+id: gamera
+name: Gamera
+description: "Gamera (駕瞑羅) is a CHINESE Private Torrent Tracker for Japanese Monster and Superhero MOVIES / TV"
 language: zh-CN
 type: private
 encoding: UTF-8
 links:
-  - https://gainbound.net/
+  - https://gamerapt.link/

 caps:
  categorymappings:
-    - {id: 401, cat: Movies, desc: "Movies(电影)"}
-    - {id: 404, cat: TV/Documentary, desc: "Documentaries(纪录片)"}
-    - {id: 406, cat: Audio/Video, desc: "Music Videos(演唱会/MV)"}
-    - {id: 410, cat: TV, desc: "TV Series(港台剧)"}
+    - {id: 410, cat: Movies, desc: "Monster怪兽"}
+    - {id: 410, cat: TV, desc: "Monster怪兽"}
+    - {id: 411, cat: Movies, desc: "Kamen Rider假面骑士"}
+    - {id: 411, cat: TV, desc: "Kamen Rider假面骑士"}
+    - {id: 412, cat: Movies, desc: "Ultraman奥特曼"}
+    - {id: 412, cat: TV, desc: "Ultraman奥特曼"}
+    - {id: 413, cat: Movies, desc: "Team战队"}
+    - {id: 413, cat: TV, desc: "Team战队"}
+    - {id: 414, cat: Movies, desc: "Other其他特摄"}
+    - {id: 414, cat: TV, desc: "Other其他特摄"}
+    - {id: 415, cat: Movies, desc: "Musical特摄音乐"}
+    - {id: 415, cat: TV, desc: "Musical特摄音乐"}

  modes:
    search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
-    music-search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q, imdbid, doubanid]

 settings:
  - name: cookie
@@ -67,21 +74,21 @@ search:
    - path: torrents.php
  inputs:
    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }} {{ else }}{{ .Keywords }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}"
    # 0 incldead, 1 active, 2 dead
    incldead: 0
    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 title, 1 descr, 3 uploader, 4 imdburl
-    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
-    # 0 AND, 1 OR, 2 exact
+    # 0 title, 1 descr, 3 uploader
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}{{ end }}{{ if .Query.DoubanID }}1{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}0{{ end }}"
+    # 0 AND, 2 exact
    search_mode: 0
    sort: "{{ .Config.sort }}"
    type: "{{ .Config.type }}"
    notnewword: 1

  rows:
-    selector: table.torrents > tbody > tr:has(a[href^="details.php?id="])
+    selector: table.torrents > tbody > tr:has(table.torrentname)

  fields:
    category:
@@ -90,32 +97,43 @@ search:
      filters:
        - name: querystring
          args: cat
-    title:
+    title_default:
      selector: a[href^="details.php?id="]
-      remove: span.__cf_email__
+    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]
+      selector: td.rowfollow:nth-last-of-type(5) > span[title]
      attribute: title
      optional: true
      filters:
        - name: append
-          args: " +08:00" # CST
+          args: " +08:00"
        - name: dateparse
          args: "yyyy-MM-dd HH:mm:ss zzz"
    date_added:
      # time added
-      selector: td.rowfollow:nth-child(4):not(:has(span))
+      selector: td.rowfollow:nth-last-of-type(5):not(:has(span))
      optional: true
      filters:
        - name: append
@@ -125,13 +143,13 @@ search:
    date:
      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
    size:
-      selector: td.rowfollow:nth-child(5)
+      selector: td.rowfollow:nth-last-of-type(4)
    seeders:
-      selector: td.rowfollow:nth-child(6)
+      selector: td.rowfollow:nth-last-of-type(3)
    leechers:
-      selector: td.rowfollow:nth-child(7)
+      selector: td.rowfollow:nth-last-of-type(2)
    grabs:
-      selector: td.rowfollow:nth-child(8)
+      selector: td.rowfollow:nth-last-of-type(1)
    downloadvolumefactor:
      case:
        img.pro_free: 0
@@ -146,9 +164,9 @@ search:
        img.pro_free2up: 2
        img.pro_2up: 2
        "*": 1
-    minimumratio:
-      text: 1.0
    description:
-      selector: td.rowfollow:nth-child(2)
+      selector: td:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP v1.8.0 2023-01-26
+    minimumratio:
+      text: 0.2
+# NexusPHP KEMURIKUSA 2019-01-09
--- a/src/Jackett.Common/Definitions/gimmepeers.yml
+++ b/src/Jackett.Common/Definitions/gimmepeers.yml
@@ -104,7 +104,7 @@ search:
    type: "{{ .Config.type }}"

  rows:
-    selector: table.browsetable:not(:has(td.gp_sub_nav):contains("Top 20")) tbody tr:has(a[href^="download.php"])
+    selector: table.browsetable:not(:has(td.gp_sub_nav):contains("Top 25")) tbody tr:has(a[href^="download.php"])

  fields:
    category:
--- a/src/Jackett.Common/Definitions/gktorrent.yml
+++ b/src/Jackett.Common/Definitions/gktorrent.yml
@@ -8,8 +8,8 @@ encoding: UTF-8
 followredirect: true
 # to fetch current domain use https://www.protege-torrent.com/Gktorrent
 links:
-  - https://www.gktorrents.cc/
-  - https://gktorrent.nocensor.click/
+  - https://www.gktorrent.ac/
+  - https://gktorrent.nocensor.cloud/
  - https://gktorrent.mrunblock.bond/
 legacylinks:
  - https://www.gktorrent.org/
@@ -35,6 +35,8 @@ legacylinks:
  - https://gktorrent.nocensor.lol/
  - https://gktorrent.mrunblock.guru/
  - https://gktorrent.mrunblock.life/ # cloudflare 403
+  - https://gktorrent.nocensor.click/
+  - https://www.gktorrents.cc/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/glodls.yml
+++ b/src/Jackett.Common/Definitions/glodls.yml
@@ -8,18 +8,15 @@ encoding: UTF-8
 followredirect: true
 links:
  - https://glodls.to/
-  - https://gtdb.cc/
  - https://www.gtdb.to/
-  - https://glotorrents.unblockit.rsvp/
+  - https://glotorrents.unblockit.esq/
  - https://glotorrents.mrunblock.bond/
  - https://glodls.unblockninja.com/
-  - https://glotorrents.nocensor.click/
+  - https://glotorrents.nocensor.cloud/
 legacylinks:
  - https://glodls.rocks/
  - https://gtdb.to/
  - https://glotorrents.nocensor.biz/
-  - https://glotorrents.unblockit.llc/
-  - https://glotorrents.unblockit.blue/
  - https://glotorrents.unblockit.name/
  - https://glotorrents.nocensor.sbs/
  - https://glotorrents.unblockit.ist/
@@ -39,6 +36,10 @@ legacylinks:
  - https://glotorrents.unblockit.asia/
  - https://glotorrents.unblockit.mov/
  - https://glotorrents.mrunblock.life/
+  - https://glotorrents.unblockit.rsvp/
+  - https://glotorrents.nocensor.click/
+  - https://gtdb.cc/
+  - https://glotorrents.unblockit.vegas/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/greekteam.yml
+++ b/src/Jackett.Common/Definitions/greekteam.yml
@@ -169,6 +169,8 @@ search:
      selector: td:has(a[href$="filelist=1"]) ~ td ~ td ~ td ~ td ~ td ~ td
    leechers:
      selector: td:has(a[href$="filelist=1"]) ~ td ~ td ~ td ~ td ~ td ~ td ~ td
+      optional: true
+      default: 0
    downloadvolumefactor:
      case:
        img[src="pic/free.png"]: 0
--- a/src/Jackett.Common/Definitions/hdatmos.yml
+++ b/src/Jackett.Common/Definitions/hdatmos.yml
@@ -175,4 +175,4 @@ search:
    description:
      selector: td:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP v1.8.2 2023-05-08
+# NexusPHP v1.8.6 2023-08-18
--- a/src/Jackett.Common/Definitions/hdcztorrent.yml
+++ b/src/Jackett.Common/Definitions/hdcztorrent.yml
@@ -12,47 +12,44 @@ legacylinks:

 caps:
  categorymappings:
-    # Filmy
+    # FILMY
    - {id: 117, cat: Movies/DVD, desc: "DvD"}
-    - {id: 119, cat: Movies/BluRay, desc: "Blu-Ray "}
+    - {id: 119, cat: Movies/BluRay, desc: "Blu-Ray"}
    - {id: 120, cat: Movies/HD, desc: "HD 720"}
    - {id: 121, cat: Movies/HD, desc: "HD 1080"}
-    - {id: 122, cat: Movies/UHD, desc: "4K"}
-    - {id: 123, cat: Movies/UHD, desc: "4K - Originál Zvuk"}
-    - {id: 124, cat: Movies/3D, desc: "3D Filmy Bluray"}
    - {id: 125, cat: Movies/3D, desc: "3D Filmy"}
    - {id: 126, cat: Movies/SD, desc: "SD Filmy"}
    - {id: 127, cat: Movies/HD, desc: "H-265"}
    - {id: 128, cat: TV/Documentary, desc: "Dokument"}
    - {id: 129, cat: TV/Sport, desc: "Sportovní Filmy"}
-    - {id: 130, cat: TV/WEB-DL, desc: "TV - WEB- DL"}
-    - {id: 131, cat: Movies, desc: "RLS For HDCZT"}
-    - {id: 91, cat: TV, desc: "Serial titulky"}
-    - {id: 45, cat: TV, desc: "SERIALY CZ"}
-    - {id: 81, cat: Movies, desc: "ORIGINAL JAZYK"}
-    # Animované
+    - {id: 143, cat: Movies/Foreign, desc: "film titulky"}
+    - {id: 144, cat: TV/Foreign, desc: "serial titulky"}
+    - {id: 145, cat: Movies/Foreign, desc: "film original"}
+    - {id: 146, cat: TV/Foreign, desc: "serial original"}
    - {id: 47, cat: TV/Other, desc: "Animované"}
-    # HUDBA
-    - {id: 57, cat: Audio/Lossless, desc: "Hudba flac"}
-    - {id: 58, cat: Audio/MP3, desc: "Hudba mp3"}
-    - {id: 96, cat: Audio/Other, desc: "RETRO HUDBA"}
-    # ostatni
-    - {id: 64, cat: Books, desc: "E-books, PDF fotky"}
+    - {id: 77, cat: Movies/UHD, desc: "ULTRA HD  4K"}
+    - {id: 45, cat: TV, desc: "SERIALY CZ"}
+    # premium
+    - {id: 130, cat: Movies/WEB-DL, desc: "TV - WEB- DL HBO Max"}
+    - {id: 133, cat: TV/WEB-DL, desc: "TV - WEB- DL Disney"}
+    - {id: 134, cat: TV/WEB-DL, desc: "TV -WEB- DL NETLIFIX"}
+    - {id: 135, cat: TV/WEB-DL, desc: "TV - WEB- DL Prime"}
+    - {id: 136, cat: TV/WEB-DL, desc: "TV -WEB- DL Skyshow"}
+    # rls track
+    - {id: 131, cat: Movies, desc: "RLS For HDCZT"}
+    - {id: 132, cat: Movies, desc: "Film na přání"}
+    # programy win linux
+    - {id: 62, cat: PC, desc: "Aplikace All"}
+    # knihy foto pdf
+    - {id: 64, cat: Books, desc: "knihy-foto"}
    - {id: 65, cat: Audio/Audiobook, desc: "Mluvene slovo"}
-    - {id: 113, cat: Books/Other, desc: "obrazky fotky"}
-    # PORNO
+    # porno
    - {id: 11, cat: XXX, desc: "XXX 18+KLASIKA"}
-    - {id: 99, cat: XXX, desc: "XXX GAY"}
-    - {id: 100, cat: XXX, desc: "XXX ASIAN"}
-    - {id: 101, cat: XXX, desc: "XXX 3D"}
    - {id: 106, cat: XXX/ImageSet, desc: "XXX-OBRÁZKY"}
-    - {id: 108, cat: XXX, desc: "PORNO BDSM"}
+    # Hudba mp3-flac
+    - {id: 58, cat: Audio, desc: "Hudba"}
    # HRY
    - {id: 73, cat: PC/Games, desc: "Hry, Games"}
-    - {id: 97, cat: Console/PS4, desc: "HRY PS4"}
-    # APLIKACE
-    - {id: 60, cat: PC/Mobile-Other, desc: "Mobil PDA"}
-    - {id: 62, cat: PC, desc: "Aplikace All"}

  modes:
    search: [q]
@@ -124,7 +121,7 @@ search:
    by: "{{ .Config.type }}"

  rows:
-    selector: td#mcol table.lista > tbody > tr:has(a[href^="index.php?page=torrent_history"])
+    selector: td table.lista > tbody > tr:has(a[href^="download.php"])

  fields:
    category:
--- a/src/Jackett.Common/Definitions/hdpt.yml
+++ b/src/Jackett.Common/Definitions/hdpt.yml
@@ -196,4 +196,4 @@ search:
    description:
      selector: td.rowfollow:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP v1.7.38 2023-05-14
+# NexusPHP v1.8.6 2023-08-18
--- a/src/Jackett.Common/Definitions/hellashut.yml
+++ b/src/Jackett.Common/Definitions/hellashut.yml
@@ -0,0 +1,195 @@
+---
+id: hellashut
+name: HellasHut
+description: "HellasHut is a GREEK Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: el-GR
+type: private
+encoding: UTF-8
+testlinktorrent: false
+links:
+  - https://hellashut.net/
+legacylinks:
+  - https://hellashut.de/
+
+caps:
+  categorymappings:
+    - {id: 28, cat: TV/Anime, desc: "Anime/Cartoon HD"}
+    - {id: 47, cat: TV/Anime, desc: "Anime/Cartoon HDTV"}
+    - {id: 48, cat: TV/Anime, desc: "Anime/Cartoon SD"}
+    - {id: 50, cat: TV/Anime, desc: "Anime/Cartoon SD Emb"}
+    - {id: 51, cat: TV/Anime, desc: "Anime/Cartoon TV"}
+    - {id: 77, cat: PC, desc: "Applications DOS"}
+    - {id: 20, cat: PC, desc: "Applications Linux"}
+    - {id: 19, cat: PC/Mac, desc: "Applications MAC"}
+    - {id: 68, cat: PC, desc: "Applications OS2 WARP"}
+    - {id: 21, cat: PC, desc: "Applications Other"}
+    - {id: 18, cat: PC/0day, desc: "Applications Windows"}
+    - {id: 52, cat: Books, desc: "Books/Magazines All"}
+    - {id: 9, cat: TV/Documentary, desc: "Documentaries All"}
+    - {id: 53, cat: TV/Documentary, desc: "Documentaries Greek"}
+    - {id: 54, cat: TV/Documentary, desc: "Documentaries HD"}
+    - {id: 55, cat: Movies/DVD, desc: "DVD-R All"}
+    - {id: 17, cat: Console/Other, desc: "Games Other"}
+    - {id: 11, cat: Console/PS4, desc: "Games PSX"}
+    - {id: 10, cat: PC/Games, desc: "Games Windows"}
+    - {id: 13, cat: Console/XBox, desc: "Games Xbox"}
+    - {id: 56, cat: Other, desc: "Miscellaneous All"}
+    - {id: 57, cat: PC/Mobile-Other, desc: "Mobile All"}
+    - {id: 1, cat: Movies/3D, desc: "Movies 3D"}
+    - {id: 2, cat: Movies/UHD, desc: "Movies 4K"}
+    - {id: 42, cat: Movies/BluRay, desc: "Movies BluRay"}
+    - {id: 58, cat: Movies/DVD, desc: "Movies DVD"}
+    - {id: 4, cat: Movies/HD, desc: "Movies HD"}
+    - {id: 69, cat: Movies/HD, desc: "Movies HD Packs"}
+    - {id: 3, cat: Movies/SD, desc: "Movies SD"}
+    - {id: 67, cat: Movies/SD, desc: "Movies SD Packs"}
+    - {id: 71, cat: Audio, desc: "Music CDA"}
+    - {id: 59, cat: Audio, desc: "Music Discographies"}
+    - {id: 23, cat: Audio/Lossless, desc: "Music FLAC"}
+    - {id: 22, cat: Audio/MP3, desc: "Music MP3"}
+    - {id: 25, cat: Audio/Video, desc: "Music Video"}
+    - {id: 75, cat: Movies/HD, desc: "NO IN SUBS Movies HD"}
+    - {id: 76, cat: Movies/UHD, desc: "NO SUBS IN Movies 4K"}
+    - {id: 35, cat: TV/Sport, desc: "Sports HD"}
+    - {id: 34, cat: TV/Sport, desc: "Sports SD"}
+    - {id: 5, cat: TV, desc: "TV Greek Movies"}
+    - {id: 6, cat: TV, desc: "TV Greek Series"}
+    - {id: 7, cat: TV, desc: "TV Greek Series Packs"}
+    - {id: 60, cat: TV, desc: "TV Greek Shows"}
+    - {id: 41, cat: TV/HD, desc: "TV HD"}
+    - {id: 61, cat: TV, desc: "TV Series"}
+    - {id: 62, cat: TV, desc: "TV Series Emb"}
+    - {id: 63, cat: TV, desc: "TV Series Emb Packs"}
+    - {id: 64, cat: TV/HD, desc: "TV Series HD"}
+    - {id: 65, cat: TV/HD, desc: "TV Series HD Packs"}
+    - {id: 66, cat: TV, desc: "TV Series Packs"}
+    - {id: 73, cat: Movies/BluRay, desc: "UNTOUCHED BluRay"}
+    - {id: 72, cat: Movies/DVD, desc: "UNTOUCHED DVD"}
+
+  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
+
+login:
+  path: account-login.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    returnto: /
+  error:
+    - selector: td.embedded:contains("Access Denied")
+  test:
+    path: /
+    selector: a[href="account-logout.php"]
+
+download:
+  selectors:
+    - selector: a[href^="download.php?id="], a[href^="magnet:?xt="]
+      attribute: href
+
+search:
+  paths:
+    # https://hellashut.de/torrents-search.php?c52=1&search=&cat=0&incldead=1&advanced=1&lang=0&blah=0&freeleech=0&sort=id&order=desc
+    - path: torrents-search.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 active, 1 incldead, 2 onlydead
+    incldead: 1
+    # 0 all, 1 notfree, 2 onlyfree
+    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 Greek
+    lang: 0
+    # 0 name, 1 descr, 2 uploader
+    blah: "{{ if .Query.IMDBID }}1{{ else }}0{{ end }}"
+    # 0 all
+    team: 0
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+    # does not return imdb link in results
+
+  rows:
+    selector: table.ttable_headinner tr.t-row
+
+  fields:
+    category:
+      selector: a[href*="cat="]
+      attribute: href
+      optional: true
+      default: 56
+      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
+      filters:
+        - name: replace
+          args: ["&hit=1", ""] # avoid redirect
+    download:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: href
+      filters:
+        - name: replace
+          args: ["&hit=1", ""] # avoid redirect
+    size:
+      selector: td:nth-last-child(7)
+    date:
+      selector: td:nth-last-child(6)
+      # auto adjusted by site account profile
+      filters:
+        - name: dateparse
+          args: "dd-MM-yyyy HH:mm:ss"
+    grabs:
+      selector: td:nth-last-child(5)
+    seeders:
+      selector: td:nth-last-child(4)
+    leechers:
+      selector: td:nth-last-child(3)
+    downloadvolumefactor:
+      case:
+        img[src="pic/freedownload.gif"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 10 day (as seconds = 10 x 24 x 60 x 60)
+      text: 864000
+# TorrentTrader v2-svn
--- a/src/Jackett.Common/Definitions/hhanclub.yml
+++ b/src/Jackett.Common/Definitions/hhanclub.yml
@@ -10,15 +10,15 @@ links:

 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/MV"}
-    - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
-    - {id: 409, cat: Other, desc: "Misc/其他"}
-    - {id: 408, cat: Audio, desc: "Music/音乐"}
+    - {id: 408, cat: Audio, desc: "HQ Audio"}
+    - {id: 409, cat: Other, desc: "其他"}
+    - {id: 407, cat: TV/Sport, desc: "Sports"}
+    - {id: 406, cat: Audio/Video, desc: "MV"}
+    - {id: 403, cat: TV, desc: "综艺"}
+    - {id: 402, cat: TV, desc: "电视剧"}
+    - {id: 405, cat: TV/Anime, desc: "动漫"}
+    - {id: 404, cat: TV/Documentary, desc: "纪录片"}
+    - {id: 401, cat: Movies, desc: "电影"}

  modes:
    search: [q]
@@ -27,13 +27,19 @@ caps:
    music-search: [q]

 settings:
-  - name: cookie
+  - name: username
    type: text
-    label: Cookie
-  - name: info
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: 2facode
+    type: text
+    label: 2FA code
+  - name: info_2fa
    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>"
+    label: "About 2FA code"
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the HHanClub Web Site. Otherwise just leave it empty."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -60,18 +66,31 @@ settings:
    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.

 login:
-  method: cookie
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
  inputs:
-    cookie: "{{ .Config.cookie }}"
+    secret: <?php echo $secret ?>
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    two_step_code: "{{ .Config.2facode }}"
+    ssl: yes
+    trackerssl: yes
+  error:
+    - selector: td.embedded:has(h2:contains("失败"))
  test:
    path: index.php
-    selector: a[href="usercp.php"]
+    selector: a[href="logout.php"]

 search:
  paths:
    - path: torrents.php
  inputs:
-    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    $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
@@ -86,42 +105,30 @@ search:
    notnewword: 1

  rows:
-    selector: table.torrents > tbody > tr:has(a[href^="details.php?id="])
+    selector: div.w-full:has(a[href^="details.php?id="])

  fields:
    category:
-      selector: a[href^="?cat="]
+      selector: a[href^="?cat[]="]
      attribute: href
      filters:
        - name: querystring
-          args: cat
-    title_default:
-      selector: a[href^="details.php?id="]
+          args: cat[]
    title:
-      selector: a[title][href^="details.php?id="]
-      attribute: title
-      optional: true
-      default: "{{ .Result.title_default }}"
+      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-child(4) > span[title]
+      selector: div.torrent-info-text:nth-child(2) > span[title]
      attribute: title
      optional: true
      filters:
@@ -131,7 +138,7 @@ search:
          args: "yyyy-MM-dd HH:mm:ss zzz"
    date_added:
      # time added
-      selector: td.rowfollow:nth-child(4):not(:has(span))
+      selector: div.torrent-info-text:nth-child(2):not(:has(span))
      optional: true
      filters:
        - name: append
@@ -141,26 +148,26 @@ search:
    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)
+      selector: div.torrent-info-text:nth-child(1)
    seeders:
-      selector: td.rowfollow:nth-child(6)
+      selector: div.torrent-info-text:nth-child(3)
    leechers:
-      selector: td.rowfollow:nth-child(7)
+      selector: div.torrent-info-text:nth-child(4)
    grabs:
-      selector: td.rowfollow:nth-child(8)
+      selector: div.torrent-info-text:nth-child(5)
    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
+        span.promotion-tag-free: 0
+        span.promotion-tag-free2up: 0
+        span.promotion-tag-50pctdown: 0.5
+        span.promotion-tag-50pctdown2up: 0.5
+        span.promotion-tag-30pctdown: 0.3
        "*": 1
    uploadvolumefactor:
      case:
-        img.pro_50pctdown2up: 2
-        img.pro_free2up: 2
-        img.pro_2up: 2
+        span.promotion-tag-50pctdown2up: 2
+        span.promotion-tag-free2up: 2
+        span.promotion-tag-2up: 2
        "*": 1
    minimumratio:
      text: 1.0
@@ -168,6 +175,5 @@ search:
      # 1 day (as seconds = 24 x 60 x 60)
      text: 86400
    description:
-      selector: td.rowfollow:nth-child(2)
-      remove: a, b, font, img, span
-# NexusPHP v1.7.39 2023-05-15
+      selector: div.torrent-title > div > div
+# NexusPHP v1.8.6 2023-08-15 (customised)
--- a/src/Jackett.Common/Definitions/huntorrent.yml
+++ b/src/Jackett.Common/Definitions/huntorrent.yml
@@ -79,7 +79,7 @@ settings:
    options:
      desc: desc
      asc: asc
-  - name: info
+  - 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.
--- a/src/Jackett.Common/Definitions/icc2022.yml
+++ b/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.3 2023-05-14
+# NexusPHP v1.8.6 2023-08-18
--- a/src/Jackett.Common/Definitions/idope.yml
+++ b/src/Jackett.Common/Definitions/idope.yml
@@ -1,6 +1,6 @@
 ---
 id: idope
-name: Idope
+name: iDope
 description: "iDope is a Public torrent search engine presenting direct magnet links"
 language: en-US
 type: public
--- a/src/Jackett.Common/Definitions/ilcorsaronero.yml
+++ b/src/Jackett.Common/Definitions/ilcorsaronero.yml
@@ -11,7 +11,7 @@ links:
  - https://ilcorsaronero.link/
  - https://ilcorsaronero.torrentbay.net/
  - https://ilcorsaronero.mrunblock.bond/
-  - https://ilcorsaronero.nocensor.click/
+  - https://ilcorsaronero.nocensor.cloud/
 legacylinks:
  - https://ilcorsaronero.live/
  - https://ilcorsaronero.vip/
@@ -37,6 +37,7 @@ legacylinks:
  - https://ilcorsaronero.pro/
  - https://ilcorsaronero.mrunblock.guru/
  - https://ilcorsaronero.mrunblock.life/
+  - https://ilcorsaronero.nocensor.click/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/infire.yml
+++ b/src/Jackett.Common/Definitions/infire.yml
@@ -27,6 +27,7 @@ caps:
    - {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"}
+    - {id: 99, cat: Movies/HD, desc: "Filmi BRRip 720p"}
    # TV
    - {id: 23, cat: TV, desc: "TV"}
    - {id: 24, cat: TV/HD, desc: "TV HDTV 720p"}
@@ -37,6 +38,7 @@ caps:
    - {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"}
+    - {id: 98, cat: TV/UHD, desc: "TV BluRay 2160p"}
    # Risanke
    - {id: 26, cat: Movies/Other, desc: "Animirano"}
    - {id: 56, cat: TV/Anime, desc: "Anime"}
--- a/src/Jackett.Common/Definitions/kamept.yml
+++ b/src/Jackett.Common/Definitions/kamept.yml
@@ -31,19 +31,13 @@ caps:
    search: [q]

 settings:
-  - name: username
+  - name: cookie
    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: 2facode
-    type: text
-    label: 2FA code
-  - name: info_2fa
+    label: Cookie
+  - name: info
    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 KamePT Web Site. Otherwise just leave it empty."
+    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
@@ -70,19 +64,9 @@ settings:
    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.

 login:
-  path: takelogin.php
-  method: post
+  method: cookie
  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("失败"))
+    cookie: "{{ .Config.cookie }}"
  test:
    path: index.php
    selector: a[href*="usercp.php"]
@@ -179,4 +163,4 @@ search:
    description:
      selector: td.rowfollow:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP v1.8.2 2023-05-08
+# NexusPHP KEMURIKUSA 2019-01-09
--- a/src/Jackett.Common/Definitions/kufei.yml
+++ b/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.5 2023-07-22
+# NexusPHP v1.8.7 2023-09-03
--- a/src/Jackett.Common/Definitions/limetorrents.yml
+++ b/src/Jackett.Common/Definitions/limetorrents.yml
@@ -9,10 +9,10 @@ followredirect: true
 # changes to this indexer should also be made to limetorrentsclone
 links:
  - https://www.limetorrents.lol/
-  - https://limetorrents.unblockit.rsvp/
-  - https://limetorrents.unblockninja.com/
+  - https://limetorrents.unblockit.esq/
+  - https://limetorrents.ninjaproxy1.com/
  - https://limetorrents.mrunblock.bond/
-  - https://limetorrents.nocensor.click/
+  - https://limetorrents.nocensor.cloud/
 legacylinks:
  - https://www.limetorrents.io/
  - https://www.limetorrents.cc/
@@ -41,6 +41,10 @@ legacylinks:
  - https://limetorrents.unblockit.asia/
  - https://limetorrents.unblockit.mov/
  - https://limetorrents.mrunblock.life/
+  - https://limetorrents.unblockit.rsvp/
+  - https://limetorrents.nocensor.click/
+  - https://limetorrents.unblockninja.com/
+  - https://limetorrents.unblockit.vegas/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/moviesite.yml
+++ b/src/Jackett.Common/Definitions/moviesite.yml
@@ -1,221 +0,0 @@
---
-id: moviesite
-name: Moviesite
-description: "Moviesite is a HUNGARIAN Semi-Private tracker for MOVIES / TV / GENERAL"
-language: hu-HU
-type: semi-private
-encoding: ISO-8859-2
-links:
-  - http://moviesite.info.hu/ # does not support https ERR_CONNECTION_REFUSED
-
-caps:
-  categorymappings:
-    - {id: 25, cat: Movies/SD, desc: "CAM"}
-    - {id: 4, cat: Movies/DVD, desc: "DVD/Eng"}
-    - {id: 3, cat: Movies/DVD, desc: "DVD/Hun"}
-    - {id: 6, cat: Movies/HD, desc: "HD/Eng"}
-    - {id: 5, cat: Movies/HD, desc: "HD/Hun"}
-    - {id: 13, cat: PC/Games, desc: "Játék"}
-    - {id: 20, cat: Other, desc: "Képek"}
-    - {id: 16, cat: Books/EBook, desc: "Könyv"}
-    - {id: 11, cat: Movies, desc: "Mese, Animáció"}
-    - {id: 21, cat: PC/Mobile-Other, desc: "Mobil"}
-    - {id: 23, cat: PC/ISO, desc: "Program/iso"}
-    - {id: 24, cat: PC/0day, desc: "Program/rip"}
-    - {id: 8, cat: TV, desc: "Sorozat/Eng"}
-    - {id: 7, cat: TV, desc: "Sorozat/Hun"}
-    - {id: 2, cat: Movies/SD, desc: "Xvid/Eng"}
-    - {id: 1, cat: Movies/SD, desc: "Xvid/Hun"}
-    - {id: 9, cat: XXX, desc: "XXX-film"}
-    - {id: 19, cat: XXX/ImageSet, desc: "xxx-képek"}
-    - {id: 12, cat: Audio, desc: "Zene"}
-
-  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: Filter freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: added
-    options:
-      added: added
-      size: size
-      seeders: seeders
-  - 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>Torrentek oldalanként</b> setting to <b>40 Torrent oldalanként</b> on your account profile.
-
-login:
-  method: form
-  path: login.php
-  form: form[action="takelogin.php"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    logintype: yes
-  error:
-    - selector: table:contains("Hiba történt!")
-  test:
-    path: index.php
-    selector: a[href*="logout.php?logouthash="]
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    sort_order: yes
-    page: 0
-    do: search
-    # does not support multi categories so defaulting to ALL
-    category: 0
-    keywords: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    # t_both2, t_name, t_t_image4, t_description, t_both, t_uploader, t_genre
-    search_type: "{{ if .Query.IMDBID }}t_genre{{ else }}t_name{{ end }}"
-    sortby: "{{ .Config.sort }}"
-    orderby: "{{ .Config.type }}"
-
-  keywordsfilters:
-    - name: re_replace
-      args: ["(\\w+)", "+$1"] # prepend + to each word
-
-  rows:
-    selector: "table tbody tr:has(a[href*=\"download.php?id=\"]:has(img[src=\"../pic/yes.png\"])){{ if .Config.freeleech }}:has(img[src$=\"freedownload.gif\"]){{ else }}{{ end }}"
-
-  fields:
-    category:
-      selector: a[href*="browse.php?browse_categories"]
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    title_default:
-      # is often abbreviated
-      selector: a[href^="details.php?id="]
-    title:
-      # usually longer than details title
-      selector: a[href*="download.php?id="]:has(img[src="../pic/yes.png"])
-      attribute: title
-      optional: true
-      default: "{{ .Result.title_default }}"
-      filters:
-        - name: replace
-          args: ["Download torrent: ", ""]
-        - name: replace
-          args: ["Torrent letöltése: ", ""]
-        - name: replace
-          args: ["Downloadeaza torentul: ", ""]
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href*="download.php?id="]:has(img[src="../pic/yes.png"])
-      attribute: href
-    poster:
-      selector: div.bottom > img
-      attribute: src
-      filters:
-        - name: replace
-          args: ["../pic/+18.png", ""]
-    genre:
-      selector: font[color="black"]
-      filters:
-        - name: replace
-          args: ["Műfaj:\xA0", ""]
-        - name: replace
-          args: ["Categorie:\xA0", ""]
-        - name: replace
-          args: ["Genre:\xA0", ""]
-        - name: replace
-          args: ["\x09", ""]
-    description:
-      selector: div center font b i
-      filters:
-        - name: append
-          args: "{{ if .Result.genre }}</br>{{ .Result.genre }}{{ else }}{{ end }}"
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    date_today:
-       # Ma 11-06 18:19	 (Today)
-      optional: true
-      selector: td:nth-child(2):contains("Ma ")
-      filters:
-        - name: regexp
-          args: "Ma \\d{2}-\\d{2} (\\d{2}:\\d{2})"
-        - name: prepend
-          args: "Today "
-        - name: append
-          args: " +01:00" # CET
-        - name: fuzzytime
-    date_yday:
-      # Tegnap 11-05 15:15	 (Yesterday)
-      optional: true
-      selector: td:nth-child(2):contains("Tegnap ")
-      filters:
-        - name: regexp
-          args: "Tegnap \\d{2}-\\d{2} (\\d{2}:\\d{2})"
-        - name: prepend
-          args: "Yesterday "
-        - name: append
-          args: " +01:00" # CET
-        - name: fuzzytime
-    date_year:
-      # 2021-10-28 10-28 20:18
-      optional: true
-      selector: td:nth-child(2):not(:contains("Tegnap ")):not(:contains("Ma "))
-      filters:
-        - name: regexp
-          args: "(\\d{4}-\\d{2}-\\d{2} \\d{2}-\\d{2} \\d{2}:\\d{2})"
-        - name: re_replace
-          args: ["(\\d{4}-\\d{2}-\\d{2} )\\d{2}-\\d{2} (\\d{2}:\\d{2})", "$1$2"]
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "yyyy-MM-dd HH: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 }}"
-    size:
-      selector: td:nth-last-child(2)
-    files:
-      selector: td:nth-last-child(6)
-    grabs:
-      selector: td:nth-last-child(2) b b
-    seeders:
-      selector: td:nth-last-child(4)
-    leechers:
-      selector: td:nth-last-child(3)
-    downloadvolumefactor:
-      case:
-        img[src$="freedownload.gif"]: 0
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[src$="x2.gif"]: 2
-        "*": 1
-    minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
-# TS Special Edition v5.6
--- a/src/Jackett.Common/Definitions/movieworld.yml
+++ b/src/Jackett.Common/Definitions/movieworld.yml
@@ -10,33 +10,20 @@ links:

 caps:
  categorymappings:
-    - {id: 1, cat: Movies/SD, desc: "Movie/Xvid"}
-    - {id: 14, cat: Movies/WEB-DL, desc: "Movie/WeBRip"}
-    - {id: 2, cat: Movies/3D, desc: "Movie/3D"}
-    - {id: 3, cat: Movies/SD, desc: "Movie/480p"}
-    - {id: 5, cat: Movies/UHD, desc: "Movie/4k"}
-    - {id: 6, cat: Movies/BluRay, desc: "Movie/BD-R"}
-    - {id: 4, cat: Movies/BluRay, desc: "Movie/BD-Rip"}
-    - {id: 7, cat: Movies/BluRay, desc: "Movie/HD/Bluray"}
-    - {id: 8, cat: Movies, desc: "Movie/Kids"}
-    - {id: 9, cat: Movies/HD, desc: "Movie/MP4"}
-    - {id: 12, cat: Movies/Foreign, desc: "Movie/Non-English"}
+    - {id: 14, cat: Movies/WEB-DL, desc: "Movie/WEB"}
+    - {id: 36, cat: Movies/UHD, desc: "Movie/4K Disc"}
+    - {id: 5, cat: Movies/UHD, desc: "Movie/4K Rip"}
+    - {id: 6, cat: Movies/BluRay, desc: "Movie/BluRay Disc"}
+    - {id: 7, cat: Movies/BluRay, desc: "Movie/BluRay Rip"}
+    - {id: 34, cat: Movies, desc: "Movie/Rest"}
    - {id: 15, cat: Movies, desc: "Movie/Packs"}
-    - {id: 16, cat: Movies/HD, desc: "Movie/x265"}
-    - {id: 17, cat: XXX, desc: "Movie/XXX/Packs"}
-    - {id: 18, cat: Movies, desc: "Movie/Freeleech"}
-    - {id: 19, cat: Movies/DVD, desc: "Movie/DVD-R"}
-    - {id: 20, cat: Movies/SD, desc: "Movie/Cam"}
+    - {id: 20, cat: Movies/SD, desc: "Movie/CAM"}
    - {id: 21, cat: XXX, desc: "Movie/XXX"}
-    - {id: 23, cat: Movies/DVD, desc: "Movie/DvdRip"}
-    - {id: 25, cat: Movies, desc: "V.I.P."}
-    - {id: 32, cat: TV/Anime, desc: "Anime"}
-    - {id: 33, cat: Audio/Video, desc: "Music/Misc"}
+    - {id: 33, cat: Audio/Video, desc: "Music"}
    - {id: 28, cat: TV, desc: "Tv Packs"}
-    - {id: 31, cat: TV, desc: "Tv Mini Packs"}
-    - {id: 29, cat: TV/SD, desc: "Tv Episodes SD"}
-    - {id: 30, cat: TV/HD, desc: "Tv Episodes HD"}
-    - {id: 26, cat: TV/Sport, desc: "Tv Sport SD/HD"}
+    - {id: 31, cat: TV, desc: "Tv Mini Series"}
+    - {id: 30, cat: TV/HD, desc: "Tv Episodes"}
+    - {id: 26, cat: TV/Sport, desc: "Tv Sport"}

  modes:
    search: [q]
--- a/src/Jackett.Common/Definitions/mteamtp.yml
+++ b/src/Jackett.Common/Definitions/mteamtp.yml
@@ -8,7 +8,6 @@ encoding: UTF-8
 requestDelay: 4
 links:
  - https://kp.m-team.cc/
-legacylinks:
  - https://tp.m-team.cc/
  - https://pt.m-team.cc/

--- a/src/Jackett.Common/Definitions/mteamtp2fa.yml
+++ b/src/Jackett.Common/Definitions/mteamtp2fa.yml
@@ -8,7 +8,6 @@ encoding: UTF-8
 requestDelay: 4
 links:
  - https://kp.m-team.cc/
-legacylinks:
  - https://tp.m-team.cc/
  - https://pt.m-team.cc/

--- a/src/Jackett.Common/Definitions/nordichd.yml
+++ b/src/Jackett.Common/Definitions/nordichd.yml
@@ -7,6 +7,8 @@ type: private
 encoding: UTF-8
 links:
  - https://nordichd.org/
+legacylinks:
+  - http://nordichd.org/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/nyaasi.yml
+++ b/src/Jackett.Common/Definitions/nyaasi.yml
@@ -11,7 +11,7 @@ links:
  - https://nyaa.iss.ink/
  - https://nyaa.mrunblock.bond/ # for magnets only
  - https://nyaa.unblockninja.com/ # for magnets only
-  - https://nyaa.nocensor.click/
+  - https://nyaa.nocensor.cloud/
  - https://nyaa.land/
 legacylinks:
  - https://nyaa.black-mirror.xyz/
@@ -29,6 +29,7 @@ legacylinks:
  - https://nyaa.nocensor.art/
  - https://nyaa.mrunblock.guru/
  - https://nyaa.mrunblock.life/
+  - https://nyaa.nocensor.click/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/tellytorrent-api.yml
+++ b/src/Jackett.Common/Definitions/tellytorrent-api.yml
@@ -1,33 +1,22 @@
 ---
-id: tellytorrent-api
-name: TellyTorrent (API)
-description: "TellyTorrent is an INDIAN Private Tracker for MOVIES / TV"
+id: onlyencodes-api
+name: OnlyEncodes (API)
+description: "OnlyEncodes is a Private Tracker for MOVIES / TV"
 language: en-US
 type: private
 encoding: UTF-8
 links:
-  - https://telly.wtf/
-legacylinks:
-  - https://tellytorrent.net/
-  - https://telly.cc/
-  - https://telly.to/
+  - https://onlyencodes.cc/

 caps:
  categorymappings:
    - {id: 1, cat: Movies, desc: "Movie"}
-    - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: Audio, desc: "Music"}
-    - {id: 4, cat: Movies/WEB-DL, desc: "Web Originals"}
-    - {id: 5, cat: PC/Games, desc: "Games"}
-    - {id: 6, cat: PC/0day, desc: "Application"}
-    - {id: 7, cat: PC/Mobile-Other, desc: "Mobile App"}
-    - {id: 8, cat: Movies, desc: "Movies"}
+    - {id: 2, cat: TV, desc: "TV Show"}

  modes:
    search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
    movie-search: [q, imdbid, tmdbid]
-    music-search: [q]

 settings:
  - name: apikey
@@ -36,7 +25,7 @@ settings:
  - name: info_key
    type: info
    label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://telly.wtf/\" target=\"_blank\">TellyTorrent</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://onlyencodes.cc/\" target=\"_blank\">OnlyEncodes</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -166,10 +155,10 @@ search:
      case:
        0: 1 # normal
        1: 2 # double
-# global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
+# global MR is 0.4 but torrents must be seeded for 2 days regardless of ratio
 #    minimumratio:
 #      text: 0.4
    minimumseedtime:
-      # 7 day (as seconds = 7 x 24 x 60 x 60)
-      text: 604800
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
 # json UNIT3D 6.5.0
--- a/src/Jackett.Common/Definitions/oshenpt.yml
+++ b/src/Jackett.Common/Definitions/oshenpt.yml
@@ -188,4 +188,4 @@ search:
    description:
      selector: td:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP v1.8.4 2023-06-13
+# NexusPHP v1.8.7 2023-08-29
--- a/src/Jackett.Common/Definitions/ostwiki.yml
+++ b/src/Jackett.Common/Definitions/ostwiki.yml
@@ -0,0 +1,163 @@
+---
+id: ostwiki
+name: Ostwiki
+description: "Ostwiki is a Private Torrent Tracker for Soundtracks releases."
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://www.ostwiki.com/
+
+caps:
+  categorymappings:
+    - {id: 12, cat: Audio, desc: "Anime Soundtracks"}
+    - {id: 19, cat: Audio, desc: "Discography"}
+    - {id: 13, cat: Audio, desc: "Game Soundtracks"}
+    - {id: 14, cat: Audio, desc: "Movie Soundtracks"}
+    - {id: 18, cat: Audio/MP3, desc: "MP3 Musical"}
+    - {id: 15, cat: Audio, desc: "Musical Soundtracks"}
+    - {id: 17, cat: Audio, desc: "Other Music"}
+    - {id: 20, cat: Audio/Lossless, desc: "Soundtrack .FLAC"}
+    - {id: 16, cat: Audio, desc: "Television Soundtracks"}
+
+  modes:
+    search: [q]
+    music-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Filter freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: added
+    options:
+      added: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>40</b> on your account profile. The Default is <i>15</i>.
+
+login:
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img#regimage
+    input: imagestring
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    logout: ""
+  error:
+    - selector: table:contains("error has occured")
+  test:
+    path: index.php
+    selector: a[href*="/logout.php?logouthash="]
+
+download:
+  before:
+    path: takethanks.php
+    method: post
+    inputs:
+      torrentid: "{{ .DownloadUri.Query.id }}"
+  selectors:
+    - selector: a[href*="download.php?id="]
+      attribute: href
+
+search:
+  paths:
+    - path: browse.php
+  keywordsfilters:
+    - name: re_replace
+      args: ["[\\s]+", "%"]
+  inputs:
+    do: search
+    keywords: "{{ .Keywords }}"
+    # t_name, t_description, t_both, t_uploader, t_genre
+    search_type: t_name
+    # does not support multi category searching so defaulting to all.
+    category: 0
+    # yes, no
+    include_dead_torrents: yes
+    sort: "{{ if .Config.freeleech }}free{{ else }}{{ .Config.sort }}{{ end }}"
+    order: "{{ if .Config.freeleech }}asc{{ else }}{{ .Config.type }}{{ end }}"
+
+  rows:
+    selector: "table.sortable tr:has(a[href*=\"/download.php?id=\"]){{ if .Config.freeleech }}:has(img[src$=\"/freedownload.gif\"]){{ else }}{{ end }}"
+
+  fields:
+    category:
+      selector: a[href*="/browse.php?category="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: category
+    title_default:
+      # is usually abbreaviated
+      selector: a[href*="/details.php?id="]
+    title:
+      # while still abbreviated, is usually longer than the default
+      selector: div.tooltip-content div
+      optional: true
+      default: "{{ .Result.title_default }}"
+    details:
+      selector: a[href*="/details.php?id="]
+      attribute: href
+    download:
+      selector: a[href*="/details.php?id="]
+      attribute: href
+    magnet:
+      selector: a[href^="magnet:?xt="]
+      attribute: href
+    poster:
+      selector: img[src*="/torrents/images/"]
+      attribute: src
+    date:
+      selector: td:nth-child(2)
+      # auto adjusted by site account profile
+      filters:
+        - name: regexp
+          args: "(\\d{2}-\\d{2}-\\d{4} \\d{2}:\\d{2})"
+        - name: dateparse
+          args: "dd-MM-yyyy HH:mm"
+    size:
+      selector: td:nth-last-child(5)
+    grabs:
+      selector: td:nth-last-child(4)
+    seeders:
+      selector: td:nth-last-child(3)
+    leechers:
+      selector: td:nth-last-child(2)
+    description:
+      # Wait: 4 h
+      selector: div.tooltip-content > div:last-child
+    downloadvolumefactor:
+      case:
+        img[src$="/freedownload.gif"]: 0
+        img[src$="/silverdownload.gif"]: 0.5
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img[src$="/x2.gif"]: 2
+        "*": 1
+# TS Special Edition v.8.0
--- a/src/Jackett.Common/Definitions/panda.yml
+++ b/src/Jackett.Common/Definitions/panda.yml
@@ -192,4 +192,4 @@ search:
    description:
      selector: td:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP v1.8.4 2023-06-13
+# NexusPHP v1.8.6 2023-08-04
--- a/src/Jackett.Common/Definitions/pignetwork.yml
+++ b/src/Jackett.Common/Definitions/pignetwork.yml
@@ -40,6 +40,13 @@ settings:
    type: info
    label: How to get the Cookie
    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: useragent
+    type: text
+    label: User-Agent
+  - name: info_useragent
+    type: info
+    label: How to get the User-Agent
+    default: "<ol><li>From the same place you fetched the cookie,</li><li>Find <b>'user-agent:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole user-agent string <i>(everything after 'user-agent: ')</i> and <b>Paste</b> here.</li></ol>"
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -98,6 +105,9 @@ search:
    type: "{{ .Config.type }}"
    notnewword: 1

+  headers:
+    User-Agent: ["{{ .Config.useragent }}"]
+
  rows:
    selector: table.torrents > tbody > tr:has(a[href^="details.php?id="])

--- a/src/Jackett.Common/Definitions/ptcafe.yml
+++ b/src/Jackett.Common/Definitions/ptcafe.yml
@@ -0,0 +1,182 @@
+---
+id: ptcafe
+name: PTCafe
+description: "PTCafe (咖啡) is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - https://ptcafe.club/
+
+caps:
+  categorymappings:
+    - {id: 401, cat: Movies, desc: "电影"}
+    - {id: 402, cat: TV, desc: "剧集"}
+    - {id: 403, cat: TV, desc: "综艺"}
+    - {id: 404, cat: TV/Documentary, desc: "纪录"}
+    - {id: 405, cat: TV/Anime, desc: "动漫"}
+    - {id: 406, cat: Audio/Video, desc: "MV"}
+    - {id: 407, cat: TV/Sport, desc: "体育"}
+    - {id: 408, cat: Audio, desc: "音乐"}
+    - {id: 409, cat: Other, desc: "其他"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
+    music-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: 2facode
+    type: text
+    label: 2FA code
+  - name: info_2fa
+    type: info
+    label: "About 2FA code"
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the PTCafe 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("失败"))
+      message:
+        selector: td.text
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }} {{ else }}{{ .Keywords }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
+    incldead: 0
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl (not used)
+    search_area: "{{ if or .Query.IMDBID .Query.DoubanID }}1{{ else }}0{{ end }}"
+    # 0 AND, 2 exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    notnewword: 1
+
+  rows:
+    selector: table.torrents > tbody > tr:has(table.torrentname)
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_default:
+      selector: a[href^="details.php?id="]
+    title:
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+      optional: true
+      default: "{{ .Result.title_default }}"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    date_elapsed:
+      # time type: time elapsed (default)
+      selector: td:nth-child(4) > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    date_added:
+      # time added
+      selector: td:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-ddHH:mm:ss zzz"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td:nth-child(5)
+    seeders:
+      selector: td:nth-child(6)
+    leechers:
+      selector: td:nth-child(7)
+    grabs:
+      selector: td:nth-child(8)
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    minimumratio:
+      text: 0.8
+    description:
+      selector: td:nth-child(2)
+      remove: a, b, font, img, span
+# NexusPHP v1.8.5 2023-07-29
--- a/src/Jackett.Common/Definitions/pterclub.yml
+++ b/src/Jackett.Common/Definitions/pterclub.yml
@@ -176,4 +176,4 @@ search:
    description:
      selector: td:has(table.torrentname)
      remove: a, img
-# NexusPHP custom v2019.12
+# NexusPHP prod#60d2fdc724a 2023-05-10
--- a/src/Jackett.Common/Definitions/ptlsp.yml
+++ b/src/Jackett.Common/Definitions/ptlsp.yml
@@ -1,34 +1,33 @@
 ---
-id: biho
-name: biho
-description: "biho (必火pt) is a CHINESE Private site for MOVIES / TV / GENERAL"
+id: ptlsp
+name: PTLSP
+description: "PTLSP is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: zh-CN
 type: private
 encoding: UTF-8
 links:
-  - https://www.biho.xyz/
+  - https://www.ptlsp.com/

 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/其他"}
+    - {id: 401, cat: Movies, desc: "Movie(电影)"}
+    - {id: 402, cat: TV, desc: "TV Series(电视剧)"}
+    - {id: 405, cat: TV/Anime, desc: "Anime(动画)"}
+    - {id: 411, cat: Audio, desc: "Music(音乐)"}
+    - {id: 406, cat: Audio/Video, desc: "MV(演唱)"}
+    - {id: 412, cat: PC/0day, desc: "Software(软件)"}
+    - {id: 413, cat: PC/Games, desc: "Game(游戏)"}
+    - {id: 403, cat: TV, desc: "TV Shows(综艺)"}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries(纪录片)"}
+    - {id: 407, cat: TV/Sport, desc: "Sports(体育)"}
+    - {id: 408, cat: Audio, desc: "Audio(音频)"}
+    - {id: 409, 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
@@ -43,7 +42,7 @@ settings:
  - name: info_2fa
    type: info
    label: "About 2FA code"
-    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the biho 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 PTLSP Web Site. Otherwise just leave it empty."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -88,6 +87,8 @@ login:
    trackerssl: yes
  error:
    - selector: td.embedded:has(h2:contains("失败"))
+      message:
+        selector: td.text
  test:
    path: index.php
    selector: a[href="logout.php"]
@@ -104,7 +105,7 @@ search:
    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
    # 0 title, 1 descr, 3 uploader, 4 imdburl
    search_area: "{{ if .Query.IMDBID }}4{{ else }}{{ end }}{{ if .Query.DoubanID }}1{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}0{{ end }}"
-    # 0 AND, 1 OR, 2 exact
+    # 0 AND, 2 exact
    search_mode: 0
    sort: "{{ .Config.sort }}"
    type: "{{ .Config.type }}"
@@ -120,8 +121,13 @@ search:
      filters:
        - name: querystring
          args: cat
-    title:
+    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
@@ -141,17 +147,17 @@ search:
      attribute: href
    date_elapsed:
      # time type: time elapsed (default)
-      selector: td.rowfollow:nth-last-of-type(6) > span[title]
+      selector: td:nth-child(4) > span[title]
      attribute: title
      optional: true
      filters:
        - name: append
-          args: " +08:00"
+          args: " +08:00" # CST
        - 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))
+      selector: td:nth-child(4):not(:has(span))
      optional: true
      filters:
        - name: append
@@ -161,13 +167,13 @@ search:
    date:
      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
    size:
-      selector: td.rowfollow:nth-child(5)
+      selector: td:nth-child(5)
    seeders:
-      selector: td.rowfollow:nth-child(6)
+      selector: td:nth-child(6)
    leechers:
-      selector: td.rowfollow:nth-child(7)
+      selector: td:nth-child(7)
    grabs:
-      selector: td.rowfollow:nth-child(8)
+      selector: td:nth-child(8)
    downloadvolumefactor:
      case:
        img.pro_free: 0
@@ -182,9 +188,7 @@ search:
        img.pro_free2up: 2
        img.pro_2up: 2
        "*": 1
-    minimumratio:
-      text: 1.0
    description:
-      selector: td.rowfollow:nth-child(2)
+      selector: td:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP v1.8.0 2022-12-08
+# NexusPHP v1.8.5 2023-07-29
--- a/src/Jackett.Common/Definitions/ptsbao.yml
+++ b/src/Jackett.Common/Definitions/ptsbao.yml
@@ -39,10 +39,6 @@ settings:
    type: checkbox
    label: Search freeleech only
    default: false
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
  - name: sort
    type: select
    label: Sort requested from site
--- a/src/Jackett.Common/Definitions/r3vwtf.yml
+++ b/src/Jackett.Common/Definitions/r3vwtf.yml
@@ -27,6 +27,7 @@ caps:
    - {id: 40, cat: Audio/Video, desc: "Music Videos"}
    - {id: 22, cat: Audio/Lossless, desc: "Music/Flac"}
    - {id: 51, cat: PC/Games, desc: "PC  GAMES"}
+    - {id: 53, cat: Audio, desc: "Promo Music"}
    - {id: 23, cat: TV, desc: "Tv/Packs"}
    - {id: 16, cat: TV/HD, desc: "Tv/x264"}
    - {id: 49, cat: TV/HD, desc: "Tv/X265"}
@@ -41,6 +42,38 @@ caps:
    music-search: [q]
    book-search: [q]

+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: 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:
  path: login.php
  method: form
@@ -65,11 +98,13 @@ search:
    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
    search: "{{ .Keywords }}"
    # title descr genre all
-    searchin: "title"
+    searchin: title
    # 0 active 1 incldead 2 onlydead
    incldead: 1
    # 1 yes 0 no
-    "only_free": 0
+    only_free: "{{ if .Config.freeleech }}1{{ else }}0{{ end }}"
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"

  rows:
    selector: table[cellpadding="3"] > tbody > tr:has(a[href^="download.php?torrent="])
@@ -122,11 +157,11 @@ search:
      selector: td:nth-last-child(2)
    downloadvolumefactor:
      case:
-        a.info:contains("Free"): 0
+        a.info:contains("Freeleech"): 0
        "*": 1
    uploadvolumefactor:
      case:
-        img[src="./pic/doubleseed.gif"]: 0
+        img[src$="pic/doubleseed.gif"]: 0
        "*": 1
    minimumratio:
      text: 1.0
--- a/src/Jackett.Common/Definitions/redleaves.yml
+++ b/src/Jackett.Common/Definitions/redleaves.yml
@@ -1,24 +1,24 @@
 ---
-id: uploads
-name: Uploads
-description: "Uploads is a CHINESE Private torrent tracker for MOVIES / TV / GENERAL"
+id: redleaves
+name: Red Leaves
+description: "Red Leaves (红叶) is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: zh-CN
 type: private
 encoding: UTF-8
 links:
-  - http://uploads.ltd/
+  - https://leaves.red/

 caps:
  categorymappings:
-    - {id: 401, cat: Movies, desc: "Movies"}
-    - {id: 402, cat: TV, desc: "TV Series"}
-    - {id: 403, cat: TV, desc: "TV Shows"}
-    - {id: 404, cat: TV/Documentary, desc: "Documentaries"}
-    - {id: 405, cat: TV/Anime, desc: "Animations"}
-    - {id: 406, cat: Audio/Video, desc: "Music Videos"}
-    - {id: 407, cat: TV/Sport, desc: "Sports"}
-    - {id: 408, cat: Audio, desc: "HQ Audio"}
-    - {id: 409, cat: Other, desc: "Misc"}
+    - {id: 408, cat: Audio, desc: "HQ Audio (高清音频/音乐)"}
+    - {id: 409, cat: Other, desc: "Misc (杂项/软件/其他)"}
+    - {id: 407, cat: TV/Sport, desc: "Sports (竞技体育)"}
+    - {id: 406, cat: Audio/Video, desc: "Music Videos (音乐录影带)"}
+    - {id: 403, cat: TV, desc: "TV Shows (电视节目)"}
+    - {id: 402, cat: TV, desc: "TV Series (剧集)"}
+    - {id: 405, cat: TV/Anime, desc: "Animations (动画)"}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries (纪实)"}
+    - {id: 401, cat: Movies, desc: "Movies (电影)"}

  modes:
    search: [q]
@@ -39,7 +39,7 @@ settings:
  - name: info_2fa
    type: info
    label: "About 2FA code"
-    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the Uploads Web Site. Otherwise just leave it empty."
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the Red Leaves Web Site. Otherwise just leave it empty."
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -69,6 +69,10 @@ login:
  path: login.php
  method: form
  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
  inputs:
    secret: ""
    username: "{{ .Config.username }}"
@@ -76,10 +80,12 @@ login:
    two_step_code: "{{ .Config.2facode }}"
    logout: ""
    securelogin: ""
-    ssl: ""
-    trackerssl: ""
+    ssl: yes
+    trackerssl: yes
  error:
    - selector: td.embedded:has(h2:contains("失败"))
+      message:
+        selector: td.text
  test:
    path: index.php
    selector: a[href="logout.php"]
@@ -95,8 +101,8 @@ search:
    # 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_area: "{{ if or .Query.IMDBID .Query.DoubanID }}1{{ else }}0{{ end }}"
+    # 0 AND, 2 exact
    search_mode: 0
    sort: "{{ .Config.sort }}"
    type: "{{ .Config.type }}"
@@ -180,6 +186,6 @@ search:
        img.pro_2up: 2
        "*": 1
    description:
-      selector: td:nth-child(2)
+      selector: td.rowfollow:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP v1.7.30 2022-11-05
+# NexusPHP v1.8.5 2023-07-27
--- a/src/Jackett.Common/Definitions/rgfootball.yml
+++ b/src/Jackett.Common/Definitions/rgfootball.yml
@@ -539,6 +539,8 @@ login:
    login_username: "{{ .Config.username }}"
    login_password: "{{ .Config.password }}"
    autologin: 1
+    redirect: index.php
+    login: Вход
  selectorinputs:
    cookie_test:
      selector: input[name="cookie_test"]
--- a/src/Jackett.Common/Definitions/rousi.yml
+++ b/src/Jackett.Common/Definitions/rousi.yml
@@ -86,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_special
+    type: info
+    label: "About the Special area (3X)"
+    default: "Note that the <b>Special area</b> (3X) is only available to ranks <b>Power User</b> and <b>above</b>. If you are a <i>Peasant</i> or <i>User</i> then a search for <i>3X</i> torrents will return <b>0</b> results."

 login:
  path: login.php
@@ -211,4 +215,4 @@ search:
    description:
      selector: td:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP v1.8.4 2023-06-18
+# NexusPHP v1.8.6 2023-08-15
--- a/src/Jackett.Common/Definitions/rutor.yml
+++ b/src/Jackett.Common/Definitions/rutor.yml
@@ -10,7 +10,7 @@ links:
  - http://rutor.is/ # site does not support https ERR_CONNECTION_REFUSED
  - http://new-rutor.org/ # site does not support https ERR_CONNECTION_REFUSED
  - https://rutor.mrunblock.bond/ # for magnet only
-  - https://rutor.nocensor.click/
+  - https://rutor.nocensor.cloud/
 legacylinks:
  - http://live-rutor.org/ # domain expired 9 Feb 2020
  - https://rutor.black-mirror.xyz/
@@ -32,6 +32,7 @@ legacylinks:
  - https://rutor.nocensor.art/
  - https://rutor.mrunblock.guru/
  - https://rutor.mrunblock.life/
+  - https://rutor.nocensor.click/

 caps:
  # unfortunately RuTor does not display categories anywhere in its search results page :-(
--- a/src/Jackett.Common/Definitions/rutracker-ru.yml
+++ b/src/Jackett.Common/Definitions/rutracker-ru.yml
@@ -23,7 +23,7 @@ caps:
    - {id: 1674, cat: Movies/HD, desc: "Кинематограф Российские фильмы в 720p (2022)"}
    - {id: 1673, cat: Movies/HD, desc: "Кинематограф Зарубежные фильмы в 1080p (2022)"}
    - {id: 1672, cat: Movies/HD, desc: "Кинематограф Российские фильмы в 1080р (2022)"}
-    - {id: 1656, cat: Movies, desc: "фильмы (2021)"}
+    - {id: 1656, cat: Movies, desc: "Фильмы 2021 года"}
    - {id: 1662, cat: Movies, desc: " |- Зарубежные фильмы (2021)"}
    - {id: 1661, cat: Movies, desc: " |- Российские фильмы (2021)"}
    - {id: 1660, cat: Movies/HD, desc: " |- Зарубежные фильмы в 720p (2021)"}
@@ -58,10 +58,12 @@ caps:
    - {id: 1328, cat: Movies/HD, desc: " |- Российские фильмы в 720p (2017)"}
    - {id: 1329, cat: Movies/HD, desc: " |- Зарубежные фильмы в 1080p (2017)"}
    - {id: 1330, cat: Movies/HD, desc: " |- Российские фильмы в 1080р (2017)"}
+    - {id: 1715, cat: Movies, desc: " |- Зарубежные фильмы до 1990 г."}
+    - {id: 1716, cat: Movies, desc: " |- Советское кино"}
    - {id: 820, cat: Movies/HD, desc: "Зарубежные фильмы"}
-    - {id: 1346, cat: Movies/UHD, desc: " |- [4K | ULTRA HD | 2160p]"}
-    - {id: 843, cat: Movies/HD, desc: " |- Blu-Ray , BDRip 1080p , HDTV 1080 , WEB-DL 1080р"}
-    - {id: 842, cat: Movies/HD, desc: " |- BDRip 720p , WEB-DL 720p , HDTVRip 720p"}
+    - {id: 1346, cat: Movies/UHD, desc: " |- ФИЛЬМЫ (Ultra HD, 2160p)"}
+    - {id: 843, cat: Movies/HD, desc: " |- ФИЛЬМЫ (Full HD, 1080p)"}
+    - {id: 842, cat: Movies/HD, desc: " |- ФИЛЬМЫ (HD, 720p)"}
    - {id: 840, cat: Movies/DVD, desc: " |- DVD5 , DVD9"}
    - {id: 841, cat: Movies/3D, desc: " |- Фильмы в 3D формате"}
    - {id: 825, cat: Movies, desc: " |- Азиатское кино"}
@@ -77,13 +79,12 @@ caps:
    - {id: 832, cat: Movies, desc: " |- Классика зарубежного кино"}
    - {id: 1608, cat: Movies, desc: " |- Классика зарубежного кино (720p, 1080p)"}
    - {id: 1317, cat: Movies, desc: " |- Детские фильмы, сказки, сериалы"}
-    - {id: 837, cat: Movies, desc: " |- Сборники фильмов , Фильмографии"}
    - {id: 838, cat: Movies, desc: " |- Короткометражные фильмы"}
    - {id: 845, cat: Movies, desc: " |- В оригинале"}
    - {id: 1560, cat: Movies, desc: " |- | - фильмы с переводом UKR"}
    - {id: 798, cat: Movies/HD, desc: "Российские фильмы"}
-    - {id: 817, cat: Movies/HD, desc: " |- Blu-Ray , BDRip 1080p , HDTV 1080 , WEB-DL 1080р"}
-    - {id: 818, cat: Movies/HD, desc: " |- BDRip 720p , WEB-DL 720p , HDTVRip 720p"}
+    - {id: 817, cat: Movies/HD, desc: " |- ФИЛЬМЫ (Full HD, 1080p)"}
+    - {id: 818, cat: Movies/HD, desc: " |- ФИЛЬМЫ (HD, 720p)"}
    - {id: 802, cat: Movies/DVD, desc: " |- DVD5 , DVD9"}
    - {id: 801, cat: Movies/3D, desc: " |- Фильмы в 3D формате"}
    - {id: 815, cat: Movies, desc: " |- Боевик , Приключения , Вестерн"}
@@ -94,8 +95,6 @@ caps:
    - {id: 807, cat: Movies, desc: " |- Мистика , Фэнтези"}
    - {id: 806, cat: Movies, desc: " |- Ужасы , Триллер"}
    - {id: 805, cat: Movies, desc: " |- Фантастика"}
-    - {id: 810, cat: Movies, desc: "| - Кино СССР"}
-    - {id: 1609, cat: Movies, desc: " |- Кино СССР (720p, 1080p)"}
    - {id: 1318, cat: Movies, desc: " |- Детские фильмы, сказки, сериалы"}
    - {id: 804, cat: Movies, desc: " |- Сборники фильмов / Фильмографии"}
    # Сериалы TV
@@ -104,32 +103,32 @@ caps:
    - {id: 1709, cat: TV, desc: " |- Отечественные сериалы"}
    - {id: 1711, cat: TV/HD, desc: " |- Отечественные сериалы (HD Video)"}
    - {id: 1705, cat: TV/WEB-DL, desc: " |- WEBRip, WEB-DLRip, SATRip"}
-    - {id: 1086, cat: TV/HD, desc: " |- BDRip 720p , WEB-DL 720p , HDTVRip 720p"}
-    - {id: 1085, cat: TV/HD, desc: " |- BDRip 1080p , HDTV 1080 , WEB-DL 1080р"}
-    - {id: 1551, cat: TV/UHD, desc: " |- [4K | ULTRA HD | 2160p]"}
-    - {id: 1087, cat: TV/SD, desc: " |- DVD5 , DVD9"}
+    - {id: 1086, cat: TV/HD, desc: " |- Зарубежные сериалы (HD Video)"}
+    - {id: 1085, cat: TV/HD, desc: " |- Зарубежные сериалы (Full HD)"}
+    - {id: 1551, cat: TV/UHD, desc: " |- Зарубежные сериалы 4K"}
+    - {id: 1087, cat: TV/SD, desc: " |- Сериалы на DVD"}
    - {id: 1703, cat: TV/WEB-DL, desc: " |- WEBRip, WEB-DLRip, SATRip"}
-    - {id: 1083, cat: TV/HD, desc: " |- BDRip 720p , WEB-DL 720p , HDTVRip 720p"}
-    - {id: 1082, cat: TV/HD, desc: " |- BDRip 1080p , HDTV 1080 , WEB-DL 1080р"}
-    - {id: 1084, cat: TV/SD, desc: " |- DVD5 , DVD9"}
+    - {id: 1083, cat: TV/HD, desc: " |- Отечественные сериалы (HD Video)"}
+    - {id: 1082, cat: TV/HD, desc: " |- Отечественные сериалы (Full HD)"}
+    - {id: 1084, cat: TV/SD, desc: " |- Сериалы на DVD"}
    # Мультипликация Animation
    - {id: 125, cat: TV, desc: "Мультфильмы"}
-    - {id: 1353, cat: TV/HD, desc: " |- BDRip 1080p , HDTV 1080 , WEB-DL 1080р"}
-    - {id: 1355, cat: TV/HD, desc: " |- BDRip 720p , WEB-DL 720p , HDTVRip 720p"}
-    - {id: 1352, cat: TV/SD, desc: " |- DVD5 , DVD9"}
+    - {id: 1353, cat: TV/HD, desc: " |- Мультфильмы 1080р"}
+    - {id: 1355, cat: TV/HD, desc: " |- Мультфильмы 720p"}
+    - {id: 1352, cat: TV/SD, desc: " |- Мультфильмы на DVD"}
    - {id: 1343, cat: TV/Anime, desc: " |- Аниме"}
    - {id: 1025, cat: TV/Anime, desc: " |- Мультфильмы в 3D формате"}
    - {id: 8, cat: TV, desc: "Мультсериалы"}
-    - {id: 1347, cat: TV/HD, desc: " |- BDRip 1080p , HDTV 1080 , WEB-DL 1080р"}
-    - {id: 1348, cat: TV/HD, desc: " |- BDRip 720p , WEB-DL 720p , HDTVRip 720p"}
-    - {id: 1349, cat: TV/SD, desc: " |- DVD5 , DVD9"}
+    - {id: 1347, cat: TV/HD, desc: " |- Мультсериалы 1080р"}
+    - {id: 1348, cat: TV/HD, desc: " |- Мультсериалы 720p"}
+    - {id: 1349, cat: TV/SD, desc: " |- Мультсериалы на DVD"}
    # Документалистика, развлекательные телепередачи, спорт Docs
    - {id: 11, cat: TV/Documentary, desc: "Документальные фильмы и телепередачи"}
    - {id: 12, cat: TV, desc: "Развлекательные телепередачи"}
    - {id: 13, cat: TV/Sport, desc: "Спорт"}
    # Игры Games
    - {id: 60, cat: PC/Games, desc: "Игры для PC"}
-    - {id: 73, cat: Console, desc: " |- Горячие новинки 2020 года (только AAA проекты)"}
+    - {id: 73, cat: Console, desc: " |- Горячие новинки 2021 года (только AAA проекты)"}
    - {id: 61, cat: Console, desc: " |- Онлайн Игры"}
    - {id: 1234, cat: Console, desc: " |- Симуляторы"}
    - {id: 84, cat: Console, desc: " |- Action"}
@@ -166,8 +165,6 @@ caps:
    - {id: 1636, cat: Audio/MP3, desc: " |- Сборники поп музыки (50/50 общие mp3)"}
    - {id: 1643, cat: Audio/MP3, desc: " |- Зарубежная поп музыка (альбомы, синглы mp3)"}
    - {id: 1637, cat: Audio/MP3, desc: " |- Зарубежная поп-музыка (сборники mp3)"}
-    - {id: 1654, cat: Audio/MP3, desc: " |- Eurodance, Disco, Hi-NRG, Technopop (mp3)"}
-    - {id: 1638, cat: Audio/MP3, desc: " |- Eurodance, Disco, Hi-NRG, Technopop (Сборники mp3)"}
    - {id: 1639, cat: Audio/MP3, desc: " |- Club, Dance, Hands Up (Сборники mp3)"}
    - {id: 1640, cat: Audio/Lossless, desc: " |- Зарубежный шансон (mp3, Lossless)"}
    - {id: 1177, cat: Audio/MP3, desc: "Отечественная поп музыка, шансон и авторская песня"}
@@ -175,7 +172,10 @@ caps:
    - {id: 1427, cat: Audio/MP3, desc: " |- Сборники Российской поп музыки"}
    - {id: 1641, cat: Audio/MP3, desc: " |- Шансон и авторская песня (mp3)"}
    - {id: 1561, cat: Audio/MP3, desc: " |- Сборники Русского шансона"}
-    - {id: 1168, cat: Audio/MP3, desc: "Зарубежный ROCK"}
+    - {id: 1598, cat: Audio/MP3, desc: "Отечественный Rock, Metal"}
+    - {id: 1599, cat: Audio/MP3, desc: " |- Отечественный Rock (mp3)"}
+    - {id: 1600, cat: Audio/MP3, desc: " |- Отечественный Metal (mp3 )"}
+    - {id: 1601, cat: Audio/MP3, desc: " |- Сборники Rock, Metal (mp3)"}
    - {id: 1200, cat: Audio/MP3, desc: " |- Classic Rock&Hard Rock"}
    - {id: 1552, cat: Audio/MP3, desc: " |- Progressive&Art-Rock"}
    - {id: 1565, cat: Audio/MP3, desc: " |- Folk-Rock, Folk-Punk, Songwriter"}
@@ -195,7 +195,6 @@ caps:
    - {id: 1586, cat: Audio/MP3, desc: " |- Sludge, Stoner, Post-Metal"}
    - {id: 1587, cat: Audio/MP3, desc: " |- Thrash, Speed"}
    - {id: 1602, cat: Audio/MP3, desc: " |- Сборники Metal"}
-    - {id: 1589, cat: Audio/MP3, desc: "Зарубежные Alternative, Punk, Independent"}
    - {id: 1590, cat: Audio/MP3, desc: " |- Alternative&Nu-metal"}
    - {id: 1591, cat: Audio/MP3, desc: " |- Punk"}
    - {id: 1592, cat: Audio/MP3, desc: " |- Hardcore"}
@@ -204,6 +203,9 @@ caps:
    - {id: 1595, cat: Audio/MP3, desc: " |- Emocore, Post-hardcore, Metalcore, Deathcore"}
    - {id: 1596, cat: Audio/MP3, desc: " |- Gothic Rock&Dark Folk"}
    - {id: 1597, cat: Audio/MP3, desc: " |- Avant-garde, Experimental Rock"}
+    - {id: 1626, cat: Audio/MP3, desc: " |- Зарубежный джаз (mp3)"}
+    - {id: 1627, cat: Audio/MP3, desc: " |- Зарубежный блюз (mp3)"}
+    - {id: 1628, cat: Audio/MP3, desc: " |- Отечественный джаз и блюз (mp3)"}
    - {id: 1610, cat: Audio/MP3, desc: " |- Goa Trance, Psy-Trance"}
    - {id: 1611, cat: Audio/MP3, desc: " |- PsyChill, Ambient, Dub"}
    - {id: 1457, cat: Audio/MP3, desc: " |- Trance"}
--- a/src/Jackett.Common/Definitions/seedfile.yml
+++ b/src/Jackett.Common/Definitions/seedfile.yml
@@ -102,8 +102,8 @@ search:
      selector: a[href^="details.php?id="]
      attribute: href
    poster:
-      selector: a[href^="details.php?id="]
-      attribute: onmouseover
+      selector: td.numele_tor span[data-original-title]
+      attribute: data-original-title
      filters:
        - name: regexp
          args: "src='(.+?)'"
@@ -115,15 +115,17 @@ search:
    description:
      text: "{{ .Result.genre }}"
    files:
-      selector: td:nth-last-child(7)
+      selector: td:nth-last-child(8)
    date:
-      selector: td:nth-last-child(5)
+      selector: td:nth-last-child(6)
      filters:
        - name: append
          args: " +02:00" # EET
        - name: dateparse
          args: "HH:mm:ssyyyy-MM-dd zzz"
    size:
+      selector: td:nth-last-child(5)
+    grabs:
      selector: td:nth-last-child(4)
    seeders:
      selector: td:nth-last-child(3)
--- a/src/Jackett.Common/Definitions/solidtorrents.yml
+++ b/src/Jackett.Common/Definitions/solidtorrents.yml
@@ -8,9 +8,10 @@ encoding: UTF-8
 requestDelay: 2
 links:
  - https://solidtorrents.to/
-  - https://solidtorrents.nocensor.click/
+  - https://solidtorrents.nocensor.cloud/
 legacylinks:
  - https://solidtorrents.net/
+  - https://solidtorrents.nocensor.click/

 caps:
  categories:
@@ -97,8 +98,9 @@ search:
      filters:
        - name: regexp
          args: ([A-F|a-f|0-9]{40})
-    grabs:
-      selector: div.stats div:has(img[alt="Download"])
+    grabs_dot:
+      selector: div.stats div:has(img[alt="Download"]):contains(".")
+      optional: true
      filters:
        - name: replace
          args: [".", ""]
@@ -106,10 +108,41 @@ search:
          args: ["K", "00"]
        - name: replace
          args: ["M", "00000"]
+    grabs_nodot:
+      selector: div.stats div:has(img[alt="Download"]):not(:contains("."))
+      optional: true
+      filters:
+        - name: replace
+          args: ["K", "000"]
+        - name: replace
+          args: ["M", "000000"]
+    grabs:
+      text: "{{ if or .Result.grabs_dot .Result.grabs_nodot }}{{ or .Result.grabs_dot .Result.grabs_nodot }}{{ else }}0{{ end }}"
    size:
      selector: div.stats div:has(img[alt="Size"])
+    seeders_dot:
+      selector: div.stats div:has(img[alt="Seeder"]):contains(".")
+      optional: true
+      filters:
+        - name: replace
+          args: [".", ""]
+        - name: replace
+          args: ["K", "00"]
+        - name: replace
+          args: ["M", "00000"]
+    seeders_nodot:
+      selector: div.stats div:has(img[alt="Seeder"]):not(:contains("."))
+      optional: true
+      filters:
+        - name: replace
+          args: ["K", "000"]
+        - name: replace
+          args: ["M", "000000"]
    seeders:
-      selector: div.stats div:has(img[alt="Seeder"])
+      text: "{{ if or .Result.seeders_dot .Result.seeders_nodot }}{{ or .Result.seeders_dot .Result.seeders_nodot }}{{ else }}0{{ end }}"
+    leechers_dot:
+      selector: div.stats div:has(img[alt="Leecher"]):contains(".")
+      optional: true
      filters:
        - name: replace
          args: [".", ""]
@@ -117,15 +150,16 @@ search:
          args: ["K", "00"]
        - name: replace
          args: ["M", "00000"]
+    leechers_nodot:
+      selector: div.stats div:has(img[alt="Leecher"]):not(:contains("."))
+      optional: true
+      filters:
+        - name: replace
+          args: ["K", "000"]
+        - name: replace
+          args: ["M", "000000"]
    leechers:
-      selector: div.stats div:has(img[alt="Leecher"])
-      filters:
-        - name: replace
-          args: [".", ""]
-        - name: replace
-          args: ["K", "00"]
-        - name: replace
-          args: ["M", "00000"]
+      text: "{{ if or .Result.leechers_dot .Result.leechers_nodot }}{{ or .Result.leechers_dot .Result.leechers_nodot }}{{ else }}0{{ end }}"
    date:
      selector: div.stats div:has(img[alt="Date"])
      filters:
--- a/src/Jackett.Common/Definitions/spidertk.yml
+++ b/src/Jackett.Common/Definitions/spidertk.yml
@@ -1,261 +0,0 @@
---
-id: spidertk
-name: SpiderTK
-description: "SpiderTK is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: fr-FR
-type: private
-encoding: UTF-8
-links:
-  - https://spidertk.top/
-legacylinks:
-  - https://spidertk.xyz/
-
-caps:
-  categorymappings:
-    - {id: 401, cat: Movies/BluRay, desc: "Films / 2160p / BluRay Full"}
-    - {id: 410, cat: Movies/UHD, desc: "Films / 2160p / REMUX"}
-    - {id: 411, cat: Movies/UHD, desc: "Films / 2160p / AV1"}
-    - {id: 412, cat: Movies/UHD, desc: "Films / 2160p / x265"}
-    - {id: 413, cat: Movies/BluRay, desc: "Films / 1080p / BluRay Full"}
-    - {id: 414, cat: Movies/HD, desc: "Films / 1080p / REMUX"}
-    - {id: 415, cat: Movies/HD, desc: "Films / 1080p / AV1"}
-    - {id: 416, cat: Movies/HD, desc: "Films / 1080p / x265"}
-    - {id: 417, cat: Movies/HD, desc: "Films / 1080p / x264"}
-    - {id: 418, cat: Movies/HD, desc: "Films / 720p / x264"}
-    - {id: 419, cat: Movies/SD, desc: "Films / SD / x264"}
-    - {id: 420, cat: Movies/3D, desc: "Films / 3D"}
-    - {id: 421, cat: Movies/SD, desc: "Films / XviD"}
-    - {id: 422, cat: Movies/HD, desc: "Films / HDTV / 1080p"}
-    - {id: 423, cat: Movies/WEB-DL, desc: "Films / WEB / 1080p"}
-    - {id: 424, cat: TV/Documentary, desc: "Films / Documentaire"}
-    - {id: 425, cat: TV/Sport, desc: "Films / Sport"}
-    - {id: 426, cat: Movies, desc: "Films / Animation"}
-    - {id: 427, cat: Movies/Other, desc: "Films / Spectacle"}
-    - {id: 428, cat: Audio/Video, desc: "Films / Concerts, Clips"}
-    - {id: 430, cat: TV, desc: "Séries / BluRay"}
-    - {id: 431, cat: TV, desc: "Séries / Pack VF"}
-    - {id: 432, cat: TV/HD, desc: "Séries / HD VF"}
-    - {id: 433, cat: TV/SD, desc: "Séries / SD VF"}
-    - {id: 434, cat: TV, desc: "Séries / Pack VOSTFR"}
-    - {id: 435, cat: TV/HD, desc: "Séries / HD VOSTFR"}
-    - {id: 436, cat: TV/SD, desc: "Séries / SD VOSTFR"}
-    - {id: 437, cat: TV/Anime, desc: "Séries / Pack Animé"}
-    - {id: 438, cat: TV/Anime, desc: "Séries / Animé VF"}
-    - {id: 439, cat: TV/Anime, desc: "Séries / Animé VOSTFR"}
-    - {id: 440, cat: Movies/HD, desc: "Films / HDTV / 720p"}
-    - {id: 441, cat: TV/Documentary, desc: "Séries / Documentaire"}
-    - {id: 442, cat: TV/Sport, desc: "Séries / Sport"}
-    - {id: 443, cat: TV, desc: "Séries / Émission TV"}
-    - {id: 444, cat: Books/EBook, desc: "Livres / Roman"}
-    - {id: 445, cat: Audio/Audiobook, desc: "Livres / Audio"}
-    - {id: 446, cat: Books/Mags, desc: "Livres / Magazine"}
-    - {id: 447, cat: Books/Comics, desc: "Livres / Bande Dessinée"}
-    - {id: 448, cat: Books/Comics, desc: "Livres / Comic"}
-    - {id: 449, cat: Books/Comics, desc: "Livres / Manga"}
-    - {id: 450, cat: PC/Games, desc: "Logiciels / Jeu PC"}
-    - {id: 451, cat: PC/Games, desc: "Logiciels / Jeu Mac"}
-    - {id: 452, cat: PC/Games, desc: "Logiciels / Jeu Linux"}
-    - {id: 453, cat: PC/0day, desc: "Logiciels / Appli Windows"}
-    - {id: 454, cat: PC/Mac, desc: "Logiciels / Appli Mac"}
-    - {id: 455, cat: PC, desc: "Logiciels / Appli Linux"}
-    - {id: 456, cat: Console, desc: "Logiciels / Console"}
-    - {id: 457, cat: PC/Mobile-iOS, desc: "Logiciels / iOS"}
-    - {id: 458, cat: Movies/WEB-DL, desc: "Films / WEB / 720p"}
-    - {id: 459, cat: PC/Mobile-Android, desc: "Logiciels / Android"}
-    - {id: 460, cat: Movies, desc: "Films / VO"}
-    - {id: 461, cat: TV, desc: "Séries / VO"}
-    - {id: 462, cat: Movies/WEB-DL, desc: "Films / WEB / SD"}
-    - {id: 463, cat: Movies/WEB-DL, desc: "Films / WEB / 2160p"}
-    - {id: 468, cat: Books/Other, desc: "Livres / Divers"}
-    - {id: 469, cat: Books/Other, desc: "Livres / Bricolage"}
-    - {id: 470, cat: Books/Other, desc: "Livres / RPG"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
-    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 SpiderTK 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: multilang
-    type: checkbox
-    label: Replace MULTi by another language in release name
-    default: false
-  - name: multilanguage
-    type: select
-    label: Replace MULTi by this language
-    default: FRENCH
-    options:
-      FRENCH: FRENCH
-      MULTi FRENCH: MULTi FRENCH
-      ENGLISH: ENGLISH
-      MULTi ENGLISH: MULTi ENGLISH
-      VOSTFR: VOSTFR
-      MULTi VOSTFR: MULTi VOSTFR
-  - name: vostfr
-    type: checkbox
-    label: Replace VOSTFR and SUBFRENCH with ENGLISH
-    default: false
-  - name: info_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:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    two_step_code: "{{ .Config.2facode }}"
-    logout: ""
-    securelogin: ""
-    ssl: yes
-    trackerssl: yes
-  error:
-    - selector: td.embedded:has(h2:contains("Echoué")) # invalid captcha
-    - selector: td.embedded:has(h2:contains("Échec")) # invalid uid or pwd
-      message:
-        selector: td.text
-  test:
-    path: index.php
-    selector: a[href*="logout.php"]
-
-search:
-  paths:
-    - path: torrents.php
-  inputs:
-    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .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 }}"
-    inclbookmarked: 0
-    # 0 title, 1 descr, 3 uploader, 4 imdburl
-    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
-    # 0 AND, 1 OR, 2 exact
-    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_phase1:
-      selector: a[href^="details.php?id="]
-    title_vostfr:
-      text: "{{ .Result.title_phase1 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)\\b(vostfr|subfrench)\\b", "ENGLISH"]
-    title_phase2:
-      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
-    title_multilang:
-      text: "{{ .Result.title_phase2 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)\\b(MULTI(?!.*(?:FRENCH|ENGLISH|VOSTFR)))\\b", "{{ .Config.multilanguage }}"]
-    title:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    poster:
-      selector: img[data-src]
-      attribute: data-src
-    date_elapsed:
-      # time type: time elapsed (default)
-      selector: td.rowfollow:nth-child(4) > span[title]
-      attribute: title
-      optional: true
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "yyyy-MM-dd HH:mm:ss zzz"
-    date_added:
-      # time added
-      selector: td.rowfollow:nth-child(4):not(:has(span))
-      optional: true
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "yyyy-MM-ddHH:mm:ss zzz"
-    date:
-      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
-    size:
-      selector: td.rowfollow:nth-child(5)
-    seeders:
-      selector: td.rowfollow:nth-child(6)
-    leechers:
-      selector: td.rowfollow:nth-child(7)
-    grabs:
-      selector: td.rowfollow:nth-child(8)
-    downloadvolumefactor:
-      case:
-        img[src="pic/freeleech.png"]: 0
-        img[src="pic/2xupfree.png"]: 0
-        img[src="pic/50pc.png"]: 0.5
-        img[src="pic/2x50pc.png"]: 0.5
-        img[src="pic/30pc.png"]: 0.3
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[src="pic/2x.png"]: 2
-        img[src="pic/2xupfree.png"]: 2
-        img[src="pic/2x50pc.png"]: 2
-        "*": 1
-    minimumratio:
-      text: 0.81
-# NexusPHP v1.7.33 2022-12-19 (custom)
--- a/src/Jackett.Common/Definitions/superbits.yml
+++ b/src/Jackett.Common/Definitions/superbits.yml
@@ -58,6 +58,10 @@ settings:
    type: checkbox
    label: Search freeleech only
    default: false
+  - name: p2p_releases_only
+    type: checkbox
+    label: Search P2P releases only
+    default: false
  - name: sort
    type: select
    label: Sort requested from site
@@ -102,6 +106,7 @@ search:
    noaudio: false
    nosub: false
    order: "{{ .Config.type }}"
+    p2p: "{{ if .Config.p2p_releases_only }}true{{ else }}{{ end }}"
    page: search
    searchText: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }} {{ else }}{{ end }}{{ .Keywords }}"
    section: all
--- a/src/Jackett.Common/Definitions/theoldschool-api.yml
+++ b/src/Jackett.Common/Definitions/theoldschool-api.yml
@@ -207,6 +207,9 @@ search:
      case:
        0: 1 # normal
        1: 2 # double
+# global MR is 0.6 but torrents must be seeded for 2 days regardless of ratio
+#    minimumratio:
+#      text: 0.6
    minimumseedtime:
      # 2 days (as seconds = 2 x 24 x 60 x 60)
      text: 172800
--- a/src/Jackett.Common/Definitions/thepiratebay.yml
+++ b/src/Jackett.Common/Definitions/thepiratebay.yml
@@ -74,14 +74,17 @@ caps:
    # Video
    - {id: 200, cat: Movies, desc: "Video"}
    - {id: 201, cat: Movies, desc: "Movies"}
-    - {id: 202, cat: Movies, desc: "Movies"}
+    - {id: 202, cat: Movies, desc: "Movies DVDR"}
    - {id: 203, cat: Audio/Video, desc: "Music Videos"}
    - {id: 204, cat: Movies/Other, desc: "Movie Clips"}
-    - {id: 205, cat: TV, desc: "TV"}
+    - {id: 205, cat: TV, desc: "TV Shows"}
    - {id: 206, cat: TV/Other, desc: "Handheld"}
    - {id: 207, cat: Movies/HD, desc: "HD - Movies"}
    - {id: 208, cat: TV/HD, desc: "HD - TV shows"}
    - {id: 209, cat: Movies/3D, desc: "3D"}
+    - {id: 210, cat: Movies/SD, desc: "CAM/TS"}
+    - {id: 211, cat: Movies/UHD, desc: "UHD/4k - Movies"}
+    - {id: 212, cat: TV/UHD, desc: "UHD/4k - TV shows"}
    - {id: 299, cat: Movies/Other, desc: "Video Other"}
    # Applications
    - {id: 300, cat: PC, desc: "Applications"}
@@ -109,12 +112,13 @@ caps:
    - {id: 502, cat: XXX/DVD, desc: "Movies DVDR"}
    - {id: 503, cat: XXX/ImageSet, desc: "Pictures"}
    - {id: 504, cat: XXX, desc: "Games"}
-    - {id: 505, cat: XXX, desc: "HD - Movies"}
+    - {id: 505, cat: XXX/x264, desc: "HD - Movies"}
    - {id: 506, cat: XXX, desc: "Movie Clips"}
+    - {id: 507, cat: XXX/UHD, desc: "UHD/4k - Movies"}
    - {id: 599, cat: XXX/Other, desc: "Porn other"}
    # Other
    - {id: 600, cat: Other, desc: "Other"}
-    - {id: 601, cat: Books, desc: "E-books"}
+    - {id: 601, cat: Books/EBook, desc: "E-books"}
    - {id: 602, cat: Books/Comics, desc: "Comics"}
    - {id: 603, cat: Books, desc: "Pictures"}
    - {id: 604, cat: Books, desc: "Covers"}
--- a/src/Jackett.Common/Definitions/thorsland.yml
+++ b/src/Jackett.Common/Definitions/thorsland.yml
@@ -16,20 +16,30 @@ caps:
    - {id: 67, cat: PC/Mac, desc: "iOS"}
    # AUTRES
    - {id: 104, cat: Other, desc: "AUTRES"}
-    # DOCUMENTAIRES
+    # DOCUMENTAIRES FILM
    - {id: 72, cat: TV/Documentary, desc: "4K UHD"}
    - {id: 70, cat: TV/Documentary, desc: "HD 1080p"}
    - {id: 71, cat: TV/Documentary, desc: "HD 720p"}
-    - {id: 81, cat: TV/Documentary, desc: "PACK 4K"}
-    - {id: 80, cat: TV/Documentary, desc: "PACK HD"}
-    - {id: 79, cat: TV/Documentary, desc: "PACK SD"}
+    - {id: 119, cat: TV/Documentary, desc: "Québec HD"}
+    - {id: 118, cat: TV/Documentary, desc: "Québec SD"}
    - {id: 69, cat: TV/Documentary, desc: "SD"}
-    - {id: 75, cat: TV/Documentary, desc: "SÉRIES 4K"}
-    - {id: 74, cat: TV/Documentary, desc: "SÉRIES HD"}
-    - {id: 73, cat: TV/Documentary, desc: "SÉRIES SD"}
    - {id: 78, cat: TV/Documentary, desc: "V.O.S.T. 4K"}
    - {id: 77, cat: TV/Documentary, desc: "V.O.S.T. HD"}
    - {id: 76, cat: TV/Documentary, desc: "V.O.S.T. SD"}
+    # DOCUMENTAIRES SERIES
+    - {id: 81, cat: TV/Documentary, desc: "PACK 4K"}
+    - {id: 80, cat: TV/Documentary, desc: "PACK HD"}
+    - {id: 121, cat: TV/Documentary, desc: "PACK HD QC"}
+    - {id: 79, cat: TV/Documentary, desc: "PACK SD"}
+    - {id: 121, cat: TV/Documentary, desc: "PACK SD QC"}
+    - {id: 117, cat: TV/Documentary, desc: "Québec HD"}
+    - {id: 116, cat: TV/Documentary, desc: "Québec SD"}
+    - {id: 75, cat: TV/Documentary, desc: "SÉRIES 4K"}
+    - {id: 74, cat: TV/Documentary, desc: "SÉRIES HD"}
+    - {id: 73, cat: TV/Documentary, desc: "SÉRIES SD"}
+    - {id: 115, cat: TV/Documentary, desc: "V.O.S.T. 4K"}
+    - {id: 114, cat: TV/Documentary, desc: "V.O.S.T. HD"}
+    - {id: 113, cat: TV/Documentary, desc: "V.O.S.T. SD"}
    # FILMS
    - {id: 11, cat: Movies/3D, desc: "3D"}
    - {id: 12, cat: Movies/UHD, desc: "4K UHD"}
@@ -207,7 +217,7 @@ download:
      to: give
      torrent: "{{ .DownloadUri.Query.id }}"
  selectors:
-    - selector: a[href^="download?id="]
+    - selector: a[href^="download?id="], a[href^="magnet:?xt="]
      attribute: href

 search:
@@ -262,9 +272,6 @@ search:
    download:
      selector: a[href^="/torrents-details?id="]
      attribute: href
-    magnet:
-      selector: a[href^="magnet:?xt="]
-      attribute: href
    poster:
      selector: img[src^="uploads/images/"]
      attribute: src
--- a/src/Jackett.Common/Definitions/tokyotosho.yml
+++ b/src/Jackett.Common/Definitions/tokyotosho.yml
@@ -8,7 +8,7 @@ encoding: UTF-8
 links:
  - https://www.tokyotosho.info/
  - https://tokyotosho.mrunblock.bond/
-  - https://tokyotosho.nocensor.click/
+  - https://tokyotosho.nocensor.cloud/
 legacylinks:
  - https://tokyotosho.black-mirror.xyz/
  - https://tokyotosho.unblocked.casa/
@@ -29,6 +29,7 @@ legacylinks:
  - https://tokyotosho.nocensor.art/
  - https://tokyotosho.mrunblock.guru/
  - https://tokyotosho.mrunblock.life/
+  - https://tokyotosho.nocensor.click/

 settings:
  - name: cat
--- a/src/Jackett.Common/Definitions/torlock.yml
+++ b/src/Jackett.Common/Definitions/torlock.yml
@@ -10,14 +10,12 @@ requestDelay: 2
 links:
  - https://www.torlock2.com/
  - https://www.torlock.com/
-  - https://torlock.unblockit.rsvp/
-  - https://torlock.nocensor.click/
+  - https://torlock.unblockit.esq/
+  - https://torlock.nocensor.cloud/
  - https://torlock.mrunblock.bond/
 legacylinks:
  - https://torlock.com/
  - https://torlock.nocensor.biz/
-  - https://torlock.unblockit.llc/
-  - https://torlock.unblockit.blue/
  - https://www.torlock.icu/
  - https://torlock.unblockit.name/
  - https://torlock.nocensor.sbs/
@@ -37,6 +35,9 @@ legacylinks:
  - https://torlock.unblockit.asia/
  - https://torlock.mrunblock.life/ # This web property is not accessible via this address
  - https://torlock.unblockit.mov/
+  - https://torlock.unblockit.rsvp/
+  - https://torlock.nocensor.click/
+  - https://torlock.unblockit.vegas/

 caps:
  # dont forget to update the search fields category case block
--- a/src/Jackett.Common/Definitions/torrent9.yml
+++ b/src/Jackett.Common/Definitions/torrent9.yml
@@ -118,10 +118,6 @@ search:
    - name: replace
      args: [" ", "-"]

-  headers:
-    # site blocks Jackett's Linux User-Agent, so use Jackett's Windows User-Agent instead
-    User-Agent: ["Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"]
-
  rows:
    selector: table.table-striped > tbody > tr
    filters:
--- a/src/Jackett.Common/Definitions/torrent911.yml
+++ b/src/Jackett.Common/Definitions/torrent911.yml
@@ -11,6 +11,7 @@ links:
  - https://www.torrent911.io/
  - https://t911.org/
  - https://oxtorrent.unblockninja.com/
+  - https://torrent911.ninjaproxy1.com/
 legacylinks:
  - https://www.protege-liens.com/
  - https://oxtorrent.nocensor.work/
--- a/src/Jackett.Common/Definitions/torrent9clone.yml
+++ b/src/Jackett.Common/Definitions/torrent9clone.yml
@@ -8,27 +8,12 @@ encoding: UTF-8
 followredirect: true
 # to fetch current domain use https://www.protege-torrent.com/Torrent9
 links:
-  - https://www.torrent9.fi/
-  - https://torrent9.nocensor.click/
+  - https://www.torrent9.gs/
+  - https://torrent9.nocensor.cloud/
  - https://torrent9.mrunblock.bond/
 legacylinks:
-  - https://wwv.torrent9.one/
-  - https://vww.torrent9.one/
-  - https://www.torrent9.srl/
-  - https://www.torrent9.la/
-  - https://www.torrent9.ninja/
-  - https://torrent9.nocensor.space/
-  - https://torrent9.nocensor.work/
-  - https://www.torrent9.pw/
-  - https://www.torrent9.si/
-  - https://torrent9.nocensor.biz/
-  - https://www.torrent9.nl/
-  - https://www.torrent9.re/
-  - https://torrent9.nocensor.sbs/
  - https://ww1.torrent9.re/
  - http://ww2.torrent9.re/
-  - https://torrent9.nocensor.world/
-  - https://torrent9.nocensor.lol/
  - https://ww2.torrent9.re/
  - http://ww5.torrent9.re/
  - https://ww5.torrent9.re/
@@ -38,6 +23,14 @@ legacylinks:
  - https://www.torrent9.cm/
  - https://torrent9.nocensor.art/
  - https://torrent9.mrunblock.life/
+  - https://www.torrent9.fi/
+  - https://www.torrent9.wtf/
+  - https://www.torrent9.sc/
+  - https://torrent9.nocensor.click/
+  - https://www.torrent9.moe/
+  - https://ww2.torrent9.moe/
+  - https://wwv.torrent9.moe/
+  - https://www.torrent9.pro/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/torrentdownload.yml
+++ b/src/Jackett.Common/Definitions/torrentdownload.yml
@@ -8,15 +8,13 @@ encoding: UTF-8
 followredirect: true
 links:
  - https://www.torrentdownload.info/
-  - https://torrentdownload.unblockit.rsvp/
+  - https://torrentdownload.unblockit.esq/
  - https://torrentdownload.mrunblock.bond/
-  - https://torrentdownload.nocensor.click/
+  - https://torrentdownload.nocensor.cloud/
 legacylinks:
  - https://torrentdownload.nocensor.space/
  - https://torrentdownload.nocensor.work/
  - https://torrentdownload.nocensor.biz/
-  - https://torrentdownload.unblockit.llc/
-  - https://torrentdownload.unblockit.blue/
  - https://torrentdownload.unblockit.name/
  - https://torrentdownload.nocensor.sbs/
  - https://torrentdownload.unblockit.ist/
@@ -35,6 +33,9 @@ legacylinks:
  - https://torrentdownload.unblockit.asia/
  - https://torrentdownload.unblockit.mov/
  - https://torrentdownload.mrunblock.life/
+  - https://torrentdownload.unblockit.rsvp/
+  - https://torrentdownload.nocensor.click/
+  - https://torrentdownload.unblockit.vegas/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/torrentdownloads.yml
+++ b/src/Jackett.Common/Definitions/torrentdownloads.yml
@@ -8,16 +8,14 @@ encoding: UTF-8
 followredirect: true
 links:
  - https://www.torrentdownloads.pro/
-  - https://torrentdownloads.unblockit.rsvp/
+  - https://torrentdownloads.unblockit.esq/
  - https://torrentdownloads.mrunblock.bond/
  - https://torrentdownloads.unblockninja.com/
-  - https://torrentdownloads.nocensor.click/
+  - https://torrentdownloads.nocensor.cloud/
 legacylinks:
  - https://www.torrentdownloads.me/
  - https://torrentdownloads.nocensor.work/
  - https://torrentdownloads.nocensor.biz/
-  - https://torrentdownloads.unblockit.llc/
-  - https://torrentdownloads.unblockit.blue/
  - https://torrentdownloads.unblockit.name/
  - https://torrentdownloads.nocensor.sbs/
  - https://torrentdownloads.unblockit.ist/
@@ -37,6 +35,9 @@ legacylinks:
  - https://torrentdownloads.unblockit.asia/
  - https://torrentdownloads.unblockit.mov/
  - https://torrentdownloads.mrunblock.life/
+  - https://torrentdownloads.unblockit.rsvp/
+  - https://torrentdownloads.nocensor.click/
+  - https://torrentdownloads.unblockit.vegas/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/torrentfunk.yml
+++ b/src/Jackett.Common/Definitions/torrentfunk.yml
@@ -9,15 +9,14 @@ followredirect: true
 links:
  - https://www.torrentfunk.com/
  - https://www.torrentfunk2.com/
-  - https://torrentfunk.unblockit.rsvp/
-  - https://torrentfunk.nocensor.click/
+  - https://torrentfunk.unblockit.esq/
+  - https://torrentfunk.nocensor.cloud/
  - https://torrentfunk.mrunblock.bond/
+  - https://torrentfunk.ninjaproxy1.com/
 legacylinks:
  - https://torrentfunk.nocensor.space/
  - https://torrentfunk.nocensor.work/
  - https://torrentfunk.nocensor.biz/
-  - https://torrentfunk.unblockit.llc/
-  - https://torrentfunk.unblockit.blue/
  - https://torrentfunk.unblockit.name/
  - https://torrentfunk.nocensor.sbs/
  - https://torrentfunk.unblockit.ist/
@@ -36,6 +35,9 @@ legacylinks:
  - https://torrentfunk.unblockit.asia/
  - https://torrentfunk.mrunblock.life/ # This web property is not accessible via this address
  - https://torrentfunk.unblockit.mov/
+  - https://torrentfunk.unblockit.rsvp/
+  - https://torrentfunk.nocensor.click/
+  - https://torrentfunk.unblockit.vegas/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/torrentgalaxy.yml
+++ b/src/Jackett.Common/Definitions/torrentgalaxy.yml
@@ -11,7 +11,7 @@ links:
  - https://torrentgalaxy.mx/
  - https://tgx.rs/
  - https://tgx.sb/
-  - https://torrentgalaxy.unblockit.rsvp/
+  - https://torrentgalaxy.unblockit.esq/
  - https://torrentgalaxy.unblockninja.com/
 legacylinks:
  - https://torrentgalaxy.org/ # redirects to *.to
@@ -20,8 +20,6 @@ legacylinks:
  - https://torrentgalaxy.nocensor.space/
  - https://torrentgalaxy.nocensor.work/
  - https://torrentgalaxy.nocensor.biz/
-  - https://torrentgalaxy.unblockit.llc/
-  - https://torrentgalaxy.unblockit.blue/
  - https://torrentgalaxy.unblockit.name/
  - https://torrentgalaxy.nocensor.sbs/
  - https://torrentgalaxy.unblockit.ist/
@@ -37,6 +35,8 @@ legacylinks:
  - https://torrentgalaxy.unblockit.click/
  - https://torrentgalaxy.unblockit.asia/
  - https://torrentgalaxy.unblockit.mov/
+  - https://torrentgalaxy.unblockit.rsvp/
+  - https://torrentgalaxy.unblockit.vegas/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/torrentleech.yml
+++ b/src/Jackett.Common/Definitions/torrentleech.yml
@@ -17,59 +17,54 @@ legacylinks:

 caps:
  categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
    - {id: 8, cat: Movies/SD, desc: "Movies Cam"}
    - {id: 9, cat: Movies/SD, desc: "Movies TS/TC"}
    - {id: 11, cat: Movies/SD, desc: "Movies DVDRip/DVDScreener"}
-    - {id: 12, cat: Movies/DVD, desc: "Movies DVD-R"}
-    - {id: 13, cat: Movies/BluRay, desc: "Movies Bluray"}
-    - {id: 14, cat: Movies/HD, desc: "Movies BlurayRip"}
-    - {id: 15, cat: Movies, desc: "Movies Boxsets"}
-    - {id: 29, cat: TV/Documentary, desc: "Documentaries"}
-    - {id: 47, cat: Movies/UHD, desc: "Movies 4K"}
-    - {id: 36, cat: Movies/Foreign, desc: "Movies Foreign"}
    - {id: 37, cat: Movies/WEB-DL, desc: "Movies WEBRip"}
    - {id: 43, cat: Movies/HD, desc: "Movies HDRip"}
+    - {id: 14, cat: Movies/HD, desc: "Movies BlurayRip"}
+    - {id: 12, cat: Movies/DVD, desc: "Movies DVD-R"}
+    - {id: 13, cat: Movies/BluRay, desc: "Movies Bluray"}
+    - {id: 47, cat: Movies/UHD, desc: "Movies 4K"}
+    - {id: 15, cat: Movies, desc: "Movies Boxsets"}
+    - {id: 29, cat: TV/Documentary, desc: "Documentaries"}

-    - {id: 2, cat: TV, desc: "TV"}
    - {id: 26, cat: TV/SD, desc: "TV Episodes"}
-    - {id: 27, cat: TV, desc: "TV Boxsets"}
    - {id: 32, cat: TV/HD, desc: "TV Episodes HD"}
-    - {id: 44, cat: TV/Foreign, desc: "TV Foreign"}
+    - {id: 27, cat: TV, desc: "TV Boxsets"}

-    - {id: 3, cat: PC/Games, desc: "Games"}
    - {id: 17, cat: PC/Games, desc: "Games PC"}
+    - {id: 42, cat: PC/Mac, desc: "Games Mac"}
    - {id: 18, cat: Console/XBox, desc: "Games XBOX"}
    - {id: 19, cat: Console/XBox 360, desc: "Games XBOX360"}
    - {id: 40, cat: Console/XBox One, desc: "Games XBOXONE"}
    - {id: 20, cat: Console/PS3, desc: "Games PS2"}
    - {id: 21, cat: Console/PS3, desc: "Games Mac"}
+    - {id: 39, cat: Console/PS4, desc: "Games PS4"}
+    - {id: 49, cat: Console/PS4, desc: "Games PS5"}
    - {id: 22, cat: Console/PSP, desc: "Games PSP"}
    - {id: 28, cat: Console/Wii, desc: "Games Wii"}
    - {id: 30, cat: Console/NDS, desc: "Games Nintendo DS"}
-    - {id: 39, cat: Console/PS4, desc: "Games PS4"}
-    - {id: 42, cat: PC/Mac, desc: "Games Mac"}
    - {id: 48, cat: Console/Other, desc: "Games Nintendo Switch"}

-    - {id: 4, cat: Audio, desc: "Music"}
-    - {id: 16, cat: Audio/Video, desc: "Music videos"}
-    - {id: 31, cat: Audio, desc: "Audio"}
-
-    - {id: 7, cat: TV, desc: "Animation"}
-    - {id: 34, cat: TV/Anime, desc: "TV Anime"}
-    - {id: 35, cat: TV, desc: "TV Cartoons"}
-
-    - {id: 5, cat: Books, desc: "Books"}
-    - {id: 45, cat: Books/EBook, desc: "Books EBooks"}
-    - {id: 46, cat: Books/Comics, desc: "Books Comics"}
-
-    - {id: 6, cat: PC, desc: "Apps"}
    - {id: 23, cat: PC/ISO, desc: "PC ISO"}
    - {id: 24, cat: PC/Mac, desc: "PC Mac"}
    - {id: 25, cat: PC/Mobile-Other, desc: "PC Mobile"}
    - {id: 33, cat: PC/0day, desc: "PC 0-day"}
    - {id: 38, cat: Other, desc: "Education"}

+    - {id: 34, cat: TV/Anime, desc: "TV Anime"}
+    - {id: 35, cat: TV, desc: "TV Cartoons"}
+
+    - {id: 45, cat: Books/EBook, desc: "Books EBooks"}
+    - {id: 46, cat: Books/Comics, desc: "Books Comics"}
+
+    - {id: 31, cat: Audio, desc: "Audio"}
+    - {id: 16, cat: Audio/Video, desc: "Music videos"}
+
+    - {id: 36, cat: Movies/Foreign, desc: "Movies Foreign"}
+    - {id: 44, cat: TV/Foreign, desc: "TV Foreign"}
+
  modes:
    search: [q]
    tv-search: [q, season, ep, imdbid]
--- a/src/Jackett.Common/Definitions/torrentqq.yml
+++ b/src/Jackett.Common/Definitions/torrentqq.yml
@@ -7,14 +7,8 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentqq267.com/
+  - https://torrentqq273.com/
 legacylinks:
-  - https://torrentqq252.com/
-  - https://torrentqq253.com/
-  - https://torrentqq254.com/
-  - https://torrentqq255.com/
-  - https://torrentqq256.com/
-  - https://torrentqq257.com/
  - https://torrentqq258.com/
  - https://torrentqq259.com/
  - https://torrentqq260.com/
@@ -24,6 +18,12 @@ legacylinks:
  - https://torrentqq264.com/
  - https://torrentqq265.com/
  - https://torrentqq266.com/
+  - https://torrentqq267.com/
+  - https://torrentqq268.com/
+  - https://torrentqq269.com/
+  - https://torrentqq270.com/
+  - https://torrentqq271.com/
+  - https://torrentqq272.com/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/torrentsir.yml
+++ b/src/Jackett.Common/Definitions/torrentsir.yml
@@ -7,18 +7,8 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentsir113.com/
+  - https://torrentsir118.com/
 legacylinks:
-  - http://torrentsir94.com/
-  - https://torrentsir94.com/
-  - http://torrentsir95.com/
-  - https://torrentsir95.com/
-  - http://torrentsir96.com/
-  - https://torrentsir96.com/
-  - http://torrentsir100.com/
-  - https://torrentsir100.com/
-  - http://torrentsir101.com/
-  - https://torrentsir101.com/
  - http://torrentsir102.com/
  - https://torrentsir102.com/
  - http://torrentsir103.com/
@@ -40,6 +30,16 @@ legacylinks:
  - http://torrentsir112.com/
  - https://torrentsir112.com/
  - http://torrentsir113.com/
+  - https://torrentsir113.com/
+  - http://torrentsir114.com/
+  - https://torrentsir114.com/
+  - http://torrentsir115.com/
+  - https://torrentsir115.com/
+  - http://torrentsir116.com
+  - https://torrentsir116.com/
+  - http://torrentsir117.com/
+  - https://torrentsir117.com/
+  - http://torrentsir118.com/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/torrentview.yml
+++ b/src/Jackett.Common/Definitions/torrentview.yml
@@ -7,11 +7,10 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://viewtorrent12.com/
+  - https://viewtorrent14.com/
 legacylinks:
  - https://torrentview.net/
  - https://torrentview.co/
-  - https://torrentview63.com/
  - https://torrentview65.com/
  - https://torrentview66.com/
  - https://torrentview67.com/
@@ -25,6 +24,8 @@ legacylinks:
  - https://viewtorrent8.com/
  - https://viewtorrent10.com/
  - https://viewtorrent11.com/
+  - https://viewtorrent12.com/
+  - https://viewtorrent13.com/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/torrentwhiz.yml
+++ b/src/Jackett.Common/Definitions/torrentwhiz.yml
@@ -7,9 +7,8 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentwiz60.com/
+  - https://torrentwiz62.com/
 legacylinks:
-  - https://torrentwiz42.com/
  - https://torrentwiz43.com/
  - https://torrentwiz45.com/
  - https://torrentwiz47.com/
@@ -25,6 +24,8 @@ legacylinks:
  - https://torrentwiz57.com/
  - https://torrentwiz58.com/
  - https://torrentwiz59.com/
+  - https://torrentwiz60.com/
+  - https://torrentwiz61.com/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/torrentz2eu.yml
+++ b/src/Jackett.Common/Definitions/torrentz2eu.yml
@@ -8,8 +8,7 @@ encoding: UTF-8
 requestDelay: 2
 followredirect: true
 links:
-  - https://2torrentz2eu.in/
-  - https://torrentz2.unblockninja.com/
+  - https://torrentz2beta.com/
 legacylinks:
  - https://torrentz2eu.me/
  - https://torrentz2.org.in/
@@ -17,6 +16,9 @@ legacylinks:
  - https://torrentz2.club/
  - https://torrentz2eu.in/
  - https://torrentz2.pics/
+  - https://2torrentz2eu.in/
+  - https://torrentz2.unblockninja.com/
+  - hhttps://torrentz2beta.com/

 caps:
  # unfortunately torrentz2eu does not display categories anywhere in its search results page :-(
@@ -43,13 +45,13 @@ download:

 search:
  paths:
-    # https://2torrentz2eu.in/beta2/search.php?torrent-query=2023
-    - path: beta2/search.php
-    - path: beta2/search.php
+    # https://torrentz2beta.com/beta/search.php?q=2023
+    - path: beta/search.php
+    - path: beta/search.php
      inputs:
        page: 2
  inputs:
-    torrent-query: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+    q: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"

  rows:
    selector: table#torrent-table > tbody > tr
@@ -64,14 +66,14 @@ search:
    category:
      text: "{{ if .Result.category_is_tv_show }}2{{ else }}3{{ end }}"
    details:
-      # https://torrentz2.pics/beta2/page.php?url=9999999%2FThe-Torrent-file-name-goes-here%2F
+      # https://torrentz2beta.com/beta/page.php?url=99999999%2FThe-Torrent-file-name-goes-here%2F
      selector: td:nth-child(6) button
      attribute: onclick
      filters:
        - name: regexp
          args: "'(.+?)'"
        - name: prepend
-          args: "{{ .Config.sitelink }}beta2/page.php?url="
+          args: "{{ .Config.sitelink }}beta/page.php?url="
    download:
      text: "{{ .Result.details }}"
    seeders:
@@ -91,4 +93,4 @@ search:
      text: 0
    uploadvolumefactor:
      text: 1
-# beta2
+# beta
--- a/src/Jackett.Common/Definitions/torrentz2nz.yml
+++ b/src/Jackett.Common/Definitions/torrentz2nz.yml
@@ -8,13 +8,14 @@ encoding: UTF-8
 links:
  - https://torrentz2.nz/
  - https://torrentz2.mrunblock.bond/
-  - https://torrentz2.nocensor.click/
+  - https://torrentz2.nocensor.cloud/
 legacylinks:
  - https://torrentz2.nocensor.world/
  - https://torrentz2.nocensor.lol/
  - https://torrentz2.nocensor.art/
  - https://torrentz2.mrunblock.guru/
  - https://torrentz2.mrunblock.life/
+  - https://torrentz2.nocensor.click/

 caps:
  # unfortunately torrentz2nz does not display categories anywhere in its search results page :-(
--- a/src/Jackett.Common/Definitions/trackermk.yml
+++ b/src/Jackett.Common/Definitions/trackermk.yml
@@ -0,0 +1,155 @@
+---
+id: trackermk
+name: TrackerMK
+description: "TrackerMK is a MACEDONIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: mk-MK
+type: private
+encoding: UTF-8
+links:
+  - http://trackermk.com/ # does not support https, CA expired December 2017
+
+caps:
+  categorymappings:
+    - {id: 49, cat: Movies/DVD, desc: "Movies DVD-R"}
+    - {id: 68, cat: PC/Mobile-Android, desc: "Андроид (Android)"}
+    - {id: 72, cat: PC/Mobile-Android, desc: "Андроид - Апликации (Android)"}
+    - {id: 47, cat: PC, desc: "Апликации (Software)"}
+    - {id: 71, cat: PC/Mac, desc: "Апликации - Mac OS"}
+    - {id: 70, cat: PC/0day, desc: "Апликации - Window 7/8.1/10/11"}
+    - {id: 63, cat: Audio/Audiobook, desc: "Аудио (Audiobooks)"}
+    - {id: 60, cat: TV/Documentary, desc: "Документарци (Documentaries)"}
+    - {id: 61, cat: TV, desc: "Домашни серии (TV Local)"}
+    - {id: 69, cat: TV, desc: "Домашни серии - Српски / Хрватски / Босански (TV Local)"}
+    - {id: 57, cat: Books/EBook, desc: "Е-Книги (EBooks)"}
+    - {id: 53, cat: Console, desc: "Игри (Games)"}
+    - {id: 54, cat: Audio/Video, desc: "Концерти (Concerts)"}
+    - {id: 52, cat: Audio/Video, desc: "Музички Спотови (Music Videos)"}
+    - {id: 67, cat: Other, desc: "Од се по нешто (VIP)"}
+    - {id: 73, cat: Audio, desc: "Рип од Плоча (Music Rips)"}
+    - {id: 65, cat: Other, desc: "Слики (pictures)"}
+    - {id: 55, cat: TV/Sport, desc: "Спорт (sport)"}
+    - {id: 48, cat: TV/Anime, desc: "Цртани (Animations)"}
+    - {id: 64, cat: Audio/Lossless, desc: "FLAC"}
+    - {id: 62, cat: Movies/HD, desc: "Movies HDTV"}
+    - {id: 50, cat: Audio/MP3, desc: "Mp3"}
+    - {id: 56, cat: Movies/SD, desc: "Movies Xvid"}
+    - {id: 59, cat: XXX, desc: "XXX"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Filter freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: added
+    options:
+      added: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    logout: ""
+  error:
+    - selector: table:contains("Грешка!")
+  test:
+    path: index.php
+    selector: a[href*="/logout.php?logouthash="]
+
+search:
+  paths:
+    - path: browse.php
+  keywordsfilters:
+    - name: re_replace
+      args: ["[\\s]+", "%"]
+  inputs:
+    do: search
+    keywords: "{{ .Keywords }}"
+    # t_name, t_description, t_both, t_uploader, t_genre
+    search_type: t_name
+    # does not support multi category searching so defaulting to all.
+    category: 0
+    include_dead_torrents: yes
+    sort: "{{ if .Config.freeleech }}free{{ else }}{{ .Config.sort }}{{ end }}"
+    order: "{{ if .Config.freeleech }}asc{{ else }}{{ .Config.type }}{{ end }}"
+    # does not return imdb link in results and t_genre does not return imdbid search results
+
+  rows:
+    selector: "table.sortable tr:has(a[href*=\"/download.php?id=\"]){{ if .Config.freeleech }}:has(img[src$=\"/freedownload.gif\"]){{ else }}{{ end }}"
+
+  fields:
+    category:
+      selector: a[href*="/browse.php?category="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: category
+    title:
+      selector: a[href*="/details.php?id="]
+    details:
+      selector: a[href*="/details.php?id="]
+      attribute: href
+    download:
+      selector: a[href*="/download.php?id="]
+      attribute: href
+    poster:
+      selector: img[src*="/torrents/images/"]
+      attribute: src
+    date:
+      selector: td:nth-child(2)
+      # auto adjusted by site account profile
+      filters:
+        - name: regexp
+          args: "(\\d{2}-\\d{2}-\\d{4} \\d{2}:\\d{2})"
+        - name: dateparse
+          args: "dd-MM-yyyy HH:mm"
+    size:
+      selector: td:nth-last-child(5)
+    grabs:
+      selector: td:nth-last-child(4)
+    seeders:
+      selector: td:nth-last-child(3)
+    leechers:
+      selector: td:nth-last-child(2)
+    downloadvolumefactor:
+      case:
+        img[src$="/freedownload.gif"]: 0
+        img[src$="/silverdownload.gif"]: 0.5
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img[src$="/x2.gif"]: 2
+        "*": 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 24 hours (as seconds = 24 x 60 x 60)
+      text: 86400
+# TS Special Edition v.7.2
--- a/src/Jackett.Common/Definitions/ubits.yml
+++ b/src/Jackett.Common/Definitions/ubits.yml
@@ -177,8 +177,14 @@ search:
        img.pro_2up: 2
        "*": 1
    minimumratio:
-      text: 0.8
+      case:
+        img.hitandrun: 100 # dummy MR to ensure HnR MST is met
+        "*": 0.8
+    minimumseedtime:
+      case:
+        img.hitandrun: 259200
+        "*": 8640000 # dummy MST to ensure non-HnR MR is met
    description:
      selector: td:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP v1.8.4 2023-05-27
+# NexusPHP v1.8.7 2023-08-22
--- a/src/Jackett.Common/Definitions/ultrahd.yml
+++ b/src/Jackett.Common/Definitions/ultrahd.yml
@@ -163,4 +163,4 @@ search:
    description:
      selector: td:nth-child(2)
      remove: a, b, font, img, span
-# NexusPHP v1.8.5 2023-07-10
+# NexusPHP v1.8.7 2023-08-22
--- a/src/Jackett.Common/Definitions/wintersakura.yml
+++ b/src/Jackett.Common/Definitions/wintersakura.yml
@@ -0,0 +1,207 @@
+---
+id: wintersakura
+name: WinterSakura
+description: "WinterSakura is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: zh-CN
+type: private
+encoding: UTF-8
+requestDelay: 2
+links:
+  - https://wintersakura.net/
+
+caps:
+  categorymappings:
+    # torrents.php
+    - {id: 409, cat: Other, desc: "Misc其他", default: true}
+    - {id: 407, cat: TV/Sport, desc: "Sports体育", default: true}
+    - {id: 406, cat: Audio/Video, desc: "Music Videos音乐MV", default: true}
+    - {id: 408, cat: Audio, desc: "HQ Audio无损音乐", default: true}
+    - {id: 418, cat: TV, desc: "TV Shows综艺(分集)", default: true}
+    - {id: 403, cat: TV, desc: "TV Shows综艺(Packs合集)", default: true}
+    - {id: 402, cat: TV, desc: "TV Series剧集(分集)", default: true}
+    - {id: 414, cat: TV, desc: "TV Series剧集(Packs合集)", default: true}
+    - {id: 413, cat: TV/Anime, desc: "Animation series动漫剧集(分集)", default: true}
+    - {id: 423, cat: TV/Anime, desc: "Animation series动漫剧集(Packs合集)", default: true}
+    - {id: 422, cat: TV/Anime, desc: "Animation flims动漫电影", default: true}
+    - {id: 410, cat: TV/Documentary, desc: "Documentaries纪录片", default: true}
+    - {id: 401, cat: Movies, desc: "Movies电影", default: true}
+    # special.php
+    - {id: 427, cat: PC, desc: "Software软件/程序/代码", default: false}
+    - {id: 426, cat: Books/Technical, desc: "Papers期刊/论文", default: false}
+    - {id: 428, cat: Books/EBook, desc: "Books图书", default: false}
+    - {id: 425, cat: Other, desc: "Database数据/数据库", default: false}
+    - {id: 424, cat: Other, desc: "Course课程", default: false}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: 2facode
+    type: text
+    label: 2FA code
+  - name: info_2fa
+    type: info
+    label: "About 2FA code"
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the WinterSakura Web Site. Otherwise just leave it empty."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+
+login:
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
+  inputs:
+    secret: ""
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    two_step_code: "{{ .Config.2facode }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
+  error:
+    - selector: td.embedded:has(h2:contains("失败"))
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+      categories: [409, 407, 406, 408, 418, 403, 402, 414, 413, 423, 422, 410, 401]
+    - path: special.php
+      categories: [427, 426, 428, 425, 424]
+  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 or .Query.IMDBID .Query.DoubanID }}1{{ else }}0{{ end }}"
+    # 0 AND, 2 exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    notnewword: 1
+
+  rows:
+    selector: table.torrents > tbody > tr:has(a[href^="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: 0.4
+    description:
+      selector: td.rowfollow:nth-child(2)
+      remove: a, b, font, img, span
+# NexusPHP f99d919 2023-05-08
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
ilike2burnthing	3b7729f20f	hdcztorrent: update cats & row selector	2023-09-10 00:18:42 +01:00
ilike2burnthing	b328b4d992	x-ite.me: add cert exception	2023-09-09 23:47:47 +01:00
ilike2burnthing	91f92db2d0	aftershock: remove old cert exception	2023-09-09 23:47:29 +01:00
Garfield69	5ca1c17c65	rutracker-ru: add new cat, refresh others.	2023-09-10 06:56:39 +12:00
Garfield69	3f3ad8a75c	assorted nexusphp: bump engine tags	2023-09-10 04:44:48 +12:00
ilike2burnthing	2c26735004	torrent9: remove no longer necessary UA header	2023-09-09 05:07:57 +01:00
ilike2burnthing	00f50a9e63	eztv: Prowlarr issue reference for comment	2023-09-09 04:56:53 +01:00
ilike2burnthing	c1392af6ca	rgfootball: add missing login inputs	2023-09-09 04:33:10 +01:00
Garfield69	7ecd0053ba	beyondhd-api: add length check on config API and RSS keys. resolves #14683	2023-09-09 09:36:14 +12:00
Garfield69	c877ced77a	tellytorrent: removed. resolves #5635	2023-09-09 06:55:01 +12:00
Garfield69	2ea0f061a9	cinefilhd: removed. resolves #4908	2023-09-09 06:53:46 +12:00
Garfield69	7cbd97cc79	biho: removed. resolves #14533	2023-09-09 06:45:00 +12:00
Garfield69	346abc7271	datatalli: removed. resolves #12327	2023-09-09 06:24:06 +12:00
Garfield69	6d163dbfeb	mejortorrent: fix typo	2023-09-08 16:34:44 +12:00
Garfield69	a8c3b37b4e	mejortorrent: bump domain	2023-09-08 15:39:11 +12:00
ilike2burnthing	e7ba7fb615	hdatmos: update engine version	2023-09-08 03:23:11 +01:00
Garfield69	ce64110a8b	torrentqq: bump domain	2023-09-08 06:22:33 +12:00
Garfield69	52f5da4b46	assorted: new unblockit domain	2023-09-08 05:58:45 +12:00
Garfield69	2e6747cd7b	assorted: unblockninja proxy replacements	2023-09-07 19:05:03 +12:00
Bogdan	ef06d04d66	xxxclub: add fallback to magnet links Co-authored-by: ouenascender <138104265+ouenascender@users.noreply.github.com> Closes Prowlarr/Indexers#344	2023-09-06 05:44:41 +03:00
ilike2burnthing	585a2f05f1	tray: add version number to tooltip. resolves #14681	2023-09-06 01:15:00 +01:00
Garfield69	b4a7bd73fb	torrentview: bump domain	2023-09-06 06:06:11 +12:00
Garfield69	f19fa49afd	torrentwhiz: bump domain	2023-09-06 06:05:50 +12:00
Garfield69	ea08395b8f	byrutor: new domain	2023-09-06 06:05:31 +12:00
Garfield69	22db47d37c	torrentsir: bump domain	2023-09-05 16:44:43 +12:00
ilike2burnthing	b94c18e548	firebit: removed, down for 30 days. resolves #6395 (#14680 )	2023-09-05 03:03:02 +01:00
ilike2burnthing	f9af13cf95	uploads: removed, down for 30 days. resolves #14291 (#14679 )	2023-09-05 02:58:54 +01:00
Garfield69	f0598c01b7	dontorrent: new domain	2023-09-05 07:02:25 +12:00
Garfield69	500889a313	winget: drop start-sleep step	2023-09-05 07:02:11 +12:00
Garfield69	c3c1cd50e7	winget: bump delay to 30m	2023-09-04 18:23:56 +12:00
Garfield69	58ac8f3ad0	cinecalidad: update description	2023-09-04 17:16:16 +12:00
Bogdan	937593b306	cinecalidad: parse 4k releases (#14677 )	2023-09-04 03:46:11 +03:00
ilike2burnthing	3cf4166e15	1337x: add *.so mirror https://github.com/Prowlarr/Indexers/pull/363	2023-09-04 01:30:56 +01:00
Garfield69	a017671b40	torrentz2eu: fix sitelink	2023-09-03 20:33:17 +12:00
ilike2burnthing	5b6fe7fb12	iptorrents: trust expired cert for *.octopus.town	2023-09-03 05:11:21 +01:00
ilike2burnthing	a85a324685	classix: tracker update resolves https://github.com/Prowlarr/Indexers/issues/361	2023-09-03 03:14:34 +01:00
Vedant	f781ad49b3	Delay 5 minutes before running winget-releaser (#14673 )	2023-09-03 13:54:52 +12:00
Garfield69	4eb62c23dc	torrentleech: refresh cats	2023-09-03 07:16:02 +12:00
Garfield69	1089f2ee44	torrentz2eu: new domain and search path	2023-09-03 06:21:21 +12:00
Bogdan	dcf72f4f92	superbits: add search P2P releases only option (#14670 )	2023-09-02 15:42:33 +03:00
Garfield69	8b3356f2cf	cinecalidad: follow-up on revert	2023-09-02 16:42:13 +12:00
Garfield69	a5e73d6fa6	ubits: fix h&r	2023-09-02 16:18:14 +12:00
Garfield69	e010ba3261	Update ubits.yml	2023-09-02 07:36:00 +12:00
Garfield69	232f1678c1	ubits: h&r MST	2023-09-02 07:11:58 +12:00
Garfield69	7f12fd98e2	Revert "cinecalidad: new sub domain" This reverts commit `64c5e6d864`.	2023-09-02 06:17:11 +12:00
Garfield69	435699e5d4	torrentqq: bump domain	2023-09-01 06:14:33 +12:00
Garfield69	64c5e6d864	cinecalidad: new sub domain	2023-08-31 15:57:11 +12:00
Garfield69	f80575b78d	moviesite: gone. resolves #13059	2023-08-30 20:09:10 +12:00
Garfield69	8d8d79deb4	eniahd: add new cats	2023-08-30 06:29:28 +12:00
Garfield69	13c59c1174	dontorrent: new domain	2023-08-30 06:14:49 +12:00
ilike2burnthing	bc3b9756b9	dariustracker: removed, down for 30 days. resolves #9768 (#14664 )	2023-08-29 16:38:08 +01:00
ilike2burnthing	685cf98697	assorted: fix cst tz typo (#14663 ) no idea how I even did this	2023-08-29 16:13:43 +01:00
Garfield69	7d1b7cf287	add redleaves a private Chinese site. resolves #14485	2023-08-29 17:53:06 +12:00
Garfield69	ca7568794d	torrentsir: bump domain	2023-08-29 16:54:58 +12:00
ilike2burnthing	9ae3c4b4c2	xbytes2: reorder keywordsfilters resolves https://github.com/Prowlarr/Indexers/issues/360	2023-08-28 16:53:47 +01:00
Garfield69	1f67b5a38d	2xfree: drop books and music	2023-08-28 06:51:40 +12:00
Garfield69	e79b9e27a7	mteam: restore alternate domains	2023-08-27 17:05:07 +12:00
Bogdan	7ba083c354	anthelion-api: use the filename if a single file (#14661 )	2023-08-27 00:09:15 +03:00
Garfield69	4b9857161a	dark-shadow: cat can be missing. default to other.	2023-08-27 08:32:19 +12:00
Garfield69	d823bed1a4	cinecalidad: new sub domain	2023-08-26 16:15:53 +12:00
Garfield69	a1431bb413	cpabien: new domain	2023-08-25 16:34:29 +12:00
ilike2burnthing	d721b08def	cinecalidad: change sub-domain	2023-08-25 01:42:05 +01:00
ilike2burnthing	a99b6728e5	Update README.md	2023-08-25 00:45:37 +01:00
Garfield69	c9ea96b72c	torrentqq: bump domain	2023-08-25 08:45:05 +12:00
Garfield69	a1d852ec03	Revert "extremebits: removed. resolves #8794 " This reverts commit `45f184dece`.	2023-08-25 06:11:43 +12:00
Garfield69	563ebc5616	3dtorrents: add freeleech	2023-08-24 20:18:44 +12:00
Garfield69	23a125c282	rousi: add config info about 3X	2023-08-24 08:19:56 +12:00
Garfield69	9586c545d7	solidtorrents: fix grabs, seeds and leech	2023-08-24 07:18:40 +12:00
Garfield69	fb994c981c	bitsearch: fix grabs, seeds and leech	2023-08-24 07:17:57 +12:00
Garfield69	96f667b7c6	2xfree: bump engine tag	2023-08-24 07:16:25 +12:00
ilike2burnthing	f54b6695d4	ostwiki: remove unused MST & MR Asked staff, reply was, "This option is currently not enabled"	2023-08-22 23:01:50 +01:00
ilike2burnthing	91e2cab65a	ptcafe: add private Chinese tracker. resolves #14652 (#14656 )	2023-08-22 22:24:40 +01:00
Garfield69	4aeef003ba	Update ptlsp.yml	2023-08-23 06:40:12 +12:00
ilike2burnthing	a09ed98d68	ptlsp: add private Chinese tracker. resolves #14651 (#14655 )	2023-08-22 16:06:52 +01:00
Garfield69	26fc637a13	add ostkiki a private site. resolves #14653	2023-08-22 08:58:07 +12:00
Garfield69	8f97782a9d	gainbound: removed. resolves #13899	2023-08-22 07:34:37 +12:00
Garfield69	4960267968	torrentsir: bump domain	2023-08-22 07:09:01 +12:00
Garfield69	f1ce263f3e	torrent9clone: new domain	2023-08-22 07:08:48 +12:00
Tom Homewood	51584e8cce	scenehd: Use new certificate thumbprint (#14650 )	2023-08-22 06:20:03 +12:00
ilike2burnthing	4025381ecc	r3vwtf: update cats and vf selectors, add freeleech search and sort (#14648 ) no x2 torrents available, but the example image uses `img[src="pic/doubleseed.gif"]`, so just added `$` to make sure	2023-08-21 13:13:51 +01:00
ilike2burnthing	adf0255a01	hhanclub: update layout. resolves #14647 Presumably their logon secret isn't supposed to be that. Blank also works, but might as well follow their mistake. Having displaying IMDB info enabled in tracker settings doesn't make a difference. Only free torrents currently available, so had to guess at the rest of the cases. Alternatively, they could follow pttime's naming, or something completely different.	2023-08-20 23:23:59 +01:00
Garfield69	19477ce89e	assorted nexus: bump engine tag	2023-08-21 09:26:50 +12:00
ilike2burnthing	0c43c992d9	glodls: remove *.cc mirror, dead	2023-08-20 21:49:36 +01:00
ilike2burnthing	a616202cfe	hdcztorrent: update cats	2023-08-19 23:41:32 +01:00
Garfield69	76212cfb4a	infire: correct new cats need caffeine	2023-08-20 06:54:07 +12:00
Garfield69	4b32cab990	infire: add new cats	2023-08-20 06:44:49 +12:00
Garfield69	6d1afb8654	1337x: remove followredirect, its not needed. resolves #14645	2023-08-19 13:45:35 +12:00
Garfield69	f0a2be17a0	yggcookie: oops. fix `cbbaedc8ab`	2023-08-19 08:07:51 +12:00
U̙̫͊̅̊̚͢͜n̨̤̙̰̠̜ͨ̐ḭ̵̴̜̲̖͂̾c̡͕̮ͤ̍̌̃͛o̱̳͙̹͓̽͝ͅḓ̜̠̺̌ͮ͛͆e̦̬̤̰̦̙̔͞ A̧͚͈̙̾̂́͛p̢̨̩̣̬̙̆ͣǫ̣͚͕̩̊́̽ç͈̭̐̇ͫ͗͜ả̛̪̖̜̗̉̂ḽ̶̼̟̮̜̽ͅÿ̵̢̜̟͙́̋̍p̮̮̭̘͚ͦ̇͛s̡̤̫̺͔̅́͜ȩ̢̥̱̤̀̓̓	cbbaedc8ab	yggtorrent & yggcookie: switch to unix date and other misc updates (#14644 )	2023-08-19 08:05:09 +12:00
sitiom	35a68f51a9	winget: change job runner to `ubuntu-latest` (#14642 )	2023-08-18 05:10:32 +01:00
ilike2burnthing	279248b06c	spidertk: removed, dead. resolves #12718 (#14641 )	2023-08-18 01:17:16 +01:00
Garfield69	d6ce279906	cinecalidad: new domain	2023-08-18 06:27:42 +12:00
Garfield69	ee509208e7	torrentqq: bump domain	2023-08-18 06:27:23 +12:00
Garfield69	d6f0592867	lostfilm: try to prevent parse error #14638 tested with non-Russian IP for regular TEST However error only occurs with Russian IP so that is untested as I don't have a VPN to access that region.	2023-08-17 21:10:12 +12:00
Garfield69	a8f994871f	thorsland: favour .torrent over magnet. resolves #14630	2023-08-17 07:18:32 +12:00
Garfield69	3ec6a55071	Update README.md	2023-08-16 21:00:42 +12:00
Garfield69	cc6dfe5299	nordichd: http -> https	2023-08-16 08:46:29 +12:00
Garfield69	14d225a3fb	exttorrents: add followredirect for 2nd page search.. resolves #14637	2023-08-16 07:37:32 +12:00
Garfield69	296e70addb	divxtotal: new domain	2023-08-16 06:39:02 +12:00
Garfield69	3344de422f	torrentsir: bump domain	2023-08-16 06:38:35 +12:00
Garfield69	9279633ff2	Update indexer-request.yml	2023-08-15 16:37:24 +12:00
Garfield69	13c9adfffe	onlyencodes: fix MR #14635	2023-08-15 15:19:38 +12:00
Garfield69	cd30b11618	add onlyencodes a private site. resolves #14635	2023-08-15 14:57:21 +12:00
ilike2burnthing	13c653282d	futuretorrent: add Italian private tracker. resolves #4205 (#14634 )	2023-08-15 03:01:23 +01:00
Garfield69	0268caa908	torrent9clone: new domain	2023-08-15 06:42:56 +12:00
ilike2burnthing	43622f8f59	yggtorrent: make strip season optional. resolves #14565 (#14629 )	2023-08-13 22:56:17 +01:00
Garfield69	1811ddbd2c	kamept: switch to cookie method. resolves #14628	2023-08-14 08:55:19 +12:00
Garfield69	c52937f2ec	gktorrent: new domain	2023-08-14 07:07:47 +12:00
Cédric BOUR	5883257606	core: add cookie for one request to flaresolverr (#14627 ) Co-authored-by: cedricb <cedricb@Mac-Studio-de-Cedric.local>	2023-08-13 11:34:12 +01:00
ilike2burnthing	016b6b0da2	bitbazis: update cats, again again	2023-08-12 23:41:14 +01:00
ilike2burnthing	a159f53ecd	torrent9clone: update subdomain	2023-08-12 09:06:33 +01:00
Garfield69	5b41051fd7	torrent9clone: new subdomain	2023-08-12 07:11:54 +12:00
ilike2burnthing	f43e627d56	bitbazis: update cats, again slowly but surely...	2023-08-11 17:24:00 +01:00
ilike2burnthing	073d0e27a8	core: restore stacktraces for UI 'view logs'. resolves #14585 (#14619 )	2023-08-11 01:14:37 +03:00
ilike2burnthing	8b30469255	core: simplify logging code (#14618 )	2023-08-11 00:17:41 +03:00
Garfield69	642944e9d8	cinecalidad: new sub domain	2023-08-11 06:22:20 +12:00
Garfield69	a24a5ff430	torrentqq: bump domain	2023-08-11 06:21:46 +12:00
ilike2burnthing	dfd1c80007	bitbazis: update cats	2023-08-10 08:02:46 +01:00
ilike2burnthing	47d4483573	theoldschool-api: add global MR comment	2023-08-10 01:16:22 +01:00
Garfield69	d134d9c77c	bitbazis: new layout	2023-08-10 08:04:56 +12:00
Garfield69	ec70bff112	btsow: new comain	2023-08-10 06:29:50 +12:00
Garfield69	2965812013	Revert "torrent9clone: new domain" This reverts commit `9cafa3058c`.	2023-08-10 06:29:03 +12:00
ilike2burnthing	fdeaf34aa5	nordichd: change to http. resolves #6708	2023-08-09 18:18:52 +01:00
Bogdan	f92a203ba8	torrentwhiz: bump domain	2023-08-09 12:00:16 +03:00
Bogdan	aa705d3069	torrentview: bump domain	2023-08-09 11:59:32 +03:00
Garfield69	e89dadd5f9	2xfree: update description	2023-08-09 14:52:39 +12:00
ilike2burnthing	21d5611e3a	hellashut: restore indexer. resolves #13706 (#14615 )	2023-08-09 03:50:23 +01:00
ilike2burnthing	5e6d537b00	2xfree: update MR & MST	2023-08-09 03:25:45 +01:00
Garfield69	cf3022d127	2xfree: drop special cats site has closed the 2D torrents, only does 3D now.	2023-08-09 08:03:00 +12:00
Garfield69	9dcaa63058	thorsland: new cats	2023-08-09 07:48:50 +12:00
Garfield69	056efef8a2	cinecalidad: new domain	2023-08-09 06:27:19 +12:00
Garfield69	9cafa3058c	torrent9clone: new domain	2023-08-09 06:27:00 +12:00
Garfield69	8ebbb843cf	PTP: removed. resolves #14591	2023-08-08 16:51:06 +12:00
Garfield69	45f184dece	extremebits: removed. resolves #8794	2023-08-08 16:20:24 +12:00
Garfield69	d79c78e0d8	ptsbao: drop duplicate info tpp	2023-08-08 15:22:17 +12:00
Garfield69	28241dcba7	huntorrent: info for cookie hidden by info for tpp	2023-08-08 15:21:48 +12:00
Garfield69	bbb4f887c6	assorted: new nocensor domain	2023-08-07 20:50:01 +12:00
Garfield69	444376c191	assorted: new unblockit domain	2023-08-07 20:28:55 +12:00
Garfield69	29b560ef7b	movieworld: refresh cats	2023-08-07 06:46:46 +12:00
Garfield69	70ec9e67c7	rutracker-ru: update cats	2023-08-07 06:26:20 +12:00
ilike2burnthing	79ff6598b9	mejortorrent: forgot to change alternate site link	2023-08-06 16:05:00 +01:00
ilike2burnthing	3118fd3438	mejortorrent: change subdomain	2023-08-05 17:52:39 +01:00
ilike2burnthing	7baded616d	cinecalidad: change subdomain	2023-08-05 17:51:39 +01:00
Garfield69	5d9067c31b	seedfile: new layout	2023-08-05 07:39:27 +12:00
ilike2burnthing	b2e5930741	torrentqq: change domain	2023-08-03 18:03:33 +01:00
ilike2burnthing	9c781bfb9d	torrent9clone: change domain, again	2023-08-03 15:06:40 +01:00
Bogdan	c24975059b	digitalcore: add search UNRAR releases only option	2023-08-03 11:11:21 +03:00
Garfield69	504715b81f	add trackermk a Macedonian private site. resolves #14344	2023-08-03 16:55:56 +12:00
ilike2burnthing	ac8c216c1e	idope: correct capitalisation of name	2023-08-02 22:38:49 +01:00
Garfield69	d49f46fcc3	y: new cats. resolves #14604	2023-08-03 07:48:38 +12:00
Garfield69	d9b27c50bd	torrent9clone: new domain	2023-08-03 06:05:50 +12:00
Garfield69	b7ebb2b7af	dontorrent: new domain	2023-08-03 06:05:35 +12:00
ilike2burnthing	15f5dcf39f	chdbits: change domain. resolves #14602	2023-08-02 16:33:25 +01:00
Garfield69	065a408fff	add gamera a Chinese private site. resolves #14589	2023-08-02 19:56:11 +12:00
Garfield69	9c510bf7ce	greekteam: leechers can be missing	2023-08-02 07:17:51 +12:00
ilike2burnthing	e5aebbacdf	fantasticheaven: removed, down for 30 days. resolves #14523 (#14599 )	2023-08-01 10:21:32 +01:00
ilike2burnthing	508c028a9b	hdcztorrent: another new cat	2023-08-01 10:04:07 +01:00
Garfield69	74c966f496	kamept: lint	2023-08-01 19:10:08 +12:00
Garfield69	a62117c7e2	kamept: update engine tag	2023-08-01 18:59:12 +12:00
Garfield69	1c00a90832	hdcztorrent: new cat	2023-08-01 06:44:05 +12:00
Garfield69	bb9cf12ba6	add wintersakura a Chinese private site. resolves #14597	2023-07-31 21:18:52 +12:00
ilike2burnthing	a6dbacc9cb	wukong: capitalise language in description	2023-07-31 07:59:52 +01:00
Garfield69	453baf59b8	assorted nexus: update engine tags	2023-07-31 17:15:05 +12:00
Garfield69	208c556bb3	3wmg: -> 1.8.5 resolves #13389	2023-07-31 16:43:08 +12:00
Garfield69	fddf016cee	bithorlo: cat id changed	2023-07-31 06:59:35 +12:00
Garfield69	91103feba4	torrentsir: bump domain	2023-07-31 06:30:35 +12:00
ilike2burnthing	d52a12487e	gimmepeers: update row selector	2023-07-30 03:47:50 +01:00
ilike2burnthing	c6edf7bf8d	pignetwork: add useragent workaround. resolves #13318	2023-07-30 01:00:40 +01:00
Garfield69	bf44b2ea1b	xxxclub: new layout plus cats	2023-07-30 07:14:33 +12:00
Garfield69	26b661de84	torrent9clone: new domain	2023-07-30 07:13:11 +12:00