immortuos: add MR and MST (#13271)

also improve cat detection, like 7212f96d29

README.md

@@ -27,7 +27,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 
  * ØMagnet
  * 1337x
- * 24rolika
  * ACG.RIP
  * ACGsou (36DM)
  * Anidex
@@ -46,6 +45,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BT.etree
  * BT4G
  * BTDIGG
+ * BTmirror
  * BTSOW
  * Byrutor
  * comicat
@@ -82,6 +82,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * JAV-Torrent
  * kickasstorrents.to
  * kickasstorrents.ws
+ * Knaben
  * Legit Torrents
  * LePorno.info
  * LimeTorrents
@@ -396,12 +397,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDU
  * HDZone
  * Hebits
- * HellasTZ
  * House of Devil
  * HQSource (HQS)
  * Il Corsaro Verde
  * ImmortalSeed (iS)
- * Immortuos [![(invite needed)][inviteneeded]](#)
+ * Immortuos
  * Indietorrents [![(invite needed)][inviteneeded]](#)
  * Insane Tracker
  * IPTorrents (IPT)
@@ -505,7 +505,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * SceneTime
  * SDBits [![(invite needed)][inviteneeded]](#)
  * Secret Cinema
- * SeedFile (SF)
  * Shareisland
  * Shazbat [![(invite needed)][inviteneeded]](#)
  * SiamBIT

src/Jackett.Common/Definitions/24rolika.yml

@@ -1,138 +0,0 @@
----
-id: 24rolika
-name: 24rolika
-description: "24rolika is a RUSSIAN Public Torrent Tracker for 3X"
-language: ru-RU
-type: public
-encoding: UTF-8
-links:
-  - http://24rolika.ru/ # does not support https
-
-caps:
-  categorymappings:
-    # only subcategories of Порно фильмы (Movies) have torrents
-    - {id: 94, cat: XXX, desc: "4K порно фильмы", default: true}
-    - {id: 76, cat: XXX, desc: "Японские порно фильмы", default: true}
-    - {id: 81, cat: XXX, desc: "Бразильские порно фильмы", default: true}
-    - {id: 41, cat: XXX, desc: "Итальянские порно фильмы", default: true}
-    - {id: 42, cat: XXX, desc: "Американские порно фильмы", default: true}
-    - {id: 43, cat: XXX, desc: "Немецкие порно фильмы", default: true}
-    - {id: 44, cat: XXX, desc: "Французские порно фильмы", default: true}
-    - {id: 45, cat: XXX, desc: "Русские порно фильмы", default: true}
-    - {id: 47, cat: XXX, desc: "Порно фильмы 2018 года", default: true}
-    - {id: 75, cat: XXX, desc: "Порно фильмы 2019 года", default: true}
-    - {id: 92, cat: XXX, desc: "Порно фильмы 2020 года", default: true}
-    - {id: 93, cat: XXX, desc: "Порно фильмы 2021 года", default: true}
-    - {id: 48, cat: XXX, desc: "Ретро / Классика", default: true}
-    - {id: 49, cat: XXX, desc: "С русским переводом", default: true}
-    - {id: 82, cat: XXX, desc: "С сюжетом", default: true}
-    - {id: 91, cat: XXX, desc: "Пародии", default: true}
-    - {id: 51, cat: XXX, desc: "Brazzers", default: true}
-    - {id: 52, cat: XXX, desc: "BangBros", default: true}
-    - {id: 53, cat: XXX, desc: "Marc Dorcel", default: true}
-    - {id: 54, cat: XXX, desc: "Evil Angel", default: true}
-    - {id: 55, cat: XXX, desc: "Tushy", default: true}
-    - {id: 56, cat: XXX, desc: "Blacked", default: true}
-    - {id: 57, cat: XXX, desc: "Evil Playgrounds", default: true}
-    - {id: 58, cat: XXX, desc: "Reality Kings", default: true}
-    - {id: 59, cat: XXX, desc: "New Sensations", default: true}
-    - {id: 60, cat: XXX, desc: "Wicked Pictures", default: true}
-    - {id: 61, cat: XXX, desc: "21Sextury", default: true}
-    - {id: 62, cat: XXX, desc: "PornPros", default: true}
-    - {id: 63, cat: XXX, desc: "Private", default: true}
-    - {id: 64, cat: XXX, desc: "DD Busty", default: true}
-    - {id: 65, cat: XXX, desc: "Naughty America", default: true}
-    - {id: 66, cat: XXX, desc: "Third Degree Films", default: true}
-    - {id: 67, cat: XXX, desc: "Hustler", default: true}
-    - {id: 68, cat: XXX, desc: "Blacks on Blondes", default: true}
-    - {id: 69, cat: XXX, desc: "Team Skeet", default: true}
-    - {id: 70, cat: XXX, desc: "Mofos", default: true}
-    - {id: 71, cat: XXX, desc: "Vixen", default: true}
-    - {id: 72, cat: XXX, desc: "Jules Jordan", default: true}
-    - {id: 73, cat: XXX, desc: "Nubile Films", default: true}
-    - {id: 74, cat: XXX, desc: "Digital Playground", default: true}
-    - {id: 83, cat: XXX, desc: "Zero Tolerance", default: true}
-    - {id: 84, cat: XXX, desc: "Pure Taboo", default: true}
-    - {id: 85, cat: XXX, desc: "Devil's Film", default: true}
-    - {id: 86, cat: XXX, desc: "Sweet Sinner", default: true}
-    - {id: 87, cat: XXX, desc: "Penthouse", default: true}
-    - {id: 88, cat: XXX, desc: "Elegant Angel", default: true}
-    - {id: 89, cat: XXX, desc: "Digital Sin", default: true}
-
-  modes:
-    search: [q]
-
-settings:
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: date
-    options:
-      date: created
-      title: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-
-download:
-  selectors:
-    - selector: a[href*="index.php?do=download&id="]
-      attribute: href
-
-search:
-  paths:
-    - path: index.php
-  inputs:
-    $raw: "{{ range .Categories }}catlist[]={{.}}&{{end}}"
-    do: search
-    subaction: search
-    search_start: 0
-    full_search: 1
-    result_from: 1
-    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
-    # 0 in article 1 in comments 2 in static pages 3 in article titles
-    titleonly: 3
-    sortby: "{{ .Config.sort }}"
-    resorder: "{{ .Config.type }}"
-    showposts: 0
-
-  headers:
-    Referer: ["{{ .Config.sitelink }}"]
-
-  rows:
-    selector: article.shortstory
-
-  fields:
-    category:
-      text: 94
-    title:
-      selector: h2.short_title a
-    details:
-      selector: h2.short_title a
-      attribute: href
-    download:
-      selector: h2.short_title a
-      attribute: href
-    poster:
-      selector: img
-      attribute: src
-    date:
-      text: now
-    size:
-      text: "512 MB"
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    description:
-      selector: div.video_time
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# DataLife

src/Jackett.Common/Definitions/arabp2p.yml

@@ -7,6 +7,7 @@ type: private
 encoding: UTF-8
 links:
   - https://www.arabp2p.com/
+  - https://www.arabp2p.net/
 legacylinks:
   - http://www.arabp2p.com/
 

src/Jackett.Common/Definitions/bitbazis.yml

@@ -65,6 +65,10 @@ settings:
     type: info
     label: How to get the Cookie
     default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+  - name: freeleech
+    type: checkbox
+    label: Filter freeleech only
+    default: false
   - name: sort
     type: select
     label: Sort requested from site
@@ -83,7 +87,7 @@ settings:
   - name: info_tpp
     type: info
     label: Results Per Page
-    default: For best results, change the <b>Torrentek száma egy oldalon:</b> setting to <b>100</b> on your account profile.
+    default: For best results, change the <b>Torrentek száma egy oldalon:</b> setting to <b>50</b> on your account profile.
 
 login:
   method: cookie
@@ -96,21 +100,28 @@ login:
 search:
   paths:
     - path: browse.php
+      categories: ["!", 33, 66, 99]
+      inputs:
+        # 0 all, 1 active, 2 deadonly, 3  myuploads, 4 zeroseed, 6 re-seeded
+        incldead: 0
+    - path: browse_xxx.php
+      categories: [33, 66, 99]
+      inputs:
+        # 0 active, 1 all, 2 deadonly, 3  myuploads, 4 zeroseed, 6 re-seeded
+        incldead: 1
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
-    # 0 active, 1 all, 2 deadonly, 3  myuploads, 4 zeroseed
-    incldead: 1
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
-    # site does not support imdbid searching or appear to have freeleech
+    # site does not support imdbid searching
 
   rows:
-    selector: table[width="100%"]:last-child tbody tr:has(a[href^="userdetails.php?id="]):has(a[href^="download.php?torrent="])
+    selector: "table[width=\"100%\"]:last-child tbody tr:has(div.tooltip){{ if .Config.freeleech }}:has(i:contains(\"(Free)\")){{ else }}{{ end }}"
 
   fields:
     category:
-      selector: a[href^="browse.php?cat="]
+      selector: a[href*=".php?cat="]
       attribute: href
       filters:
         - name: querystring
@@ -124,19 +135,43 @@ search:
     poster:
       selector: a.preview
       attribute: href
-    download:
+    download1:
       selector: a[href^="download.php?torrent="]
+      optional: true
       attribute: href
+    download2:
+      selector: input[onclick*="download.php?torrent="]
+      optional: true
+      attribute: onclick
+      filters:
+        - name: replace
+          args: ["window.open('", ""]
+        - name: replace
+          args: ["', '_self');", ""]
+    download:
+      text: "{{ if or .Result.download1 .Result.download2 }}{{ or .Result.download1 .Result.download2 }}{{ else }}{{ end }}"
     size:
       selector: td:nth-child(6)
-    date:
+    date_browse:
       # 2022<br>03/15.
-      selector: td:nth-child(7)
+      selector: td:nth-child(7):contains("/")
+      optional: true
       filters:
         - name: append
           args: " +01:00" # CET
         - name: dateparse
           args: "200601/02. -07:00"
+    date_browse_xxx:
+      # 22.03.15
+      selector: td:nth-child(7):not(:contains("/"))
+      optional: true
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "06.01.02 -07:00"
+    date:
+      text: "{{ if or .Result.date_browse .Result.date_browse_xxx }}{{ or .Result.date_browse .Result.date_browse_xxx }}{{ else }}now{{ end }}"
     grabs:
       selector: td:nth-child(5)
     seeders:

src/Jackett.Common/Definitions/btmirror.yml

@@ -0,0 +1,96 @@
+---
+id: btmirror
+name: BTmirror
+description: "BTmirror is a Public BitTorrent DHT search engine."
+language: en-US
+type: public
+encoding: UTF-8
+links:
+  - https://btsao.com/
+  - https://btmirror.unblockit.blue/
+
+caps:
+  categories:
+    Other: Other
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: info_8000
+    type: info
+    label: About BTmirror Categories
+    default: BTmirror does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: create_time
+    options:
+      relavance: relevance
+      create_time: created
+      length: size
+
+download:
+  infohash:
+    hash:
+      selector: p.magnet a
+      attribute: href
+      filters:
+        - name: regexp
+          args: ([A-F|a-f|0-9]{40})
+    title:
+      selector: p.magnet a
+      attribute: href
+      filters:
+        - name: regexp
+          args: "&dn=(.+?)$"
+        - name: validfilename
+
+search:
+  # https://btsao.com/en/search/2022/?c=&s=create_time
+  # returns 10 results per page
+  paths:
+    - path: "en/search/{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}/"
+    - path: "en/search/{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}/2"
+  inputs:
+    c: ""
+    s: "{{ .Config.sort }}"
+
+  rows:
+    selector: div.ssbox
+
+  fields:
+    category:
+      text: Other
+    title:
+      selector: h3
+    details:
+      selector: h3 a
+      attribute: href
+    download:
+      selector: h3 a
+      attribute: href
+    date:
+      selector: span:contains("date:") b
+      filters:
+        - name: dateparse
+          args: "2006-01-02"
+    size:
+      selector: span:contains("size:") b
+    files:
+      selector: span:contains("files:") b
+    grabs:
+      selector: span:contains("人气:") b
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine: n/a

src/Jackett.Common/Definitions/coastalcrew.yml

@@ -10,7 +10,8 @@ links:
 
 caps:
   categorymappings:
-    - {id: 62, cat: Books, desc: "EBook"}
+    - {id: 62, cat: Books/EBook, desc: "EBook"}
+    - {id: 69, cat: Books/Mags, desc: "Zeitung"}
     - {id: 30, cat: TV/Anime, desc: "Filme - Animie"}
     - {id: 28, cat: Movies/BluRay, desc: "Filme - Bluray"}
     - {id: 31, cat: Movies/Other, desc: "Filme - Bollywood"}

src/Jackett.Common/Definitions/cpasbienclone.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www.cpasbien.gg/
+  - https://www.cpasbien.vip/
 legacylinks:
   - https://www1.cpasbiens.ws/
   - https://www2.cpasbiens.ws/
@@ -20,6 +20,7 @@ legacylinks:
   - https://cpasbiens.uk-unblock.xyz/
   - https://cpasbiens.ind-unblock.xyz/
   - https://cpasbien.to/
+  - https://www.cpasbien.gg/
 
 caps:
   categories:

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

@@ -16,6 +16,7 @@ caps:
     - {id: 28, cat: Movies/SD, desc: "Filme SD"}
     - {id: 32, cat: Movies/HD, desc: "Filme HD"}
     - {id: 114, cat: Movies/UHD, desc: "Filme UHD"}
+    - {id: 140, cat: Movies/BluRay, desc: "Filme BluRay"}
     - {id: 138, cat: Movies, desc: "Filme Pack`s"}
     # Serien
     - {id: 60, cat: TV/SD, desc: "Serien SD"}
@@ -218,4 +219,4 @@ search:
     minimumseedtime:
       # 2 days (as seconds = 2 x 24 x 60 x 60)
       text: 172800
-# engine n/a
+# 3xT

src/Jackett.Common/Definitions/dragonworldreloaded.yml

@@ -206,4 +206,4 @@ search:
     minimumseedtime:
       # 12 hours (as seconds = 12 x 60 x 60)
       text: 43200
-# engine n/a
+# 3xT

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

@@ -6,7 +6,7 @@ language: es-ES
 type: public
 encoding: UTF-8
 links:
-  - https://www.elitetorrent.dev/
+  - https://www.elitetorrent.com/
   - https://elitetorrent.nocensor.sbs/
 legacylinks:
   - https://www.elitetorrent.biz/
@@ -23,7 +23,6 @@ legacylinks:
   - https://vvww.elitetorrent.nl/
   - https://www.elitetorrent.to/
   - https://www.elitetorrent.se/
-  - https://www.elitetorrent.com/
   - https://elitetorrent.si/
   - https://elitetorrent.nocensor.work/
   - https://elitetorrent.com/
@@ -31,6 +30,7 @@ legacylinks:
   - https://elitetorrent.nocensor.biz/
   - https://elitetorrent.la/
   - https://www.elitetorrent.wtf/
+  - https://www.elitetorrent.dev/
 
 caps:
   categories:

src/Jackett.Common/Definitions/fantasticheaven.yml

@@ -10,85 +10,54 @@ links:
 
 caps:
   categorymappings:
-    - {id: 54, cat: Movies/SD, desc: "kino SD x264/x265"}
-    - {id: 56, cat: Movies/HD, desc: "kino 720p"}
-    - {id: 57, cat: Movies/HD, desc: "kino 1080p"}
-    - {id: 100, cat: Movies/3D, desc: "kino 3D"}
-    - {id: 58, cat: Movies/SD, desc: "Filme SD x264/x265"}
+    - {id: 58, cat: Movies/SD, desc: "Filme SD"}
     - {id: 59, cat: Movies/HD, desc: "Filme 720p"}
     - {id: 60, cat: Movies/HD, desc: "Filme 1080p"}
     - {id: 61, cat: Movies/UHD, desc: "Filme 2160p"}
-    - {id: 62, cat: Movies/3D, desc: "Filme 3D"}
+    - {id: 170, cat: Movies/BluRay, desc: "Filme Bluray"}
     - {id: 101, cat: Movies/DVD, desc: "Filme DVD"}
-    - {id: 63, cat: Movies/HD, desc: "Filme Remux"}
-    - {id: 129, cat: Movies/SD, desc: "Filme Packs SD x264/265"}
+    - {id: 62, cat: Movies/3D, desc: "Filme 3D"}
+    - {id: 169, cat: Movies/Foreign, desc: "Filme International"}
+    - {id: 129, cat: Movies/SD, desc: "Filme Packs SD"}
     - {id: 130, cat: Movies/HD, desc: "Filme Packs 720p"}
     - {id: 131, cat: Movies/HD, desc: "Filme Packs 1080p"}
-    - {id: 64, cat: TV/SD, desc: "Serien SD x264/x265"}
+    - {id: 159, cat: Movies/UHD, desc: "Filme Packs 2160p"}
+    - {id: 172, cat: Movies/SD, desc: "Film-Klassiker SD"}
+    - {id: 173, cat: Movies/HD, desc: "Film-Klassiker 720p"}
+    - {id: 174, cat: Movies/HD, desc: "Film-Klassiker 1080p"}
+    - {id: 175, cat: Movies/UHD, desc: "Film-Klassiker 2160p"}
+    - {id: 180, cat: Movies/DVD, desc: "Film-Klassiker DVD"}
+    - {id: 181, cat: Movies/BluRay, desc: "Film-Klassiker Bluray"}
+    - {id: 176, cat: Movies/SD, desc: "Film-Klassiker Pack SD"}
+    - {id: 177, cat: Movies/HD, desc: "Film-Klassiker Pack 720p"}
+    - {id: 178, cat: Movies/HD, desc: "Film-Klassiker Pack 1080p"}
+    - {id: 179, cat: Movies/UHD, desc: "Film-Klassiker Pack 2160p"}
+    - {id: 64, cat: TV/SD, desc: "Serien SD"}
     - {id: 65, cat: TV/HD, desc: "Serien 720p"}
     - {id: 66, cat: TV/HD, desc: "Serien 1080p"}
     - {id: 68, cat: TV/UHD, desc: "Serien 2160p"}
     - {id: 69, cat: TV/Foreign, desc: "Serien Ger-Subbed"}
-    - {id: 70, cat: TV/Foreign, desc: "Serien International"}
-    - {id: 76, cat: TV/SD, desc: "Serienpacks SD x264/x265"}
+    - {id: 167, cat: TV/Foreign, desc: "Serien International"}
+    - {id: 76, cat: TV/SD, desc: "Serienpacks SD"}
     - {id: 77, cat: TV/HD, desc: "Serienpacks 720p"}
     - {id: 78, cat: TV/HD, desc: "Serienpacks 1080p"}
     - {id: 81, cat: TV/UHD, desc: "Serienpacks 2160p"}
     - {id: 79, cat: TV/Foreign, desc: "Serienpacks Ger-Subbed"}
-    - {id: 80, cat: TV/Foreign, desc: "Serienpacks International"}
-    - {id: 115, cat: Movies/SD, desc: "Kids-Filme SD x264/x265"}
-    - {id: 116, cat: Movies/HD, desc: "Kids-Filme 720p"}
-    - {id: 117, cat: Movies/HD, desc: "Kids-Filme 1080p"}
-    - {id: 109, cat: TV/SD, desc: "Kids-Serien SD x264/x265"}
-    - {id: 110, cat: TV/HD, desc: "Kids-Serien 720p"}
-    - {id: 111, cat: TV/HD, desc: "Kids-Serien 1080p"}
-    - {id: 112, cat: TV/SD, desc: "Kids-Serien Packs SD"}
-    - {id: 113, cat: TV/HD, desc: "Kids-Serien Packs 720p"}
-    - {id: 114, cat: TV/HD, desc: "Kids-Serien Packs 1080p"}
-    - {id: 127, cat: TV/Foreign, desc: "Kids-Serien International"}
-    - {id: 98, cat: TV/SD, desc: "Tatort SD x264/x265"}
-    - {id: 99, cat: TV/HD, desc: "Tatort 720p"}
-    - {id: 105, cat: TV/SD, desc: "Daily Soaps SD x264/x265"}
-    - {id: 103, cat: TV/HD, desc: "Daily Soaps 720p"}
-    - {id: 104, cat: TV/HD, desc: "Daily Soaps 1080p"}
-    - {id: 106, cat: TV/Documentary, desc: "Dokus SD x264/x265"}
-    - {id: 107, cat: TV/Documentary, desc: "Dokus 720p"}
-    - {id: 108, cat: TV/Documentary, desc: "Dokus 1080p"}
-    - {id: 83, cat: Movies/SD, desc: "TV-Filme SD x264/x265"}
-    - {id: 84, cat: Movies/HD, desc: "TV-Filme 720p"}
-    - {id: 85, cat: Movies/HD, desc: "TV-Filme 1080p"}
-    - {id: 86, cat: TV/SD, desc: "TV-Shows SD x264/x265"}
-    - {id: 87, cat: TV/HD, desc: "TV-Shows 720p"}
-    - {id: 88, cat: TV/HD, desc: "TV-Shows 1080p"}
-    - {id: 118, cat: TV/Sport, desc: "SportSD x264/x265"}
-    - {id: 119, cat: TV/Sport, desc: "Sport720p"}
-    - {id: 120, cat: TV/Sport, desc: "Sport1080p"}
-    - {id: 122, cat: TV/Sport, desc: "Sport2160p"}
-    - {id: 121, cat: TV/Sport, desc: "SportInternational"}
-    - {id: 82, cat: Audio/Audiobook, desc: "Audio Audiobooks"}
     - {id: 71, cat: Audio/MP3, desc: "Audio MP3"}
     - {id: 72, cat: Audio/Lossless, desc: "Audio Flac"}
-    - {id: 135, cat: Audio/Lossless, desc: "Audio WAV"}
-    - {id: 73, cat: Audio/MP3, desc: "Audio MP3 Packs"}
-    - {id: 74, cat: Audio/Lossless, desc: "Audio Flac Packs"}
-    - {id: 128, cat: Audio, desc: "Audio Kids"}
-    - {id: 75, cat: Audio/Video, desc: "Audio Musikvideo"}
+    - {id: 73, cat: Audio, desc: "Audio Packs"}
+    - {id: 153, cat: Audio/Audiobook, desc: "Hörbücher"}
     - {id: 123, cat: PC, desc: "Software Windows"}
-    - {id: 124, cat: PC, desc: "Software Linux"}
-    - {id: 125, cat: PC/Mobile-Android, desc: "Software Android"}
-    - {id: 126, cat: PC/Mac, desc: "Software MacOS"}
+    - {id: 166, cat: PC/Mac, desc: "Software Sonstiges"}
     - {id: 132, cat: PC/Games, desc: "Spiele Windows"}
-    - {id: 133, cat: PC/Mac, desc: "Spiele MacOS"}
-    - {id: 134, cat: Console, desc: "Spiele Nintendo"}
-    - {id: 90, cat: Books/Mags, desc: "Diverses Zeitschriften"}
-    - {id: 89, cat: Books/EBook, desc: "Diverses E-Books"}
-    - {id: 91, cat: XXX/x264, desc: "XXX SD x264/x265"}
+    - {id: 150, cat: PC/Mac, desc: "Spiele Sonstiges"}
+    - {id: 90, cat: Books/Mags, desc: "Zeitschriften"}
+    - {id: 89, cat: Books/EBook, desc: "E-Books"}
+    - {id: 91, cat: XXX/SD, desc: "XXX SD"}
     - {id: 92, cat: XXX/x264, desc: "XXX 720p"}
     - {id: 93, cat: XXX/x264, desc: "XXX 1080p"}
-    - {id: 95, cat: XXX/Pack, desc: "XXX Packs SD"}
-    - {id: 96, cat: XXX/Pack, desc: "XXX Packs HD"}
+    - {id: 171, cat: XXX/Pack, desc: "XXX Packs"}
     - {id: 94, cat: XXX/ImageSet, desc: "XXX Magazine"}
-    - {id: 97, cat: XXX/ImageSet, desc: "XXX Pics"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/fouducinema.yml

@@ -6,60 +6,54 @@ language: fr-FR
 type: private
 encoding: UTF-8
 links:
+  - https://fou-du-cinema.ca/
+legacylinks:
   - https://fou-du-cinema.net/
 
 caps:
   categorymappings:
-    - {id: 28, cat: PC, desc: "App: Linux"}
-    - {id: 19, cat: PC/Mac, desc: "Apps: Mac"}
-    - {id: 18, cat: PC/0day, desc: "Apps: PC"}
-    - {id: 54, cat: Books/Comics, desc: "BD: bande dessinée"}
-    - {id: 9, cat: TV/Documentary, desc: "Documentaries: All"}
-    - {id: 60, cat: Books/EBook, desc: "Ebook: BD - X"}
-    - {id: 23, cat: Movies/UHD, desc: "FILM: 4K et plus"}
-    - {id: 51, cat: TV/Anime, desc: "FILM: Animé"}
-    - {id: 43, cat: Movies/BluRay, desc: "FILM: BD-Rip"}
-    - {id: 22, cat: Movies/DVD, desc: "FILM: DVD"}
-    - {id: 52, cat: Movies/DVD, desc: "FILM: DVDRip"}
-    - {id: 40, cat: Movies/HD, desc: "Film: HD"}
-    - {id: 26, cat: Movies/HD, desc: "FILM: HD 1080p"}
-    - {id: 25, cat: Movies/HD, desc: "FILM: HD 720p"}
-    - {id: 50, cat: Movies/HD, desc: "FILM: HDTV"}
-    - {id: 47, cat: Movies/HD, desc: "FILM: MHD"}
-    - {id: 61, cat: Movies/WEB-DL, desc: "FILM: TVRip"}
-    - {id: 49, cat: Movies, desc: "FILM: VO"}
-    - {id: 48, cat: Movies, desc: "FILM: Vost-FR"}
-    - {id: 17, cat: Movies/WEB-DL, desc: "FILM: Web-DL 1080P"}
-    - {id: 39, cat: Movies/WEB-DL, desc: "FILM: Web-DL 720P"}
-    - {id: 34, cat: Movies/WEB-DL, desc: "FILM: Webrip"}
-    - {id: 21, cat: Movies/WEB-DL, desc: "FILM: WebRip 1080p"}
-    - {id: 20, cat: Movies/WEB-DL, desc: "FILM: WebRip 720p"}
-    - {id: 14, cat: Movies/WEB-DL, desc: "FILM: WebRip-DL"}
-    - {id: 24, cat: XXX, desc: "FILM: XXX"}
-    - {id: 10, cat: PC/Games, desc: "Games: PC"}
-    - {id: 53, cat: Books/Mags, desc: "Journaux : presse"}
-    - {id: 36, cat: Books/EBook, desc: "Other: E-Books"}
-    - {id: 33, cat: Other, desc: "Other: Emulation"}
-    - {id: 38, cat: PC/Mobile-Other, desc: "Other: Mobile Phone"}
-    - {id: 58, cat: TV, desc: "Serie: DVDVOST"}
-    - {id: 59, cat: TV/WEB-DL, desc: "Serie: TVRip"}
-    - {id: 57, cat: TV/WEB-DL, desc: "Serie: WEB"}
-    - {id: 42, cat: TV, desc: "SERIES:  Concerts / Spectacles"}
-    - {id: 5, cat: TV/Anime, desc: "SERIES: Animée"}
-    - {id: 7, cat: TV/SD, desc: "SERIES: Épisodes SD"}
-    - {id: 3, cat: TV/Documentary, desc: "SERIES: Documentaires"}
-    - {id: 55, cat: TV/SD, desc: "Serie: DVD"}
-    - {id: 1, cat: TV/HD, desc: "SERIES: Episodes HD"}
-    - {id: 6, cat: TV/HD, desc: "SERIES: HDTV"}
-    - {id: 56, cat: TV/HD, desc: "SERIE: HDTV1080p"}
-    - {id: 2, cat: TV/HD, desc: "SERIES: Pack HD"}
-    - {id: 4, cat: TV/SD, desc: "SERIES: Pack SD"}
-    - {id: 41, cat: TV, desc: "SERIES: Vost-FR"}
+    - {id: 9, cat: TV/SD, desc: "SERIE DVD"}
+    - {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: 36, cat: TV/Other, desc: "SERIE Pack"}
+    - {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: 37, cat: TV, desc: "SERIE EPISODE"}
+    - {id: 56, cat: PC/ISO, desc: "LOGICIELS Linux"}
+    - {id: 24, cat: PC/Mac, desc: "LOGICIELS Apple"}
+    - {id: 58, cat: PC/0day, desc: "LOGICIELS Windows"}
+    - {id: 59, cat: PC, desc: "LOGICIELS "}
+    - {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"}
+    - {id: 50, cat: TV/Anime, desc: "ANIMEE Anim<69>e"}
+    - {id: 1, cat: Movies/SD, desc: "FILM Xvid"}
+    - {id: 33, cat: Movies/HD, desc: "FILM HDTV"}
+    - {id: 31, cat: Movies/Other, desc: "FILM MUET"}
+    - {id: 30, cat: Movies/Other, 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: 2, cat: Movies/DVD, desc: "FILM DVD"}
+    - {id: 34, cat: Movies/SD, desc: "FILM TVRip"}
+    - {id: 5, cat: Audio/Video, desc: "MUSIC clip video"}
+    - {id: 7, cat: PC/Games, desc: "JEUX Win"}
+    - {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:
@@ -69,10 +63,6 @@ settings:
   - name: password
     type: password
     label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
   - name: multilang
     type: checkbox
     label: Replace MULTI by another language in release name
@@ -95,10 +85,10 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: id
+    default: added
     options:
-      id: created
-      seeders: seeders
+      added: created
+      seeds: seeders
       size: size
       name: title
   - name: type
@@ -110,53 +100,56 @@ settings:
       asc: asc
 
 login:
-  path: account-login.php
-  method: post
+  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 }}"
-    remember: yes
   error:
-    - selector: div.myFrame-caption:contains("Access denied")
-      message:
-        selector: div.myFrame-content
+    - selector: div#login_error
   test:
     path: index.php
-    selector: a[href="account-logout.php"]
+    selector: a[href="logout.php"]
 
 download:
-  selectors:
-    - selector: a[href^="download.php?id="]
-      attribute: href
+  before:
+    path: ajax_det_poll.php
+    method: post
+    inputs:
+      set_thanks: Merci
+      det_id: "{{ .DownloadUri.Query.torrent }}"
+      ajax: yes
 
 search:
   paths:
-    - path: torrents-search.php
+    - path: selection.php
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
-    # 0 active, 1 incldead, 2 onlydead
-    incldead: 1
-    # 0 inclfree, 1 notfree, 2 onlyfree
-    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 all, 1 English, 2 etc...
-    lang: 0
-    sort: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
+    # 0 name, 1 descr, 2 both
+    blah: 0
+    orderby: "{{ .Config.sort }}"
+    sort: "{{ .Config.type }}"
+    # site does not support imdbid searches or provide imdb links in results
 
   rows:
-    selector: tr.t-row
+    selector: div.content_wrap > div.selection_wrap:has(a[href^="details.php?id="])
 
   fields:
-    category:
-      selector: a[href^="torrents.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
+    cat_p1:
+      selector: div.kat_cat_pic_name
+    cat_p2:
+      selector: div.kat_cat_pic_name_b
+    categorydesc:
+      text: "{{ .Result.cat_p1 }} {{ .Result.cat_p2 }}"
     title_phase1:
-      selector: a[href^="torrents-details.php?id="]
-      attribute: title
+      selector: a[href^="details.php?id="]
     title_multilang:
       text: "{{ .Result.title_phase1 }}"
       filters:
@@ -174,28 +167,58 @@ search:
     title:
       text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
     details:
-      selector: a[href^="torrents-details.php?id="]
+      selector: a[href^="details.php?id="]
       attribute: href
+    poster:
+      selector: img
+      attribute: src
     download:
-      selector: a[href^="torrents-details.php?id="]
+      selector: a[href^="details.php?id="]
       attribute: href
-    size:
-      selector: td:nth-child(5)
-    date:
-      text: now
+      filters:
+        - name: replace
+          args: ["details.php?id=", "download.php?torrent="]
     seeders:
-      selector: td:nth-child(6)
+      selector: div.selection_unter_aa > b
     leechers:
-      selector: td:nth-child(7)
+      selector: div.selection_unter_aaa > b
+    date_day:
+      # Aujourd'hui à 06:26:25
+      # Hier à 05:15:19
+      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
+        - name: fuzzytime
+    date_year:
+      # Le 17.10.2020 à 04:39:44
+      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: "02.01.2006 15:04:05 -07:00"
+    date:
+      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+    size:
+      selector: div.selection_unter_ad
     grabs:
-      selector: td:nth-child(8)
+      selector: div.selection_unter_ae
     downloadvolumefactor:
-      case:
-        img[src="images/free.gif"]: 0
-        img[src^="data:image/gif;base64,R0lGODlhEA"]: 0 # encoded gold coin image
-        "*": 1
+      text: 1
     uploadvolumefactor:
       text: 1
-    minimumratio:
-      text: 1.0
-# TT3.0
+    minimumseedtime:
+      # 2.5 days (as seconds =  2.5 x 24 x 60 x 60)
+      text: 216000
+# 3xT

src/Jackett.Common/Definitions/hdchina.yml

@@ -76,29 +76,38 @@ search:
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
     search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0=incldead, 1=active, 2=dead
     incldead: 0
+    # 0=all, 1=normal, 2=free, 3=2x, 4=2x free, 5=50%, 6=2x 50%, 7=30%
     spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0=title, 1=descr, 3=uploader, 4=imdb URL
     search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0=AND, 1=OR, 2=Exact
     search_mode: 0
 
   rows:
     selector: table.torrent_list > tbody > tr:has(a[href^="?cat="])
 
   fields:
-    title:
-      selector: td:nth-child(2) a
     category:
       selector: a[href^="?cat="]
       attribute: href
       filters:
         - name: querystring
           args: cat
+    title:
+      selector: a[href^="details.php?id="]
+      filters:
+        - name: re_replace
+          args: ["\\.", " "]
     details:
       selector: a[href^="details.php?id="]
       attribute: href
     download:
       selector: a[href^="download.php?hash="]
       attribute: href
+    description:
+      selector: h4
     size:
       selector: td.t_size
     grabs:
@@ -136,4 +145,4 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
-# NexusPHP tbd
+# NexusPHP 146364c08c (Customised)

src/Jackett.Common/Definitions/hellastz.yml

@@ -1,179 +0,0 @@
----
-id: hellastz
-name: HellasTZ
-description: "HellasTZ is an Greek Private site for TV / MOVIES / GENERAL"
-language: el-GR
-type: private
-encoding: UTF-8
-testlinktorrent: false
-links:
-  - https://hellastz.com/
-certificates:
-  - d2e56574d77a5059c30883c221094f0556d99cb6 # expired
-
-caps:
-  categorymappings:
-    - {id: 11, cat: Movies, desc: "Movies Αποκλειστικά του HTz (HTz only)"}
-    - {id: 54, cat: Movies/BluRay, desc: "Movies Blu-Ray 720p-1080p"}
-    - {id: 213, cat: Movies, desc: "Movies Ελληνικές Ταινιίες (Greek)"}
-    - {id: 232, cat: Movies/UHD, desc: "Movies Full-HD - 4K"}
-    - {id: 233, cat: Movies/DVD, desc: "Movies DvdRip Full"}
-    - {id: 234, cat: Movies/HD, desc: "Movies BDRip-BRRip-HDRip"}
-    - {id: 235, cat: Movies/WEB-DL, desc: "Movies WEB-720-1080p -HDrip"}
-    - {id: 236, cat: Movies/SD, desc: "Movies Cam - HDcam-HDts"}
-    - {id: 242, cat: Movies, desc: "Movies Ταινίες No Subs"}
-    - {id: 243, cat: Movies/DVD, desc: "Movies Φιλμογραφίες"}
-    - {id: 90, cat: TV, desc: "TV Ελληνικές Σειρές (Greek)"}
-    - {id: 96, cat: TV, desc: "TV Ξένες Σειρές (Foreign)"}
-    - {id: 219, cat: Audio, desc: "Music Ξένη μουσική (Foreign)"}
-    - {id: 220, cat: Audio, desc: "Music Ελληνική Μουσική (Greek)"}
-    - {id: 221, cat: Console, desc: "Παιχνίδια (Games)"}
-    - {id: 223, cat: Books/EBook, desc: "Βιβλία (Books)"}
-    - {id: 100, cat: Books/Comics, desc: "Comics & Περιοδικά"}
-    - {id: 225, cat: TV/Documentary, desc: "Ντοκιμαντερ (Documentaries)"}
-    - {id: 227, cat: PC, desc: "Pc Software"}
-    - {id: 228, cat: TV/Anime, desc: "Animation"}
-    - {id: 230, cat: TV/Anime, desc: "Παιδικα μεταγλωτισμε (Children)"}
-    - {id: 231, cat: TV/Anime, desc: "Παιδικα υποτιτλους (Children w/ subs)"}
-    - {id: 240, cat: PC/Mobile-Other, desc: "Android - Linux"}
-    - {id: 241, cat: Audio/Audiobook, desc: "Audio Books"}
-
-  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"]
-
-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:
-    - path: index.php
-  inputs:
-    page: torrents
-    search: "{{ .Keywords }}"
-    category: "{{ range .Categories }}{{.}};{{end}}"
-    # 0 all, 1 active only, 2 dead only
-    active: 0
-    order: "{{ .Config.sort }}"
-    by: "{{ .Config.type }}"
-    # does not support imdbid search and does not ruturn imdb link in results
-
-  rows:
-    selector: "table.lista > tbody > tr:has(a[href^=\"index.php?page=torrent-details&id=\"]){{ if .Config.freeleech }}:has(img[alt=\"Gold 100% Free\"]){{ else }}{{ end }}"
-
-  fields:
-    category:
-      selector: a[href^="index.php?page=torrents&category="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    title:
-      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-    poster:
-      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=(.*?) "
-    details:
-      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-      attribute: href
-    download:
-      selector: a[href^="index.php?page=downloadcheck&id="]
-      attribute: href
-    date:
-      selector: td:nth-child(4)
-      filters:
-        - name: append
-          args: " +02:00" # EET
-        - name: dateparse
-          args: "02/01/2006 -07:00"
-    seeders:
-      selector: td:nth-child(5)
-    leechers:
-      selector: td:nth-child(6)
-    grabs:
-      selector: td:nth-child(7)
-    size:
-      selector: td:nth-child(8)
-    downloadvolumefactor:
-      case:
-        img[alt="Gold 100% Free"]: 0
-        img[alt="Silver 50% Free"]: 0.5
-        img[alt="Bronze 25% Free"]: 0.75
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[alt="2x Upload Multiplier"]: 2
-        img[alt="3x Upload Multiplier"]: 3
-        img[alt="4x Upload Multiplier"]: 4
-        img[alt="5x Upload Multiplier"]: 5
-        img[alt="6x Upload Multiplier"]: 6
-        img[alt="7x Upload Multiplier"]: 7
-        img[alt="8x Upload Multiplier"]: 8
-        img[alt="9x Upload Multiplier"]: 9
-        img[alt="10x Upload Multiplier"]: 10
-        "*": 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
-#  xbtitFM v3.1.00

src/Jackett.Common/Definitions/immortuos.yml

@@ -192,4 +192,10 @@ search:
         i[class*="fa-globe text-green"]: 2 # Global Double Upload
         i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
         "*": 1
+# global MR is 1.0 but torrents must be seeded for 2 days regardless of ratio
+#    minimumratio:
+#      text: 1.0
+    minimumseedtime:
+      # 2 days (as seconds = 5 x 24 x 60 x 60)
+      text: 172800
 # UNIT3D 1.9.3

src/Jackett.Common/Definitions/knaben.yml

@@ -0,0 +1,142 @@
+---
+id: knaben
+name: Knaben
+description: "Knaben is a Public torrent meta-search engine"
+language: en-US
+type: public
+encoding: UTF-8
+links:
+  - https://knaben.eu/
+
+caps:
+  categorymappings:
+    # Cat ids used for filtering /browse/ are not consistent with those for results, so double-check when updating.
+    # They appear to be using nZEDb/Newznab/Jackett cat ids, so if there are empty categories, resort to those.
+    # Audio
+    - {id: 3000, cat: Audio, desc: "Audio"}
+    - {id: 3010, cat: Audio/MP3, desc: "Audio/MP3"}
+    - {id: 3020, cat: Audio/Video, desc: "Audio/Video"}
+    - {id: 3030, cat: Audio/Audiobook, desc: "Audio/Audiobook"}
+    - {id: 3040, cat: Audio/Lossless, desc: "Audio/Lossless"}
+    - {id: 3050, cat: Audio/Other, desc: "Audio/Other"}
+    # Console
+    - {id: 1000, cat: Console, desc: "Console"}
+    - {id: 1010, cat: Console/NDS, desc: "Console/NDS"}
+    - {id: 1020, cat: Console/PSP, desc: "Console/PSP"}
+    - {id: 1030, cat: Console/Wii, desc: "Console/Wii"}
+    - {id: 1040, cat: Console/XBox, desc: "Console/Xbox"}
+    - {id: 1050, cat: Console/XBox 360, desc: "Console/Xbox 360"}
+    - {id: 1080, cat: Console/PS3, desc: "Console/PS3"}
+    - {id: 1110, cat: Console/3DS, desc: "Console/3DS"}
+    - {id: 1120, cat: Console/PS Vita, desc: "Console/PS Vita"}
+    - {id: 1180, cat: Console/PS4, desc: "Console/PS4"}
+    - {id: 1090, cat: Console/Other, desc: "Console/Other"}
+    # Movies
+    - {id: 2000, cat: Movies, desc: "Movies"}
+    - {id: 2010, cat: Movies/Foreign, desc: "Movies/Foreign"}
+    - {id: 2030, cat: Movies/SD, desc: "Movies/SD"}
+    - {id: 2040, cat: Movies/HD, desc: "Movies/HD"}
+    - {id: 2045, cat: Movies/UHD, desc: "Movies/UHD"}
+    - {id: 2060, cat: Movies/3D, desc: "Movies/3D"}
+    - {id: 2050, cat: Movies/BluRay, desc: "Movies/BluRay"}
+    - {id: 2070, cat: Movies/DVD, desc: "Movies/DVD"}
+    - {id: 2020, cat: Movies/Other, desc: "Movies/Other"}
+    # PC
+    - {id: 4000, cat: PC, desc: "PC/PC"}
+    - {id: 4020, cat: PC/ISO, desc: "PC/ISO"}
+    - {id: 4030, cat: PC/Mac, desc: "PC/Mac"}
+    - {id: 4040, cat: PC/Mobile-Other, desc: "PC/Mobile-Other"}
+    - {id: 4050, cat: PC/Games, desc: "PC/Games"}
+    - {id: 4060, cat: PC/Mobile-iOS, desc: "PC/Mobile-iOS"}
+    - {id: 4070, cat: PC/Mobile-Android, desc: "PC/Mobile-Android"}
+    # Anime
+    - {id: 5070, cat: TV/Anime, desc: "Anime"}
+    # TV
+    - {id: 5000, cat: TV, desc: "TV"}
+    - {id: 5020, cat: TV/Foreign, desc: "TV/FOREIGN"}
+    - {id: 5030, cat: TV/SD, desc: "TV/SD"}
+    - {id: 5040, cat: TV/HD, desc: "TV/HD"}
+    - {id: 5045, cat: TV/UHD, desc: "TV/UHD"}
+    - {id: 5060, cat: TV/Sport, desc: "TV/Sport"}
+    - {id: 5080, cat: TV/Documentary, desc: "TV/Documentary"}
+    - {id: 5050, cat: TV/Other, desc: "TV/OTHER"}
+    # XXX
+    - {id: 6000, cat: XXX, desc: "XXX"}
+    - {id: 6010, cat: XXX/DVD, desc: "XXX/DVD"}
+    - {id: 6060, cat: XXX/ImageSet, desc: "XXX/Imageset"}
+    - {id: 6070, cat: XXX/Other, desc: "XXX/Other"}
+    # Books
+    - {id: 7000, cat: Books, desc: "Books"}
+    - {id: 7020, cat: Books/EBook, desc: "Books/Ebook"}
+    - {id: 7030, cat: Books/Comics, desc: "Books/Comics"}
+    - {id: 8030, cat: Books/Mags, desc: "Books/Magazines"}
+    - {id: 7040, cat: Books/Technical, desc: "Books/Technical"}
+    - {id: 7050, cat: Books/Other, desc: "Books/Other"}
+    # Other
+    - {id: 8000, cat: Other, desc: "Other"}
+    - {id: 8010, cat: Other/Misc, desc: "Other/Misc"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: Date
+    options:
+      Date: created
+      Seeders: seeders
+      Size: size
+      Title: title
+
+search:
+  paths:
+    - path: "{{ if .Keywords }}search/?q={{ .Keywords }}&p=1&cat=All&s={{ else }}browse/1/0/{{ end }}{{ .Config.sort }}"
+
+  rows:
+    selector: tr[title^="Cached at"]
+
+  fields:
+    category:
+      selector: a[href^="/browse/"]
+      attribute: href
+      filters:
+        - name: split
+          args: ["/", 3]
+    title:
+      selector: td:nth-child(2) a
+    details:
+      selector: td:last-child a
+      attribute: href
+    magnet:
+      selector: td:nth-child(2) a
+      attribute: href
+    description:
+      selector: td:last-child a
+      filters:
+        - name: prepend
+          args: "Source: "
+    date:
+      selector: td:nth-child(4)
+      attribute: title
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "2006-01-02T15:04:05 -07:00"
+    size:
+      selector: td:nth-child(3)
+    seeders:
+      selector: td:nth-child(5)
+    leechers:
+      selector: td:nth-child(6)
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/mteamtp.yml

@@ -105,6 +105,11 @@ login:
     path: index.php
     selector: a[href="logout.php"]
 
+download:
+  selectors:
+    - selector: a[href$="&https=1"]
+      attribute: href
+
 search:
   paths:
     - path: torrents.php
@@ -120,7 +125,7 @@ search:
     incldead: 0
     # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
     spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 title, 1 descr, 3 uploader, 4 imdb url
+    # 0 title, 3 uploader, 4 imdb url
     search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
     # 0 and, 1 or, 2 exact
     search_mode: 0
@@ -151,7 +156,7 @@ search:
       selector: a[href^="details.php?id="]
       attribute: href
     download:
-      selector: a[href^="download.php?id="]
+      selector: a[href^="details.php?id="]
       attribute: href
     poster:
       selector: img[alt="torrent thumbnail"]

src/Jackett.Common/Definitions/mteamtp2fa.yml

@@ -108,6 +108,11 @@ login:
     path: index.php
     selector: a[href="logout.php"]
 
+download:
+  selectors:
+    - selector: a[href$="&https=1"]
+      attribute: href
+
 search:
   paths:
     - path: torrents.php
@@ -123,7 +128,7 @@ search:
     incldead: 0
     # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
     spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 title, 1 descr, 3 uploader, 4 imdb url
+    # 0 title, 3 uploader, 4 imdb url
     search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
     # 0 AND, 1 OR, 2 exact
     search_mode: 0
@@ -157,7 +162,7 @@ search:
       selector: a[href^="details.php?id="]
       attribute: href
     download:
-      selector: a[href^="download.php?id="]
+      selector: a[href^="details.php?id="]
       attribute: href
     poster:
       selector: img[alt="torrent thumbnail"]

src/Jackett.Common/Definitions/oxtorrent.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www.torrent911.net/
+  - https://www.torrent911.org/
   - https://www.t911.me/
 legacylinks:
   - https://www.oxtorrent.bz/
@@ -37,6 +37,7 @@ legacylinks:
   - https://www.t911.net/
   - https://oxtorrent.unblockit.blue/ # proxy for *.co, a clone without derniers
   - https://oxtorrent.nocensor.sbs/ # proxy for *.co, a clone without derniers
+  - https://www.torrent911.net/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/putao.yml

@@ -178,17 +178,11 @@ search:
       selector: td:nth-child(8)
     downloadvolumefactor:
       case:
-        tr.free_bg: 0
         img.pro_free: 0
-        tr.2up: 0
         img.pro_2up: 0
-        tr.free2up: 0
         img.pro_free2up: 0
-        tr.halfdown_bg: 0.5
         img.pro_50pctdown: 0.5
-        tr.d30down_bg: 0.3
         img.pro_30pctdown: 0.3
-        tr.d70down_bg: 0.7
         img.pro_70pctdown: 0.7
         "*": 1
     uploadvolumefactor:

src/Jackett.Common/Definitions/seedfile.yml

@@ -1,161 +0,0 @@
----
-id: seedfile
-name: SeedFile
-description: "SeedFile (SF) is a ROMANIAN Private Torrent Tracker for 0DAY / GENERAL"
-language: ro-RO
-type: private
-encoding: UTF-8
-links:
-  - https://www.seedfile.io/
-legacylinks:
-  - https://www.seedfile.ro/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Books/Mags, desc: "Cărți/Reviste"}
-    - {id: 2, cat: Other, desc: "Desene SD"}
-    - {id: 3, cat: Other, desc: "Diverse n/a"}
-    - {id: 5, cat: Movies/BluRay, desc: "Filme Blu-Ray"}
-    - {id: 6, cat: Movies/DVD, desc: "Filme DVD"}
-    - {id: 7, cat: Movies/DVD, desc: "Filme DVD-RO"}
-    - {id: 8, cat: Movies/HD, desc: "Filme HD"}
-    - {id: 9, cat: Movies/HD, desc: "Filme HD-RO"}
-    - {id: 10, cat: Movies/SD, desc: "Filme SD"}
-    - {id: 11, cat: Movies/SD, desc: "Filme SD-RO"}
-    - {id: 12, cat: Other, desc: "Imagini"}
-    - {id: 13, cat: Console, desc: "Jocuri Console"}
-    - {id: 14, cat: PC/Games, desc: "Jocuri PC"}
-    - {id: 15, cat: Audio, desc: "Muzică"}
-    - {id: 16, cat: PC/Mobile-Other, desc: "Mobile"}
-    - {id: 17, cat: PC, desc: "Programe"}
-    - {id: 18, cat: TV/HD, desc: "Seriale HD"}
-    - {id: 19, cat: TV/HD, desc: "Seriale HD-RO"}
-    - {id: 20, cat: TV/SD, desc: "Seriale TV"}
-    - {id: 21, cat: TV/SD, desc: "Seriale TV-RO"}
-    - {id: 22, cat: TV/Sport, desc: "Sport"}
-    - {id: 23, cat: Audio/Video, desc: "Video Clip"}
-    - {id: 24, cat: XXX, desc: "Adult 18+"}
-    - {id: 36, cat: Movies/3D, desc: "Video 3D"}
-    - {id: 37, cat: Movies/HD, desc: "Animație HD"}
-
-  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
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: div.recover-error2
-  test:
-    path: profile.php
-
-download:
-  selectors:
-    - selector: a[href^="download.php/"]
-      attribute: href
-
-search:
-  paths:
-    - path: download-torrents
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    # 0 active, 1 incldead, 2 onlydead, 3 freeleech
-    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
-
-  rows:
-    selector: tr.browse
-
-  fields:
-    category:
-      selector: a[href^="torrents.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^="details.php?id="]
-      attribute: href
-    files:
-      selector: td:nth-last-child(7)
-    date:
-      selector: td:nth-last-child(5)
-      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
-        - name: re_replace
-          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
-        - name: re_replace
-          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
-        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
-        - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
-        - name: re_replace
-          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
-        - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
-        - name: re_replace
-          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
-        - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
-        - name: re_replace
-          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
-        - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
-        - name: re_replace
-          args: ["(?i) (ay)", "month"]
-        - name: re_replace
-          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
-        - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
-        - name: re_replace
-          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
-        - name: re_replace
-          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
-        - name: re_replace
-          args: ["(?i) (an)", "year"]
-        - name: re_replace
-          args: ["(?i)(För |und)", ""] # Misc removals
-        - name: timeago
-    size:
-      selector: td:nth-last-child(4)
-    seeders:
-      selector: td:nth-last-child(3)
-    leechers:
-      selector: td:nth-last-child(2)
-    downloadvolumefactor:
-      case:
-        "img[src=\"./pic/freeleech.png\"]": 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    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/thefallingangels.yml

@@ -203,4 +203,4 @@ search:
       case:
         "div[onmouseover=\"return overlib('Freeleech: Ja');\"]": 0
         "*": 1
-# engine n/a
+# 3xT

src/Jackett.Common/Definitions/torrent-explosiv.yml

@@ -11,14 +11,13 @@ legacylinks:
   - https://torrent-explosiv.eu/
 
 caps:
-    # dont forget to update the search fields category case block
   categorymappings:
     # Movie
     - {id: 179, cat: Movies/SD, desc: "Movie SD"}
     - {id: 180, cat: Movies/HD, desc: "Movie HD"}
     - {id: 185, cat: Movies/UHD, desc: "Movie UHD"}
-    - {id: 181, cat: Movies/DVD, desc: "Movie DVD-R"}
-    - {id: 184, cat: Movies/BluRay, desc: "Movie BluRay"}
+    - {id: 181, cat: Movies/DVD, desc: "Movie DVD/HD2DVD"}
+    - {id: 184, cat: Movies/BluRay, desc: "Movie BluRay/Remux"}
     - {id: 182, cat: Movies/SD, desc: "Movie Pack SD"}
     - {id: 225, cat: Movies/HD, desc: "Movie Pack HD"}
     - {id: 186, cat: Movies/Foreign, desc: "Movie International"}
@@ -45,7 +44,7 @@ caps:
     - {id: 173, cat: PC/Games, desc: "Game PC"}
     - {id: 174, cat: Console/PSP, desc: "Game PlayStation"}
     - {id: 175, cat: Console/XBox, desc: "Game XBOX"}
-    - {id: 176, cat: Console/Wii, desc: "Game Wii"}
+    - {id: 176, cat: Console/Wii, desc: "Game Wii - Switch"}
     - {id: 222, cat: Console/NDS, desc: "Game NDS-3DS"}
     - {id: 177, cat: Console, desc: "Game Wimmelbild"}
     - {id: 178, cat: Console/Other, desc: "Game Sonstieges"}
@@ -161,79 +160,12 @@ search:
     details:
       selector: a.selection_a
       attribute: href
-    category:
-      selector: div.kat_cat_pic
-      case:
-        # Movie
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"Pack SD\"))": 182
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"Pack HD\"))": 225
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 179
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"UHD\"))": 185
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 180
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"DVD\"))": 181
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"BluRay\"))": 184
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"International\"))": 186
-        # Serien
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack SD\"))": 223
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack UHD\"))": 224
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack HD\"))": 201
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 198
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"UHD\"))": 200
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 199
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Anime\"))": 202
-        # Doku
-        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"Pack SD\"))": 172
-        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"Pack HD\"))": 226
-        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 170
-        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 171
-        # Software
-        ":has(div.kat_cat_pic_name:contains(\"Software\")):has(div.kat_cat_pic_name_b:contains(\"Windows\"))": 168
-        ":has(div.kat_cat_pic_name:contains(\"Software\")):has(div.kat_cat_pic_name_b:contains(\"Mac\"))": 166
-        ":has(div.kat_cat_pic_name:contains(\"Software\")):has(div.kat_cat_pic_name_b:contains(\"Linux\"))": 165
-        ":has(div.kat_cat_pic_name:contains(\"Software\")):has(div.kat_cat_pic_name_b:contains(\"Android\"))": 169
-        ":has(div.kat_cat_pic_name:contains(\"Software\")):has(div.kat_cat_pic_name_b:contains(\"ios\"))": 227
-        # Game
-        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": 173
-        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"PlayStation\"))": 174
-        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"XBOX\"))": 175
-        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Wii\"))": 176
-        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"NDS\"))": 222
-        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Wimmelbild\"))": 177
-        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Sonstieges\"))": 178
-        # Musik
-        ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Alben\"))": 187
-        ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Sampler\"))": 188
-        ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Mixe\"))": 189
-        ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Charts\"))": 190
-        ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Single\"))": 191
-        ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Pack Flac\"))": 228
-        ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Flac\"))": 193
-        ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"mp3\"))": 196
-        ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Musikvideo\"))": 194
-        # Sport
-        ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 203
-        ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"UHD\"))": 229
-        ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 204
-        # Ebooks
-        ":has(div.kat_cat_pic_name:contains(\"Ebooks\")):has(div.kat_cat_pic_name_b:contains(\"Zeitungen\"))": 212
-        ":has(div.kat_cat_pic_name:contains(\"Ebooks\")):has(div.kat_cat_pic_name_b:contains(\"Magazine\"))": 211
-        ":has(div.kat_cat_pic_name:contains(\"Ebooks\")):has(div.kat_cat_pic_name_b:contains(\"Bücher\"))": 213
-        ":has(div.kat_cat_pic_name:contains(\"Ebooks\")):has(div.kat_cat_pic_name_b:contains(\"Comics\"))": 214
-        # XXX
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Pack SD\"))": 207
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Pack HD\"))": 231
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 205
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 206
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Clips\"))": 208
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Bilder\"))": 209
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Ebook\"))": 230
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Sonstiges\"))": 210
-        # Other
-        ":has(div.kat_cat_pic_name:contains(\"Other\")):has(div.kat_cat_pic_name_b:contains(\"PDF\"))": 216
-        ":has(div.kat_cat_pic_name:contains(\"Other\")):has(div.kat_cat_pic_name_b:contains(\"Hörspiele\"))": 217
-        ":has(div.kat_cat_pic_name:contains(\"Other\")):has(div.kat_cat_pic_name_b:contains(\"EPaper\"))": 218
-        ":has(div.kat_cat_pic_name:contains(\"Other\")):has(div.kat_cat_pic_name_b:contains(\"A-Books\"))": 219
-        ":has(div.kat_cat_pic_name:contains(\"Other\")):has(div.kat_cat_pic_name_b:contains(\"Sonstiges\"))": 220
+    cat_p1:
+      selector: div.kat_cat_pic_name
+    cat_p2:
+      selector: div.kat_cat_pic_name_b
+    categorydesc:
+      text: "{{ .Result.cat_p1 }} {{ .Result.cat_p2 }}"
     poster:
       selector: div[id^="details"] img
       attribute: src
@@ -277,4 +209,4 @@ search:
     minimumseedtime:
       # 2 days (as seconds = 2 x 24 x 60 x 60)
       text: 172800
-# engine n/a
+# 3xT

src/Jackett.Common/Definitions/torrent9clone.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www.torrent9.nl/
+  - https://www.torrent9.re/
   - https://torrent9.nocensor.sbs/
 legacylinks:
   - https://www.t9.vc/
@@ -30,6 +30,7 @@ legacylinks:
   - https://www.torrent9.pw/
   - https://www.torrent9.si/
   - https://torrent9.nocensor.biz/
+  - https://www.torrent9.nl/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentqq.yml

@@ -7,9 +7,8 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentqq144.com/
+  - https://torrentqq145.com/
 legacylinks:
-  - https://torrentqq129.com/
   - https://torrentqq130.com/
   - https://torrentqq131.com/
   - https://torrentqq132.com/
@@ -24,6 +23,7 @@ legacylinks:
   - https://torrentqq141.com/
   - https://torrentqq142.com/
   - https://torrentqq143.com/
+  - https://torrentqq144.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentsir.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentsir57.com/
+  - https://torrentsir58.com/
 legacylinks:
   - https://torrentsir46.com/
   - https://torrentsir47.com/
@@ -25,7 +25,8 @@ legacylinks:
   - http://torrentsir55.com/
   - http://torrentsir56.com/
   - https://torrentsir56.com/
-
+  - https://torrentsir57.com/
+  - http://torrentsir58.com/
 caps:
   categorymappings:
     - {id: "gallery", cat: XXX, desc: "+19 (Adult)"}

src/Jackett.Common/Definitions/torrentview.yml

@@ -7,12 +7,10 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentview60.com/
+  - https://torrentview62.com/
 legacylinks:
   - https://torrentview.net/
   - https://torrentview.co/
-  - https://torrentview38.com/
-  - https://torrentview39.com/
   - https://torrentview40.com/
   - https://torrentview41.com/
   - https://torrentview42.com/
@@ -25,6 +23,7 @@ legacylinks:
   - https://torrentview52.com/
   - https://torrentview53.com/
   - https://torrentview57.com/
+  - https://torrentview60.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentwhiz.yml

@@ -7,9 +7,8 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentwiz42.com/
+  - https://torrentwiz43.com/
 legacylinks:
-  - https://torrentwiz27.me/
   - https://torrentwiz28.me/
   - https://torrentwiz29.me/
   - https://torrentwiz30.com/
@@ -24,6 +23,7 @@ legacylinks:
   - https://torrentwiz39.com/
   - https://torrentwiz40.com/
   - https://torrentwiz41.com/
+  - https://torrentwiz42.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Indexers/DonTorrent.cs

@@ -39,7 +39,7 @@ namespace Jackett.Common.Indexers
         private const string SearchUrl = "buscar/";
 
         public override string[] AlternativeSiteLinks { get; protected set; } = {
-            "https://dontorrent.cab/",
+            "https://dontorrent.wtf/",
             "https://todotorrents.net/",
             "https://tomadivx.net/",
             "https://seriesblanco.one/",
@@ -65,6 +65,7 @@ namespace Jackett.Common.Indexers
             "https://dontorrent.nl/",
             "https://dontorrent.cx/",
             "https://dontorrent.bet/",
+            "https://dontorrent.cab/",
             "https://dontorrent.eu/"
         };
 
@@ -83,7 +84,7 @@ namespace Jackett.Common.Indexers
             : base(id: "dontorrent",
                    name: "DonTorrent",
                    description: "DonTorrent is a SPANISH public tracker for MOVIES / TV / GENERAL",
-                   link: "https://dontorrent.cab/",
+                   link: "https://dontorrent.wtf/",
                    caps: new TorznabCapabilities
                    {
                        TvSearchParams = new List<TvSearchParam>

src/Jackett.Updater/Program.cs

@@ -255,6 +255,7 @@ namespace Jackett.Updater
                 "CurlSharp.dll",
                 "CurlSharp.pdb",
                 "Definitions/01torrent.yml",
+                "Definitions/24rolika.yml",
                 "Definitions/32pages.yml",
                 "Definitions/3evils.yml",
                 "Definitions/420files.yml",
@@ -371,6 +372,7 @@ namespace Jackett.Updater
                 "Definitions/hdplus.yml",
                 "Definitions/hdreactor.yml", // renamed to hdhouse
                 "Definitions/hdstreet.yml",
+                "Definitions/hellastz.yml",
                 "Definitions/hidden-palace.yml",
                 "Definitions/hon3yhd-net.yml",
                 "Definitions/hon3yhd.yml",
@@ -459,6 +461,7 @@ namespace Jackett.Updater
                 "Definitions/scenexpress.yml",
                 "Definitions/sdkino.yml",
                 "Definitions/secretcinema.yml", // migrated to C# gazelle base tracker
+                "Definitions/seedfile.yml",
                 "Definitions/seedpeer.yml",
                 "Definitions/sexxi.yml",
                 "Definitions/sharefiles.yml",