byrutor: new domain byrutor.* -> byrut.*

Co-authored-by: garfield69 <garfieldsixtynine@gmail.com>
Co-authored-by: ilike2burnthing <59480337+ilike2burnthing@users.noreply.github.com>

README.md

@@ -245,7 +245,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * anasch.cc
  * AnimeBytes (AB)
  * AnimeTorrents (AnT)
- * AnimeWorld (AST4u) [![(invite needed)][inviteneeded]](#)
+ * AnimeWorld [![(invite needed)][inviteneeded]](#)
  * Anthelion
  * Araba Fenice (Phoenix) [![(invite needed)][inviteneeded]](#)
  * ArabP2P
@@ -429,7 +429,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Ourbits (HDPter)
  * P2PBG
  * P2PElite
- * Partis [![(invite needed)][inviteneeded]](#)
  * PassThePopcorn (PTP)
  * Peers.FM
  * Pirata Digital

src/Jackett.Common/Definitions/acgsou.yml

@@ -24,7 +24,7 @@ caps:
     - {id: 2, cat: TV/Anime, desc: "动画分类 (Anime)"}
     - {id: 7, cat: TV/Anime, desc: "新番连载 (Anime New Fan Series)"}
     - {id: 8, cat: TV/Anime, desc: "完整动画 (Anime Collection)"}
-    - {id: 9, cat: TV/Anime, desc: "剧场版 (Anime Movie)"}
+    - {id: 9, cat: Movies/Other, desc: "剧场版 (Anime Movie)"}
     - {id: 10, cat: TV/Anime, desc: "DVDRIP (Anime DVDRIP)"}
     - {id: 11, cat: TV/Anime, desc: "BDRIP (Anime BDRIP)"}
     - {id: 5, cat: TV/Anime, desc: "RAW/ISO"}

src/Jackett.Common/Definitions/aither.yml

@@ -199,4 +199,4 @@ search:
     minimumseedtime:
       # 3 days (as seconds = 3 x 24 x 60 x 60)
       text: 259200
-# UNIT3D 5.1.0
+# UNIT3D 5.2.0

src/Jackett.Common/Definitions/anime-free.yml

@@ -86,6 +86,9 @@ search:
 
   fields:
     category:
+      text: 54
+    category|noappend:
+      optional: true
       selector: a[href*="category="]
       attribute: href
       case:
@@ -130,6 +133,9 @@ search:
     leechers:
       text: 1
     size:
+      text: "0 B"
+    size:
+      optional: true
       selector: b.file_size
     downloadvolumefactor:
       text: 0

src/Jackett.Common/Definitions/animeworld.yml

@@ -1,47 +1,32 @@
 ---
 id: animeworld
 name: AnimeWorld
-description: "AnimeWorld (AST4u) is a GERMAN Private site for TV / MOVIES / ANIME / HENTAI"
+description: "AnimeWorld (AW) is a GERMAN Private site for ANIME / MANGA / HENTAI"
 language: de-de
 type: private
-encoding: iso-8859-1
+encoding: UTF-8
 links:
   - https://animeworld.cx/
-legacylinks:
-  - https://www.ast4u.me/
 
 caps:
   categorymappings:
-    - {id: 35, cat: TV/Anime, desc: "Anime Movie"}
-    - {id: 36, cat: TV/Anime, desc: "Anime Serie"}
-    - {id: 37, cat: Audio/Foreign, desc: "Anime Musik"}
-    - {id: 41, cat: Books, desc: "Anime Pic & Manga"}
-    - {id: 42, cat: XXX, desc: "Hentai Movie & OVA"}
-    - {id: 43, cat: XXX, desc: "Hentai Serie"}
-    - {id: 44, cat: PC, desc: "Hentai Game"}
-    - {id: 45, cat: Movies, desc: "Cartoon Movie"}
-    - {id: 46, cat: TV, desc: "Cartoon Serie"}
-    - {id: 47, cat: TV, desc: "TV-Serie"}
-    - {id: 49, cat: TV/Documentary, desc: "Sonstiges Doku"}
-    - {id: 50, cat: Audio, desc: "Sonstiges Soundtrack"}
-    - {id: 52, cat: Movies/HD, desc: "Movie HD"}
-    - {id: 53, cat: Other, desc: "Sonstiges"}
-    - {id: 55, cat: Movies/Foreign, desc: "Movie Asia & MartialArts"}
-    - {id: 56, cat: TV/Anime, desc: "Anime OVA"}
-    - {id: 58, cat: Movies, desc: "Movie"}
-    - {id: 59, cat: Audio/Audiobook, desc: "Sonstiges Hoerspiele"}
-    - {id: 62, cat: Console, desc: "Sonstiges Game"}
-    - {id: 65, cat: Movies/BluRay, desc: "Movie BluRay"}
-    - {id: 66, cat: TV, desc: "TV-Serie BluRay"}
-    - {id: 67, cat: TV/HD, desc: "TV-Serie HD"}
-    - {id: 68, cat: TV/Anime, desc: "Anime Movie HD & BD"}
-    - {id: 69, cat: TV/Anime, desc: "Anime OVA HD & BD"}
-    - {id: 70, cat: TV/Anime, desc: "Anime Serie HD & BD"}
+    - {id: 1, cat: Movies/Other, desc: "Anime Movie"}
+    - {id: 2, cat: TV/Anime, desc: "Anime Serie"}
+    - {id: 3, cat: Audio, desc: "Anime Musik/OST"}
+    - {id: 4, cat: PC/Games, desc: "Anime Spiele"}
+    - {id: 5, cat: XXX, desc: "Hentai"}
+    - {id: 6, cat: PC, desc: "Spiele Linux"}
+    - {id: 7, cat: Other, desc: "Sonstiges"}
+    - {id: 8, cat: Movies, desc: "Filme"}
+    - {id: 9, cat: TV, desc: "Serien"}
+    - {id: 10, cat: PC/Games, desc: "Spiele"}
+    - {id: 11, cat: Audio, desc: "Musik"}
+    - {id: 12, cat: Books, desc: "Mangas"}
 
   modes:
     search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid]
+    movie-search: [q, imdbid, tmdbid]
     music-search: [q]
     book-search: [q]
 
@@ -52,83 +37,155 @@ settings:
   - name: password
     type: password
     label: Password
-  - name: info
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrentliste</b> setting to <i>Platzsparendes Layout mit PopUp für zusätzliche Informationen</i> in your profile.
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: created_at
+    options:
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
 
 login:
-  path: takelogin.php
-  method: post
+  path: login
+  method: form
+  form: form[action$="/login"]
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
-    returnto: "/index.php"
-  test:
-    path: browse.php
+    remember: on
+  selectorinputs:
+    _token:
+      selector: input[name="_token"]
+      attribute: value
+  error:
+    - selector: div#ERROR_COPY
+#    test:
+#      path: /
+#      selector: a[href$="/logout"]
 
 search:
   paths:
-    - path: browse.php
+    - path: torrents
   inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    incldead: 0
-    orderby: added
-    sort: desc
+    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
+    name: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
+    description: ""
+    mediainfo: ""
+    keywords: ""
+    uploader: ""
+    tmdbId: "{{ .Query.TMDBID }}"
+    imdbId: "{{ .Query.IMDBIDShort }}"
+    tvdbId: "{{ .Query.TVDBID }}"
+    malId: ""
+    startYear: ""
+    endYear: ""
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
+    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
   rows:
-    selector: table.tableinborder > tbody > tr:has(a[href^="details.php"])
+    selector: table > tbody > tr
 
-  fields: # note: two alternative layouts available
-    title:
-      selector: a[href^="details.php"]
-    title:
-      optional: true
-      selector: a[href^="details.php"][title]
-      attribute: title
+  fields:
     category:
-      selector: a[href^="browse.php?cat="]
+      selector: a[href*="/categories/"]
       attribute: href
       filters:
-        - name: querystring
-          args: cat
-    details:
-      selector: a[href^="details.php"]
-      attribute: href
+        - name: regexp
+          args: "/categories/(\\d+)"
+    title:
+      selector: a.view-torrent
     download:
-      selector: a[href^=" /gettorrent/"]
+      selector: a[href*="/download/"]
       attribute: href
-    files:
-      selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(1) > b:nth-child(2), a[href*="&filelist=1"]
-    grabs:
-      selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(3) > b:nth-child(1), a[href*="&tosnatchers=1"]
+    details:
+      selector: a.view-torrent
+      attribute: href
+    poster:
+      selector: div.torrent-poster img
+      attribute: src
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/90x135", ""]
     size:
-      selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(1) > b:nth-child(1), td:nth-child(7):has(br)
-      filters:
-        - name: replace
-          args: [".", ""]
-        - name: replace
-          args: [",", "."]
+      selector: td:nth-last-child(5)
     seeders:
-      selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(2) > b:nth-child(1), a[href*="&toseeders=1"]
+      selector: td:nth-last-child(4)
     leechers:
-      selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(2) > b:nth-child(3), a[href*="&todlers=1"]
+      selector: td:nth-last-child(3)
+    grabs:
+      selector: td:nth-last-child(2)
     date:
-      selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(5), td:nth-child(5):has(br)
+      selector: td:nth-last-child(1)
       filters:
-        - name: replace
-          args: [" ", ""]
-        - name: append
-          args: " +2:00" # EET
-        - name: replace
-          args: ["\xA0", ""]
-        - name: dateparse
-          args: "02.01.200615:04:05 -07:00"
+        # 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
     downloadvolumefactor:
       case:
-        img[src="/pic/free.gif"]: 0
+        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
+        i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
+        i[class*="fa-star text-bold"]: 0 # Freeleech From Token
+        i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
+        i[class*="fa-globe text-blue"]: 0 # Global Freeleech
+        i[class*="fa-star text-gold"]: 0 # Freeleech
+        i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
         "*": 1
     uploadvolumefactor:
-      text: 1
-# engine tbd
+      case:
+        i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
+        i[class*="fa-globe text-green"]: 2 # Global Double Upload
+        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
+        "*": 1
+    minimumseedtime:
+      # 7 day (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
+# UNIT3D 5.3.0

src/Jackett.Common/Definitions/bithumen.yml

@@ -123,13 +123,7 @@ search:
     size:
       selector: td:nth-child(6) > u
     downloadvolumefactor:
-      text: 1
-    downloadvolumefactor:
-      optional: true
-      selector: td:nth-child(6) > nobr > font:contains(" × ")
-      filters:
-        - name: replace
-          args: ["×", ""]
+      text: 0
     uploadvolumefactor:
       text: 1
     uploadvolumefactor:

src/Jackett.Common/Definitions/blutopia.yml

@@ -10,7 +10,7 @@ links:
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 1, cat: Movies, desc: "Movie"}
     - {id: 2, cat: TV, desc: "TV"}
     - {id: 3, cat: Movies/Other, desc: "FANRES"}
     - {id: 5, cat: Movies/Other, desc: "Trailer"}
@@ -68,28 +68,24 @@ login:
 
 search:
   paths:
-    # https://blutopia.xyz/torrents/filter?
-    # search=&description=&keywords=&uploader=&imdb=&tvdb=&view=list&tmdb=&mal=&igdb=
-    # &start_year=&end_year=&categories%5B%5D=3&sorting=seeders&direction=asc&page=0&qty=25
-    - path: torrents/filter
+    - path: torrents
   inputs:
     $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
+    name: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
     description: ""
+    mediainfo: ""
     keywords: ""
     uploader: ""
-    imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: "{{ .Query.TVDBID }}"
-    tmdb: "{{ .Query.TMDBID }}"
-    mal: ""
-    igdb: ""
-    start_year: ""
-    end_year: ""
-    sorting: "{{ .Config.sort }}"
-    direction: "{{ .Config.type }}"
-    qty: 100
-    page: 0
-    view: list
+    tmdbId: "{{ .Query.TMDBID }}"
+    imdbId: "{{ .Query.IMDBIDShort }}"
+    tvdbId: "{{ .Query.TVDBID }}"
+    malId: ""
+    startYear: ""
+    endYear: ""
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
     freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
   rows:
@@ -103,40 +99,29 @@ search:
         - name: regexp
           args: "/categories/(\\d+)"
     title:
-      selector: a[href*="/torrents/"]
+      selector: a.view-torrent
     download:
       selector: a[href*="/download/"]
       attribute: href
     details:
-      selector: a[href*="/torrents/"]
+      selector: a.view-torrent
       attribute: href
     poster:
       selector: div.torrent-poster img
       attribute: src
       filters:
         - name: replace
-          args: ["&w=52&h=80", "&w=180&h=270"] # for display on dashboard
-        - name: replace
-          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/52x80&w=180&h=270", ""]
+          args: ["https://via.placeholder.com/90x135", ""]
     size:
-      selector: td:nth-last-child(4)
+      selector: td:nth-last-child(5)
     seeders:
-      selector: td:nth-last-child(3)
+      selector: td:nth-last-child(4)
     leechers:
-      selector: td:nth-last-child(2)
+      selector: td:nth-last-child(3)
     grabs:
-      selector: td:nth-last-child(1)
-      filters:
-        - name: regexp
-          args: (\d+)
-    imdb:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    tmdbid:
-      selector: a[href*="themoviedb.org/movie/"]
-      attribute: href
+      selector: td:nth-last-child(2)
     date:
-      selector: time
+      selector: td:nth-last-child(1)
       filters:
         # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
         - name: re_replace
@@ -190,7 +175,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 0.4 but torrents must be seeded for 7 days regardless of ratio
+#    minimumratio:
+#      text: 0.4
     minimumseedtime:
-      # 7 days (as seconds = 7 x 24 x 60 x 60)
+      # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# UNIT3D 5.2.1b
+# UNIT3D 5.3.0b

src/Jackett.Common/Definitions/btdigg.yml

@@ -7,6 +7,9 @@ type: public
 encoding: UTF-8
 links:
   - https://btdig.com/
+  - https://btdiggwzoyrwwbiv.onion.ly/
+  - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.onion.ly/
+legacylinks:
   - http://btdiggwzoyrwwbiv.onion.ly/
 
 caps:

src/Jackett.Common/Definitions/btetree.yml

@@ -56,21 +56,21 @@ search:
     files:
       selector: td:nth-child(4)
     date:
-      selector: td:nth-child(6)
+      selector: td:nth-child(5)
       filters:
         - name: dateparse
           args: "01/02 15:04"
     size:
-      selector: td:nth-child(7)
+      selector: td:nth-child(6)
     grabs:
-      selector: td:nth-child(8)
+      selector: td:nth-child(7)
       filters:
         - name: regexp
           args: (\d+)
     seeders:
-      selector: td:nth-child(9)
+      selector: td:nth-child(8)
     leechers:
-      selector: td:nth-child(10)
+      selector: td:nth-child(9)
     downloadvolumefactor:
       text: 0
     uploadvolumefactor:

src/Jackett.Common/Definitions/byrutor.yml

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

src/Jackett.Common/Definitions/carpathians.yml

@@ -150,7 +150,7 @@ search:
           args: ["hete", "week"]
         - name: timeago
     downloadvolumefactor:
-      text: 1
+      text: 0
     uploadvolumefactor:
       case:
         img[src="pic/double.png"]: 2

src/Jackett.Common/Definitions/crazyhd.yml

@@ -13,6 +13,10 @@ legacylinks:
 caps:
   categorymappings:
     # Movies
+    - {id: 62, cat: Movies/3D, desc: "Movies 3D"}
+    - {id: 96, cat: Movies/UHD, desc: "Movies 4k Hindi"}
+    - {id: 94, cat: Movies/UHD, desc: "Movies 4k"}
+    - {id: 64, cat: Movies, desc: "Movies Animated"}
     - {id: 16, cat: Movies/BluRay, desc: "Movies English Bluray"}
     - {id: 11, cat: Movies/DVD, desc: "Movies English DVD-RIP"}
     - {id: 14, cat: Movies, desc: "Movies English CAM"}
@@ -25,12 +29,9 @@ caps:
     - {id: 65, cat: Movies/WEB-DL, desc: "Movies Hindi Webrip/HDrip"}
     - {id: 24, cat: Movies, desc: "Movies UNRATED"}
     - {id: 53, cat: Movies/Foreign, desc: "Movies Other Foreign"}
-    - {id: 64, cat: Movies, desc: "Movies Animated"}
     - {id: 45, cat: Movies, desc: "Movies Trailers"}
     - {id: 93, cat: Movies, desc: "Movies Dual Movies"}
     - {id: 59, cat: Movies, desc: "Movies Pack"}
-    - {id: 94, cat: Movies/UHD, desc: "Movies 4k"}
-    - {id: 62, cat: Movies/3D, desc: "Movies 3D"}
     # TV
     - {id: 34, cat: TV, desc: "TV English Series"}
     - {id: 57, cat: TV, desc: "TV Bangla series"}
@@ -46,7 +47,7 @@ caps:
     - {id: 61, cat: PC/Games, desc: "Games trailer"}
     - {id: 90, cat: Console/PS4, desc: "Games Ps4"}
     - {id: 86, cat: Console/PS3, desc: "Games xbox / ps3"}
-    - {id: 92, cat: PC/Games, desc: "Games nrated"}
+    - {id: 92, cat: PC/Games, desc: "Games unrated"}
     # Software
     - {id: 7, cat: PC/0day, desc: "Software Windows"}
     - {id: 20, cat: PC/Mobile-Android, desc: "Software Android Apps"}

src/Jackett.Common/Definitions/crazyspirits.yml

@@ -33,6 +33,7 @@ caps:
     - {id: 65, cat: Movies, desc: "Films FSCR"}
     - {id: 66, cat: Movies, desc: "Films CamTS"}
     - {id: 67, cat: Movies, desc: "Films Pack Films"}
+    - {id: 129, cat: Movies, desc: "Films QC~Film"}
     - {id: 68, cat: Movies, desc: "Films VostFR"}
     - {id: 69, cat: Movies, desc: "Films VO"}
     - {id: 70, cat: Movies/WEB-DL, desc: "Films WebRip 1080p"}
@@ -40,7 +41,7 @@ caps:
     - {id: 73, cat: Movies/WEB-DL, desc: "Films Webrip"}
     - {id: 72, cat: Movies/WEB-DL, desc: "Films WEB DL"}
     - {id: 99, cat: Movies, desc: "Films Remux"}
-    - {id: 98, cat: TV/Anime, desc: "Films Film Animées"}
+    - {id: 98, cat: Movies/Other, desc: "Films Film Animées"}
     - {id: 122, cat: Movies/WEB-DL, desc: "Films Web-DL 1080P"}
     - {id: 123, cat: Movies/WEB-DL, desc: "Films WEB-DL 720p"}
     - {id: 126, cat: Movies, desc: "Films HDTV"}
@@ -71,6 +72,7 @@ caps:
     - {id: 107, cat: Audio/MP3, desc: "Musiques MP3"}
     - {id: 108, cat: Audio/Lossless, desc: "Musiques FLAC"}
     - {id: 109, cat: Audio, desc: "Musiques WMA"}
+    - {id: 132, cat: Audio, desc: "Musiques QC~Musique"}
     # Séries
     - {id: 76, cat: TV/HD, desc: "Series Blu-Ray"}
     - {id: 77, cat: TV/HD, desc: "Series HDTV"}
@@ -88,10 +90,13 @@ caps:
     - {id: 97, cat: TV/Anime, desc: "Series Animée"}
     - {id: 88, cat: TV, desc: "Series Pack HD"}
     - {id: 128, cat: TV, desc: "Series Pack SD"}
+    - {id: 130, cat: TV, desc: "SeriesQC~Serie"}
     # Spéctacle
+    - {id: 131, cat: TV, desc: "SeriesQC~Spectacle"}
     - {id: 91, cat: TV/Other, desc: "Spectacle 720p"}
     - {id: 90, cat: TV/Other, desc: "Spectacle 1080p"}
     # Télévision
+    - {id: 133, cat: TV, desc: "TV QC~Tv"}
     - {id: 74, cat: TV/HD, desc: "TV TVHD"}
     - {id: 75, cat: TV, desc: "TV TVRip"}
     - {id: 92, cat: TV/Other, desc: "TV Spectacles"}

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

@@ -943,7 +943,7 @@ settings: []
 
 search:
   paths:
-    - path: "{{ if .Keywords }}search/?search={{ .Keywords }}{{ else }}/home{{ end }}"
+    - path: "{{ if .Keywords }}search/?search={{ .Keywords }}{{ else }}home{{ end }}"
 
   rows:
     selector: tr[class^="tl"]

src/Jackett.Common/Definitions/generationfree.yml

@@ -36,16 +36,18 @@ caps:
     - {id: 50, cat: Books/EBook, desc: "E-Books: Manuel Français"}
     - {id: 66, cat: Movies, desc: "Films: VOSTFR"}
     - {id: 65, cat: Movies, desc: "Films: VO"}
-    - {id: 55, cat: Movies/HD, desc: "Films: MHD x265"}
     - {id: 54, cat: Movies/HD, desc: "Films: MHD HDlight"}
+    - {id: 55, cat: Movies/HD, desc: "Films: MHD x265"}
     - {id: 69, cat: Movies/3D, desc: "Films: 3D"}
-    - {id: 110, cat: Movies/WEB-DL, desc: "Films: WEB"}
     - {id: 2, cat: Movies/HD, desc: "Films: HD"}
-    - {id: 59, cat: Movies, desc: "Films: Spectacle"}
+    - {id: 110, cat: Movies/WEB-DL, desc: "Films: WEB"}
+    - {id: 154, cat: Movies/UHD, desc: "Films: AV1-2160p"}
     - {id: 89, cat: Movies/SD, desc: "Films: SD"}
+    - {id: 153, cat: Movies/HD, desc: "Films: AV1-1080p"}
+    - {id: 59, cat: Movies, desc: "Films: Spectacle"}
     - {id: 70, cat: Movies/HD, desc: "Films: X265"}
-    - {id: 92, cat: Movies/UHD, desc: "Films: 4K"}
     - {id: 135, cat: Movies, desc: "Films: Noel"}
+    - {id: 155, cat: Movies/UHD, desc: "films: 4K X265"}
     - {id: 87, cat: XXX, desc: "Films: XXX"}
     - {id: 4, cat: Movies, desc: "Films: ISO"}
     - {id: 151, cat: TV, desc: "Films: .Série animation"}
@@ -55,8 +57,8 @@ caps:
     - {id: 97, cat: Audio, desc: "Musique: Podcast"}
     - {id: 137, cat: Audio, desc: "Musique: Noel"}
     - {id: 25, cat: Audio/MP3, desc: "Musique: Single MP3"}
-    - {id: 143, cat: Audio/MP3, desc: "Musique: Wav"}
     - {id: 22, cat: Audio/MP3, desc: "Musique: Album MP3"}
+    - {id: 143, cat: Audio/MP3, desc: "Musique: Wav"}
     - {id: 98, cat: Audio, desc: "Musique: karaoké"}
     - {id: 58, cat: Audio, desc: "Musique: Concert"}
     - {id: 24, cat: Audio/Lossless, desc: "Musique: Single Flac"}
@@ -64,8 +66,8 @@ caps:
     - {id: 64, cat: Audio, desc: "Musique: Mégamix Maison"}
     - {id: 6, cat: TV, desc: "Serie TV: Saison FR"}
     - {id: 7, cat: TV, desc: "Serie TV: Episode FR"}
-    - {id: 153, cat: TV, desc: "Serie TV: Saison VO"}
-    - {id: 63, cat: TV, desc: "Serie TV: Episode VO"}
+    - {id: 63, cat: TV, desc: "Serie TV: Saison VO"}
+    - {id: 152, cat: TV, desc: "Serie TV: Episode VO"}
     - {id: 93, cat: TV, desc: "Serie TV: Saison VOSTFR"}
     - {id: 61, cat: TV, desc: "Serie TV: Episode VOSTFR"}
     - {id: 12, cat: TV, desc: "Serie TV: Animation"}

src/Jackett.Common/Definitions/hdolimpo.yml

@@ -113,6 +113,8 @@ search:
           args: ["HDOlimpo", ""] # Delete HDOlimpo
         - name: replace
           args: ["HD-Olimpo", ""] # Delete HD-Olimpo
+        - name: replace
+          args: ["E-AC-3", "EAC3"]
         - name: re_replace
           args: ["[ -](?i)español[ -]", " SPANiSH "]
         - name: re_replace

src/Jackett.Common/Definitions/ilcorsaroblu.yml

@@ -6,12 +6,12 @@ language: it-it
 type: semi-private
 encoding: UTF-8
 links:
-  - https://ilcorsaroblu.online/
+  - https://ilcorsaroblu.org/
 legacylinks:
   - http://ilcorsaroblu.org/
   - https://www.ilcorsaroblu.info/
   - https://www.ilcorsaroblu.org/
-  - https://ilcorsaroblu.org/
+  - https://ilcorsaroblu.online/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/ilcorsaronero.yml

@@ -47,7 +47,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
+    tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
     book-search: [q]
@@ -62,12 +62,6 @@ search:
     - path: "{{ if .Keywords }}advsearch.php?&category={{ range .Categories }}{{.}};{{end}}&search={{ .Keywords }}&order=data&by=DESC&page=0{{ else }}/browse/0{{ end }}"
     - path: "{{ if .Keywords }}advsearch.php?&category={{ range .Categories }}{{.}};{{end}}&search={{ .Keywords }}&order=data&by=DESC&page=1{{ else }}/browse/1{{ end }}"
     - path: "{{ if .Keywords }}advsearch.php?&category={{ range .Categories }}{{.}};{{end}}&search={{ .Keywords }}&order=data&by=DESC&page=2{{ else }}/browse/2{{ end }}"
-  keywordsfilters:
-    # remove searching by season and episode due to inconsistent naming #11471
-    - name: re_replace # remove S01
-      args: ["(?i)(\\s*s\\d+)", ""]
-    - name: re_replace # remove E01
-      args: ["(?i)(\\s*e\\d+)", ""]
 
   rows:
     selector: "tr.odd,tr.odd2"

src/Jackett.Common/Definitions/jptv.yml

@@ -13,7 +13,7 @@ caps:
     - {id: 1, cat: Movies, desc: "Movies"}
     - {id: 2, cat: TV, desc: "TV"}
     - {id: 6, cat: TV, desc: "ts Firehose (RAW TS)"}
-    - {id: 7, cat: TV/Anime, desc: "Anime Movies"}
+    - {id: 7, cat: Movies/Other, desc: "Anime Movies"}
     - {id: 9, cat: TV/Anime, desc: "Anime Series"}
     - {id: 8, cat: Audio, desc: "Music"}
 

src/Jackett.Common/Definitions/lemonhd.yml

@@ -42,12 +42,12 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: 4
+    default: added
     options:
-      4: created
-      7: seeders
-      5: size
-      1: title
+      added: created
+      seeders: seeders
+      size: size
+      name: title
   - name: type
     type: select
     label: Order requested from site
@@ -72,19 +72,13 @@ search:
     - path: torrents.php
   inputs:
     search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    # 0 incldead, 1 active, 2 dead
-    incldead: 0
-    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
-    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 title, 1 descr, 3 uploader, 4 imdburl
-    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
-    # 0 AND, 1 OR, 2 exact
-    search_mode: 0
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
+    search_area: "{{ if .Query.IMDBID }}imdb{{ else }}name{{ end }}"
+    suggest: 0
+    column: "{{ .Config.sort }}"
+    sort: "{{ .Config.type }}"
 
   rows:
-    selector: table.torrents > tbody > tr:has(table.torrentname)
+    selector: table.torrents > tbody > tr:has(a[href^="download.php?"])
 
   fields:
     category:
@@ -152,4 +146,4 @@ search:
     description:
       selector: td:nth-child(2)
       remove: a, img
-# NexusPHP Standard v1.5 Beta 4
+# NexusPHP Standard v1.5 Beta 4 (customised)

src/Jackett.Common/Definitions/netcosmo.yml

@@ -15,6 +15,7 @@ caps:
     - {id: 15, cat: Movies/HD, desc: "Rip H264"}
     - {id: 16, cat: Movies/HD, desc: "Rip H265"}
     - {id: 24, cat: Movies/UHD, desc: "Rip 4K"}
+    - {id: 40, cat: Movies/UHD, desc: "4K - 3840X2160"}
     - {id: 21, cat: Movies/HD, desc: "Full HD"}
     - {id: 31, cat: TV/HD, desc: "Serie TV 720P"}
     - {id: 25, cat: Audio, desc: "Musica"}

src/Jackett.Common/Definitions/pixelcove.yml

@@ -54,6 +54,7 @@ caps:
     - {id: 48, cat: Other, desc: "Retro"}
     - {id: 72, cat: Other, desc: "Board Games"}
     - {id: 75, cat: Other, desc: "Paper Crafting"}
+    - {id: 77, cat: Other, desc: "Arcade"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/portugas.yml

@@ -107,12 +107,12 @@ search:
         - name: regexp
           args: "/categories/(\\d+)"
     title:
-      selector: a.view-torrent
+      selector: a.text-bright
     download:
       selector: a[href*="/download/"]
       attribute: href
     details:
-      selector: a.view-torrent
+      selector: a.text-bright
       attribute: href
     poster:
       selector: div.torrent-poster img
@@ -133,12 +133,6 @@ search:
       filters:
         - name: regexp
           args: (\d+)
-    imdb:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    tmdbid:
-      selector: a[href*="themoviedb.org/movie/"]
-      attribute: href
     date:
       selector: time
       filters:

src/Jackett.Common/Definitions/pwtorrents.yml

@@ -30,6 +30,8 @@ caps:
     - {id: 18, cat: TV/Sport, desc: "WWE Network"}
     - {id: 16, cat: TV/Sport, desc: "WWE PPV's"}
     - {id: 17, cat: TV/Sport, desc: "WWE Weekly"}
+    - {id: 19, cat: TV/Sport, desc: "AEW Weekly"}
+    - {id: 20, cat: TV/Sport, desc: "AEW PPV's"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/racing4everyone.yml

@@ -45,6 +45,7 @@ caps:
     - {id: 78, cat: TV/Sport, desc: "Porsche Supercup"}
     - {id: 79, cat: TV/Sport, desc: "TV Series"}
     - {id: 80, cat: TV/Sport, desc: "Touring Cars"}
+    - {id: 81, cat: TV/Sport, desc: "Extreme E"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/racingforme.yml

@@ -231,6 +231,9 @@ search:
       attribute: href
     size:
       selector: div.data-size
+      filters:
+        - name: re_replace
+          args: ["(\\d)\\.(\\d{3}\\.\\d{2})", "$1$2"]
     seeders:
       selector: div.data-seeders
       filters:

src/Jackett.Common/Definitions/rainbowtracker.yml

@@ -183,6 +183,9 @@ search:
       selector: td:nth-child(7)
     seeders:
       selector: td.seedmed > b, td.icemed > b
+      filters:
+        - name: replace
+          args: ["X", "0"]
     leechers:
       selector: td.leechmed > b
     grabs:

src/Jackett.Common/Definitions/rofd.yml

@@ -29,6 +29,7 @@ caps:
     - {id: 30, cat: Audio/MP3, desc: "Musik mp3"}
     - {id: 31, cat: Audio/Lossless, desc: "Musik Flac"}
     - {id: 32, cat: Audio/Video, desc: "Musik Video"}
+    - {id: 45, cat: Audio, desc: "Musik Pack"}
     - {id: 34, cat: PC/Games, desc: "Spiele Windows"}
     - {id: 35, cat: Console, desc: "Spiele Konsole"}
     - {id: 36, cat: Console, desc: "Spiele Wimmel"}

src/Jackett.Common/Definitions/shareisland.yml

@@ -77,24 +77,24 @@ login:
 
 search:
   paths:
-    - path: torrents/filter
+    - path: torrents
   inputs:
     $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
+    name: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
     description: ""
+    mediainfo: ""
+    keywords: ""
     uploader: ""
-    imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: "{{ .Query.TVDBID }}"
-    tmdb: "{{ .Query.TMDBID }}"
-    mal: ""
-    igdb: ""
-    start_year: ""
-    end_year: ""
-    sorting: "{{ .Config.sort }}"
-    direction: "{{ .Config.type }}"
-    qty: 100
-    page: 0
-    view: list
+    tmdbId: "{{ .Query.TMDBID }}"
+    imdbId: "{{ .Query.IMDBIDShort }}"
+    tvdbId: "{{ .Query.TVDBID }}"
+    malId: ""
+    startYear: ""
+    endYear: ""
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
     freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
   keywordsfilters:
     - name: diacritics
@@ -151,28 +151,17 @@ search:
       attribute: src
       filters:
         - name: replace
-          args: ["&w=52&h=80", "&w=180&h=270"] # for display on dashboard
-        - name: replace
-          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
+          args: ["https://via.placeholder.com/90x135", ""]
     size:
-      selector: td:nth-last-child(4)
+      selector: td:nth-last-child(5)
     seeders:
-      selector: td:nth-last-child(3)
+      selector: td:nth-last-child(4)
     leechers:
-      selector: td:nth-last-child(2)
+      selector: td:nth-last-child(3)
     grabs:
-      selector: td:nth-last-child(1)
-      filters:
-        - name: regexp
-          args: (\d+)
-    imdb:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    tmdbid:
-      selector: a[href*="themoviedb.org/movie/"]
-      attribute: href
+      selector: td:nth-last-child(2)
     date:
-      selector: time
+      selector: td:nth-last-child(1)
       filters:
         # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
         - name: re_replace
@@ -226,7 +215,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 0.4 but torrents must be seeded for 7 days regardless of ratio
+#    minimumratio:
+#      text: 0.4
     minimumseedtime:
-      # 6 days (as seconds = 6 x 24 x 60 x 60)
-      text: 518400
-# UNIT3D 5.2.0
+      # 7 day (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
+# UNIT3D 5.3.0

src/Jackett.Common/Definitions/tellytorrent.yml

@@ -14,7 +14,7 @@ legacylinks:
 
 caps:
   categorymappings:
-    - {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: Movies, desc: "Web Originals"}
@@ -76,24 +76,24 @@ login:
 
 search:
   paths:
-    - path: torrents/filter
+    - path: torrents
   inputs:
     $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
+    name: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
     description: ""
+    mediainfo: ""
+    keywords: ""
     uploader: ""
-    imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: "{{ .Query.TVDBID }}"
-    tmdb: "{{ .Query.TMDBID }}"
-    mal: ""
-    igdb: ""
-    start_year: ""
-    end_year: ""
-    sorting: "{{ .Config.sort }}"
-    direction: "{{ .Config.type }}"
-    qty: 100
-    page: 0
-    view: list
+    tmdbId: "{{ .Query.TMDBID }}"
+    imdbId: "{{ .Query.IMDBIDShort }}"
+    tvdbId: "{{ .Query.TVDBID }}"
+    malId: ""
+    startYear: ""
+    endYear: ""
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
     freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
   rows:
@@ -119,28 +119,17 @@ search:
       attribute: src
       filters:
         - name: replace
-          args: ["&w=52&h=80", "&w=180&h=270"] # for display on dashboard
-        - name: replace
-          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
+          args: ["https://via.placeholder.com/90x135", ""]
     size:
-      selector: td:nth-last-child(4)
+      selector: td:nth-last-child(5)
     seeders:
-      selector: td:nth-last-child(3)
+      selector: td:nth-last-child(4)
     leechers:
-      selector: td:nth-last-child(2)
+      selector: td:nth-last-child(3)
     grabs:
-      selector: td:nth-last-child(1)
-      filters:
-        - name: regexp
-          args: (\d+)
-    imdb:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    tmdbid:
-      selector: a[href*="themoviedb.org/movie/"]
-      attribute: href
+      selector: td:nth-last-child(2)
     date:
-      selector: time
+      selector: td:nth-last-child(1)
       filters:
         # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
         - name: re_replace
@@ -194,9 +183,10 @@ search:
         i[class*="fa-globe text-green"]: 2 # Global Double Upload
         i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
         "*": 1
-    minimumratio:
-      text: 1.0
+# global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
+#    minimumratio:
+#      text: 0.4
     minimumseedtime:
-      # 1 day (as seconds = 24 x 60 x 60)
-      text: 86400
-# UNIT3D 5.2.0
+      # 7 day (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
+# UNIT3D 5.3.0

src/Jackett.Common/Definitions/thefallingangels.yml

@@ -57,8 +57,8 @@ caps:
     - {id: 117, cat: Books/EBook, desc: "Books Romane"}
     - {id: 156, cat: Books, desc: "Books Packs"}
     - {id: 130, cat: Books, desc: "Books FSK 18"}
-    - {id: 159, cat: TV/Anime, desc: "Anime Movies HD"}
-    - {id: 160, cat: TV/Anime, desc: "Anime Movies SD"}
+    - {id: 159, cat: Movies/HD, desc: "Anime Movies HD"}
+    - {id: 160, cat: Movies/SD, desc: "Anime Movies SD"}
     - {id: 128, cat: TV/Anime, desc: "Anime Serien"}
     - {id: 131, cat: TV/Anime, desc: "Anime Hentai"}
     - {id: 129, cat: TV/Anime, desc: "Anime Sonstiges"}

src/Jackett.Common/Definitions/thesceneplace.yml

@@ -100,7 +100,7 @@ search:
     # does not support imdbid search and does not return imdb link in results
 
   rows:
-    selector: "table.lista > tbody > tr:has(a[href^=\"index.php?page=torrent-details&id=\"]){{ 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(img[src=\"images/gold.gif\"]){{ else }}{{ end }}"
+    selector: "table.lista > tbody > tr:has(a[href^=\"index.php?page=torrent-details&id=\"]):not(:has(a[href^=\"index.php?page=userdetails&id=\"])){{ 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=\"]):not(:has(a[href^=\"index.php?page=userdetails&id=\"])):has(img[src=\"images/gold.gif\"]){{ else }}{{ end }}"
 
   fields:
     category:

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

@@ -36,9 +36,10 @@ caps:
     - {id: 191, cat: TV, desc: "TV/BluTv"}
     - {id: 192, cat: TV, desc: "TV/BluTv Series"}
     - {id: 193, cat: Movies, desc: "TV/BluTv Film"}
-    - {id: 199, cat: TV, desc: "TV/Netflix"}
+    - {id: 188, cat: TV, desc: "TV/Netflix"}
     - {id: 189, cat: TV, desc: "TV/Netflix Series"}
     - {id: 190, cat: Movies, desc: "TV/Netflix Film"}
+    - {id: 195, cat: TV, desc: "TV/Exxen"}
     - {id: 171, cat: Audio, desc: "Music"}
     - {id: 172, cat: Audio, desc: "Music/Turkish"}
     - {id: 173, cat: Audio, desc: "Music/Foreign"}

src/Jackett.Common/Definitions/torrent9clone.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www.torrent9.ninja/
+  - https://www.torrent9.pw/
   - https://torrent9.nocensor.space/
 
 legacylinks:
@@ -54,6 +54,7 @@ legacylinks:
   - https://www.torrent9.srl/
   - https://torrent9.unblocked.monster/
   - https://www.torrent9.la/
+  - https://www.torrent9.ninja/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentqq.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentqq88.com/
+  - https://torrentqq89.com/
 legacylinks:
   - https://torrentqq76.com/
   - https://torrentqq77.com/
@@ -21,6 +21,7 @@ legacylinks:
   - https://torrentqq85.com/
   - https://torrentqq86.com/
   - https://torrentqq87.com/
+  - https://torrentqq88.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/trackeros.yml

@@ -119,6 +119,36 @@ search:
           args: ["(?i)(m720p|mhd720p)", "720p MicroHD"]
         - name: re_replace
           args: ["(?i)brrip", "BDRip"]
+        - name: re_replace # Temporada 1 to S01
+          args: ["(?i)\\btemporada *(\\d{1,2})\\b", "S$1"]
+        - name: re_replace # T1 to S01
+          args: ["\\bT(\\d{1,2})\\b", "S$1"]
+        - name: re_replace # S1 to S01 / E1 to E01
+          args: ["\\b([SE])(\\d)\\b", "${1}0$2"]
+        - name: re_replace # S01 E01 to S01E01 / T01E01 to S01E01
+          args: ["\\b[ST](\\d{1,2}) *E(\\d{1,2})\\b", "S$1E$2"]
+        - name: re_replace # S1 a S2 to S1-2
+          args: ["(S\\d{1,2})( a S*| A S*| a la S*| A LA S*)(\\d{1,2})", "$1-$3"]
+        - name: re_replace # S01E01 E02 E03 to S01E01-02-03 (2 episodes)
+          args: ["([E-]\\d{1,2})( E| a E*| A E*| al E*| AL E*)(\\d{1,2})", "$1-$3"]
+        - name: re_replace # continuation (3 episodes)
+          args: ["([E-]\\d{1,2})( E| a E*| A E*| al E*| AL E*)(\\d{1,2})", "$1-$3"]
+        - name: re_replace # continuation (4 episodes)
+          args: ["([E-]\\d{1,2})( E| a E*| A E*| al E*| AL E*)(\\d{1,2})", "$1-$3"]
+        - name: re_replace # continuation (5 episodes)
+          args: ["([E-]\\d{1,2})( E| a E*| A E*| al E*| AL E*)(\\d{1,2})", "$1-$3"]
+        - name: re_replace # continuation (6 episodes)
+          args: ["([E-]\\d{1,2})( E| a E*| A E*| al E*| AL E*)(\\d{1,2})", "$1-$3"]
+        - name: re_replace # continuation (7 episodes)
+          args: ["([E-]\\d{1,2})( E| a E*| A E*| al E*| AL E*)(\\d{1,2})", "$1-$3"]
+        - name: re_replace # continuation (8 episodes)
+          args: ["([E-]\\d{1,2})( E| a E*| A E*| al E*| AL E*)(\\d{1,2})", "$1-$3"]
+        - name: re_replace # continuation (9 episodes)
+          args: ["([E-]\\d{1,2})( E| a E*| A E*| al E*| AL E*)(\\d{1,2})", "$1-$3"]
+        - name: re_replace # continuation (10 episodes)
+          args: ["([E-]\\d{1,2})( E| a E*| A E*| al E*| AL E*)(\\d{1,2})", "$1-$3"]
+        - name: re_replace # 2x6 to S02E06
+          args: ["\\b(\\d{1,2})x(\\d{1,2})\\b", "S$1E$2"]
         - name: append
           args: " MULTi/SPANiSH" # Add language for Sonarr/Radarr
     download:
@@ -127,6 +157,14 @@ search:
     details:
       selector: a.view-torrent
       attribute: href
+    poster:
+      selector: div.torrent-poster img
+      attribute: src
+      filters:
+        - name: replace
+          args: ["&w=52&h=80", "&w=180&h=270"] # for display on dashboard
+        - name: replace
+          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/52x80&w=180&h=270", ""]
     size:
       selector: td:nth-last-child(4)
     seeders:

src/Jackett.Common/Definitions/turktorrent.yml

@@ -14,7 +14,9 @@ legacylinks:
 caps:
   categorymappings:
     - {id: 36, cat: Movies, desc: "Film"}
-    - {id: 59, cat: Movies, desc: "Türk Filmi"}
+    - {id: 76, cat: Movies, desc: "Film Almanca [Tek Dil!]"}
+    - {id: 78, cat: Movies, desc: "Film İngilizce [NL Altyazı!]"}
+    - {id: 59, cat: Movies, desc: "Film Türk Filmi"}
     - {id: 61, cat: Movies/3D, desc: "Film 3D"}
     - {id: 18, cat: Movies, desc: "Anime - Çizgi"}
     - {id: 20, cat: Movies, desc: "Film Boxset"}
@@ -44,6 +46,14 @@ caps:
     - {id: 39, cat: TV, desc: "Netflix Film"}
     - {id: 38, cat: TV, desc: "Netflix Dizi"}
     - {id: 40, cat: TV, desc: "Netflix Belgesel"}
+    - {id: 83, cat: TV, desc: "Dijital Platform"}
+    - {id: 84, cat: TV, desc: "Dijital Platform BluTV"}
+    - {id: 85, cat: TV, desc: "Dijital Platform BEiN"}
+    - {id: 77, cat: TV, desc: "Dijital Platform EXXEN"}
+    - {id: 86, cat: TV, desc: "Dijital Platform AMAZON"}
+    - {id: 87, cat: TV, desc: "Dijital Platform GAIN"}
+    - {id: 88, cat: TV, desc: "Dijital Platform TV+"}
+    - {id: 89, cat: TV, desc: "Dijital Platform Diger"}
     - {id: 31, cat: TV, desc: "Dizi"}
     - {id: 32, cat: TV, desc: "Dizi Yerli"}
     - {id: 33, cat: TV, desc: "Dizi Yabancı Orjinal Dil / Tr Dublaj "}

src/Jackett.Common/Definitions/zetorrents.yml

@@ -6,7 +6,7 @@ language: fr-fr
 type: public
 encoding: UTF-8
 links:
-  - https://www.zetorrents.org/
+  - https://wvw.zetorrents.org/
 legacylinks:
   - https://www.zetorrents.co/
   - https://www.zetorrents.io/
@@ -14,6 +14,7 @@ legacylinks:
   - https://vww.zetorrents.io/
   - https://wwv.zetorrents.io/
   - https://ww1.zetorrents.io/
+  - https://www.zetorrents.org/
 
 caps:
   categories:

src/Jackett.Common/Indexers/IPTorrents.cs

@@ -145,6 +145,7 @@ namespace Jackett.Common.Indexers
             AddCategoryMapping(86, TorznabCatType.PC0day, "Appz/Non-English");
             AddCategoryMapping(64, TorznabCatType.AudioAudiobook, "AudioBook");
             AddCategoryMapping(35, TorznabCatType.Books, "Books");
+            AddCategoryMapping(102, TorznabCatType.Books, "Books/Non-English");
             AddCategoryMapping(94, TorznabCatType.BooksComics, "Books/Comics");
             AddCategoryMapping(95, TorznabCatType.BooksOther, "Books/Educational");
             AddCategoryMapping(98, TorznabCatType.Other, "Other/Fonts");

src/Jackett.Common/Indexers/NewPCT.cs

@@ -101,8 +101,7 @@ namespace Jackett.Common.Indexers
         public override string[] AlternativeSiteLinks { get; protected set; } = {
             "https://pctmix.com/",
             "https://pctmix1.com/",
-            "https://pctreload1.com/",
-            "https://maxitorrent.com"
+            "https://pctreload1.com/"
         };
 
         public override string[] LegacySiteLinks { get; protected set; } = {
@@ -116,7 +115,8 @@ namespace Jackett.Common.Indexers
             "http://pctnew.com/",
             "https://descargas2020.org/",
             "https://pctnew.org/",
-            "https://pctreload.com/"
+            "https://pctreload.com/",
+            "https://maxitorrent.com"
         };
 
         public NewPCT(IIndexerConfigurationService configService, WebClient wc, Logger l, IProtectionService ps,

src/Jackett.Common/Indexers/Partis.cs

@@ -1,250 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Threading.Tasks;
-using AngleSharp.Html.Parser;
-using Jackett.Common.Models;
-using Jackett.Common.Models.IndexerConfig;
-using Jackett.Common.Services.Interfaces;
-using Jackett.Common.Utils;
-using Jackett.Common.Utils.Clients;
-using Newtonsoft.Json.Linq;
-using NLog;
-
-namespace Jackett.Common.Indexers
-{
-    [ExcludeFromCodeCoverage]
-    public class Partis : BaseWebIndexer
-    {
-        private string LoginUrl => SiteLink + "user/login/";
-        private string SearchUrl => SiteLink + "torrent/show/";
-
-        private new ConfigurationDataBasicLogin configData
-        {
-            get => (ConfigurationDataBasicLogin)base.configData;
-            set => base.configData = value;
-        }
-
-        public Partis(IIndexerConfigurationService configService, WebClient wc, Logger l, IProtectionService ps,
-            ICacheService cs)
-            : base(id: "partis",
-                   name: "Partis",
-                   description: "Partis is a SLOVENIAN Private Torrent Tracker",
-                   link: "https://www.partis.si/",
-                   caps: new TorznabCapabilities
-                   {
-                       TvSearchParams = new List<TvSearchParam>
-                       {
-                           TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
-                       },
-                       MovieSearchParams = new List<MovieSearchParam>
-                       {
-                           MovieSearchParam.Q
-                       },
-                       MusicSearchParams = new List<MusicSearchParam>
-                       {
-                           MusicSearchParam.Q
-                       },
-                       BookSearchParams = new List<BookSearchParam>
-                       {
-                           BookSearchParam.Q
-                       }
-                   },
-                   configService: configService,
-                   client: wc,
-                   logger: l,
-                   p: ps,
-                   cacheService: cs,
-                   configData: new ConfigurationDataBasicLogin())
-        {
-            Encoding = Encoding.UTF8;
-            Language = "sl-sl";
-            Type = "private";
-
-            // Blu Ray
-            AddCategoryMapping(40, TorznabCatType.MoviesBluRay, "Blu-Ray 1080p/i");
-            AddCategoryMapping(42, TorznabCatType.MoviesBluRay, "Blu-Ray 720p/i");
-            AddCategoryMapping(43, TorznabCatType.MoviesBluRay, "Blu-Ray B-Disc");
-            AddCategoryMapping(41, TorznabCatType.MoviesBluRay, "Blu-Ray 3D");
-            AddCategoryMapping(44, TorznabCatType.MoviesBluRay, "Blu-Ray Remux");
-            AddCategoryMapping(45, TorznabCatType.MoviesBluRay, "Blu-Ray Remux/Disc");
-
-            // UHD
-            AddCategoryMapping(32, TorznabCatType.MoviesUHD, "UHD 4K Disc");
-            AddCategoryMapping(55, TorznabCatType.MoviesUHD, "UHD 4K Remux");
-
-            // HD
-            AddCategoryMapping(20, TorznabCatType.MoviesHD, "HD");
-            AddCategoryMapping(4, TorznabCatType.MoviesSD, "DVD-R");
-            AddCategoryMapping(7, TorznabCatType.MoviesSD, "XviD");
-            AddCategoryMapping(12, TorznabCatType.MoviesSD, "Anime");
-            AddCategoryMapping(30, TorznabCatType.MoviesSD, "Risanke");
-            AddCategoryMapping(15, TorznabCatType.MoviesSD, "Sport");
-
-            // TV Show
-            AddCategoryMapping(53, TorznabCatType.TVWEBDL, "TV WEB-DL");
-            AddCategoryMapping(60, TorznabCatType.TVSD, "TV-XviD");
-            AddCategoryMapping(38, TorznabCatType.TVSD, "SD-TV");
-            AddCategoryMapping(51, TorznabCatType.TVHD, "TV 1080p/i");
-            AddCategoryMapping(52, TorznabCatType.TVHD, "TV 720p/i");
-
-            AddCategoryMapping(54, TorznabCatType.MoviesSD, "WEBRip");
-            AddCategoryMapping(59, TorznabCatType.MoviesWEBDL, "WEB-DL");
-            AddCategoryMapping(24, TorznabCatType.TVDocumentary, "Dokumentarci");
-
-            // Games
-            AddCategoryMapping(10, TorznabCatType.PCGames, "PC igre/ISO");
-            AddCategoryMapping(11, TorznabCatType.PCGames, "PC igre/Rips/Repack");
-            AddCategoryMapping(64, TorznabCatType.PCGames, "PC igre/Update & Patch");
-
-            // Music
-            AddCategoryMapping(46, TorznabCatType.AudioLossless, "Glasba/Flac");
-            AddCategoryMapping(8, TorznabCatType.AudioOther, "Glasba/Ostalo");
-            AddCategoryMapping(47, TorznabCatType.AudioMP3, "Glasba/Mp3");
-            AddCategoryMapping(8, TorznabCatType.AudioVideo, "Music DVD");
-            AddCategoryMapping(8, TorznabCatType.AudioVideo, "Videospoti");
-            AddCategoryMapping(21, TorznabCatType.AudioAudiobook, "AudioBook");
-            AddCategoryMapping(3, TorznabCatType.BooksEBook, "eKnjige");
-        }
-
-        public override async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
-        {
-            LoadValuesFromJson(configJson);
-
-            var pairs = new Dictionary<string, string>
-            {
-                { "user[username]", configData.Username.Value },
-                { "user[password]", configData.Password.Value }
-            };
-
-            var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, string.Empty, false, null, null, true);
-            await ConfigureIfOK(result.Cookies, result.ContentString != null && result.ContentString.Contains("/odjava"), () =>
-            {
-                var parser = new HtmlParser();
-                var dom = parser.ParseDocument(result.ContentString);
-                var errorMessage = dom.QuerySelector("div.obvet > span.najvecji").TextContent.Trim(); // Prijava ni uspela! obvestilo
-                throw new ExceptionWithConfigData(errorMessage, configData);
-            });
-            return IndexerConfigurationStatus.RequiresTesting;
-        }
-
-        protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
-        {
-            var releases = new List<ReleaseInfo>();     //List of releases initialization
-            var searchString = query.GetQueryString();  //get search string from query
-
-            WebResult results = null;
-            var queryCollection = new NameValueCollection();
-            var catList = MapTorznabCapsToTrackers(query);     // map categories from query to indexer specific
-            var categ = string.Join(",", catList);
-
-            //create GET request - search URI
-            queryCollection.Add("offset", "0");
-            queryCollection.Add("keyword", searchString);
-            queryCollection.Add("category", categ.TrimStart(','));
-            queryCollection.Add("option", "");
-            queryCollection.Add("ns", "true");
-
-            //concatenate base search url with query
-            var searchUrl = SearchUrl + "?" + queryCollection.GetQueryString();
-
-            // log search URL
-            logger.Info(string.Format("Searh URL Partis_: {0}", searchUrl));
-
-            // add necessary headers
-            var header = new Dictionary<string, string>
-            {
-                { "X-requested-with", "XMLHttpRequest" }
-            };
-
-            //get results and follow redirect
-            results = await RequestWithCookiesAsync(searchUrl, referer: SearchUrl, headers: header);
-            await FollowIfRedirect(results, null, null, null, true);
-
-            // are we logged in?
-            if (!results.ContentString.Contains("/odjava"))
-            {
-                await ApplyConfiguration(null);
-            }
-            // another request with specific query - NEEDED for succesful response - return data
-            results = await RequestWithCookiesAsync(
-                SiteLink + "brskaj/?rs=false&offset=0", referer: SearchUrl, headers: header);
-            await FollowIfRedirect(results, null, null, null, true);
-
-            // parse results
-            try
-            {
-                var RowsSelector = "div.list > div[name=\"torrrow\"]";
-
-                var ResultParser = new HtmlParser();
-                var SearchResultDocument = ResultParser.ParseDocument(results.ContentString);
-                var Rows = SearchResultDocument.QuerySelectorAll(RowsSelector);
-                foreach (var Row in Rows)
-                {
-                    try
-                    {
-                        // initialize REleaseInfo
-                        var release = new ReleaseInfo
-                        {
-                            MinimumRatio = 1,
-                            MinimumSeedTime = 0
-                        };
-
-                        // Get Category
-                        var catega = Row.QuerySelector("div.likona div").GetAttribute("alt");
-                        release.Category = MapTrackerCatDescToNewznab(catega);
-
-                        var qDetailsLink = Row.QuerySelector("div.listeklink a");
-
-                        // Title and torrent link
-                        release.Title = qDetailsLink.TextContent;
-                        release.Details = new Uri(SiteLink + qDetailsLink.GetAttribute("href").TrimStart('/'));
-                        release.Guid = release.Details;
-
-                        // Date of torrent creation
-                        var liopis = Row.QuerySelector("div.listeklink div span.middle");
-                        var ind = liopis.TextContent.IndexOf("Naloženo:");
-                        var reldate = liopis.TextContent.Substring(ind + 10, 22);
-                        release.PublishDate = DateTime.ParseExact(reldate, "dd.MM.yyyy ob HH:mm:ss", CultureInfo.InvariantCulture);
-
-                        // Is freeleech?
-                        var checkIfFree = (Row.QuerySelector("div.listeklink div.liopisl img[title=\"freeleech\"]") != null) ? true : false;
-
-                        // Download link
-                        var qDownloadLink = Row.QuerySelector("div.data3t a").GetAttribute("href");
-                        release.Link = new Uri(SiteLink + qDownloadLink.TrimStart('/'));
-
-                        // Various data - size, seeders, leechers, download count
-                        var sel = Row.QuerySelectorAll("div.datat");
-                        var size = sel[0].TextContent;
-                        release.Size = ReleaseInfo.GetBytes(size);
-
-                        release.Seeders = ParseUtil.CoerceInt(sel[1].TextContent);
-                        release.Peers = ParseUtil.CoerceInt(sel[2].TextContent) + release.Seeders;
-                        release.Grabs = ParseUtil.CoerceLong(sel[3].TextContent);
-
-                        // Set download/upload factor
-                        release.DownloadVolumeFactor = checkIfFree ? 0 : 1;
-                        release.UploadVolumeFactor = 1;
-
-                        // Add current release to List
-                        releases.Add(release);
-                    }
-                    catch (Exception ex)
-                    {
-                        logger.Error(string.Format("{0}: Error while parsing row '{1}':\n\n{2}", Id, Row.OuterHtml, ex));
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                OnParseError(results.ContentString, ex);
-            }
-
-            return releases;
-        }
-    }
-}

src/Jackett.Common/Indexers/RarBG.cs

@@ -81,7 +81,7 @@ namespace Jackett.Common.Indexers
             { Value = "last" };
             configData.AddDynamic("sort", sort);
 
-            AddCategoryMapping(4, TorznabCatType.XXX, "XXX (18+)");
+            //AddCategoryMapping(4, TorznabCatType.XXX, "XXX (18+)"); // 3x is not supported by API #11848
             AddCategoryMapping(14, TorznabCatType.MoviesSD, "Movies/XVID");
             AddCategoryMapping(17, TorznabCatType.MoviesSD, "Movies/x264");
             AddCategoryMapping(18, TorznabCatType.TVSD, "TV Episodes");

src/Jackett.Common/Indexers/Xthor.cs

@@ -309,9 +309,6 @@ namespace Jackett.Common.Indexers
         {
             var releases = new List<ReleaseInfo>();
             var searchTerm = query.SanitizedSearchTerm + " " + query.GetEpisodeSearchString();
-            searchTerm = searchTerm.Trim();
-            searchTerm = searchTerm.ToLower();
-            searchTerm = searchTerm.Replace(" ", ".");
 
             if (EnhancedAnimeSearch && query.HasSpecifiedCategories && (query.Categories.Contains(TorznabCatType.TVAnime.ID) || query.Categories.Contains(100032) || query.Categories.Contains(100101) || query.Categories.Contains(100110)))
             {
@@ -319,6 +316,10 @@ namespace Jackett.Common.Indexers
                 searchTerm = regex.Replace(searchTerm, " E$1");
             }
 
+            searchTerm = searchTerm.Trim();
+            searchTerm = searchTerm.ToLower();
+            searchTerm = searchTerm.Replace(" ", ".");
+
             // Multiple page support
             var nextPage = 1;
             var followingPages = true;

src/Jackett.Common/Services/IndexerManagerService.cs

@@ -40,7 +40,6 @@ namespace Jackett.Common.Services
         // use: {"<old id>", "<new id>"}
         private readonly Dictionary<string, string> renamedIndexers = new Dictionary<string, string>
         {
-            {"ast4u", "animeworld"},
             {"audiobooktorrents", "abtorrents"},
             {"broadcastthenet", "broadcasthenet"},
             {"cili180", "cilipro"},