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

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

README.md

@@ -28,9 +28,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ØMagnet
  * 1337x
  * ACG.RIP
- * ACGsou (36DM)
  * Anidex
  * AniLibria
+ * Anime Time
  * Anime Tosho
  * AniRena
  * AniSource
@@ -113,6 +113,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Sexy-Pics
  * Shana Project
  * ShowRSS
+ * SimpleAnime
  * Solid Torrents
  * sosulki
  * SubsPlease
@@ -160,23 +161,19 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Anime-Free
  * AnimeLayer
  * ArenaBG
- * BitNova
  * BookTracker
  * BootyTape
  * Catorrent
- * Darmowe torrenty
  * Deildu
  * Demonoid
  * Devil-Torrents
  * DXP (Deaf Experts)
  * Electro-Torrent
- * EliteTorrent-pl
  * EniaHD
  * Erai-Raws
  * Ex-torrenty
  * ExKinoRay
  * ExtremlymTorrents
- * Fenyarnyek-Tracker
  * File-Tracker
  * Gay-Torrents.net
  * Genesis-Movement
@@ -224,7 +221,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TribalMixes
  * Union Fansub
  * UniOtaku
- * vTorrent
  * xTorrenty
  * YggTorrent (YGG)
  * ZOMB
@@ -260,7 +256,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Araba Fenice (Phoenix) [![(invite needed)][inviteneeded]](#)
  * ArabP2P
  * ArabTorrents [![(invite needed)][inviteneeded]](#)
- * aro.lol
  * AsianCinema
  * AsianDVDClub
  * Audiences
@@ -310,6 +305,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * CHDBits [![(invite needed)][inviteneeded]](#)
  * cheggit
  * ChileBT
+ * CiNEFiLHD
  * Cinemageddon [![(invite needed)][inviteneeded]](#)
  * CinemaMovieS_ZT
  * Cinematik [![(invite needed)][inviteneeded]](#)
@@ -322,6 +318,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * CrnaBerza
  * Dajiao (打胶) [![(invite needed)][inviteneeded]](#)
  * DANISH BYTES
+ * Darius Tracker
  * Dark-Shadow
  * DataScene (DS)
  * DataTalli
@@ -367,7 +364,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * GiroTorrent
  * GreatPosterWall (GPW)
  * GreekDiamond
- * Greek Team [![(invite needed)][inviteneeded]](#)
+ * Greek Team
  * HaiDan
  * Haitang
  * HappyFappy
@@ -425,6 +422,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Le Saloon
  * LaidBackManor
  * Lat-Team [![(invite needed)][inviteneeded]](#)
+ * Le-Cinephile
  * LearnBits
  * LearnFlakes
  * leech24
@@ -470,7 +468,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * OurBits (HDPter)
  * P2PBG
  * Panda
- * Partis
  * Party-Tracker
  * PassThePopcorn (PTP)
  * Peeratiko
@@ -510,10 +507,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * RetroFlix
  * RevolutionTT
  * Romanian Metal Torrents (RMT) [![(invite needed)][inviteneeded]](#)
+ * Rousi
  * SceneHD [![(invite needed)][inviteneeded]](#)
  * SceneRush
  * SceneTime
- * SDBits [![(invite needed)][inviteneeded]](#)
  * Secret Cinema
  * SeedFile
  * Shadowflow (影) [![(invite needed)][inviteneeded]](#)
@@ -605,6 +602,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * White Angel
  * World-In-HD [![(invite needed)][inviteneeded]](#)
  * World-of-Tomorrow
+ * Wukong
  * x-ite.me (XM)
  * xBytesV2
  * XSpeeds (XS)

jackett_launcher.bat

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

src/Jackett.Common/Content/custom.js

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

src/Jackett.Common/Content/index.html

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

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

@@ -15,6 +15,7 @@ links:
   - https://x1337x.se/
   - https://1337x.unblockit.rsvp/
   - https://1337x.unblockninja.com/
+  - https://1337x.mrunblock.bond/
 legacylinks:
   - https://1337x.is/
   - https://1337x.nocensor.work/
@@ -188,6 +189,10 @@ search:
     - path: "{{ if or .Query.Album .Query.Artist .Keywords }}sort-search{{ else }}cat/Music{{ end }}{{ if or .Query.Album .Query.Artist }}/{{ or .Query.Album .Query.Artist }}{{ else }}/{{ .Keywords }}{{ end }}{{ if or .Query.Album .Query.Artist .Keywords }}/{{ else }}{{ end }}{{ .Config.sort }}/{{ .Config.type }}/{{ if or .Query.Album .Query.Artist .Keywords }}3{{ else }}1{{ end }}/"
     - path: "{{ if or .Query.Album .Query.Artist .Keywords }}sort-search{{ else }}cat/Other{{ end }}{{ if or .Query.Album .Query.Artist }}/{{ or .Query.Album .Query.Artist }}{{ else }}/{{ .Keywords }}{{ end }}{{ if or .Query.Album .Query.Artist .Keywords }}/{{ else }}{{ end }}{{ .Config.sort }}/{{ .Config.type }}/{{ if or .Query.Album .Query.Artist .Keywords }}4{{ else }}1{{ end }}/"
 
+  keywordsfilters:
+    - name: re_replace # daily standard S2023 > 2023
+      args: ["\\bS(20\\d{2})\\b", "$1"]
+
   rows:
     selector: tr:has(a[href^="/torrent/"])
 

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

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

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

@@ -11,6 +11,7 @@ links:
 
 caps:
   categorymappings:
+    # special.php
     - {id: 401, cat: Movies, desc: "Movies(电影)", default: true}
     - {id: 402, cat: TV, desc: "TV Series(电视剧)", default: true}
     - {id: 403, cat: TV, desc: "TV Shows(综艺)", default: true}
@@ -19,7 +20,6 @@ caps:
     - {id: 406, cat: Audio/Video, desc: "Music Videos(MV)", default: true}
     - {id: 407, cat: TV/Sport, desc: "Sports(体育运动)", default: true}
     - {id: 408, cat: Audio, desc: "HQ Audio(音乐)", default: true}
-    - {id: 409, cat: Other, desc: "Misc(其他)", default: true}
     - {id: 410, cat: Books, desc: "eBook(电子书)", default: true}
     - {id: 411, cat: PC/Games, desc: "PCGame(游戏)", default: true}
     - {id: 413, cat: Audio/Video, desc: "AV(无码)", default: true}
@@ -29,9 +29,12 @@ caps:
     - {id: 422, cat: XXX, desc: "HGame(H游戏)", default: true}
     - {id: 423, cat: XXX, desc: "IV(写真影片)", default: true}
     - {id: 424, cat: XXX, desc: "IV(写真图集)", default: true}
-    # special
-    - {id: 526, cat: Movies, desc: "VRMovies(3D/VR电影)", default: false}
-    - {id: 527, cat: TV, desc: "VRSeries(3D/VR剧集)", default: false}
+    - {id: 409, cat: Other, desc: "Misc(其他)", default: true}
+    # torrents.php
+    - {id: 526, cat: Movies, desc: "3DMovies(3D电影)", default: false}
+    - {id: 527, cat: TV, desc: "3DSeries(3D剧集)", default: false}
+    - {id: 533, cat: Movies, desc: "VRMovies(VR电影)", default: false}
+    - {id: 534, cat: TV, desc: "VRSeries(VR剧集)", default: false}
     - {id: 528, cat: Audio/Video, desc: "AV(VR无码)", default: false}
     - {id: 529, cat: Audio/Video, desc: "AV(VR有码)", default: false}
     - {id: 530, cat: Console, desc: "VRGame(VR一体机游戏)", default: false}
@@ -58,7 +61,7 @@ settings:
   - name: info_2fa
     type: info
     label: "About 2FA code"
-    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the ICC2022 Web Site. Otherwise just leave it empty."
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the 2xFree Web Site. Otherwise just leave it empty."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -113,10 +116,10 @@ login:
 
 search:
   paths:
-    - path: torrents.php
-      categories: [401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 413, 420, 421, 422, 423, 424]
     - path: special.php
-      categories: [526, 527, 528, 529, 530, 531, 532]
+      categories: [401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 413, 420, 421, 422, 423, 424]
+    - path: torrents.php
+      categories: [526, 527, 533, 534, 528, 529, 530, 531, 532]
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
     search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }} {{ else }}{{ .Keywords }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}"

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

@@ -47,7 +47,7 @@ settings:
   - name: info_2fa
     type: info
     label: "About 2FA code"
-    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the ICC2022 Web Site. Otherwise just leave it empty."
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the 3Wmg Web Site. Otherwise just leave it empty."
   - name: freeleech
     type: checkbox
     label: Search freeleech only

src/Jackett.Common/Definitions/acgsou.yml

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

src/Jackett.Common/Definitions/aftershock.yml

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

src/Jackett.Common/Definitions/animetime.yml

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

src/Jackett.Common/Definitions/anisource.yml

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

src/Jackett.Common/Definitions/asiandvdclub.yml

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

src/Jackett.Common/Definitions/badasstorrents.yml

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

src/Jackett.Common/Definitions/bigfangroup.yml

@@ -90,14 +90,17 @@ settings:
 
 search:
   # https://bigfangroup.org/browse.php?search=black+lightning&cat=0&incldead=0&year=0&format=0
+  headers:
+    Referer: ["{{ .Config.sitelink }}browse.php?search={{ .Keywords }}&cat=0&incldead=1&year=0&format=0"]
   paths:
+    # https://bigfangroup.org/browse.php?ajax=1&search=the+librarian&cat=0&incldead=0&year=0&format=0
     - path: browse.php
   inputs:
+    ajax: 1
     search: "{{ .Keywords }}"
     cat: 0
     # 0 active, 1 incldead, 2 onlydead, 3 gold, 4 noseed, 5 silver, 7 BFG
     incldead: 1
-    ajax: 1
     year: 0
     format: 0
     s: "{{ .Config.sort }}"

src/Jackett.Common/Definitions/bitbazis.yml

@@ -11,42 +11,30 @@ links:
 
 caps:
   categorymappings:
-    - {id: 85, cat: Movies/SD, desc: "Film/Cam/Hun", default: true}
-    - {id: 86, cat: Movies/SD, desc: "Film/Cam/Eng", default: true}
-    - {id: 15, cat: Movies/SD, desc: "Film/SD/Hun", default: true}
-    - {id: 16, cat: Movies/SD, desc: "Film/SD/Eng", default: true}
-    - {id: 17, cat: Movies/DVD, desc: "Film/DVD/Hun", default: true}
-    - {id: 19, cat: Movies/DVD, desc: "Film/DVD/Eng", default: true}
-    - {id: 83, cat: Movies/HD, desc: "Film/HD/Hun", default: true}
-    - {id: 82, cat: Movies/HD, desc: "Film/HD/Eng", default: true}
-    - {id: 94, cat: Movies/HD, desc: "Film/FHD/Hun", default: true}
-    - {id: 95, cat: Movies/HD, desc: "Film/FHD/Eng", default: true}
-    - {id: 92, cat: Movies/UHD, desc: "Film/UHD/Hun", default: true}
-    - {id: 93, cat: Movies/UHD, desc: "Film/UHD/Eng", default: true}
+    - {id: 85, cat: Movies/SD, desc: "Film/Cam", default: true}
+    - {id: 15, cat: Movies/SD, desc: "Film/SD", default: true}
+    - {id: 17, cat: Movies/DVD, desc: "Film/DVD", default: true}
+    - {id: 83, cat: Movies/HD, desc: "Film/HD", default: true}
+    - {id: 94, cat: Movies/HD, desc: "Film/FHD", default: true}
+    - {id: 92, cat: Movies/UHD, desc: "Film/UHD", default: true}
     - {id: 22, cat: TV, desc: "Sorozat/Hun", default: true}
     - {id: 58, cat: TV, desc: "Sorozat/Eng", default: true}
     - {id: 64, cat: Movies, desc: "Film/Pack", default: true}
-    - {id: 66, cat: XXX/ImageSet, desc: "Képek/XXX", default: false}
-    - {id: 33, cat: XXX/SD, desc: "SD/XXX", default: false}
-    - {id: 89, cat: XXX/x264, desc: "HD/XXX", default: false}
+    - {id: 66, cat: XXX/ImageSet, desc: "XXX/Pics", default: false}
+    - {id: 33, cat: XXX/SD, desc: "XXX/SD", default: false}
+    - {id: 89, cat: XXX/x264, desc: "XXX/HD", default: false}
     - {id: 24, cat: Audio/Video, desc: "Videóklip", default: true}
     - {id: 70, cat: Audio/Audiobook, desc: "Hangoskönyv", default: true}
-    - {id: 27, cat: Books/EBook, desc: "Könyv/Hun", default: true}
-    - {id: 50, cat: Books/EBook, desc: "Könyv/Eng", default: true}
+    - {id: 27, cat: Books/EBook, desc: "Könyv", default: true}
     - {id: 69, cat: TV/Anime, desc: "Mese/SD", default: true}
-    - {id: 68, cat: TV/Anime, desc: "Mese/DVD", default: true}
     - {id: 91, cat: TV/Anime, desc: "Mese/HD", default: true}
     - {id: 25, cat: Audio/MP3, desc: "Mp3/Hun", default: true}
     - {id: 26, cat: Audio/MP3, desc: "Mp3/Eng", default: true}
     - {id: 84, cat: Audio/Lossless, desc: "Lossless/Hun", default: true}
     - {id: 71, cat: Audio/Lossless, desc: "Lossless/Eng", default: true}
-    - {id: 31, cat: PC/Games, desc: "Játék/PC", default: true}
-    - {id: 54, cat: Console, desc: "Játék/Konzol", default: true}
-    - {id: 81, cat: PC/0day, desc: "Program/PC", default: true}
-    - {id: 67, cat: PC/Mobile-Android, desc: "Program/Mobil", default: true}
-    - {id: 49, cat: PC/0day, desc: "Program/Rip", default: true}
+    - {id: 31, cat: PC/Games, desc: "Játék", default: true}
+    - {id: 81, cat: PC/0day, desc: "Program", default: true}
     - {id: 14, cat: PC, desc: "Program/Egyéb", default: true}
-    - {id: 65, cat: Other, desc: "Egyéb", default: true}
     - {id: 97, cat: TV/Anime, desc: "Sorozat/Mese", default: true}
 
   modes:

src/Jackett.Common/Definitions/bitnova.yml

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

src/Jackett.Common/Definitions/bitsearch.yml

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

src/Jackett.Common/Definitions/btsow.yml

@@ -7,9 +7,8 @@ type: public
 encoding: UTF-8
 # use https://tellme.pw/btsow to find the new domain
 links:
-  - https://btsow.skin/
+  - https://btsow.makeup/
 legacylinks:
-  - https://btsow.shop/
   - https://btsow.us/
   - https://btsow.one/
   - https://btsow.rest/
@@ -24,6 +23,7 @@ legacylinks:
   - https://btsow.boats/
   - https://btsow.hair/
   - https://btsow.bond/
+  - https://btsow.skin/
 
 caps:
   categories:

src/Jackett.Common/Definitions/byrbt.yml

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

src/Jackett.Common/Definitions/cinefilhd.yml

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

src/Jackett.Common/Definitions/cpabien.yml

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

src/Jackett.Common/Definitions/dariustracker.yml

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

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

@@ -6,10 +6,10 @@ language: de-DE
 type: private
 encoding: UTF-8
 links:
-  - https://projekt.dark-shadow.me/
+  - https://dark-shadow.me/
 legacylinks:
   - https://dark-shadow.ml/
-  - https://dark-shadow.me/
+  - https://projekt.dark-shadow.me/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/demonoid.yml

@@ -12,7 +12,7 @@ links:
   - https://www.dnoid.pw/
   - https://demonoid.unblockit.rsvp/
   - https://demonoid.torrentbay.net/
-  - https://demonoid.mrunblock.life/
+  - https://demonoid.mrunblock.bond/
   - https://demonoid.nocensor.click/
 legacylinks:
   - https://demonoid.nocensor.biz/
@@ -42,6 +42,7 @@ legacylinks:
   - https://demonoid.unblockit.click/
   - https://demonoid.unblockit.asia/
   - https://demonoid.unblockit.mov/
+  - https://demonoid.mrunblock.life/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/drugari.yml

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

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

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

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

@@ -8,7 +8,7 @@ encoding: UTF-8
 links:
   - https://extratorrent.st/
   - https://extratorrent.unblockit.rsvp/
-  - https://extratorrent.mrunblock.life/
+  - https://extratorrent.mrunblock.bond/
   - https://extratorrent.nocensor.click/
 legacylinks:
   - https://extratorrent.nocensor.work/
@@ -33,6 +33,7 @@ legacylinks:
   - https://extratorrent.unblockit.click/
   - https://extratorrent.unblockit.asia/
   - https://extratorrent.unblockit.mov/
+  - https://extratorrent.mrunblock.life/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/eztv.yml

@@ -14,7 +14,7 @@ links:
   - https://eztv1.xyz/
   - https://eztv.unblockninja.com/
   - https://eztv.unblockit.rsvp/
-  - https://eztv.mrunblock.life/
+  - https://eztv.mrunblock.bond/
   - https://eztv.nocensor.click/
 legacylinks:
   - https://eztv.ag/ # redirects to .re
@@ -42,6 +42,7 @@ legacylinks:
   - https://eztv.unblockit.click/
   - https://eztv.unblockit.asia/
   - https://eztv.unblockit.mov/
+  - https://eztv.mrunblock.life/
 
 caps:
   categories:

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

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

src/Jackett.Common/Definitions/filelisting.yml

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

src/Jackett.Common/Definitions/frozenlayer.yml

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

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

@@ -81,6 +81,7 @@ settings:
     type: info
     label: Reminder from GF-Free Admin
     default: "Attention users of third-party software like Jackett or Radarr, Sonarr or similar:<br>Despite your seed downloads you must physically connect to the web site with your browser or risk being <b>Banned for non-participation</b>...<br><ol>We ask :<li>Remain in seed at least 48 hours on the media to avoid H$R</li><li>And much more depending on your storage means</li><li>Participate in the life of the site shout forum...</li><li>Connect regularly to possibly read your private messages.</li></ol>"
+
 login:
   path: /api/torrents
   method: get
@@ -152,13 +153,10 @@ search:
       selector: details_link
     download:
       selector: download_link
-    magnet:
-      selector: magnet_link
-      optional: true
     infohash:
       selector: info_hash
     poster:
-      selector: poster
+      selector: meta.poster
       filters:
         - name: replace
           args: ["https://via.placeholder.com/90x135", ""]
@@ -168,6 +166,13 @@ search:
       selector: tmdb_id
     tvdbid:
       selector: tvdb_id
+    genre:
+      selector: meta.genres
+      filters:
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
     files:
       selector: num_file
     seeders:
@@ -205,4 +210,4 @@ search:
     minimumseedtime:
       # 2 days (as seconds = 2 x 24 x 60 x 60)
       text: 172800
-# json UNIT3D 6.3.0
+# json UNIT3D 6.5.0

src/Jackett.Common/Definitions/gktorrent.yml

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

src/Jackett.Common/Definitions/glodls.yml

@@ -11,7 +11,7 @@ links:
   - https://gtdb.cc/
   - https://www.gtdb.to/
   - https://glotorrents.unblockit.rsvp/
-  - https://glotorrents.mrunblock.life/
+  - https://glotorrents.mrunblock.bond/
   - https://glodls.unblockninja.com/
   - https://glotorrents.nocensor.click/
 legacylinks:
@@ -38,6 +38,7 @@ legacylinks:
   - https://glotorrents.unblockit.click/
   - https://glotorrents.unblockit.asia/
   - https://glotorrents.unblockit.mov/
+  - https://glotorrents.mrunblock.life/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/greekteam.yml

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

src/Jackett.Common/Definitions/hdarea.yml

@@ -6,6 +6,8 @@ language: zh-CN
 type: private
 encoding: UTF-8
 links:
+  - https://www.hdarea.club/
+legacylinks:
   - https://www.hdarea.co/
 
 caps:

src/Jackett.Common/Definitions/hdchina.yml

@@ -65,7 +65,7 @@ login:
     cookie: "{{ .Config.cookie }}"
   test:
     path: torrents.php
-    selector: a[href="logout.php"]
+    selector: a[href^="logout.php"]
 
 search:
   paths:
@@ -114,21 +114,27 @@ search:
       selector: td.t_torrents
     leechers:
       selector: td.t_leech
-    date:
-      selector: td.t_time
+    date_elapsed:
+      # time type: time elapsed (default)
+      selector: td.t_time > span[title]
+      attribute: title
+      optional: true
       filters:
-        - name: replace
-          args: ["时", " hours"]
-        - name: replace
-          args: ["分", " minutes"]
-        - name: replace
-          args: ["天", " days"]
-        - name: replace
-          args: ["年", " year"]
-        - name: replace
-          args: ["月", " months"]
         - name: append
-          args: " ago"
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    date_added:
+      # time added
+      selector: td.t_time:not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-ddHH:mm:ss zzz"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
     downloadvolumefactor:
       # DLVF and ULVF are dynamically presented via javascript so not available to cardigann
       text: 1

src/Jackett.Common/Definitions/hdcztorrent.yml

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

src/Jackett.Common/Definitions/hdforever.yml

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

src/Jackett.Common/Definitions/hdgalaktik.yml

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

src/Jackett.Common/Definitions/hdmayi.yml

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

src/Jackett.Common/Definitions/hdtime.yml

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

src/Jackett.Common/Definitions/ilcorsaronero.yml

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

src/Jackett.Common/Definitions/kufei.yml

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

src/Jackett.Common/Definitions/lastfiles.yml

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

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

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

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

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

src/Jackett.Common/Definitions/limetorrents.yml

@@ -11,7 +11,7 @@ links:
   - https://www.limetorrents.lol/
   - https://limetorrents.unblockit.rsvp/
   - https://limetorrents.unblockninja.com/
-  - https://limetorrents.mrunblock.life/
+  - https://limetorrents.mrunblock.bond/
   - https://limetorrents.nocensor.click/
 legacylinks:
   - https://www.limetorrents.io/
@@ -40,6 +40,7 @@ legacylinks:
   - https://limetorrents.unblockit.click/
   - https://limetorrents.unblockit.asia/
   - https://limetorrents.unblockit.mov/
+  - https://limetorrents.mrunblock.life/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/marinetracker.yml

@@ -151,6 +151,7 @@ caps:
     - {id: 289, cat: Books, desc: "Shipmodeling-Ships in Bottles"}
     - {id: 197, cat: Books, desc: "Marine bulletins"}
     - {id: 219, cat: Books, desc: "Marine History"}
+    - {id: 347, cat: Books, desc: "Marine History-Sea Life"}
     - {id: 323, cat: Books, desc: "Marine History-History of Submarines"}
     - {id: 282, cat: Books, desc: "Marine History-Fleets history"}
     - {id: 281, cat: Books, desc: "Marine History-History of Merchant Marine"}

src/Jackett.Common/Definitions/mazepa.yml

@@ -12,71 +12,73 @@ caps:
   categorymappings:
     # note: when refreshing cats use the tracker.php not the search.php!
     - {id: 37, cat: Movies, desc: "Українські фільми HD, UHD"}
-    - {id: 7, cat: Movies, desc: " |- Українські фільми"}
+    - {id: 7, cat: Movies, desc: "Українські фільми HD, UHD Українські фільми"}
     - {id: 38, cat: TV, desc: "Українські серіали HD, UHD"}
-    - {id: 8, cat: TV, desc: " |- Українські серіали"}
+    - {id: 8, cat: TV, desc: "Українські серіали HD, UHD Українські серіали"}
     - {id: 35, cat: TV/Anime, desc: "Українські мультфільми HD, UHD"}
-    - {id: 5, cat: TV/Anime, desc: " |- Українські мультфільми"}
+    - {id: 5, cat: TV/Anime, desc: "Українські мультфільми HD, UHD Українські мультфільми"}
     - {id: 36, cat: TV/Anime, desc: "Українські мультсеріали HD, UHD"}
-    - {id: 6, cat: TV/Anime, desc: " |- Українські мультсеріали"}
+    - {id: 6, cat: TV/Anime, desc: "Українські мультсеріали HD, UHD Українські мультсеріали"}
     - {id: 39, cat: TV/Documentary, desc: "Українська документалістика HD, UHD"}
-    - {id: 9, cat: TV/Documentary, desc: " |- Українська документалістика"}
-    - {id: 13, cat: Movies/SD, desc: " |- Фільми SD"}
-    - {id: 12, cat: Movies/HD, desc: " |- Фільми HD"}
-    - {id: 147, cat: Movies/UHD, desc: " |- Фільми UHD"}
-    - {id: 14, cat: TV/SD, desc: " |- Серіали SD"}
-    - {id: 44, cat: TV/HD, desc: " |- Серіали HD"}
-    - {id: 152, cat: TV/UHD, desc: " |- Серіали UHD"}
-    - {id: 10, cat: TV/Anime, desc: " |- Мультфільми SD"}
-    - {id: 41, cat: TV/Anime, desc: " |- Мультфільми HD"}
-    - {id: 155, cat: TV/Anime, desc: " |- Мультфільми UHD"}
-    - {id: 11, cat: TV/Anime, desc: " |- Мультсеріали SD"}
-    - {id: 43, cat: TV/Anime, desc: " |- Мультсеріали HD"}
+    - {id: 9, cat: TV/Documentary, desc: "Українська документалістика HD, UHD Українська документалістика"}
+    - {id: 13, cat: Movies/SD, desc: "Озвучений контент Фільми SD"}
+    - {id: 12, cat: Movies/HD, desc: "Озвучений контент Фільми HD"}
+    - {id: 147, cat: Movies/UHD, desc: "Озвучений контент Фільми UHD"}
+    - {id: 174, cat: Movies, desc: "Озвучений контент Субтитровані фільми"}
+    - {id: 14, cat: TV/SD, desc: "Озвучений контент Серіали SD"}
+    - {id: 44, cat: TV/HD, desc: "Озвучений контент Серіали HD"}
+    - {id: 152, cat: TV/UHD, desc: "Озвучений контент Серіали UHD"}
+    - {id: 10, cat: TV/Anime, desc: "Озвучений контент Мультфільми SD"}
+    - {id: 41, cat: TV/Anime, desc: "Озвучений контент Мультфільми HD"}
+    - {id: 155, cat: TV/Anime, desc: "Озвучений контент Мультфільми UHD"}
+    - {id: 11, cat: TV/Anime, desc: "Озвучений контент Мультсеріали SD"}
+    - {id: 43, cat: TV/Anime, desc: "Озвучений контент Мультсеріали HD"}
     - {id: 16, cat: TV/Anime, desc: "Аніме"}
-    - {id: 15, cat: TV/Documentary, desc: " |- Документальне SD"}
-    - {id: 42, cat: TV/Documentary, desc: " |- Документальне HD"}
-    - {id: 157, cat: TV/Documentary, desc: " |- Документальне UHD"}
-    - {id: 20, cat: TV/Sport, desc: " |- Формула 1 Сезон 2023"}
-    - {id: 167, cat: TV/Sport, desc: " |- Формула 1 Сезон 2022"}
-    - {id: 79, cat: TV/Sport, desc: " |- Формула 1 Сезони 2017-2021"}
-    - {id: 21, cat: TV/Sport, desc: " |- Формула 1 Сезони 2007-2016"}
-    - {id: 75, cat: TV/Sport, desc: " |- Формула 1 Сезони до 2006"}
+    - {id: 15, cat: TV/Documentary, desc: "Аніме Документальне SD"}
+    - {id: 42, cat: TV/Documentary, desc: "Аніме Документальне HD"}
+    - {id: 157, cat: TV/Documentary, desc: "Аніме Документальне UHD"}
+    - {id: 20, cat: TV/Sport, desc: "Спорт Формула 1 Сезон 2023"}
+    - {id: 167, cat: TV/Sport, desc: "Спорт Формула 1 Сезон 2022"}
+    - {id: 79, cat: TV/Sport, desc: "Спорт Формула 1 Сезони 2017-2021"}
+    - {id: 21, cat: TV/Sport, desc: "Спорт Формула 1 Сезони 2007-2016"}
+    - {id: 75, cat: TV/Sport, desc: "Спорт Формула 1 Сезони до 2006"}
     - {id: 77, cat: TV/Sport, desc: "Автоспорт"}
-    - {id: 47, cat: TV/Sport, desc: " |- Чемпіонат та кубок України"}
-    - {id: 46, cat: TV/Sport, desc: " |- Єврокубки"}
-    - {id: 48, cat: TV/Sport, desc: " |- Чемпіонат Світу"}
-    - {id: 49, cat: TV/Sport, desc: " |- Чемпіонат Європи"}
-    - {id: 53, cat: TV/Sport, desc: " |- Закордонні чемпіонати"}
+    - {id: 47, cat: TV/Sport, desc: "Автоспорт Чемпіонат та кубок України"}
+    - {id: 46, cat: TV/Sport, desc: "Автоспорт Єврокубки"}
+    - {id: 48, cat: TV/Sport, desc: "Автоспорт Чемпіонат Світу"}
+    - {id: 49, cat: TV/Sport, desc: "Автоспорт Чемпіонат Європи"}
+    - {id: 53, cat: TV/Sport, desc: "Автоспорт Закордонні чемпіонати"}
     - {id: 19, cat: TV/Sport, desc: "Бокс"}
     - {id: 29, cat: Audio/Video, desc: "Концерти, відеокліпи"}
     - {id: 30, cat: TV, desc: "Теле-Шоу"}
-    - {id: 65, cat: Audio, desc: " |- Рок"}
-    - {id: 63, cat: Audio, desc: " |- Поп, Диско"}
-    - {id: 66, cat: Audio, desc: " |- Фольк, Етно, Народна, Бардівська"}
-    - {id: 64, cat: Audio, desc: " |- Реп"}
-    - {id: 67, cat: Audio, desc: " |- Електронна"}
-    - {id: 61, cat: Audio, desc: " |- Джаз, Блюз"}
-    - {id: 60, cat: Audio, desc: " |- Класична, Інструментальна"}
-    - {id: 82, cat: Audio, desc: " |- Невидане"}
-    - {id: 160, cat: Audio, desc: " |- Rock, Alternative, Punk, Metal"}
-    - {id: 161, cat: Audio, desc: " |- Pop"}
-    - {id: 165, cat: Audio, desc: " |- Jazz, Blues, Soul"}
-    - {id: 163, cat: Audio, desc: " |- Rap, Hip-hop, RnB, Reggae"}
-    - {id: 166, cat: Audio, desc: " |- Country, Country pop, Bluegrass, Southern rock"}
-    - {id: 162, cat: Audio, desc: " |- Electronic"}
-    - {id: 164, cat: Audio, desc: " |- Other Styles"}
-    - {id: 93, cat: Books, desc: " |- Українська художня література [до 1991 р.]"}
-    - {id: 92, cat: Books, desc: " |- Українська художня література (після 1991 р.)"}
-    - {id: 91, cat: Books, desc: " |- Зарубіжна художня література"}
-    - {id: 90, cat: Books, desc: " |- Наукова література (гуманітарні дисципліни)"}
-    - {id: 89, cat: Books, desc: " |- Наукова література (природничі дисципліни)"}
-    - {id: 88, cat: Books, desc: " |- Навчальна та довідкова"}
-    - {id: 87, cat: Books, desc: " |- Періодика"}
-    - {id: 86, cat: Books, desc: " |- Батькам та малятам"}
-    - {id: 85, cat: Books, desc: " |- Графіка (комікси, манґа, BD та інше)"}
-    - {id: 96, cat: Books, desc: " |- Українська художня література"}
-    - {id: 95, cat: Books, desc: " |- Зарубіжна художня література"}
-    - {id: 94, cat: Books, desc: " |- Історія, біографістика, спогади"}
+    - {id: 65, cat: Audio, desc: "Музика Рок"}
+    - {id: 63, cat: Audio, desc: "Музика Поп, Диско"}
+    - {id: 66, cat: Audio, desc: "Музика Фольк, Етно, Народна, Бардівська"}
+    - {id: 64, cat: Audio, desc: "Музика Реп"}
+    - {id: 67, cat: Audio, desc: "Музика Електронна"}
+    - {id: 61, cat: Audio, desc: "Музика Джаз, Блюз"}
+    - {id: 60, cat: Audio, desc: "Музика Класична, Інструментальна"}
+    - {id: 82, cat: Audio, desc: "Музика Невидане"}
+    - {id: 160, cat: Audio, desc: "Музика Rock, Alternative, Punk, Metal"}
+    - {id: 161, cat: Audio, desc: "Музика Pop"}
+    - {id: 165, cat: Audio, desc: "Музика Jazz, Blues, Soul"}
+    - {id: 163, cat: Audio, desc: "Музика Rap, Hip-hop, RnB, Reggae"}
+    - {id: 166, cat: Audio, desc: "Музика Country, Country pop, Bluegrass, Southern rock"}
+    - {id: 162, cat: Audio, desc: "Музика Electronic"}
+    - {id: 164, cat: Audio, desc: "Музика Other Styles"}
+    - {id: 93, cat: Books, desc: "Література Українська художня література [до 1991 р.]"}
+    - {id: 92, cat: Books, desc: "Література Українська художня література (після 1991 р.)"}
+    - {id: 91, cat: Books, desc: "Література Зарубіжна художня література"}
+    - {id: 90, cat: Books, desc: "Література Наукова література (гуманітарні дисципліни)"}
+    - {id: 89, cat: Books, desc: "Література Наукова література (природничі дисципліни)"}
+    - {id: 88, cat: Books, desc: "Література Навчальна та довідкова"}
+    - {id: 87, cat: Books, desc: "Література Періодика"}
+    - {id: 86, cat: Books, desc: "Література Батькам та малятам"}
+    - {id: 85, cat: Books, desc: "Література Графіка (комікси, манґа, BD та інше)"}
+    - {id: 84, cat: Books, desc: "Аудіокниги українською"}
+    - {id: 96, cat: Books, desc: "Література Українська художня література"}
+    - {id: 95, cat: Books, desc: "Література Зарубіжна художня література"}
+    - {id: 94, cat: Books, desc: "Література Історія, біографістика, спогади"}
     - {id: 168, cat: PC, desc: "Програмне забезпечення Операційні системи"}
     - {id: 169, cat: PC, desc: "Програмне забезпечення Системні програми"}
     - {id: 170, cat: PC, desc: "Програмне забезпечення Офіс, текстові редактори"}

src/Jackett.Common/Definitions/movieworld.yml

@@ -29,13 +29,14 @@ caps:
     - {id: 20, cat: Movies/SD, desc: "Movie/Cam"}
     - {id: 21, cat: XXX, desc: "Movie/XXX"}
     - {id: 23, cat: Movies/DVD, desc: "Movie/DvdRip"}
-    - {id: 25, cat: Audio/Video, desc: "Music/Misc"}
+    - {id: 25, cat: Movies, desc: "V.I.P."}
+    - {id: 32, cat: TV/Anime, desc: "Anime"}
+    - {id: 33, cat: Audio/Video, desc: "Music/Misc"}
     - {id: 28, cat: TV, desc: "Tv Packs"}
     - {id: 31, cat: TV, desc: "Tv Mini Packs"}
     - {id: 29, cat: TV/SD, desc: "Tv Episodes SD"}
     - {id: 30, cat: TV/HD, desc: "Tv Episodes HD"}
     - {id: 26, cat: TV/Sport, desc: "Tv Sport SD/HD"}
-    - {id: 32, cat: TV/Anime, desc: "Anime"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/nicept.yml

@@ -178,4 +178,4 @@ search:
       filters:
         - name: replace
           args: [" 剩余时间：", ""]
-# NexusPHP v1.8.3 2023-05-14
+# NexusPHP v1.8.4 2023-06-18

src/Jackett.Common/Definitions/nyaasi.yml

@@ -9,7 +9,7 @@ requestDelay: 2
 links:
   - https://nyaa.si/
   - https://nyaa.iss.ink/
-  - https://nyaa.mrunblock.life/ # for magnets only
+  - https://nyaa.mrunblock.bond/ # for magnets only
   - https://nyaa.unblockninja.com/ # for magnets only
   - https://nyaa.nocensor.click/
   - https://nyaa.land/
@@ -28,6 +28,7 @@ legacylinks:
   - https://nyaa.nocensor.lol/
   - https://nyaa.nocensor.art/
   - https://nyaa.mrunblock.guru/
+  - https://nyaa.mrunblock.life/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/oshenpt.yml

@@ -188,4 +188,4 @@ search:
     description:
       selector: td:nth-child(2)
       remove: a, b, font, img, span
-# NexusPHP v1.8.3 2023-05-14
+# NexusPHP v1.8.4 2023-06-13

src/Jackett.Common/Definitions/partis.yml

@@ -1,166 +0,0 @@
----
-id: partis
-name: Partis
-description: "Partis is a Private SLOVENIAN Torrent Tracker for MOVIES / TV / BOOKS / GENERAL"
-language: sl-SI
-type: private
-encoding: UTF-8
-links:
-  - https://www.partis.si/
-
-caps:
-  categorymappings:
-    # Movies / Filmi
-    - {id: 7, cat: Movies, desc: "Xvid"}
-    - {id: 20, cat: Movies/HD, desc: "HD"}
-    - {id: 55, cat: Movies/UHD, desc: "UHD 4K Remux"}
-    - {id: 32, cat: Movies/UHD, desc: "UHD 4K Disc"}
-    - {id: 40, cat: Movies/BluRay, desc: "Blu-ray 1080p/i"}
-    - {id: 41, cat: Movies/3D, desc: "Blu-ray 3D"}
-    - {id: 42, cat: Movies/BluRay, desc: "Blu-ray 720p/i"}
-    - {id: 43, cat: Movies/BluRay, desc: "Blu-ray B-Disc"}
-    - {id: 44, cat: Movies/BluRay, desc: "Blu-ray Remux"}
-    - {id: 45, cat: Movies/BluRay, desc: "Blu-ray"}
-    - {id: 4, cat: Movies/DVD, desc: "DVD-R"}
-    - {id: 54, cat: Movies/WEB-DL, desc: "WEBRip"}
-    - {id: 59, cat: Movies/WEB-DL, desc: "WEB-DL"}
-    - {id: 30, cat: Movies/Other, desc: "Risanke"}
-    # TV
-    - {id: 17, cat: TV/HD, desc: "HD-TV"}
-    - {id: 31, cat: TV/HD, desc: "HD-TV"}
-    - {id: 38, cat: TV/SD, desc: "SD-TV"}
-    - {id: 51, cat: TV/HD, desc: "TV 1080p/i"}
-    - {id: 52, cat: TV/SD, desc: "TV 720p/i"}
-    - {id: 53, cat: TV/WEB-DL, desc: "TV WEB-DL"}
-    - {id: 5, cat: TV/Sport, desc: "Sport"}
-    - {id: 2, cat: TV/Anime, desc: "Anime"}
-    - {id: 24, cat: TV/Documentary, desc: "Dokumentarci"}
-    # Games / Igre
-    - {id: 10, cat: PC/Games, desc: "PC igre/ISO"}
-    - {id: 11, cat: PC/Games, desc: "PC igre/Rips/Repack"}
-    - {id: 13, cat: Console, desc: "PS2"}
-    - {id: 12, cat: Console/PSP, desc: "PSP"}
-    - {id: 28, cat: Console/PS3, desc: "PS3"}
-    - {id: 63, cat: Console/PS4, desc: "PS4"}
-    - {id: 27, cat: Console/Wii, desc: "Wii"}
-    - {id: 14, cat: Console/XBox, desc: "XboX"}
-    - {id: 49, cat: PC/Games, desc: "Mac Igre"}
-    - {id: 48, cat: PC/Games, desc: "Linux Igre"}
-    - {id: 64, cat: PC/Games, desc: "PC igre/Update & Patch"}
-    # Music / Glasba
-    - {id: 8, cat: Audio, desc: "Glasba/Ostalo"}
-    - {id: 47, cat: Audio/MP3, desc: "Glasba/Mp3"}
-    - {id: 46, cat: Audio/Lossless, desc: "Glasba/Flac"}
-    - {id: 23, cat: Audio/Video, desc: "Videospoti"}
-    - {id: 22, cat: Audio/Video, desc: "Music DVD"}
-    # Programs / Programi
-    - {id: 15, cat: PC, desc: "PC programi/drugo"}
-    - {id: 16, cat: PC/ISO, desc: "PC programi/ISO"}
-    - {id: 58, cat: PC/Mac, desc: "Mac programi"}
-    - {id: 50, cat: PC, desc: "Linux programi"}
-    # XXX
-# only works for exactly categories cat=18,36,35,37,56,39 in this order
-#    - {id: 18, cat: XXX, desc: "XXX-HD"}
-#    - {id: 36, cat: XXX/XviD, desc: "XXX-XviD"}
-#    - {id: 35, cat: XXX, desc: "XXX-Clip"}
-#    - {id: 37, cat: XXX, desc: "XXX 37"}
-#    - {id: 39, cat: XXX, desc: "XXX 39"}
-#    - {id: 56, cat: XXX, desc: "XXX 56"}
-    # Other / Ostalo
-    - {id: 3, cat: Books/EBook, desc: "eKnjige"}
-    - {id: 19, cat: Other, desc: "Slike"}
-    - {id: 21, cat: Audio/Audiobook, desc: "AudioBook"}
-    - {id: 9, cat: PC/Mobile-Other, desc: "GBA"}
-    - {id: 25, cat: PC/Mobile-Other, desc: "GSM/Igre"}
-    - {id: 26, cat: PC/Mobile-Android, desc: "PDA"}
-    - {id: 29, cat: PC/Mobile-iOS, desc: "Ipod"}
-    - {id: 61, cat: PC/Mobile-Other, desc: "GSM/Programi"}
-    - {id: 62, cat: PC/Mobile-Other, desc: "GSM/Ostalo"}
-    # undocumented in category table but present in results
-    - {id: 60, cat: TV/SD, desc: "TV-XVID"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: sort
-    type: select
-    label: Sort results
-    default: _
-    options:
-      _: "Added descending"
-      "seeders ASC": "Seeders ascending"
-      "seeders DESC": "Seeders descending"
-      "leechers ASC": "Leechers ascending"
-      "leechers DESC": "Leechers descending"
-      "size ASC": "Size ascending"
-      "size DESC": "Size descending"
-
-login:
-  method: post
-  path: user/login
-  inputs:
-    user: "{{ .Config.username }}"
-    pass: "{{ .Config.password }}"
-  test:
-    path: portal
-    selector: a[href="/user/logout"]
-
-search:
-  paths:
-    - path: torrent/search
-  inputs:
-    q: "{{ .Keywords }}"
-    cat: "{{ join .Categories \",\" }}"
-    order: "{{ re_replace .Config.sort \"_\" \"\" }}"
-  preprocessingfilters:
-    # Extract torrent information from the json array that is part of the response and transform it into html form
-    - name: re_replace
-      args: ["\\[(\\d+),(\\d+),(\\d+),\"([^\"]+?)\",(\\d+),(\\d+),\"([^\"]+?)\",(\\d+),([\\d.]+?),\"([^\"]+?)\",\"([^\"]+?)\",\"([^\"]+?)\".*?\\],?", "<torrent><fid>$1</fid><w>$2</w><created_at>$3</created_at><title>$4</title><seeders>$5</seeders><leechers>$6</leechers><short_description>$7</short_description><torrent_category_id>$8</torrent_category_id><completed>$9</completed><size>$10</size><icon>$11</icon><poster>$12</poster></torrent>"]
-    # Remove javascript and keep only <torrent>...</torrent>
-    - name: re_replace
-      args: ["^.*?(<torrent>.*<\\\/torrent>).*|.*", "$1"]
-
-  rows:
-    selector: torrent
-
-  fields:
-    category:
-      selector: torrent_category_id
-    title:
-      selector: title
-    _id:
-      selector: fid
-    details:
-      text: "{{ .Config.sitelink }}portal#torrent/{{ .Result._id }}"
-    download:
-      text: "{{ .Config.sitelink }}torrent/download/{{ .Result._id }}"
-    poster:
-      selector: poster
-    date:
-      selector: created_at
-    size:
-      selector: size
-    leechers:
-      selector: leechers
-    seeders:
-      selector: seeders
-    downloadvolumefactor:
-      text: 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.0
-    description:
-      selector: short_description
-# engine BtiTracker

src/Jackett.Common/Definitions/ptfiles.yml

@@ -5,8 +5,6 @@ description: "PTFiles (PTF) is a Private site for TV / MOVIES / GENERAL"
 language: en-US
 type: private
 encoding: windows-1252
-certificates:
-  - 69901C31636B4D413903F4B32573ED6E8F5961FE # expired 26 May 2023
 links:
   - https://ptfiles.net/
 

src/Jackett.Common/Definitions/rousi.yml

@@ -0,0 +1,214 @@
+---
+id: rousi
+name: Rousi
+description: "Rousi is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: zh-CN
+type: private
+encoding: UTF-8
+requestDelay: 2
+links:
+  - https://rousi.zip/
+
+caps:
+  categorymappings:
+    - {id: 401, cat: Movies, desc: "Movies(电影)", default: true}
+    - {id: 402, cat: TV, desc: "TV Series(电视剧)", default: true}
+    - {id: 403, cat: TV, desc: "TV Shows(综艺)", default: true}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries(纪录片)", default: true}
+    - {id: 407, cat: TV/Sport, desc: "Sports(体育、竞技、武术及相关)", default: true}
+    - {id: 410, cat: Console, desc: "Games(游戏及相关)", default: true}
+    - {id: 406, cat: Audio, desc: "Music(音乐、专辑、MV、演唱会)", default: true}
+    - {id: 419, cat: TV, desc: "Art(舞蹈、歌剧、戏曲、相声、评书等)", default: true}
+    - {id: 411, cat: Other, desc: "Science(科学、知识、技能)", default: true}
+    - {id: 412, cat: Other, desc: "School(应试、考级、初中以上教育)", default: true}
+    - {id: 413, cat: Books, desc: "Book(书籍、杂志、报刊、有声书)", default: true}
+    - {id: 414, cat: Other, desc: "Code(IT技术、建模、编程、信息技术、大数据、人工智能)", default: true}
+    - {id: 405, cat: TV/Anime, desc: "Animations(3D动画、2.5次元)", default: true}
+    - {id: 415, cat: Other, desc: "ACGN(二次元、漫画、动漫)", default: true}
+    - {id: 416, cat: Other, desc: "Baby(婴幼、儿童、早教、小学及相关)", default: true}
+    - {id: 417, cat: Other, desc: "Resource(图片、文档、素材、模板)", default: true}
+    - {id: 418, cat: PC, desc: "Software(软件、系统、程序、APP等)", default: true}
+    - {id: 409, cat: Other, desc: "Other(其它，确认上边无分类)", default: true}
+    # special
+    - {id: 420, cat: XXX, desc: "步兵(步兵/无码)", default: false}
+    - {id: 421, cat: XXX, desc: "骑兵(骑兵/有码)", default: false}
+    - {id: 422, cat: XXX, desc: "III(三级片、限制级电影)", default: false}
+    - {id: 423, cat: XXX, desc: "H漫(动漫、漫画)", default: false}
+    - {id: 424, cat: XXX, desc: "H游(游戏及相关)", default: false}
+    - {id: 425, cat: XXX, desc: "H书(书籍、有声书)", default: false}
+    - {id: 426, cat: XXX, desc: "H图(写真、图片、私拍、短视频)", default: false}
+    - {id: 427, cat: XXX, desc: "H音(ASMR、音频、音乐)", default: false}
+    - {id: 428, cat: XXX, desc: "H综(综艺、综合、剪辑、其它等)", default: false}
+    - {id: 429, cat: XXX, desc: "H同(男同、女同)", default: false}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: 2facode
+    type: text
+    label: 2FA code
+  - name: info_2fa
+    type: info
+    label: "About 2FA code"
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the Rousi Web Site. Otherwise just leave it empty."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+
+login:
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
+  inputs:
+    secret: ""
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    two_step_code: "{{ .Config.2facode }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
+  error:
+    - selector: td.embedded:has(h2:contains("失败"))
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+      categories: [401, 402, 403, 404, 407, 410, 406, 419, 411, 412, 413, 414, 405, 415, 416, 417, 418, 409]
+    - path: special.php
+      categories: [420, 421, 422, 423, 424, 425, 426, 427, 428, 429]
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }} {{ else }}{{ .Keywords }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
+    incldead: 0
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}{{ end }}{{ if .Query.DoubanID }}1{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}0{{ end }}"
+    # 0 AND, 2 exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    notnewword: 1
+
+  rows:
+    selector: table.torrents > tbody > tr:has(a[href^="download.php?id="])
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_default:
+      selector: a[href^="details.php?id="]
+    title:
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+      optional: true
+      default: "{{ .Result.title_default }}"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    poster:
+      selector: img[data-src]
+      attribute: data-src
+    imdbid:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    doubanid:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
+      selector: a[href*="movie.douban.com/subject/"]
+      attribute: href
+    date_elapsed:
+      # time type: time elapsed (default)
+      selector: td.rowfollow:nth-child(4) > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    date_added:
+      # time added
+      selector: td.rowfollow:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-ddHH:mm:ss zzz"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td.rowfollow:nth-child(5)
+    seeders:
+      selector: td.rowfollow:nth-child(6)
+    leechers:
+      selector: td.rowfollow:nth-child(7)
+    grabs:
+      selector: td.rowfollow:nth-child(8)
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    description:
+      selector: td:nth-child(2)
+      remove: a, b, font, img, span
+# NexusPHP v1.8.4 2023-06-18

src/Jackett.Common/Definitions/rutor.yml

@@ -9,7 +9,7 @@ links:
   - http://rutor.info/ # site does not support https ERR_CONNECTION_REFUSED
   - http://rutor.is/ # site does not support https ERR_CONNECTION_REFUSED
   - http://new-rutor.org/ # site does not support https ERR_CONNECTION_REFUSED
-  - https://rutor.mrunblock.life/ # for magnet only
+  - https://rutor.mrunblock.bond/ # for magnet only
   - https://rutor.nocensor.click/
 legacylinks:
   - http://live-rutor.org/ # domain expired 9 Feb 2020
@@ -31,6 +31,7 @@ legacylinks:
   - https://rutor.nocensor.lol/
   - https://rutor.nocensor.art/
   - https://rutor.mrunblock.guru/
+  - https://rutor.mrunblock.life/
 
 caps:
   # unfortunately RuTor does not display categories anywhere in its search results page :-(

src/Jackett.Common/Definitions/sdbits.yml

@@ -1,124 +0,0 @@
----
-id: sdbits
-name: SDBits
-description: "SDBits is a small tracker that focuses on SD movies and tv."
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://sdbits.org/
-legacylinks:
-  - http://sdbits.org/
-
-caps:
-  categorymappings:
-    - {id: 6, cat: Audio, desc: "Audio"}
-    - {id: 3, cat: TV/Documentary, desc: "Documentary"}
-    - {id: 1, cat: Movies, desc: "Movies"}
-    - {id: 4, cat: Audio, desc: "Music"}
-    - {id: 5, cat: TV/Sport, desc: "Sports"}
-    - {id: 7, cat: TV/Other, desc: "Stand-up Comedy"}
-    - {id: 2, cat: TV, desc: "TV"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
-    music-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: added
-    options:
-      added: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: DESC
-    options:
-      DESC: desc
-      ASC: asc
-  - name: info
-    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: takeloginn3.php
-  method: post
-  inputs:
-    uname: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    returnto: "/"
-  error:
-    - selector: td.embedded:has(h2:contains("failed")+table)
-  test:
-    path: browse.php
-    selector: span.smallfont:has(a[href="logout.php"])
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    incldead: 1
-    descriptions: 0
-    imdbgt: 0
-    imdblt: 10
-    imdb: "{{ .Query.IMDBID }}"
-    sort: "{{ .Config.sort }}"
-    d: "{{ .Config.type }}"
-
-  rows:
-    selector: table#torrent-list > tbody > tr[id]
-
-  fields:
-    title:
-      selector: td:nth-child(3) > b > a
-    category:
-      selector: a[href^="?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    details:
-      selector: td:nth-child(3) > b > a
-      attribute: href
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    size:
-      selector: td:nth-child(6)
-    grabs:
-      selector: td:nth-child(7)
-    seeders:
-      selector: td:nth-child(8)
-    leechers:
-      selector: td:nth-child(9)
-    date:
-      selector: td:nth-child(5)
-      filters:
-        - name: append
-          args: " ago"
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    downloadvolumefactor:
-      case:
-        "a[style=\"color:#000099\"][href^=\"details.php?\"]": 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-# engine tbd

src/Jackett.Common/Definitions/shadowflow.yml

@@ -27,19 +27,13 @@ caps:
     music-search: [q]
 
 settings:
-  - name: username
+  - name: cookie
     type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: 2facode
-    type: text
-    label: 2FA code
-  - name: info_2fa
+    label: Cookie
+  - name: info
     type: info
-    label: "About 2FA code"
-    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the Kufei Web Site. Otherwise just leave it empty."
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -66,23 +60,12 @@ settings:
     default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
 
 login:
-  path: login.php
-  method: form
-  form: form[action="takelogin.php"]
+  method: cookie
   inputs:
-    secret: ""
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    two_step_code: "{{ .Config.2facode }}"
-    logout: ""
-    securelogin: ""
-    ssl: yes
-    trackerssl: yes
-  error:
-    - selector: td.embedded:has(h2:contains("失败"))
+    cookie: "{{ .Config.cookie }}"
   test:
     path: index.php
-    selector: a[href="logout.php"]
+    selector: a[href*="usercp.php"]
 
 search:
   paths:

src/Jackett.Common/Definitions/simpleanime.yml

@@ -0,0 +1,87 @@
+---
+id: simpleanime
+name: SimpleAnime
+description: "SimpleAnime is a CHINESE Public torrent tracker for ANIME"
+language: zh-CN
+type: public
+encoding: UTF-8
+links:
+  - https://www.36dm.org/
+
+caps:
+  categories:
+    Anime: TV/Anime
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    music-search: [q]
+    book-search: [q]
+
+settings: []
+
+download:
+  # cant use magnet directly, generates Invalid non-ASCII or control character in header: 0x79BB
+  infohash:
+    hash:
+      selector: a[href^="magnet:?xt="]
+      attribute: href
+      filters:
+        - name: regexp
+          args: ([A-F|a-f|0-9]{40})
+    title:
+      selector: h4
+      filters:
+        - name: trim
+        - name: validfilename
+
+search:
+  paths:
+    # https://www.36dm.org/
+    # https://www.36dm.org/search-gene_20ai.htm
+    - path: "{{ if .Keywords }}search-{{ .Keywords }}-1.htm{{ else }}/{{ end }}"
+  keywordsfilters:
+    - name: replace
+      args: [" ", "_20"]
+
+  rows:
+    selector: ul.threadlist > li:not(:has(a[href="thread-293154.htm"]))
+
+  fields:
+    category:
+      text: Anime
+    title:
+      selector: a[href^="thread-"]
+    details:
+      selector: a[href^="thread-"]
+      attribute: href
+    download:
+      selector: a[href^="thread-"]
+      attribute: href
+    date:
+      selector: span.date
+      filters:
+        - name: replace
+          args: ["秒前", " seconds ago"]
+        - name: replace
+          args: ["分钟前", " minutes ago"]
+        - name: replace
+          args: ["小时前", " hours ago"]
+        - name: replace
+          args: ["天前", " days ago"]
+        - name: replace
+          args: ["月前", " months ago"]
+        - name: replace
+          args: ["年前", " years ago"]
+        - name: timeago
+    size:
+      text: 512MB
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# BBS 4.0.4

src/Jackett.Common/Definitions/theempire.yml

@@ -43,6 +43,7 @@ caps:
     - {id: 66, cat: TV, desc: "Motoring"}
     - {id: 71, cat: TV, desc: "Property"}
     - {id: 76, cat: TV, desc: "Soaps"}
+    - {id: 200, cat: TV, desc: "Soaps : Classic"}
     - {id: 80, cat: TV, desc: "Talkshow"}
     - {id: 59, cat: TV, desc: "Drama"}
 

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

@@ -21,6 +21,7 @@ caps:
     - {id: 3, cat: Audio, desc: "Músicas"}
     - {id: 11, cat: Books/Mags, desc: "Revistas"}
     - {id: 2, cat: TV, desc: "Series"}
+    - {id: 14, cat: TV/Anime, desc: "Animes"}
 
   modes:
     search: [q]

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

@@ -18,11 +18,11 @@ caps:
     - {id: 3, cat: Audio, desc: "Music"}
     - {id: 4, cat: Console, desc: "Game"}
     - {id: 5, cat: PC, desc: "Application"}
-    - {id: 6, cat: XXX, desc: "XXX"}
     - {id: 7, cat: TV/Sport, desc: "Wrestling"}
     - {id: 8, cat: Books, desc: "Ebooks"}
     - {id: 11, cat: Movies, desc: "TSH-Movie"}
     - {id: 12, cat: TV, desc: "TSH-Serien"}
+    - {id: 13, cat: XXX, desc: "XxX"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/tokyotosho.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 links:
   - https://www.tokyotosho.info/
-  - https://tokyotosho.mrunblock.life/
+  - https://tokyotosho.mrunblock.bond/
   - https://tokyotosho.nocensor.click/
 legacylinks:
   - https://tokyotosho.black-mirror.xyz/
@@ -28,6 +28,7 @@ legacylinks:
   - https://tokyotosho.nocensor.lol/
   - https://tokyotosho.nocensor.art/
   - https://tokyotosho.mrunblock.guru/
+  - https://tokyotosho.mrunblock.life/
 
 settings:
   - name: cat

src/Jackett.Common/Definitions/torlock.yml

@@ -12,6 +12,7 @@ links:
   - https://www.torlock.com/
   - https://torlock.unblockit.rsvp/
   - https://torlock.nocensor.click/
+  - https://torlock.mrunblock.bond/
 legacylinks:
   - https://torlock.com/
   - https://torlock.nocensor.biz/
@@ -78,7 +79,7 @@ settings:
 
 search:
   paths:
-    - path: "{{ if .Keywords }}/all/torrents/{{ .Keywords }}.html?sort={{ .Config.sort }}&order={{ .Config.type }}{{ else }}/fresh.html{{ end }}"
+    - path: "/all/torrents/{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}.html?sort={{ .Config.sort }}&order={{ .Config.type }}"
       categories: ["!", TELEVISION, MOVIES, MUSIC, GAMES, SOFTWARE, ANIME, EBOOKS, OTHER, ADULT, AUDIOBOOK, IMAGES]
     - path: "{{ if .Keywords }}/television/torrents/{{ .Keywords }}.html?sort={{ .Config.sort }}&order={{ .Config.type }}{{else}}/television/1/{{ .Config.sort }}/{{ .Config.type }}.html{{end}}"
       categories: [TELEVISION]

src/Jackett.Common/Definitions/torrent911.yml

@@ -6,9 +6,9 @@ language: fr-FR
 type: public
 encoding: UTF-8
 followredirect: true
-# to fetch current domain use https://www.protege-liens.com/T911 and https://www.protege-liens.com/Torrent911
+# to fetch current domain use https://www.protege-torrent.com/T911 and https://www.protege-torrent.com/Torrent911
 links:
-  - https://www.torrent911.me/
+  - https://www.torrent911.io/
   - https://t911.org/
   - https://oxtorrent.unblockninja.com/
 legacylinks:
@@ -40,6 +40,7 @@ legacylinks:
   - https://torrent911.ws/
   - http://www.torrent911.ws/
   - https://www.torrent911.ws/
+  - https://www.torrent911.me/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrent9clone.yml

@@ -10,7 +10,7 @@ followredirect: true
 links:
   - https://www.torrent9.fi/
   - https://torrent9.nocensor.click/
-  - https://torrent9.mrunblock.life/
+  - https://torrent9.mrunblock.bond/
 legacylinks:
   - https://wwv.torrent9.one/
   - https://vww.torrent9.one/
@@ -37,6 +37,7 @@ legacylinks:
   - http://www.torrent9.cm/
   - https://www.torrent9.cm/
   - https://torrent9.nocensor.art/
+  - https://torrent9.mrunblock.life/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentdownload.yml

@@ -9,7 +9,7 @@ followredirect: true
 links:
   - https://www.torrentdownload.info/
   - https://torrentdownload.unblockit.rsvp/
-  - https://torrentdownload.mrunblock.life/
+  - https://torrentdownload.mrunblock.bond/
   - https://torrentdownload.nocensor.click/
 legacylinks:
   - https://torrentdownload.nocensor.space/
@@ -34,6 +34,7 @@ legacylinks:
   - https://torrentdownload.unblockit.click/
   - https://torrentdownload.unblockit.asia/
   - https://torrentdownload.unblockit.mov/
+  - https://torrentdownload.mrunblock.life/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentdownloads.yml

@@ -9,7 +9,7 @@ followredirect: true
 links:
   - https://www.torrentdownloads.pro/
   - https://torrentdownloads.unblockit.rsvp/
-  - https://torrentdownloads.mrunblock.life/
+  - https://torrentdownloads.mrunblock.bond/
   - https://torrentdownloads.unblockninja.com/
   - https://torrentdownloads.nocensor.click/
 legacylinks:
@@ -36,6 +36,7 @@ legacylinks:
   - https://torrentdownloads.unblockit.click/
   - https://torrentdownloads.unblockit.asia/
   - https://torrentdownloads.unblockit.mov/
+  - https://torrentdownloads.mrunblock.life/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentfunk.yml

@@ -11,6 +11,7 @@ links:
   - https://www.torrentfunk2.com/
   - https://torrentfunk.unblockit.rsvp/
   - https://torrentfunk.nocensor.click/
+  - https://torrentfunk.mrunblock.bond/
 legacylinks:
   - https://torrentfunk.nocensor.space/
   - https://torrentfunk.nocensor.work/

src/Jackett.Common/Definitions/torrentgalaxy.yml

@@ -10,6 +10,7 @@ links:
   - https://torrentgalaxy.to/
   - https://torrentgalaxy.mx/
   - https://tgx.rs/
+  - https://tgx.sb/
   - https://torrentgalaxy.unblockit.rsvp/
   - https://torrentgalaxy.unblockninja.com/
 legacylinks:

src/Jackett.Common/Definitions/torrentkitty.yml

@@ -13,6 +13,8 @@ links:
   - https://www.torrentkitty.app/
   - https://www.torrentkitty.red/
   - https://www.torrentkitty.lol/
+  - https://www.torrentkitty.best/
+  - https://www.torrentkitty.ink/
 
 caps:
   categories:
@@ -35,7 +37,7 @@ settings:
 
 search:
   paths:
-    - path: "search/{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+    - path: "search/{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}/"
 
   rows:
     selector: table#archiveResult tbody tr:has(a[href^="magnet:?xt="])

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

@@ -0,0 +1,192 @@
+---
+id: torrentland-api
+name: Torrentland (API)
+description: "Torrentland is a SPANISH Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: es-ES
+type: private
+encoding: UTF-8
+links:
+  - https://torrentland.li/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Películas"}
+    - {id: 2, cat: TV, desc: "Series"}
+    - {id: 3, cat: TV/Anime, desc: "Animación"}
+    - {id: 4, cat: TV/Anime, desc: "Series Animación"}
+    - {id: 5, cat: TV/Documentary, desc: "Documentales"}
+    - {id: 6, cat: TV/Documentary, desc: "Series Documentales"}
+    - {id: 7, cat: TV/Sport, desc: "Deportes"}
+    - {id: 8, cat: Audio/Video, desc: "Videos Músicales"}
+    - {id: 9, cat: XXX, desc: "+18"}
+    - {id: 10, cat: Other, desc: "Otros"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
+    movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://torrentland.li/\" target =_blank>Torrentland</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: compatOld
+    type: checkbox
+    label: Improve Sonarr compatibility with the tracker's older season naming scheme by renaming Sxx to Txx in searches. Can cause results already using Sxx to not be found.
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: created_at
+    options:
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_thanks
+    type: info
+    label: About Thanks
+    default: "Torrentland requires all downloads to be thanked. After initiating a download with this indexer, use your browser to visit the torrent details page and click the thank you button. Failure to maintain a 1:1 thank ratio will lead to loss of RSS and API access."
+
+login:
+  path: /api/torrents
+  method: get
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
+search:
+  paths:
+    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    - path: "/api/torrents/filter"
+      response:
+        type: json
+
+  headers:
+    Authorization: ["Bearer {{ .Config.apikey }}"]
+
+  inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
+    name: "{{ .Keywords }}"
+    seasonNumber: "{{ .Query.Season }}"
+    episodeNumber: "{{ .Query.Ep }}"
+    imdbId: "{{ .Query.IMDBIDShort }}"
+    tmdbId: "{{ .Query.TMDBID }}"
+    tvdbId: "{{ .Query.TVDBID }}"
+    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+    - name: re_replace
+      args: ["(?i)\\bS(\\d+)", "{{ if .Config.compatOld }}T$1{{ else }}S$1{{ end }}"]
+
+  rows:
+    selector: data
+    attribute: attributes
+
+  fields:
+    category:
+      selector: category_id
+    title_vose:
+      selector: name:contains(VOSE)
+      optional: true
+      filters:
+        - name: append
+          args: " ENGLiSH"
+    title_notvose:
+      selector: name:not(:contains(VOSE))
+      optional: true
+      filters:
+        - name: append
+          args: " SPANiSH"
+    title:
+      text: "{{ if .Result.title_vose }}{{ .Result.title_vose }}{{ else }}{{ .Result.title_notvose }}{{ end }}"
+      filters:
+        - name: re_replace
+          args: ["^ *\\[[^\\]]*\\] *", ""] # Remove prefix tags
+        - name: re_replace
+          args: ["(?i)\\bT(\\d+)", "S$1"]
+        - name: re_replace
+          args: ["UHDRip", "BDRip"] # Fix for Radarr
+    details:
+      selector: details_link
+    download:
+      selector: download_link
+    infohash:
+      selector: info_hash
+    poster:
+      selector: poster
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/90x135", ""]
+    imdbid:
+      selector: imdb_id
+    tmdbid:
+      selector: tmdb_id
+    tvdbid:
+      selector: tvdb_id
+    files:
+      selector: num_file
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    date:
+      # "created_at": "2021-10-18T00:34:50.000000Z" is returned by Newtonsoft.Json.Linq as 18/10/2021 00:34:50
+      selector: created_at
+      filters:
+        - name: append
+          args: " +00:00" # GMT
+        - name: dateparse
+          args: "MM/dd/yyyy HH:mm:ss zzz"
+    size:
+      selector: size
+    downloadvolumefactor:
+      # api returns 0%, 25%, 50%, 75%, 100%
+      selector: freeleech
+      case:
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
+    uploadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: double_upload
+      case:
+        0: 1 # normal
+        1: 2 # double
+# global MR is 0.4 but torrents must be seeded for 4 days regardless of ratio
+#    minimumratio:
+#      text: 0.4
+    minimumseedtime:
+      # 4 days (as seconds = 4 x 24 x 60 x 60)
+      text: 345600
+# json UNIT3D 6.3.0 (custom)

src/Jackett.Common/Definitions/torrentqq.yml

@@ -7,11 +7,8 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentqq264.com/
+  - https://torrentqq267.com/
 legacylinks:
-  - https://torrentqq249.com/
-  - https://torrentqq250.com/
-  - https://torrentqq251.com/
   - https://torrentqq252.com/
   - https://torrentqq253.com/
   - https://torrentqq254.com/
@@ -24,6 +21,9 @@ legacylinks:
   - https://torrentqq261.com/
   - https://torrentqq262.com/
   - https://torrentqq263.com/
+  - https://torrentqq264.com/
+  - https://torrentqq265.com/
+  - https://torrentqq266.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentsir.yml

@@ -7,10 +7,8 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentsir111.com/
+  - https://torrentsir113.com/
 legacylinks:
-  - http://torrentsir93.com/
-  - https://torrentsir93.com/
   - http://torrentsir94.com/
   - https://torrentsir94.com/
   - http://torrentsir95.com/
@@ -38,6 +36,10 @@ legacylinks:
   - http://torrentsir110.com/
   - https://torrentsir110.com/
   - http://torrentsir111.com/
+  - https://torrentsir111.com/
+  - http://torrentsir112.com/
+  - https://torrentsir112.com/
+  - http://torrentsir113.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentview.yml

@@ -7,11 +7,10 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://viewtorrent11.com/
+  - https://viewtorrent12.com/
 legacylinks:
   - https://torrentview.net/
   - https://torrentview.co/
-  - https://torrentview62.com/
   - https://torrentview63.com/
   - https://torrentview65.com/
   - https://torrentview66.com/
@@ -25,6 +24,7 @@ legacylinks:
   - https://viewtorrent7.com/
   - https://viewtorrent8.com/
   - https://viewtorrent10.com/
+  - https://viewtorrent11.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentwhiz.yml

@@ -7,9 +7,8 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentwiz59.com/
+  - https://torrentwiz60.com/
 legacylinks:
-  - https://torrentwiz41.com/
   - https://torrentwiz42.com/
   - https://torrentwiz43.com/
   - https://torrentwiz45.com/
@@ -25,6 +24,7 @@ legacylinks:
   - https://torrentwiz56.com/
   - https://torrentwiz57.com/
   - https://torrentwiz58.com/
+  - https://torrentwiz59.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentz2nz.yml

@@ -7,13 +7,14 @@ type: public
 encoding: UTF-8
 links:
   - https://torrentz2.nz/
-  - https://torrentz2.mrunblock.life/
+  - https://torrentz2.mrunblock.bond/
   - https://torrentz2.nocensor.click/
 legacylinks:
   - https://torrentz2.nocensor.world/
   - https://torrentz2.nocensor.lol/
   - https://torrentz2.nocensor.art/
   - https://torrentz2.mrunblock.guru/
+  - https://torrentz2.mrunblock.life/
 
 caps:
   # unfortunately torrentz2nz does not display categories anywhere in its search results page :-(

src/Jackett.Common/Definitions/ultrahd.yml

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

src/Jackett.Common/Definitions/utopia.yml

@@ -30,6 +30,10 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
+  - name: addukrainiantotitle
+    type: checkbox
+    label: Add UKR 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
@@ -96,6 +100,8 @@ search:
       filters:
         - name: re_replace
           args: ["\\.", " "]
+        - name: append
+          args: "{{ if .Config.addukrainiantotitle }} UKR{{ else }}{{ end }}"
     details:
       selector: details_link
     download:

src/Jackett.Common/Definitions/vtorrent.yml

@@ -1,154 +0,0 @@
----
-id: vtorrent
-name: vTorrent
-description: "vTorrent is a POLISH Semi-Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: pl-PL
-type: semi-private
-encoding: UTF-8
-links:
-  - https://vtorrent.pl/
-
-caps:
-  categorymappings:
-    - {id: 695, cat: Movies, desc: "FILMY"}
-    - {id: 94, cat: Movies/HD, desc: "FILMY RMVB"}
-    - {id: 124, cat: Movies/SD, desc: "FILMY (S)VCD"}
-    - {id: 64, cat: Movies/SD, desc: "FILMY Divx / Xvid"}
-    - {id: 81, cat: Movies/DVD, desc: "FILMY DVD-R"}
-    - {id: 109, cat: Movies/HD, desc: "FILMY x264 / HDTV"}
-    - {id: 697, cat: Movies/UHD, desc: "FILMY 4K"}
-    - {id: 696, cat: Movies/3D, desc: "FILMY 3D"}
-    - {id: 230, cat: TV, desc: "TV / Seriale"}
-    - {id: 307, cat: TV/Anime, desc: "Anime"}
-    - {id: 698, cat: PC/Games, desc: "GRY"}
-    - {id: 155, cat: PC/Games, desc: "GRY Gry PC"}
-    - {id: 173, cat: Console, desc: "GRY Gry Konsole"}
-    - {id: 704, cat: Other, desc: "GRY Poradniki, spolszczenia i inne"}
-    - {id: 699, cat: PC, desc: "PROGRAMY"}
-    - {id: 138, cat: PC/0day, desc: "PROGRAMY Windows"}
-    - {id: 288, cat: PC/Mac, desc: "PROGRAMY Linux / Mac"}
-    - {id: 700, cat: Audio, desc: "MUZYKA"}
-    - {id: 187, cat: Audio, desc: "MUZYKA Albumy i składanki"}
-    - {id: 701, cat: Audio/Video, desc: "MUZYKA Koncerty"}
-    - {id: 702, cat: TV/Documentary, desc: "DOKUMENTY"}
-    - {id: 249, cat: Books/EBook, desc: "DOKUMENTY Książki"}
-    - {id: 283, cat: Audio/Audiobook, desc: "DOKUMENTY Audiobooki"}
-    - {id: 251, cat: Books/Mags, desc: "DOKUMENTY Czasopisma"}
-    - {id: 284, cat: Books/Comics, desc: "DOKUMENTY Komiksy"}
-    - {id: 703, cat: Other, desc: "POZOSTAŁE"}
-    - {id: 310, cat: Other, desc: "POZOSTAŁE Dla Dzieci"}
-    - {id: 294, cat: TV/Sport, desc: "POZOSTAŁE Sport"}
-    - {id: 316, cat: PC/Mobile-Other, desc: "POZOSTAŁE GSM / PDA"}
-    - {id: 333, cat: Other, desc: "POZOSTAŁE Tapety"}
-    - {id: 325, cat: Other/Misc, desc: "POZOSTAŁE Różne"}
-    - {id: 334, cat: XXX, desc: "EROTYKA"}
-    - {id: 705, cat: XXX/x264, desc: "EROTYKA Filmy XXX"}
-    - {id: 706, cat: XXX/ImageSet, desc: "EROTYKA Zdjęcia XXX"}
-    - {id: 340, cat: XXX/Other, desc: "EROTYKA Czasopisma XXX"}
-    - {id: 342, cat: XXX/Other, desc: "EROTYKA Gry XXX"}
-    - {id: 308, cat: XXX/Other, desc: "EROTYKA Hentai"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: multilang
-    type: checkbox
-    label: Replace MULTi by another language in release name
-    default: false
-  - name: multilanguage
-    type: select
-    label: Replace MULTi by this language
-    default: POLISH
-    options:
-      POLISH: POLISH
-      MULTi POLISH: MULTIi POLISH
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrentów na stronę:</b> setting to <b>100</b> on your account profile.
-
-login:
-  path: login.php
-  method: form
-  form: form
-  inputs:
-    uid: "{{ .Config.username }}"
-    pwd: "{{ .Config.password }}"
-    keeplogged: 1
-  error:
-    - selector: font[color="#FF0000"]
-  test:
-    path: index.php
-    selector: a[href^="logout.php?check_hash="]
-
-search:
-  paths:
-    # https://vtorrent.pl/torrents.php?erotyka=1&page=1
-    - path: torrents.php
-  inputs:
-    # does not support multi category selection. so using default for all
-    # $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    category: 0
-    search: "{{ .Keywords }}"
-    erotyka: 1
-    page: 1
-    # does not support sorting results, or imdbid searching, or have imdb in results
-
-  rows:
-    selector: table.lista[width="100%"]:not(table[align]) > tbody > tr:has(a[href^="details.php?id="])
-
-  fields:
-    category:
-      selector: a[href^="torrents.php?category="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    title_phase1:
-      selector: a[href^="details.php?id="]
-    title_multilang:
-      selector: a[href^="details.php?id="]
-      filters:
-        - name: re_replace
-          args: ["(?i)\\b(MULTI(?!.*(?:POLISH|ENGLISH|\\bPL\\b)))\\b", "{{ .Config.multilanguage }}"]
-        - name: re_replace
-          args: ["(?i)\\b(pl)\\b", "POLISH"]
-    title:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    poster:
-      selector: img
-      attribute: src
-    date:
-      selector: td:nth-child(6)
-      # auto adjusted by site account profile
-      filters:
-        - name: dateparse
-          args: "dd/MM/yyyy HH:mm:ss"
-    size:
-      selector: td:nth-child(7)
-    seeders:
-      selector: td:nth-child(9)
-    leechers:
-      selector: td:nth-child(10)
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/wukong.yml

@@ -0,0 +1,181 @@
+---
+id: wukong
+name: Wukong
+description: "Wukong (悟空问道) is a Chinese Private Torrent Tracker for E-LEARNING"
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - https://wukongwendao.top/
+
+caps:
+  categorymappings:
+    - {id: 402, cat: Other, desc: "模型"}
+    - {id: 407, cat: Other, desc: "整合包"}
+    - {id: 401, cat: Other, desc: "源码"}
+    - {id: 408, cat: Other, desc: "音乐生成"}
+    - {id: 406, cat: Other, desc: "文字语料"}
+    - {id: 403, cat: Other, desc: "训练教程"}
+    - {id: 405, cat: Other, desc: "动画生成"}
+    - {id: 411, cat: Other, desc: "作品"}
+    - {id: 404, cat: Books/Technical, desc: "文档"}
+    - {id: 410, cat: Books/Technical, desc: "电子书"}
+    - {id: 409, cat: Other/Misc, desc: "其他"}
+
+  modes:
+    search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: 2facode
+    type: text
+    label: 2FA code
+  - name: info_2fa
+    type: info
+    label: "About 2FA code"
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the Wukong Web Site. Otherwise just leave it empty."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+
+login:
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
+  inputs:
+    secret: ""
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    two_step_code: "{{ .Config.2facode }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
+  error:
+    - selector: td.embedded:has(h2:contains("失败"))
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # 0 incldead, 1 active, 2 dead
+    incldead: 0
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: 0
+    # 0 AND, 2 exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    notnewword: 1
+
+  rows:
+    selector: table.torrents > tbody > tr:has(a[href^="download.php?id="])
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_default:
+      selector: a[href^="details.php?id="]
+    title:
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+      optional: true
+      default: "{{ .Result.title_default }}"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    poster:
+      selector: img[data-src]
+      attribute: data-src
+    date_elapsed:
+      # time type: time elapsed (default)
+      selector: td.rowfollow:nth-child(4) > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    date_added:
+      # time added
+      selector: td.rowfollow:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-ddHH:mm:ss zzz"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td.rowfollow:nth-child(5)
+    seeders:
+      selector: td.rowfollow:nth-child(6)
+    leechers:
+      selector: td.rowfollow:nth-child(7)
+    grabs:
+      selector: td.rowfollow:nth-child(8)
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    description:
+      selector: td:nth-child(2)
+      remove: a, b, font, img, span
+# NexusPHP v1.8.3 2023-05-14

src/Jackett.Common/Definitions/yggcookie.yml

@@ -8,7 +8,7 @@ encoding: UTF-8
 followredirect: true
 requestDelay: 2
 links:
-  - https://www3.yggtorrent.do/
+  - https://www3.yggtorrent.wtf/
 legacylinks:
   - https://www.yggtorrent.gg/
   - https://www.yggtorrent.ch/
@@ -31,6 +31,7 @@ legacylinks:
   - https://www5.yggtorrent.fi/
   - https://yggtorrent.lol/
   - https://www6.yggtorrent.lol/
+  - https://www3.yggtorrent.do/
 
 caps:
   # dont forget to update the search fields category case block
@@ -350,6 +351,9 @@ search:
     # fix date search and workaround for internal YGG issues
     - name: re_replace
       args: ["[\\\\\\-\\.\\/!\\s]+", " "]
+    # strip season as site does not support partial matches
+    - name: re_replace
+      args: ["(?i)\\bS\\d{1,3}\\b", ""]
     - name: trim
     # put each word in quotations to prevent exact phrase search
     - name: re_replace

src/Jackett.Common/Definitions/yggtorrent.yml

@@ -8,7 +8,7 @@ encoding: UTF-8
 followredirect: true
 requestDelay: 2
 links:
-  - https://www3.yggtorrent.do/
+  - https://www3.yggtorrent.wtf/
 legacylinks:
   - https://www.yggtorrent.gg/
   - https://www.yggtorrent.ch/
@@ -31,6 +31,7 @@ legacylinks:
   - https://www5.yggtorrent.fi/
   - https://yggtorrent.lol/
   - https://www6.yggtorrent.lol/
+  - https://www3.yggtorrent.do/
 
 caps:
   # dont forget to update the search fields category case block
@@ -354,6 +355,9 @@ search:
     # fix date search and workaround for internal YGG issues
     - name: re_replace
       args: ["[\\\\\\-\\.\\/!\\s]+", " "]
+    # strip season as site does not support partial matches
+    - name: re_replace
+      args: ["(?i)\\bS\\d{1,3}\\b", ""]
     - name: trim
     # put each word in quotations to prevent exact phrase search
     - name: re_replace

src/Jackett.Common/Definitions/yourbittorrent.yml

@@ -9,6 +9,7 @@ links:
   - https://yourbittorrent.com/
   - https://yourbittorrent2.com/
   - https://yourbittorrent.nocensor.click/
+  - https://yourbittorrent.mrunblock.bond/
 legacylinks:
   - https://yourbittorrent.host/
   - https://yourbittorrent.nocensor.space/

src/Jackett.Common/Definitions/yts.yml

@@ -11,7 +11,7 @@ links:
   - https://yts.mx/
   - https://yts.unblockit.rsvp/
   - https://yts.unblockninja.com/
-  - https://yts.mrunblock.life/
+  - https://yts.mrunblock.bond/
   - https://yts.nocensor.click/
 legacylinks:
   - https://yts.ag/
@@ -38,6 +38,7 @@ legacylinks:
   - https://yts.unblockit.click/
   - https://yts.unblockit.asia/
   - https://yts.unblockit.mov/
+  - https://yts.mrunblock.life/
 
 caps:
   categorymappings:
@@ -91,8 +92,14 @@ search:
         "2160p": 46
         "3D": 47
         "*": 45
+    _audio:
+      selector: audio_channels
+    _depth:
+      selector: bit_depth
     _type:
       selector: type
+    _codec:
+      selector: video_codec
     year:
       selector: ..year
     title_default:
@@ -107,9 +114,8 @@ search:
       filters:
         - name: replace
           args: [":", ""]
-        # append type: BRRip or WEBRip, resolves #3558 via #4577
         - name: append
-          args: " {{ .Result._quality }} {{ if eq .Result._type \"web\" }}WEBRip{{ else }}BRRip{{ end }} -YTS"
+          args: " {{ .Result._quality }} {{ if eq .Result._type \"web\" }}WEBRip{{ else }}BRRip{{ end }} {{ if eq .Result._audio \"5.1\" }}5.1 {{ else }}{{ end }}{{ if eq .Result._depth \"10\" }}10Bit {{ else }}{{ end }}{{ .Result._codec }} -YTS"
     details:
       selector: ..url
       filters:

src/Jackett.Common/Definitions/zetorrents.yml

@@ -5,10 +5,10 @@ description: "zetorrents is a FRENCH Public site for MOVIES / TV / GENERAL"
 language: fr-FR
 type: public
 encoding: UTF-8
-# to fetch current domain use https://www.protege-liens.com/Zetorrents
+# to fetch current domain use https://www.protege-torrent.com/Zetorrents
 links:
   - https://www.zetorrents.pw/
-  - https://zetorrents.mrunblock.life/
+  - https://zetorrents.mrunblock.bond/
   - https://zetorrents.nocensor.click/
 legacylinks:
   - https://www.zetorrents.co/
@@ -29,6 +29,7 @@ legacylinks:
   - https://zetorrents.nocensor.art/
   - https://www.zetorrents.ch/
   - https://zetorrents.mrunblock.guru/
+  - https://zetorrents.mrunblock.life/
 
 caps:
   categories:

src/Jackett.Common/Definitions/zmpt.yml

@@ -10,18 +10,20 @@ links:
 
 caps:
   categorymappings:
-    - {id: 401, cat: Movies, desc: "Movies/综合-电影"}
-    - {id: 422, cat: TV/Documentary, desc: "Documentaries/综合-纪录片"}
-    - {id: 402, cat: TV, desc: "TV Series/综合-电视剧"}
-    - {id: 403, cat: TV, desc: "TV Shows/综合-综艺"}
-    - {id: 406, cat: Audio/Video, desc: "Music Videos/综合-音乐MV"}
-    - {id: 408, cat: Audio, desc: "Music/综合-音乐"}
-    - {id: 409, cat: Other, desc: "Misc/综合-其他"}
-    - {id: 417, cat: TV/Anime, desc: "Anime China/动漫-国漫"}
-    - {id: 418, cat: TV/Anime, desc: "Anime Japan/动漫-日漫"}
-    - {id: 419, cat: TV/Anime, desc: "Anime Korean/动漫-韩漫"}
-    - {id: 420, cat: TV/Anime, desc: "Anime Europe and America/动漫-欧美"}
     - {id: 421, cat: TV/Anime, desc: "Anime Other/动漫-其他"}
+    - {id: 420, cat: TV/Anime, desc: "Anime Europe and America/动漫-欧美"}
+    - {id: 419, cat: TV/Anime, desc: "Anime Korean/动漫-韩漫"}
+    - {id: 418, cat: TV/Anime, desc: "Anime Japan/动漫-日漫"}
+    - {id: 417, cat: TV/Anime, desc: "Anime China/动漫-国漫"}
+    - {id: 409, cat: Other, desc: "Misc/综合-其他"}
+    - {id: 403, cat: TV, desc: "TV Shows/综合-综艺"}
+    - {id: 402, cat: TV, desc: "TV Series/综合-电视剧"}
+    - {id: 422, cat: TV/Documentary, desc: "Documentaries/综合-纪录片"}
+    - {id: 401, cat: Movies, desc: "Movies/综合-电影"}
+    - {id: 423, cat: Audio, desc: "Music/声音类-音乐"}
+    - {id: 424, cat: Audio/Audiobook, desc: "Music Audiobooks/声音类-有声书"}
+    - {id: 425, cat: PC, desc: "Software/软件游戏-软件"}
+    - {id: 426, cat: Console, desc: "Games/软件游戏-游戏"}
 
   modes:
     search: [q]
@@ -179,10 +181,15 @@ search:
         img.pro_2up: 2
         "*": 1
     minimumratio:
-      text: 1.0
+      case:
+        img[title="H&R"]: 1.0
+        "*": 0.4
     minimumseedtime:
-      # 1 day (as seconds = 24 x 60 x 60)
-      text: 86400
+      # H&R 3 days (as seconds = 3 x 24 x 60 x 60)
+      # normal 1 day (as seconds = 24 x 60 x 60)
+      case:
+        img[title="H&R"]: 259200
+        "*": 86400
     description:
       selector: td.rowfollow:nth-child(2)
       remove: a, b, font, img, span

src/Jackett.Common/Indexers/Aro.cs

@@ -1,58 +0,0 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using Jackett.Common.Indexers.Abstract;
-using Jackett.Common.Models;
-using Jackett.Common.Services.Interfaces;
-using Jackett.Common.Utils.Clients;
-using NLog;
-
-namespace Jackett.Common.Indexers
-{
-    [ExcludeFromCodeCoverage]
-    public class Aro : GazelleTracker
-    {
-        public override string Id => "aro";
-        public override string Name => "aro.lol";
-        public override string Description => "aro.lol is a SERBIAN/ENGLISH Private Torrent Tracker for ANIME";
-        public override string SiteLink { get; protected set; } = "https://aro.lol/";
-        public override string Language => "en-US";
-        public override string Type => "private";
-
-        public override TorznabCapabilities TorznabCaps => SetCapabilities();
-
-        public Aro(IIndexerConfigurationService configService, WebClient wc, Logger l, IProtectionService ps,
-                   ICacheService cs)
-            : base(configService: configService,
-                   client: wc,
-                   logger: l,
-                   p: ps,
-                   cs: cs,
-                   has2Fa: true,
-                   supportsFreeleechTokens: true)
-        {
-        }
-
-        private TorznabCapabilities SetCapabilities()
-        {
-            var caps = new TorznabCapabilities
-            {
-                TvSearchParams = new List<TvSearchParam>
-                {
-                    TvSearchParam.Q
-                },
-                MovieSearchParams = new List<MovieSearchParam>
-                {
-                    MovieSearchParam.Q
-                }
-            };
-
-            caps.Categories.AddCategoryMapping(1, TorznabCatType.Movies, "Movies");
-            caps.Categories.AddCategoryMapping(2, TorznabCatType.TVAnime, "Anime");
-            caps.Categories.AddCategoryMapping(3, TorznabCatType.Books, "Manga");
-            caps.Categories.AddCategoryMapping(4, TorznabCatType.Console, "Games");
-            caps.Categories.AddCategoryMapping(5, TorznabCatType.Other, "Other");
-
-            return caps;
-        }
-    }
-}

src/Jackett.Common/Indexers/BeyondHDAPI.cs

@@ -25,6 +25,8 @@ namespace Jackett.Common.Indexers
         public override string Language => "en-US";
         public override string Type => "private";
 
+        public override bool SupportsPagination => true;
+
         public override TorznabCapabilities TorznabCaps => SetCapabilities();
 
         private readonly string APIBASE = "https://beyond-hd.me/api/torrents/";
@@ -111,24 +113,53 @@ namespace Jackett.Common.Indexers
             };
 
             if (configData.FilterFreeleech.Value)
+            {
                 postData.Add(BHDParams.freeleech, "1");
+            }
+
             if (configData.FilterLimited.Value)
+            {
                 postData.Add(BHDParams.limited, "1");
+            }
+
             if (configData.FilterRefund.Value)
+            {
                 postData.Add(BHDParams.refund, "1");
+            }
+
             if (configData.FilterRewind.Value)
+            {
                 postData.Add(BHDParams.rewind, "1");
+            }
+
+            if (configData.SearchTypes.Values.Any())
+            {
+                postData.Add(BHDParams.types, string.Join(",", configData.SearchTypes.Values));
+            }
 
             if (query.IsTVSearch)
+            {
                 postData.Add(BHDParams.categories, "TV");
+            }
             else if (query.IsMovieSearch)
+            {
                 postData.Add(BHDParams.categories, "Movies");
+            }
 
-            var imdbId = ParseUtil.GetImdbId(query.ImdbID);
-            if (imdbId != null)
-                postData.Add(BHDParams.imdb_id, imdbId.ToString());
-            if (query.IsTmdbQuery)
-                postData.Add(BHDParams.tmdb_id, query.TmdbID.Value.ToString());
+            if (query.IsImdbQuery)
+            {
+                postData.Add(BHDParams.imdb_id, query.ImdbIDShort);
+            }
+            else if (query.IsTmdbQuery)
+            {
+                postData.Add(BHDParams.tmdb_id, query.TmdbID.ToString());
+            }
+
+            if (query.Limit > 0 && query.Offset > 0)
+            {
+                var page = (query.Offset / query.Limit) + 1;
+                postData.Add("page", page.ToString());
+            }
 
             var bhdResponse = await GetBHDResponse(apiUrl, postData);
             var releaseInfos = bhdResponse.results.Select(mapToReleaseInfo);

src/Jackett.Common/Indexers/DarmoweTorrenty.cs

@@ -1,255 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using System.Web;
-using AngleSharp.Dom;
-using AngleSharp.Html.Parser;
-using Jackett.Common.Models;
-using Jackett.Common.Models.IndexerConfig;
-using Jackett.Common.Services.Interfaces;
-using Jackett.Common.Utils;
-using Jackett.Common.Utils.Clients;
-using Newtonsoft.Json.Linq;
-using NLog;
-
-namespace Jackett.Common.Indexers
-{
-    [ExcludeFromCodeCoverage]
-    public class DarmoweTorenty : IndexerBase
-    {
-        public override string Id => "darmowetorenty";
-        public override string Name => "Darmowe torenty";
-        public override string Description => "Darmowe torenty is a POLISH Semi-Private Torrent Tracker for MOVIES / TV / GENERAL";
-        public override string SiteLink { get; protected set; } = "https://darmowe-torenty.pl/";
-        public override Encoding Encoding => Encoding.GetEncoding("iso-8859-2");
-        public override string Language => "pl-PL";
-        public override string Type => "semi-private";
-
-        public override TorznabCapabilities TorznabCaps => SetCapabilities();
-
-        private string LoginUrl => SiteLink + "login.php";
-        private string BrowseUrl => SiteLink + "torrenty.php";
-
-        private static readonly Regex _SizeRegex = new Regex("Rozmiar: (\\d{1,4}\\.\\d{2}\\s[K|M|G][B])", RegexOptions.Compiled);
-        private static readonly Regex _DateRegex = new Regex("Dodano: (\\d{2}\\/\\d{2}\\/\\d{4})", RegexOptions.Compiled);
-        private static readonly Regex _SeedsRegex = new Regex("Seedów: (\\d+)", RegexOptions.Compiled);
-        private static readonly Regex _LeechersRegex = new Regex("Leecherów: (\\d+)", RegexOptions.Compiled);
-        private new ConfigurationDataBasicLogin configData
-        {
-            get => (ConfigurationDataBasicLogin)base.configData;
-            set => base.configData = value;
-        }
-
-        public DarmoweTorenty(IIndexerConfigurationService configService, WebClient wc, Logger l,
-            IProtectionService ps, ICacheService cs)
-            : base(configService: configService,
-                   client: wc,
-                   logger: l,
-                   p: ps,
-                   cacheService: cs,
-                   configData: new ConfigurationDataBasicLogin())
-        {
-        }
-
-        private TorznabCapabilities SetCapabilities()
-        {
-            var caps = new TorznabCapabilities
-            {
-                TvSearchParams = new List<TvSearchParam>
-                {
-                    TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
-                },
-                MovieSearchParams = new List<MovieSearchParam>
-                {
-                    MovieSearchParam.Q
-                },
-                MusicSearchParams = new List<MusicSearchParam>
-                {
-                    MusicSearchParam.Q
-                },
-                BookSearchParams = new List<BookSearchParam>
-                {
-                    BookSearchParam.Q
-                }
-            };
-
-            caps.Categories.AddCategoryMapping(14, TorznabCatType.Movies, "Filmy");
-            caps.Categories.AddCategoryMapping(27, TorznabCatType.MoviesDVD, "Filmy DVD-R");
-            caps.Categories.AddCategoryMapping(28, TorznabCatType.MoviesSD, "Filmy VCD/SVCD");
-            caps.Categories.AddCategoryMapping(29, TorznabCatType.MoviesBluRay, "Filmy BluRay/x264");
-            caps.Categories.AddCategoryMapping(30, TorznabCatType.MoviesSD, "Filmy DivX/XviD LEKTOR/NAPISY PL");
-            caps.Categories.AddCategoryMapping(72, TorznabCatType.MoviesSD, "Filmy DivX/XviD ENG/...");
-            caps.Categories.AddCategoryMapping(31, TorznabCatType.Movies, "Filmy RMVB");
-            caps.Categories.AddCategoryMapping(74, TorznabCatType.MoviesHD, "Filmy HD");
-            caps.Categories.AddCategoryMapping(75, TorznabCatType.Movies3D, "Filmy 3D");
-            caps.Categories.AddCategoryMapping(16, TorznabCatType.TV, "Seriale");
-            caps.Categories.AddCategoryMapping(25, TorznabCatType.TV, "Seriale Polskie");
-            caps.Categories.AddCategoryMapping(26, TorznabCatType.TV, "Seriale Zagraniczne");
-            caps.Categories.AddCategoryMapping(17, TorznabCatType.Movies, "Dla Dzieci");
-            caps.Categories.AddCategoryMapping(32, TorznabCatType.Movies, "Bajki Pl/Eng");
-            caps.Categories.AddCategoryMapping(18, TorznabCatType.PCGames, "Gry");
-            caps.Categories.AddCategoryMapping(34, TorznabCatType.PCGames, "Gry PC");
-            caps.Categories.AddCategoryMapping(35, TorznabCatType.ConsolePSP, "Gry PS2/PS3/PSP");
-            caps.Categories.AddCategoryMapping(36, TorznabCatType.ConsoleXBox, "Gry Xbox");
-            caps.Categories.AddCategoryMapping(37, TorznabCatType.Console, "Gry Inne Konsole");
-            caps.Categories.AddCategoryMapping(19, TorznabCatType.Audio, "Muzyka");
-            caps.Categories.AddCategoryMapping(38, TorznabCatType.Audio, "Muzyka Polska/Zagraniczna");
-            caps.Categories.AddCategoryMapping(39, TorznabCatType.Audio, "Muzyka Soundtracki");
-            caps.Categories.AddCategoryMapping(40, TorznabCatType.Audio, "Muzyka Teledyski/Koncerty");
-            caps.Categories.AddCategoryMapping(20, TorznabCatType.PCMobileOther, "GSM/PDA");
-            caps.Categories.AddCategoryMapping(42, TorznabCatType.PCMobileOther, "Tapety GSM/PDA");
-            caps.Categories.AddCategoryMapping(43, TorznabCatType.PCMobileOther, "Programy GSM/PDA");
-            caps.Categories.AddCategoryMapping(44, TorznabCatType.PCMobileOther, "Filmy GSM/PDA");
-            caps.Categories.AddCategoryMapping(45, TorznabCatType.PCMobileOther, "Dzwonki GSM/PDA");
-            caps.Categories.AddCategoryMapping(46, TorznabCatType.PCMobileOther, "Gry GSM/PDA");
-            caps.Categories.AddCategoryMapping(21, TorznabCatType.Books, "Książki/Czasopisma");
-            caps.Categories.AddCategoryMapping(47, TorznabCatType.BooksEBook, "Książki/Czasopisma E-Booki");
-            caps.Categories.AddCategoryMapping(48, TorznabCatType.AudioAudiobook, "Książki/Czasopisma Audio-Booki");
-            caps.Categories.AddCategoryMapping(49, TorznabCatType.BooksMags, "Książki/Czasopisma Czasopisma");
-            caps.Categories.AddCategoryMapping(50, TorznabCatType.BooksComics, "Książki/Czasopisma Komiksy");
-            caps.Categories.AddCategoryMapping(22, TorznabCatType.PC, "Programy");
-            caps.Categories.AddCategoryMapping(51, TorznabCatType.PC0day, "Programy Windows");
-            caps.Categories.AddCategoryMapping(52, TorznabCatType.PC, "Programy Linux");
-            caps.Categories.AddCategoryMapping(53, TorznabCatType.PCMac, "Programy Macintosh");
-            caps.Categories.AddCategoryMapping(23, TorznabCatType.Other, "Inne");
-            caps.Categories.AddCategoryMapping(55, TorznabCatType.Other, "Inne Tapety");
-            caps.Categories.AddCategoryMapping(54, TorznabCatType.Other, "Inne Śmieszne");
-            caps.Categories.AddCategoryMapping(56, TorznabCatType.TVSport, "Inne Sport");
-            caps.Categories.AddCategoryMapping(57, TorznabCatType.Other, "Inne Pozostałe");
-            caps.Categories.AddCategoryMapping(24, TorznabCatType.XXX, "Erotyka");
-            caps.Categories.AddCategoryMapping(58, TorznabCatType.XXX, "Erotyka Czasopisma");
-            caps.Categories.AddCategoryMapping(59, TorznabCatType.XXX, "Erotyka Zdjęcia");
-            caps.Categories.AddCategoryMapping(60, TorznabCatType.XXX, "Erotyka Filmy");
-            caps.Categories.AddCategoryMapping(61, TorznabCatType.XXX, "Erotyka Gry");
-            caps.Categories.AddCategoryMapping(63, TorznabCatType.XXX, "Erotyka Hentai+18");
-            caps.Categories.AddCategoryMapping(68, TorznabCatType.TVAnime, "Anime");
-            caps.Categories.AddCategoryMapping(69, TorznabCatType.TVAnime, "Anime Pl");
-            caps.Categories.AddCategoryMapping(70, TorznabCatType.TVAnime, "Anime");
-            caps.Categories.AddCategoryMapping(76, TorznabCatType.Other, "Archiwum");
-
-            return caps;
-        }
-
-        public override async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
-        {
-            LoadValuesFromJson(configJson);
-
-            var pairs = new Dictionary<string, string>
-            {
-                { "uid", configData.Username.Value },
-                { "pwd", configData.Password.Value }
-            };
-
-            var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, null, LoginUrl, true);
-
-            await ConfigureIfOK(result.Cookies, result.ContentString != null && result.Cookies.Contains("pass=") && !result.Cookies.Contains("deleted"), () =>
-            {
-                var parser = new HtmlParser();
-                var dom = parser.ParseDocument(result.ContentString);
-                var invalidPasswordDiv = dom.QuerySelector("div:contains(\"Podane hasło jest\")");
-                var invalidLoginDiv = dom.QuerySelector("div:contains(\"Podany login jest\")");
-                var bannedUserElement = dom.QuerySelector("b:contains(\"has been blocked - fill captcha that\")");
-                var errorMessage = invalidLoginDiv?.TextContent ??
-                                   invalidPasswordDiv?.TextContent ??
-                                   bannedUserElement?.TextContent;
-                throw new ExceptionWithConfigData(errorMessage, configData);
-            });
-            return IndexerConfigurationStatus.RequiresTesting;
-        }
-
-        private ReleaseInfo ParseRow(IParentNode titleRow, IElement detailsRow)
-        {
-            var categoryAttribute = detailsRow.QuerySelector("a[href^=\"/torrenty.php?category=\"]").GetAttribute("href");
-            var categoryUrl = new Uri(SiteLink + Uri.UnescapeDataString(categoryAttribute));
-            var trackerCategory = HttpUtility.ParseQueryString(categoryUrl.Query)["category"];
-            var categories = MapTrackerCatToNewznab(trackerCategory);
-            var seedsMatch = _SeedsRegex.Match(detailsRow.TextContent);
-            var leechersMatch = _LeechersRegex.Match(detailsRow.TextContent);
-            var dateMatch = _DateRegex.Match(detailsRow.TextContent);
-            var sizeMatch = _SizeRegex.Match(detailsRow.TextContent);
-            var date = DateTime.MinValue; // In case of parsing failure
-            if (dateMatch.Success)
-            {
-                date = DateTime.ParseExact(
-                    $"{dateMatch.Groups[1].Value} +01:00", "dd/MM/yyyy zzz", CultureInfo.InvariantCulture);
-            }
-            var details = titleRow.QuerySelector("a[href^=\"details.php?id=\"]:has(span)");
-            var detailsLink = new Uri(SiteLink + details.GetAttribute("href"));
-            var encodedDownloadLink = detailsRow.QuerySelector("a[id^=\"download_\"]").GetAttribute("data-href");
-            var siteDownloadLink = new Uri(SiteLink + Uri.UnescapeDataString(StringUtil.FromBase64(encodedDownloadLink)));
-            var infoHash = HttpUtility.ParseQueryString(siteDownloadLink.Query)["id"];
-            var posterStr = detailsRow.QuerySelector("img[src^=\"./imgtorrent/\"]")?.GetAttribute("src");
-            var poster = !string.IsNullOrEmpty(posterStr) ? new Uri(SiteLink + posterStr) : null;
-            var seeders = seedsMatch.Success ? int.Parse(seedsMatch.Groups[1].Value) : 0;
-            var leechers = leechersMatch.Success ? int.Parse(leechersMatch.Groups[1].Value) : 0;
-            var peers = seeders + leechers;
-            var release = new ReleaseInfo
-            {
-                Title = details.TextContent,
-                Category = categories,
-                Seeders = seeders,
-                Poster = poster,
-                Peers = peers,
-                PublishDate = date,
-                DownloadVolumeFactor = 0,
-                UploadVolumeFactor = 1,
-                InfoHash = infoHash, // magnet link is auto generated from infohash
-                Guid = detailsLink,
-                Details = detailsLink,
-                Size = sizeMatch.Success ? ParseUtil.GetBytes(sizeMatch.Groups[1].Value) : 0
-            };
-            return release;
-        }
-        protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
-        {
-            var releases = new List<ReleaseInfo>();
-
-            var searchString = query.GetQueryString();
-            var searchUrl = BrowseUrl;
-            var queryCollection = new NameValueCollection
-            {
-                {"search", searchString},
-                {"category", "0"}, // multi category search not supported
-                {"erotyka", "1"}
-            };
-            searchUrl += "?" + queryCollection.GetQueryString(Encoding);
-
-            var response = await RequestWithCookiesAsync(searchUrl);
-            if (response.IsRedirect || response.Cookies != null && response.Cookies.Contains("pass=deleted;"))
-            {
-                // re-login
-                await ApplyConfiguration(null);
-                response = await RequestWithCookiesAsync(searchUrl);
-            }
-
-            var results = response.ContentString;
-            try
-            {
-                var parser = new HtmlParser();
-                var dom = parser.ParseDocument(results);
-                var rows = dom.QuerySelectorAll("table.header > tbody > tr:has(td)");
-                if (rows[0].TextContent.Contains("Nie ma torrentów")) // issue #9782
-                {
-                    return releases;
-                }
-                for (var i = 0; i < rows.Length; i += 2)
-                {
-                    // First row contains table, the second row contains the rest of the details
-                    var releaseInfo = ParseRow(rows[i], rows[i + 1]);
-                    releases.Add(releaseInfo);
-                }
-            }
-            catch (Exception ex)
-            {
-                OnParseError(results, ex);
-            }
-
-            return releases;
-        }
-    }
-}

src/Jackett.Common/Indexers/DonTorrent.cs

@@ -26,10 +26,10 @@ namespace Jackett.Common.Indexers
         public override string Name => "DonTorrent";
         public override string Description => "DonTorrent is a SPANISH public tracker for MOVIES / TV / GENERAL";
         // in the event the redirect is inactive https://t.me/s/dontorrent should have the latest working domain
-        public override string SiteLink { get; protected set; } = "https://dontorrent.foo/";
+        public override string SiteLink { get; protected set; } = "https://dontorrent.rsvp/";
         public override string[] AlternativeSiteLinks => new[]
         {
-            "https://dontorrent.foo/",
+            "https://dontorrent.rsvp/",
             "https://todotorrents.org/",
             "https://tomadivx.net/",
             "https://seriesblanco.one/",
@@ -38,8 +38,6 @@ namespace Jackett.Common.Indexers
         };
         public override string[] LegacySiteLinks => new[]
         {
-            "https://dontorrent.cloud/",
-            "https://dontorrent.africa/",
             "https://dontorrent.pictures/",
             "https://dontorrent.ms/",
             "https://dontorrent.care/",
@@ -53,6 +51,8 @@ namespace Jackett.Common.Indexers
             "https://dontorrent.mov/",
             "https://dontorrent.day/",
             "https://dontorrent.boo/",
+            "https://dontorrent.foo/",
+            "https://dontorrent.hair/",
         };
         public override string Language => "es-ES";
         public override string Type => "public";

src/Jackett.Common/Indexers/EraiRaws.cs

@@ -24,7 +24,7 @@ namespace Jackett.Common.Indexers
         {
             "https://www.erai-raws.info/",
             "https://beta.erai-raws.info/",
-            "https://erairaws.mrunblock.life/",
+            "https://erairaws.mrunblock.bond/",
             "https://erairaws.nocensor.click/"
         };
         public override string[] LegacySiteLinks => new[]
@@ -36,7 +36,8 @@ namespace Jackett.Common.Indexers
             "https://erairaws.nocensor.world/",
             "https://erairaws.nocensor.lol/",
             "https://erairaws.nocensor.art/",
-            "https://erairaws.mrunblock.guru/"
+            "https://erairaws.mrunblock.guru/",
+            "https://erairaws.mrunblock.life/",
         };
         public override string Language => "en-US";
         public override string Type => "semi-private";

src/Jackett.Common/Indexers/IPTorrents.cs

@@ -37,7 +37,8 @@ namespace Jackett.Common.Indexers
             "https://ipt.workisboring.net/",
             "https://ipt.lol/",
             "https://ipt.cool/",
-            "https://ipt.world/"
+            "https://ipt.world/",
+            "https://ipt.octopus.town/"
         };
         public override string[] LegacySiteLinks => new[]
         {

src/Jackett.Common/Indexers/MejorTorrent.cs

@@ -26,15 +26,14 @@ namespace Jackett.Common.Indexers
         public override string Id => "mejortorrent";
         public override string Name => "MejorTorrent";
         public override string Description => "MejorTorrent - Hay veces que un torrent viene mejor! :)";
-        public override string SiteLink { get; protected set; } = "https://www3.mejortorrent.rip/";
+        public override string SiteLink { get; protected set; } = "https://www4.mejortorrent.rip/";
         public override string[] AlternativeSiteLinks => new[]
         {
-            "https://www3.mejortorrent.rip/",
+            "https://www4.mejortorrent.rip/",
             "https://mejortorrent.unblockit.rsvp/"
         };
         public override string[] LegacySiteLinks => new[]
         {
-            "http://www.mejortorrentt.org/",
             "https://www.mejortorrents.net/",
             "https://www.mejortorrents1.com/",
             "https://www.mejortorrents1.net/",
@@ -61,6 +60,7 @@ namespace Jackett.Common.Indexers
             "https://mejortorrent.unblockit.asia/",
             "https://www2.mejortorrent.rip/",
             "https://mejortorrent.unblockit.mov/",
+            "https://www3.mejortorrent.rip/",
         };
         public override string Language => "es-ES";
         public override string Type => "public";

src/Jackett.Common/Indexers/SubsPlease.cs

@@ -26,7 +26,7 @@ namespace Jackett.Common.Indexers
         public override string[] AlternativeSiteLinks => new[]
         {
             "https://subsplease.org/",
-            "https://subsplease.mrunblock.life/",
+            "https://subsplease.mrunblock.bond/",
             "https://subsplease.nocensor.click/"
         };
         public override string[] LegacySiteLinks => new[]
@@ -38,7 +38,8 @@ namespace Jackett.Common.Indexers
             "https://subsplease.nocensor.world/",
             "https://subsplease.nocensor.lol/",
             "https://subsplease.nocensor.art/",
-            "https://subsplease.mrunblock.guru/"
+            "https://subsplease.mrunblock.guru/",
+            "https://subsplease.mrunblock.life/",
         };
         public override string Language => "en-US";
         public override string Type => "public";

src/Jackett.Common/Models/Config/ServerConfig.cs

@@ -15,6 +15,7 @@ namespace Jackett.Common.Models.Config
             observers = new List<IObserver<ServerConfig>>();
             // Default values
             Port = 9117;
+            LocalBindAddress = "127.0.0.1";
             AllowExternal = Environment.OSVersion.Platform == PlatformID.Unix;
             CacheEnabled = true;
             // Sonarr 15min, Radarr 60min, LazyLibrarian 20min, Readarr 15min, Lidarr = 15min
@@ -32,6 +33,7 @@ namespace Jackett.Common.Models.Config
         }
 
         public int Port { get; set; }
+        public string LocalBindAddress { get; set; }
         public bool AllowExternal { get; set; }
         public bool AllowCORS { get; set; }
         public string APIKey { get; set; }
@@ -114,7 +116,7 @@ namespace Jackett.Common.Models.Config
             else
             {
                 return new string[] {
-                    "http://127.0.0.1:" + Port + "/"
+                    $"http://{LocalBindAddress}:{Port}/"
                 };
             }
         }

src/Jackett.Common/Models/DTO/ServerConfig.cs

@@ -15,6 +15,8 @@ namespace Jackett.Common.Models.DTO
         [DataMember]
         public bool external { get; set; }
         [DataMember]
+        public string local_bind_address { get; set; }
+        [DataMember]
         public bool cors { get; set; }
         [DataMember]
         public string api_key { get; set; }
@@ -72,6 +74,7 @@ namespace Jackett.Common.Models.DTO
             this.notices = notices;
             port = config.Port;
             external = config.AllowExternal;
+            local_bind_address = config.LocalBindAddress;
             cors = config.AllowCORS;
             api_key = config.APIKey;
             blackholedir = config.BlackholeDir;