wihd: fix keywordless search + new cats #15754

because they may contain missing fields causing row error

README.md

@@ -517,7 +517,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Red Leaves (红叶) [![(invite needed)][inviteneeded]](#)
  * Red Star Torrent (RST) [![(invite needed)][inviteneeded]](#)
  * Redacted (PassTheHeadphones)
- * RedBits
  * ReelFlix
  * Resurrect The Net [![(invite needed)][inviteneeded]](#)
  * RetroFlix
@@ -571,7 +570,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TheEmpire (TE)
  * TheLeachZone (TLZ)
  * ThePiratedShip
- * TheScenePlace (TSP)
  * TJUPT (北洋园PT)
  * TLFBits [![(invite needed)][inviteneeded]](#)
  * TmGHuB [![(invite needed)][inviteneeded]](#)

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

@@ -173,7 +173,7 @@ search:
         img.pro_2up: 2
         "*": 1
     minimumratio:
-      text: 1
+      text: 1.1
     minimumseedtime:
       # 1 day (as seconds = 24 x 60 x 60)
       text: 86400

src/Jackett.Common/Definitions/aftershock.yml

@@ -115,7 +115,7 @@ search:
     type: "{{ .Config.type }}"
 
   rows:
-    selector: table tbody#torrent_background tr:has(a.index)
+    selector: table tbody#torrent_background tr:has(a.index):has(span.icon_check_alt)
     filters:
       - name: andmatch
 

src/Jackett.Common/Definitions/arabp2p.yml

@@ -52,7 +52,6 @@ caps:
     - {id: 52, cat: TV, desc: "مسرحيات (Plays)"}
     - {id: 71, cat: TV, desc: "مسلسلات مدبلجه عربي (Arabic Dubbed Series)"}
     - {id: 90, cat: TV, desc: "برامج ومسابقات (Shows)"}
-    - {id: 117, cat: TV, desc: "رمضان 2024 (Ramadan)"}
     # المرئيات الاجنبية Foreign Movies
     - {id: 92, cat: TV/Foreign, desc: "تعليمي (Educational)"}
     - {id: 93, cat: TV/Documentary, desc: "وثائقي (Documentary)"}
@@ -79,6 +78,7 @@ caps:
     - {id: 25, cat: Audio, desc: "القران الكريم (The Holy Quran)"}
     - {id: 27, cat: Audio, desc: "محاضرات (Lectures)"}
     - {id: 26, cat: Audio, desc: "اناشيد (Chants)"}
+    - {id: 118, cat: Audio, desc: "برامج صوتية (Programs)"}
     # برامج  Software
     - {id: 22, cat: PC, desc: "برامج عربية (Arabic Software)"}
     - {id: 23, cat: PC, desc: "برامج عامه (Public Software)"}

src/Jackett.Common/Definitions/blueroms.yml

@@ -70,51 +70,37 @@ search:
     at: "{{ .Config.sort }}"
 
   rows:
-    selector: table.table-striped > tbody > tr
+    selector: div.row > div.col-xs-12
 
   fields:
     category:
-      selector: td:nth-child(1) a
+      selector: p.card-text a
       attribute: href
     _platform:
-      selector: td:nth-child(1)
+      selector: p.card-text a
     title:
-      selector: td:nth-child(2)
+      selector: h4.card-title a
       filters:
         - name: append
           args: " - {{ .Result._platform }}"
     details:
-      selector: td:nth-child(2) a
+      selector: h4.card-title a
       attribute: href
     download:
-      selector: td:nth-child(3) a
+      selector: div.card-footer a
       attribute: href
     size:
-      selector: td:nth-child(4)
-    date_year:
-      selector: td:nth-child(5):not(:contains("-"))
-      optional: true
-      filters:
-        - name: dateparse
-          args: "yyyy"
-    date_month:
-      selector: td:nth-child(5):contains("-")
-      optional: true
+      selector: p.card-text
       filters:
         - name: regexp
-          args: (\d{4}-\d{2})
-        - name: dateparse
-          args: "yyyy-MM"
-    date_day:
-      selector: td:nth-child(5):contains("-")
-      optional: true
+          args: (\d+\.?\d+[T|G|K]iB)
+    date:
+      selector: p.card-text
       filters:
         - name: regexp
           args: (\d{4}-\d{2}-\d{2})
         - name: dateparse
           args: "yyyy-MM-dd"
-    date:
-      text: "{{ if or .Result.date_year .Result.date_day .Result.date_month }}{{ or .Result.date_year .Result.date_day .Result.date_month }}{{ else }}now{{ end }}"
     seeders:
       text: 1
     leechers:

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

@@ -13,14 +13,17 @@ legacylinks:
 caps:
   categorymappings:
     - {id: 1, cat: Movies, desc: "Movie"}
+    - {id: 8, cat: Other, desc: "Other"}
     - {id: 2, cat: TV, desc: "TV Show"}
     - {id: 3, cat: Movies/Other, desc: "FANRES"}
     - {id: 5, cat: Movies/Other, desc: "Trailer"}
+    - {id: 9, cat: Audio/Video, desc: "Live Concert"}
 
   modes:
     search: [q]
     tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
 
 settings:
   - name: apikey

src/Jackett.Common/Definitions/btdirectory.yml

@@ -7,8 +7,10 @@ type: public
 encoding: UTF-8
 # current domain at https://cursor.vip/btmulu then follow links to the final search-movie link
 links:
-  - https://btmulu.work/
+  - https://www.btmulu.asia/
   - https://www.btmulu.digital/
+legacylinks:
+  - https://btmulu.work/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/crabpt.yml

@@ -67,6 +67,10 @@ settings:
     type: info
     label: Results Per Page
     default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Account retention rules:<ol><li>Veteran User and above will be retained forever</li><li>Elite User and above will not have their account deleted after parking (in the control panel)</li><li> Users with a parked account will be deleted if they do not log in for 400 consecutive days</li><li>Users with a non-parked account will be deleted if they do not log in for 150 consecutive days</li><li>Users who have no traffic (i.e. upload/download data are both 0) will be deleted if they do not log in for 100 consecutive days.</li></ol>"
 
 login:
   path: login.php

src/Jackett.Common/Definitions/hdforever.yml

@@ -133,16 +133,19 @@ search:
           args: "&usetoken=1"
     download:
       text: "{{ if .Config.usetoken }}{{ .Result.download_usetoken }}{{ else }}{{ .Result.download_regular }}{{ end }}"
+    _release_group:
+      selector: span.team_name
+      optional: true
+      filters:
+        - name: trim
     title_phase1:
       selector: div.group_info
-      remove: span:nth-child(1), div.tags
+      remove: :scope > span.team_name, :scope > span:nth-child(2), div.tags, div.vote_controls, .add_bookmark, img
       filters:
         - name: replace
-          args: ["\n", ""]
+          args: ["\n", " "]
         - name: re_replace
-          args: ["^(.+)                                                                            (.+)", "$2-$1"]
-        - name: replace
-          args: ["                         ", " "]
+          args: ["\\s+", " "]
         - name: replace
           args: ["Blu-Ray Original", "Complete.BluRay"]
         - name: replace
@@ -236,6 +239,8 @@ search:
           args: [".VOF", ".FRENCH"]
         - name: replace
           args: [".VFQ.MULTI", ".MULTI.VFQ"]
+        - name: append
+          args: "{{ if .Result._release_group }}-{{ .Result._release_group }}{{ else }}{{ end }}"
     title_vostfr:
       text: "{{ .Result.title_phase1 }}"
       filters:

src/Jackett.Common/Definitions/hdonly.yml

@@ -107,7 +107,7 @@ login:
     selector: a[href^="logout.php?auth="]
 
 search:
-  # https://hd-only.org/torrents.php?filelist=blood+2009&freetorrent=1&order_by=time&order_way=desc&action=advanced&searchsubmit=1
+  # https://hd-only.org/ajax.php?filelist=blood+2009&action=browse&group_results=0&order_by=time&order_way=desc&freetorrent=1
   paths:
     - path: ajax.php
       response:
@@ -227,6 +227,9 @@ search:
     _vfq:
       selector: vfq
       optional: true
+    _vf2:
+      selector: vf2
+      optional: true
     _vfi:
       selector: vfi
       optional: true
@@ -251,9 +254,11 @@ search:
         - name: append
           args: ".{{ .Result.year }}.{{ .Result._episode_info }}.{{ .Result._format }}.{{ .Result._encoding }}.{{ .Result._media }}{{ if eq .Result._hdr \"True\" }}.HDR{{ else }}{{ end }}.{{ if eq .Result._hdr10plus \"True\" }}.HDR10+{{ else }}{{ end }}.{{ if eq .Result._dovi \"True\" }}.DoVi{{ else }}{{ end }}"
         - name: append
-          args: "{{ if or (eq .Result._vff \"True\") (eq .Result._vfq \"True\") }}.MULTI{{ else }}{{ end }}{{ if or (eq .Result._vfi \"True\") (eq .Result._vf \"True\") }}.MULTI{{ else }}{{ end }}"
-        - name: replace
-          args: [".MULTI.MULTI", ".MULTI"]
+          args: "{{ if or (eq .Result._vf2 \"True\") (or (eq .Result._vff \"True\") (or (eq .Result._vfq \"True\") (or (eq .Result._vfi \"True\")  (eq .Result._vf \"True\")))) }}.MULTI{{ else }}{{ end }}"
+        - name: re_replace
+          args: ["(\\.MULTI)\\1", ".MULTI"]
+        - name: append
+          args: "{{ if and (.Config.add_version_francophone_to_title) (eq .Result._vf2 \"True\") }}.VF2{{ else }}{{ end }}"
         - name: append
           args: "{{ if and (.Config.add_version_francophone_to_title) (eq .Result._vff \"True\") }}.VFF{{ else }}{{ end }}"
         - name: append

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

@@ -12,12 +12,20 @@ caps:
   categorymappings:
     - {id: 1, cat: Movies, desc: "Movies"}
     - {id: 2, cat: TV, desc: "TV"}
+    - {id: 8, cat: TV/Anime, desc: "Anime"}
+    - {id: 7, cat: Audio, desc: "Music"}
     - {id: 4, cat: Console, desc: "Games"}
+    - {id: 6, cat: PC, desc: "Apps"}
+    - {id: 9, cat: Books/Technical, desc: "Books/E-Learning"}
+    - {id: 10, cat: Books/Comics, desc: "Manga"}
+    - {id: 11, cat: XXX, desc: "XXX"}
 
   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
@@ -143,7 +151,7 @@ search:
       selector: created_at
       filters:
         - name: append
-          args: " -11:00" # SST
+          args: " -10:00" # HAST
         - name: dateparse
           args: "MM/dd/yyyy HH:mm:ss zzz"
     size:
@@ -178,4 +186,4 @@ search:
     minimumseedtime:
       # 7 days (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 8.3.3
+# json UNIT3D 8.3.4

src/Jackett.Common/Definitions/itatorrents.yml

@@ -167,7 +167,7 @@ search:
       selector: created_at
       filters:
         - name: append
-          args: " -03:00" # BRT
+          args: " +00:00" # GMT
         - name: dateparse
           args: "MM/dd/yyyy HH:mm:ss zzz"
     size:
@@ -200,4 +200,4 @@ search:
     minimumseedtime:
       # 7 days (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 8.3.3 (custom)
+# json UNIT3D 8.3.4 (custom)

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

@@ -41,6 +41,13 @@ caps:
     book-search: [q]
 
 settings:
+  - name: useragent
+    type: text
+    label: User-Agent
+  - name: info_useragent
+    type: info
+    label: How to get the User-Agent
+    default: "<ol><li>Access 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>'user-agent:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole user-agent string <i>(everything after 'user-agent: ')</i> and <b>Paste</b> here.</li></ol>"
   - name: sort
     type: select
     label: Sort requested from site
@@ -63,6 +70,9 @@ download:
       attribute: href
 
 search:
+  headers:
+    User-Agent: ["{{ .Config.useragent }}"]
+
   paths:
     # 20 rows per page
     - path: "{{ if .Keywords }}usearch/{{ .Keywords }}/{{ else }}new/{{ end }}?sortby={{ .Config.sort }}&sort={{ .Config.type }}"
@@ -73,6 +83,8 @@ search:
 
   error:
     - selector: h1:contains("403 Forbidden")
+      message:
+        text: "Site returned 403 Forbidden. Try updating your indexer config with a new/different user-agent."
 
   rows:
     selector: table.data tr.odd:has(a[class="cellMainLink"]), table.data tr.even:has(a[class="cellMainLink"])

src/Jackett.Common/Definitions/kufei.yml

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

src/Jackett.Common/Definitions/lastfiles.yml

@@ -1,17 +1,17 @@
 ---
 id: lastfiles
 name: LastFiles
-description: "LastFiles (LF) is a ROMANIAN Private Torrent Tracker for 0DAY / GENERAL"
+description: "LastFiles (LF) is a ROMANIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: ro-RO
 type: private
 encoding: UTF-8
 followredirect: true
 requestDelay: 2
 links:
+  - https://last-torrents.org/
   - https://www.last-torrents.org/
 legacylinks:
   - http://last-torrents.org/
-  - https://last-torrents.org/
   - https://www.lastfiles.ro/
   - http://www.lastfiles.ro/
   - http://www.last-torrents.org/
@@ -38,12 +38,13 @@ caps:
     - {id: 24, cat: Movies/SD, desc: "Movies: XVID", default: true}
     - {id: 25, cat: Movies/SD, desc: "Movies: XVID-Ro", default: true}
     - {id: 26, cat: PC/0day, desc: "Software", default: true}
-    - {id: 27, cat: XXX, desc: "Movies: XXX", default: false}
+    - {id: 27, cat: XXX/x264, desc: "Movies: XXX", default: false}
     - {id: 28, cat: Audio, desc: "Music", default: true}
     - {id: 30, cat: PC/Games, desc: "Games: PC-ISO", default: true}
     - {id: 31, cat: Movies/UHD, desc: "Movies: 4K", default: true}
-    - {id: 32, cat: Movies/UHD, desc: "Movies: 4K-Ro", default: true}
+    - {id: 32, cat: Movies/UHD, desc: "Movies: 4KRo", default: true}
     - {id: 33, cat: PC/Games, desc: "Games: Packs", default: true}
+    - {id: 34, cat: XXX/Pack, desc: "XXX Pack", default: false}
     - {id: 42, cat: TV/Sport, desc: "Sport", default: true}
     - {id: 43, cat: Books, desc: "Documents", default: true}
     - {id: 44, cat: Other, desc: "Images", default: true}
@@ -53,10 +54,7 @@ caps:
     - {id: 55, cat: Movies/WEB-DL, desc: "Movies: WEB-DL Ro", default: true}
     - {id: 56, cat: TV/Documentary, desc: "Documentary", default: true}
     - {id: 57, cat: TV/Documentary, desc: "Documentary-Ro", default: true}
-    - {id: 58, cat: Movies/SD, desc: "Movies: Cam", default: true}
-    - {id: 59, cat: Movies/SD, desc: "Movies: Cam-Ro", default: true}
-    - {id: 61, cat: Movies/3D, desc: "Movies: 3D", default: true}
-    - {id: 62, cat: Movies/3D, desc: "Movies: 3D-Ro", default: true}
+    - {id: 60, cat: XXX/ImageSet, desc: "ImagesXXX", default: false}
     - {id: 81, cat: Movies/HD, desc: "Movies: x265-Ro", default: true}
     - {id: 82, cat: Movies/HD, desc: "Movies: x265", default: true}
 
@@ -84,81 +82,99 @@ settings:
     type: info
     label: Account Inactivity
     default: "Accounts inactive for more than 42 days are automatically deleted."
-#  - name: sort
-#    type: select
-#    label: Sort requested from site
-#    default: 3
-#    options:
-#      3: created
-#      6: seeders
-#      4: 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
+  path: login
+  method: form
+  form: form[action$="/login"]
   inputs:
-    username: "{{ .Config.username }}"
+    name: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
-    submitme: Login!
-    use_ssl: 1
-    perm_ssl: 1
+    remember: on
+  selectorinputs:
+    _token:
+      selector: input[name="_token"]
+      attribute: value
   error:
-    - selector: td.embedded:contains("Login failed")
+    - selector: div.alert-danger:contains("Invalid credentials")
   test:
-    path: index.php
-    selector: a[href*="/logout.php?hash_please="]
+    path: /
+    selector: a[href$="/logout"]
 
 search:
   paths:
-    # https://www.last-torrents.org/browse.php?search=the+nun+ii&searchin=title&type=0&cat=+
-    # cannot support imdbid or tmdbid searches while using path category filters
-    - path: browse.php
-      categories: [1, 2, 5, 6, 9, 10, 11, 12, 13, 14, 16, 17, 18, 19, 20, 21, 22, 24, 25, 26, 28, 30, 31, 32, 33, 42, 43, 44, 49, 51, 54, 55, 56, 57, 58, 59, 60, 61, 62, 81, 82]
-    - path: browseadult.php
-      categories: [27]
+    # https://www.last-torrents.org/torrents?keyword=tt8337290&category=32&genre=&torrent_status=free
+    - path: torrents
+      categories: [1, 2, 5, 6, 9, 10, 11, 12, 13, 14, 16, 17, 18, 19, 20, 21, 22, 24, 25, 26, 28, 30, 31, 32, 33, 42, 43, 44, 49, 51, 54, 55, 56, 57, 81, 82]
+    - path: torrents/adult
+      categories: [27, 34, 60]
 
   inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.Genre }}{{ .Query.Genre }} {{ else }}{{ end }}{{ .Keywords }}"
-    # title, genre, all
-    searchin: "{{ if .Query.Genre }}all{{ else }}title{{ end }}"
-    # 0 active, 1 incldead, 2 onlydead, 3 free, 4 silver, 5 seedbox
-    type: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
-# sort and type can only be used in a non-search query due to conflicting parameters
-#    sort: "{{ .Config.sort }}"
-#    type: "{{ .Config.type }}"
+    # does not support multi categories, leaving out category keyword defaults to all
+    keyword: "{{ .Keywords }}"
+    # active, dead, free, double, seedbox
+    torrent_status: "{{ if .Config.freeleech }}free{{ else }}active{{ end }}"
+    # has sort for size and seeders but not for title or date
 
   rows:
-    selector: div.py-3
-    filters:
-      - name: andmatch
+    selector: table.table-striped > tbody > tr
 
   fields:
     category:
-      selector: a[href*="cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
+      selector: img[src*="images/categories/"], img[src*="images/categoriesNORMALE/"]
+      attribute: src
+      case:
+        # not all categories are available at the moment, so some are deduced and unconfirmed
+        img[src$="/anime.png"]: 1
+        img[src$="/anime-ro.png"]: 2
+        img[src$="/bluray.png"]: 5
+        img[src$="/bluray-ro.png"]: 6
+        img[src$="/dvd.png"]: 9
+        img[src$="/dvd-ro.png"]: 10
+        img[src$="/hd.png"]: 11
+        img[src$="/hd-ro.png"]: 12
+        img[src$="/hdtve.png"]: 13
+        img[src$="/hdtve-ro.png"]: 14
+        img[src$="/oldies.png"]: 16
+        img[src$="/oldies-ro.png"]: 17
+        img[src$="/pack.png"]: 18
+        img[src$="/pack-ro.png"]: 19
+        img[src$="/tvepisode.png"]: 20
+        img[src$="/tvepisode-ro.png"]: 21
+        img[src$="/rocontent.png"]: 22
+        img[src$="/xvid.png"]: 24
+        img[src$="/xvid-ro.png"]: 25
+        img[src$="/soft.png"]: 26
+        img[src$="/xxx.png"]: 27
+        img[src$="/music.png"]: 28
+        img[src$="/pciso.png"]: 30
+        img[src$="/4k.png"]: 31
+        img[src$="/4kRO.png"]: 32
+        img[src$="/packs.png"]: 33
+        img[src$="/xxxpacks.png"]: 34
+        img[src$="/sport.png"]: 42
+        img[src$="/docs.png"]: 43
+        img[src$="/images.png"]: 44
+        img[src$="/misc.png"]: 49
+        img[src$="/android.png"]: 51
+        img[src$="/web-DL.png"]: 54
+        img[src$="/web-DLRO.png"]: 55
+        img[src$="/doc.png"]: 56
+        img[src$="/doc-ro.png"]: 57
+        img[src$="/imagesxxx.png"]: 60
+        img[src$="/x265ro.png"]: 81
+        img[src$="/x265.png"]: 82
     title:
-      selector: a[href^="t"]
+      selector: a.torrent-name
     details:
-      selector: a[href^="t"]
+      selector: a.torrent-name
       attribute: href
     poster:
-      selector: a[href^="t"]
-      attribute: title
+      selector: a.torrent-name
+      attribute: data-bs-title
       filters:
         - name: regexp
-          args: "src=(.+?) "
+          args: "src='(.+?)'"
     genre:
       selector: i:has(a[href$="searchin=genre"]), font[size]
       filters:
@@ -171,46 +187,32 @@ search:
     description:
       text: "{{ .Result.genre }}"
     download:
-      selector: a[href^="download.php"]
+      selector: a[href*="/download/"]
       attribute: href
-    date_day:
-      selector: div.col-sm-4:nth-of-type(3):contains("day")
-      # auto adjusted by site account profile
-      optional: true
-      filters:
-        - name: fuzzytime
-    date_year:
-      selector: div.col-sm-4:nth-of-type(3):contains(":"):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 }}"
+      selector: td:nth-of-type(4) div[title]
+      attribute: title
+      filters:
+        - name: timeago
     size:
-      selector: div.col-sm-4:nth-of-type(4)
+      selector: td:nth-of-type(5)
     grabs:
-      selector: div.col-sm-3:contains("Completed") b
+      selector: td:nth-of-type(6)
     seeders:
-      selector: div.col-sm-3:contains("Seeders") b
+      selector: td:nth-of-type(7)
     leechers:
-      selector: div.col-sm-2:contains("Leechers") b
+      selector: td:nth-of-type(8)
     downloadvolumefactor:
       case:
-        img[src$="half2.png"]: 0.5
-        a#free-btn: 0
+        div.free-btn: 0
         "*": 1
     uploadvolumefactor:
       case:
-        a#double-btn: 2
+        div.double-btn: 2
         "*": 1
     minimumratio:
       text: 1.0
     minimumseedtime:
-      # freeleech 2 days (as seconds =  2 x 24 x 60 x 60)
-      # notfree 1.5 days  (as seconds =  1.5 x 24 x 60 x 60)
-      case:
-        a#free-btn: 172800
-        "*": 129600
-# U-232 V5
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# Last Files V1

src/Jackett.Common/Definitions/okpt.yml

@@ -72,7 +72,7 @@ settings:
   - name: info_activity
     type: info
     label: Account Inactivity
-    default: "Account retention rules:<ul><li>Sixth degree burn (Extreme User) and above will be retained forever</li><li>Second degree burn (Elite User) and above have their accounts parked (in the control panel) for 60 consecutive days If you do not log in for 60 days, your account will be deleted</li><li>Users who have parked their accounts and do not log in for 60 consecutive days will have their accounts deleted</li><li>Users who have not parked their accounts will have their accounts deleted if they do not log in for 60 consecutive days</li><li>Users without traffic (i.e. upload / download data are all 0) If you do not log in for 14 consecutive days, your account will be deleted.</li></ul>"
+    default: "Account retention rules:<ul><li>Sixth degree burn (Extreme User) and above will be retained forever</li><li>Second degree burn (Elite User) and above that have their accounts parked (in the control panel) for 60 consecutive days will be deleted</li><li>Users who have parked their accounts and do not log in for 60 consecutive days will have their accounts deleted</li><li>Users who have not parked their accounts will have their accounts deleted if they do not log in for 60 consecutive days</li><li>Users without traffic (i.e. upload / download data are all 0) will have their accounts deleted if they do not log in for 14 consecutive days.</li></ul>"
 
 login:
   # using cookie method because site regularly disables login page for certain events during the year

src/Jackett.Common/Definitions/polishtorrent.yml

@@ -11,10 +11,10 @@ links:
 caps:
   categorymappings:
     - {id: 6, cat: PC/0day, desc: "Aplikacje/Programy"}
-    - {id: 31, cat: TV/Anime, desc: "Anime"}
     - {id: 4, cat: Movies, desc: "Bajki"}
-    - {id: 30, cat: TV, desc: "TV Seriale Bajki"}
+    - {id: 31, cat: TV/Anime, desc: "Anime"}
     - {id: 1, cat: Movies/HD, desc: "Filmy HD"}
+    - {id: 30, cat: TV, desc: "TV Seriale Bajki"}
     - {id: 13, cat: Movies/DVD, desc: "DVD5/9"}
     - {id: 12, cat: Movies/BluRay, desc: "BD25/50_5/9"}
     - {id: 14, cat: Movies/3D, desc: "Filmy 3D"}
@@ -27,9 +27,9 @@ caps:
     - {id: 19, cat: Other, desc: "Inne"}
     - {id: 8, cat: Audio, desc: "Muzyka"}
     - {id: 11, cat: Movies, desc: "Paczki"}
-    - {id: 27, cat: TV/Other, desc: "Teatr Telewizyjny"}
-    - {id: 25, cat: Audio/Audiobook, desc: "Audiobook"}
     - {id: 20, cat: Books, desc: "Book"}
+    - {id: 25, cat: Audio/Audiobook, desc: "Audiobook"}
+    - {id: 27, cat: TV/Other, desc: "Teatr Telewizyjny"}
     - {id: 21, cat: TV/Sport, desc: "Sport"}
     - {id: 29, cat: Movies, desc: "Stare Filmy"}
     - {id: 22, cat: TV/SD, desc: "TV Seriale SD"}
@@ -39,6 +39,7 @@ caps:
     - {id: 2, cat: TV/UHD, desc: "TV 4K"}
     - {id: 15, cat: Movies, desc: "Filmy bez lektora"}
     - {id: 7, cat: XXX, desc: "XXX 18+"}
+    - {id: 32, cat: Movies/Other, desc: "Anime/Filmy"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/pornolab.yml

@@ -21,9 +21,9 @@ caps:
     - {id: 508, cat: XXX, desc: "Классические фильмы / Classic"}
     - {id: 555, cat: XXX, desc: "Фильмы с сюжетом / Feature & Vignettes"}
     - {id: 1845, cat: XXX, desc: "Гонзо-фильмы 1991-2010 / Gonzo 1991-2010"}
-    - {id: 1673, cat: XXX, desc: "Гонзо-фильмы 2011-2024 / Gonzo 2011-2024"}
+    - {id: 1673, cat: XXX, desc: "Гонзо-фильмы 2011-2025 / Gonzo 2011-2025"}
     - {id: 1112, cat: XXX, desc: "Фильмы без сюжета 1991-2010 / All Sex & Amateur 1991-2010"}
-    - {id: 1718, cat: XXX, desc: "Фильмы без сюжета 2011-2024 / All Sex & Amateur 2011-2024"}
+    - {id: 1718, cat: XXX, desc: "Фильмы без сюжета 2011-2025 / All Sex & Amateur 2011-2025"}
     - {id: 553, cat: XXX, desc: "Лесбо-фильмы / All Girl & Solo"}
     - {id: 1143, cat: XXX, desc: "Этнические фильмы / Ethnic-Themed"}
     - {id: 1646, cat: XXX, desc: "Видео для телефонов и КПК / Pocket РС & Phone Video"}
@@ -41,8 +41,8 @@ caps:
     - {id: 1675, cat: XXX/Pack, desc: "Паки русских порнороликов / Russian Clips Packs"}
     - {id: 36, cat: XXX, desc: "Сайтрипы с русскими актрисами 1991-2015 / Russian SiteRip's 1991-2015"}
     - {id: 1830, cat: XXX, desc: "Сайтрипы с русскими актрисами 1991-2015 (HD Video) / Russian SiteRip's 1991-2015 (HD Video)"}
-    - {id: 1803, cat: XXX, desc: "Сайтрипы с русскими актрисами 2016-2024 / Russian SiteRip's 2016-2024"}
-    - {id: 1831, cat: XXX, desc: "Сайтрипы с русскими актрисами 2016-2024 (HD Video) / Russian SiteRip's 2016-2024 (HD Video)"}
+    - {id: 1803, cat: XXX, desc: "Сайтрипы с русскими актрисами 2016-2025 / Russian SiteRip's 2016-2025"}
+    - {id: 1831, cat: XXX, desc: "Сайтрипы с русскими актрисами 2016-2025 (HD Video) / Russian SiteRip's 2016-2025 (HD Video)"}
     - {id: 1741, cat: XXX, desc: "Русские Порноролики Разное / Russian Clips (various)"}
     - {id: 1676, cat: XXX, desc: "Русское любительское видео / Russian Amateur Video"}
 
@@ -64,6 +64,7 @@ caps:
     - {id: 1857, cat: XXX, desc: "Сайтрипы 2022 (HD Video) / SiteRip's 2022 (HD Video)"}
     - {id: 1861, cat: XXX, desc: "Сайтрипы 2023 (HD Video) / SiteRip's 2023 (HD Video)"}
     - {id: 1867, cat: XXX, desc: "Сайтрипы 2024 (HD Video) / SiteRip's 2024 (HD Video)"}
+    - {id: 1872, cat: XXX, desc: "Сайтрипы 2025 (HD Video) / SiteRip's 2025 (HD Video)"}
     - {id: 1451, cat: XXX, desc: "Сайтрипы 1991-2010 / SiteRip's 1991-2010"}
     - {id: 1788, cat: XXX, desc: "Сайтрипы 2011-2012 / SiteRip's 2011-2012"}
     - {id: 1789, cat: XXX, desc: "Сайтрипы 2013 / SiteRip's 2013"}
@@ -78,6 +79,7 @@ caps:
     - {id: 1856, cat: XXX, desc: "Сайтрипы 2022 / SiteRip's 2022"}
     - {id: 1862, cat: XXX, desc: "Сайтрипы 2023 / SiteRip's 2023"}
     - {id: 1868, cat: XXX, desc: "Сайтрипы 2024 / SiteRip's 2024"}
+    - {id: 1873, cat: XXX, desc: "Сайтрипы 2025 / SiteRip's 2025"}
     - {id: 1707, cat: XXX, desc: "Сцены из фильмов / Movie Scenes (кроме SiteRip)"}
     - {id: 284, cat: XXX, desc: "Порноролики Разное / Clips (various)"}
     - {id: 1853, cat: XXX, desc: "Компиляции и Музыкальные порно клипы / Compilations & Porn Music Video (PMV)"}
@@ -87,7 +89,7 @@ caps:
     - {id: 1801, cat: XXX/Pack, desc: "Паки японских фильмов и сайтрипов / Full Length Japanese Movies Packs & SiteRip's Packs"}
     - {id: 1719, cat: XXX, desc: "Японские фильмы и сайтрипы (DVD и HD Video) / Japanese Movies & SiteRip's (DVD & HD Video)"}
     - {id: 997, cat: XXX, desc: "Японские фильмы и сайтрипы 1991-2014 / Japanese Movies & SiteRip's 1991-2014"}
-    - {id: 1818, cat: XXX, desc: "Японские фильмы и сайтрипы 2015-2024 / Japanese Movies & SiteRip's 2015-2024"}
+    - {id: 1818, cat: XXX, desc: "Японские фильмы и сайтрипы 2015-2025 / Japanese Movies & SiteRip's 2015-2025"}
     - {id: 1849, cat: XXX, desc: "Китайские фильмы и сайтрипы (DVD и HD Video) / Chinese Movies & SiteRip's (DVD & HD Video)"}
     - {id: 1815, cat: XXX, desc: "Архив (Японское и китайское порно)"}
 

src/Jackett.Common/Definitions/ptitzmx.yml

@@ -60,7 +60,7 @@ settings:
   - name: info_activity
     type: info
     label: Account Inactivity
-    default: "Cherish your user account. Inactive accounts would be deleted based on the following rules:<ol><li>Veteran User or above would never be deleted</li><li>Elite User or above would never be deleted if parked (at User CP)</li><li>Parked accounts would be deleted if users have not logged in for more than 400 days in a row</li><li>Un-parked accounts would be deleted if users have not logged in for more than 150 days in a row</li><li>Accounts with both uploaded and downloaded amount being 0 would be deleted if users have not logged in for more than 100 days in a row.</li></ol>"
+    default: "Cherish your user account. Inactive accounts would be deleted based on the following rules:<ol><li>Veteran User and above users will be retained forever</li><li>Elite User and above users will not be deleted after parking their accounts (in the control panel)</li><li>Users with parked accounts will have their accounts deleted if they do not log in for 300 consecutive days</li><li>Users with un-parked accounts will have their accounts deleted if they do not log in for 90 consecutive days</li><li>Accounts with both uploaded and downloaded amount being 0 would be deleted if users have not logged in for more than 7 days in a row.</li></ol>"
 
 login:
   path: login.php

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

@@ -1,198 +0,0 @@
----
-id: redbits-api
-name: RedBits (API)
-description: "RedBits is a SPANISH site for classic content"
-language: es-ES
-type: private
-encoding: UTF-8
-links:
-  - https://redbits.xyz/
-legacylinks:
-  - https://red-bits.com/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Películas"}
-    - {id: 2, cat: TV, desc: "Series"}
-    - {id: 10, cat: TV, desc: "Series Completas"}
-    - {id: 6, cat: TV/Documentary, desc: "Documentales"}
-    - {id: 7, cat: TV/Sport, desc: "Deportes"}
-    - {id: 8, cat: Movies, desc: "Hagbard"}
-    - {id: 9, cat: Movies, desc: "Studio Ghibli"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
-    movie-search: [q, imdbid, tmdbid]
-
-settings:
-  - name: apikey
-    type: text
-    label: APIKey
-  - name: info_key
-    type: info
-    label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://redbits.xyz/\" target=\"_blank\">RedBits</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: created_at
-    options:
-      created_at: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_activity
-    type: info
-    label: Account Inactivity
-    default: "Not entering in a month leads to the account being deactivated or banned. If the account does not register downloads in a month, it will be banned with the User rank, the other ranks will be given a time determined by the staff."
-
-login:
-  path: /api/torrents
-  method: get
-  error:
-    - selector: a[href*="/login"]
-      message:
-        text: "The API key was not accepted by {{ .Config.sitelink }}."
-    - selector: :root:contains("Account is Banned")
-
-search:
-  paths:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/wiki/Torrent-API-(UNIT3D-v8.x.x)
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php#L476
-    - path: "/api/torrents/filter"
-      response:
-        type: json
-
-  headers:
-    Authorization: ["Bearer {{ .Config.apikey }}"]
-
-  inputs:
-  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
-    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
-    name: "{{ .Keywords }}"
-    seasonNumber: "{{ .Query.Season }}"
-    episodeNumber: "{{ .Query.Ep }}"
-    imdbId: "{{ .Query.IMDBIDShort }}"
-    tmdbId: "{{ .Query.TMDBID }}"
-    tvdbId: "{{ .Query.TVDBID }}"
-    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 100
-
-  keywordsfilters:
-    - name: re_replace
-      args: ["\\.", " "]
-
-  rows:
-    selector: data
-    attribute: attributes
-
-  fields:
-    category:
-      selector: category_id
-    title_vose:
-      selector: name:contains(VOSE)
-      optional: true
-      filters:
-        - name: append
-          args: " English" # Add english to fix Sonarr/Radarr language
-    title_notvose:
-      selector: name:not(:contains(VOSE))
-      optional: true
-      filters:
-        - name: append
-          args: " Spanish" # Add spanish to fix Sonarr/Radarr language
-    title:
-      text: "{{ if .Result.title_vose }}{{ .Result.title_vose }}{{ else }}{{ .Result.title_notvose }}{{ end }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)bdfull", "BluRay"] # BDfull  -> BluRay
-        - name: re_replace
-          args: ["(?i)RedBits", ""] # Delete RedBits
-        - name: re_replace
-          args: ["\\[|\\]", " "]
-        - name: re_replace
-          args: ["  ", " "]
-        - name: re_replace
-          args: ["(?i)T(\\d{1,2})\\b", "S$1"]
-    details:
-      selector: details_link
-    download:
-      selector: download_link
-    infohash:
-      selector: info_hash
-    poster:
-      selector: meta.poster
-      filters:
-        - name: replace
-          args: ["https://via.placeholder.com/90x135", ""]
-    imdbid:
-      selector: imdb_id
-    tmdbid:
-      selector: tmdb_id
-    tvdbid:
-      selector: tvdb_id
-    genre:
-      selector: meta.genres
-      filters:
-        - name: re_replace
-          args: ["(?i)^None$", ""]
-        - name: re_replace
-          args: ["(?i)(Película de TV)", "Película_de_TV"]
-        - name: re_replace
-          args: ["(?i)(Ciencia ficción)", "Ciencia_ficción"]
-        - name: replace
-          args: [" & ", "_&_"]
-    description:
-      text: "{{ .Result.genre }}"
-    files:
-      selector: num_file
-    seeders:
-      selector: seeders
-    leechers:
-      selector: leechers
-    grabs:
-      selector: times_completed
-    date:
-      # "created_at": "2021-10-18T00:34:50.000000Z" is returned by Newtonsoft.Json.Linq as 18/10/2021 00:34:50
-      selector: created_at
-      filters:
-        - name: append
-          args: " +00:00" # GMT
-        - name: dateparse
-          args: "MM/dd/yyyy HH:mm:ss zzz"
-    size:
-      selector: size
-    downloadvolumefactor:
-      # api returns 0%, 25%, 50%, 75%, 100%
-      selector: freeleech
-      case:
-        0%: 1 # not free
-        25%: 0.75
-        50%: 0.5
-        75%: 0.25
-        100%: 0 # freeleech
-        "*": 0 # catch errors
-    uploadvolumefactor:
-      # api returns 0=false, 1=true
-      selector: double_upload
-      case:
-        0: 1 # normal
-        1: 2 # double
-    minimumseedtime:
-      # 4 days (as seconds = 4 x 24 x 60 x 60)
-      text: 345600
-# json UNIT3D 6.4.1

src/Jackett.Common/Definitions/rudub.yml

@@ -9,21 +9,8 @@ type: semi-private
 encoding: windows-1251
 followredirect: true
 links:
-  - https://04december.rudub.online/
+  - https://17december.rudub.online/
 legacylinks:
-  - https://04november.rudub.online/
-  - https://05november.rudub.online/
-  - https://06november.rudub.online/
-  - https://07november.rudub.online/
-  - https://08november.rudub.online/
-  - https://09november.rudub.online/
-  - https://10november.rudub.online/
-  - https://11november.rudub.online/
-  - https://12november.rudub.online/
-  - https://13november.rudub.online/
-  - https://14november.rudub.online/
-  - https://15november.rudub.online/
-  - https://16november.rudub.online/
   - https://17november.rudub.online/
   - https://18november.rudub.online/
   - https://19november.rudub.online/
@@ -41,6 +28,19 @@ legacylinks:
   - https://01december.rudub.online/
   - https://02december.rudub.online/
   - https://03december.rudub.online/
+  - https://04december.rudub.online/
+  - https://05december.rudub.online/
+  - https://06december.rudub.online/
+  - https://07december.rudub.online/
+  - https://08december.rudub.online/
+  - https://09december.rudub.online/
+  - https://10december.rudub.online/
+  - https://11december.rudub.online/
+  - https://12december.rudub.online/
+  - https://13december.rudub.online/
+  - https://14december.rudub.online/
+  - https://15december.rudub.online/
+  - https://16december.rudub.online/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/thesceneplace.yml

@@ -1,187 +0,0 @@
----
-id: thesceneplace
-name: TheScenePlace
-description: "TheScenePlace (TSP) is a Private site for TV / MOVIES / GENERAL"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://www.thesceneplace.com/
-legacylinks:
-  - http://www.thesceneplace.com/ # site is no longer forcing http
-
-caps:
-  categorymappings:
-    - {id: 13, cat: PC, desc: "Apps"}
-    - {id: 15, cat: TV/HD, desc: "TV x264"}
-    - {id: 16, cat: TV/HD, desc: "TV x265"}
-    - {id: 17, cat: TV/SD, desc: "TV XVID"}
-    - {id: 18, cat: TV, desc: "TV PACKS"}
-    - {id: 25, cat: TV, desc: "TV KIDS"}
-    - {id: 38, cat: TV/SD, desc: "TV 480p"}
-    - {id: 20, cat: Movies/HD, desc: "Movies x264"}
-    - {id: 21, cat: Movies/HD, desc: "Movies x265"}
-    - {id: 22, cat: Movies/SD, desc: "Movies XVID"}
-    - {id: 23, cat: Movies, desc: "Movies PACKS"}
-    - {id: 24, cat: Movies, desc: "Movies KIDS"}
-    - {id: 35, cat: Movies/UHD, desc: "Movies 4K/UHD"}
-    - {id: 36, cat: Movies/BluRay, desc: "Movies BluRay"}
-    - {id: 37, cat: Movies/SD, desc: "Movies 480p"}
-    - {id: 27, cat: Audio/MP3, desc: "Music MP3"}
-    - {id: 28, cat: Audio/Lossless, desc: "Music FLAC"}
-    - {id: 29, cat: Audio, desc: "Music PACKS"}
-    - {id: 34, cat: Audio, desc: "Music Karaoke "}
-    - {id: 30, cat: Books/EBook, desc: "eBooks"}
-    - {id: 32, cat: PC/Games, desc: "Games PC"}
-    - {id: 33, cat: Console, desc: "Games ROMS"}
-    - {id: 39, cat: Other, desc: "Misc"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Filter freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 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:
-  path: index.php?page=login
-  method: post
-  inputs:
-    uid: "{{ .Config.username }}"
-    pwd: "{{ .Config.password }}"
-  error:
-    - selector: tr td span[style="color:#FF0000;"]
-  test:
-    path: index.php
-    selector: a[href="logout.php"]
-
-search:
-  paths:
-    - path: index.php
-  inputs:
-    page: torrents
-    search: "{{ .Keywords }}"
-    category: "{{ range .Categories }}{{.}};{{end}}"
-    # 0 filename, 1 file&descr, 2 descr, 3 uploaders, 5 gold, 6 silver, 7 bronze
-    options: 0
-    # 0 all, 1 active only, 2 dead only
-    active: 0
-    order: "{{ .Config.sort }}"
-    by: "{{ .Config.type }}"
-    # does not support imdbid search and does not return imdb link in results
-
-  keywordsfilters:
-    - name: re_replace
-      args: ["\\.", " "]
-
-  rows:
-    selector: "table.lista > tbody > tr:has(a[href^=\"index.php?page=torrent-details&id=\"]):has(td[width=\"30\"]){{ if .Config.freeleech }}:has(img[src=\"images/freeleech.gif\"]){{ else }}{{ end }}{{ if .Config.freeleech }}, table.lista > tbody > tr:has(a[href^=\"index.php?page=torrent-details&id=\"]):has(td[width=\"30\"]):has(img[src=\"images/gold.gif\"]){{ else }}{{ end }}"
-
-  fields:
-    title_torrent:
-      selector: a[href^="download.php?id="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: f
-        - name: htmldecode
-        - name: re_replace
-          args: ["(?i)\\.torrent$", ""]
-    title_text:
-      selector: a[href^="index.php?page=torrent-details&id="]
-    category:
-      selector: a[href^="index.php?page=torrents&category="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    title:
-      text: "{{ if .Result.title_torrent }}{{ .Result.title_torrent }}{{ else }}{{ .Result.title_text }}{{ end }}"
-    poster:
-      selector: a[href^="index.php?page=torrent-details&id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=(.*?) "
-        - name: replace
-          args: ["torrentimg/nocover.jpg", ""]
-    details:
-      selector: a[href^="index.php?page=torrent-details&id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    _uploader:
-      selector: a[href^="index.php?page=userdetails"]
-      optional: true
-    date:
-      selector: td:has(a[href^="download.php?id="]) ~ td
-      # auto adjusted by site account profile
-      filters:
-        - name: dateparse
-          args: "dd/MM/yyyy"
-    seeders:
-      selector: td:has(a[href^="download.php?id="]) ~ td ~ td
-    leechers:
-      selector: td:has(a[href^="download.php?id="]) ~ td ~ td ~ td
-    grabs:
-      selector: td:has(a[href^="download.php?id="]) ~ td ~ td ~ td ~ td
-    size:
-      selector: "td:has(a[href^=\"download.php?id=\"]) ~ td ~ td ~ td ~ td ~ td{{ if .Result._uploader }} ~ td{{ else }}{{ end }}"
-    downloadvolumefactor:
-      case:
-        img[src="images/freeleech.gif"]: 0
-        img[src="images/gold.gif"]: 0
-        img[src="images/silver.gif"]: 0.5
-        img[src="images/bronze.gif"]: 0.75
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[src="images/2x.gif"]: 2
-        img[src="images/3x.gif"]: 3
-        img[src="images/4x.gif"]: 4
-        img[src="images/5x.gif"]: 5
-        img[src="images/6x.gif"]: 6
-        img[src="images/7x.gif"]: 7
-        img[src="images/8x.gif"]: 8
-        img[src="images/9x.gif"]: 9
-        img[src="images/10x.gif"]: 10
-        "*": 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 7 days (as seconds = 7 x 24 x 60 x 60)
-      text: 604800
-#  xbtitFM v3.1.00

src/Jackett.Common/Definitions/torrent9-tel.yml

@@ -9,7 +9,7 @@ type: public
 encoding: UTF-8
 # to fetch current domain use https://www.protege-torrent.com/Torrent9
 links:
-  - https://www.torrent9.cv/
+  - https://www.torrent9.ke/
 legacylinks:
   - https://www.protege-liens.com/
   - https://www.protege-liens.net/
@@ -21,7 +21,6 @@ legacylinks:
   - https://www.torrent.onl/
   - https://torrent9.news/
   # actual legacylinks
-  - https://www.torrent9.gy/
   - https://www.torrent9.sbs/
   - https://www.torrent9.sb/
   - https://www.torrent9.tf/
@@ -37,6 +36,7 @@ legacylinks:
   - https://www.torrent9.gd/
   - https://www.torrent9.ing/
   - https://www.torrent9.run/
+  - https://www.torrent9.cv/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentqq.yml

@@ -7,11 +7,9 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentqq344.com/
-  - https://torrentegg36.com/
+  - https://torrentqq346.com/
+  - https://torrentegg38.com/
 legacylinks:
-  - https://torrentqq329.com/
-  - https://torrentqq330.com/
   - https://torrentqq331.com/
   - https://torrentqq332.com/
   - https://torrentqq333.com/
@@ -33,6 +31,10 @@ legacylinks:
   - https://torrentegg34.com/
   - https://torrentqq343.com/
   - https://torrentegg35.com/
+  - https://torrentegg36.com/
+  - https://torrentqq344.com/
+  - https://torrentegg37.com/
+  - https://torrentqq345.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentsir.yml

@@ -7,10 +7,8 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentsir160.com/
+  - https://torrentsir161.com/
 legacylinks:
-  - http://torrentsir151.com/
-  - https://torrentsir151.com/
   - http://torrentsir152.com/
   - https://torrentsir152.com/
   - http://torrentsir153.com/
@@ -28,6 +26,8 @@ legacylinks:
   - http://torrentsir159.com/
   - https://torrentsir159.com/
   - http://torrentsir160.com/
+  - https://torrentsir160.com/
+  - http://torrentsir161.com/
 
 caps:
   categorymappings:

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

@@ -195,4 +195,4 @@ search:
     minimumseedtime:
       # 1.5 days (as seconds = 1.5 x 24 x 60 x 60)
       text: 129600
-# json UNIT3D 8.3.2
+# json UNIT3D 8.3.4

src/Jackett.Common/Definitions/wihd.yml

@@ -39,6 +39,10 @@ caps:
     - {id: 59e67c0ed5b6a3e689dd1e1f, cat: Movies/UHD, desc: "Bluray 4K"}
     - {id: 59e488174a23a800358b4567, cat: Movies/UHD, desc: "Bluray Remux 4K"}
     - {id: 5a64af02ee30983a7e596aed, cat: Movies/HD, desc: "WEB-DL"}
+    - {id: 5cd19d6c3fc7af3ea2491037, cat: Movies/UHD, desc: "2160p"}
+    - {id: 5cd19f753fc7af3ea2491038, cat: TV/UHD, desc: "2160p"}
+    - {id: 5cd1a01f3fc7af3ea2491039, cat: TV/Anime, desc: "2160p"}
+    - {id: 5cd1a0b73fc7af3ea249103a, cat: Movies/Other, desc: "2160p"}
 
   modes:
     search: [q]
@@ -92,10 +96,7 @@ login:
 
 search:
   paths:
-    - path: torrent/ajaxfiltertorrent/{{ .Keywords }}
-  keywordsfilters:
-    - name: re_replace
-      args: ["^$", "null"]
+    - path: "torrent/ajaxfiltertorrent/{{ if .Keywords }}{{ .Keywords }}{{ else }}null{{ end }}"
   inputs:
     $raw: "{{ range .Categories }}subcat[]={{.}}&{{end}}"
     exclu: 0
@@ -167,6 +168,10 @@ search:
         ":contains(\"Divers\"):contains(\"Bluray\")": "565af82d1fd35761568b45b7"
         ":contains(\"Divers\"):contains(\"1080p\")": "59591f0807fd301b6eaa7a8f"
         ":contains(\"Divers\"):contains(\"720p\")": "595cd82e07fd301b6eaa7a90"
+        ":contains(\"Films\"):contains(\"2160p\")": "5cd19d6c3fc7af3ea2491037"
+        ":contains(\"Séries\"):contains(\"2160p\")": "5cd19f753fc7af3ea2491038"
+        ":contains(\"Animations\"):contains(\"2160p\")": "5cd1a01f3fc7af3ea2491039"
+        ":contains(\"Divers\"):contains(\"2160p\")": "5cd1a0b73fc7af3ea249103a"
         "*": ""
     size: # actuall size is not provided, use some default values to make clients happy
       selector: div.category
@@ -199,6 +204,10 @@ search:
         ":contains(\"Divers\"):contains(\"Bluray\")": "20GB"
         ":contains(\"Divers\"):contains(\"1080p\")": "5GB"
         ":contains(\"Divers\"):contains(\"720p\")": "4GB"
+        ":contains(\"Films\"):contains(\"2160p\")": "20GB"
+        ":contains(\"Séries\"):contains(\"2160p\")": "20GB"
+        ":contains(\"Animations\"):contains(\"2160p\")": "20GB"
+        ":contains(\"Divers\"):contains(\"2160p\")": "20GB"
         "*": ""
     date:
       text: now

src/Jackett.Common/Definitions/wukong.yml

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

src/Jackett.Common/Definitions/yoinked.yml

@@ -10,15 +10,18 @@ links:
 
 caps:
   categorymappings:
-    - {id: 3, cat: Audio, desc: "Music"}
-    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 1, cat: Movies, desc: "Movie"}
     - {id: 2, cat: TV, desc: "TV"}
+    - {id: 3, cat: Audio, desc: "Music"}
+    - {id: 4, cat: Books, desc: "Book"}
+    - {id: 5, cat: Audio/Audiobook, desc: "AudioBook"}
 
   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

src/Jackett.Common/Indexers/BaseIndexer.cs

@@ -381,6 +381,10 @@ namespace Jackett.Common.Indexers
 
                 results = FilterResults(queryCopy, results).ToList();
                 results = FixResults(queryCopy, results).ToList();
+
+                // De-dupe releases by Guid so duplicate results aren't returned.
+                results = results.GroupBy(r => r.Guid).Select(g => g.First()).ToList();
+
                 cacheService.CacheResults(this, queryCopy, results.ToList());
                 errorCount = 0;
                 expireAt = DateTime.Now.Add(HealthyStatusValidity);

src/Jackett.Common/Indexers/Definitions/DonTorrent.cs

@@ -28,10 +28,10 @@ namespace Jackett.Common.Indexers.Definitions
         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.yoga/";
+        public override string SiteLink { get; protected set; } = "https://dontorrent.co/";
         public override string[] AlternativeSiteLinks => new[]
         {
-            "https://dontorrent.yoga/",
+            "https://dontorrent.co/",
             "https://todotorrents.org/",
             "https://tomadivx.net/",
             "https://seriesblanco.one/",
@@ -40,8 +40,6 @@ namespace Jackett.Common.Indexers.Definitions
         };
         public override string[] LegacySiteLinks => new[]
         {
-            "https://dontorrent.esq/",
-            "https://dontorrent.city/",
             "https://dontorrent.cologne/",
             "https://dontorrent.dance/",
             "https://dontorrent.cricket/",
@@ -55,6 +53,8 @@ namespace Jackett.Common.Indexers.Definitions
             "https://dontorrent.equipment/",
             "https://dontorrent.fashion/",
             "https://dontorrent.gallery/",
+            "https://dontorrent.yoga/",
+            "https://dontorrent.foundation/",
         };
         public override string Language => "es-ES";
         public override string Type => "public";

src/Jackett.Common/Indexers/Definitions/MTeamTp.cs

@@ -12,7 +12,6 @@ using Jackett.Common.Models;
 using Jackett.Common.Models.IndexerConfig.Bespoke;
 using Jackett.Common.Serializer;
 using Jackett.Common.Services.Interfaces;
-using Jackett.Common.Utils;
 using Jackett.Common.Utils.Clients;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -288,11 +287,6 @@ namespace Jackett.Common.Indexers.Definitions
                     MinimumSeedTime = 172800 // 2 days
                 };
 
-                if (torrent.Imdb.IsNotNullOrWhiteSpace())
-                {
-                    release.Imdb = ParseUtil.GetImdbId(torrent.Imdb.TrimEnd('/').Split('/').LastOrDefault()).GetValueOrDefault();
-                }
-
                 if (torrent.Status?.CreatedDate != null &&
                     DateTime.TryParseExact($"{torrent.Status.CreatedDate} +08:00", "yyyy-MM-dd HH:mm:ss zzz", CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal, out var publishDate))
                 {

src/Jackett.Common/Indexers/Definitions/MejorTorrent.cs

@@ -27,11 +27,9 @@ namespace Jackett.Common.Indexers.Definitions
         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://www24.mejortorrent.zip/";
+        public override string SiteLink { get; protected set; } = "https://www26.mejortorrent.eu/";
         public override string[] LegacySiteLinks => new[]
         {
-            "https://www9.mejortorrent.rip/",
-            "https://www10.mejortorrent.rip/",
             "https://www11.mejortorrent.rip/",
             "https://www12.mejortorrent.rip/",
             "https://www13.mejortorrent.rip/",
@@ -45,6 +43,8 @@ namespace Jackett.Common.Indexers.Definitions
             "https://www21.mejortorrent.zip/",
             "https://www22.mejortorrent.zip/",
              "https://www23.mejortorrent.zip/",
+             "https://www24.mejortorrent.zip/",
+             "https://www25.mejortorrent.zip/",
         };
         public override string Language => "es-ES";
         public override string Type => "public";

src/Jackett.Updater/Program.cs

@@ -596,6 +596,7 @@ namespace Jackett.Updater
                 "Definitions/rapidetracker.yml",
                 "Definitions/rarbg.yml", // migrated to C#
                 "Definitions/redbits.yml", // switch to *-API #11540 #8682
+                "Definitions/redbits-api.yml",
                 "Definitions/redtopia.yml",
                 "Definitions/reelflix.yml", // switch to *-API #8682
                 "Definitions/renegade.yml",
@@ -669,6 +670,7 @@ namespace Jackett.Updater
                 "Definitions/themoviecave.yml",
                 "Definitions/therebels-api.yml",
                 "Definitions/theresurrection.yml",
+                "Definitions/thesceneplace.yml",
                 "Definitions/theshinning.yml", // switch to *-API #13751
                 "Definitions/thespit.yml",
                 "Definitions/thetorrents.yml",