hdolimpo: fix freeleech detection

https://github.com/Prowlarr/Prowlarr/issues/1647

.editorconfig

@@ -237,7 +237,7 @@ csharp_style_conditional_delegate_call=true:warning
 # Modifier preferences
 csharp_preferred_modifier_order=public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
 # Expression-level preferences
-csharp_prefer_braces=false:suggestion
+csharp_prefer_braces=true:suggestion
 csharp_style_deconstructed_variable_declaration=true:suggestion
 csharp_prefer_simple_default_expression=true:warning
 csharp_style_pattern_local_over_anonymous_function=true:suggestion

README.md

@@ -41,12 +41,12 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BitRu
  * BitSearch
  * BT.etree
- * BT4G
  * BTDIGG
  * BTMET
  * BTSOW
  * BullTorrent
  * Byrutor
+ * Cinecalidad
  * comicat
  * ConCen
  * cpasbien
@@ -55,10 +55,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Demonoid
  * DivxTotal
  * dmhy
- * Dodder (菟丝子资源社区)
  * DonTorrent
- * EBook Bay (EBB)
  * E-Hentai
+ * EBook Bay (EBB)
  * EpubLibre
  * EXT Torrents
  * ExtraTorrent.st
@@ -67,13 +66,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * FireBit
  * freshMeat
  * Frozen Layer
- * FTUApps
  * GamesTorrents
  * GkTorrent
  * GloDLS
  * GTorrent.pro
  * Idope
- * Il CorSaRo Blu
  * Il Corsaro Nero
  * Internet Archive (archive.org)
  * Isohunt2
@@ -95,6 +92,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * MoviesDVDR
  * MovieTorrent
  * MyPornClub
+ * NextJAV
  * Newstudio
  * Nipponsei
  * NNTT
@@ -106,17 +104,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * PiratBit
  * PornosLab
  * PornoTorrent
- * Portugas
  * ProPorn
  * Rapidzona
  * RARBG
- * RinTor
  * RinTorNeT
- * Rus-media
  * RuTor
  * RuTracker.RU
  * Seedoff
- * seleZen
  * Sexy-Pics
  * Shana Project
  * ShowRSS
@@ -128,22 +122,20 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Tokyo Tosho
  * Torlock
  * Torrent[CORE]
- * Torrent Downloads (TD)
  * Torrent Oyun indir
  * torrent.by
  * torrent-pirat
  * Torrent9
  * Torrent9 clone
  * Torrent911
- * TorrentDownload
  * TorrentFunk
+ * TorrentDownloads
  * TorrentGalaxy (TGx)
  * TorrentKitty
  * TorrentProject2
  * TorrentQQ (토렌트큐큐)
  * Torrents.csv
  * TorrentSir (토렌트썰)
- * Torrentv
  * TorrentView (토렌트뷰)
  * TorrentWhiz ( 토렌트위즈)
  * Torrentz2eu
@@ -154,6 +146,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * VSTHouse
  * VST Torrents
  * xxxAdultTorrent
+ * XXXClub
  * xxxtor
  * xxxtorrents
  * YourBittorrent
@@ -163,7 +156,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 
 <details> <summary> <b> Supported Semi-Private Trackers </b> </summary>
 
- * 720pier
  * AniDUB
  * Anime-Free
  * AnimeLayer
@@ -172,9 +164,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BookTracker
  * BootyTape
  * Catorrent
- * Devil-Torrents
  * Darmowe torrenty
  * Deildu
+ * Demonoid
+ * Devil-Torrents
  * DimeADozen (EzTorrent)
  * DXP (Deaf Experts)
  * Electro-Torrent
@@ -189,9 +182,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Gay-Torrents.net
  * Genesis-Movement
  * HD-CzTorrent
- * HellTorrents
  * HDGalaKtik
+ * HellTorrents
  * HunTorrent
+ * Il CorSaRo Blu
  * Kinorun
  * Kinozal
  * Lightning-Tor
@@ -200,27 +194,32 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Marine Tracker
  * Mazepa
  * Metal Tracker
- * MuziekFrabriek
+ * Moviesite
  * MVGroup Forum
  * MVGroup Main
  * NetHD (VietTorrent)
+ * Newstudio (login)
+ * NoNaMe Club (NNM-Club) (login)
+ * PiratBit (login)
  * PornoLab
  * PussyTorrents
  * Rainbow Tracker
  * RGFootball
+ * RinTor
  * RiperAM
  * RockBox
  * RUDUB (ex-BaibaKoTV)
  * Rustorka
  * RuTracker
  * SATClubbing
+ * seleZen
  * Sharewood
  * SkTorrent
  * SkTorrent-org
  * themixingbowl (TMB)
  * Toloka.to
- * Torrent-Explosiv
  * Torrents-Local
+ * TorrentDownload
  * TribalMixes
  * Union Fansub
  * UniOtaku
@@ -241,6 +240,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * 3D Torrents (3DT)
  * 4thD (4th Dimension)
  * 52PT
+ * 720pier
  * Abnormal
  * ABtorrents (ABT + RNS)
  * Acervos [![(invite needed)][inviteneeded]](#)
@@ -252,8 +252,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * AlphaRatio (AR)
  * AmigosShareClub
  * AnimeBytes (AB)
- * AnimeTracker
  * AnimeTorrents (AnT)
+ * AnimeTracker
  * AnimeWorld
  * Anthelion
  * Araba Fenice (Phoenix) [![(invite needed)][inviteneeded]](#)
@@ -306,7 +306,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * CGPeers [![(invite needed)][inviteneeded]](#)
  * CHDBits [![(invite needed)][inviteneeded]](#)
  * ChileBT
- * Cinecalidad
  * Cinemageddon [![(invite needed)][inviteneeded]](#)
  * CinemaMovieS_ZT
  * Cinematik [![(invite needed)][inviteneeded]](#)
@@ -318,7 +317,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * CrazySpirits
  * CrnaBerza
  * DANISH BYTES
- * Darius Tracker
+ * Dark-Shadow
  * DataScene (DS)
  * DataTalli
  * DesiTorrents
@@ -358,7 +357,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * GiroTorrent
  * GreatPosterWall (GPW)
  * GreekDiamond
- * Greek Team
+ * Greek Team [![(invite needed)][inviteneeded]](#)
  * HaiDan
  * Haitang
  * HappyFappy
@@ -374,8 +373,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDArea (HDA)
  * HDAtmos
  * HDBits [![(invite needed)][inviteneeded]](#)
+ * HDC (HDCiTY) [![(invite needed)][inviteneeded]](#)
  * HDChina (HDWing) [![(invite needed)][inviteneeded]](#)
- * HDCity [![(invite needed)][inviteneeded]](#)
  * HDFans
  * HDHome (HDBigger) [![(invite needed)][inviteneeded]](#)
  * HDMaYi
@@ -386,14 +385,15 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDTorrents.it [![(invite needed)][inviteneeded]](#)
  * HDTurk
  * HDU
+ * HDVIDEO
  * HDZone
  * Hebits
  * HellasHut
  * HHanClub
- * HQMusic
  * House of Devil
+ * HQMusic
+ * iAnon
  * ICC2022
- * iHDBits
  * ImmortalSeed (iS)
  * Immortuos
  * Indietorrents [![(invite needed)][inviteneeded]](#)
@@ -410,12 +410,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * KrazyZone
  * Kufirc
  * LastFiles
- * Lat-Team [![(invite needed)][inviteneeded]](#)
  * Le Saloon
+ * Lat-Team [![(invite needed)][inviteneeded]](#)
  * LearnBits
  * LearnFlakes
  * leech24
- * LegacyHD (HD4Free)
  * LemonHD
  * Les-Cinephiles
  * Libble
@@ -436,16 +435,19 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * MMA-Torrents [![(invite needed)][inviteneeded]](#)
  * MNV (Max-New-Vision)
  * MOJBLiNK
+ * MonikaDesign (MDU) [![(invite needed)][inviteneeded]](#)
  * MoreThanTV (MTV)
  * MouseBits
  * Movie-Torrentz
- * Moviesite
+ * MuziekFabriek
  * MyAnonamouse (MAM)
  * MySpleen [![(invite needed)][inviteneeded]](#)
  * NCore
  * Nebulance (NBL) (TransmiTheNet)
  * NicePT
  * NorBits
+ * NORDiCHD
+ * Ntelogo
  * Old Toons World
  * OpenCD [![(invite needed)][inviteneeded]](#)
  * Orpheus
@@ -463,6 +465,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * PolishSource (PS)
  * PolishTracker
  * Pornbay [![(invite needed)][inviteneeded]](#)
+ * Portugas
  * PotUK
  * Pretome
  * PrivateHD (PHD)
@@ -481,9 +484,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * R3V WTF! [![(invite needed)][inviteneeded]](#)
  * Racing4Everyone (R4E)
  * RacingForMe (RFM)
+ * RareShare2
  * Red Star Torrent (RST) [![(invite needed)][inviteneeded]](#)
  * Redacted (PassTheHeadphones)
  * RedBits
+ * ReelFlix
  * Resurrect The Net
  * RetroFlix
  * RevolutionTT
@@ -539,13 +544,14 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TheEmpire (TE)
  * TheLeachZone (TLZ)
  * TheScenePlace (TSP)
+ * Thor's Land
  * TJUPT
  * TLFBits [![(invite needed)][inviteneeded]](#)
  * TmGHuB
  * Tornado
  * Torrent Network (TN)
  * Torrent Sector Crew (TSC)
- * Torrent Surf
+ * Torrent-Explosiv
  * Torrent-Syndikat [![(invite needed)][inviteneeded]](#)
  * TOrrent-tuRK (TORK)
  * Torrent.LT
@@ -570,12 +576,14 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TV Chaos UK (TVCUK)
  * TvRoad
  * TVstore
- * Twilight Torrents
  * U2 (U2分享園@動漫花園) [![(invite needed)][inviteneeded]](#)
+ * UBits
  * UHDBits
+ * UltraHD
  * UnionGang
  * UnleashTheCartoons
  * UnlimitZ
+ * Uploads
  * White Angel
  * World-In-HD [![(invite needed)][inviteneeded]](#)
  * World-of-Tomorrow
@@ -583,6 +591,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * xBytesV2
  * XSpeeds (XS)
  * Xthor
+ * XtremeBytes
  * XWT-Classics
  * XWTorrents (XWT)
  * YDYPT

src/Jackett.Common/Content/custom.js

@@ -72,11 +72,6 @@ function getHashArgs() {
     }, prev), {});
 }
 
-function insertWordWrap(str) {
-    // insert optional word wrap after punctuation to avoid overflows on long scene titles
-    return str.replace(/([\.\-_\/\\])/g, "$1\u200B");
-}
-
 function type_filter(indexer) {
   return indexer.type == this.value;
 }
@@ -1155,12 +1150,6 @@ function showSearch(selectedFilter, selectedIndexer, query, category) {
 
         var trackerId = filterId || "all";
         api.resultsForIndexer(trackerId, queryObj, function (data) {
-            for (var i = 0; i < data.Results.length; i++) {
-                var item = data.Results[i];
-                item.Title = insertWordWrap(item.Title);
-                item.CategoryDesc = insertWordWrap(item.CategoryDesc);
-            }
-
             $('#jackett-search-perform').html($('#search-button-ready').html());
             var searchResults = $('#searchResults');
             searchResults.empty();
@@ -1307,7 +1296,7 @@ $.fn.dataTable.ext.search = [
 ];
 
 function updateSearchResultTable(element, results) {
-    var resultsTemplate = Handlebars.compile($("#jackett-search-results").html());
+    var resultsTemplate = Handlebars.compile($("#jackett-search-results").text());
     element.html($(resultsTemplate(results)));
     element.find('tr.jackett-search-results-row').each(function () {
         updateReleasesRow(this);
@@ -1504,11 +1493,6 @@ function bindUIButtons() {
 
     $("#jackett-show-releases").click(function () {
         api.getServerCache(function (data) {
-            for (var i = 0; i < data.length; i++) {
-                var item = data[i];
-                item.Title = insertWordWrap(item.Title);
-                item.CategoryDesc = insertWordWrap(item.CategoryDesc);
-            }
             var releaseTemplate = Handlebars.compile($("#jackett-releases").html());
             var item = {
                 releases: data,

src/Jackett.Common/Content/index.html

@@ -465,11 +465,11 @@
                                     <td class="fit">{{jacketTimespan PublishDate}}</td>
                                     <td class="fit">{{jacketTimespan FirstSeen}}</td>
                                     <td class="fit">{{Tracker}}</td>
-                                    <td class="Title"><a href="{{Details}}">{{Title}}</a> <span class="release-labels"></span></td>
+                                    <td class="Title" style="word-break: break-all"><a href="{{Details}}" target="_blank">{{Title}}</a> <span class="release-labels"></span></td>
                                     <td class="fit">{{Size}}</td>
                                     <td class="fit">{{jacketSize Size}}</td>
                                     <td class="fit">{{Files}}</td>
-                                    <td class="fit Cat">{{CategoryDesc}}</td>
+                                    <td class="fit Cat" style="word-break: break-all">{{CategoryDesc}}</td>
                                     <td class="fit">{{Grabs}}</td>
                                     <td class="fit">{{Seeders}}</td>
                                     <td class="fit">{{Peers}}</td>
@@ -592,11 +592,11 @@
                     <td class="text-center">{{PublishDate}}</td>
                     <td class="text-center" title="{{dateFormat PublishDate format="YYYY-MM-DD HH:mm:ss Z"}}">{{jacketTimespan PublishDate}}</td>
                     <td class="text-center">{{Tracker}}</td>
-                    <td class="Title"><a href="{{Details}}" target="_blank">{{Title}}</a> <span class="release-labels"></span></td>
+                    <td class="Title" style="word-break: break-all"><a href="{{Details}}" target="_blank">{{Title}}</a> <span class="release-labels"></span></td>
                     <td class="text-right">{{Size}}</td>
                     <td class="text-right fit">{{jacketSize Size}}</td>
                     <td class="text-center">{{Files}}</td>
-                    <td class="text-center Cat">{{CategoryDesc}}</td>
+                    <td class="text-center Cat" style="word-break: break-all">{{CategoryDesc}}</td>
                     <td class="text-center">{{Grabs}}</td>
                     <td class="text-center">{{Seeders}}</td>
                     <td class="text-center">{{Peers}}</td>
@@ -756,6 +756,6 @@
     </script>
 
     <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=2023010701"></script>
+    <script type="text/javascript" src="../custom.js?changed=2023041901"></script>
 </body>
 </html>

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

@@ -47,9 +47,9 @@ settings:
   - name: password
     type: password
     label: Password
-  - name: striprussian
+  - name: stripcyrillic
     type: checkbox
-    label: Strip Russian Letters
+    label: Strip Cyrillic Letters
     default: true
   - name: freeleech
     type: checkbox
@@ -91,13 +91,6 @@ search:
   paths:
     # https://tracker.0day.kiev.ua/browse.php?c10=1&c27=1&search=endgame&incldead=1&where=0
     - path: browse.php
-  keywordsfilters:
-    - name: diacritics
-      args: replace
-    - name: re_replace # S01 to Cезон 1
-      args: ["(?i)\\bS0*(\\d+)\\b", "езон $1"]
-    - name: re_replace # S01E01 to Сезон 1 Серии 1
-      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "езон $1 ерии $2"]
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
@@ -108,8 +101,19 @@ search:
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
 
+  keywordsfilters:
+    - name: diacritics
+      args: replace
+    - name: re_replace # S01 to Cезон 1
+      args: ["(?i)\\bS0*(\\d+)\\b", "езон $1"]
+    - name: re_replace # E01 to Серии 1
+      args: ["(?i)\\bE0*(\\d+)\\b", "ерии $1"]
+    - name: re_replace # S01E01 to Сезон 1 Серии 1
+      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "езон $1 ерии $2"]
+
   rows:
     selector: table > tbody > tr.rowtorrentinfo
+
   fields:
     category:
       selector: a[href^="browse.php?cat="]
@@ -123,22 +127,28 @@ search:
         # normalize to SXXEYY format
         - name: re_replace
           args: ["[\\:\\-\\/\\|]", " "]
-        - name: replace
-          args: ["Кураж Бамбей", "kurazh"]
-        - name: replace
-          args: ["Кубик в Кубе", "Kubik"]
-        - name: replace
-          args: ["Кравец", "Kravec"]
         - name: re_replace
-          args: ["(.*)\\([CСcс]езон\\s+(\\d+)\\)\\s+[CСcс]ери[ия]\\s+(\\d+)\\s+(\\d+)(.*)", "$1 S$2E$3-$4 rus $5"]
+          args: ["(?i)\\bКураж Бамбей\\b", "kurazh"]
         - name: re_replace
-          args: ["(.*)\\([CСcс]езон\\s+(\\d+)\\)(.*)", "$1 S$2 rus $3"]
+          args: ["(?i)\\bКубик в Кубе\\b", "Kubik"]
         - name: re_replace
-          args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
-        - name: replace
-          args: ["WEB DL", "WEBDL"]
-        - name: replace
-          args: ["WEBDLRip", "WEBDL"]
+          args: ["(?i)\\bКравец\\b", "Kravec"]
+        - name: re_replace
+          args: ["(?i)(.*)\\([CС]езон\\s+(\\d+)\\)\\s+[CС]ери[ия]\\s+(\\d+)\\s+(\\d+)(.*)", "$1 S$2E$3-$4 rus $5"]
+        - name: re_replace
+          args: ["(?i)(.*)\\([CС]езон\\s+(\\d+)\\)(.*)", "$1 S$2 rus $3"]
+        - name: re_replace
+          args: ["(\\([\\p{IsCyrillic}\\W]+\\))|(^[\\p{IsCyrillic}\\W\\d]+\\/ )|([\\p{IsCyrillic} \\-]+,+)|([\\p{IsCyrillic}]+)", "{{ if .Config.stripcyrillic }}{{ else }}$1$2$3$4{{ end }}"]
+        - name: re_replace
+          args: ["(?i)\\bHDTV\\s?Rip\\b", "HDTV"]
+        - name: re_replace
+          args: ["(?i)\\bSAT\\s?Rip\\b", "HDTV"]
+        - name: re_replace
+          args: ["(?i)\\bWEB\\s?DL\\s?Rip\\b", "WEBDL"]
+        - name: re_replace
+          args: ["(?i)\\bWEB Rip\\b", "WEBRip"]
+        - name: re_replace
+          args: ["(?i)\\bWEB DL\\b", "WEBDL"]
     details:
       selector: a[href^="details.php?id="]
       attribute: href
@@ -184,4 +194,6 @@ search:
       text: 1
     minimumratio:
       text: 0.2
+    description:
+      selector: a[href^="details.php?id="]
 # engine n/a

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

@@ -6,6 +6,10 @@ language: en-US
 type: public
 encoding: UTF-8
 links:
+  - https://0magnet.co/
+  - https://13mag.net/
+  - https://16mag.net/
+legacylinks:
   - https://0magnet.com/
   - https://9mag.net/
 

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

@@ -13,13 +13,11 @@ links:
   - https://x1337x.ws/
   - https://x1337x.eu/
   - https://x1337x.se/
-  - https://1337x.unblockit.boo/
-  - https://1337x.mrunblock.guru/
+  - https://1337x.unblockit.asia/
   - https://1337x.unblockninja.com/
 legacylinks:
   - https://1337x.is/
   - https://1337x.nocensor.work/
-  - https://1337x.unblockit.how/
   - https://1337x.unblockit.cam/
   - https://1337x.nocensor.biz/
   - https://1337x.gd/
@@ -39,6 +37,10 @@ legacylinks:
   - https://1337x.unblockit.ink/
   - https://1337x.nocensor.art/
   - https://1337x.unblockit.bio/
+  - https://1337x.unblockit.boo/
+  - https://1337x.mrunblock.guru/
+  - https://1337x.mrunblock.life/ # cloudflare 403
+  - https://1337x.unblockit.click/
 
 caps:
   categorymappings:

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

@@ -1,7 +1,7 @@
 ---
 id: 1ptbar
 name: 1ptbar
-description: "1ptbar is a CHINESE Private Torrent Tracker for Movies, TV, and e-Learning"
+description: "1ptbar is a CHINESE Private Torrent Tracker for MOVIES / TV / E-LEARNING"
 language: zh-CN
 type: private
 encoding: UTF-8
@@ -25,26 +25,28 @@ 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:
-  - name: cookie
+  - name: username
     type: text
-    label: Cookie
-  - name: info
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: 2facode
+    type: text
+    label: 2FA code
+  - name: info_2fa
     type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+    label: "About 2FA code"
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the 1ptbar Web Site. Otherwise just leave it empty."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
     default: false
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
   - name: sort
     type: select
     label: Sort requested from site
@@ -61,27 +63,47 @@ settings:
     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:
-  method: cookie
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
   inputs:
-    cookie: "{{ .Config.cookie }}"
+    secret: ""
+    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: torrents.php
+    path: index.php
+    selector: a[href="logout.php"]
 
 search:
   paths:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }} {{ else }}{{ .Keywords }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}"
     # 0 incldead, 1 active, 2 dead
     incldead: 0
     # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
     spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
     # 0 title, 1 descr, 3 uploader, 4 imdburl
-    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
-    # 0 AND, 1 OR, 2 exact
+    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 }}"
@@ -114,8 +136,13 @@ search:
       selector: img[data-src]
       attribute: data-src
     imdbid:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
+    doubanid:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
+      selector: a[href*="movie.douban.com/subject/"]
+      attribute: href
     date_elapsed:
       # time type: time elapsed (default)
       selector: td.rowfollow:nth-last-of-type(6) > span[title]
@@ -161,5 +188,5 @@ search:
         "*": 1
     description:
       selector: td:nth-child(2)
-      remove: a, img
-# NexusPHP v1.7.32 2022-12-05
+      remove: a, b, font, img, span
+# NexusPHP v1.8.2 2023-05-08

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

@@ -103,7 +103,6 @@ login:
     trackerssl: yes
   error:
     - selector: td.embedded:has(h2:contains("失败"))
-    - selector: td.embedded:has(h2:contains("Failed"))
   test:
     path: index.php
     selector: a[href="logout.php"]
@@ -213,5 +212,5 @@ search:
       text: 86400
     description:
       selector: td.rowfollow:nth-child(2)
-      remove: a, img
-# NexusPHP v1.8.0 2023-01-26
+      remove: a, b, font, img, span
+# NexusPHP v1.8.2 2023-05-08

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

@@ -1,7 +1,7 @@
 ---
 id: 3changtrai
 name: 3ChangTrai
-description: "3ChangTrai (3CT) is a VIETNAMESE Private Torrent Tracker for HD MOVIES / TV"
+description: "3ChangTrai (3CT) is a VIETNAMESE Private Torrent Tracker for HD MOVIES / TV / GENERAL"
 language: vi-VN
 type: private
 encoding: UTF-8
@@ -100,7 +100,6 @@ search:
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
     notnewword: 1
-    # does not return imdb link in results
 
   rows:
     selector: table.torrents > tbody > tr:has(table.torrentname)
@@ -126,7 +125,7 @@ search:
       selector: a[href^="download.php?id="]
       attribute: href
     poster:
-      selector: img.lazyload
+      selector: img[data-src]
       attribute: data-src
     imdbid:
       selector: a[href*="imdb.com/title/tt"]
@@ -174,7 +173,10 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
     description:
-      selector: td:nth-child(2)
-      remove: a, img
-# NexusPHP v3.0 2020-04-30
+      selector: td:nth-child(3)
+      remove: a, b, font, img, span
+# NexusPHP 3ChangTrai v3.0 2020-04-30

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

@@ -104,6 +104,9 @@ search:
       filters:
         - name: querystring
           args: category
+        - name: re_replace
+          args: ["(\\b0\\b)", "31"]
+
     title:
       selector: a[href^="index.php?page=torrent-details&id="]
     details:

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

@@ -40,10 +40,6 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
   - name: sort
     type: select
     label: Sort requested from site
@@ -96,6 +92,12 @@ search:
     selector: table.torrents > tbody > tr:has(table.torrentname)
 
   fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
     title_default:
       selector: a[href^="details.php?id="]
     title:
@@ -103,12 +105,6 @@ 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
@@ -158,12 +154,12 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
-    description:
-      selector: td:nth-child(2)
-      remove: a, img
     minimumratio:
       text: 1
     minimumseedtime:
       # 1 day (as seconds = 24 x 60 x 60)
       text: 86400
+    description:
+      selector: td:nth-child(2)
+      remove: a, b, font, img, span
 # NexusPHP Standard v1.5 Beta 4

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

@@ -35,7 +35,7 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://acervos.cc/\" target =_blank>Acervos</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://acervos.cc/\" target=\"_blank\">Acervos</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only

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

@@ -35,7 +35,7 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://aither.cc/\" target =_blank>Aither</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://aither.cc/\" target=\"_blank\">Aither</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only

src/Jackett.Common/Definitions/amigosshare.yml

@@ -178,6 +178,9 @@ search:
     _quality:
       selector: div.list-group-item-content p.m-0 span.badge-primary:contains("1080p"), div.list-group-item-content p.m-0 span.badge-primary:contains("720p"), div.list-group-item-content p.m-0 span.badge-primary:contains("4k")
       optional: true
+      filters:
+        - name: replace
+          args: ["4k", "2160p"]
     _year:
       selector: div.list-group-item-content p.m-0 span.badge-primary[style$="#246AB6;"]
       optional: true

src/Jackett.Common/Definitions/anilibria.yml

@@ -19,11 +19,11 @@ caps:
     movie-search: [q]
 
 settings:
-  - name: striprussian
+  - name: stripcyrillic
     type: checkbox
-    label: Strip Russian
+    label: Strip Cyrillic Letters
     default: false
-  - name: addrussian
+  - name: addrussiantotitle
     type: checkbox
     label: Add RUS to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
     default: false
@@ -41,9 +41,9 @@ search:
     limit: 100
 
   keywordsfilters:
-    # strip season and ep
+    # strip season and/or ep
     - name: re_replace
-      args: ["(?i)(?:[SE]?\\d{1,4}){1,2}$", ""]
+      args: ["(?i)\\b(?:[SE]\\d{1,4}){1,2}\\b\\s?", ""]
 
   rows:
     selector: list
@@ -65,9 +65,11 @@ search:
       optional: true
       filters:
         - name: re_replace
-          args: ["([А-Яа-яЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1{{ end }}"]
+          args: ["(\\([\\p{IsCyrillic}\\W]+\\))|(^[\\p{IsCyrillic}\\W\\d]+\\/ )|([\\p{IsCyrillic} \\-]+,+)|([\\p{IsCyrillic}]+)", "{{ if .Config.stripcyrillic }}{{ else }}$1$2$3$4{{ end }}"]
         - name: re_replace
-          args: ["^[\\.\\s\\d,\\-—:]+", ""]
+          args: ["[\\[\\(\\{<«][\\s\\W]*[\\]\\)\\}>»]", ""]
+        - name: re_replace
+          args: ["^[\\s&,\\.!\\?\\+\\-_\\|\\/':]+", ""]
         - name: re_replace
           args: ["^OVA$", ""]
     year:
@@ -75,14 +77,14 @@ search:
     _quality:
       selector: quality.string
     title:
-      text: "{{ if .Config.striprussian }}{{ 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 }}"
+      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: [" - \\bEOVA\\b", " - OVA"]
         - name: append
-          args: "{{ if .Config.addrussian }} - RUS{{ else }}{{ end }}"
+          args: "{{ if .Config.addrussiantotitle }} - RUS{{ else }}{{ end }}"
     _code:
       selector: ..code
     details:

src/Jackett.Common/Definitions/animetracker.yml

@@ -37,7 +37,7 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://animetracker.cc/\" target =_blank>AnimeTracker</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://animetracker.cc/\" target=\"_blank\">AnimeTracker</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only

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

@@ -40,7 +40,7 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://animeworld.cx/\" target =_blank>AnimeWorld</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://animeworld.cx/\" target=\"_blank\">AnimeWorld</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only

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

@@ -31,7 +31,7 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Key by accessing your <a href=\"https://anthelion.me/\" target =_blank>Anthelion</a> account <i>Settings</i> page and scrolling down to the <b>API Key</b> section.<br>Tick the <b>Search</b> and <b>Download</b> checkboxes and click the <b>save profile</b> button to generate the key."
+    default: "Find or Generate a new API Key by accessing your <a href=\"https://anthelion.me/\" target=\"_blank\">Anthelion</a> account <i>Settings</i> page and scrolling down to the <b>API Key</b> section.<br>Tick the <b>Search</b> and <b>Download</b> checkboxes and click the <b>save profile</b> button to generate the key."
 
 login:
   path: api.php

src/Jackett.Common/Definitions/arenabg.yml

@@ -5,8 +5,6 @@ description: "ArenaBG is a BULGARIAN Semi-Private Torrent Tracker for 0DAY / GEN
 language: bg-BG
 type: semi-private
 encoding: UTF-8
-certificates:
-  - d5d96eaf33f4b7470a7009f1e591a45f6af0430d # expired 15 Oct 2022
 links:
   - https://arenabg.com/
 legacylinks:

src/Jackett.Common/Definitions/audiences.yml

@@ -41,10 +41,6 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
   - name: sort
     type: select
     label: Sort requested from site
@@ -61,6 +57,10 @@ settings:
     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:
   method: cookie

src/Jackett.Common/Definitions/backups.yml

@@ -22,6 +22,7 @@ caps:
     - {id: 65, cat: Console, desc: "CoinOps Unofficial"}
     - {id: 63, cat: Books/Comics, desc: "Comics"}
     - {id: 60, cat: Console, desc: "Core"}
+    - {id: 72, cat: Console, desc: "CORE Community"}
     - {id: 44, cat: Console, desc: "CP78"}
     - {id: 16, cat: TV/Documentary, desc: "Docu"}
     - {id: 41, cat: Console, desc: "Dragon"}

src/Jackett.Common/Definitions/badasstorrents.yml

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

src/Jackett.Common/Definitions/beitai.yml

@@ -163,5 +163,5 @@ search:
         "*": 1
     description:
       selector: td:nth-child(2)
-      remove: a, img
+      remove: a, b, font, img, span
 # NexusPHP Standard v1.5 Beta 4

src/Jackett.Common/Definitions/bestcore.yml

@@ -124,11 +124,10 @@ search:
 
   fields:
     category:
-      text: 38
-    category|noappend:
       selector: a[href^="browse.php?cat="]
       attribute: href
       optional: true
+      default: 38
       filters:
         - name: querystring
           args: cat

src/Jackett.Common/Definitions/bigfangroup.yml

@@ -63,9 +63,13 @@ caps:
     book-search: [q]
 
 settings:
-  - name: striprussian
+  - name: stripcyrillic
     type: checkbox
-    label: Strip Russian Letters
+    label: Strip Cyrillic Letters
+    default: false
+  - name: addrussiantotitle
+    type: checkbox
+    label: Add RUS to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
     default: false
   - name: sort
     type: select
@@ -99,10 +103,13 @@ search:
     s: "{{ .Config.sort }}"
     d: "{{ .Config.type }}"
 
+  keywordsfilters:
+    # strip season and/or ep
+    - name: re_replace
+      args: ["(?i)\\b(?:[SE]\\d{1,4}){1,2}\\b\\s?", ""]
+
   rows:
     selector: table > tbody#highlighted > tr:has(a[href^="browse.php?cat="])
-    filters:
-      - name: andmatch
 
   fields:
     category:
@@ -116,25 +123,57 @@ search:
       filters:
         # normalize to SXXEYY format
         - name: re_replace
-          args: ["[\\.\\,\\:\\-\\/\\|]", " "]
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)", "S$1E$2 of $3"]
         - name: re_replace
-          args: ["(.*)[CСcс]езон\\s+(\\d+).+[CСcс]ери[ия]\\s+(\\d+)\\s+(\\d+)\\s+из\\s+\\d+(.*)", "$1 S$2E$3-$4 rus $5"]
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езоны?.+?(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))?", "S$1E$2 of $3"]
         - name: re_replace
-          args: ["(.*)[CСcс]езон\\s+(\\d+).+[CСcс]ери[ия]\\s+(\\d+)\\s+из\\s+\\d+(.*)", "$1 S$2E$3 rus $4"]
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езоны?.+?(\\d+(?:-\\d+)?)\\s*(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))\\s+из\\s*(\\w?)", "S$1E$2 of $3"]
         - name: re_replace
-          args: ["(.*)[CСcс]езон\\s+(\\d+)(.*)", "$1 S$2 rus $3"]
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))?", "S$1E$2 of $3"]
         - name: re_replace
-          args: ["(.*)[CСcс]]ери[ия]\\s+(\\d+)(.*)", "$1 E$2 rus $3"]
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)\\s*(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))\\s+из\\s*(\\w?)", "S$1E$2 of $3"]
         - name: re_replace
-          args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
-        - name: replace
-          args: ["WEBRip", "WEBDL"]
-        - name: replace
-          args: ["WEB DL", "WEBDL"]
-        - name: replace
-          args: ["WEBDLRip", "WEBDL"]
-        - name: replace
-          args: ["HDTVRip", "HDTV"]
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езоны?.+?(\\d+(?:-\\d+)?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?)", "S$1"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s+[CС]езоны?", "S$1"]
+        - name: re_replace
+          args: ["(?i)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)", "E$1 of $2"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "E$1 of $2"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s+(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))\\s+из\\s*(\\w?)", "E$1 of $2"]
+        - name: re_replace
+          args: ["(?i)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)", "E$1"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s+(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "E$1"]
+        - name: re_replace
+          args: ["(?i)\\s\\|\\sот\\s([\\w\\p{P}\\p{S}]+)$", "-$1"]
+        - name: re_replace
+          args: ["\\s\\|\\s(\\w{4,})$", "-$1"]
+        - name: re_replace
+          args: ["(\\([\\p{IsCyrillic}\\W]+\\))|(^[\\p{IsCyrillic}\\W\\d]+\\/ )|([\\p{IsCyrillic} \\-]+,+)|([\\p{IsCyrillic}]+)", "{{ if .Config.stripcyrillic }}{{ else }}$1$2$3$4{{ end }}"]
+        - name: re_replace
+          args: ["(?i)\\bHDTV[-\\s]?Rip\\b", "HDTV"]
+        - name: re_replace
+          args: ["(?i)\\bSAT[-\\s]?Rip\\b", "HDTV"]
+        - name: re_replace
+          args: ["(?i)\\bWEB[-\\s]?DL[-\\s]?Rip\\b", "WEB-DL"]
+        - name: re_replace
+          args: ["(?i)\\bWEB\\sRip\\b", "WEBRip"]
+        - name: re_replace
+          args: ["(?i)\\bWEB\\sDL\\b", "WEB-DL"]
+        - name: re_replace
+          args: ["[\\[\\(\\{<«][\\s\\W]*[\\]\\)\\}>»]", ""]
+        - name: re_replace
+          args: ["^[\\s&,\\.!\\?\\+\\-_\\|\\/':]+", ""]
+        - name: append
+          args: "{{ if .Config.addrussiantotitle }} RUS{{ else }}{{ end }}"
     details:
       selector: a[href^="details.php?id="]
       attribute: href
@@ -188,4 +227,6 @@ search:
       text: 0
     uploadvolumefactor:
       text: 1
+    description:
+      selector: a[href^="details.php?id="]
 # engine n/a

src/Jackett.Common/Definitions/bitbazis.yml

@@ -94,7 +94,7 @@ login:
     cookie: "{{ .Config.cookie }}"
   test:
     path: index.php
-    selector: i[onclick^="window.open('logout.php?k="]
+    selector: li[onclick^="window.open('logout.php?k="]
 
 search:
   paths:

src/Jackett.Common/Definitions/bitru.yml

@@ -31,13 +31,13 @@ caps:
     book-search: [q]
 
 settings:
-  - name: striprussian
+  - name: stripcyrillic
     type: checkbox
     label: Strip Russian Letters
     default: false
-  - name: addrussian
+  - name: addrussiantotitle
     type: checkbox
-    label: Add RUSSIAN to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
+    label: Add RUS to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
     default: false
   - name: adverts
     type: checkbox
@@ -58,7 +58,8 @@ search:
   inputs:
     s: "{{ .Keywords }}"
     sort: "{{ re_replace .Config.sort \"_\" \"\" }}"
-    $raw: "{{ if .Config.adverts }}{{ else }}&rek=no{{ end}}"
+    rek: "{{ if .Config.adverts }}{{ else }}no{{ end }}"
+
   keywordsfilters:
     - name: re_replace # S01 or S01E01 to 1 сезон
       args: ["(?i)\\bS0*(\\d+)(?:E0*(\\d+))?\\b", "$1 сезон"]
@@ -76,28 +77,44 @@ search:
     title:
       selector: a[href^="details.php?id="]
       filters:
-        - name: replace
-          args: ["селезень", "selezen"]
         - name: re_replace
-          args: ["(?:(\\d+-*\\d*)\\s+[Сс]езоны?:?)\\s+\\((\\d+-*\\d*).*[?\\d]+\\)(.*)(\\((?:[12][0-9]{3}-?){1,}\\))(.*)", "$3 - S$1E$2 - $4 $5"]
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s+[CС]езоны?\\s*[:]*.+?\\((\\d+(?:-\\d+)?)\\s*из\\s*(\\d+)\\)", "(S$1E$2 of $3)"]
         - name: re_replace
-          args: ["\\((\\d+-*\\d*).*[?\\d]+\\)(.*)(\\((?:[12][0-9]{3}-?){1,}\\))(.*)", "$2 - E$1 - $3 $4"]
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s+[CС]езоны?\\s*[:]*.+?\\((\\d+(?:-\\d+)?)\\)", "(S$1E$2)"]
         - name: re_replace
-          args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$0{{ end }}"]
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s+[CС]езоны?", "(S$1)"]
         - name: re_replace
-          args: ["[!?.,:|\\[\\]\\/]", " "]
+          args: ["(?i)\\((\\d+(?:-\\d+)?)\\s*из\\s*(\\d+)\\)", "(E$1 of $2)"]
         - name: re_replace
-          args: ["^\\s+-\\s+", " "]
+          args: ["(?i)\\bселезень\\b", "selezen"]
+        - name: re_replace
+          args: ["(?i)\\bFiles-х\\b", "Files-x"]
+        - name: re_replace
+          args: ["(?i)\\s\\|\\sот\\s([\\w\\p{P}\\p{S}]+)$", "-$1"]
+        - name: re_replace
+          args: ["\\s\\|\\s(\\w{4,})$", "-$1"]
+        - name: re_replace
+          args: ["(\\([\\p{IsCyrillic}\\W]+\\))|(^[\\p{IsCyrillic}\\W\\d]+\\/ )|([\\p{IsCyrillic} \\-]+,+)|([\\p{IsCyrillic}]+)", "{{ if .Config.stripcyrillic }}{{ else }}$1$2$3$4{{ end }}"]
+        - name: re_replace
+          args: ["(?i)\\bHDTV[-\\s]?Rip\\b", "HDTV"]
+        - name: re_replace
+          args: ["(?i)\\bSAT[-\\s]?Rip\\b", "HDTV"]
+        - name: re_replace
+          args: ["(?i)\\bWEB[-\\s]?DL[-\\s]?Rip\\b", "WEB-DL"]
+        - name: re_replace
+          args: ["(?i)\\bWEB\\sRip\\b", "WEBRip"]
+        - name: re_replace
+          args: ["(?i)\\bWEB\\sDL\\b", "WEB-DL"]
+        - name: re_replace
+          args: ["[\\[\\(\\{<«][\\s\\W]*[\\]\\)\\}>»]", ""]
+        - name: re_replace
+          args: ["^[\\s&,\\.!\\?\\+\\-_\\|\\/':]+", ""]
+        - name: re_replace
+          args: ["(?i)^\\(\\s*([SE]\\d+.*?)\\s*\\)[\\s\\/\\|]*(.+)(-[\\w\\p{P}\\p{S}]*)$", "$2 $1$3"]
+        - name: re_replace
+          args: ["(?i)^\\(\\s*([SE]\\d+.*?)\\s*\\)[\\s\\/\\|]*(.+)", "$2 $1"]
         - name: append
-          args: "{{ if .Config.addrussian }} - RUSSIAN{{ else }}{{ end }}"
-        - name: replace
-          args: ["-Rip", "Rip"]
-        - name: replace
-          args: ["WEB-DL", "WEBDL"]
-        - name: replace
-          args: ["WEBDLRip", "WEBDL"]
-        - name: replace
-          args: ["HDTVRip", "HDTV"]
+          args: "{{ if .Config.addrussiantotitle }} RUS{{ else }}{{ end }}"
     details:
       selector: a[href^="details.php?id="]
       attribute: href

src/Jackett.Common/Definitions/bitsearch.yml

@@ -5,14 +5,16 @@ description: "BitSearch is a Public torrent meta-search engine"
 language: en-US
 type: public
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://bitsearch.to/
-  - https://bitsearch.mrunblock.guru/
+  - https://bitsearch.mrunblock.life/
 legacylinks:
   - https://bitsearch.nocensor.biz/
   - https://bitsearch.nocensor.sbs/
   - https://bitsearch.nocensor.world/
   - https://bitsearch.nocensor.lol/
+  - https://bitsearch.mrunblock.guru/
 
 caps:
   categories:
@@ -77,6 +79,7 @@ search:
     q: "{{ .Keywords }}"
     sort: "{{ .Config.sort }}"
     order: "{{ .Config.type }}"
+    limit: 100
 
   keywordsfilters:
     - name: re_replace

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

@@ -29,7 +29,7 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://blutopia.cc/\" target =_blank>Blutopia</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://blutopia.cc/\" target=\"_blank\">Blutopia</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -83,7 +83,6 @@ search:
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
-    page: 1
 
   keywordsfilters:
     - name: re_replace
@@ -92,8 +91,6 @@ search:
   rows:
     selector: data
     attribute: attributes
-    count:
-      selector: meta.total
 
   fields:
     category:
@@ -168,4 +165,4 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 6.5.0b
+# json UNIT3D 7.0.0b

src/Jackett.Common/Definitions/boxingtorrents.yml

@@ -26,6 +26,7 @@ caps:
     - {id: 4, cat: TV/Sport, desc: "Full - Poor"}
     - {id: 14, cat: TV/Sport, desc: "HD"}
     - {id: 7, cat: TV/Sport, desc: "Misc"}
+    - {id: 18, cat: TV/Sport, desc: "Instructional"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/broadcity.yml

@@ -50,6 +50,10 @@ settings:
     type: info
     label: How to get the Cookie
     default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: freeleech
+    type: checkbox
+    label: Filter freeleech only
+    default: false
 
 login:
   method: cookie
@@ -81,7 +85,7 @@ search:
     include_dead_torrents: yes
 
   rows:
-    selector: table#sortabletable tbody tr:has(div[id^="port-target-"])
+    selector: "table#sortabletable tbody tr:has(div[id^=\"port-target-\"]){{ if .Config.freeleech }}:has(img[src$=\"/freedownload.gif\"]){{ else }}{{ end }}"
 
   fields:
     category:

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

@@ -30,7 +30,7 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://brsociety.club/\" target =_blank>BrSociety</a> account <i>My 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://brsociety.club/\" target=\"_blank\">BrSociety</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only

src/Jackett.Common/Definitions/bt4g.yml

@@ -1,77 +0,0 @@
----
-id: bt4g
-name: BT4G
-description: "BT4G is a Public metadata crawler for magnets"
-language: en-US
-type: public
-encoding: UTF-8
-links:
-  - https://bt4g.org/
-
-caps:
-  categories:
-    Application: PC
-    Archive file: Other
-    Audio: Audio
-    Doc: Books
-    Other: Other
-    Video: Movies
-    TV: TV # dummy cat to allow both Movies,TV to be categorised when Video is found.
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings: []
-
-search:
-  paths:
-    # https://bt4g.org/search/2021
-    # site does not support cat search
-    - path: "search/{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
-
-  rows:
-    selector: div.row > div.col > div:has(h5)
-
-  fields:
-    title:
-      selector: a
-    category:
-      selector: span.cpill
-    category|append:
-      # add tv to video
-      optional: true
-      selector: span.cpill
-      filters:
-        - name: replace
-          args: ["Video", "TV"]
-    details:
-      selector: a
-      attribute: href
-    infohash:
-      selector: a
-      attribute: href
-      filters:
-        - name: replace
-          args: ["/magnet/", ""]
-    date:
-      selector: span:nth-last-child(5) b
-      filters:
-        - name: dateparse
-          args: "yyyy-MM-dd"
-    files:
-      selector: span:nth-last-child(4) b
-    size:
-      selector: span:nth-last-child(3) b
-    seeders:
-      selector: span:nth-last-child(2) b
-    leechers:
-      selector: span:nth-last-child(1) b
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/btdigg.yml

@@ -14,6 +14,7 @@ legacylinks:
   - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.onion.pet/ # not found
   - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.onion.ly/ # 504 gateway timeout
   - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.tor2web.to/ # 504 gateway timeout
+  - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.tor2web.link/ # Origin is unreachable Error code 523
 
 caps:
   categories:

src/Jackett.Common/Definitions/btschool.yml

@@ -150,5 +150,5 @@ search:
       text: 1.0
     description:
       selector: td:nth-child(2)
-      remove: a, img
+      remove: a, b, font, img, span
 # NexusPHP Standard v1.5 Beta 4

src/Jackett.Common/Definitions/btsow.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 # use https://tellme.pw/btsow to find the new domain
 links:
-  - https://btsow.boats/
+  - https://btsow.hair/
 legacylinks:
   - https://btsow.surf/
   - https://btsow.com/
@@ -25,6 +25,7 @@ legacylinks:
   - https://btsow.autos/
   - https://btsow.beauty/
   - https://btsow.mom/
+  - https://btsow.boats/
 
 caps:
   categories:

src/Jackett.Common/Definitions/bulltorrent.yml

@@ -7,13 +7,14 @@ type: public
 encoding: UTF-8
 links:
   - https://www.bulltorrent.com/
-  - https://toros.mrunblock.guru/
 legacylinks:
   - https://toros.nocensor.space/
   - https://toros.nocensor.work/
   - https://www.toros.co/
   - https://toros.nocensor.biz/
   - https://toros.nocensor.lol/
+  - https://toros.mrunblock.guru/
+  - https://toros.mrunblock.life/ # Gateway time-out Error code 504
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/byrbt.yml

@@ -38,10 +38,6 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
   - name: sort
     type: select
     label: Sort requested from site
@@ -58,6 +54,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
 
 login:
   path: login.php
@@ -76,8 +76,6 @@ login:
     trackerssl: yes
   error:
     - selector: td.embedded:has(h2:contains("失败"))
-    - selector: td.embedded:has(h2:contains("failed!"))
-    - selector: td.embedded:has(h2:contains("Failed"))
   test:
     path: index.php
     selector: a[href^="logout.php?key="]
@@ -169,12 +167,12 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
-    description:
-      selector: td:nth-child(2)
-      remove: a, img
     minimumratio:
       text: 1.0
     minimumseedtime:
       # 1 day (as seconds = 1 x 24 x 60 x 60)
       text: 86400
+    description:
+      selector: td:nth-child(2)
+      remove: a, b, font, img, span
 # NexusPHP v1.5 beta 5 20120707

src/Jackett.Common/Definitions/byrutor.yml

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

src/Jackett.Common/Definitions/carpt.yml

@@ -188,5 +188,5 @@ search:
       text: 86400
     description:
       selector: td.rowfollow:nth-child(2)
-      remove: a, img
-# NexusPHP v1.7.31 2022-11-14
+      remove: a, b, font, img, span
+# NexusPHP v1.7.37 2023-05-08

src/Jackett.Common/Definitions/ceskeforum.yml

@@ -41,10 +41,6 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
   - name: sort
     type: select
     label: Sort requested from site
@@ -61,6 +57,10 @@ settings:
     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
@@ -170,7 +170,7 @@ search:
         "*": 1
     description:
       selector: td.rowfollow:nth-child(2)
-      remove: a, img
+      remove: a, b, font, img, span
     genre:
       selector: table.torrentname > tbody > tr > td:first-child
       remove: a

src/Jackett.Common/Definitions/chdbits.yml

@@ -165,5 +165,5 @@ search:
         "*": 1
     description:
       selector: td:nth-child(2)
-      remove: a, img
+      remove: a, b, font, img, span
 # NexusPHP Standard v1.5 Beta 4

src/Jackett.Common/Definitions/cpasbienclone.yml

@@ -31,6 +31,7 @@ caps:
     search: [q]
     tv-search: [q, season, ep]
     movie-search: [q]
+  allowrawsearch: true
 
 settings:
   - name: info_8000

src/Jackett.Common/Definitions/cpasbiensi.yml

@@ -1,101 +0,0 @@
----
-id: cpasbiensi
-name: cpasbien.si
-description: "cpasbien.si is a FRENCH Public site for TV / MOVIES / GENERAL"
-language: fr-FR
-type: public
-encoding: UTF-8
-links:
-  - https://www.cpasbien.si/
-
-caps:
-  categories:
-    Other: Other
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-
-settings:
-  - name: info_8000
-    type: info
-    label: About cpasbiensi Categories
-    default: cpasbiensi does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
-  - name: multilang
-    type: checkbox
-    label: Replace MULTi by another language in release name
-    default: false
-  - name: multilanguage
-    type: select
-    label: Replace MULTi by this language
-    default: FRENCH
-    options:
-      FRENCH: FRENCH
-      MULTi FRENCH: MULTi FRENCH
-      ENGLISH: ENGLISH
-      MULTi ENGLISH: MULTi ENGLISH
-      VOSTFR: VOSTFR
-      MULTi VOSTFR: MULTi VOSTFR
-  - name: vostfr
-    type: checkbox
-    label: Replace VOSTFR and SUBFRENCH with ENGLISH
-    default: false
-
-download:
-  selectors:
-    - selector: a[href^="/get_torrents/"]
-      attribute: href
-
-search:
-  paths:
-    - path: "{{ if .Keywords }}recherche/{{ .Keywords }}{{ else }}{{ end }}"
-
-  rows:
-    selector: table.table-corps > tbody > tr:has(a)
-
-  fields:
-    category:
-      text: Other
-    title_phase1:
-      selector: a
-      filters:
-        - name: re_replace
-          args: ["(?i)\\b(FRENCH|MULTI|TRUEFRENCH|VOSTFR|SUBFRENCH)\\b(.+?)(\\b(19|20\\d{2})\\b)$", "$3 $1$2"]
-    title_vostfr:
-      text: "{{ .Result.title_phase1 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)\\b(vostfr|subfrench)\\b", "ENGLISH"]
-    title_phase2:
-      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
-    title_multilang:
-      text: "{{ .Result.title_phase2 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)\\b(MULTI(?!.*(?:FRENCH|ENGLISH|VOSTFR)))\\b", "{{ .Config.multilanguage }}"]
-    title:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
-    details:
-      selector: a
-      attribute: href
-    download:
-      selector: a
-      attribute: href
-    size:
-      selector: div.poid
-    date:
-      text: now
-    seeders:
-      selector: div.up
-      optional: true
-      default: 0
-    leechers:
-      selector: div.down
-      optional: true
-      default: 0
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/crackingpatching.yml

@@ -64,11 +64,10 @@ search:
 
   fields:
     category:
-      text: other
-    category|noappend:
       selector: article.post-entry
       attribute: class
       optional: true
+      default: other
       filters:
         - name: regexp
           args: "category-(.+?) "

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

@@ -36,14 +36,14 @@ settings:
   - name: info_apikey
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://danishbytes.club/\" target =_blank>DanishBytes</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://danishbytes.club/\" target=\"_blank\">DanishBytes</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
   - name: rsskey
     type: text
     label: RSSKey
   - name: info_rsskey
     type: info
     label: About your RSS key
-    default: "Find or Generate a new RSS key by accessing your <a href=\"https://danishbytes.club/\" target =_blank>DanishBytes</a> account <i>My Security</i> page and clicking on the <b>RSS Key (RID)</b> tab."
+    default: "Find or Generate a new RSS key by accessing your <a href=\"https://danishbytes.club/\" target=\"_blank\">DanishBytes</a> account <i>My Security</i> page and clicking on the <b>RSS Key (RID)</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only

src/Jackett.Common/Definitions/dariustracker.yml

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

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

@@ -0,0 +1,202 @@
+---
+id: dark-shadow
+name: Dark-Shadow
+description: "Dark-Shadow is a GERMAN Private site for TV / MOVIES / GENERAL"
+language: de-DE
+type: private
+encoding: UTF-8
+links:
+  - https://projekt.dark-shadow.me/
+legacylinks:
+  - https://dark-shadow.ml/
+  - https://dark-shadow.me/
+
+caps:
+  categorymappings:
+    # Movie
+    - {id: 28, cat: Movies/SD, desc: "Filme SD"}
+    - {id: 32, cat: Movies/HD, desc: "Filme HD"}
+    - {id: 114, cat: Movies/UHD, desc: "Filme UHD"}
+    - {id: 140, cat: Movies/BluRay, desc: "Filme BluRay"}
+    - {id: 138, cat: Movies, desc: "Filme Pack`s"}
+    # Serien
+    - {id: 60, cat: TV/SD, desc: "Serien SD"}
+    - {id: 57, cat: TV/HD, desc: "Serien HD"}
+    - {id: 139, cat: TV/UHD, desc: "Serien UHD"}
+    - {id: 59, cat: TV, desc: "Serien Pack`s"}
+    # Audio
+    - {id: 110, cat: Audio/MP3, desc: "Audio MP3"}
+    - {id: 48, cat: Audio/Lossless, desc: "Audio Flac"}
+    - {id: 52, cat: Audio, desc: "Audio Pack"}
+    - {id: 63, cat: Audio/Audiobook, desc: "Audio Hörbuch"}
+    - {id: 120, cat: Audio/Video, desc: "Audio Videos"}
+    # Apps
+    - {id: 12, cat: PC/0day, desc: "Apps Windows"}
+    - {id: 125, cat: PC/Mac, desc: "Apps Mac-OSX"}
+    - {id: 11, cat: PC/Mobile-Other, desc: "Apps Mobil"}
+    - {id: 141, cat: PC/ISO, desc: "Apps Other"}
+    # Doku
+    - {id: 15, cat: TV/Documentary, desc: "Doku SD"}
+    - {id: 14, cat: TV/Documentary, desc: "Doku HD"}
+    - {id: 123, cat: TV/Documentary, desc: "Doku Reihe"}
+    # Spiel
+    - {id: 126, cat: Console/Other, desc: "Spiel Mobil"}
+    - {id: 17, cat: PC/Games, desc: "Spiel PC"}
+    - {id: 24, cat: Console, desc: "Spiel Konsole"}
+    - {id: 121, cat: Console, desc: "Spiel Wimmelbild"}
+    # Sport
+    - {id: 61, cat: TV/Sport, desc: "Sport HD"}
+    - {id: 62, cat: TV/Sport, desc: "Sport SD"}
+    # ePaper
+    - {id: 96, cat: Books/Mags, desc: "ePaper Zeitungen"}
+    - {id: 136, cat: Books/EBook, desc: "ePaper E-Book"}
+    - {id: 137, cat: Books/Comics, desc: "ePaper Comics"}
+    # XXX
+    - {id: 76, cat: XXX/XviD, desc: "XXX SD"}
+    - {id: 73, cat: XXX/x264, desc: "XXX HD"}
+    - {id: 75, cat: XXX/Pack, desc: "XXX Pack"}
+    - {id: 142, cat: XXX/ImageSet, desc: "XXX Pic´s"}
+    #  Internal
+    - {id: 129, cat: Movies/SD, desc: "Internal Film SD"}
+    - {id: 128, cat: Movies/HD, desc: "Internal Film HD"}
+    - {id: 131, cat: TV/SD, desc: "Internal Serie SD"}
+    - {id: 130, cat: TV/HD, desc: "Internal Serien HD"}
+    - {id: 132, cat: Other, desc: "Internal Sonstiges"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Filter freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: added
+    options:
+      added: created
+      seeds: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: login.php
+  method: form
+  form: form[action="/login.php"]
+  cookies: ["JAVA=OK"] # avoid jscheck redirect
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: div#login_error
+  test:
+    path: selection.php
+
+search:
+  paths:
+    - path: selection.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # 0 name, 1 descr, 2 both
+    blah: 0
+    orderby: "{{ .Config.sort }}"
+    sort: "{{ .Config.type }}"
+  keywordsfilters:
+    # prefix and postfix percent wildcard as well as replacing spaces between words
+    - name: re_replace
+      args: ["\\W+", "%"]
+    - name: re_replace
+      args: ["^(.+)$", "%$1%"]
+
+  rows:
+    selector: "div.selection_wrap{{ if .Config.freeleech }}:root:has(div.onlyup){{ else }}{{ end }}"
+
+  fields:
+    category_p1:
+      selector: div.kat_cat_pic_name
+    category_p2:
+      selector: div.kat_cat_pic_name_b
+    categorydesc:
+      text: "{{ .Result.category_p1 }} {{ .Result.category_p2 }}"
+    title:
+      selector: a.selection_a
+      filters:
+        # remove [REQ] and anything else in [] that prefixes titles
+        - name: re_replace
+          args: ["^(\\[.*\\])(.*)", "$2"]
+    details:
+      selector: a.selection_a
+      attribute: href
+    download:
+      selector: a[href^="download_ssl.php?torrent="]
+      attribute: href
+    poster:
+      selector: div[id^="details"] img
+      attribute: src
+    size:
+      selector: div.selection_unter_ad
+    grabs:
+      selector: div.selection_unter_ae
+    date_day:
+      # Heute 13:30:04
+      # Gestern 09:10:10
+      selector: div.selection_unter_ab:not(:contains("."))
+      optional: true
+      filters:
+        - name: replace
+          args: ["Heute", "Today"]
+        - name: replace
+          args: ["Gestern", "Yesterday"]
+        - name: append
+          args: " +01:00" # CET
+    date_year:
+      # 30.02.2018 um 23:12:50
+      selector: div.selection_unter_ab:contains(".")
+      optional: true
+      filters:
+        - name: replace
+          args: [" um", ""]
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "dd.MM.yyyy HH:mm:ss zzz"
+    date:
+      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+    description:
+      selector: selection_unter_af
+    seeders:
+      selector: div.selection_unter_aa
+    leechers:
+      selector: div.selection_unter_aaa
+    downloadvolumefactor:
+      case:
+        ":root:has(div.onlyup)": 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 36 hours (as seconds = 36 x 60 x 60)
+      text: 129600
+# 3xT

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

@@ -36,7 +36,7 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://datascene.xyz/\" target =_blank>DataScene</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://datascene.xyz/\" target=\"_blank\">DataScene</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -111,6 +111,8 @@ search:
       selector: details_link
     download:
       selector: download_link
+    infohash:
+      selector: info_hash
     poster:
       selector: meta.poster
       filters:

src/Jackett.Common/Definitions/deildu.yml

@@ -118,7 +118,7 @@ search:
         - name: dateparse
           args: "yyyy-MM-ddHH:mm:ss zzz"
     downloadvolumefactor:
-      text: 1
+      text: 0
     uploadvolumefactor:
       text: 1
 # engine n/a

src/Jackett.Common/Definitions/demonoid.yml

@@ -10,13 +10,11 @@ links:
   - https://www.demonoid.is/
   - https://www.dnoid.to/
   - https://www.dnoid.pw/
-  - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.ly/
-  - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.tor2web.to/
-  - https://demonoid.unblockit.boo/
-  - https://demonoid.torrentbay.to/
-  - https://demonoid.mrunblock.guru/
+  - https://demonoid.unblockit.asia/
+  - https://demonoid.torrentbay.net/
+  - https://demonoid.mrunblock.life/
+  - https://demonoid.nocensor.click/
 legacylinks:
-  - https://demonoid.unblockit.how/
   - https://demonoid.unblockit.cam/
   - https://demonoid.nocensor.biz/
   - https://demonoid.unblockit.day/
@@ -37,6 +35,13 @@ legacylinks:
   - https://demonoid.unblockit.ink/
   - https://demonoid.nocensor.art/
   - https://demonoid.unblockit.bio/
+  - https://demonoid.unblockit.boo/
+  - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.ly/
+  - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.tor2web.to/
+  - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.tor2web.link/ # Origin is unreachable Error code 523
+  - https://demonoid.mrunblock.guru/
+  - https://demonoid.torrentbay.to/
+  - https://demonoid.unblockit.click/
 
 caps:
   categorymappings:
@@ -306,10 +311,6 @@ settings:
     type: info
     label: How to get the Cookie
     default: "<ol><li>Access this tracker with your browser</li><li>click on the <b>Apply Filter</b> button on the page to invoke the search and solve the challenge</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
-  - name: info_themes
-    type: info
-    label: About themes
-    default: Only the default theme <b>Demonoid - v5</b> is supported. If you are using v3 then change it in your <i>User Control Panel</i> or you will get 0 results.
   - name: sort
     type: select
     label: Sort requested from site
@@ -331,12 +332,18 @@ login:
 download:
   infohash:
     hash:
-      selector: div:contains("Torrent hash") > div.col-md-5 > div
+      selector: tr:has(td:contains("Torrent hash"))
       filters:
+        # 907617B7 070AACB6 08CC213C 5277368D 217C1666
         - name: replace
           args: [" ", ""]
+        - name: regexp
+          args: ([A-F|0-9]{40})
     title:
-      selector: h1[id="torrent--title"]
+      selector: td.ctable_header
+      filters:
+        - name: replace
+          args: ["Details for ", ""]
 
 search:
   paths:
@@ -359,11 +366,10 @@ search:
     # does not return imdb link in results
 
   rows:
-    # only the default theme "Demonoid - v5" is supported
-    selector: table.table tbody tr.table__row:has(td[class*="tone_"])
+    selector: table.font_12px tbody tr:has(td[class^="tone_1"]):not(:has(script))
     after: 1
     dateheaders:
-      selector: tr td.table__separator:not(:contains("Sponsored links"))
+      selector: td.added_today:not(:contains("Sponsored links"))
       filters:
         - name: replace
           args: ["Added ", ""]
@@ -372,11 +378,10 @@ search:
 
   fields:
     category:
-      text: 0
-    category|noappend:
-      selector: span.table__column__subtext > a:nth-child(2)
+      selector: a.subcategory
       attribute: href
       optional: true
+      default: 0
       filters:
         - name: querystring
           args: subcategory
@@ -388,25 +393,16 @@ search:
     download:
       selector: a[href^="/files/details/"]
       attribute: href
-    poster:
-      selector: div[title]
-      attribute: data-bs-content
-      filters:
-        - name: regexp
-          args: src='(.+?)'
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
     description:
-      selector: td:nth-last-child(7)
+      selector: td:nth-last-child(8)
     size:
-      selector: td:nth-last-child(5)
+      selector: td:nth-last-child(6)
     grabs:
-      selector: td:nth-last-child(3)
+      selector: td:nth-last-child(4)
     seeders:
-      selector: td:nth-last-child(2)
+      selector: td:nth-last-child(3)
     leechers:
-      selector: td:nth-last-child(1)
+      selector: td:nth-last-child(2)
     downloadvolumefactor:
       text: 0
     uploadvolumefactor:

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

@@ -29,7 +29,7 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://desitorrents.tv/\" target =_blank>DesiTorrents</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://desitorrents.tv/\" target=\"_blank\">DesiTorrents</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only

src/Jackett.Common/Definitions/digitalcore.yml

@@ -148,7 +148,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/docspedia.yml

@@ -5,8 +5,6 @@ description: "DocsPedia is a Private Torrent Tracker for E-learning"
 language: en-US
 type: private
 encoding: UTF-8
-certificates:
-  - 0a9676d26d187ccc715189a5eea3bd43eff07c43 # Expired Jan 15 2023
 links:
   - https://www.docspedia.world/
 

src/Jackett.Common/Definitions/dodder.yml

@@ -1,75 +0,0 @@
----
-id: dodder
-name: Dodder
-description: "Dodder (菟丝子资源社区) is a CHINESE Public BitTorrent DHT search engine"
-language: zh-CN
-type: public
-encoding: UTF-8
-links:
-  - https://dodder.top/
-
-caps:
-  categories:
-    Other: Other
-
-  modes:
-    search: [q]
-
-settings: []
-
-download:
-  infohash:
-    hash:
-      selector: a[href^="magnet:?xt"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: ([A-F|a-f|0-9]{40})
-    title:
-      selector: b
-      attribute: title
-      filters:
-        - name: validfilename
-
-search:
-  paths:
-    - path: /
-  inputs:
-    fileName: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
-
-  rows:
-    selector: table.dodder-torrent-list > tbody > tr
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      text: Other
-    title:
-      selector: a[href^="/info/"]
-      attribute: title
-    details:
-      selector: a[href^="/info/"]
-      attribute: href
-    download:
-      selector: a[href^="/info/"]
-      attribute: href
-    date:
-      selector: div.layui-hide-xs
-      filters:
-        - name: dateparse
-          args: "yyyy-MM-dd HH:mm:ss"
-    size:
-      selector: span.layui-bg-gray
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    description:
-      selector: span.layui-row
-      remove: span.layui-badge
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/dxp.yml

@@ -48,6 +48,14 @@ settings:
   - name: password
     type: password
     label: Password
+  - name: stripcyrillic
+    type: checkbox
+    label: Strip Cyrillic Letters
+    default: false
+  - name: addrussiantotitle
+    type: checkbox
+    label: Add RUS to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
+    default: false
   - name: sort
     type: select
     label: Sort requested from site
@@ -97,6 +105,11 @@ search:
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
 
+  keywordsfilters:
+    # strip season and/or ep
+    - name: re_replace
+      args: ["(?i)\\b(?:[SE]\\d{1,4}){1,2}\\b\\s?", ""]
+
   rows:
     selector: table#loading-table tbody#highlighted tr:has(a[href^="torrents.php?cat="]), table#loading-table tbody#highlighted tr:has(a[href^="details.php?id="])
     after: 1
@@ -113,6 +126,58 @@ search:
       attribute: href
     title:
       selector: a[href^="torrent-"]
+      filters:
+        # normalize to SXXEYY format
+        - name: re_replace
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)", "S$1E$2 of $3"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езоны?.+?(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))?", "S$1E$2 of $3"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езоны?.+?(\\d+(?:-\\d+)?)\\s*(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))\\s+из\\s*(\\w?)", "S$1E$2 of $3"]
+        - name: re_replace
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))?", "S$1E$2 of $3"]
+        - name: re_replace
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)\\s*(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))\\s+из\\s*(\\w?)", "S$1E$2 of $3"]
+        - name: re_replace
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езоны?.+?(\\d+(?:-\\d+)?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?)", "S$1"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s+[CС]езоны?", "S$1"]
+        - name: re_replace
+          args: ["(?i)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)", "E$1 of $2"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "E$1 of $2"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s+(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))\\s+из\\s*(\\w?)", "E$1 of $2"]
+        - name: re_replace
+          args: ["(?i)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)", "E$1"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s+(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "E$1"]
+        - name: re_replace
+          args: ["(\\([\\p{IsCyrillic}\\W]+\\))|(^[\\p{IsCyrillic}\\W\\d]+\\/ )|([\\p{IsCyrillic} \\-]+,+)|([\\p{IsCyrillic}]+)", "{{ if .Config.stripcyrillic }}{{ else }}$1$2$3$4{{ end }}"]
+        - name: re_replace
+          args: ["(?i)\\bHDTV[-\\s]?Rip\\b", "HDTV"]
+        - name: re_replace
+          args: ["(?i)\\bSAT[-\\s]?Rip\\b", "HDTV"]
+        - name: re_replace
+          args: ["(?i)\\bWEB[-\\s]?DL[-\\s]?Rip\\b", "WEB-DL"]
+        - name: re_replace
+          args: ["(?i)\\bWEB\\sRip\\b", "WEBRip"]
+        - name: re_replace
+          args: ["(?i)\\bWEB\\sDL\\b", "WEB-DL"]
+        - name: re_replace
+          args: ["[\\[\\(\\{<«][\\s\\W]*[\\]\\)\\}>»]", ""]
+        - name: re_replace
+          args: ["^[\\s&,\\.!\\?\\+\\-_\\|\\/':]+", ""]
+        - name: re_replace
+          args: ["(?i)^\\(\\s*([SE]\\d+.*?)\\s*\\)[\\s\\/\\|]*(.+)", "$2 $1"]
+        - name: append
+          args: "{{ if .Config.addrussiantotitle }} RUS{{ else }}{{ end }}"
     details:
       selector: a[href^="torrent-"]
       attribute: href
@@ -146,4 +211,6 @@ search:
       text: 1
     minimumratio:
       text: 0.3
+    description:
+      selector: a[href^="torrent-"]
 # engine n/a

src/Jackett.Common/Definitions/ebookbay.yml

@@ -92,14 +92,14 @@ search:
     - path: "page/5/{{ if .Keywords }}?s={{ .Keywords }}{{ else }}{{ end }}"
 
   rows:
-    selector: "div#content > div.poststuff, div#content > div.poststuff + div.entry:has(a.download)"
+    selector: "div#content > div.poststuff:has(~ div.entry a.download), div#content > div.poststuff ~ div.entry:has(a.download)"
     after: 1
 
   fields:
     category:
-      text: Other
-    category|noappend:
       selector: span.writer
+      optional: true
+      default: Other
       filters:
         - name: regexp
           args: "E book under:\\s+(.+?)\\s"

src/Jackett.Common/Definitions/eniahd.yml

@@ -66,9 +66,17 @@ settings:
   - name: password
     type: password
     label: Password
-  - name: striprussian
+  - name: stripcyrillic
     type: checkbox
-    label: Strip Russian Letters
+    label: Strip Cyrillic Letters
+    default: false
+  - name: addrussiantotitle
+    type: checkbox
+    label: Add RUS to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
+    default: false
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
     default: false
   - name: sort
     type: select
@@ -104,15 +112,6 @@ login:
 search:
   paths:
     - path: tracker.php
-  keywordsfilters:
-    - name: diacritics
-      args: replace
-    - name: re_replace
-      args: ["(\\w+)", "+$1"] # prepend + to each word
-    - name: re_replace # S01 to сезон 1
-      args: ["(?i)S0*(\\d+)", "сезон $1"]
-    - name: re_replace # S01E01 to сезон 1 серии 1
-      args: ["(?i)S0*(\\d+)E0*(\\d+)", "сезон $1 серии $2"]
   inputs:
     $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{ else }}f[]=-1{{ end }}"
     prev_allw: 0
@@ -147,15 +146,21 @@ search:
     srg: -1
     # title search
     nm: "{{ .Keywords }}"
-    # find a username
-    pn: ""
     # search by partial word
     allw: 0
+    tor_type: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+
+  keywordsfilters:
+    - name: diacritics
+      args: replace
+    # strip season and/or ep
+    - name: re_replace
+      args: ["(?i)\\b(?:[SE]\\d{1,4}){1,2}\\b\\s?", ""]
+    - name: re_replace
+      args: ["(\\w+)", "+$1"] # prepend + to each word
 
   rows:
     selector: tr[id^="tor_"]:has(a[href^="./dl.php?id="])
-    filters:
-      - name: andmatch
 
   fields:
     title:
@@ -163,21 +168,53 @@ search:
       filters:
         # normalize to SXXEYY format
         - name: re_replace
-          args: ["[\\:\\-\\/\\|]", " "]
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)", "S$1E$2 of $3"]
         - name: re_replace
-          args: ["(.*)[CСcс]езон\\s+(\\d+).+[CСcс]ери[ия]\\s+(\\d+)\\s+(\\d+)\\s+из\\s+\\d+(.*)", "$1 S$2E$3-$4 rus $5"]
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езоны?.+?(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))?", "S$1E$2 of $3"]
         - name: re_replace
-          args: ["(.*)[CСcс]езон\\s+(\\d+).+[CСcс]ери[ия]\\s+(\\d+)\\s+из\\s+\\d+(.*)", "$1 S$2E$3 rus $4"]
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езоны?.+?(\\d+(?:-\\d+)?)\\s*(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))\\s+из\\s*(\\w?)", "S$1E$2 of $3"]
         - name: re_replace
-          args: ["(.*)[CСcс]езон\\s+(\\d+)(.*)", "$1 S$2 rus $3"]
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))?", "S$1E$2 of $3"]
         - name: re_replace
-          args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
-        - name: replace
-          args: ["WEB DL", "WEBDL"]
-        - name: replace
-          args: ["WEBDLRip", "WEBDL"]
-        - name: replace
-          args: ["HDTVRip", "HDTV"]
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)\\s*(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))\\s+из\\s*(\\w?)", "S$1E$2 of $3"]
+        - name: re_replace
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езоны?.+?(\\d+(?:-\\d+)?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?)", "S$1"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s+[CС]езоны?", "S$1"]
+        - name: re_replace
+          args: ["(?i)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)", "E$1 of $2"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "E$1 of $2"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s+(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))\\s+из\\s*(\\w?)", "E$1 of $2"]
+        - name: re_replace
+          args: ["(?i)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)", "E$1"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s+(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "E$1"]
+        - name: re_replace
+          args: ["(\\([\\p{IsCyrillic}\\W]+\\))|(^[\\p{IsCyrillic}\\W\\d]+\\/ )|([\\p{IsCyrillic} \\-]+,+)|([\\p{IsCyrillic}]+)", "{{ if .Config.stripcyrillic }}{{ else }}$1$2$3$4{{ end }}"]
+        - name: re_replace
+          args: ["(?i)\\bHDTV[-\\s]?Rip\\b", "HDTV"]
+        - name: re_replace
+          args: ["(?i)\\bSAT[-\\s]?Rip\\b", "HDTV"]
+        - name: re_replace
+          args: ["(?i)\\bWEB[-\\s]?DL[-\\s]?Rip\\b", "WEB-DL"]
+        - name: re_replace
+          args: ["(?i)\\bWEB\\sRip\\b", "WEBRip"]
+        - name: re_replace
+          args: ["(?i)\\bWEB\\sDL\\b", "WEB-DL"]
+        - name: re_replace
+          args: ["[\\[\\(\\{<«][\\s\\W]*[\\]\\)\\}>»]", ""]
+        - name: re_replace
+          args: ["^[\\s&,\\.!\\?\\+\\-_\\|\\/':]+", ""]
+        - name: append
+          args: "{{ if .Config.addrussiantotitle }} RUS{{ else }}{{ end }}"
     details:
       selector: a.tLink
       attribute: href
@@ -206,7 +243,17 @@ search:
       # unix
       selector: td:last-child > u
     downloadvolumefactor:
-      text: 1
+      case:
+        img[src$="/tor_gold.gif"]: 0
+        img[src$="/tor_silver.gif"]: 0.5
+        "*": 1
     uploadvolumefactor:
       text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 100 hours (as seconds = 100 x 60 x 60)
+      text: 360000
+    description:
+      selector: a.tLink
 # TorrentPier

src/Jackett.Common/Definitions/exkinoray.yml

@@ -71,9 +71,13 @@ settings:
   - name: password
     type: password
     label: Password
-  - name: striprussian
+  - name: stripcyrillic
     type: checkbox
-    label: Strip Russian Letters
+    label: Strip Cyrillic Letters
+    default: false
+  - name: addrussiantotitle
+    type: checkbox
+    label: Add RUS to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
     default: false
   - name: sort
     type: select
@@ -90,10 +94,6 @@ settings:
     options:
       desc: desc
       asc: asc
-  - name: info_search
-    type: info
-    label: "Searching with Season / Episode (S01E01)"
-    default: "The web site does support season/episode searching. To allow some results for Sonarr, these are stripped from the keywords."
 
 login:
   path: takelogin.php
@@ -113,12 +113,6 @@ search:
   paths:
     # http://exkinoray.tv/browse.php?search=&incldead=1&cat=0
     - path: browse.php
-  keywordsfilters:
-    # the site does not support season/episode searching in the title.
-    - name: re_replace # strip S01
-      args: ["(?i)\\bS0*(\\d+)\\b", ""]
-    - name: re_replace # strip S01E01
-      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", ""]
   inputs:
     $raw: "{{ if .Categories }}{{ range .Categories }}c{{.}}=1&{{end}}{{ else }}cat=0{{ end }}"
     # 0 active, 1 incldead, 2 onlydead, 4 noseeds (how is this different from onlydead?)
@@ -127,6 +121,11 @@ search:
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
 
+  keywordsfilters:
+    # strip season and/or ep
+    - name: re_replace
+      args: ["(?i)\\b(?:[SE]\\d{1,4}){1,2}\\b\\s?", ""]
+
   rows:
     selector: table.begins > tbody > tr:has(a[href^="details.php?id="])
 
@@ -140,30 +139,57 @@ search:
     title:
       selector: a[href^="details.php?id="]
       filters:
-        # Женские секреты (1 сезон: 1-4 серии из 12) Жіночі секрети | 2020 | HDTVRip (720p)
-        # Мандалорец (1 сезон: 1-8 серии из 8) | The Mandalorian | 2019 | WEB-DL (720p)
-        # Война семей (1-14 серии из 20) | 2019 | WEB-DLRip (AVC)
         # normalize to SXXEYY format
-        - name: replace
-          args: [" | ", " "]
         - name: re_replace
-          args: ["\\((\\d+)\\s+[Сс]езон:\\s+(?:(\\d+-*\\d*)\\s+[Сс]ери[ия]\\s+.*\\d+)\\)(.*)\\s([12][0-9]{3})\\s(.*)", "$3 - S$1E$2 - rus $5"]
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)", "S$1E$2 of $3"]
         - name: re_replace
-          args: ["\\((?:(\\d+-*\\d*)\\s+[Сс]ери[ия]\\s+.*\\d+)\\)(.*)\\s([12][0-9]{3})\\s(.*)", "$2 - S1E$1 - rus $4"]
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езоны?.+?(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))?", "S$1E$2 of $3"]
         - name: re_replace
-          args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езоны?.+?(\\d+(?:-\\d+)?)\\s*(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))\\s+из\\s*(\\w?)", "S$1E$2 of $3"]
         - name: re_replace
-          args: ["\\((\\d+p)\\)", "$1"]
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))?", "S$1E$2 of $3"]
         - name: re_replace
-          args: [" - ", " "]
-        - name: replace
-          args: ["-Rip", "Rip"]
-        - name: replace
-          args: ["WEB-DL", "WEBDL"]
-        - name: replace
-          args: ["WEBDLRip", "WEBDL"]
-        - name: replace
-          args: ["HDTVRip", "HDTV"]
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)\\s*(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))\\s+из\\s*(\\w?)", "S$1E$2 of $3"]
+        - name: re_replace
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езоны?.+?(\\d+(?:-\\d+)?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?)", "S$1"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s+[CС]езоны?", "S$1"]
+        - name: re_replace
+          args: ["(?i)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)", "E$1 of $2"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "E$1 of $2"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s+(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))\\s+из\\s*(\\w?)", "E$1 of $2"]
+        - name: re_replace
+          args: ["(?i)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)", "E$1"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s+(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "E$1"]
+        - name: re_replace
+          args: ["(\\([\\p{IsCyrillic}\\W]+\\))|(^[\\p{IsCyrillic}\\W\\d]+\\/ )|([\\p{IsCyrillic} \\-]+,+)|([\\p{IsCyrillic}]+)", "{{ if .Config.stripcyrillic }}{{ else }}$1$2$3$4{{ end }}"]
+        - name: re_replace
+          args: ["(?i)\\bHDTV[-\\s]?Rip\\b", "HDTV"]
+        - name: re_replace
+          args: ["(?i)\\bSAT[-\\s]?Rip\\b", "HDTV"]
+        - name: re_replace
+          args: ["(?i)\\bWEB[-\\s]?DL[-\\s]?Rip\\b", "WEB-DL"]
+        - name: re_replace
+          args: ["(?i)\\bWEB\\sRip\\b", "WEBRip"]
+        - name: re_replace
+          args: ["(?i)\\bWEB\\sDL\\b", "WEB-DL"]
+        - name: re_replace
+          args: ["[\\[\\(\\{<«][\\s\\W]*[\\]\\)\\}>»]", ""]
+        - name: re_replace
+          args: ["^[\\s&,\\.!\\?\\+\\-_\\|\\/':]+", ""]
+        - name: re_replace
+          args: ["(?i)^\\(\\s*([SE]\\d+.*?)\\s*\\)[\\s\\/\\|]*(.+)", "$2 $1"]
+        - name: append
+          args: "{{ if .Config.addrussiantotitle }} RUS{{ else }}{{ end }}"
     details:
       selector: a[href^="details.php?id="]
       attribute: href
@@ -189,4 +215,6 @@ search:
       text: 0
     uploadvolumefactor:
       text: 1
+    description:
+      selector: a[href^="details.php?id="]
 # engine n/a

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

@@ -7,11 +7,11 @@ type: public
 encoding: UTF-8
 links:
   - https://extratorrent.st/
-  - https://extratorrent.unblockit.boo/
-  - https://extratorrent.mrunblock.guru/
+  - https://extratorrent.unblockit.asia/
+  - https://extratorrent.mrunblock.life/
+  - https://extratorrent.nocensor.click/
 legacylinks:
   - https://extratorrent.nocensor.work/
-  - https://extratorrent.unblockit.how/
   - https://extratorrent.unblockit.cam/
   - https://extratorrent.nocensor.biz/
   - https://extratorrent.unblockit.day/
@@ -30,6 +30,9 @@ legacylinks:
   - https://extratorrent.unblockit.ink/
   - https://extratorrent.nocensor.art/
   - https://extratorrent.unblockit.bio/
+  - https://extratorrent.unblockit.boo/
+  - https://extratorrent.mrunblock.guru/
+  - https://extratorrent.unblockit.click/
 
 caps:
   categorymappings:
@@ -96,7 +99,7 @@ search:
       args: ["[\\s]+", "."]
 
   rows:
-    selector: tr[class^="tl"]
+    selector: tr[class^="tl"]:has(a[href^="magnet:?xt="])
     filters:
       - name: andmatch
 

src/Jackett.Common/Definitions/extremebits.yml

@@ -5,8 +5,6 @@ description: "ExtremeBits is a Private Torrent Tracker for EXTREME SPORTS"
 language: en-US
 type: private
 encoding: UTF-8
-certificates:
-  - 62ab0c90c702bd458a18d778c1fd5928b3721e13 # Expired 6 January 2023
 links:
   - https://extremebits.net/
 

src/Jackett.Common/Definitions/exttorrents.yml

@@ -9,13 +9,14 @@ requestDelay: 5
 links:
   - https://ext.to/
   - https://search.extto.com/
-  - https://extranet.torrentbay.to/
+  - https://extranet.torrentbay.net/
 legacylinks:
   - https://ext.unblockninja.com/
   - https://t.extto.com/
   - https://torrent.extto.com/
   - https://site.extto.com/
   - https://ext.torrentbay.to/
+  - https://extranet.torrentbay.to/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/eztv.yml

@@ -13,8 +13,9 @@ links:
   - https://eztv.yt/
   - https://eztv1.xyz/
   - https://eztv.unblockninja.com/
-  - https://eztv.unblockit.boo/
-  - https://eztv.mrunblock.guru/
+  - https://eztv.unblockit.asia/
+  - https://eztv.mrunblock.life/
+  - https://eztv.nocensor.click/
 legacylinks:
   - https://eztv.ag/ # redirects to .re
   - https://eztv.it/ # redirects to .re
@@ -37,6 +38,9 @@ legacylinks:
   - https://eztv.unblockit.ink/
   - https://eztv.nocensor.art/
   - https://eztv.unblockit.bio/
+  - https://eztv.unblockit.boo/
+  - https://eztv.mrunblock.guru/
+  - https://eztv.unblockit.click/
 
 caps:
   categories:

src/Jackett.Common/Definitions/femdomcult.yml

@@ -44,6 +44,10 @@ settings:
   - 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
@@ -83,6 +87,7 @@ search:
     order_by: "{{ .Config.sort }}"
     order_way: "{{ .Config.type }}"
     action: advanced
+    filter_freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
   rows:
     # exclude redbar torrents

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

@@ -513,13 +513,17 @@ settings:
   - name: password
     type: password
     label: Password
-  - name: striprussian
+  - name: stripcyrillic
     type: checkbox
-    label: Strip Russian Letters
+    label: Strip Cyrillic Letters
     default: false
-  - name: addrussian
+  - name: addrussiantotitle
     type: checkbox
-    label: Add RUSSIAN to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
+    label: Add RUS to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
+    default: false
+  - name: freeleech
+    type: checkbox
+    label: Filter freeleech only
     default: false
   - name: sort
     type: select
@@ -559,13 +563,6 @@ login:
 search:
   paths:
     - path: tracker.php
-  keywordsfilters:
-    - name: diacritics
-      args: replace
-    - name: re_replace # S01 to сезон 1
-      args: ["(?i)\\bS0*(\\d+)\\b", "сезон $1"]
-    - name: re_replace # S01E01 to сезон 1 серии 1
-      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "сезон $1 серии $2"]
   inputs:
     $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{ else }}f[]=-1{{ end }}"
     prev_allw: 1
@@ -598,13 +595,18 @@ search:
     # seed not seen -1=disregard
     sns: -1
     nm: "{{ .Keywords }}"
-    # find a username
-    pn: ""
     # search all words
     allw: 1
 
+  keywordsfilters:
+    - name: diacritics
+      args: replace
+    # strip season and/or ep
+    - name: re_replace
+      args: ["(?i)\\b(?:[SE]\\d{1,4}){1,2}\\b\\s?", ""]
+
   rows:
-    selector: tr[id^="tor_"]:has(a[href^="/download.php?id="])
+    selector: "tr[id^=\"tor_\"]:has(a[href^=\"/download.php?id=\"]){{ if .Config.freeleech }}:has(img[src=\"images/tor_gold.gif\"]){{ else }}{{ end }}"
 
   fields:
     category:
@@ -616,39 +618,69 @@ search:
     title:
       selector: a.genmed
       filters:
-        - name: replace
-          args: ["Кураж-Бамбей", "kurazh"]
-        - name: replace
-          args: ["Кубик в Кубе", "Kubik"]
-        - name: replace
-          args: ["Кравец", "Kravec"]
-        - name: replace
-          args: ["Пифагор", "Pifagor"]
-        - name: replace
-          args: ["Невафильм", "Nevafilm"]
-        - name: replace
-          args: ["Лицензия", "Lic"]
-        - name: replace
-          args: ["селезень", "selezen"]
         # normalize to SXXEYY format
         - name: re_replace
-          args: ["([CСcс]езоны?:?\\s+((?:\\d+)(?:-\\d+)?).*[CСcс]ери[ия]:?\\s+((?:\\d+)(?:-\\d+)?).*?\\d+\\)?)", " S$2E$3 "]
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:(?:-|–)\\d+)?).+?(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:(?:-|–)\\d+)?)\\s*из\\s*(\\w?)", "S$1E$2 of $3"]
         - name: re_replace
-          args: ["([CСcс]ери[ия]:?\\s+((?:\\d+)(?:-\\d+)?).*?[?\\d]+\\)?)", " E$2 "]
+          args: ["(?i)(\\d+(?:(?:-|–)\\d+)?)\\s*[CС]езоны?.+?(\\d+(?:(?:-|–)\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))?", "S$1E$2 of $3"]
         - name: re_replace
-          args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$0{{ end }}"]
+          args: ["(?i)(\\d+(?:(?:-|–)\\d+)?)\\s*[CС]езоны?.+?(\\d+(?:(?:-|–)\\d+)?)\\s*(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))\\s+из\\s*(\\w?)", "S$1E$2 of $3"]
         - name: re_replace
-          args: ["[«»()=.,:|\\[\\]\\/]", " "]
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:(?:-|–)\\d+)?).+?(\\d+(?:(?:-|–)\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))?", "S$1E$2 of $3"]
+        - name: re_replace
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:(?:-|–)\\d+)?).+?(\\d+(?:(?:-|–)\\d+)?)\\s*(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))\\s+из\\s*(\\w?)", "S$1E$2 of $3"]
+        - name: re_replace
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:(?:-|–)\\d+)?).+?(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:(?:-|–)\\d+)?)", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:(?:-|–)\\d+)?)\\s*[CС]езоны?.+?(\\d+(?:(?:-|–)\\d+)?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:(?:-|–)\\d+)?).+?(\\d+(?:(?:-|–)\\d+)?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:(?:-|–)\\d+)?)", "S$1"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:(?:-|–)\\d+)?)\\s+[CС]езоны?", "S$1"]
+        - name: re_replace
+          args: ["(?i)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:(?:-|–)\\d+)?)\\s*из\\s*(\\w?)", "E$1 of $2"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:(?:-|–)\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "E$1 of $2"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:(?:-|–)\\d+)?)\\s+(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))\\s+из\\s*(\\w?)", "E$1 of $2"]
+        - name: re_replace
+          args: ["(?i)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:(?:-|–)\\d+)?)", "E$1"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:(?:-|–)\\d+)?)\\s+(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "E$1"]
+        - name: re_replace
+          args: ["(?i)\\bКураж-Бамбей\\b", "kurazh"]
+        - name: re_replace
+          args: ["(?i)\\bКубик в Кубе\\b", "Kubik"]
+        - name: re_replace
+          args: ["(?i)\\bКравец\\b", "Kravec"]
+        - name: re_replace
+          args: ["(?i)\\bПифагор\\b", "Pifagor"]
+        - name: re_replace
+          args: ["(?i)\\bНевафильм\\b", "Nevafilm"]
+        - name: re_replace
+          args: ["(?i)\\bЛицензия\\b", "Lic"]
+        - name: re_replace
+          args: ["(?i)\\bселезень\\b", "selezen"]
+        - name: re_replace
+          args: ["(\\([\\p{IsCyrillic}\\W]+\\))|(^[\\p{IsCyrillic}\\W\\d]+\\/ )|([\\p{IsCyrillic} \\-]+,+)|([\\p{IsCyrillic}]+)", "{{ if .Config.stripcyrillic }}{{ else }}$1$2$3$4{{ end }}"]
+        - name: re_replace
+          args: ["(?i)\\bHDTV[-\\s]?Rip\\b", "HDTV"]
+        - name: re_replace
+          args: ["(?i)\\bSAT[-\\s]?Rip\\b", "HDTV"]
+        - name: re_replace
+          args: ["(?i)\\bWEB[-\\s]?DL[-\\s]?Rip\\b", "WEB-DL"]
+        - name: re_replace
+          args: ["(?i)\\bWEB\\sRip\\b", "WEBRip"]
+        - name: re_replace
+          args: ["(?i)\\bWEB\\sDL\\b", "WEB-DL"]
+        - name: re_replace
+          args: ["[\\[\\(\\{<«][\\s\\W]*[\\]\\)\\}>»]", ""]
+        - name: re_replace
+          args: ["^[\\s&,\\.!\\?\\+\\-_\\|\\/':]+", ""]
         - name: append
-          args: "{{ if .Config.addrussian }} - RUSSIAN{{ else }}{{ end }}"
-        - name: replace
-          args: ["-Rip", "Rip"]
-        - name: replace
-          args: ["WEB-DL", "WEBDL"]
-        - name: replace
-          args: ["WEBDLRip", "WEBDL"]
-        - name: replace
-          args: ["HDTVRip", "HDTV"]
+          args: "{{ if .Config.addrussiantotitle }} RUS{{ else }}{{ end }}"
     details:
       selector: a.genmed
       attribute: href
@@ -672,4 +704,6 @@ search:
         "*": 1
     uploadvolumefactor:
       text: 1
+    description:
+      selector: a.genmed
 # TorrentPier

src/Jackett.Common/Definitions/filelisting.yml

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

src/Jackett.Common/Definitions/firebit.yml

@@ -56,7 +56,15 @@ caps:
     music-search: [q]
     book-search: [q]
 
-settings: []
+settings:
+  - name: stripcyrillic
+    type: checkbox
+    label: Strip Cyrillic Letters
+    default: false
+  - name: addrussiantotitle
+    type: checkbox
+    label: Add RUS to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
+    default: false
 
 download:
   selectors:
@@ -69,6 +77,11 @@ search:
     - path: "{{ if .Keywords }}index.php?do=search&type=simple&q={{ .Keywords }}{{ else }}{{ end }}"
     - path: "{{ if .Keywords }}index.php?do=search&type=simple&q={{ .Keywords }}&cstart=2{{ else }}%D1%81%D1%82%D1%80%D0%B0%D0%BD%D0%B8%D1%86%D0%B0/2/{{ end }}"
 
+  keywordsfilters:
+    # strip season and/or ep
+    - name: re_replace
+      args: ["(?i)\\b(?:[SE]\\d{1,4}){1,2}\\b\\s?", ""]
+
   rows:
     selector: "{{ if .Keywords }}table.torrents tbody tr:has(td.td-size){{ else }}div[id^=\"post-id-\"]:has(li.meta-size){{ end }}"
     filters:
@@ -76,10 +89,9 @@ search:
 
   fields:
     category:
-      text: "-"
-    category|noappend:
-      optional: true
       selector: td:nth-child(1), div.article-indent div b
+      optional: true
+      default: "-"
       filters:
         - name: replace
           args: ["Новинки", ""]
@@ -88,6 +100,58 @@ search:
         - name: trim
     title:
       selector: td:nth-child(2), span.article-title
+      filters:
+        # normalize to SXXEYY format
+        - name: re_replace
+          args: ["(?i)[CС]езон[ыи]?[\\s:;]*(\\d+(?:-\\d+)?).+?(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))[\\s:;]*(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)", "S$1E$2 of $3"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езон[ыи]?.+?(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))?", "S$1E$2 of $3"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езон[ыи]?.+?(\\d+(?:-\\d+)?)\\s*(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))\\s+из\\s*(\\w?)", "S$1E$2 of $3"]
+        - name: re_replace
+          args: ["(?i)[CС]езон[ыи]?[\\s:;]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))?", "S$1E$2 of $3"]
+        - name: re_replace
+          args: ["(?i)[CС]езон[ыи]?[\\s:;]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)\\s*(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))\\s+из\\s*(\\w?)", "S$1E$2 of $3"]
+        - name: re_replace
+          args: ["(?i)[CС]езон[ыи]?[\\s:;]*(\\d+(?:-\\d+)?).+?(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))[\\s:;]*(\\d+(?:-\\d+)?)", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езон[ыи]?.+?(\\d+(?:-\\d+)?)(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)[CС]езон[ыи]?[\\s:;]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)[CС]езон[ыи]?[\\s:;]*(\\d+(?:-\\d+)?)", "S$1"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s+[CС]езон[ыи]?", "S$1"]
+        - name: re_replace
+          args: ["(?i)(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))[\\s:;]*(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)", "E$1 of $2"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))", "E$1 of $2"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s+(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))\\s+из\\s*(\\w?)", "E$1 of $2"]
+        - name: re_replace
+          args: ["(?i)(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))[\\s:;]*(\\d+(?:-\\d+)?)", "E$1"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s+(?:\\s*(?:[CС]ер[иі][ияйї]|Эпизод|Выпуски?|Епізоди?))", "E$1"]
+        - name: re_replace
+          args: ["(\\([\\p{IsCyrillic}\\W]+\\))|(^[\\p{IsCyrillic}\\W\\d]+\\/ )|([\\p{IsCyrillic} \\-]+,+)|([\\p{IsCyrillic}]+)", "{{ if .Config.stripcyrillic }}{{ else }}$1$2$3$4{{ end }}"]
+        - name: re_replace
+          args: ["(?i)\\bHDTV[-\\s]?Rip\\b", "HDTV"]
+        - name: re_replace
+          args: ["(?i)\\bSAT[-\\s]?Rip\\b", "HDTV"]
+        - name: re_replace
+          args: ["(?i)\\bWEB[-\\s]?DL[-\\s]?Rip\\b", "WEB-DL"]
+        - name: re_replace
+          args: ["(?i)\\bWEB\\sRip\\b", "WEBRip"]
+        - name: re_replace
+          args: ["(?i)\\bWEB\\sDL\\b", "WEB-DL"]
+        - name: re_replace
+          args: ["[\\[\\(\\{<«][\\s\\W]*[\\]\\)\\}>»]", ""]
+        - name: re_replace
+          args: ["^[\\s&,\\.!\\?\\+\\-_\\|\\/':]+", ""]
+#        - name: re_replace
+#          args: ["(?i)^\\(\\s*([SE]\\d+.*?)\\s*\\)[\\s\\/\\|]*(.+)", "$2 $1"]
+        - name: append
+          args: "{{ if .Config.addrussiantotitle }} RUS{{ else }}{{ end }}"
     details:
       selector: td:nth-child(2) a, span.article-title a
       attribute: href
@@ -129,4 +193,6 @@ search:
       text: 0
     uploadvolumefactor:
       text: 1
+    description:
+      selector: td:nth-child(2), span.article-title
 # engine n/a

src/Jackett.Common/Definitions/frozenlayer.yml

@@ -85,10 +85,9 @@ search:
       selector: td:nth-child(1) a[href^="magnet:?"]
       attribute: href
     category:
-      text: Anime
-    category|noappend:
-      optional: true
       selector: td.tit span
+      optional: true
+      default: Anime
     date_day:
       # 1d
       # 2d 3h

src/Jackett.Common/Definitions/ftuapps.yml

@@ -1,73 +0,0 @@
----
-id: ftuapps
-name: FTUApps
-description: "FTUApps is a Public tracker for Software and Apps"
-language: en-US
-type: public
-encoding: UTF-8
-links:
-  - https://ftuapps.dev/
-
-caps:
-  categorymappings:
-    - {id: 52, cat: PC, desc: ".Net", default: true}
-    - {id: 3648, cat: PC/Mobile-Android, desc: "Android Applications", default: true}
-    - {id: 55, cat: PC/Mobile-Other, desc: "Application", default: true}
-    - {id: 46, cat: PC, desc: "Database", default: true}
-    - {id: 331, cat: PC, desc: "Delphi", default: true}
-    - {id: 4120, cat: PC, desc: "DriverPack Solution Offline", default: true}
-    - {id: 2142, cat: PC/Mac, desc: "MacOS", default: true}
-    - {id: 2431, cat: PC, desc: "Operating Systems", default: true}
-    - {id: 2172, cat: PC, desc: "Portable Apps", default: true}
-    - {id: 2435, cat: PC, desc: "PreActivated Apps", default: true}
-    - {id: 3, cat: PC/0day, desc: "Software", default: true}
-    - {id: 165, cat: Other, desc: "Web & Script", default: true}
-
-  modes:
-    search: [q]
-
-settings: []
-
-download:
-  selectors:
-    - selector: a[href$=".torrent"]
-      attribute: href
-
-search:
-  paths:
-    - path: "?s={{ .Keywords }}&asl_active=1&p_asid=1&p_asl_data=1&qtranslate_lang=0&asl_gen[]=title&customset[]=post&customset[]=page{{ range .Categories }}&categoryset[]={{.}}{{end}}"
-
-  rows:
-    selector: article[id^="post-"]:has(a[href*="/category/"])
-    filters:
-      - name: andmatch
-
-  fields:
-    categorydesc:
-      selector: a[href*="/category/"]
-    title:
-      selector: a
-      attribute: title
-    details:
-      selector: a
-      attribute: href
-    download:
-      selector: a
-      attribute: href
-    poster:
-      selector: img
-      attribute: src
-    date:
-      selector: time.published
-      attribute: datetime
-    size:
-      text: "512 MB"
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# WordPress 5.9

src/Jackett.Common/Definitions/funkytorrents.yml

@@ -57,6 +57,18 @@ caps:
     music-search: [q, artist]
     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
+
 login:
   path: takelogin.php
   method: post
@@ -72,9 +84,14 @@ search:
   paths:
     - path: browse.php
   inputs:
+    # cat search doesn't work if our custom MP3 and Lossless cats are selected
     # $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    cat: 0
     search: "{{ if .Query.Artist }}{{ .Query.Artist }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 active, 1 incldead, 2 dead
     incldead: 1
+    # 0 all, 1 not documented, 2 free
+    free: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
 
   rows:
     selector: table.mainouter > tbody > tr > td.outer > table > tbody > tr.mouse_out

src/Jackett.Common/Definitions/gainbound.yml

@@ -150,5 +150,5 @@ search:
       text: 1.0
     description:
       selector: td.rowfollow:nth-child(2)
-      remove: a, img
+      remove: a, b, font, img, span
 # NexusPHP v1.8.0 2023-01-26

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

@@ -33,7 +33,7 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://generation-free.org/\" target =_blank>Generation-Free</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://generation-free.org/\" target=\"_blank\">Generation-Free</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only

src/Jackett.Common/Definitions/gigatorrents.yml

@@ -58,6 +58,10 @@ settings:
   - 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
@@ -97,7 +101,8 @@ search:
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
-    incldead: 1
+    # 0 active, 1 incldead, 2 onlydead, 5 freeleech, 6 2x upload, 7 highlighted
+    incldead: "{{ if .Config.freeleech }}5{{ else }}1{{ end }}"
     blah: 0
     order: "{{ .Config.sort }}"
     by: "{{ .Config.type }}"

src/Jackett.Common/Definitions/gktorrent.yml

@@ -9,7 +9,6 @@ followredirect: true
 # to fetch current domain use https://www.protege-liens.com/Gktorrent
 links:
   - https://www.gktorrents.cc/
-  - https://gktorrent.mrunblock.guru/
 legacylinks:
   - https://www.gktorrent.org/
   - https://www.gktorrent.me/
@@ -32,6 +31,8 @@ legacylinks:
   - https://gktorrent.nocensor.sbs/
   - https://gktorrent.nocensor.world/
   - https://gktorrent.nocensor.lol/
+  - https://gktorrent.mrunblock.guru/
+  - https://gktorrent.mrunblock.life/ # cloudflare 403
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/glodls.yml

@@ -10,13 +10,13 @@ links:
   - https://glodls.to/
   - https://gtdb.cc/
   - https://www.gtdb.to/
-  - https://glotorrents.unblockit.boo/
-  - https://glotorrents.mrunblock.guru/
+  - https://glotorrents.unblockit.asia/
+  - https://glotorrents.mrunblock.life/
   - https://glodls.unblockninja.com/
+  - https://glotorrents.nocensor.click/
 legacylinks:
   - https://glodls.rocks/
   - https://gtdb.to/
-  - https://glotorrents.unblockit.how/
   - https://glotorrents.unblockit.cam/
   - https://glotorrents.nocensor.biz/
   - https://glotorrents.unblockit.day/
@@ -35,6 +35,9 @@ legacylinks:
   - https://glotorrents.unblockit.ink/
   - https://glotorrents.nocensor.art/
   - https://glotorrents.unblockit.bio/
+  - https://glotorrents.unblockit.boo/
+  - https://glotorrents.mrunblock.guru/
+  - https://glotorrents.unblockit.click/
 
 caps:
   categorymappings:
@@ -107,11 +110,10 @@ search:
 
   fields:
     category:
-      text: 33 # issue #7113
-    category|noappend:
-      optional: true
       selector: a[href^="/search.php?cat="]
       attribute: href
+      optional: true
+      default: 33
       filters:
         - name: querystring
           args: cat

src/Jackett.Common/Definitions/haitang.yml

@@ -37,10 +37,6 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
   - name: sort
     type: select
     label: Sort requested from site
@@ -57,6 +53,10 @@ settings:
     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
@@ -70,7 +70,6 @@ login:
     trackerssl: yes
   error:
     - selector: td.embedded:has(h2:contains("失败"))
-    - selector: td.embedded:has(h2:contains("failed"))
   test:
     path: index.php
     selector: a[href="logout.php"]
@@ -162,12 +161,12 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
-    description:
-      selector: td:nth-child(2)
-      remove: a, img
     minimumratio:
       text: 1
     minimumseedtime:
       # 1 day (as seconds = 24 x 60 x 60)
       text: 86400
+    description:
+      selector: td:nth-child(2)
+      remove: a, b, font, img, span
 # NexusPHP v1.1 2021-10-15

src/Jackett.Common/Definitions/happyfappy.yml

@@ -10,7 +10,13 @@ links:
 
 caps:
   categorymappings:
-    - {id: 1, cat: XXX, desc: "PRON"}
+    - {id: 3, cat: XXX, desc: "Gay"}
+    - {id: 4, cat: XXX, desc: "Interracial"}
+    - {id: 5, cat: XXX, desc: "Lesbian"}
+    - {id: 6, cat: XXX, desc: "Onlyfans"}
+    - {id: 1, cat: XXX, desc: "Pron"}
+    - {id: 8, cat: XXX, desc: "Retro"}
+    - {id: 7, cat: XXX, desc: "VR"}
 
   modes:
     search: [q]
@@ -66,21 +72,22 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
-    searchtext: ""
     title: "{{ .Keywords }}"
     order_by: "{{ .Config.sort }}"
     order_way: "{{ .Config.type }}"
     action: advanced
     filter_freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-    filelist: ""
-    taglist: ""
 
   rows:
     selector: table#torrent_table > tbody > tr[class^="torrent row"]
 
   fields:
     category:
-      text: 1
+      selector: a[href^="/torrents.php?filter_cat["]
+      attribute: href
+      filters:
+        - name: regexp
+          args: \[(\d+)\]
     title:
       selector: a[href^="/torrents.php?id="]
     details:

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

@@ -25,7 +25,7 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://www.hawke.uno/\" target =_blank>hawke-uno</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://www.hawke.uno/\" target=\"_blank\">hawke-uno</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only

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

@@ -28,7 +28,7 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://hd-united.vn/\" target =_blank>HD-UNiT3D</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://hd-united.vn/\" target=\"_blank\">HD-UNiT3D</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only

src/Jackett.Common/Definitions/hd4fans.yml

@@ -54,7 +54,7 @@ login:
     ssl: yes
     trackerssl: yes
   error:
-    - selector: td.embedded:has(h2:contains("失败")), td.embedded:has(h2:contains("failed"))
+    - selector: td.embedded:has(h2:contains("失败"))
       message:
         selector: td.text
   test:
@@ -145,5 +145,5 @@ search:
         "*": 1
     description:
       selector: td.rowfollow:nth-child(2)
-      remove: a, img
+      remove: a, b, font, img, span
 # NexusPHP Standard v1.5 Beta 4

src/Jackett.Common/Definitions/hdarea.yml

@@ -47,10 +47,6 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
   - name: sort
     type: select
     label: Sort requested from site
@@ -170,5 +166,5 @@ search:
       text: 0.8
     description:
       selector: td:nth-child(2)
-      remove: a, img
+      remove: a, b, font, img, span
 # NexusPHP Standard v1.5 Beta 4

src/Jackett.Common/Definitions/hdatmos.yml

@@ -20,10 +20,9 @@ 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]
-    book-search: [q]
 
 settings:
   - name: username
@@ -43,10 +42,6 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
   - name: sort
     type: select
     label: Sort requested from site
@@ -63,6 +58,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
 
 login:
   path: login.php
@@ -94,14 +93,14 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }} {{ else }}{{ .Keywords }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}"
     # 0 incldead, 1 active, 2 dead
     incldead: 0
     # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
     spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
     # 0 title, 1 descr, 3 uploader, 4 imdburl
-    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
-    # 0 AND, 1 OR, 2 exact
+    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 }}"
@@ -130,9 +129,6 @@ search:
     download:
       selector: a[href^="download.php?id="]
       attribute: href
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
     date_elapsed:
       # time type: time elapsed (default)
       selector: td:nth-child(4) > span[title]
@@ -178,7 +174,5 @@ search:
         "*": 1
     description:
       selector: td:nth-child(2)
-      remove: a, img
-    minimumratio:
-      text: 0.81
-# NexusPHP 1.7.31 2022-11-14
+      remove: a, b, font, img, span
+# NexusPHP v1.8.2 2023-05-08

src/Jackett.Common/Definitions/hdcztorrent.yml

@@ -12,34 +12,24 @@ legacylinks:
 
 caps:
   categorymappings:
-    # Film
-    - {id: 37, cat: Movies/DVD, desc: "DVD"}
-    - {id: 92, cat: TV, desc: "TV Serial ENG"}
-    - {id: 39, cat: Audio/Video, desc: "Hudba Video"}
-    - {id: 41, cat: Movies/SD, desc: "DivX / AVI"}
-    - {id: 90, cat: Movies/SD, desc: "DivX / AVI Titulky"}
-    - {id: 43, cat: Movies/Other, desc: "FILM dokument"}
-    - {id: 44, cat: Movies/Other, desc: "FILM sport"}
-    - {id: 45, cat: TV, desc: "SERIALY CZ"}
-    - {id: 47, cat: Movies, desc: "Animované"}
+    # Filmy
+    - {id: 117, cat: Movies/DVD, desc: "DvD"}
+    - {id: 119, cat: Movies/BluRay, desc: "Blu-Ray "}
+    - {id: 120, cat: Movies/HD, desc: "HD 720"}
+    - {id: 121, cat: Movies/HD, desc: "HD 1080"}
+    - {id: 122, cat: Movies/UHD, desc: "4K"}
+    - {id: 123, cat: Movies/UHD, desc: "4K - Originál Zvuk"}
+    - {id: 124, cat: Movies/3D, desc: "3D Filmy Bluray"}
+    - {id: 125, cat: Movies/3D, desc: "3D Filmy"}
+    - {id: 126, cat: Movies/SD, desc: "SD Filmy"}
+    - {id: 127, cat: Movies/HD, desc: "H-265"}
+    - {id: 128, cat: TV/Documentary, desc: "Dokument"}
+    - {id: 129, cat: TV/Sport, desc: "Sportovní Filmy"}
+    - {id: 130, cat: TV/WEB-DL, desc: "TV - WEB- DL"}
+    - {id: 131, cat: Movies, desc: "RLS For HDCZT"}
     - {id: 91, cat: TV, desc: "Serial titulky"}
-    - {id: 50, cat: Movies/BluRay, desc: "FILMY Blu-ray"}
-    - {id: 109, cat: Movies/BluRay, desc: "BLURAY orig JAZYK"}
-    - {id: 52, cat: Movies/HD, desc: "HD 1080 "}
-    - {id: 53, cat: Movies/HD, desc: "HD 720"}
-    - {id: 55, cat: Movies/3D, desc: "3D Filmy"}
-    - {id: 110, cat: Movies/3D, desc: "3D ORIGINÁL"}
-    - {id: 111, cat: Movies, desc: "FILMY CZ TVORBA"}
-    - {id: 98, cat: Movies/UHD, desc: "ORIGINAL JAZYK 4K"}
-    - {id: 77, cat: Movies/UHD, desc: "ULTRA HD  4K"}
-    - {id: 89, cat: Movies/HD, desc: "HD720 titulky "}
-    - {id: 93, cat: Movies/HD, desc: "HD 1080 titulky"}
-    - {id: 107, cat: Movies, desc: "CAMERA RIP "}
-    - {id: 94, cat: Movies, desc: "h 265"}
+    - {id: 45, cat: TV, desc: "SERIALY CZ"}
     - {id: 81, cat: Movies, desc: "ORIGINAL JAZYK"}
-    - {id: 95, cat: Movies/Other, desc: "FILM RETRO"}
-    #
-    - {id: 115, cat: Movies/Other, desc: "RLS-HD"}
     # HUDBA
     - {id: 57, cat: Audio/Lossless, desc: "Hudba flac"}
     - {id: 58, cat: Audio/MP3, desc: "Hudba mp3"}

src/Jackett.Common/Definitions/hddolby.yml

@@ -24,10 +24,9 @@ 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]
-    book-search: [q]
 
 settings:
   - name: username
@@ -47,6 +46,22 @@ settings:
     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: flaresolverr
     type: info
     label: FlareSolverr
@@ -85,21 +100,29 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }} {{ else }}{{ .Keywords }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}"
     # 0=incldead, 1=active, 2=dead
     incldead: 0
     # show promotions: 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 }}"
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}{{ end }}{{ if .Query.DoubanID }}1{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}0{{ end }}"
     # 0=AND, 1=OR, 2=Exact
     search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
     notnewword: 1
 
   rows:
     selector: table.torrents > tbody > tr:has(table.torrentname)
 
   fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
     title_default:
       selector: a[href^="details.php?id="]
     title:
@@ -107,18 +130,18 @@ 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
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    doubanid:
+      selector: a[href*="movie.douban.com/subject/"]
+      attribute: href
     date_elapsed:
       # time type: time elapsed (default)
       selector: td.rowfollow:nth-child(4) > span[title]
@@ -166,5 +189,8 @@ search:
       text: 1.2
     description:
       selector: td.rowfollow:nth-child(2)
-      remove: a, img
+      remove: a, b, font, img, span
+      filters:
+        - name: replace
+          args: [" 剩余时间：", ""]
 # NexusPHP Standard v1.5 Beta 4

src/Jackett.Common/Definitions/hdfans.yml

@@ -52,10 +52,6 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
   - name: sort
     type: select
     label: Sort requested from site
@@ -72,6 +68,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
 
 login:
   path: login.php
@@ -103,14 +103,14 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }} {{ else }}{{ .Keywords }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}"
     # 0 incldead, 1 active, 2 dead
     incldead: 0
     # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
     spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
     # 0 title, 1 descr, 3 uploader, 4 imdburl
-    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
-    # 0 AND, 1 OR, 2 exact
+    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 }}"
@@ -139,12 +139,14 @@ search:
     download:
       selector: a[href^="download.php?id="]
       attribute: href
-    poster:
-      selector: img[data-src]
-      attribute: data-src
     imdbid:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
+    doubanid:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
+      selector: a[href*="movie.douban.com/subject/"]
+      attribute: href
     date_elapsed:
       # time type: time elapsed (default)
       selector: td:nth-child(4) > span[title]
@@ -188,9 +190,9 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
-    description:
-      selector: td:nth-child(2)
-      remove: a, img
     minimumratio:
       text: 0.81
-# NexusPHP v1.8.0 2023-01-20
+    description:
+      selector: td:nth-child(2)
+      remove: a, b, font, img, span
+# NexusPHP v1.8.2 2023-05-06

src/Jackett.Common/Definitions/hdgalaktik.yml

@@ -1,7 +1,7 @@
 ---
 id: hdgalaktik
 name: HDGalaKtik
-description: "HDGalaKtik is a RUSSIAN Semi-Private tracker for TV / MOVIES / GENERAL"
+description: "HDGalaKtik is a RUSSIAN Semi-Private tracker for MOVIES / TV / GENERAL"
 language: ru-RU
 type: semi-private
 encoding: UTF-8
@@ -44,14 +44,18 @@ settings:
     type: info
     label: How to get the Cookie
     default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: stripcyrillic
+    type: checkbox
+    label: Strip Cyrillic Letters
+    default: false
+  - name: addrussiantotitle
+    type: checkbox
+    label: Add RUS to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
+    default: false
   - name: freeleech
     type: checkbox
     label: Search freeleech only
     default: false
-  - name: striprussian
-    type: checkbox
-    label: Strip Russian Letters
-    default: false
   - name: sort
     type: select
     label: Sort requested from site
@@ -85,15 +89,6 @@ search:
   # https://hdgalaktik.com/browse.php?search=&stype=0&s=0&cat=0&gr=0&kp=0&im=0&incldead=1&sort=0&type=desc
   paths:
     - path: browse.php
-  keywordsfilters:
-    - name: re_replace # S01E01 to [1 сезон 1 сери]
-      args: ["(?i)S0*(\\d+)E0*(\\d+)", "[$1 сезон $2 сери]"]
-    - name: re_replace # S01 to [1 сезон]
-      args: ["(?i)S0*(\\d+)", "[$1 сезон]"]
-    - name: re_replace # E01 to [1 сери]
-      args: ["(?i)E0*(\\d+)", "[$1 сери]"]
-    - name: re_replace # replace special characters with "%" (wildcard)
-      args: ["[^a-zA-Z0-9]+", "%"]
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
@@ -110,20 +105,31 @@ search:
     sort: "{{ .Config.sort }}"
     ascdesc: "{{ .Config.type }}"
 
+  keywordsfilters:
+    - name: re_replace # S01 to сезон 1
+      args: ["(?i)\\bS0*(\\d+)\\b", "сезон $1"]
+    - name: re_replace # E02 to сери 1
+      args: ["(?i)\\bE0*(\\d+)\\b", "сери $1"]
+    - name: re_replace # S01E02 to сезон 1 сери 2
+      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "сезон $1 сери $2"]
+    - name: re_replace # replace special characters with "%" (wildcard)
+      args: ["[^a-zA-Z0-9]+", "%"]
+
   rows:
     selector: table.embedded > tbody > tr.torcontduo
 
   fields:
-    category:
+    category_default:
       selector: td:nth-child(1)
       optional: true
       filters:
         - name: replace
           args: ["---", 4]
-    category|noappend:
+    category:
       selector: a[href^="browse.php?cat="]
       attribute: href
       optional: true
+      default: "{{ .Result.category_default }}"
       filters:
         - name: querystring
           args: cat
@@ -133,41 +139,61 @@ search:
       filters:
         # normalize to SXXEYY format
         - name: re_replace
-          args: ["[\\.\\,\\:\\/\\|\\[\\]]", " "]
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)", "S$1E$2 of $3"]
         - name: re_replace
-          args: ["(.*) от .*$", "$1"]
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езоны?.+?(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))?", "S$1E$2 of $3"]
         - name: re_replace
-          args: ["(.*)(\\d+\\-\\d+)\\s*[CСcс]езон\\s*(\\d+\\-\\d+)\\s*[CСcс]ери[ия]\\s*из\\s*\\d+(.*)", "$1 S$2E$3 rus $4"]
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езоны?.+?(\\d+(?:-\\d+)?)\\s*(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))\\s+из\\s*(\\w?)", "S$1E$2 of $3"]
         - name: re_replace
-          args: ["(.*)(\\d+)\\-(\\d+)\\s*[CСcс]езон\\s*(\\d+)\\-(\\d+)\\s*[CСcс]ери[ия](.*)", "$1 S$2E$3 rus $4"]
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))?", "S$1E$2 of $3"]
         - name: re_replace
-          args: ["(.*)(\\d+)\\s*[CСcс]езон\\s*(\\d+\\-\\d+)\\s*[CСcс]ери[ия]\\s*из\\s*\\d+(.*)", "$1 S$2E$3 rus $4"]
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)\\s*(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))\\s+из\\s*(\\w?)", "S$1E$2 of $3"]
         - name: re_replace
-          args: ["(.*)(\\d+)\\s*[CСcс]езон\\s*(\\d+\\-\\d+)\\s*[CСcс]ери[ия](.*)", "$1 S$2E$3 rus $4"]
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)", "S$1E$2"]
         - name: re_replace
-          args: ["(.*)(\\d+\\-\\d+)\\s*[CСcс]езон\\s*(.*)", "$1 S$2 rus $3"]
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езоны?.+?(\\d+(?:-\\d+)?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "S$1E$2"]
         - name: re_replace
-          args: ["(.*)(\\d+)\\s*[CСcс]езон\\s*(.*)", "$1 S$2 rus $3"]
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "S$1E$2"]
         - name: re_replace
-          args: ["(.*)(\\d+\\-\\d+)\\s*[CСcс]ери[ия]\\s*из\\s*\\d+(.*)", "$1 E$2 rus $3"]
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?)", "S$1"]
         - name: re_replace
-          args: ["(.*)(\\d+)\\s*[CСcс]ери[ия]\\s*из\\s*\\d+(.*)", "$1 E$2 rus $3"]
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s+[CС]езоны?", "S$1"]
         - name: re_replace
-          args: ["(.*)(\\d+\\-\\d+)\\s*[CСcс]ери[ия](.*)", "$1 E$2 rus $3"]
+          args: ["(?i)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)", "E$1 of $2"]
         - name: re_replace
-          args: ["(.*)(\\d+)\\s*[CСcс]ери[ия](.*)", "$1 E$2 rus $3"]
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "E$1 of $2"]
         - name: re_replace
-          args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
-        - name: replace
-          args: ["WEBRip", "WEBDL"]
-        - name: replace
-          args: ["WEB-DL", "WEBDL"]
-        - name: replace
-          args: ["WEBDLRip", "WEBDL"]
-        - name: replace
-          args: ["HDTVRip", "HDTV"]
-        - name: replace
-          args: ["SATRip", "TV"]
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s+(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))\\s+из\\s*(\\w?)", "E$1 of $2"]
+        - name: re_replace
+          args: ["(?i)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)", "E$1"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s+(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "E$1"]
+        - name: re_replace
+          args: ["(?i)\\bFiles-х\\b", "Files-x"]
+        - name: re_replace
+          args: ["(?i)\\sот\\s([\\w\\p{P}\\p{S}]+)$", "-$1"]
+        - name: re_replace
+          args: ["\\s\\|\\s(\\w{4,})$", "-$1"]
+        - name: re_replace
+          args: ["(\\([\\p{IsCyrillic}\\W]+\\))|(^[\\p{IsCyrillic}\\W\\d]+\\/ )|([\\p{IsCyrillic} \\-]+,+)|([\\p{IsCyrillic}]+)", "{{ if .Config.stripcyrillic }}{{ else }}$1$2$3$4{{ end }}"]
+        - name: re_replace
+          args: ["(?i)\\bHDTV[-\\s]?Rip\\b", "HDTV"]
+        - name: re_replace
+          args: ["(?i)\\bSAT[-\\s]?Rip\\b", "HDTV"]
+        - name: re_replace
+          args: ["(?i)\\bWEB[-\\s]?DL[-\\s]?Rip\\b", "WEB-DL"]
+        - name: re_replace
+          args: ["(?i)\\bWEB\\sRip\\b", "WEBRip"]
+        - name: re_replace
+          args: ["(?i)\\bWEB\\sDL\\b", "WEB-DL"]
+        - name: re_replace
+          args: ["[\\[\\(\\{<«][\\s\\W]*[\\]\\)\\}>»]", ""]
+        - name: re_replace
+          args: ["^[\\s&,\\.!\\?\\+\\-_\\|\\/':]+", ""]
+        - name: re_replace
+          args: ["(?i)^\\(\\s*([SE]\\d+.*?)\\s*\\)[\\s\\/\\|]*(.+)", "$2 $1"]
+        - name: append
+          args: "{{ if .Config.addrussiantotitle }} RUS{{ else }}{{ end }}"
     details:
       selector: a.alink
       attribute: href
@@ -208,4 +234,7 @@ search:
       text: 1
     minimumratio:
       text: 1.0
+    description:
+      selector: a.alink
+      attribute: title
 # engine n/a

src/Jackett.Common/Definitions/hdhome.yml

@@ -170,5 +170,5 @@ search:
         "*": 1
     description:
       selector: td:nth-child(2)
-      remove: a, img
+      remove: a, b, font, img, span
 # NexusPHP v2.0 2014-11-24

src/Jackett.Common/Definitions/hdmayi.yml

@@ -19,6 +19,7 @@ caps:
     - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
     - {id: 409, cat: Other, desc: "Misc/其他"}
     - {id: 408, cat: Audio, desc: "Music/音乐"}
+    - {id: 410, cat: PC, desc: "Softs/软件"}
 
   modes:
     search: [q]
@@ -169,5 +170,5 @@ search:
       text: 86400
     description:
       selector: td.rowfollow:nth-child(2)
-      remove: a, img
+      remove: a, b, font, img, span
 # NexusPHP v1.7.29 2022-10-12

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

@@ -60,6 +60,8 @@ login:
     api_token: "{{ .Config.apikey }}"
   error:
     - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
 
 search:
   paths:
@@ -70,9 +72,12 @@ search:
         type: json
 
   inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
     api_token: "{{ .Config.apikey }}"
     $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
     name: "{{ .Keywords }}"
+    seasonNumber: "{{ .Query.Season }}"
+    episodeNumber: "{{ .Query.Ep }}"
     imdbId: "{{ .Query.IMDBIDShort }}"
     tmdbId: "{{ .Query.TMDBID }}"
     tvdbId: "{{ .Query.TVDBID }}"
@@ -182,11 +187,15 @@ search:
     size:
       selector: size
     downloadvolumefactor:
-      # api returns 0=false, 1=true
+      # api returns 0%, 25%, 50%, 75%, 100%
       selector: freeleech
       case:
-        0: 1 # not free
-        1: 0 # freeleech
+        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
@@ -196,4 +205,4 @@ search:
     minimumseedtime:
       # 4 days (as seconds = 4 x 24 x 60 x 60)
       text: 345600
-# json UNIT3D ???
+# json UNIT3D 6.0.4

src/Jackett.Common/Definitions/hdsky.yml

@@ -144,5 +144,5 @@ search:
         "*": 1
     description:
       selector: td:nth-child(2)
-      remove: a, img
+      remove: a, b, font, img, span
 # NexusPHP Standard v1.5 Beta 5

src/Jackett.Common/Definitions/hdtime.yml

@@ -84,7 +84,6 @@ login:
     trackerssl: yes
   error:
     - selector: td.embedded:has(h2:contains("失败"))
-    - selector: td.embedded:has(h2:contains("Failed"))
   test:
     path: index.php
     selector: a[href="logout.php"]
@@ -99,8 +98,8 @@ search:
     incldead: 0
     # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
     spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 title, 1 descr, 3 uploader, 4 imdburl (not working)
-    search_area: "{{ if or .Query.IMDBID .Query.DoubanID }}1{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}{{ end }}{{ if .Query.DoubanID }}1{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}0{{ end }}"
     # 0 AND, 1 OR, 2 exact
     search_mode: 0
     sort: "{{ .Config.sort }}"
@@ -188,5 +187,5 @@ search:
       text: 0.81
     description:
       selector: td.rowfollow:nth-child(2)
-      remove: a, img
-# NexusPHP v1.7.33 2023-01-04
+      remove: a, b, font, img, span
+# NexusPHP v1.7.37 2023-05-08

src/Jackett.Common/Definitions/hdtorrentsit.yml

@@ -48,6 +48,7 @@ search:
   paths:
     - path: browse.php
       method: post
+  allowEmptyInputs: true
   keywordsfilters:
     - name: re_replace
       args: ["[^a-zA-Z0-9]+", "%"]
@@ -60,6 +61,7 @@ search:
   inputs:
     ajax: false
     search: "{{ .Keywords }}"
+    # 0 active 1 incldead 2 onlydead 3 gold 4 no seeders
     incldead: 0
 
   rows:

src/Jackett.Common/Definitions/hdturk.yml

@@ -96,6 +96,10 @@ settings:
     type: info
     label: How to get the Cookie
     default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: freeleech
+    type: checkbox
+    label: Filter freeleech only
+    default: false
 
 login:
   method: cookie
@@ -132,7 +136,7 @@ search:
     # does not return imdb link in results
 
   rows:
-    selector: table#sortabletable tbody tr:has(div[id^="port-target-"])
+    selector: "table#sortabletable tbody tr:has(div[id^=\"port-target-\"]){{ if .Config.freeleech }}:has(img[src$=\"/freedownload.gif\"]){{ else }}{{ end }}"
 
   fields:
     title:

src/Jackett.Common/Definitions/hdu.yml

@@ -40,6 +40,22 @@ settings:
     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
@@ -78,12 +94,20 @@ search:
     search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
     # 0=AND, 1=OR, 2=Exact
     search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
     notnewword: 1
 
   rows:
     selector: table.torrents > tbody > tr:has(table.torrentname)
 
   fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
     title_default:
       selector: a[href^="details.php?id="]
     title:
@@ -91,12 +115,6 @@ 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
@@ -153,5 +171,5 @@ search:
       text: 259200
     description:
       selector: td.rowfollow:nth-child(2)
-      remove: a, img
+      remove: a, b, font, img, span
 # NexusPHP Standard v1.5 Beta 4

src/Jackett.Common/Definitions/hdvideo.yml

@@ -1,24 +1,23 @@
 ---
-id: ihdbits
-name: iHDBits
-description: "iHDBits is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
+id: hdvideo
+name: HDVIDEO
+description: "HDVIDEO is a CHINESE Private torrent tracker for MOVIES / TV / GENERAL"
 language: zh-CN
 type: private
 encoding: UTF-8
 links:
-  - https://ihdbits.me/
+  - https://hdvideo.one/
 
 caps:
   categorymappings:
     - {id: 401, cat: Movies, desc: "Movies/电影"}
-    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
-    - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
-    - {id: 402, cat: TV, desc: "TV Series/连续剧"}
+    - {id: 402, cat: TV, desc: "TV Series/电视剧"}
     - {id: 403, cat: TV, desc: "TV Shows/综艺"}
-    - {id: 406, cat: Audio/Video, desc: "Music Videos/MV"}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
+    - {id: 405, cat: TV/Anime, desc: "Anime/动漫"}
+    - {id: 406, cat: Audio/Video, desc: "Music Videos/演唱会"}
     - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
-    - {id: 409, cat: Other, desc: "Misc/其他"}
-    - {id: 408, cat: Audio, desc: "Music/音乐"}
+    - {id: 408, cat: Audio, desc: "HQ Audio/音乐"}
 
   modes:
     search: [q]
@@ -39,7 +38,7 @@ settings:
   - name: info_2fa
     type: info
     label: "About 2FA code"
-    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the iHDBits Web Site. Otherwise just leave it empty."
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the HDVIDEO Web Site. Otherwise just leave it empty."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -84,7 +83,6 @@ login:
     trackerssl: yes
   error:
     - selector: td.embedded:has(h2:contains("失败"))
-    - selector: td.embedded:has(h2:contains("Failed"))
   test:
     path: index.php
     selector: a[href="logout.php"]
@@ -99,16 +97,16 @@ search:
     incldead: 0
     # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
     spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 title, 1 descr, 3 uploader, 4 imdburl (not working)
-    search_area: "{{ if or .Query.IMDBID .Query.DoubanID }}1{{ 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(a[href^="details.php?id="])
+    selector: table.torrents > tbody > tr:has(table.torrentname)
 
   fields:
     category:
@@ -130,9 +128,6 @@ search:
     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"]
@@ -184,12 +179,7 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 5 day (as seconds = 5 x 24 x 60 x 60)
-      text: 432000
     description:
-      selector: td.rowfollow:nth-child(2)
-      remove: a, img
-# NexusPHP v1.7.30 2022-11-05
+      selector: td:nth-child(2)
+      remove: a, b, font, img, span
+# NexusPHP v1.8.1 2023-04-21

src/Jackett.Common/Definitions/hdzone.yml

@@ -204,5 +204,5 @@ search:
 #       text: 1209600
     description:
       selector: td:nth-child(2)
-      remove: a, img
+      remove: a, b, font, img, span
 # NexusPHP Standard v1.5 Beta 4

src/Jackett.Common/Definitions/hellashut.yml

@@ -143,11 +143,10 @@ search:
 
   fields:
     category:
-      text: 56
-    category|noappend:
       selector: a[href*="cat="]
       attribute: href
       optional: true
+      default: 56
       filters:
         - name: querystring
           args: cat

src/Jackett.Common/Definitions/hhanclub.yml

@@ -76,8 +76,8 @@ search:
     incldead: 0
     # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
     spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 title, 1 descr, 3 uploader, 4 imdburl (not working)
-    search_area: "{{ if or .Query.IMDBID .Query.DoubanID }}1{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}{{ end }}{{ if .Query.DoubanID }}1{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}0{{ end }}"
     # 0 AND, 1 OR, 2 exact
     search_mode: 0
     sort: "{{ .Config.sort }}"
@@ -168,5 +168,5 @@ search:
       text: 86400
     description:
       selector: td.rowfollow:nth-child(2)
-      remove: a, img
-# NexusPHP v1.7.30 2022-11-05
+      remove: a, b, font, img, span
+# NexusPHP v1.7.34 2023-01-16

src/Jackett.Common/Definitions/houseofdevil.yml

@@ -29,7 +29,7 @@ caps:
     - {id: 127, cat: Movies, desc: "Fuer Unsere Kleinsten"}
     - {id: 121, cat: PC/Mobile-Other, desc: "Handy-Stuff"}
     - {id: 124, cat: Audio, desc: "Musik - Alben"}
-    - {id: 140, cat: Audio, desc: "Musik - Diskografie"}
+    - {id: 141, cat: Audio, desc: "Musik - Diskografie"}
     - {id: 122, cat: Audio/Audiobook, desc: "Musik - Hoerbuch"}
     - {id: 123, cat: Audio, desc: "Musik - Mixe"}
     - {id: 133, cat: Audio/MP3, desc: "Musik - MP3"}