BaseNewsnabIndexer: Add imdb, tvdb and tvmaze to feed base release (#15245)

change the config `Search Freeleech` to `Filter Freeleech`
and if enabled then filter row to include gold and global freeleech flags only.

.github/workflows/codeql-analysis.yml

@@ -52,11 +52,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -68,7 +68,7 @@ jobs:
     # If this step fails, then you should remove it and run the build manually (see below)
 
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -82,4 +82,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/issuebot.yml

@@ -23,7 +23,7 @@ jobs:
 
       # This step sets up Node.js. The script that this workflow will run uses Node.js.
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '18.x'
 

README.md

@@ -27,6 +27,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 
  * ØMagnet
  * 1337x
+ * 52BT
  * ACG.RIP
  * Anidex
  * AniLibria
@@ -75,7 +76,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Knaben
  * LePorno.info
  * LimeTorrents
- * LimeTorrents clone
  * LinuxTracker
  * Mac Torrents Download
  * MegaPeer
@@ -104,7 +104,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Seedoff
  * Sexy-Pics
  * Shana Project
- * ShizaProject
  * ShowRSS
  * SimpleAnime
  * Solid Torrents
@@ -135,6 +134,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Torrentz2nz
  * TrahT
  * truPornolabs
+ * U3C3
  * UnionDHT
  * VSTHouse
  * VST Torrentz
@@ -202,7 +202,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * RockBox
  * RUDUB (ex-BaibaKoTV)
  * Rustorka
- * RuTracker
+ * RuTracker.org
  * seleZen
  * Sharewood
  * SkTorrent
@@ -211,6 +211,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Toloka.to
  * TorrentMasters
  * Torrents-Local
+ * TorrentDownload
  * TribalMixes
  * Union Fansub
  * UniOtaku
@@ -251,7 +252,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ArabTorrents [![(invite needed)][inviteneeded]](#)
  * AsianCinema
  * AsianDVDClub
- * AT-12 Project
  * Audiences
  * AudioNews (AN)
  * Aussierul.es [![(invite needed)][inviteneeded]](#)
@@ -287,6 +287,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BTSCHOOL
  * BWTorrents
  * BYRBT
+ * CapybaraBR
  * Carp-Hunter
  * Carpathians
  * CarPT
@@ -333,9 +334,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ExtremeBits
  * Falkon Vision Team
  * FANO.IN [![(invite needed)][inviteneeded]](#)
- * Fantastiko
+ * Fantastiko [![(invite needed)][inviteneeded]](#)
  * Fappaizuri
- * FastScene
  * FearNoPeer
  * Femdomcult
  * FileList (FL)
@@ -383,6 +383,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDPT (明教) [![(invite needed)][inviteneeded]](#)
  * HDRoute [![(invite needed)][inviteneeded]](#)
  * HDSky [![(invite needed)][inviteneeded]](#)
+ * HDT-LaFenice
  * HDtime
  * HDTorrents.it [![(invite needed)][inviteneeded]](#)
  * HDTurk
@@ -397,6 +398,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HQMusic
  * iAnon
  * ICC2022 (冰淇淋)
+ * ilolicon PT
  * ImmortalSeed (iS)
  * Immortuos
  * Indietorrents [![(invite needed)][inviteneeded]](#)
@@ -412,6 +414,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * KamePT [![(invite needed)][inviteneeded]](#)
  * Karagarga
  * Keep Friends [![(invite needed)][inviteneeded]](#)
+ * Kelu
  * KIMOJI
  * Korsar
  * KrazyZone
@@ -478,6 +481,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * PigNetwork (猪猪网)
  * PixelCove (Ultimate Gamer)
  * PiXELHD (PxHD) [![(invite needed)][inviteneeded]](#)
+ * Plusteca
  * Polish Torrent (PTT)
  * PolishSource (PS)
  * PolishTracker
@@ -501,6 +505,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * PuntoTorrent
  * PuTao (葡萄)
  * PWTorrents (PWT)
+ * Qingwa (青蛙)
  * R3V WTF!
  * Racing4Everyone (R4E)
  * RacingForMe (RFM)
@@ -514,7 +519,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * RetroFlix
  * RevolutionTT
  * RM-HD
+ * RocketHD
  * Romanian Metal Torrents (RMT)
+ * RoTorrent
  * Rousi
  * RPTScene (RPTorrents)
  * SATClubbing
@@ -566,7 +573,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * The-New-Fun
  * TheEmpire (TE)
  * TheLeachZone (TLZ)
- * TheRebels
  * TheScenePlace (TSP)
  * Thor's Land
  * TJUPT (北洋园PT)
@@ -639,7 +645,7 @@ Trackers marked with [![(invite needed)][inviteneeded]](#) have no active mainta
 
 ### Jackett Torznab query syntax
 
-Jackett accepts Torznab queries following the specifications described is the [Torznab document](https://torznab.github.io/spec-1.3-draft/index.html).
+Jackett accepts Torznab queries following the specifications described in the [Torznab document](https://torznab.github.io/spec-1.3-draft/index.html).
 For example, `.../api/v2.0/indexers/<aJackettIndexerName>/results/torznab/api?apikey=<yourJackettApiKey>&t=caps` would return the capabilities of the indexer, and `.../api/v2.0/indexers/<aJackettIndexerName>/results/torznab/api?apikey=<yourJackettApiKey>&t=search&q=keywords` would perform a free text search on that indexer.
 
 ### Search modes and parameters

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

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

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

@@ -13,7 +13,7 @@ links:
   - https://x1337x.eu/
   - https://x1337x.se/
   - https://1337x.so/
-  - https://1337x.unblockit.africa/
+  - https://1337x.abcproxy.org/
   - https://1337x.unblockninja.com/
   - https://1337x.ninjaproxy1.com/
   - https://1337x.proxyninja.org/
@@ -21,8 +21,6 @@ links:
 legacylinks:
   - https://1337x.is/
   - https://1337x.gd/
-  - https://1337x.nocensor.lol/
-  - https://1337x.unblockit.ink/
   - https://1337x.nocensor.art/
   - https://1337x.unblockit.bio/
   - https://1337x.unblockit.boo/
@@ -40,6 +38,8 @@ legacylinks:
   - https://1337x.mrunblock.bond/
   - https://1337x.unblockit.date/
   - https://1337x.unblockit.dad/
+  - https://1337x.unblockit.africa/
+  - https://1337x.unblockit.casa/ # 502
 
 caps:
   categorymappings:

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

@@ -63,6 +63,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
   - name: info_tpp
     type: info
     label: Results Per Page
@@ -70,7 +74,7 @@ settings:
   - name: info_activity
     type: info
     label: Account Inactivity
-    default: "Cherish your user account. Inactive accounts would be deleted based on the following rules:<ol><li>Veteran User or above would never be deleted.</li><li>Elite User or above would never be deleted if packed (at User CP).</li><li>Packed accounts would be deleted if users have not logged in for more than 400 days in a row.</li><li>Unpacked accounts would be deleted if users have not logged in for more than 150 days in a row.</li><li>Accounts with both uploaded and downloaded amount being 0 would be deleted if users have not logged in for more than 100 days in a row.</li></ol>"
+    default: "Cherish your user account. Inactive accounts would be deleted based on the following rules:<ol><li>Veteran User or above would never be deleted.</li><li>Elite User or above would never be deleted if parked (at User CP).</li><li>Parked accounts would be deleted if users have not logged in for more than 400 days in a row.</li><li>Unparked accounts would be deleted if users have not logged in for more than 150 days in a row.</li><li>Accounts with both uploaded and downloaded amount being 0 would be deleted if users have not logged in for more than 100 days in a row.</li></ol>"
 
 login:
   path: login.php
@@ -193,4 +197,4 @@ search:
     description:
       selector: td:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.8.9 2023-11-15
+# NexusPHP v1.8.11 2024-03-27

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

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

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

@@ -0,0 +1,101 @@
+---
+id: 52bt
+name: 52BT
+description: "52BT is a CHINESE Public tracker for TV / MOVIES / MUSIC / GENERAL"
+language: zh-CN
+type: public
+encoding: UTF-8
+links:
+  # Send any content to 52btbtbt@gmail.com to get the latest address. or visit https://521.52btbt.cyou/
+  - https://529048.xyz/
+  - https://529049.xyz/
+  - https://www.529052.xyz/
+legacylinks:
+  - https://529050.xyz/
+
+caps:
+  categorymappings:
+    - {id: 影视, cat: TV, desc: 影视}
+    - {id: 影视, cat: Movies, desc: 影视}
+    - {id: 音乐, cat: Audio, desc: 音乐}
+    - {id: 图像, cat: Other, desc: 图像}
+    - {id: 文档书籍, cat: Books, desc: 文档书籍}
+    - {id: 压缩文件, cat: Other, desc: 压缩文件}
+    - {id: 安装包, cat: PC, desc: 安装包}
+    - {id: 其他, cat: Other, desc: 其他}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: cat-id
+    type: select
+    label: Category
+    default: 0
+    options:
+      0: All categories
+      1: Film and Television
+      2: Music
+      3: Images
+      4: Books
+      5: Zip Files
+      6: Software
+      7: Other
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 2
+    options:
+      2: created
+      1: size
+      0: relevance
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+
+search:
+  paths:
+    - path: "search-{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}-{{ .Config.cat-id }}-{{ .Config.sort }}-1.html"
+
+  rows:
+    selector: div.ssbox
+
+  fields:
+    categorydesc:
+      selector: div.title > h3 > span
+      filters:
+        - name: re_replace
+          args: ["([\\[\\]]+)", ""]
+    title:
+      selector: a[href^="/hash/"]
+    details:
+      selector: a[href^="/hash/"]
+      attribute: href
+    magnet:
+      selector: a[href^="magnet:?xt="]
+      attribute: href
+    date:
+      selector: div.sbar > span:contains("添加时间:")
+      filters:
+        - name: replace
+          args: ["添加时间:", ""]
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-dd zzz"
+    size:
+      selector: div.sbar > span:contains("大小:")
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/abtorrents.yml

@@ -157,7 +157,7 @@ search:
       optional: true
       filters:
         - name: dateparse
-          args: "MMM d yyyy h:mm tt"
+          args: "MMM d yyyyh:mm tt"
     date:
       text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
     size:

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

@@ -34,6 +34,10 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
+  - name: single_file_release_use_filename
+    type: checkbox
+    label: Use filename as title for single file releases
+    default: true
   - name: sort
     type: select
     label: Sort requested from site
@@ -65,8 +69,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
     - path: "/api/torrents/filter"
       response:
         type: json
@@ -99,7 +103,7 @@ search:
   fields:
     category:
       selector: category_id
-    title:
+    title_optional:
       selector: name
     details:
       selector: details_link
@@ -121,8 +125,6 @@ search:
     genre:
       selector: meta.genres
       filters:
-        - name: re_replace
-          args: ["(?i)^None$", ""]
         - name: re_replace
           args: ["(?i)(Science Fiction)", "Science_Fiction"]
         - name: re_replace
@@ -171,4 +173,9 @@ search:
     minimumseedtime:
       # 5 days (as seconds = 5 x 24 x 60 x 60)
       text: 432000
-# json UNIT3D 7.2.5
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
+# json UNIT3D 8.0.2

src/Jackett.Common/Definitions/anilibria.yml

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

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

@@ -76,8 +76,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
     - path: "/api/torrents/filter"
       response:
         type: json

src/Jackett.Common/Definitions/audionews.yml

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

src/Jackett.Common/Definitions/bitsearch.yml

@@ -43,7 +43,7 @@ caps:
     "Other/Program": PC/0day
     "Other/Sourcecode": PC
     "Other/Source Code": PC
-    "Other/Video": TV
+    "Other/Video": Other
     Softwares: PC/0day
     "Softwares/Windows": PC/0day
     TV: TV
@@ -77,6 +77,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_8000
+    type: info
+    label: About BitSearch Categories
+    default: BitSearch does not properly return categories in its search results for some releases.</br>To add to your Apps' Torznab indexer, you will need to include the 8000(Other) category.
 
 search:
   paths:

src/Jackett.Common/Definitions/bitturk.yml

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

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

@@ -69,8 +69,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
     - path: "/api/torrents/filter"
       response:
         type: json
@@ -178,4 +178,4 @@ search:
       optional: true
     title:
       text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
-# json UNIT3D 8.0.0b
+# json UNIT3D 8.0.2

src/Jackett.Common/Definitions/bootytape.yml

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

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

@@ -66,8 +66,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
     - path: "/api/torrents/filter"
       response:
         type: json

src/Jackett.Common/Definitions/btschool.yml

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

src/Jackett.Common/Definitions/bwtorrents.yml

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

src/Jackett.Common/Definitions/capybarabr.yml

@@ -1,27 +1,24 @@
 ---
-id: therebels-api
-name: TheRebels (API)
-description: "TheRebels is a BRAZILIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+id: capybarabr
+name: CapybaraBR
+description: "CapybaraBR is a BRAZILIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: pt-BR
 type: private
 encoding: UTF-8
 links:
-  - https://therebels.tv/
+  - https://capybarabr.com/
 
 caps:
   categorymappings:
-    - {id: 10, cat: TV/Anime, desc: "Animes"}
-    - {id: 5, cat: PC, desc: "Aplicativos"}
-    - {id: 12, cat: Audio/Audiobook, desc: "Audiobooks"}
-    - {id: 7, cat: XXX, desc: "Conteúdo Adulto"}
-    - {id: 9, cat: Other, desc: "Cursos"}
-    - {id: 8, cat: Books/EBook, desc: "E-Books"}
     - {id: 1, cat: Movies, desc: "Filmes"}
-    - {id: 4, cat: Console, desc: "Jogos"}
-    - {id: 11, cat: Books/Mags, desc: "Revistas"}
     - {id: 2, cat: TV, desc: "Series"}
-    - {id: 14, cat: TV/Anime, desc: "Animes"}
-    - {id: 15, cat: PC, desc: "Emulador"}
+    - {id: 4, cat: TV/Anime, desc: "Animes"}
+    - {id: 8, cat: TV/Sport, desc: "Esportes"}
+    - {id: 6, cat: Movies, desc: "Desenhos Animados"}
+    - {id: 5, cat: Console, desc: "Jogos"}
+    - {id: 9, cat: PC, desc: "Programas"}
+    - {id: 10, cat: Audio, desc: "HQs"}
+    - {id: 11, cat: Books, desc: "Livros"}
 
   modes:
     search: [q]
@@ -37,11 +34,15 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://therebels.tv/\" target=\"_blank\">TheRebels</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://capybarabr.com/\" target=\"_blank\">CapybaraBR</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
     default: false
+  - name: single_file_release_use_filename
+    type: checkbox
+    label: Use filename as title for single file releases
+    default: true
   - name: sort
     type: select
     label: Sort requested from site
@@ -58,10 +59,6 @@ settings:
     options:
       desc: desc
       asc: asc
-  - name: info_activity
-    type: info
-    label: Account Inactivity
-    default: "Your account will be considered inactive if it goes more than 90 days without you logging into the website. After 90 days of inactivity (i.e. 180 days without logging in) it will be deleted from the tracker. Attention: The groups that suffer from inactivity are: User and Leech."
 
 login:
   path: /api/torrents
@@ -73,8 +70,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
     - path: "/api/torrents/filter"
       response:
         type: json
@@ -107,7 +104,7 @@ search:
   fields:
     category:
       selector: category_id
-    title:
+    title_optional:
       selector: name
     details:
       selector: details_link
@@ -129,8 +126,6 @@ search:
     genre:
       selector: meta.genres
       filters:
-        - name: re_replace
-          args: ["(?i)^None$", ""]
         - name: re_replace
           args: ["(?i)(Ficção científica)", "Ficção_científica"]
         - name: re_replace
@@ -168,15 +163,16 @@ search:
         100%: 0 # freeleech
         "*": 0 # catch errors
     uploadvolumefactor:
-      # api returns 0=false, 1=true
+      # api returns False, True
       selector: double_upload
       case:
-        0: 1 # normal
-        1: 2 # double
-# global MR is 1.0 but torrents must be seeded for 2 days regardless of ratio
-#    minimumratio:
-#      text: 1.0
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# json UNIT3D 6.5.0
+        False: 1 # normal
+        True: 2 # double
+    minimumratio:
+      text: 1.0
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
+# json UNIT3D 8.0.2

src/Jackett.Common/Definitions/carpt.yml

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

src/Jackett.Common/Definitions/cinematik.yml

@@ -12,8 +12,12 @@ legacylinks:
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies, desc: "Movie"}
+    - {id: 1, cat: Movies, desc: "Film"}
     - {id: 2, cat: TV, desc: "TV"}
+    - {id: 3, cat: Movies/Foreign, desc: "Foreign Film"}
+    - {id: 4, cat: TV/Foreign, desc: "Foreign TV"}
+    - {id: 5, cat: Movies/Other, desc: "Opera & Musical"}
+    - {id: 6, cat: Movies/Foreign, desc: "Asian Film"}
 
   modes:
     search: [q]
@@ -67,8 +71,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
     - path: "/api/torrents/filter"
       response:
         type: json
@@ -169,11 +173,11 @@ search:
 #    minimumratio:
 #      text: 0.4
     minimumseedtime:
-      # 7 days (as seconds = 7 x 24 x 60 x 60)
-      text: 604800
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
     title_filename:
       selector: "files[0].name"
       optional: true
     title:
       text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
-# json UNIT3D 8.0.0
+# json UNIT3D 8.0.1

src/Jackett.Common/Definitions/cpabien.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://cpasbien-vf.pics/
+  - https://cpasbien-vf.li/
 legacylinks:
   - https://www.cpasbiens.cz/
   - https://www.cpasbiens.bz/
@@ -25,6 +25,7 @@ legacylinks:
   - https://cpasbiens911.fr/
   - https://jardattraction.fr/
   - https://cpasbien-vf.fr/
+  - https://cpasbien-vf.pics/
 
 caps:
   categories:

src/Jackett.Common/Definitions/dasunerwartete.yml

@@ -108,16 +108,16 @@ settings:
     default: "Inactive accounts will be deactivated after 7 weeks and deleted after another 3 weeks."
 
 login:
-  path: login.php
-  method: form
-  form: form[action="/login.php"]
+  path: logintracker.php
+  method: post
   inputs:
-    username: "{{ .Config.username }}"
+    login_identifier: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
+    loggiin: Login
   error:
-    - selector: div#login_error
+    - selector: div.error-message
   test:
-    path: /
+    path: index.php
     selector: a[href="logout.php"]
 
 search:

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

@@ -94,8 +94,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
     - path: "/api/torrents/filter"
       response:
         type: json

src/Jackett.Common/Definitions/demonoid.yml

@@ -9,7 +9,6 @@ links:
   - https://www.demonoid.is/
   - https://www.dnoid.to/
   - https://www.dnoid.pw/
-  - https://demonoid.unblockit.africa/
   - https://demonoid.torrentbay.st/
 legacylinks:
   - https://demonoid.unblockit.boo/
@@ -34,6 +33,8 @@ legacylinks:
   - https://demonoid.nocensor.cloud/
   - https://demonoid.unblockit.date/
   - https://demonoid.unblockit.dad/
+  - https://demonoid.unblockit.africa/
+  - https://demonoid.unblockit.casa/ # 302
 
 caps:
   categorymappings:

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

@@ -66,8 +66,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
     - path: "/api/torrents/filter"
       response:
         type: json

src/Jackett.Common/Definitions/digitalcore.yml

@@ -164,7 +164,7 @@ search:
       selector: added
       filters:
         - name: append
-          args: " +01:00" # CET
+          args: " +02:00" # EET
         - name: dateparse
           args: "yyyy-MM-dd HH:mm:ss zzz"
     size:

src/Jackett.Common/Definitions/discfan.yml

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

src/Jackett.Common/Definitions/divteam.yml

@@ -64,7 +64,7 @@ settings:
     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
+    label: Filter freeleech only
     default: false
   - name: sort
     type: select
@@ -107,16 +107,17 @@ search:
     page: torrents
     category: "{{ range .Categories }}{{.}};{{end}}"
     search: "{{ .Keywords }}"
+    # 0 title, 1 title&desc, 2 descr, 3 uploaders, 5 gold, 6 silver, 9 2x, 10 3x, 11 4x, 12 5x
+    # note the options are exclusive, so searching for gold means the search keywords are ignored
+    options: 0
     # 0 all, 1 activeonly, 2 deadonly
     active: 0
-    # 0 title, 1 title&desc, 2 descr, 3 uploaders, 5 gold, 6 silver, 9 2x, 10 3x, 11 4x, 12 5x
-    options: "{{ if .Config.freeleech }}5{{ else }}0{{ end }}"
     order: "{{ .Config.sort }}"
     by: "{{ .Config.type }}"
     # does not support imdbid search and does not supply imdb link in results.
 
   rows:
-    selector: table.table.table-bordered > tbody > tr:has(a[href^="download.php?id="])
+    selector: "table.table.table-bordered > tbody > tr:has(a[href^=\"download.php?id=\"]){{ if .Config.freeleech }}:has(img[src$=\"gold.gif\"]){{ else }}{{ end }}, table.table.table-bordered > tbody > tr:has(a[href^=\"download.php?id=\"]){{ if .Config.freeleech }}:has(img[src$=\"freeleech.gif\"]){{ else }}{{ end }}"
 
   fields:
     download:

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

@@ -7,12 +7,9 @@ type: public
 encoding: UTF-8
 links:
   - https://extratorrent.st/
-  - https://extratorrent.unblockit.africa/
   - https://extratorrent.ninjaproxy1.com/
   - https://extratorrent.proxyninja.org/
 legacylinks:
-  - https://extratorrent.nocensor.lol/
-  - https://extratorrent.unblockit.ink/
   - https://extratorrent.nocensor.art/
   - https://extratorrent.unblockit.bio/
   - https://extratorrent.unblockit.boo/
@@ -32,6 +29,8 @@ legacylinks:
   - https://extratorrent.nocensor.cloud/
   - https://extratorrent.unblockit.date/
   - https://extratorrent.unblockit.dad/
+  - https://extratorrent.unblockit.africa/
+  - https://extratorrent.unblockit.casa/ # 502
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/eztv.yml

@@ -11,7 +11,8 @@ links:
   - https://eztv.tf/
   - https://eztv.yt/
   - https://eztv1.xyz/
-  - https://eztv.unblockit.africa/
+  - https://eztv.abcproxy.org/
+  - https://eztv.unblockit.casa/
   - https://eztv.unblockninja.com/
   - https://eztv.ninjaproxy1.com/
   - https://eztv.proxyninja.org/
@@ -38,6 +39,7 @@ legacylinks:
   - https://eztv.nocensor.cloud/
   - https://eztv.unblockit.date/
   - https://eztv.unblockit.dad/
+  - https://eztv.unblockit.africa/
 
 caps:
   categories:

src/Jackett.Common/Definitions/fastscene.yml

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

src/Jackett.Common/Definitions/fearnopeer.yml

@@ -38,6 +38,10 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
+  - name: single_file_release_use_filename
+    type: checkbox
+    label: Use filename as title for single file releases
+    default: true
   - name: sort
     type: select
     label: Sort requested from site
@@ -65,8 +69,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
     - path: "/api/torrents/filter"
       response:
         type: json
@@ -99,7 +103,7 @@ search:
   fields:
     category:
       selector: category_id
-    title:
+    title_optional:
       selector: name
     details:
       selector: details_link
@@ -121,8 +125,6 @@ search:
     genre:
       selector: meta.genres
       filters:
-        - name: re_replace
-          args: ["(?i)^None$", ""]
         - name: re_replace
           args: ["(?i)(Science Fiction)", "Science_Fiction"]
         - name: re_replace
@@ -168,4 +170,9 @@ search:
 # Maintain global ratio above 0.5 or downloads will get disabled. No MST.
     minimumratio:
       text: 0.51
-# json UNIT3D 7.2.5
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
+# json UNIT3D 8.0.2

src/Jackett.Common/Definitions/freefarm.yml

@@ -69,6 +69,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
   - name: info_tpp
     type: info
     label: Results Per Page
@@ -76,7 +80,7 @@ settings:
   - name: info_activity
     type: info
     label: Account Inactivity
-    default: "Cherish your user account. Inactive accounts would be deleted based on the following rules:<ol><li>Veteran User or above would never be deleted.</li><li>Elite User or above would never be deleted if packed (at User CP).</li><li>Packed accounts would be deleted if users have not logged in for more than 400 days in a row.</li><li>Unpacked accounts would be deleted if users have not logged in for more than 150 days in a row.</li><li>Accounts with both uploaded and downloaded amount being 0 would be deleted if users have not logged in for more than 100 days in a row.</li></ol>"
+    default: "Cherish your user account. Inactive accounts would be deleted based on the following rules:<ol><li>Veteran User or above would never be deleted.</li><li>Elite User or above would never be deleted if parked (at User CP).</li><li>Parked accounts would be deleted if users have not logged in for more than 400 days in a row.</li><li>Unparked accounts would be deleted if users have not logged in for more than 150 days in a row.</li><li>Accounts with both uploaded and downloaded amount being 0 would be deleted if users have not logged in for more than 100 days in a row.</li></ol>"
 
 login:
   path: login.php
@@ -216,4 +220,4 @@ search:
       filters:
         - name: prepend
           args: "{{ .Result.description_verified }} "
-# NexusPHP v1.8.9 2023-09-29
+# NexusPHP v1.8.11 2024-03-27

src/Jackett.Common/Definitions/fsm.yml

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

src/Jackett.Common/Definitions/fuzer.yml

@@ -61,7 +61,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid]
+    tv-search: [q, season, ep]
     movie-search: [q, imdbid]
     music-search: [q]
     book-search: [q]
@@ -110,6 +110,7 @@ search:
     query: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
     order: "{{ .Config.sort }}"
     sort: "{{ .Config.type }}"
+    # any (every word), phr (any match), all (exact match)
     matchquery: any
     freeleech: "{{ if .Config.freeleech }}1{{ else }}0{{ end }}"
     # on, off, only_dead

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

@@ -92,8 +92,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
     - path: "/api/torrents/filter"
       response:
         type: json

src/Jackett.Common/Definitions/girotorrent.yml

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

src/Jackett.Common/Definitions/gktorrent.yml

@@ -8,7 +8,7 @@ encoding: UTF-8
 followredirect: true
 # to fetch current domain use https://www.protege-torrent.com/Gktorrent
 links:
-  - https://www.gktorrent.sh/
+  - https://www.gktorrent.eu/
 legacylinks:
   - https://www.rantop.org/
   - https://gktorrent.nocensor.work/
@@ -19,7 +19,6 @@ legacylinks:
   - https://gktorrent.mrunblock.guru/
   - https://gktorrent.mrunblock.life/
   - https://gktorrent.nocensor.click/
-  - https://www.gktorrents.cc/
   - https://www.gktorrent.ac/
   - https://www.gktorrent.ph/
   - https://www.gktorrent.vc/
@@ -31,6 +30,7 @@ legacylinks:
   - https://www.gktorrent.wtf/
   - https://www.gktorrent.vg/
   - https://www.gktorrent.lol/
+  - https://www.gktorrent.sh/
 
 caps:
   categorymappings:
@@ -97,7 +97,7 @@ search:
       args: ["(?i)(S)(\\d{1,3})$", "saison $2"]
 
   rows:
-    selector: table.table-hover > tbody > tr:has(a[onclick*="torrent/"])
+    selector: table.table-hover > tbody > tr
 
   fields:
     category:
@@ -124,7 +124,7 @@ search:
       text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
     details:
       selector: td:nth-child(1) a
-      attribute: onclick
+      attribute: href
       filters:
         - name: regexp
           args: (/?torrent/\d+)

src/Jackett.Common/Definitions/glodls.yml

@@ -8,7 +8,7 @@ encoding: UTF-8
 links:
   - https://glodls.to/
   - https://gtso.cc/
-  - https://glotorrents.unblockit.africa/
+  - https://glotorrents.unblockit.casa/
   - https://glodls.unblockninja.com/
   - https://glodls.ninjaproxy1.com/
 legacylinks:
@@ -34,6 +34,7 @@ legacylinks:
   - https://glotorrents.nocensor.cloud/
   - https://glotorrents.unblockit.date/
   - https://glotorrents.unblockit.dad/
+  - https://glotorrents.unblockit.africa/
 
 caps:
   categorymappings:

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

@@ -11,6 +11,10 @@ links:
 caps:
   categorymappings:
     - {id: 6, cat: XXX/WEB-DL, desc: "OnlyFans"}
+    - {id: 8, cat: XXX/WEB-DL, desc: "Privacy"}
+    - {id: 9, cat: XXX/WEB-DL, desc: "Other"}
+    - {id: 12, cat: XXX/WEB-DL, desc: "Hentai"}
+    - {id: 11, cat: XXX/WEB-DL, desc: "JAV"}
 
   modes:
     search: [q]
@@ -56,8 +60,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
     - path: "/api/torrents/filter"
       response:
         type: json
@@ -86,9 +90,6 @@ search:
       selector: category_id
     title:
       selector: name
-      filters:
-        - name: re_replace
-          args: ["\\.", " "]
     details:
       selector: details_link
     download:

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

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

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

@@ -33,6 +33,10 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
+  - name: single_file_release_use_filename
+    type: checkbox
+    label: Use filename as title for single file releases
+    default: true
   - name: sort
     type: select
     label: Sort requested from site
@@ -64,8 +68,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
     - path: "/api/torrents/filter"
       response:
         type: json
@@ -98,7 +102,7 @@ search:
   fields:
     category:
       selector: category_id
-    title:
+    title_optional:
       selector: name
     details:
       selector: details_link
@@ -120,8 +124,6 @@ search:
     genre:
       selector: meta.genres
       filters:
-        - name: re_replace
-          args: ["(?i)^None$", ""]
         - name: re_replace
           args: ["(?i)(Science Fiction)", "Science_Fiction"]
         - name: re_replace
@@ -167,4 +169,9 @@ search:
     minimumseedtime:
       # 3 days (as seconds = 3 x 24 x 60 x 60)
       text: 259200
-# json UNIT3D 7.2.5
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
+# json UNIT3D 8.0.2

src/Jackett.Common/Definitions/hd4fans.yml

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

src/Jackett.Common/Definitions/hdatmos.yml

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

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

@@ -63,8 +63,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
     - path: api/torrents/filter
       response:
         type: json

src/Jackett.Common/Definitions/hdt-lafenice.yml

@@ -0,0 +1,166 @@
+---
+id: hdt-lafenice
+name: HDT-LaFenice
+description: "HDT-LaFenice is an ITALIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: it-IT
+type: private
+encoding: UTF-8
+links:
+  - https://hdtlafenice.eu/
+
+caps:
+  categorymappings:
+    - {id: 32, cat: Movies/BluRay, desc: "BluRay"}
+    - {id: 33, cat: Movies/UHD, desc: "Film-2160p"}
+    - {id: 34, cat: Movies/HD, desc: "Film-1080p"}
+    - {id: 35, cat: Movies/HD, desc: "Film-720p"}
+    - {id: 37, cat: Movies/DVD, desc: "Film-DVD"}
+    - {id: 50, cat: Movies/SD, desc: "Film-DVDRip"}
+    - {id: 48, cat: TV/Other, desc: "Cartoni"}
+    - {id: 39, cat: TV/Anime, desc: "Anime"}
+    - {id: 51, cat: Movies/SD, desc: "Film-Cine"}
+    - {id: 40, cat: TV/HD, desc: "TV-HD"}
+    - {id: 41, cat: TV/SD, desc: "TV-SD"}
+    - {id: 46, cat: Audio, desc: "Musica"}
+    - {id: 42, cat: PC/Games, desc: "PC-Giochi"}
+    - {id: 43, cat: PC/0day, desc: "App-Win"}
+    - {id: 44, cat: PC/Mac, desc: "App-Mac"}
+    - {id: 45, cat: PC/Mobile-Android, desc: "Android"}
+    - {id: 47, cat: Books, desc: "E-Book"}
+    - {id: 49, cat: Other, desc: "Altro"}
+
+  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: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Inactive accounts are automatically deleted."
+
+login:
+  path: ajax/login.php
+  method: post
+  inputs:
+    action: login
+    loginbox_membername: "{{ .Config.username }}"
+    loginbox_password: "{{ .Config.password }}"
+    loginbox_remember: 1
+  error:
+    - selector: div.error
+    - selector: :contains("-ERROR-")
+  test:
+    path: ?p=home&pid=1
+    selector: div#member_info_bar
+
+search:
+  paths:
+    - path: /?p=torrents&pid=10
+      method: post
+  keywordsfilters:
+    - name: re_replace
+      args: ["[^a-zA-Z0-9]+", "%25"]
+  inputs:
+    $raw: "{{ range .Categories }}cid[]={{.}}&{{end}}"
+    keywords: "{{ .Keywords }}"
+    # name, description, both, uploader
+    search_type: name
+    "sortOptions[sortBy]": "{{ .Config.sort }}"
+    "sortOptions[sortOrder]": "{{ .Config.type }}"
+    # does not support imdbid search but has imdbid links in results.
+  error:
+    - selector: div.error:not(:contains("There are no results found."))
+
+  rows:
+    selector: "div.torrent-box[id^=\"torrent_\"]{{ if .Config.freeleech }}:has(img[src$=\"/torrent_free.png\"]){{ else }}{{ end }}"
+
+  fields:
+    category:
+      selector: a[href*="?p=torrents&pid=10&cid="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cid
+    title:
+      selector: a[href*="?p=torrents&pid=10&action=details&tid="]
+    details:
+      selector: a[href*="?p=torrents&pid=10&action=details&tid="]
+      attribute: href
+    download:
+      selector: a[href*="?p=torrents&pid=10&action=download&tid="]
+      attribute: href
+    poster:
+      selector: a[href*="data/torrents/torrent_images/"]
+      attribute: href
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    size:
+      selector: a[rel="torrent_size"]
+    grabs:
+      selector: a[rel="times_completed"]
+    seeders:
+      selector: a[rel="torrent_seeders"]
+    leechers:
+      selector: a[rel="torrent_leechers"]
+    date_day:
+      selector: div.torrentOwner:contains("day")
+      # auto adjusted by site account profile
+      optional: true
+      filters:
+        - name: regexp
+          args: "Uploaded (.+?) by"
+        - name: fuzzytime
+    date_year:
+      selector: div.torrentOwner:contains("-")
+      # auto adjusted by site account profile
+      optional: true
+      filters:
+        - name: regexp
+          args: "Uploaded (.+?) by"
+        - name: dateparse
+          args: "dd-MM-yyyy HH:mm"
+    date_unix:
+      selector: div.torrentOwner abbr
+      optional: true
+      attribute: data-time
+    date:
+      text: "{{ if or .Result.date_day .Result.date_year .Result.date_unix }}{{ or .Result.date_day .Result.date_year .Result.date_unix }}{{ else }}now{{ end }}"
+    downloadvolumefactor:
+      case:
+        img[src$="/torrent_free.png"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 0.8
+# TSUE 2.2

src/Jackett.Common/Definitions/hdtime.yml

@@ -192,4 +192,4 @@ search:
     description:
       selector: td.rowfollow:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.8.5 2023-07-15
+# NexusPHP vv1.8.7 2023-08-22

src/Jackett.Common/Definitions/hdtorrentsit.yml

@@ -34,6 +34,10 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
+  - name: single_file_release_use_filename
+    type: checkbox
+    label: Use filename as title for single file releases
+    default: true
   - name: sort
     type: select
     label: Sort requested from site
@@ -61,8 +65,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
     - path: "/api/torrents/filter"
       response:
         type: json
@@ -97,15 +101,8 @@ search:
   fields:
     category:
       selector: category_id
-    title:
+    title_optional:
       selector: name
-      filters:
-        - name: re_replace
-          args: ["\\.", " "]
-        - name: re_replace # Stagione X --> S0X
-          args: ["(?i)\\bStagion[ei]\\s?(\\d{1})\\b|\\bSeason'?s?\\s?(\\d{1})\\b", "S0$1$2"]
-        - name: re_replace # Stagione XX --> SXX
-          args: ["(?i)\\bStagion[ei]\\s?(\\d{2,})\\b|\\bSeason'?s?\\s?(\\d{2,})\\b", "S$1$2"]
     details:
       selector: details_link
     download:
@@ -126,8 +123,6 @@ search:
     genre:
       selector: meta.genres
       filters:
-        - name: re_replace
-          args: ["(?i)^None$", ""]
         - name: re_replace
           args: ["(?i)(Science Fiction)", "Science_Fiction"]
         - name: re_replace
@@ -171,4 +166,16 @@ search:
         False: 1 # normal
         True: 2 # double
 # as a pay site there is no MR or MST
-# json UNIT3D 7.2.5
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
+      filters:
+        - name: re_replace
+          args: ["\\.", " "]
+        - name: re_replace # Stagione X --> S0X
+          args: ["(?i)\\bStagion[ei]\\s?(\\d{1})\\b|\\bSeason'?s?\\s?(\\d{1})\\b", "S0$1$2"]
+        - name: re_replace # Stagione XX --> SXX
+          args: ["(?i)\\bStagion[ei]\\s?(\\d{2,})\\b|\\bSeason'?s?\\s?(\\d{2,})\\b", "S$1$2"]
+# json UNIT3D 8.0.2 (custom)

src/Jackett.Common/Definitions/hdu.yml

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

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

@@ -92,6 +92,10 @@ settings:
     type: info
     label: Results Per Page
     default: For best results, change the <b>Torrents per page:</b> setting to <b>40</b> on your account profile. The Default is <i>15</i>.
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
   - name: info_activity
     type: info
     label: Account Inactivity

src/Jackett.Common/Definitions/hebits.yml

@@ -75,7 +75,7 @@ search:
         type: json
 
   inputs:
-    searchstr: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    searchstr: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }} {{ else }}{{ end }}{{ .Keywords }}"
     order_by: "{{ .Config.sort }}"
     order_way: "{{ .Config.type }}"
     imdbgt: 0
@@ -83,6 +83,7 @@ search:
     # 1 freeleech, 2 neutral, 3 50%, 4 2x, 5 3x, 9 75%, 11 only perks, 0 normal
     freetorrent: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
     action: browse
+    group_results: 0
     $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
 
   rows:

src/Jackett.Common/Definitions/hellashut.yml

@@ -13,6 +13,7 @@ legacylinks:
 
 caps:
   categorymappings:
+    - {id: 85, cat: TV/Anime, desc: "Anime/Cartoon 4K"}
     - {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"}

src/Jackett.Common/Definitions/houseofdevil.yml

@@ -39,6 +39,7 @@ caps:
     - {id: 115, cat: PC/0day, desc: "Programme - Windows"}
     - {id: 116, cat: TV/Documentary, desc: "Serien - Dokus"}
     - {id: 118, cat: TV/Sport, desc: "Serien - Sport"}
+    - {id: 142, cat: TV, desc: "Serien - Pack"}
     - {id: 129, cat: Other, desc: "Sonstiges"}
     - {id: 109, cat: PC/Mobile-Other, desc: "Spiele - Handy"}
     - {id: 112, cat: Console, desc: "Spiele - Konsolen"}

src/Jackett.Common/Definitions/huntorrent.yml

@@ -134,8 +134,13 @@ search:
     details:
       text: "details.php?id={{ .Result._id }}"
     download:
-      selector: a[href^="download.php?torrent="]
+      selector: a.download-link
       attribute: href
+      filters:
+        - name: replace
+          args: ["please_wait=1&", ""]
+        - name: replace
+          args: ["&please_wait=1", ""]
     genre:
       selector: "span[style=\"font-size: 6pt; font-weight: bold;\"]"
     description:

src/Jackett.Common/Definitions/icc2022.yml

@@ -72,7 +72,7 @@ settings:
   - name: info_activity
     type: info
     label: Account Inactivity
-    default: "Cherish your user account. Inactive accounts would be deleted based on the following rules:<ol><li>Veteran User or above would never be deleted.</li><li>Elite User or above would never be deleted if packed (at User CP).</li><li>Packed accounts would be deleted if users have not logged in for more than 400 days in a row.</li><li>Unpacked accounts would be deleted if users have not logged in for more than 150 days in a row.</li><li>Accounts with both uploaded and downloaded amount being 0 would be deleted if users have not logged in for more than 100 days in a row.</li></ol>"
+    default: "Cherish your user account. Inactive accounts would be deleted based on the following rules:<ol><li>Veteran User or above would never be deleted.</li><li>Elite User or above would never be deleted if parked (at User CP).</li><li>Parked accounts would be deleted if users have not logged in for more than 400 days in a row.</li><li>Unparked accounts would be deleted if users have not logged in for more than 150 days in a row.</li><li>Accounts with both uploaded and downloaded amount being 0 would be deleted if users have not logged in for more than 100 days in a row.</li></ol>"
 
 login:
   path: login.php
@@ -193,4 +193,4 @@ search:
     description:
       selector: td.rowfollow:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.8.6 2023-08-18
+# NexusPHP v1.8.11 2024-03-27

src/Jackett.Common/Definitions/ilcorsaroblu.yml

@@ -84,7 +84,7 @@ settings:
     label: Password
   - name: freeleech
     type: checkbox
-    label: Search freeleech only
+    label: Filter freeleech only
     default: false
   - name: flaresolverr
     type: info
@@ -140,7 +140,8 @@ search:
     search: "{{ .Keywords }}"
     category: "{{ if .Categories }}{{ range .Categories }}{{.}};{{end}}{{ else }}0{{ end }}"
     # 0 title, 1 title & descr, 2 descr, 3 uploaders, 5 gold, 6 silver, 7 bronze
-    options: "{{ if .Config.freeleech }}5{{ else }}0{{ end }}"
+    # note the options are exclusive, so searching for gold means the search keywords are ignored
+    options: 0
     # 0 all, 1 activeonly, 2 deadonly
     active: 0
     order: "{{ .Config.sort }}"
@@ -148,7 +149,7 @@ search:
     # does not support imdbid searches and does not return imdb link in results
 
   rows:
-    selector: div.b-content > table > tbody > tr > td > table.lista > tbody > tr:has(a[href^="index.php?page=torrents&category="])
+    selector: "div.b-content > table > tbody > tr > td > table.lista > tbody > tr:has(a[href^=\"index.php?page=torrents&category=\"]){{ if .Config.freeleech }}:has(img[src$=\"gold.gif\"]){{ else }}{{ end }}"
     filters:
       - name: andmatch
 

src/Jackett.Common/Definitions/ildragonero.yml

@@ -5,7 +5,6 @@ description: "ilDraGoNeRo is an ITALIAN Semi-Private Torrent Tracker for MOVIES
 language: it-IT
 type: semi-private
 encoding: UTF-8
-requestDelay: 5
 links:
   - https://ildragonero2.info/
 

src/Jackett.Common/Definitions/ilolicon.yml

@@ -0,0 +1,172 @@
+---
+id: ilolicon
+name: ilolicon PT
+description: "ilolicon PT is a CHINESE Private torrent tracker for LOLICON / MOVIES / 3X"
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - https://share.ilolicon.com/
+
+caps:
+  categorymappings:
+    - {id: 401, cat: Movies, desc: "电影 (Movie)"}
+    - {id: 402, cat: TV, desc: 电视剧/综艺 (TV Series/TV Show)"}
+    - {id: 405, cat: TV/Anime, desc: "动画 (Animation)"}
+    - {id: 408, cat: Audio, desc: "音乐 (Music)"}
+    - {id: 410, cat: Audio/Video, desc: "舞台演出 (Stage Performance)"}
+    - {id: 404, cat: TV/Documentary, desc: "纪录片 (Documentary)"}
+    - {id: 412, cat: Console, desc: "游戏 (Game)"}
+    - {id: 413, cat: PC, desc: "软件 (Software)"}
+    - {id: 411, cat: Other, desc: "漫画/图集/绘本/写真 (Photo)"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
+    music-search: [q]
+
+settings:
+  - name: cookie
+    type: text
+    label: Cookie
+  - name: info
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: 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.</br>Choosing more may cause the web site to fail to deliver complete results.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Cherish your user account. Inactive accounts would be deleted based on the following rules:<ol><li>Veteran User or above would never be deleted.</li><li>Elite User or above would never be deleted if parked (at User CP).</li><li>Parked accounts would be deleted if users have not logged in for more than 400 days in a row.</li><li>Unparked accounts would be deleted if users have not logged in for more than 150 days in a row.</li><li>Accounts with both uploaded and downloaded amount being 0 would be deleted if users have not logged in for more than 100 days in a row.</li></ol>"
+
+login:
+  method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }} {{ else }}{{ .Keywords }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
+    incldead: 0
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}{{ end }}{{ if .Query.DoubanID }}1{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}0{{ end }}"
+    # 0 AND, 2 exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    notnewword: 1
+
+  rows:
+    selector: table.torrents > tbody > tr:has(a[href^="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
+    description:
+      selector: td.rowfollow:nth-child(2) td:nth-child(2)
+      remove: a, b, font, img
+# NexusPHP v1.8.8 2023-09-25

src/Jackett.Common/Definitions/irishtv.yml

@@ -41,7 +41,7 @@ settings:
     label: Password
   - name: freeleech
     type: checkbox
-    label: Search freeleech only
+    label: Filter freeleech only
     default: false
   - name: sort
     type: select
@@ -85,7 +85,8 @@ search:
     search: "{{ .Keywords }}"
     category: "{{ range .Categories }}{{.}};{{end}}"
     # 0 filename, 1 file&descr, 2 descr, 3 uploaders, 18 genre, 4 imdb, 5 gold, 6 silver, 7 bronze, 8-17 upload multiplier 1x-10x
-    options: "{{ if .Config.freeleech }}5{{ else }}0{{ end }}"
+    # note the options are exclusive, so searching for gold means the search keywords are ignored
+    options: 0
     # 0 all, 1 active only, 2 dead only
     active: 0
     order: "{{ .Config.sort }}"
@@ -97,7 +98,7 @@ search:
       args: ["\\.", " "]
 
   rows:
-    selector: "table.lista > tbody > tr:has(a[href^=\"download.php?id=\"]):not(:has(a[href^=\"index.php?page=userdetails\"]))"
+    selector: "table.lista > tbody > tr:has(a[href^=\"download.php?id=\"]):not(:has(a[href^=\"index.php?page=userdetails\"])){{ if .Config.freeleech }}:has(img[src$=\"gold.gif\"]){{ else }}{{ end }}, able.lista > tbody > tr:has(a[href^=\"download.php?id=\"]):not(:has(a[href^=\"index.php?page=userdetails\"])){{ if .Config.freeleech }}:has(img[src$=\"freeleech.gif\"]){{ else }}{{ end }}"
 
   fields:
     category:

src/Jackett.Common/Definitions/itatorrents.yml

@@ -34,11 +34,15 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://itatorrents.xyz/\" target=\"_blank\">ItaTorrents</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://itatorrents.xyz/\" target=\"_blank\">ItaTorrents</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
     default: false
+  - name: single_file_release_use_filename
+    type: checkbox
+    label: Use filename as title for single file releases
+    default: true
   - name: sort
     type: select
     label: Sort requested from site
@@ -70,8 +74,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
     - path: "/api/torrents/filter"
       response:
         type: json
@@ -106,15 +110,8 @@ search:
   fields:
     category:
       selector: category_id
-    title:
+    title_optional:
       selector: name
-      filters:
-        - name: re_replace
-          args: ["\\.", " "]
-        - name: re_replace # Stagione X --> S0X
-          args: ["(?i)\\bStagion[ei]\\s?(\\d{1})\\b|\\bSeason'?s?\\s?(\\d{1})\\b", "S0$1$2"]
-        - name: re_replace # Stagione XX --> SXX
-          args: ["(?i)\\bStagion[ei]\\s?(\\d{2,})\\b|\\bSeason'?s?\\s?(\\d{2,})\\b", "S$1$2"]
     details:
       selector: details_link
     download:
@@ -135,8 +132,6 @@ search:
     genre:
       selector: meta.genres
       filters:
-        - name: re_replace
-          args: ["(?i)^None$", ""]
         - name: re_replace
           args: ["(?i)(televisione film)", "televisione_film"]
         - name: replace
@@ -172,12 +167,24 @@ search:
         100%: 0 # freeleech
         "*": 0 # catch errors
     uploadvolumefactor:
-      # api returns 0=false, 1=true
+      # api returns False, True
       selector: double_upload
       case:
-        0: 1 # normal
-        1: 2 # double
+        False: 1 # normal
+        True: 2 # double
     minimumseedtime:
       # 7 days (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 6.5.0
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
+      filters:
+        - name: re_replace
+          args: ["\\.", " "]
+        - name: re_replace # Stagione X --> S0X
+          args: ["(?i)\\bStagion[ei]\\s?(\\d{1})\\b|\\bSeason'?s?\\s?(\\d{1})\\b", "S0$1$2"]
+        - name: re_replace # Stagione XX --> SXX
+          args: ["(?i)\\bStagion[ei]\\s?(\\d{2,})\\b|\\bSeason'?s?\\s?(\\d{2,})\\b", "S$1$2"]
+# json UNIT3D 8.0.2 (custom)

src/Jackett.Common/Definitions/jme-reunit3d-api.yml

@@ -72,8 +72,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
     - path: "/api/torrents/filter"
       response:
         type: json

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

@@ -68,8 +68,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
     - path: "/api/torrents/filter"
       response:
         type: json

src/Jackett.Common/Definitions/kelu.yml

@@ -0,0 +1,186 @@
+---
+id: kelu
+name: Kelu
+description: "Kelu is a CHINESE Private Torrent Tracker for GAY 3X"
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - https://our.kelu.one/
+
+caps:
+  categorymappings:
+    - {id: 408, cat: XXX/Other, desc: "其他"}
+    - {id: 409, cat: XXX/Other, desc: "动漫/二次元"}
+    - {id: 403, cat: XXX, desc: "SM"}
+    - {id: 402, cat: XXX, desc: "日韩"}
+    - {id: 405, cat: XXX, desc: "欧美"}
+    - {id: 404, cat: XXX, desc: "国产"}
+    - {id: 401, cat: XXX/ImageSet, desc: "写真"}
+    - {id: 410, cat: XXX, desc: "影视"}
+    - {id: 411, cat: PC/Games, desc: "游戏"}
+
+  modes:
+    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 Kelu Web Site. Otherwise just leave it empty."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Inactive accounts (i.e. not logged in for a long time) are automatically deleted."
+
+login:
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
+  inputs:
+    secret: ""
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    two_step_code: "{{ .Config.2facode }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
+  error:
+    - selector: td.embedded:has(h2:contains("失败"))
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # 0 incldead, 1 active, 2 dead
+    incldead: 0
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: 0
+    # 0 AND, 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
+    date_elapsed:
+      # time type: time elapsed (default)
+      selector: td.rowfollow:nth-child(4) > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    date_added:
+      # time added
+      selector: td.rowfollow:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-ddHH:mm:ss zzz"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td.rowfollow:nth-child(5)
+    seeders:
+      selector: td.rowfollow:nth-child(6)
+    leechers:
+      selector: td.rowfollow:nth-child(7)
+    grabs:
+      selector: td.rowfollow:nth-child(8)
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    minimumseedtime:
+      case:
+        img.hitandrun: 86400
+        "*": 0
+    description:
+      selector: td.rowfollow:nth-child(2)
+      remove: a, b, font, img, span
+# NexusPHP v1.8.6 2023-08-18

src/Jackett.Common/Definitions/kickasstorrents-to.yml

@@ -10,6 +10,7 @@ links:
   - https://kickasstorrents.to/
   - https://kickasstorrent.cr/
   - https://katcr.to/
+  - https://kickasstorrents.abcproxy.org/
   - https://kickasstorrents.unblockninja.com/
   - https://kickasstorrents.ninjaproxy1.com/
   - https://kickasstorrents.proxyninja.org/

src/Jackett.Common/Definitions/kimoji.yml

@@ -60,8 +60,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
     - path: "/api/torrents/filter"
       response:
         type: json

src/Jackett.Common/Definitions/krazyzone.yml

@@ -5,6 +5,8 @@ description: "KrazyZone is a Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: en-US
 type: private
 encoding: UTF-8
+certificates:
+  - 2e88b1a9031288c50f942201634b6d1484aca612 # expired 11 Apr 2024
 links:
   - https://krazyzone.net/
 legacylinks:

src/Jackett.Common/Definitions/kufei.yml

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

src/Jackett.Common/Definitions/laidbackmanor.yml

@@ -67,8 +67,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
     - path: "/api/torrents/filter"
       response:
         type: json

src/Jackett.Common/Definitions/lastdigitalunderground.yml

@@ -63,6 +63,10 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
+  - name: single_file_release_use_filename
+    type: checkbox
+    label: Use filename as title for single file releases
+    default: true
   - name: sort
     type: select
     label: Sort requested from site
@@ -90,8 +94,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
     - path: "/api/torrents/filter"
       response:
         type: json
@@ -124,7 +128,7 @@ search:
   fields:
     category:
       selector: category_id
-    title:
+    title_optional:
       selector: name
     details:
       selector: details_link
@@ -146,8 +150,6 @@ search:
     genre:
       selector: meta.genres
       filters:
-        - name: re_replace
-          args: ["(?i)^None$", ""]
         - name: re_replace
           args: ["(?i)(Science Fiction)", "Science_Fiction"]
         - name: re_replace
@@ -196,4 +198,9 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 7.2.5
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
+# json UNIT3D 8.0.1

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

@@ -40,11 +40,15 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://lat-team.com/\" target=\"_blank\">Lat-Team</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://lat-team.com/\" target=\"_blank\">Lat-Team</a> account <i>My Settings</i> page and clicking on the <b>API Key</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
     default: false
+  - name: single_file_release_use_filename
+    type: checkbox
+    label: Use filename as title for single file releases
+    default: true
   - name: sort
     type: select
     label: Sort requested from site
@@ -72,8 +76,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
     - path: "/api/torrents/filter"
       response:
         type: json
@@ -90,7 +94,7 @@ search:
     imdbId: "{{ .Query.IMDBIDShort }}"
     tmdbId: "{{ .Query.TMDBID }}"
     tvdbId: "{{ .Query.TVDBID }}"
-    free[]: "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
+    "free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
@@ -106,20 +110,8 @@ search:
   fields:
     category:
       selector: category_id
-    title_vose:
-      selector: name:contains(VOSE)
-      optional: true
-      filters:
-        - name: append
-          args: " ENGLiSH"
-    title_notvose:
-      selector: name:not(:contains(VOSE))
-      optional: true
-      filters:
-        - name: append
-          args: " SPANiSH"
-    title:
-      text: "{{ if .Result.title_vose }}{{ .Result.title_vose }}{{ else }}{{ .Result.title_notvose }}{{ end }}"
+    title_optional:
+      selector: name
     details:
       selector: details_link
     download:
@@ -140,8 +132,6 @@ search:
     genre:
       selector: meta.genres
       filters:
-        - name: re_replace
-          args: ["(?i)^None$", ""]
         - name: re_replace
           args: ["(?i)(Science Fiction)", "Science_Fiction"]
         - name: re_replace
@@ -179,15 +169,25 @@ search:
         100%: 0 # freeleech
         "*": 0 # catch errors
     uploadvolumefactor:
-      # api returns 0=false, 1=true
+      # api returns False, True
       selector: double_upload
       case:
-        0: 1 # normal
-        1: 2 # double
+        False: 1 # normal
+        True: 2 # double
 # global MR is 0.4 but torrents must be seeded for 2 days regardless of ratio
 #    minimumratio:
 #      text: 0.4
     minimumseedtime:
       # 2 days (as seconds = 2 x 24 x 60 x 60)
       text: 172800
-# json UNIT3D 6.5.0
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title_phase1:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
+    title_vose:
+      selector: name:contains(VOSE)
+      optional: true
+    title:
+      text: "{{ .Result.title_phase1 }}{{ if .Result.title_vose }} ENGLiSH{{ else }} SPANiSH{{ end }}"
+# json UNIT3D 8.0.2 (custom)

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

@@ -16,7 +16,6 @@ caps:
     - {id: 101, cat: TV/Documentary, desc: "FILM Documentaire"}
     - {id: 75, cat: Movies/UHD, desc: "FILM 2160 P"}
     - {id: 63, cat: Movies/WEB-DL, desc: "FILM WEB"}
-    - {id: 62, cat: Movies/WEB-DL, desc: "FILM WEB"}
     - {id: 66, cat: Movies/HD, desc: "FILM HDRip"}
     - {id: 34, cat: Movies/SD, desc: "FILM TVRip"}
     - {id: 33, cat: Movies/SD, desc: "FILM HDTV"}
@@ -31,6 +30,7 @@ caps:
     - {id: 107, cat: Movies, desc: "FILM ANIME"}
     # SERIE
     - {id: 9, cat: TV/SD, desc: "SERIE DVD"}
+    - {id: 106, cat: TV/Anime, desc: "SERIE ANIME"}
     - {id: 105, cat: TV, desc: "SERIE Pack"}
     - {id: 102, cat: TV/Documentary, desc: "SERIE Documentaire"}
     - {id: 72, cat: TV/UHD, desc: "SERIE 2160 P"}
@@ -43,7 +43,6 @@ caps:
     - {id: 15, cat: TV/WEB-DL, desc: "SERIE WEB.1080p"}
     - {id: 14, cat: TV/WEB-DL, desc: "SERIE WEB.720p"}
     - {id: 12, cat: TV/WEB-DL, desc: "SERIE WEB"}
-    - {id: 106, cat: TV/Anime, desc: "SERIE ANIME"}
     - {id: 108, cat: TV/HD, desc: "SERIE BlueRay"}
     # LOGICIELS
     - {id: 56, cat: PC/ISO, desc: "LOGICIELS Linux"}
@@ -56,6 +55,7 @@ caps:
     - {id: 49, cat: Books/EBook, desc: "EBOOK Livres"}
     # MUSIC
     - {id: 5, cat: Audio/Video, desc: "MUSIC clip video"}
+    - {id: 109, cat: Audio/Video, desc: "MUSIC Spectacles.Theatre"}
     # JEUX
     - {id: 96, cat: PC/Games, desc: "JEUX Apple"}
     - {id: 8, cat: Console/PS3, desc: "JEUX PS3"}

src/Jackett.Common/Definitions/lilleskyorg.yml

@@ -11,8 +11,9 @@ links:
 caps:
   categorymappings:
     - {id: 1, cat: Movies, desc: "MOVIES"}
+    - {id: 20, cat: Movies/Foreign, desc: "MOVIES-FOREIGN"}
     - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: TV/Foreign, desc: "TV-FOREIGN"}
+    - {id: 19, cat: TV/Foreign, desc: "TV-FOREIGN"}
     - {id: 4, cat: PC, desc: "APPS"}
     - {id: 5, cat: Audio, desc: "MUSIC"}
     - {id: 6, cat: XXX, desc: "XXX"}
@@ -65,8 +66,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
     - path: "/api/torrents/filter"
       response:
         type: json

src/Jackett.Common/Definitions/limetorrents.yml

@@ -8,14 +8,13 @@ encoding: UTF-8
 # changes to this indexer should also be made to limetorrentsclone
 links:
   - https://www.limetorrents.lol/
-  - https://limetorrents.unblockit.africa/
+  - https://limetorrents.abcproxy.org/
+  - https://limetorrents.unblockit.casa/
   - https://limetorrents.unblockninja.com/
   - https://limetorrents.ninjaproxy1.com/
   - https://limetorrents.proxyninja.org/
   - https://limetorrents.torrentbay.st/
 legacylinks:
-  - https://limetorrents.nocensor.lol/
-  - https://limetorrents.unblockit.ink/
   - https://limetorrents.nocensor.art/
   - https://limetorrents.unblockit.bio/
   - https://limetorrents.unblockit.boo/
@@ -35,6 +34,7 @@ legacylinks:
   - https://limetorrents.nocensor.cloud/
   - https://limetorrents.unblockit.date/
   - https://limetorrents.unblockit.dad/
+  - https://limetorrents.unblockit.africa/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/limetorrentsclone.yml

@@ -1,126 +0,0 @@
----
-id: limetorrentsclone
-name: LimeTorrents clone
-description: "LimeTorrents clone is a Public LimeTorrents clone for TV / MOVIES / GENERAL"
-language: en-US
-type: public
-encoding: UTF-8
-# changes to this indexer should also be made to limetorrents
-links:
-  - https://www.limetorrents.to/
-
-caps:
-  categorymappings:
-    - {id: "TV shows", cat: TV, desc: "TV shows"}
-    - {id: Movies, cat: Movies, desc: Movies}
-    - {id: Music, cat: Audio, desc: Music}
-    - {id: Games, cat: Console, desc: Games}
-    - {id: Applications, cat: PC/0day, desc: Applications}
-    - {id: Other, cat: Other, desc: Other}
-    - {id: Anime, cat: TV/Anime, desc: Anime}
-    - {id: E-books, cat: Books/EBook, desc: E-books}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: downloadlink
-    type: select
-    label: Download link
-    default: "magnet:"
-    options:
-      "http://itorrents.org/": iTorrents.org
-      "magnet:": magnet
-  - name: downloadlink2
-    type: select
-    label: Download link (fallback)
-    default: "http://itorrents.org/"
-    options:
-      "http://itorrents.org/": iTorrents.org
-      "magnet:": magnet
-  - name: info_download
-    type: info
-    label: About the Download links
-    default: As the .torrent download links on this site are known to fail from time to time, you can optionally set as a fallback an automatic alternate link.
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: date
-    options:
-      date: created
-      seeds: seeders
-      size: size
-  - name: info_8000
-    type: info
-    label: About LimeTorrents Categories
-    default: LimeTorrents only returns category <b>Other</b> in its <i>Keywordless</i> search results page.</br>To pass your apps' indexer TEST you will need to include the 8000(Other) category.
-
-download:
-  # the .torrent url is on the on the details page
-  selectors:
-    - selector: a.csprite_dltorrent[href^="{{ .Config.downloadlink }}"]
-      attribute: href
-    - selector: a.csprite_dltorrent[href^="{{ .Config.downloadlink2 }}"]
-      attribute: href
-
-search:
-  paths:
-    - path: "{{ if .Keywords }}search/all/{{ .Keywords }}/{{ .Config.sort }}/1/{{ else }}/latest100{{ end }}"
-  keywordsfilters:
-    - name: re_replace
-      args: ["S[0-9]{2}([^E]|$)", ""] # remove season tag without episode
-
-  rows:
-    selector: .table2 > tbody > tr[bgcolor]
-
-  fields:
-    title:
-      selector: div.tt-name > a[href^="/"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: "/(.+?)-torrent-\\d+\\.html"
-        - name: re_replace
-          args: ["-", " "]
-    category_is_tv_show:
-      text: "{{ .Result.title }}"
-      filters:
-        - name: regexp
-          args: "\\b(S\\d+(?:E\\d+)?)\\b"
-    category:
-      selector: td:nth-child(2)
-      optional: true
-      default: "{{ if .Result.category_is_tv_show }}TV shows{{ else }}Other{{ end }}"
-      filters:
-        - name: regexp
-          args: " in (.+?)[.]?$"
-    details:
-      selector: div.tt-name > a[href^="/"]
-      attribute: href
-    download:
-      selector: div.tt-name > a[href^="/"]
-      attribute: href
-    date:
-      selector: td:nth-child(2)
-      filters:
-        - name: split
-          args: ["-", 0]
-        - name: replace
-          args: ["Last Month", "1 month ago"]
-        - name: replace
-          args: ["+", " ago"]
-    size:
-      selector: td:nth-child(3)
-    seeders:
-      selector: .tdseed
-    leechers:
-      selector: .tdleech
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/locadora.yml

@@ -66,8 +66,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
     - path: "/api/torrents/filter"
       response:
         type: json
@@ -105,9 +105,6 @@ search:
       selector: category_id
     title:
       selector: name
-      filters:
-        - name: re_replace
-          args: ["\\.", " "]
     details:
       selector: details_link
     download:

src/Jackett.Common/Definitions/lst.yml

@@ -38,6 +38,10 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
+  - name: single_file_release_use_filename
+    type: checkbox
+    label: Use filename as title for single file releases
+    default: true
   - name: sort
     type: select
     label: Sort requested from site
@@ -69,8 +73,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
     - path: "/api/torrents/filter"
       response:
         type: json
@@ -103,7 +107,7 @@ search:
   fields:
     category:
       selector: category_id
-    title:
+    title_optional:
       selector: name
     details:
       selector: details_link
@@ -125,8 +129,6 @@ search:
     genre:
       selector: meta.genres
       filters:
-        - name: re_replace
-          args: ["(?i)^None$", ""]
         - name: re_replace
           args: ["(?i)(Science Fiction)", "Science_Fiction"]
         - name: re_replace
@@ -175,4 +177,9 @@ search:
     minimumseedtime:
       # 7 days (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 7.1.2
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
+# json UNIT3D 8.0.2

src/Jackett.Common/Definitions/marinetracker.yml

@@ -71,10 +71,6 @@ caps:
     - {id: 108, cat: Books, desc: Marine Engineer's Library-Hydraulics"}
     - {id: 16, cat: Books, desc: Marine Engineer's Library-MAN B&W"}
     - {id: 17, cat: Books, desc: Marine Engineer's Library-Wärtsilä & Sulzer"}
-    - {id: 7, cat: Books, desc: "Technical Books (Not maritime)"}
-    - {id: 328, cat: Books, desc: "Technical Books (Not maritime)-Hydraulics"}
-    - {id: 327, cat: Books, desc: "Technical Books (Not maritime)-Mechanics"}
-    - {id: 326, cat: Books, desc: "Technical Books (Not maritime)-Electricity"}
     - {id: 10, cat: Books, desc: "English for seamen"}
     - {id: 265, cat: Books, desc: "English for seamen-Marine dictionaries and glossaries RU↔RU/EN↔EN"}
     - {id: 266, cat: Books, desc: "English for seamen-English for Deck Officers"}
@@ -131,6 +127,7 @@ caps:
     - {id: 111, cat: Books, desc: "Yachting, sailing, boating"}
     - {id: 345, cat: Books, desc: "Yachting, sailing, boating-Solar boats"}
     - {id: 318, cat: Books, desc: "Yachting, sailing, boating-Sailing life"}
+    - {id: 300, cat: Books, desc: "Yachting, sailing, boating-RYA"}
     - {id: 298, cat: Books, desc: "Yachting, sailing, boating-Cruising Guides"}
     - {id: 297, cat: Books, desc: "Yachting, sailing, boating-Weather Sailing"}
     - {id: 296, cat: Books, desc: "Yachting, sailing, boating-How to Buy a Boat?"}
@@ -154,36 +151,54 @@ caps:
     - {id: 197, cat: Books, desc: "Marine bulletins"}
     - {id: 219, cat: Books, desc: "Marine History"}
     - {id: 347, cat: Books, desc: "Marine History-Sea Life"}
-    - {id: 323, cat: Books, desc: "Marine History-History of Submarines"}
-    - {id: 282, cat: Books, desc: "Marine History-Fleets history"}
     - {id: 281, cat: Books, desc: "Marine History-History of Merchant Marine"}
     - {id: 280, cat: Books, desc: "Marine History-Historic ships"}
-    - {id: 279, cat: Books, desc: "Marine History-Marine vessels"}
-    - {id: 278, cat: Books, desc: "Marine History-Warships"}
-    - {id: 351, cat: Books, desc: "Marine History-Battleships"}
     - {id: 259, cat: Books, desc: "Marine History-Shipbuilding history"}
-    - {id: 277, cat: Books, desc: "Marine History-Wars at Sea"}
-    - {id: 276, cat: Books, desc: "Marine History-War at sea (World War I)"}
-    - {id: 261, cat: Books, desc: "Marine History-War at sea (World War II)"}
-    - {id: 262, cat: Books, desc: "Marine History-The history of sailing ships"}
     - {id: 273, cat: Books, desc: "Marine History-History of Seafaring"}
     - {id: 275, cat: Books, desc: "Marine History-Accidents and disasters at sea"}
     - {id: 264, cat: Books, desc: "Marine History-Marine cartography"}
     - {id: 274, cat: Books, desc: "Marine History-Pirates"}
-    - {id: 218, cat: Books, desc: "Maritime Fiction"}
+    - {id: 282, cat: Books, desc: "Fleets history"}
+    - {id: 357, cat: Books, desc: "Fleets history-China"}
+    - {id: 354, cat: Books, desc: "Fleets history-USA"}
+    - {id: 356, cat: Books, desc: "Fleets history-Russia | USSR"}
+    - {id: 358, cat: Books, desc: "Fleets history-India"}
+    - {id: 355, cat: Books, desc: "Fleets history-Japan"}
+    - {id: 364, cat: Books, desc: "Fleets history-The United Kingdom"}
+    - {id: 359, cat: Books, desc: "Fleets history-Germany"}
+    - {id: 360, cat: Books, desc: "Fleets history-France"}
+    - {id: 277, cat: Books, desc: "Wars at Sea"}
+    - {id: 276, cat: Books, desc: "Wars at Sea-War at sea (World War I)"}
+    - {id: 261, cat: Books, desc: "Wars at Sea-War at sea (World War II)"}
+    - {id: 363, cat: Books, desc: "Wars at Sea-Russo-Japanese War"}
+    - {id: 362, cat: Books, desc: "History of Naval Shipbuilding"}
+    - {id: 279, cat: Books, desc: "History of Naval Shipbuilding-Marine vessels"}
+    - {id: 278, cat: Books, desc: "History of Naval Shipbuilding-Warships"}
+    - {id: 351, cat: Books, desc: "History of Naval Shipbuilding-Battleships"}
+    - {id: 353, cat: Books, desc: "History of Naval Shipbuilding-Cruisers"}
+    - {id: 365, cat: Books, desc: "History of Naval Shipbuilding-Aircraft carriers"}
+    - {id: 366, cat: Books, desc: "History of Naval Shipbuilding-Destroyers"}
+    - {id: 367, cat: Books, desc: "History of Naval Shipbuilding-Frigates"}
+    - {id: 262, cat: Books, desc: "History of Naval Shipbuilding-The history of sailing ships"}
+    - {id: 323, cat: Books, desc: "History of Naval Shipbuilding-History of Submarines"}
     - {id: 198, cat: Books, desc: "Navy"}
-    - {id: 272, cat: Books, desc: "Navy-Naval magazines"}
     - {id: 260, cat: Books, desc: "Navy-Naval shipbuilding (1950 - 20??)"}
-    - {id: 220, cat: Books, desc: "Fishing & Spearfishing"}
-    - {id: 319, cat: Books, desc: "Fishing tackle and knots"}
-    - {id: 294, cat: Books, desc: "Environmental protection"}
-    - {id: 242, cat: Books, desc: "Foreign language books"}
-    - {id: 344, cat: Books, desc: "Foreign language books-Yachting"}
+    - {id: 272, cat: Books, desc: "Navy-Naval magazines"}
+    - {id: 218, cat: Books, desc: "Maritime Fiction"}
     - {id: 243, cat: Books, desc: "Rarity"}
     - {id: 244, cat: Books, desc: "Rarity-1900 - 1950"}
     - {id: 245, cat: Books, desc: "Rarity-1800 - 1900"}
     - {id: 246, cat: Books, desc: "Rarity-1700 - 1800"}
     - {id: 247, cat: Books, desc: "Rarity-1600 - 1700"}
+    - {id: 220, cat: Books, desc: "Fishing & Spearfishing"}
+    - {id: 319, cat: Books, desc: "Fishing tackle and knots"}
+    - {id: 294, cat: Books, desc: "Environmental protection"}
+    - {id: 7, cat: Books, desc: "Technical Books (Not maritime)"}
+    - {id: 328, cat: Books, desc: "Technical Books (Not maritime)-Hydraulics"}
+    - {id: 327, cat: Books, desc: "Technical Books (Not maritime)-Mechanics"}
+    - {id: 326, cat: Books, desc: "Technical Books (Not maritime)-Electricity"}
+    - {id: 242, cat: Books, desc: "Foreign language books"}
+    - {id: 344, cat: Books, desc: "Foreign language books-Yachting"}
     - {id: 350, cat: Other, desc: "Art"}
     - {id: 324, cat: Other, desc: "Posters, placards, signs"}
     - {id: 187, cat: Books, desc: "Others (not maritime)"}

src/Jackett.Common/Definitions/mazepa.yml

@@ -16,10 +16,10 @@ caps:
     - {id: 7, cat: Movies/SD, desc: "Українські фільми SD"}
     - {id: 38, cat: TV/UHD, desc: "Українські серіали HD, UHD"}
     - {id: 8, cat: TV/SD, desc: "Українські серіали SD"}
-    - {id: 35, cat: TV/Anime, desc: "Українські мультфільми HD, UHD"}
-    - {id: 5, cat: TV/Anime, desc: "Українські мультфільми SD"}
-    - {id: 36, cat: TV/Anime, desc: "Українські мультсеріали HD, UHD"}
-    - {id: 6, cat: TV/Anime, desc: "Українські мультсеріали SD"}
+    - {id: 35, cat: Movies/UHD, desc: "Українські мультфільми HD, UHD"}
+    - {id: 5, cat: Movies/SD, desc: "Українські мультфільми SD"}
+    - {id: 36, cat: TV/UHD, desc: "Українські мультсеріали HD, UHD"}
+    - {id: 6, cat: TV/SD, desc: "Українські мультсеріали SD"}
     - {id: 39, cat: TV/Documentary, desc: "Українські документальні HD, UHD"}
     - {id: 9, cat: TV/Documentary, desc: "Українські документальні SD"}
     # Озвучений контент
@@ -31,11 +31,11 @@ caps:
     - {id: 152, cat: TV/UHD, desc: "Озвучений контент Серіали UHD"}
     - {id: 44, cat: TV/HD, desc: "Озвучений контент Серіали HD"}
     - {id: 14, cat: TV/SD, desc: "Озвучений контент Серіали SD"}
-    - {id: 155, cat: TV/Anime, desc: "Озвучений контент Мультфільми UHD"}
-    - {id: 41, cat: TV/Anime, desc: "Озвучений контент Мультфільми HD"}
-    - {id: 10, cat: TV/Anime, desc: "Озвучений контент Мультфільми SD"}
-    - {id: 43, cat: TV/Anime, desc: "Озвучений контент Мультсеріали HD"}
-    - {id: 11, cat: TV/Anime, desc: "Озвучений контент Мультсеріали SD"}
+    - {id: 155, cat: Movies/UHD, desc: "Озвучений контент Мультфільми UHD"}
+    - {id: 41, cat: Movies/HD, desc: "Озвучений контент Мультфільми HD"}
+    - {id: 10, cat: Movies/SD, desc: "Озвучений контент Мультфільми SD"}
+    - {id: 43, cat: TV/HD, desc: "Озвучений контент Мультсеріали HD"}
+    - {id: 11, cat: TV/SD, desc: "Озвучений контент Мультсеріали SD"}
     - {id: 16, cat: TV/Anime, desc: "Аніме"}
     - {id: 157, cat: TV/Documentary, desc: "Озвучений Документальне UHD"}
     - {id: 42, cat: TV/Documentary, desc: "Озвучений Документальне HD"}

src/Jackett.Common/Definitions/mendigosdaweb.yml

@@ -70,8 +70,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
     - path: "/api/torrents/filter"
       response:
         type: json

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

@@ -70,8 +70,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
     - path: "/api/torrents/filter"
       response:
         type: json

src/Jackett.Common/Definitions/movieworld.yml

@@ -38,7 +38,7 @@ settings:
     label: Password
   - name: freeleech
     type: checkbox
-    label: Search freeleech only
+    label: Filter freeleech only
     default: false
   - name: sort
     type: select
@@ -82,7 +82,8 @@ search:
     search: "{{ .Keywords }}"
     category: "{{ range .Categories }}{{.}};{{end}}"
     # 0 filename, 1 file&descr, 2 descr, 3 uploaders, 18 genre, 4 imdb, 5 gold, 6 silver, 7 bronze, 8-17 upload multiplier 1x-10x
-    options: "{{ if .Config.freeleech }}5{{ else }}0{{ end }}"
+    # note the options are exclusive, so searching for gold means the search keywords are ignored
+    options: 0
     # 0 all, 1 active only, 2 dead only
     active: 0
     order: "{{ .Config.sort }}"
@@ -94,7 +95,7 @@ search:
       args: ["\\.", " "]
 
   rows:
-    selector: "table.lista > tbody > tr:has(a[href^=\"download.php?id=\"]):not(:has(a[href^=\"index.php?page=userdetails\"]))"
+    selector: "table.lista > tbody > tr:has(a[href^=\"download.php?id=\"]):not(:has(a[href^=\"index.php?page=userdetails\"])){{ if .Config.freeleech }}:has(img[src$=\"gold.gif\"]){{ else }}{{ end }}"
 
   fields:
     category:

src/Jackett.Common/Definitions/mteamtp.yml

@@ -1,222 +0,0 @@
----
-id: mteamtp
-name: M-Team - TP
-description: "M-Team TP (MTTP) is a CHINESE Private Torrent Tracker for HD MOVIES / TV / 3X"
-language: zh-CN
-type: private
-encoding: UTF-8
-requestDelay: 5
-links:
-  - https://kp.m-team.cc/
-  - https://tp.m-team.cc/
-  - https://pt.m-team.cc/
-
-caps:
-  categorymappings:
-    - {id: 401, cat: Movies/SD, desc: "Movie(電影)/SD", default: true}
-    - {id: 419, cat: Movies/HD, desc: "Movie(電影)/HD", default: true}
-    - {id: 420, cat: Movies/DVD, desc: "Movie(電影)/DVDiSo", default: true}
-    - {id: 421, cat: Movies/BluRay, desc: "Movie(電影)/Blu-Ray", default: true}
-    - {id: 439, cat: Movies/Other, desc: "Movie(電影)/Remux", default: true}
-    - {id: 403, cat: TV/SD, desc: "TV Series(影劇/綜藝)/SD", default: true}
-    - {id: 402, cat: TV/HD, desc: "TV Series(影劇/綜藝)/HD", default: true}
-    - {id: 435, cat: TV/SD, desc: "TV Series(影劇/綜藝)/DVDiSo", default: true}
-    - {id: 438, cat: TV/HD, desc: "TV Series(影劇/綜藝)/BD", default: true}
-    - {id: 404, cat: TV/Documentary, desc: "紀錄教育", default: true}
-    - {id: 405, cat: TV/Anime, desc: "Anime(動畫)", default: true}
-    - {id: 407, cat: TV/Sport, desc: "Sports(運動)", default: true}
-    - {id: 422, cat: PC/0day, desc: "Software(軟體)", default: true}
-    - {id: 423, cat: PC/Games, desc: "PCGame(PC遊戲)", default: true}
-    - {id: 427, cat: Books, desc: "eBook(電子書)", default: true}
-    - {id: 409, cat: Other, desc: "Misc(其他)", default: true}
-    # music
-    - {id: 406, cat: Audio/Video, desc: "MV(演唱)", default: true}
-    - {id: 408, cat: Audio/Other, desc: "Music(AAC/ALAC)", default: true}
-    - {id: 434, cat: Audio, desc: "Music(無損)", default: true}
-    # adult
-    - {id: 410, cat: XXX, desc: "AV(有碼)/HD Censored", default: false}
-    - {id: 429, cat: XXX, desc: "AV(無碼)/HD Uncensored", default: false}
-    - {id: 424, cat: XXX, desc: "AV(有碼)/SD Censored", default: false}
-    - {id: 430, cat: XXX, desc: "AV(無碼)/SD Uncensored", default: false}
-    - {id: 426, cat: XXX, desc: "AV(無碼)/DVDiSo Uncensored", default: false}
-    - {id: 437, cat: XXX, desc: "AV(有碼)/DVDiSo Censored", default: false}
-    - {id: 431, cat: XXX, desc: "AV(有碼)/Blu-Ray Censored", default: false}
-    - {id: 432, cat: XXX, desc: "AV(無碼)/Blu-Ray Uncensored", default: false}
-    - {id: 436, cat: XXX, desc: "AV(網站)/0Day", default: false}
-    - {id: 425, cat: XXX, desc: "IV(寫真影集)/Video Collection", default: false}
-    - {id: 433, cat: XXX, desc: "IV(寫真圖集)/Picture Collection", default: false}
-    - {id: 411, cat: XXX, desc: "H-Game(遊戲)", default: false}
-    - {id: 412, cat: XXX, desc: "H-Anime(動畫)", default: false}
-    - {id: 413, cat: XXX, desc: "H-Comic(漫畫)", default: false}
-
-  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: 4
-    options:
-      4: created
-      7: seeders
-      5: size
-      1: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
-  - name: info_title
-    type: info
-    label: About Titles
-    default: For best results, disable the torrent name tooltip in <b>User CP/Tracker Settings/Torrents Page</b>. Otherwise long release names will be cut off.
-  - name: info_download_link
-    type: info
-    label: About Download Links
-    default: For best results, you must enable the <b>Download icon</b> in <b>User CP/Tracker Settings/Torrents Page</b>.
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: td.embedded:has(h2:contains("登录失败"))
-    - selector: td.embedded:has(h2:contains("failed"))
-    - selector: td.toolbox:contains("錯誤")
-    - selector: td.toolbox:contains("Error")
-    - selector: td.toolbox:contains("限制登")
-  test:
-    path: index.php
-    selector: a[href="logout.php"]
-
-search:
-  paths:
-    - path: torrents.php
-      categories: [401, 419, 420, 421, 439, 403, 402, 435, 438, 404, 405, 407, 422, 423, 427, 409]
-    - path: adult.php
-      categories: [410, 429, 424, 430, 426, 437, 431, 432, 436, 425, 433, 411, 412, 413]
-    - path: music.php
-      categories: [406, 408, 434]
-  allowEmptyInputs: true
-  inputs:
-    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    # 0 incldead, 1 active, 2 dead
-    incldead: 0
-    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
-    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 title, 3 uploader, 4 imdb url
-    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:
-    title_default:
-      # shortened for long release names
-      selector: a[href^="details.php?id="] > b
-    title:
-      # not available if IMDB tooltips are turned on
-      selector: a[title][href^="details.php?id="]
-      attribute: title
-      optional: true
-      default: "{{ .Result.title_default }}"
-    category:
-      selector: a[href^="?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    poster:
-      selector: img[alt="torrent thumbnail"][src]
-      attribute: src
-      filters:
-        - name: replace
-          args: ["pic/nopic.jpg", ""]
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    size:
-      selector: td.rowfollow:nth-last-child(6)
-    grabs:
-      selector: td.rowfollow:nth-last-child(3)
-    seeders:
-      selector: td.rowfollow:nth-last-child(5)
-    leechers:
-      selector: td.rowfollow:nth-last-child(4)
-    date_added:
-      selector: td.rowfollow:nth-last-child(7) > span[title]
-      optional: true
-      attribute: title
-      filters:
-        - name: append
-          args: " +08:00" # CST
-        - name: dateparse
-          args: "yyyy-MM-dd HH:mm:ss zzz"
-    date_elapsed:
-      selector: td.rowfollow:nth-last-child(7):not(:has(span))
-      optional: true
-      filters:
-        - name: append
-          args: " +08:00" # CST
-        - name: dateparse
-          args: "yyyy-MM-ddHH:mm:ss zzz"
-    date:
-      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
-    downloadvolumefactor:
-      case:
-        img.pro_free: 0
-        img.pro_free2up: 0
-        img.pro_50pctdown: 0.5
-        img.pro_50pctdown2up: 0.5
-        img.pro_30pctdown: 0.3
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img.pro_50pctdown2up: 2
-        img.pro_free2up: 2
-        img.pro_2up: 2
-        "*": 1
-    minimumratio:
-      text: 1
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-    description:
-      selector: td:nth-child(2)
-      remove: a, b, font, img, span
-# NexusPHP Standard v1.5 Beta 4

src/Jackett.Common/Definitions/mteamtp2fa.yml

@@ -1,225 +0,0 @@
----
-id: mteamtp2fa
-name: M-Team - TP (2FA)
-description: "This indexer uses a cookie login for M-Team TP (MTTP) for those that want to use 2FA"
-language: zh-CN
-type: private
-encoding: UTF-8
-requestDelay: 5
-links:
-  - https://kp.m-team.cc/
-  - https://tp.m-team.cc/
-  - https://pt.m-team.cc/
-
-caps:
-  categorymappings:
-    - {id: 401, cat: Movies/SD, desc: "Movie(電影)/SD", default: true}
-    - {id: 419, cat: Movies/HD, desc: "Movie(電影)/HD", default: true}
-    - {id: 420, cat: Movies/DVD, desc: "Movie(電影)/DVDiSo", default: true}
-    - {id: 421, cat: Movies/BluRay, desc: "Movie(電影)/Blu-Ray", default: true}
-    - {id: 439, cat: Movies/Other, desc: "Movie(電影)/Remux", default: true}
-    - {id: 403, cat: TV/SD, desc: "TV Series(影劇/綜藝)/SD", default: true}
-    - {id: 402, cat: TV/HD, desc: "TV Series(影劇/綜藝)/HD", default: true}
-    - {id: 435, cat: TV/SD, desc: "TV Series(影劇/綜藝)/DVDiSo", default: true}
-    - {id: 438, cat: TV/HD, desc: "TV Series(影劇/綜藝)/BD", default: true}
-    - {id: 404, cat: TV/Documentary, desc: "紀錄教育", default: true}
-    - {id: 405, cat: TV/Anime, desc: "Anime(動畫)", default: true}
-    - {id: 407, cat: TV/Sport, desc: "Sports(運動)", default: true}
-    - {id: 422, cat: PC/0day, desc: "Software(軟體)", default: true}
-    - {id: 423, cat: PC/Games, desc: "PCGame(PC遊戲)", default: true}
-    - {id: 427, cat: Books, desc: "eBook(電子書)", default: true}
-    - {id: 409, cat: Other, desc: "Misc(其他)", default: true}
-    # music
-    - {id: 406, cat: Audio/Video, desc: "MV(演唱)", default: true}
-    - {id: 408, cat: Audio/Other, desc: "Music(AAC/ALAC)", default: true}
-    - {id: 434, cat: Audio, desc: "Music(無損)", default: true}
-    # adult
-    - {id: 410, cat: XXX, desc: "AV(有碼)/HD Censored", default: false}
-    - {id: 429, cat: XXX, desc: "AV(無碼)/HD Uncensored", default: false}
-    - {id: 424, cat: XXX, desc: "AV(有碼)/SD Censored", default: false}
-    - {id: 430, cat: XXX, desc: "AV(無碼)/SD Uncensored", default: false}
-    - {id: 426, cat: XXX, desc: "AV(無碼)/DVDiSo Uncensored", default: false}
-    - {id: 437, cat: XXX, desc: "AV(有碼)/DVDiSo Censored", default: false}
-    - {id: 431, cat: XXX, desc: "AV(有碼)/Blu-Ray Censored", default: false}
-    - {id: 432, cat: XXX, desc: "AV(無碼)/Blu-Ray Uncensored", default: false}
-    - {id: 436, cat: XXX, desc: "AV(網站)/0Day", default: false}
-    - {id: 425, cat: XXX, desc: "IV(寫真影集)/Video Collection", default: false}
-    - {id: 433, cat: XXX, desc: "IV(寫真圖集)/Picture Collection", default: false}
-    - {id: 411, cat: XXX, desc: "H-Game(遊戲)", default: false}
-    - {id: 412, cat: XXX, desc: "H-Anime(動畫)", default: false}
-    - {id: 413, cat: XXX, desc: "H-Comic(漫畫)", default: false}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: cookie
-    type: text
-    label: Cookie
-  - name: infocookie
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
-  - name: 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
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 4
-    options:
-      4: created
-      7: seeders
-      5: size
-      1: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
-  - name: info_title
-    type: info
-    label: About Titles
-    default: For best results, disable the torrent name tooltip in <b>User CP/Tracker Settings/Torrents Page</b>. Otherwise long release names will be cut off.
-  - name: info_download_link
-    type: info
-    label: About Download Links
-    default: For best results, you must enable the <b>Download icon</b> in <b>User CP/Tracker Settings/Torrents Page</b>.
-
-login:
-  method: cookie
-  inputs:
-    cookie: "{{ .Config.cookie }}"
-  test:
-    path: index.php
-    selector: a[href="logout.php"]
-
-search:
-  paths:
-    - path: torrents.php
-      categories: [401, 419, 420, 421, 439, 403, 402, 435, 438, 404, 405, 407, 422, 423, 427, 409]
-    - path: adult.php
-      categories: [410, 429, 424, 430, 426, 437, 431, 432, 436, 425, 433, 411, 412, 413]
-    - path: music.php
-      categories: [406, 408, 434]
-  allowEmptyInputs: true
-  inputs:
-    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    # 0 incldead, 1 active, 2 dead
-    incldead: 0
-    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
-    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 title, 3 uploader, 4 imdb url
-    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
-
-  headers:
-    User-Agent: ["{{ .Config.useragent }}"]
-
-  rows:
-    selector: table.torrents > tbody > tr:has(table.torrentname)
-
-  fields:
-    title_default:
-      # shortened for long release names
-      selector: a[href^="details.php?id="] > b
-    title:
-      # not available if IMDB tooltips are turned on
-      selector: a[title][href^="details.php?id="]
-      attribute: title
-      optional: true
-      default: "{{ .Result.title_default }}"
-    category:
-      selector: a[href^="?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    poster:
-      selector: img[alt="torrent thumbnail"][src]
-      attribute: src
-      filters:
-        - name: replace
-          args: ["pic/nopic.jpg", ""]
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    size:
-      selector: td.rowfollow:nth-last-child(6)
-    grabs:
-      selector: td.rowfollow:nth-last-child(3)
-    seeders:
-      selector: td.rowfollow:nth-last-child(5)
-    leechers:
-      selector: td.rowfollow:nth-last-child(4)
-    date_added:
-      selector: td.rowfollow:nth-last-child(7) > span[title]
-      optional: true
-      attribute: title
-      filters:
-        - name: append
-          args: " +08:00" # CST
-        - name: dateparse
-          args: "yyyy-MM-dd HH:mm:ss zzz"
-    date_elapsed:
-      selector: td.rowfollow:nth-last-child(7):not(:has(span))
-      optional: true
-      filters:
-        - name: append
-          args: " +08:00" # CST
-        - name: dateparse
-          args: "yyyy-MM-ddHH:mm:ss zzz"
-    date:
-      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
-    downloadvolumefactor:
-      case:
-        img.pro_free: 0
-        img.pro_free2up: 0
-        img.pro_50pctdown: 0.5
-        img.pro_50pctdown2up: 0.5
-        img.pro_30pctdown: 0.3
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img.pro_50pctdown2up: 2
-        img.pro_free2up: 2
-        img.pro_2up: 2
-        "*": 1
-    minimumratio:
-      text: 1
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-    description:
-      selector: td:nth-child(2)
-      remove: a, b, font, img, span
-# NexusPHP Standard v1.5 Beta 4

src/Jackett.Common/Definitions/nicept.yml

@@ -187,4 +187,4 @@ search:
       filters:
         - name: prepend
           args: "{{ .Result.description_verified }} "
-# NexusPHP v1.8.4 2023-06-18
+# NexusPHP v1.8.8 2023-09-25

src/Jackett.Common/Definitions/noname-club.yml

@@ -342,24 +342,25 @@ caps:
     - {id: 470, cat: Books, desc: " |- Фантастика, Фэнтези (аудиокниги)"}
     - {id: 896, cat: Books, desc: " |- Публицистика (аудиокниги)"}
     - {id: 480, cat: Books, desc: " |- Другие аудиокниги"}
-    - {id: 436, cat: Books, desc: "Обучающие аудиоматериалы"}
-    - {id: 458, cat: Books, desc: " |- Бизнес и Менеджмент (аудиоматериалы)"}
-    - {id: 457, cat: Books, desc: " |- Иностранные языки (аудиоматериалы)"}
-    - {id: 1342, cat: Books, desc: " |- Здоровье и Медицина (аудиоматериалы)"}
-    - {id: 459, cat: Books, desc: " |- Популярная психология и саморазвитие (аудиоматериалы)"}
-    - {id: 460, cat: Books, desc: " |- Медитации (аудиоматериалы)"}
-    - {id: 461, cat: Books, desc: " |- Религия (аудиоматериалы)"}
-    - {id: 462, cat: Books, desc: " |- Прочие аудиоматериалы"}
+    - {id: 436, cat: Audio/Audiobook, desc: "Обучающие аудиоматериалы"}
+    - {id: 458, cat: Audio/Audiobook, desc: " |- Бизнес и Менеджмент (аудиоматериалы)"}
+    - {id: 457, cat: Audio/Audiobook, desc: " |- Иностранные языки (аудиоматериалы)"}
+    - {id: 1342, cat: Audio/Audiobook, desc: " |- Здоровье и Медицина (аудиоматериалы)"}
+    - {id: 459, cat: Audio/Audiobook, desc: " |- Популярная психология и саморазвитие (аудиоматериалы)"}
+    - {id: 460, cat: Audio/Audiobook, desc: " |- Медитации (аудиоматериалы)"}
+    - {id: 461, cat: Audio/Audiobook, desc: " |- Религия (аудиоматериалы)"}
+    - {id: 462, cat: Audio/Audiobook, desc: " |- Прочие аудиоматериалы"}
     - {id: 437, cat: Books, desc: "Обучающие видеоматериалы"}
-    - {id: 466, cat: Books, desc: " |- Бизнес и Менеджмент (видеокурсы)"}
-    - {id: 1319, cat: Books, desc: " |- Иностранные языки (видеокурсы)"}
-    - {id: 463, cat: Books, desc: " |- IT, Компьютерные видеокурсы"}
-    - {id: 958, cat: Books, desc: " |- Дизайн, рисование (видеокурсы)"}
-    - {id: 1223, cat: Books, desc: " |- Фотография и Видео (видеокурсы)"}
-    - {id: 467, cat: Books, desc: " |- Здоровье и Спорт (видеокурсы)"}
-    - {id: 464, cat: Books, desc: " |- Психология и саморазвитие (видеокурсы)"}
-    - {id: 465, cat: Books, desc: " |- Музыка (видеокурсы)"}
-    - {id: 469, cat: Books, desc: " |- Другие видеокурсы"}
+    - {id: 466, cat: TV, desc: " |- Бизнес и Менеджмент (видеокурсы)"}
+    - {id: 1319, cat: TV, desc: " |- Иностранные языки (видеокурсы)"}
+    - {id: 463, cat: TV, desc: " |- IT, Компьютерные видеокурсы"}
+    - {id: 958, cat: TV, desc: " |- Дизайн, рисование (видеокурсы)"}
+    - {id: 1223, cat: TV, desc: " |- Фотография и Видео (видеокурсы)"}
+    - {id: 467, cat: TV, desc: " |- Здоровье и Спорт (видеокурсы)"}
+    - {id: 464, cat: TV, desc: " |- Психология и саморазвитие (видеокурсы)"}
+    - {id: 465, cat: TV, desc: " |- Музыка (видеокурсы)"}
+    - {id: 1348, cat: TV, desc: " |- Домоводство, строительство и ремонт (видеокурсы)"}
+    - {id: 469, cat: TV, desc: " |- Другие видеокурсы"}
     - {id: 439, cat: Books, desc: "Мультимедийные материалы"}
     - {id: 477, cat: Books, desc: " |- Образование"}
     - {id: 476, cat: Books, desc: " |- Иностранные языки"}
@@ -408,114 +409,114 @@ caps:
     - {id: 681, cat: Audio, desc: " |- Vinyl-Rip и Hand-Made"}
     - {id: 330, cat: Audio, desc: "Классика"}
     - {id: 1256, cat: Audio, desc: " |- Классика (HD Audio)"}
-    - {id: 1285, cat: Audio, desc: " |- Полные собрания сочинений (Lossless)"}
+    - {id: 1285, cat: Audio/Lossless, desc: " |- Полные собрания сочинений (Lossless)"}
     - {id: 370, cat: Audio, desc: " |- Полные собрания сочинений"}
-    - {id: 1260, cat: Audio, desc: " |- Вокал (Lossless)"}
+    - {id: 1260, cat: Audio/Lossless, desc: " |- Вокал (Lossless)"}
     - {id: 371, cat: Audio, desc: " |- Вокал"}
-    - {id: 1261, cat: Audio, desc: " |- Концерты (Lossless)"}
+    - {id: 1261, cat: Audio/Lossless, desc: " |- Концерты (Lossless)"}
     - {id: 375, cat: Audio, desc: " |- Концерты"}
-    - {id: 1259, cat: Audio, desc: " |- Оркестровая (Lossless)"}
+    - {id: 1259, cat: Audio/Lossless, desc: " |- Оркестровая (Lossless)"}
     - {id: 374, cat: Audio, desc: " |- Оркестровая"}
-    - {id: 1257, cat: Audio, desc: " |- Камерная (Lossless)"}
+    - {id: 1257, cat: Audio/Lossless, desc: " |- Камерная (Lossless)"}
     - {id: 373, cat: Audio, desc: " |- Камерная"}
-    - {id: 1258, cat: Audio, desc: " |- Фортепиано (Lossless)"}
+    - {id: 1258, cat: Audio/Lossless, desc: " |- Фортепиано (Lossless)"}
     - {id: 372, cat: Audio, desc: " |- Фортепиано"}
-    - {id: 1160, cat: Audio, desc: " |- В обработке/Classical Crossover/Neoclassical (Lossless)"}
+    - {id: 1160, cat: Audio/Lossless, desc: " |- В обработке/Classical Crossover/Neoclassical (Lossless)"}
     - {id: 876, cat: Audio, desc: " |- В обработке/Classical Crossover/Neoclassical"}
-    - {id: 1255, cat: Audio, desc: " |- Классика (сборники) (Lossless)"}
+    - {id: 1255, cat: Audio/Lossless, desc: " |- Классика (сборники) (Lossless)"}
     - {id: 376, cat: Audio, desc: " |- Классика (сборники)"}
     - {id: 326, cat: Audio, desc: "Jazz, Blues, Soul"}
-    - {id: 359, cat: Audio, desc: " |- Jazz (Lossless)"}
+    - {id: 359, cat: Audio/Lossless, desc: " |- Jazz (Lossless)"}
     - {id: 358, cat: Audio, desc: " |- Jazz"}
-    - {id: 1188, cat: Audio, desc: " |- Blues, Soul (Lossless)"}
+    - {id: 1188, cat: Audio/Lossless, desc: " |- Blues, Soul (Lossless)"}
     - {id: 1189, cat: Audio, desc: " |- Blues, Soul"}
     - {id: 328, cat: Audio, desc: "Шансон, Авторская и Военная песня"}
-    - {id: 1180, cat: Audio, desc: " |- Зарубежный Шансон (Lossless)"}
+    - {id: 1180, cat: Audio/Lossless, desc: " |- Зарубежный Шансон (Lossless)"}
     - {id: 1181, cat: Audio, desc: " |- Зарубежный Шансон"}
-    - {id: 364, cat: Audio, desc: " |- Русский Шансон (Lossless)"}
+    - {id: 364, cat: Audio/Lossless, desc: " |- Русский Шансон (Lossless)"}
     - {id: 363, cat: Audio, desc: " |- Русский Шансон"}
-    - {id: 1179, cat: Audio, desc: " |- Авторская и Военная песня (Lossless)"}
+    - {id: 1179, cat: Audio/Lossless, desc: " |- Авторская и Военная песня (Lossless)"}
     - {id: 879, cat: Audio, desc: " |- Авторская и Военная песня"}
     - {id: 322, cat: Audio, desc: "Rock, Alternative, Punk, Metal"}
-    - {id: 962, cat: Audio, desc: " |- Rock (Lossless)"}
+    - {id: 962, cat: Audio/Lossless, desc: " |- Rock (Lossless)"}
     - {id: 333, cat: Audio, desc: " |- Rock"}
-    - {id: 965, cat: Audio, desc: " |- Alternative, Punk (Lossless)"}
+    - {id: 965, cat: Audio/Lossless, desc: " |- Alternative, Punk (Lossless)"}
     - {id: 336, cat: Audio, desc: " |- Alternative, Punk"}
-    - {id: 337, cat: Audio, desc: " |- Hard Rock (Lossless)"}
+    - {id: 337, cat: Audio/Lossless, desc: " |- Hard Rock (Lossless)"}
     - {id: 338, cat: Audio, desc: " |- Hard Rock"}
-    - {id: 963, cat: Audio, desc: " |- Metal (Lossless)"}
+    - {id: 963, cat: Audio/Lossless, desc: " |- Metal (Lossless)"}
     - {id: 334, cat: Audio, desc: " |- Metal"}
-    - {id: 961, cat: Audio, desc: " |- Русский Рок (Lossless)"}
+    - {id: 961, cat: Audio/Lossless, desc: " |- Русский Рок (Lossless)"}
     - {id: 332, cat: Audio, desc: " |- Русский рок"}
     - {id: 325, cat: Audio, desc: "Pop"}
-    - {id: 1165, cat: Audio, desc: " |- Eurodance, Euro-House, Technopop (Lossless)"}
+    - {id: 1165, cat: Audio/Lossless, desc: " |- Eurodance, Euro-House, Technopop (Lossless)"}
     - {id: 1166, cat: Audio, desc: " |- Eurodance, Euro-House, Technopop"}
     - {id: 1168, cat: Audio, desc: " |- Disco, Italo-Disco, Euro-Disco, Hi-NRG"}
-    - {id: 1167, cat: Audio, desc: " |- Disco, Italo-Disco, Euro-Disco, Hi-NRG (Lossless)"}
-    - {id: 1162, cat: Audio, desc: " |- Отечественная поп-музыка (Lossless)"}
+    - {id: 1167, cat: Audio/Lossless, desc: " |- Disco, Italo-Disco, Euro-Disco, Hi-NRG (Lossless)"}
+    - {id: 1162, cat: Audio/Lossless, desc: " |- Отечественная поп-музыка (Lossless)"}
     - {id: 352, cat: Audio, desc: " |- Отечественная поп-музыка"}
-    - {id: 1164, cat: Audio, desc: " |- Советская эстрада, Ретро (Lossless)"}
+    - {id: 1164, cat: Audio/Lossless, desc: " |- Советская эстрада, Ретро (Lossless)"}
     - {id: 1163, cat: Audio, desc: " |- Советская эстрада, Ретро"}
-    - {id: 1161, cat: Audio, desc: " |- Зарубежная поп-музыка (Lossless)"}
+    - {id: 1161, cat: Audio/Lossless, desc: " |- Зарубежная поп-музыка (Lossless)"}
     - {id: 353, cat: Audio, desc: " |- Зарубежная поп-музыка"}
     - {id: 324, cat: Audio, desc: "Electronic"}
-    - {id: 1327, cat: Audio, desc: " |- Psybient, Psychill, Psydub (Lossless)"}
+    - {id: 1327, cat: Audio/Lossless, desc: " |- Psybient, Psychill, Psydub (Lossless)"}
     - {id: 1328, cat: Audio, desc: " |- Psybient, Psychill, Psydub"}
-    - {id: 1325, cat: Audio, desc: " |- Downtempo, Trip-Hop, Lounge (Lossless)"}
+    - {id: 1325, cat: Audio/Lossless, desc: " |- Downtempo, Trip-Hop, Lounge (Lossless)"}
     - {id: 1326, cat: Audio, desc: " |- Downtempo, Trip-Hop, Lounge"}
-    - {id: 1323, cat: Audio, desc: " |- Ambient, Experimental, Modern Classical (Lossless)"}
+    - {id: 1323, cat: Audio/Lossless, desc: " |- Ambient, Experimental, Modern Classical (Lossless)"}
     - {id: 1324, cat: Audio, desc: " |- Ambient, Experimental, Modern Classical"}
-    - {id: 976, cat: Audio, desc: " |- Trance (Lossless)"}
+    - {id: 976, cat: Audio/Lossless, desc: " |- Trance (Lossless)"}
     - {id: 346, cat: Audio, desc: " |- Trance"}
     - {id: 1243, cat: Audio, desc: " |- Label-Packs"}
-    - {id: 977, cat: Audio, desc: " |- House, Techno, Electro, Minimal (Lossless)"}
+    - {id: 977, cat: Audio/Lossless, desc: " |- House, Techno, Electro, Minimal (Lossless)"}
     - {id: 345, cat: Audio, desc: " |- House"}
     - {id: 349, cat: Audio, desc: " |- Techno, Electro, Minimal"}
     - {id: 347, cat: Audio, desc: " |- Easy listening"}
-    - {id: 979, cat: Audio, desc: " |- Industrial, EBM, Dark Electro (Lossless)"}
+    - {id: 979, cat: Audio/Lossless, desc: " |- Industrial, EBM, Dark Electro (Lossless)"}
     - {id: 673, cat: Audio, desc: " |- Experimental Electronic"}
     - {id: 671, cat: Audio, desc: " |- Industrial, EBM, Dark Electro"}
-    - {id: 1224, cat: Audio, desc: " |- IDM (Lossless)"}
+    - {id: 1224, cat: Audio/Lossless, desc: " |- IDM (Lossless)"}
     - {id: 1225, cat: Audio, desc: " |- IDM"}
-    - {id: 980, cat: Audio, desc: " |- Synthpop, New Wave (Lossless)"}
+    - {id: 980, cat: Audio/Lossless, desc: " |- Synthpop, New Wave (Lossless)"}
     - {id: 672, cat: Audio, desc: " |- Synthpop, New Wave"}
-    - {id: 1316, cat: Audio, desc: " |- Dubstep, Future Garage, Bass Music, UK Garage (Lossless)"}
+    - {id: 1316, cat: Audio/Lossless, desc: " |- Dubstep, Future Garage, Bass Music, UK Garage (Lossless)"}
     - {id: 1317, cat: Audio, desc: " |- Dubstep, Future Garage, Bass Music, UK Garage"}
-    - {id: 981, cat: Audio, desc: " |- Drum'n'Bass, Jungle, Breaks, Breakbeat (Lossless)"}
+    - {id: 981, cat: Audio/Lossless, desc: " |- Drum'n'Bass, Jungle, Breaks, Breakbeat (Lossless)"}
     - {id: 344, cat: Audio, desc: " |- Drum'n'Bass, Jungle, Breaks, Breakbeat"}
-    - {id: 983, cat: Audio, desc: " |- Hardstyle, Jumpstyle, Hardcore (Lossless)"}
+    - {id: 983, cat: Audio/Lossless, desc: " |- Hardstyle, Jumpstyle, Hardcore (Lossless)"}
     - {id: 984, cat: Audio, desc: " |- Hardstyle, Jumpstyle, Hardcore"}
-    - {id: 982, cat: Audio, desc: " |- Psychedelic, psytrance, fullon (Lossless)"}
+    - {id: 982, cat: Audio/Lossless, desc: " |- Psychedelic, psytrance, fullon (Lossless)"}
     - {id: 348, cat: Audio, desc: " |- Psychedelic, psytrance, fullon"}
     - {id: 674, cat: Audio, desc: " |- Radioshow, Live Mixes"}
     - {id: 323, cat: Audio, desc: "Rap, Hip-hop, RnB, Reggae"}
-    - {id: 1187, cat: Audio, desc: " |- Rap, Hip-hop зарубежный (Lossless)"}
+    - {id: 1187, cat: Audio/Lossless, desc: " |- Rap, Hip-hop зарубежный (Lossless)"}
     - {id: 339, cat: Audio, desc: " |- Rap, Hip-hop зарубежный"}
-    - {id: 1186, cat: Audio, desc: " |- Rap, Hip-hop отечественный (Lossless)"}
+    - {id: 1186, cat: Audio/Lossless, desc: " |- Rap, Hip-hop отечественный (Lossless)"}
     - {id: 340, cat: Audio, desc: " |- Rap, Hip-hop отечественный"}
-    - {id: 1185, cat: Audio, desc: " |- RnB, Reggae (Lossless)"}
+    - {id: 1185, cat: Audio/Lossless, desc: " |- RnB, Reggae (Lossless)"}
     - {id: 341, cat: Audio, desc: " |- RnB, Reggae"}
     - {id: 329, cat: Audio, desc: "East Asian Music"}
-    - {id: 369, cat: Audio, desc: " |- Asian Traditional, Ethnic (Lossless)"}
+    - {id: 369, cat: Audio/Lossless, desc: " |- Asian Traditional, Ethnic (Lossless)"}
     - {id: 368, cat: Audio, desc: " |- Asian Traditional, Ethnic"}
-    - {id: 1218, cat: Audio, desc: " |- Asian Pop (Lossless)"}
+    - {id: 1218, cat: Audio/Lossless, desc: " |- Asian Pop (Lossless)"}
     - {id: 365, cat: Audio, desc: " |- Asian Pop"}
-    - {id: 1217, cat: Audio, desc: " |- Asian Rock, Metal (Lossless)"}
+    - {id: 1217, cat: Audio/Lossless, desc: " |- Asian Rock, Metal (Lossless)"}
     - {id: 366, cat: Audio, desc: " |- Asian Rock, Metal"}
-    - {id: 1215, cat: Audio, desc: " |- Doujin Music (Lossless)"}
+    - {id: 1215, cat: Audio/Lossless, desc: " |- Doujin Music (Lossless)"}
     - {id: 1216, cat: Audio, desc: " |- Doujin Music"}
-    - {id: 1213, cat: Audio, desc: " |- Other Asian (Lossless)"}
+    - {id: 1213, cat: Audio/Lossless, desc: " |- Other Asian (Lossless)"}
     - {id: 367, cat: Audio, desc: " |- Other Asian"}
     - {id: 331, cat: Audio, desc: "Other Styles"}
-    - {id: 1157, cat: Audio, desc: " |- Instrumental (Lossless)"}
+    - {id: 1157, cat: Audio/Lossless, desc: " |- Instrumental (Lossless)"}
     - {id: 711, cat: Audio, desc: " |- Instrumental"}
-    - {id: 1159, cat: Audio, desc: " |- New Age/Meditative/Relax (Lossless)"}
+    - {id: 1159, cat: Audio/Lossless, desc: " |- New Age/Meditative/Relax (Lossless)"}
     - {id: 378, cat: Audio, desc: " |- New Age/Meditative/Relax"}
-    - {id: 1158, cat: Audio, desc: " |- Folk (Lossless)"}
+    - {id: 1158, cat: Audio/Lossless, desc: " |- Folk (Lossless)"}
     - {id: 379, cat: Audio, desc: " |- Folk"}
-    - {id: 380, cat: Audio, desc: " |- Other (Lossless)"}
+    - {id: 380, cat: Audio/Lossless, desc: " |- Other (Lossless)"}
     - {id: 1178, cat: Audio, desc: " |- Other"}
-    - {id: 361, cat: Audio, desc: " |- OST (Lossless)"}
+    - {id: 361, cat: Audio/Lossless, desc: " |- OST (Lossless)"}
     - {id: 360, cat: Audio, desc: " |- OST"}
     - {id: 327, cat: Audio, desc: "Неофициальные сборники"}
     - {id: 1184, cat: Audio, desc: " |- Jazz, Blues, Soul (сборники)"}
@@ -631,9 +632,9 @@ caps:
     - {id: 1156, cat: Other, desc: " |- Отечественное видео HD для устройств Apple"}
     - {id: 1099, cat: Other, desc: " |- Зарубежное видео для устройств Apple"}
     - {id: 1098, cat: Other, desc: " |- Зарубежное видео HD для устройств Apple"}
-    - {id: 1096, cat: Other, desc: " |- Музыка (AAC)"}
-    - {id: 1097, cat: Other, desc: " |- Музыка Lossless (ALAC)"}
-    - {id: 1095, cat: Other, desc: " |- Аудиокниги (AAC)"}
+    - {id: 1096, cat: Audio, desc: " |- Музыка (AAC)"}
+    - {id: 1097, cat: Audio/Lossless, desc: " |- Музыка Lossless (ALAC)"}
+    - {id: 1095, cat: Audio/Audiobook, desc: " |- Аудиокниги (AAC)"}
     # linux
     - {id: 536, cat: Other, desc: "Linux, Unix и другие ОС"}
     - {id: 563, cat: Other, desc: " |- ОС Linux"}

src/Jackett.Common/Definitions/noname-clubl.yml

@@ -342,24 +342,25 @@ caps:
     - {id: 470, cat: Books, desc: " |- Фантастика, Фэнтези (аудиокниги)"}
     - {id: 896, cat: Books, desc: " |- Публицистика (аудиокниги)"}
     - {id: 480, cat: Books, desc: " |- Другие аудиокниги"}
-    - {id: 436, cat: Books, desc: "Обучающие аудиоматериалы"}
-    - {id: 458, cat: Books, desc: " |- Бизнес и Менеджмент (аудиоматериалы)"}
-    - {id: 457, cat: Books, desc: " |- Иностранные языки (аудиоматериалы)"}
-    - {id: 1342, cat: Books, desc: " |- Здоровье и Медицина (аудиоматериалы)"}
-    - {id: 459, cat: Books, desc: " |- Популярная психология и саморазвитие (аудиоматериалы)"}
-    - {id: 460, cat: Books, desc: " |- Медитации (аудиоматериалы)"}
-    - {id: 461, cat: Books, desc: " |- Религия (аудиоматериалы)"}
-    - {id: 462, cat: Books, desc: " |- Прочие аудиоматериалы"}
+    - {id: 436, cat: Audio/Audiobook, desc: "Обучающие аудиоматериалы"}
+    - {id: 458, cat: Audio/Audiobook, desc: " |- Бизнес и Менеджмент (аудиоматериалы)"}
+    - {id: 457, cat: Audio/Audiobook, desc: " |- Иностранные языки (аудиоматериалы)"}
+    - {id: 1342, cat: Audio/Audiobook, desc: " |- Здоровье и Медицина (аудиоматериалы)"}
+    - {id: 459, cat: Audio/Audiobook, desc: " |- Популярная психология и саморазвитие (аудиоматериалы)"}
+    - {id: 460, cat: Audio/Audiobook, desc: " |- Медитации (аудиоматериалы)"}
+    - {id: 461, cat: Audio/Audiobook, desc: " |- Религия (аудиоматериалы)"}
+    - {id: 462, cat: Audio/Audiobook, desc: " |- Прочие аудиоматериалы"}
     - {id: 437, cat: Books, desc: "Обучающие видеоматериалы"}
-    - {id: 466, cat: Books, desc: " |- Бизнес и Менеджмент (видеокурсы)"}
-    - {id: 1319, cat: Books, desc: " |- Иностранные языки (видеокурсы)"}
-    - {id: 463, cat: Books, desc: " |- IT, Компьютерные видеокурсы"}
-    - {id: 958, cat: Books, desc: " |- Дизайн, рисование (видеокурсы)"}
-    - {id: 1223, cat: Books, desc: " |- Фотография и Видео (видеокурсы)"}
-    - {id: 467, cat: Books, desc: " |- Здоровье и Спорт (видеокурсы)"}
-    - {id: 464, cat: Books, desc: " |- Психология и саморазвитие (видеокурсы)"}
-    - {id: 465, cat: Books, desc: " |- Музыка (видеокурсы)"}
-    - {id: 469, cat: Books, desc: " |- Другие видеокурсы"}
+    - {id: 466, cat: TV, desc: " |- Бизнес и Менеджмент (видеокурсы)"}
+    - {id: 1319, cat: TV, desc: " |- Иностранные языки (видеокурсы)"}
+    - {id: 463, cat: TV, desc: " |- IT, Компьютерные видеокурсы"}
+    - {id: 958, cat: TV, desc: " |- Дизайн, рисование (видеокурсы)"}
+    - {id: 1223, cat: TV, desc: " |- Фотография и Видео (видеокурсы)"}
+    - {id: 467, cat: TV, desc: " |- Здоровье и Спорт (видеокурсы)"}
+    - {id: 464, cat: TV, desc: " |- Психология и саморазвитие (видеокурсы)"}
+    - {id: 465, cat: TV, desc: " |- Музыка (видеокурсы)"}
+    - {id: 1348, cat: TV, desc: " |- Домоводство, строительство и ремонт (видеокурсы)"}
+    - {id: 469, cat: TV, desc: " |- Другие видеокурсы"}
     - {id: 439, cat: Books, desc: "Мультимедийные материалы"}
     - {id: 477, cat: Books, desc: " |- Образование"}
     - {id: 476, cat: Books, desc: " |- Иностранные языки"}
@@ -408,114 +409,114 @@ caps:
     - {id: 681, cat: Audio, desc: " |- Vinyl-Rip и Hand-Made"}
     - {id: 330, cat: Audio, desc: "Классика"}
     - {id: 1256, cat: Audio, desc: " |- Классика (HD Audio)"}
-    - {id: 1285, cat: Audio, desc: " |- Полные собрания сочинений (Lossless)"}
+    - {id: 1285, cat: Audio/Lossless, desc: " |- Полные собрания сочинений (Lossless)"}
     - {id: 370, cat: Audio, desc: " |- Полные собрания сочинений"}
-    - {id: 1260, cat: Audio, desc: " |- Вокал (Lossless)"}
+    - {id: 1260, cat: Audio/Lossless, desc: " |- Вокал (Lossless)"}
     - {id: 371, cat: Audio, desc: " |- Вокал"}
-    - {id: 1261, cat: Audio, desc: " |- Концерты (Lossless)"}
+    - {id: 1261, cat: Audio/Lossless, desc: " |- Концерты (Lossless)"}
     - {id: 375, cat: Audio, desc: " |- Концерты"}
-    - {id: 1259, cat: Audio, desc: " |- Оркестровая (Lossless)"}
+    - {id: 1259, cat: Audio/Lossless, desc: " |- Оркестровая (Lossless)"}
     - {id: 374, cat: Audio, desc: " |- Оркестровая"}
-    - {id: 1257, cat: Audio, desc: " |- Камерная (Lossless)"}
+    - {id: 1257, cat: Audio/Lossless, desc: " |- Камерная (Lossless)"}
     - {id: 373, cat: Audio, desc: " |- Камерная"}
-    - {id: 1258, cat: Audio, desc: " |- Фортепиано (Lossless)"}
+    - {id: 1258, cat: Audio/Lossless, desc: " |- Фортепиано (Lossless)"}
     - {id: 372, cat: Audio, desc: " |- Фортепиано"}
-    - {id: 1160, cat: Audio, desc: " |- В обработке/Classical Crossover/Neoclassical (Lossless)"}
+    - {id: 1160, cat: Audio/Lossless, desc: " |- В обработке/Classical Crossover/Neoclassical (Lossless)"}
     - {id: 876, cat: Audio, desc: " |- В обработке/Classical Crossover/Neoclassical"}
-    - {id: 1255, cat: Audio, desc: " |- Классика (сборники) (Lossless)"}
+    - {id: 1255, cat: Audio/Lossless, desc: " |- Классика (сборники) (Lossless)"}
     - {id: 376, cat: Audio, desc: " |- Классика (сборники)"}
     - {id: 326, cat: Audio, desc: "Jazz, Blues, Soul"}
-    - {id: 359, cat: Audio, desc: " |- Jazz (Lossless)"}
+    - {id: 359, cat: Audio/Lossless, desc: " |- Jazz (Lossless)"}
     - {id: 358, cat: Audio, desc: " |- Jazz"}
-    - {id: 1188, cat: Audio, desc: " |- Blues, Soul (Lossless)"}
+    - {id: 1188, cat: Audio/Lossless, desc: " |- Blues, Soul (Lossless)"}
     - {id: 1189, cat: Audio, desc: " |- Blues, Soul"}
     - {id: 328, cat: Audio, desc: "Шансон, Авторская и Военная песня"}
-    - {id: 1180, cat: Audio, desc: " |- Зарубежный Шансон (Lossless)"}
+    - {id: 1180, cat: Audio/Lossless, desc: " |- Зарубежный Шансон (Lossless)"}
     - {id: 1181, cat: Audio, desc: " |- Зарубежный Шансон"}
-    - {id: 364, cat: Audio, desc: " |- Русский Шансон (Lossless)"}
+    - {id: 364, cat: Audio/Lossless, desc: " |- Русский Шансон (Lossless)"}
     - {id: 363, cat: Audio, desc: " |- Русский Шансон"}
-    - {id: 1179, cat: Audio, desc: " |- Авторская и Военная песня (Lossless)"}
+    - {id: 1179, cat: Audio/Lossless, desc: " |- Авторская и Военная песня (Lossless)"}
     - {id: 879, cat: Audio, desc: " |- Авторская и Военная песня"}
     - {id: 322, cat: Audio, desc: "Rock, Alternative, Punk, Metal"}
-    - {id: 962, cat: Audio, desc: " |- Rock (Lossless)"}
+    - {id: 962, cat: Audio/Lossless, desc: " |- Rock (Lossless)"}
     - {id: 333, cat: Audio, desc: " |- Rock"}
-    - {id: 965, cat: Audio, desc: " |- Alternative, Punk (Lossless)"}
+    - {id: 965, cat: Audio/Lossless, desc: " |- Alternative, Punk (Lossless)"}
     - {id: 336, cat: Audio, desc: " |- Alternative, Punk"}
-    - {id: 337, cat: Audio, desc: " |- Hard Rock (Lossless)"}
+    - {id: 337, cat: Audio/Lossless, desc: " |- Hard Rock (Lossless)"}
     - {id: 338, cat: Audio, desc: " |- Hard Rock"}
-    - {id: 963, cat: Audio, desc: " |- Metal (Lossless)"}
+    - {id: 963, cat: Audio/Lossless, desc: " |- Metal (Lossless)"}
     - {id: 334, cat: Audio, desc: " |- Metal"}
-    - {id: 961, cat: Audio, desc: " |- Русский Рок (Lossless)"}
+    - {id: 961, cat: Audio/Lossless, desc: " |- Русский Рок (Lossless)"}
     - {id: 332, cat: Audio, desc: " |- Русский рок"}
     - {id: 325, cat: Audio, desc: "Pop"}
-    - {id: 1165, cat: Audio, desc: " |- Eurodance, Euro-House, Technopop (Lossless)"}
+    - {id: 1165, cat: Audio/Lossless, desc: " |- Eurodance, Euro-House, Technopop (Lossless)"}
     - {id: 1166, cat: Audio, desc: " |- Eurodance, Euro-House, Technopop"}
     - {id: 1168, cat: Audio, desc: " |- Disco, Italo-Disco, Euro-Disco, Hi-NRG"}
-    - {id: 1167, cat: Audio, desc: " |- Disco, Italo-Disco, Euro-Disco, Hi-NRG (Lossless)"}
-    - {id: 1162, cat: Audio, desc: " |- Отечественная поп-музыка (Lossless)"}
+    - {id: 1167, cat: Audio/Lossless, desc: " |- Disco, Italo-Disco, Euro-Disco, Hi-NRG (Lossless)"}
+    - {id: 1162, cat: Audio/Lossless, desc: " |- Отечественная поп-музыка (Lossless)"}
     - {id: 352, cat: Audio, desc: " |- Отечественная поп-музыка"}
-    - {id: 1164, cat: Audio, desc: " |- Советская эстрада, Ретро (Lossless)"}
+    - {id: 1164, cat: Audio/Lossless, desc: " |- Советская эстрада, Ретро (Lossless)"}
     - {id: 1163, cat: Audio, desc: " |- Советская эстрада, Ретро"}
-    - {id: 1161, cat: Audio, desc: " |- Зарубежная поп-музыка (Lossless)"}
+    - {id: 1161, cat: Audio/Lossless, desc: " |- Зарубежная поп-музыка (Lossless)"}
     - {id: 353, cat: Audio, desc: " |- Зарубежная поп-музыка"}
     - {id: 324, cat: Audio, desc: "Electronic"}
-    - {id: 1327, cat: Audio, desc: " |- Psybient, Psychill, Psydub (Lossless)"}
+    - {id: 1327, cat: Audio/Lossless, desc: " |- Psybient, Psychill, Psydub (Lossless)"}
     - {id: 1328, cat: Audio, desc: " |- Psybient, Psychill, Psydub"}
-    - {id: 1325, cat: Audio, desc: " |- Downtempo, Trip-Hop, Lounge (Lossless)"}
+    - {id: 1325, cat: Audio/Lossless, desc: " |- Downtempo, Trip-Hop, Lounge (Lossless)"}
     - {id: 1326, cat: Audio, desc: " |- Downtempo, Trip-Hop, Lounge"}
-    - {id: 1323, cat: Audio, desc: " |- Ambient, Experimental, Modern Classical (Lossless)"}
+    - {id: 1323, cat: Audio/Lossless, desc: " |- Ambient, Experimental, Modern Classical (Lossless)"}
     - {id: 1324, cat: Audio, desc: " |- Ambient, Experimental, Modern Classical"}
-    - {id: 976, cat: Audio, desc: " |- Trance (Lossless)"}
+    - {id: 976, cat: Audio/Lossless, desc: " |- Trance (Lossless)"}
     - {id: 346, cat: Audio, desc: " |- Trance"}
     - {id: 1243, cat: Audio, desc: " |- Label-Packs"}
-    - {id: 977, cat: Audio, desc: " |- House, Techno, Electro, Minimal (Lossless)"}
+    - {id: 977, cat: Audio/Lossless, desc: " |- House, Techno, Electro, Minimal (Lossless)"}
     - {id: 345, cat: Audio, desc: " |- House"}
     - {id: 349, cat: Audio, desc: " |- Techno, Electro, Minimal"}
     - {id: 347, cat: Audio, desc: " |- Easy listening"}
-    - {id: 979, cat: Audio, desc: " |- Industrial, EBM, Dark Electro (Lossless)"}
+    - {id: 979, cat: Audio/Lossless, desc: " |- Industrial, EBM, Dark Electro (Lossless)"}
     - {id: 673, cat: Audio, desc: " |- Experimental Electronic"}
     - {id: 671, cat: Audio, desc: " |- Industrial, EBM, Dark Electro"}
-    - {id: 1224, cat: Audio, desc: " |- IDM (Lossless)"}
+    - {id: 1224, cat: Audio/Lossless, desc: " |- IDM (Lossless)"}
     - {id: 1225, cat: Audio, desc: " |- IDM"}
-    - {id: 980, cat: Audio, desc: " |- Synthpop, New Wave (Lossless)"}
+    - {id: 980, cat: Audio/Lossless, desc: " |- Synthpop, New Wave (Lossless)"}
     - {id: 672, cat: Audio, desc: " |- Synthpop, New Wave"}
-    - {id: 1316, cat: Audio, desc: " |- Dubstep, Future Garage, Bass Music, UK Garage (Lossless)"}
+    - {id: 1316, cat: Audio/Lossless, desc: " |- Dubstep, Future Garage, Bass Music, UK Garage (Lossless)"}
     - {id: 1317, cat: Audio, desc: " |- Dubstep, Future Garage, Bass Music, UK Garage"}
-    - {id: 981, cat: Audio, desc: " |- Drum'n'Bass, Jungle, Breaks, Breakbeat (Lossless)"}
+    - {id: 981, cat: Audio/Lossless, desc: " |- Drum'n'Bass, Jungle, Breaks, Breakbeat (Lossless)"}
     - {id: 344, cat: Audio, desc: " |- Drum'n'Bass, Jungle, Breaks, Breakbeat"}
-    - {id: 983, cat: Audio, desc: " |- Hardstyle, Jumpstyle, Hardcore (Lossless)"}
+    - {id: 983, cat: Audio/Lossless, desc: " |- Hardstyle, Jumpstyle, Hardcore (Lossless)"}
     - {id: 984, cat: Audio, desc: " |- Hardstyle, Jumpstyle, Hardcore"}
-    - {id: 982, cat: Audio, desc: " |- Psychedelic, psytrance, fullon (Lossless)"}
+    - {id: 982, cat: Audio/Lossless, desc: " |- Psychedelic, psytrance, fullon (Lossless)"}
     - {id: 348, cat: Audio, desc: " |- Psychedelic, psytrance, fullon"}
     - {id: 674, cat: Audio, desc: " |- Radioshow, Live Mixes"}
     - {id: 323, cat: Audio, desc: "Rap, Hip-hop, RnB, Reggae"}
-    - {id: 1187, cat: Audio, desc: " |- Rap, Hip-hop зарубежный (Lossless)"}
+    - {id: 1187, cat: Audio/Lossless, desc: " |- Rap, Hip-hop зарубежный (Lossless)"}
     - {id: 339, cat: Audio, desc: " |- Rap, Hip-hop зарубежный"}
-    - {id: 1186, cat: Audio, desc: " |- Rap, Hip-hop отечественный (Lossless)"}
+    - {id: 1186, cat: Audio/Lossless, desc: " |- Rap, Hip-hop отечественный (Lossless)"}
     - {id: 340, cat: Audio, desc: " |- Rap, Hip-hop отечественный"}
-    - {id: 1185, cat: Audio, desc: " |- RnB, Reggae (Lossless)"}
+    - {id: 1185, cat: Audio/Lossless, desc: " |- RnB, Reggae (Lossless)"}
     - {id: 341, cat: Audio, desc: " |- RnB, Reggae"}
     - {id: 329, cat: Audio, desc: "East Asian Music"}
-    - {id: 369, cat: Audio, desc: " |- Asian Traditional, Ethnic (Lossless)"}
+    - {id: 369, cat: Audio/Lossless, desc: " |- Asian Traditional, Ethnic (Lossless)"}
     - {id: 368, cat: Audio, desc: " |- Asian Traditional, Ethnic"}
-    - {id: 1218, cat: Audio, desc: " |- Asian Pop (Lossless)"}
+    - {id: 1218, cat: Audio/Lossless, desc: " |- Asian Pop (Lossless)"}
     - {id: 365, cat: Audio, desc: " |- Asian Pop"}
-    - {id: 1217, cat: Audio, desc: " |- Asian Rock, Metal (Lossless)"}
+    - {id: 1217, cat: Audio/Lossless, desc: " |- Asian Rock, Metal (Lossless)"}
     - {id: 366, cat: Audio, desc: " |- Asian Rock, Metal"}
-    - {id: 1215, cat: Audio, desc: " |- Doujin Music (Lossless)"}
+    - {id: 1215, cat: Audio/Lossless, desc: " |- Doujin Music (Lossless)"}
     - {id: 1216, cat: Audio, desc: " |- Doujin Music"}
-    - {id: 1213, cat: Audio, desc: " |- Other Asian (Lossless)"}
+    - {id: 1213, cat: Audio/Lossless, desc: " |- Other Asian (Lossless)"}
     - {id: 367, cat: Audio, desc: " |- Other Asian"}
     - {id: 331, cat: Audio, desc: "Other Styles"}
-    - {id: 1157, cat: Audio, desc: " |- Instrumental (Lossless)"}
+    - {id: 1157, cat: Audio/Lossless, desc: " |- Instrumental (Lossless)"}
     - {id: 711, cat: Audio, desc: " |- Instrumental"}
-    - {id: 1159, cat: Audio, desc: " |- New Age/Meditative/Relax (Lossless)"}
+    - {id: 1159, cat: Audio/Lossless, desc: " |- New Age/Meditative/Relax (Lossless)"}
     - {id: 378, cat: Audio, desc: " |- New Age/Meditative/Relax"}
-    - {id: 1158, cat: Audio, desc: " |- Folk (Lossless)"}
+    - {id: 1158, cat: Audio/Lossless, desc: " |- Folk (Lossless)"}
     - {id: 379, cat: Audio, desc: " |- Folk"}
-    - {id: 380, cat: Audio, desc: " |- Other (Lossless)"}
+    - {id: 380, cat: Audio/Lossless, desc: " |- Other (Lossless)"}
     - {id: 1178, cat: Audio, desc: " |- Other"}
-    - {id: 361, cat: Audio, desc: " |- OST (Lossless)"}
+    - {id: 361, cat: Audio/Lossless, desc: " |- OST (Lossless)"}
     - {id: 360, cat: Audio, desc: " |- OST"}
     - {id: 327, cat: Audio, desc: "Неофициальные сборники"}
     - {id: 1184, cat: Audio, desc: " |- Jazz, Blues, Soul (сборники)"}
@@ -631,9 +632,9 @@ caps:
     - {id: 1156, cat: Other, desc: " |- Отечественное видео HD для устройств Apple"}
     - {id: 1099, cat: Other, desc: " |- Зарубежное видео для устройств Apple"}
     - {id: 1098, cat: Other, desc: " |- Зарубежное видео HD для устройств Apple"}
-    - {id: 1096, cat: Other, desc: " |- Музыка (AAC)"}
-    - {id: 1097, cat: Other, desc: " |- Музыка Lossless (ALAC)"}
-    - {id: 1095, cat: Other, desc: " |- Аудиокниги (AAC)"}
+    - {id: 1096, cat: Audio, desc: " |- Музыка (AAC)"}
+    - {id: 1097, cat: Audio/Lossless, desc: " |- Музыка Lossless (ALAC)"}
+    - {id: 1095, cat: Audio/Audiobook, desc: " |- Аудиокниги (AAC)"}
     # linux
     - {id: 536, cat: Other, desc: "Linux, Unix и другие ОС"}
     - {id: 563, cat: Other, desc: " |- ОС Linux"}

src/Jackett.Common/Definitions/ntelogo.yml

@@ -40,6 +40,10 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
+  - name: single_file_release_use_filename
+    type: checkbox
+    label: Use filename as title for single file releases
+    default: true
   - name: sort
     type: select
     label: Sort requested from site
@@ -67,8 +71,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
     - path: "/api/torrents/filter"
       response:
         type: json
@@ -101,7 +105,7 @@ search:
   fields:
     category:
       selector: category_id
-    title:
+    title_optional:
       selector: name
       filters:
         - name: re_replace
@@ -126,8 +130,6 @@ search:
     genre:
       selector: meta.genres
       filters:
-        - name: re_replace
-          args: ["(?i)^None$", ""]
         - name: re_replace
           args: ["(?i)(Science Fiction)", "Science_Fiction"]
         - name: re_replace
@@ -173,4 +175,9 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 7.2.3
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
+# json UNIT3D 8.0.2

src/Jackett.Common/Definitions/nyaasi.yml

@@ -85,6 +85,10 @@ settings:
     type: checkbox
     label: Improve Sonarr compatibility by trying to add Season information into Release Titles
     default: false
+  - name: strip_s01
+    type: checkbox
+    label: Remove first season keywords (S1/S01/Season 1), as some results do not include this for first/single season releases
+    default: false
   - name: radarr_compatibility
     type: checkbox
     label: Improve Radarr compatibility by removing year information from keywords and adding it to Release Titles
@@ -161,6 +165,8 @@ search:
   keywordsfilters:
     - name: re_replace
       args: [" *\\b((?:19|20)\\d{2})\\b", "{{ if .Config.radarr_compatibility }}{{ else }} $1{{ end }}"]
+    - name: re_replace
+      args: ["(?i) *\\b(S(?:0|eason *)?1)\\b", "{{ if .Config.strip_s01 }}{{ else }} $1{{ end }}"]
 
   rows:
     selector: tr.default,tr.danger,tr.success
@@ -240,14 +246,21 @@ search:
       text: "{{ .Result.title_phase3 }}"
       filters:
         - name: regexp
-          args: "\\b(.+? - ?)(\\d+) ([\\[\\(])\\b"
+          args: "\\b(.+? - ?)(\\d+(-\\d+)?) ([\\[\\(])\\b"
         - name: append
           args: "NULL"
+    title_has_movie_ova:
+      text: "{{ .Result.title_phase3 }}"
+      filters:
+        - name: regexp
+          args: "(?i)(?<![A-Za-z0-9])(Movies?|OVA|OAV)(?![A-Za-z0-9])"
+        - name: re_replace
+          args: ["(?i)(Movies?|OVA|OAV)", "YES"]
     title_optional:
       text: "{{ .Result.title_phase3 }}"
       filters:
-        - name: append
-          args: "{{ if and (eq .Result.category_group_id \"1\") (and (eq .Result.title_has_season \"NULL\") (eq .Result.title_has_episode \"NULL\")) }} S01{{ else }}{{ end }}"
+        - name: re_replace
+          args: ["^(\\[.+?].+?)\\s*(?<![\\]\\)])((?:\\[|\\(| - ).+)", "{{ if and (and (eq .Result.category_group_id \"1\") (ne .Result.title_has_movie_ova \"YES\")) (and (eq .Result.title_has_season \"NULL\") (eq .Result.title_has_episode \"NULL\")) }}$1 S01 $2{{ else }}$1 $2{{ end }}"]
     title:
       text: "{{ if .Config.sonarr_compatibility }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
     details:

src/Jackett.Common/Definitions/okpt.yml

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

src/Jackett.Common/Definitions/oldgreektracker.yml

@@ -13,67 +13,74 @@ legacylinks:
 caps:
   categorymappings:
     - {id: 3, cat: PC, desc: "Applications"}
-    - {id: 7, cat: PC/Mobile-Android, desc: "  |-- Android Applications"}
-    - {id: 5, cat: PC/0day, desc: "  |-- Linux Applications"}
-    - {id: 6, cat: PC/Mac, desc: "  |-- Macintosh Applications"}
-    - {id: 4, cat: PC/0day, desc: "  |-- Windows Applications"}
+    - {id: 7, cat: PC/Mobile-Android, desc: "Android Applications"}
+    - {id: 5, cat: PC/0day, desc: "Linux Applications"}
+    - {id: 6, cat: PC/Mac, desc: "Macintosh Applications"}
+    - {id: 4, cat: PC/0day, desc: "Windows Applications"}
     - {id: 22, cat: Books, desc: "Documents"}
-    - {id: 69, cat: Audio/Audiobook, desc: "  |-- Audio Books"}
-    - {id: 23, cat: Books/EBook, desc: "  |-- Books"}
-    - {id: 27, cat: Books/Comics, desc: "  |-- Comics"}
-    - {id: 24, cat: Books/EBook, desc: "  |-- Greek Books"}
-    - {id: 38, cat: Books/EBook, desc: "  |-- Greek Documentaries"}
-    - {id: 26, cat: Other, desc: "  |-- Greek Pictures"}
-    - {id: 25, cat: Other, desc: "  |-- Pictures"}
+    - {id: 69, cat: Audio/Audiobook, desc: "Audio Books"}
+    - {id: 23, cat: Books/EBook, desc: "Books"}
+    - {id: 27, cat: Books/Comics, desc: "Comics"}
+    - {id: 24, cat: Books/EBook, desc: "Greek Books"}
+    - {id: 38, cat: Books/EBook, desc: "Greek Documentaries"}
+    - {id: 26, cat: Other, desc: "Greek Pictures"}
+    - {id: 25, cat: Other, desc: "Pictures"}
+    - {id: 73, cat: Console, desc: "Games"}
+    - {id: 74, cat: PC/Games, desc: "PC Games"}
     - {id: 15, cat: Movies/SD, desc: "Movies"}
-    - {id: 16, cat: Movies/SD, desc: "  |-- DVDRip-WEBRip-BRRip"}
-    - {id: 20, cat: Movies/SD, desc: "  |-- Filmographies"}
-    - {id: 21, cat: Movies/SD, desc: "  |-- Greek Filmographies"}
-    - {id: 17, cat: Movies/SD, desc: "  |-- Greek Movies"}
-    - {id: 19, cat: Audio/Video, desc: "  |-- Greek Music Videos"}
-    - {id: 18, cat: Audio/Video, desc: "  |-- Music Videos"}
+    - {id: 16, cat: Movies/SD, desc: "DVDRip-WEBRip-BRRip"}
+    - {id: 20, cat: Movies/SD, desc: "Filmographies"}
+    - {id: 21, cat: Movies/SD, desc: "Greek Filmographies"}
+    - {id: 17, cat: Movies/SD, desc: "Greek Movies"}
+    - {id: 19, cat: Audio/Video, desc: "Greek Music Videos"}
+    - {id: 18, cat: Audio/Video, desc: "Music Videos"}
     - {id: 41, cat: Movies/HD, desc: "Movies HD"}
-    - {id: 50, cat: Movies/HD, desc: "  |-- BluRay / 1080p"}
-    - {id: 51, cat: Movies/UHD, desc: "  |-- BluRay / 4K (UHD)"}
-    - {id: 49, cat: Movies/HD, desc: "  |-- BluRay / 720p"}
-    - {id: 45, cat: Movies/BluRay, desc: "  |-- BluRay Disk / 1080p"}
-    - {id: 66, cat: Movies/BluRay, desc: "  |-- BluRay Disk / 4K (UHD)"}
-    - {id: 42, cat: Movies/HD, desc: "  |-- Remux / 1080p"}
-    - {id: 46, cat: Movies/UHD, desc: "  |-- Remux / 4K (UHD)"}
-    - {id: 47, cat: Movies/WEB-DL, desc: "  |-- WEB-DL / 1080p"}
-    - {id: 48, cat: Movies/UHD, desc: "  |-- WEB-DL / 4K (UHD)"}
-    - {id: 43, cat: Movies/WEB-DL, desc: "  |-- WEB-DL / 720p"}
+    - {id: 50, cat: Movies/HD, desc: "BluRay / 1080p"}
+    - {id: 51, cat: Movies/UHD, desc: "BluRay / 4K (UHD)"}
+    - {id: 49, cat: Movies/HD, desc: "BluRay / 720p"}
+    - {id: 45, cat: Movies/BluRay, desc: "BluRay Disk / 1080p"}
+    - {id: 66, cat: Movies/BluRay, desc: "BluRay Disk / 4K (UHD)"}
+    - {id: 42, cat: Movies/HD, desc: "Remux / 1080p"}
+    - {id: 46, cat: Movies/UHD, desc: "Remux / 4K (UHD)"}
+    - {id: 47, cat: Movies/WEB-DL, desc: "WEB-DL / 1080p"}
+    - {id: 48, cat: Movies/UHD, desc: "WEB-DL / 4K (UHD)"}
+    - {id: 43, cat: Movies/WEB-DL, desc: "WEB-DL / 720p"}
     - {id: 8, cat: Audio, desc: "Music"}
-    - {id: 71, cat: Audio, desc: "  |-- Collections"}
-    - {id: 68, cat: Audio, desc: "  |-- Discographies"}
-    - {id: 10, cat: Audio/Lossless, desc: "  |-- Greek Music FLAC"}
-    - {id: 9, cat: Audio/MP3, desc: "  |-- Greek Music MP3"}
-    - {id: 12, cat: Audio/Lossless, desc: "  |-- Music FLAC"}
-    - {id: 11, cat: Audio/MP3, desc: "  |-- Music MP3"}
-    - {id: 72, cat: Audio/Other, desc: "  |-- Soundtracks"}
+    - {id: 71, cat: Audio, desc: "Collections"}
+    - {id: 68, cat: Audio, desc: "Discographies"}
+    - {id: 10, cat: Audio/Lossless, desc: "Greek Music FLAC"}
+    - {id: 9, cat: Audio/MP3, desc: "Greek Music MP3"}
+    - {id: 12, cat: Audio/Lossless, desc: "Music FLAC"}
+    - {id: 11, cat: Audio/MP3, desc: "Music MP3"}
+    - {id: 72, cat: Audio/Other, desc: "Soundtracks"}
     - {id: 28, cat: TV/SD, desc: "TV"}
-    - {id: 29, cat: TV/Anime, desc: "  |-- Anime"}
-    - {id: 31, cat: TV/Other, desc: "  |-- Cartoons"}
-    - {id: 37, cat: TV/Documentary, desc: "  |-- Documentaries"}
-    - {id: 70, cat: TV/SD, desc: "  |-- DVDRip-WEBRip-BRRip"}
-    - {id: 30, cat: TV/Anime, desc: "  |-- Greek Anime"}
-    - {id: 32, cat: TV/Other, desc: "  |-- Greek Cartoon"}
-    - {id: 36, cat: TV/SD, desc: "  |-- Greek TV Packs"}
-    - {id: 35, cat: TV/SD, desc: "  |-- Greek TV Series"}
-    - {id: 40, cat: TV/SD, desc: "  |-- Greek TV Shows"}
-    - {id: 39, cat: TV/SD, desc: "  |-- Shows"}
-    - {id: 67, cat: TV/Sport, desc: "  |-- Sports"}
+    - {id: 29, cat: TV/Anime, desc: "Anime"}
+    - {id: 31, cat: TV/Other, desc: "Cartoons"}
+    - {id: 37, cat: TV/Documentary, desc: "Documentaries"}
+    - {id: 70, cat: TV/SD, desc: "DVDRip-WEBRip-BRRip"}
+    - {id: 30, cat: TV/Anime, desc: "Greek Anime"}
+    - {id: 32, cat: TV/Other, desc: "Greek Cartoon"}
+    - {id: 79, cat: TV/Documentary, desc: "Greek Documentaries"}
+    - {id: 36, cat: TV/SD, desc: "Greek TV Packs"}
+    - {id: 35, cat: TV/SD, desc: "Greek TV Series"}
+    - {id: 40, cat: TV/SD, desc: "Greek TV Shows"}
+    - {id: 39, cat: TV/SD, desc: "Shows"}
+    - {id: 67, cat: TV/Sport, desc: "Sports"}
+    - {id: 77, cat: TV/SD, desc: "TV Packs"}
+    - {id: 75, cat: TV/SD, desc: "TV Series"}
+    - {id: 76, cat: TV/SD, desc: "TV Shows"}
+    - {id: 78, cat: TV/Sport, desc: "TV Sports"}
     - {id: 54, cat: TV/HD, desc: "TV HD"}
-    - {id: 56, cat: TV/HD, desc: "  |-- BluRay / 1080p"}
-    - {id: 57, cat: TV/UHD, desc: "  |-- BluRay / 4K (UHD)"}
-    - {id: 55, cat: TV/HD, desc: "  |-- BluRay / 720p"}
-    - {id: 63, cat: TV/HD, desc: "  |-- BluRay Disk / 1080p"}
-    - {id: 65, cat: TV/UHD, desc: "  |-- BluRay Disk / 4K (UHD)"}
-    - {id: 61, cat: TV/HD, desc: "  |-- Remux / 1080p"}
-    - {id: 62, cat: TV/UHD, desc: "  |-- Remux / 4K (UHD)"}
-    - {id: 59, cat: TV/WEB-DL, desc: "  |-- WEB-DL / 1080p"}
-    - {id: 60, cat: TV/UHD, desc: "  |-- WEB-DL / 4K (UHD)"}
-    - {id: 58, cat: TV/WEB-DL, desc: "  |-- WEB-DL / 720p"}
+    - {id: 56, cat: TV/HD, desc: "BluRay / 1080p"}
+    - {id: 57, cat: TV/UHD, desc: "BluRay / 4K (UHD)"}
+    - {id: 55, cat: TV/HD, desc: "BluRay / 720p"}
+    - {id: 63, cat: TV/HD, desc: "BluRay Disk / 1080p"}
+    - {id: 65, cat: TV/UHD, desc: "BluRay Disk / 4K (UHD)"}
+    - {id: 61, cat: TV/HD, desc: "Remux / 1080p"}
+    - {id: 62, cat: TV/UHD, desc: "Remux / 4K (UHD)"}
+    - {id: 59, cat: TV/WEB-DL, desc: "WEB-DL / 1080p"}
+    - {id: 60, cat: TV/UHD, desc: "WEB-DL / 4K (UHD)"}
+    - {id: 58, cat: TV/WEB-DL, desc: "WEB-DL / 720p"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/oldtoonsworld.yml

@@ -66,8 +66,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
     - path: "/api/torrents/filter"
       response:
         type: json

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

@@ -30,6 +30,10 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
+  - name: single_file_release_use_filename
+    type: checkbox
+    label: Use filename as title for single file releases
+    default: true
   - name: sort
     type: select
     label: Sort requested from site
@@ -61,8 +65,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
     - path: "/api/torrents/filter"
       response:
         type: json
@@ -95,7 +99,7 @@ search:
   fields:
     category:
       selector: category_id
-    title:
+    title_optional:
       selector: name
     details:
       selector: details_link
@@ -117,8 +121,6 @@ search:
     genre:
       selector: meta.genres
       filters:
-        - name: re_replace
-          args: ["(?i)^None$", ""]
         - name: re_replace
           args: ["(?i)(Science Fiction)", "Science_Fiction"]
         - name: re_replace
@@ -167,4 +169,9 @@ search:
     minimumseedtime:
       # 2 days (as seconds = 2 x 24 x 60 x 60)
       text: 172800
-# json UNIT3D 7.2.5
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
+# json UNIT3D 8.0.2

src/Jackett.Common/Definitions/oshenpt.yml

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

src/Jackett.Common/Definitions/plusteca.yml

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

src/Jackett.Common/Definitions/polishtorrent.yml

@@ -54,6 +54,10 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
+  - name: single_file_release_use_filename
+    type: checkbox
+    label: Use filename as title for single file releases
+    default: true
   - name: multilang
     type: checkbox
     label: Replace MULTI by another language in release name
@@ -92,8 +96,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
     - path: "/api/torrents/filter"
       response:
         type: json
@@ -126,17 +130,8 @@ search:
   fields:
     category:
       selector: category_id
-    title_phase1:
+    title_optional:
       selector: name
-    title_multilang:
-      selector: name
-      filters:
-        - name: re_replace
-          args: ["(?i)\\b(MULTI(?!.*(?:POLISH|ENGLISH|\\bPL\\b)))\\b", "{{ .Config.multilanguage }}"]
-        - name: re_replace
-          args: ["(?i)\\b(pl)\\b", "POLISH"]
-    title:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
     details:
       selector: details_link
     download:
@@ -157,8 +152,6 @@ search:
     genre:
       selector: meta.genres
       filters:
-        - name: re_replace
-          args: ["(?i)^None$", ""]
         - name: re_replace
           args: ["(?i)(Akcja i Przygoda)", "Akcja_i_Przygoda"]
         - name: re_replace
@@ -204,4 +197,18 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 7.2.5
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title_phase1:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
+    title_multilang:
+      text: "{{ .Result.title_phase1 }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)\\b(MULTI(?!.*(?:POLISH|ENGLISH|\\bPL\\b)))\\b", "{{ .Config.multilanguage }}"]
+        - name: re_replace
+          args: ["(?i)\\b(pl)\\b", "POLISH"]
+    title:
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
+# json UNIT3D 8.0.1 (custom)

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

@@ -1,7 +1,7 @@
 ---
 id: portugas-api
 name: Portugas (API)
-description: "Portugas is a Private Portoguese Tracker"
+description: "Portugas is a Private PORTUGUESE Tracker"
 language: pt-PT
 type: private
 encoding: UTF-8
@@ -70,8 +70,8 @@ login:
 
 search:
   paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v7.0.0)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L349
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
     - path: "/api/torrents/filter"
       response:
         type: json

src/Jackett.Common/Definitions/ptlsp.yml

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