cardigannIndexer: add variables support to keywordsfilters block. resolves #13297

also update any indexer that has tmdbid on their moviesearch and add it to the tvsearch too.

README.md

@@ -45,6 +45,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BT.etree
  * BT4G
  * BTDIGG
+ * BTMET
  * BTmirror
  * BTSOW
  * Byrutor
@@ -263,6 +264,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Anthelion
  * Araba Fenice (Phoenix) [![(invite needed)][inviteneeded]](#)
  * ArabP2P
+ * aro.lol
  * AsianCinema
  * Audiences
  * AudioNews (AN)
@@ -466,6 +468,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Peers.FM
  * Pirata Digital
  * PirateTheNet (PTN)
+ * Pixelados
  * PixelCove (Ultimate Gamer)
  * PiXELHD (PxHD) [![(invite needed)][inviteneeded]](#)
  * PolishSource (PS)
@@ -531,7 +534,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TeamHD
  * TeamOS
  * TEKNO3D [![(invite needed)][inviteneeded]](#)
- * TellyTorrent
  * teracod (Movie Zone)
  * The Falling Angels (TFA) [![(invite needed)][inviteneeded]](#)
  * The Geeks

src/Jackett.Common/Content/custom.js

@@ -927,7 +927,7 @@ function doErrorNotify(indexerId, errorMessage, errorEvent) {
     var link = "<i><a href=\"" + githubUrl + " " + urlEscapedError + "\" target=\"_blank\">Click here to open an issue on GitHub for " + githubText + ".</a><i>";
     if (errorMessage.includes("FlareSolverr is not configured")) {
       link = "<i><a href=\"https://github.com/Jackett/Jackett#configuring-flaresolverr\" target=\"_blank\">Instructions to install and configure FlareSolverr.</a><i><br />" +
-        "<i><a href=\"https://github.com/Jackett/Jackett/wiki/Troubleshooting#error-connecting-to-flaresolverr-server\" target=\"_blank\">Troubleshooting frecuent errors with FlareSolverr.</a><i>";
+        "<i><a href=\"https://github.com/Jackett/Jackett/wiki/Troubleshooting#error-connecting-to-flaresolverr-server\" target=\"_blank\">Troubleshooting frequent errors with FlareSolverr.</a><i>";
     }
     doNotify("An error occurred while " + errorEvent + " this indexer<br /><b>" + htmlEscapedError + "</b><br />" + link,
       "danger", "glyphicon glyphicon-alert", false);

src/Jackett.Common/Content/index.html

@@ -754,6 +754,6 @@
     </script>
 
     <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=20220512"></script>
+    <script type="text/javascript" src="../custom.js?changed=20220606"></script>
 </body>
 </html>

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

@@ -12,8 +12,9 @@ links:
   - https://x1337x.ws/
   - https://x1337x.eu/
   - https://x1337x.se/
-  - https://1337x.unblockit.blue/
+  - https://1337x.unblockit.name/
   - https://1337x.nocensor.sbs/
+  - https://1337x.unblockninja.com/
 legacylinks:
   - https://1337x.unblockit.buzz/
   - https://1337x.unblocked.monster/
@@ -35,6 +36,7 @@ legacylinks:
   - https://1337x.gd/
   - https://1337x.unblockit.day/
   - https://1337x.unblockit.llc/
+  - https://1337x.unblockit.blue/
 
 caps:
   categorymappings:

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

@@ -23,7 +23,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
     music-search: [q]
     book-search: [q]
@@ -104,6 +104,8 @@ search:
       selector: details_link
     download:
       selector: download_link
+    infohash:
+      selector: info_hash
     poster:
       selector: poster
       filters:
@@ -150,4 +152,4 @@ search:
     minimumseedtime:
       # 5 days (as seconds = 3 x 24 x 60 x 60)
       text: 432000
-# json UNIT3D 6.1.0
+# json UNIT3D 6.2.0

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

@@ -28,7 +28,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
     music-search: [q]
     book-search: [q]
@@ -84,7 +84,7 @@ search:
   # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
     api_token: "{{ .Config.apikey }}"
     name: "{{ .Keywords }}"
-    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[*]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100

src/Jackett.Common/Definitions/asiancinema.yml

@@ -16,7 +16,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
     music-search: [q]
 

src/Jackett.Common/Definitions/audiobookbay.yml

@@ -9,7 +9,7 @@ links:
   - http://audiobookbay.fi/ # site forces http, does not support https
   - http://audiobookbay.se/
   - http://audiobookbayabb.com/
-  - https://audiobookbay.unblockit.blue/
+  - https://audiobookbay.unblockit.name/
 legacylinks:
   - https://audiobookbay.la/
   - https://audiobookbay.unblockit.buzz/
@@ -30,6 +30,7 @@ legacylinks:
   - https://audiobookbay.unblockit.biz/
   - https://audiobookbay.unblockit.day/
   - https://audiobookbay.unblockit.llc/
+  - https://audiobookbay.unblockit.blue/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/beyond-hd.yml

@@ -15,7 +15,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid]
+    tv-search: [q, season, ep, imdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
 
 settings:

src/Jackett.Common/Definitions/bitturk.yml

@@ -23,6 +23,7 @@ caps:
     - {id: 71, cat: Movies, desc: "NFLIX"}
     - {id: 78, cat: TV, desc: "EXXEN"}
     - {id: 79, cat: TV, desc: "BLUTV"}
+    - {id: 90, cat: TV, desc: "Disney+"}
     - {id: 58, cat: Movies, desc: "Film"}
     - {id: 72, cat: Movies, desc: "Belgesel"}
     - {id: 60, cat: Movies/3D, desc: "3D"}

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

@@ -17,7 +17,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
 
 settings:
@@ -96,6 +96,8 @@ search:
       selector: details_link
     download:
       selector: download_link
+    infohash:
+      selector: info_hash
     poster:
       selector: poster
       filters:
@@ -142,4 +144,4 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 6.0.9 beta
+# json UNIT3D 6.1.1 beta

src/Jackett.Common/Definitions/boxingtorrents.yml

@@ -5,6 +5,8 @@ description: "Boxing Torrents is a Private Torrent Tracker for BOXING"
 language: en-US
 type: private
 encoding: UTF-8
+certificates:
+  - dda4bd19660006cba06561d2b8f61b5e64995679 # expired ‎9 ‎June ‎2022
 links:
   - https://tc-boxing.com/
 

src/Jackett.Common/Definitions/btmet.yml

@@ -0,0 +1,105 @@
+---
+id: btmet
+name: BTMET
+description: "BTMET is a Public magnet indexer"
+language: en-US
+type: public
+encoding: UTF-8
+links:
+  - https://btmet.com/
+
+caps:
+  categories:
+    Audio: Audio
+    Compressed: Other
+    Document: Books
+    Image: Other
+    Installation: PC
+    Other: Other
+    TV: TV # dummy cat to allow both Movies,TV to be categorised when Video is found.
+    Video: Movies
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+
+settings:
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 0
+    options:
+      0: relevance
+      1: created
+      2: size
+
+search:
+  paths:
+    # https://btmet.com/search.php?q=2022&c=&l=&o=1
+    - path: search.php
+  inputs:
+    q: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+    # does not support multi cats so defaulting to all
+    c: ""
+    # 1 Chinese, 2 Japanese, 3 Korean
+    l: ""
+    o: "{{ if .Keywords }}{{ .Config.sort }}{{ else }}1{{ end }}"
+
+  rows:
+    selector: div.search-item:has(a[href^="magnet"])
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      selector: div.item-bar > span[class="cpill blue-pill"]
+    category|append:
+      # add tv to video
+      optional: true
+      selector: div.item-bar > span[class="cpill blue-pill"]
+      filters:
+        - name: replace
+          args: ["Video", "TV"]
+    title:
+      selector: a.smashTitle > script
+      filters:
+        - name: urldecode
+        - name: replace
+          args: ['document.write(decodeURIComponent("', ""]
+        - name: replace
+          args: ['"));', ""]
+        - name: replace
+          args: ["<b style='color:#ea644a'>", ""]
+        - name: replace
+          args: ["</b>", ""]
+    details:
+      selector: a.smashTitle
+      attribute: href
+    infohash:
+      selector: a[href^="magnet:?xt="]
+      attribute: href
+      filters:
+        - name: regexp
+          args: ([a-f|0-9]{40})
+    date:
+      # unix
+      selector: div.item-bar > span:nth-child(2) > b
+      attribute: t
+      filters:
+        - name: regexp
+          args: (\d{10})
+    size:
+      selector: div.item-bar > span:nth-child(3) > b
+    files:
+      selector: div.item-bar > span:nth-child(4) > b
+    seeders:
+      selector: div.item-bar > span:nth-child(5) > b
+    leechers:
+      text: 1
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/btmirror.yml

@@ -7,6 +7,8 @@ type: public
 encoding: UTF-8
 links:
   - https://btsao.com/
+  - https://btmirror.unblockit.name/
+legacylinks:
   - https://btmirror.unblockit.blue/
 
 caps:

src/Jackett.Common/Definitions/chilebt.yml

@@ -24,7 +24,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
     music-search: [q]
     book-search: [q]

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

@@ -24,7 +24,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
     music-search: [q]
     book-search: [q]
@@ -97,6 +97,8 @@ search:
       text: "{{ .Config.sitelink }}torrents/{{ .Result.id }}"
     download:
       text: "{{ .Config.sitelink }}torrent/download/{{ .Result.id }}.{{ .Config.rsskey }}"
+    infohash:
+      selector: info_hash
     poster:
       selector: poster_image
     imdbid:

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

@@ -24,7 +24,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
     music-search: [q]
     book-search: [q]

src/Jackett.Common/Definitions/demonoid.yml

@@ -11,7 +11,7 @@ links:
   - https://www.dnoid.to/
   - https://www.dnoid.pw/
   - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.ly/
-  - https://demonoid.unblockit.blue/
+  - https://demonoid.unblockit.name/
   - https://demonoid.torrentbay.to/
   - https://demonoid.nocensor.sbs/
 legacylinks:
@@ -32,6 +32,7 @@ legacylinks:
   - https://demonoid.nocensor.biz/
   - https://demonoid.unblockit.day/
   - https://demonoid.unblockit.llc/
+  - https://demonoid.unblockit.blue/
 
 caps:
   categorymappings:

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

@@ -17,7 +17,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
     music-search: [q]
 

src/Jackett.Common/Definitions/dreamtracker.yml

@@ -87,6 +87,7 @@ caps:
     - {id: 77, cat: Audio/Foreign, desc: "Music Foreign"}
     - {id: 78, cat: Audio/Foreign, desc: "Music Foreign Discographies"}
     - {id: 94, cat: Audio/Lossless, desc: "Foreign Flac"}
+    - {id: 117, cat: Audio, desc: "Compact Disc Club"}
     - {id: 20, cat: Audio/Video, desc: "Music Videos"}
 
   modes:

src/Jackett.Common/Definitions/esharenet.yml

@@ -42,7 +42,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
     music-search: [q]
 

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

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 links:
   - https://extratorrent.st/
-  - https://extratorrent.unblockit.blue/
+  - https://extratorrent.unblockit.name/
   - https://extratorrent.nocensor.sbs/
 legacylinks:
   - https://extratorrent.nocensor.work/
@@ -19,6 +19,7 @@ legacylinks:
   - https://extratorrent.nocensor.biz/
   - https://extratorrent.unblockit.day/
   - https://extratorrent.unblockit.llc/
+  - https://extratorrent.unblockit.blue/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/eztv.yml

@@ -13,7 +13,7 @@ links:
   - https://eztv.yt/
   - https://eztv1.xyz/
   - https://eztv.unblockninja.com/
-  - https://eztv.unblockit.blue/
+  - https://eztv.unblockit.name/
   - https://eztv.nocensor.sbs/
 legacylinks:
   - https://eztv.ag/ # redirects to .re
@@ -38,6 +38,7 @@ legacylinks:
   - https://eztv.nocensor.biz/
   - https://eztv.unblockit.day/
   - https://eztv.unblockit.llc/
+  - https://eztv.unblockit.blue/
 
 caps:
   categories:

src/Jackett.Common/Definitions/fouducinema.yml

@@ -33,6 +33,8 @@ caps:
     - {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: 62, cat: Movies/WEB-DL, desc: "FILM WEB"}
+    - {id: 34, cat: Movies/SD, desc: "FILM TVRip"}
     - {id: 33, cat: Movies/HD, desc: "FILM HDTV"}
     - {id: 31, cat: Movies/Other, desc: "FILM MUET"}
     - {id: 30, cat: Movies/Other, desc: "FILM VOST"}
@@ -43,7 +45,7 @@ caps:
     - {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: 63, cat: Movies/WEB-DL, desc: "FILM WEB"}
     - {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"}

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

@@ -21,7 +21,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
     music-search: [q]
     book-search: [q]
@@ -141,6 +141,8 @@ search:
     magnet:
       selector: magnet_link
       optional: true
+    infohash:
+      selector: info_hash
     poster:
       selector: poster
       filters:
@@ -184,4 +186,4 @@ search:
     minimumseedtime:
       # 2 days (as seconds = 2 x 24 x 60 x 60)
       text: 172800
-# json UNIT3D 6.1.0
+# json UNIT3D 6.2.0

src/Jackett.Common/Definitions/gktorrent.yml

@@ -6,8 +6,9 @@ language: fr-FR
 type: public
 encoding: UTF-8
 followredirect: true
+# to fetch current domain use https://www.protege-liens.com/gktorrent
 links:
-  - https://www.gktorrents.org/
+  - https://www.gktorrents.cc/
   - https://gktorrent.nocensor.sbs/
 legacylinks:
   - http://www.gktorrent.co/
@@ -30,6 +31,7 @@ legacylinks:
   - https://gktorrent.nocensor.work/
   - https://www.gktorrents.net/
   - https://gktorrent.nocensor.biz/
+  - https://www.gktorrents.org/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/glodls.yml

@@ -10,8 +10,9 @@ links:
   - https://glodls.to/
   - https://gtdb.cc/
   - https://www.gtdb.to/
-  - https://glotorrents.unblockit.blue/
+  - https://glotorrents.unblockit.name/
   - https://glotorrents.nocensor.sbs/
+  - https://glodls.unblockninja.com/
 legacylinks:
   - https://glodls.rocks/
   - https://gtdb.to/
@@ -33,6 +34,7 @@ legacylinks:
   - https://glotorrents.nocensor.biz/
   - https://glotorrents.unblockit.day/
   - https://glotorrents.unblockit.llc/
+  - https://glotorrents.unblockit.blue/
 
 caps:
   categorymappings:

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

@@ -15,7 +15,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
 
 settings:

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

@@ -19,7 +19,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
     music-search: [q]
     book-search: [q]

src/Jackett.Common/Definitions/immortuos.yml

@@ -24,7 +24,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
     music-search: [q]
 

src/Jackett.Common/Definitions/jme-reunit3d-api.yml

@@ -24,7 +24,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
     music-search: [q]
     book-search: [q]

src/Jackett.Common/Definitions/jptv.yml

@@ -20,7 +20,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
     music-search: [q]
     book-search: [q]

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

@@ -31,7 +31,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
     music-search: [q]
     book-search: [q]
@@ -138,6 +138,8 @@ search:
       selector: details_link
     download:
       selector: download_link
+    infohash:
+      selector: info_hash
     poster:
       selector: poster
       filters:

src/Jackett.Common/Definitions/limetorrents.yml

@@ -9,7 +9,7 @@ followredirect: true
 # changes to this indexer should also be made to limetorrentsclone
 links:
   - https://www.limetorrents.lol/
-  - https://limetorrents.unblockit.blue/
+  - https://limetorrents.unblockit.name/
   - https://limetorrents.unblockninja.com/
   - https://limetorrents.nocensor.sbs/
 legacylinks:
@@ -36,6 +36,7 @@ legacylinks:
   - https://limetorrents.unblockit.day/
   - https://www.limetorrents.pro/
   - https://limetorrents.unblockit.llc/
+  - https://limetorrents.unblockit.blue/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/marinetracker.yml

@@ -167,12 +167,24 @@ caps:
     - {id: 247, cat: Books, desc: "Rarity-1600 - 1700"}
     - {id: 324, cat: Other, desc: "Posters, placards, signs"}
     - {id: 187, cat: Books, desc: "Others (not maritime)"}
+    - {id: 38, cat: Books, desc: "Archive-Uncategorized"}
     - {id: 162, cat: Books, desc: "Archive"}
 #    - {id: 325, cat: Other, desc: "Corrupt torrents (hash errors)"} # we filter these out in the rows selector
     - {id: 322, cat: Books, desc: "Archive-No seeds"}
     - {id: 321, cat: Books, desc: "Archive-Outdated software"}
-    - {id: 38, cat: Books, desc: "Archive-Uncategorized"}
     - {id: 295, cat: Books, desc: "Archive-Unregistered"}
+    - {id: 330, cat: Books, desc: "Examinations"}
+    - {id: 343, cat: Books, desc: "Examinations-ROR - Colregs"}
+    - {id: 335, cat: Books, desc: "Examinations-Second Mates"}
+    - {id: 341, cat: Books, desc: "Examinations-Chief Mates (Phase I)"}
+    - {id: 342, cat: Books, desc: "Examinations-Chief Mates (Phase II)"}
+    - {id: 333, cat: Books, desc: "Examinations-IMU CET"}
+    - {id: 334, cat: Books, desc: "Examinations-NCV"}
+    - {id: 336, cat: Books, desc: "Examinations-ASM"}
+    - {id: 337, cat: Books, desc: "Examinations-TME"}
+    - {id: 338, cat: Books, desc: "Examinations-MEO"}
+    - {id: 340, cat: Books, desc: "Examinations-Text books"}
+    - {id: 339, cat: Books, desc: "Examinations-Miscellaneous"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/oxtorrent.yml

@@ -6,9 +6,11 @@ language: fr-FR
 type: public
 encoding: UTF-8
 followredirect: true
+# to fetch current domain use https://www.protege-liens.com/t911 and https://www.protege-liens.com/torrent911
 links:
   - https://www.torrent911.org/
   - https://www.t911.me/
+  - https://oxtorrent.unblockninja.com/
 legacylinks:
   - https://www.oxtorrent.bz/
   - https://www.oxtorrent.ws/

src/Jackett.Common/Definitions/piratadigital.yml

@@ -20,7 +20,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid]
+    tv-search: [q, season, ep, imdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
 
 settings:

src/Jackett.Common/Definitions/piratbit.yml

@@ -752,7 +752,7 @@ search:
       selector: td > u
     date:
       # unix
-      selector: td[title="Добавлен"] > u
+      selector: td[title="Добавлен"] > u, td[title="Added"] > u
     # Russian and Ukranian and English languages are supported
     grabs:
       selector: td[title^="Ответов"], td[title^="Відповідей"], td[title^="Replies"]

src/Jackett.Common/Definitions/piratbitl.yml

@@ -711,7 +711,7 @@ search:
     submit: "Поиск"
 
   rows:
-    selector: tr[id^="tor_"]:not(:has(span[title="закрыто"]))
+    selector: tr[id^="tor_"]:not(:has(span[title="закрыто"])):not(:has(span[title="авторское право"]))
     filters:
       - name: andmatch
 
@@ -769,7 +769,7 @@ search:
       # 2 date flavours for 3 languages
     date:
       # unix
-      selector: td[title="Добавлен"] > u
+      selector: td[title="Добавлен"] > u, td[title="Added"] > u
     # Russian and Ukranian and English languages are supported
     grabs:
       selector: td[title^="Ответов"], td[title^="Відповідей"], td[title^="Replies"]

src/Jackett.Common/Definitions/pixelados.yml

@@ -1,31 +1,25 @@
 ---
-id: tellytorrent-api
-name: TellyTorrent (API)
-description: "TellyTorrent is an INDIAN Private Tracker for MOVIES / TV"
-language: en-US
+id: pixelados
+name: Pixelados
+description: "Pixelados is a Spanish Private Torrent Tracker for HD MOVIES / TV"
+language: es-ES
 type: private
 encoding: UTF-8
 links:
-  - https://telly.wtf/
-legacylinks:
-  - https://tellytorrent.net/
-  - https://telly.cc/
-  - https://telly.to/
+  - https://pixelados.tv/
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies, desc: "Movie"}
-    - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: Audio, desc: "Music"}
-    - {id: 4, cat: Movies/WEB-DL, desc: "Web Originals"}
-    - {id: 5, cat: PC/Games, desc: "Games"}
-    - {id: 6, cat: PC/0day, desc: "Application"}
-    - {id: 7, cat: PC/Mobile-Other, desc: "Mobile App"}
-    - {id: 8, cat: Movies, desc: "Movies"}
+    - {id: 1, cat: Movies, desc: "Películas"}
+    - {id: 2, cat: TV, desc: "Series"}
+    - {id: 3, cat: Audio, desc: "Música"}
+    - {id: 4, cat: TV/Documentary, desc: "Documentales"}
+    - {id: 5, cat: TV/Sport, desc: "Deportes"}
+    - {id: 6, cat: TV/Anime, desc: "Animación"}
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
     music-search: [q]
 
@@ -36,7 +30,7 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://telly.wtf/\" target =_blank>TellyTorrent</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://pixelados.tv/\" target =_blank>Pixelados</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -89,6 +83,10 @@ search:
   keywordsfilters:
     - name: re_replace
       args: ["\\.", " "]
+    - name: re_replace
+      args: ["(?i)\\bS0*(\\d+)\\b", "T$1"]
+    - name: re_replace
+      args: ["(?i)S0?(\\d{1,2})E(\\d{1,2})", "$1x$2"]
 
   rows:
     selector: data
@@ -101,10 +99,17 @@ search:
       selector: category_id
     title:
       selector: name
+      filters:
+        - name: re_replace
+          args: ["(?i)T(\\d{1,2})\\b", "S$1"]
+        - name: re_replace
+          args: ["(\\d{1,2})[×|x](\\d{1,2})", "S$1E$2"]
     details:
       selector: details_link
     download:
       selector: download_link
+    infohash:
+      selector: info_hash
     poster:
       selector: poster
       filters:
@@ -151,4 +156,4 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 6.1.0
+# json UNIT3D 6.1.0 custom

src/Jackett.Common/Definitions/portugas.yml

@@ -22,7 +22,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
     music-search: [q]
     book-search: [q]

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

@@ -6,7 +6,9 @@ language: ru-RU
 type: public
 encoding: UTF-8
 links:
-  - http://ps4-torrent.ru/ # site forces http
+  - https://ps4-torrent.ru/
+legacylinks:
+  - http://ps4-torrent.ru/ # site forces https
 
 caps:
   categories:

src/Jackett.Common/Definitions/purovicio.yml

@@ -25,7 +25,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
     music-search: [q]
 

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

@@ -49,7 +49,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
 
 settings:
   - name: apikey

src/Jackett.Common/Definitions/racingforme.yml

@@ -5,6 +5,8 @@ description: "Racing For Me (RFM) is a Private Torrent Tracker for RACING"
 language: en-US
 type: private
 encoding: UTF-8
+certificates:
+  - adc1eab7ff8fe606c24cdf2d9c7c86788b0cd80a # expired ‎7 ‎June ‎2022
 links:
   - https://www.racingfor.me/
 

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

@@ -19,7 +19,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
 
 settings:
@@ -126,6 +126,8 @@ search:
       selector: details_link
     download:
       selector: download_link
+    infohash:
+      selector: info_hash
     poster:
       selector: poster
       filters:

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

@@ -16,7 +16,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
     music-search: [q]
     book-search: [q]
@@ -97,6 +97,8 @@ search:
       selector: details_link
     download:
       selector: download_link
+    infohash:
+      selector: info_hash
     poster:
       selector: poster
       filters:

src/Jackett.Common/Definitions/rutracker-ru.yml

@@ -155,23 +155,18 @@ caps:
     # Музыка Music
     - {id: 1635, cat: Audio/MP3, desc: "Зарубежная музыка (Disco, Italo-Disco, Eurodance,.."}
     - {id: 1636, cat: Audio/MP3, desc: " |- Сборники поп музыки (50/50 общие mp3)"}
-    - {id: 1647, cat: Audio/Lossless, desc: " |- Зарубежная поп музыка (Lossless)"}
     - {id: 1643, cat: Audio/MP3, desc: " |- Зарубежная поп музыка (альбомы, синглы mp3)"}
     - {id: 1637, cat: Audio/MP3, desc: " |- Зарубежная поп-музыка (сборники mp3)"}
-    - {id: 1655, cat: Audio/Lossless, desc: " |- Eurodance, Disco, Hi-NRG, Technopop (Lossless)"}
     - {id: 1654, cat: Audio/MP3, desc: " |- Eurodance, Disco, Hi-NRG, Technopop (mp3)"}
     - {id: 1638, cat: Audio/MP3, desc: " |- Eurodance, Disco, Hi-NRG, Technopop (Сборники mp3)"}
     - {id: 1639, cat: Audio/MP3, desc: " |- Club, Dance, Hands Up (Сборники mp3)"}
     - {id: 1640, cat: Audio/Lossless, desc: " |- Зарубежный шансон (mp3, Lossless)"}
     - {id: 1177, cat: Audio/MP3, desc: "Отечественная поп музыка, шансон и авторская песня"}
     - {id: 1642, cat: Audio/MP3, desc: " |- Российская попса (альбомы, синглы mp3)"}
-    - {id: 1644, cat: Audio/Lossless, desc: " |- Отечественная поп музыка (Lossless)"}
     - {id: 1427, cat: Audio/MP3, desc: " |- Сборники Российской поп музыки"}
-    - {id: 1646, cat: Audio/Lossless, desc: " |- Шансон, авторская песня (Lossless)"}
     - {id: 1641, cat: Audio/MP3, desc: " |- Шансон и авторская песня (mp3)"}
     - {id: 1561, cat: Audio/MP3, desc: " |- Сборники Русского шансона"}
     - {id: 1168, cat: Audio/MP3, desc: "Зарубежный ROCK"}
-    - {id: 1652, cat: Audio/Lossless, desc: " |- Зарубежная рок музыка (Lossless)"}
     - {id: 1200, cat: Audio/MP3, desc: " |- Classic Rock&Hard Rock"}
     - {id: 1552, cat: Audio/MP3, desc: " |- Progressive&Art-Rock"}
     - {id: 1565, cat: Audio/MP3, desc: " |- Folk-Rock, Folk-Punk, Songwriter"}
@@ -181,7 +176,6 @@ caps:
     - {id: 1566, cat: Audio/MP3, desc: " |- Rockabilly, Rock'n'Roll"}
     - {id: 1556, cat: Audio/MP3, desc: " |- Сборники зарубежного рока"}
     - {id: 1579, cat: Audio/MP3, desc: "Зарубежный Metal"}
-    - {id: 1653, cat: Audio/Lossless, desc: " |- Зарубежный Metal (Lossless)"}
     - {id: 1588, cat: Audio/MP3, desc: " |- Avant-garde, Experimental Metal"}
     - {id: 1580, cat: Audio/MP3, desc: " |- Black Metal"}
     - {id: 1581, cat: Audio/MP3, desc: " |- Death, Doom"}
@@ -202,18 +196,13 @@ caps:
     - {id: 1596, cat: Audio/MP3, desc: " |- Gothic Rock&Dark Folk"}
     - {id: 1597, cat: Audio/MP3, desc: " |- Avant-garde, Experimental Rock"}
     - {id: 1598, cat: Audio/MP3, desc: "Отечественный Rock, Metal"}
-    - {id: 1645, cat: Audio/Lossless, desc: " |- Отечественный Rock, Metal (Lossless)"}
     - {id: 1599, cat: Audio/MP3, desc: " |- Отечественный Rock (mp3)"}
     - {id: 1600, cat: Audio/MP3, desc: " |- Отечественный Metal (mp3)"}
     - {id: 1601, cat: Audio/MP3, desc: " |- Сборники Rock, Metal (mp3)"}
     - {id: 1626, cat: Audio/MP3, desc: " |- Зарубежный джаз (mp3)"}
-    - {id: 1625, cat: Audio/Lossless, desc: " |- Зарубежный джаз (Lossless)"}
     - {id: 1627, cat: Audio/MP3, desc: " |- Зарубежный блюз (mp3)"}
-    - {id: 1624, cat: Audio/Lossless, desc: " |- Зарубежный блюз (Lossless)"}
     - {id: 1628, cat: Audio/MP3, desc: " |- Отечественный джаз и блюз (mp3)"}
-    - {id: 1629, cat: Audio/Lossless, desc: " |- Отечественный джаз и блюз (Lossless)"}
     - {id: 1171, cat: Audio/MP3, desc: "Электронная музыка"}
-    - {id: 1648, cat: Audio/Lossless, desc: " |- Electronic and club music (Lossless)"}
     - {id: 1610, cat: Audio/MP3, desc: " |- Goa Trance, Psy-Trance"}
     - {id: 1611, cat: Audio/MP3, desc: " |- PsyChill, Ambient, Dub"}
     - {id: 1457, cat: Audio/MP3, desc: " |- Trance"}
@@ -233,23 +222,34 @@ caps:
     - {id: 1577, cat: Audio/MP3, desc: " |- Electronic music (разные стили)"}
     - {id: 1630, cat: Audio/MP3, desc: "Рэп, Хип-Хоп, R'n'B"}
     - {id: 1631, cat: Audio/MP3, desc: " |- Отечественный Рэп, Хип-Хоп, R'n'B (mp3)"}
-    - {id: 1632, cat: Audio/Lossless, desc: " |- Отечественный Рэп, Хип-Хоп (lossless)"}
     - {id: 1633, cat: Audio/MP3, desc: " |- Зарубежный Рэп, Хип-Хоп (mp3)"}
-    - {id: 1634, cat: Audio/Lossless, desc: " |- Зарубежный Рэп, Хип-Хоп (lossless)"}
     - {id: 1540, cat: Audio/MP3, desc: "Остальные музыкальные жанры, + Видеоклипы и концерты"}
     - {id: 1604, cat: Audio/MP3, desc: " |- Reggae, Ska, Dub (mp3)"}
-    - {id: 1651, cat: Audio/Lossless, desc: " |- Классическая и инструментальная музыка (Lossless)"}
     - {id: 1562, cat: Audio/MP3, desc: " |- Инструментальная и классическая музыка (mp3)"}
     - {id: 1185, cat: Audio/MP3, desc: " |- New Age, Relax, Meditative (mp3)"}
-    - {id: 1649, cat: Audio/Lossless, desc: " |- Other musical genres (Lossless)"}
     - {id: 1183, cat: Audio/MP3, desc: " |- Музыкальное видео (все жанры)"}
-    - {id: 1664, cat: Audio, desc: "Оцифровки с аналоговых носителей"}
-    - {id: 1665, cat: Audio, desc: " |- Зарубежная поп-музыка (Vinyl)"}
-    - {id: 1666, cat: Audio, desc: " |- Зарубежная рок-музыка (Vinyl)"}
-    - {id: 1667, cat: Audio, desc: " |- Джаз и блюз (Vinyl)"}
-    - {id: 1668, cat: Audio, desc: " |- Электронная музыка (Vinyl)"}
-    - {id: 1669, cat: Audio, desc: " |- Шансон, авторские, военные песни (Vinyl)"}
-    - {id: 1670, cat: Audio, desc: " |- Отечественная поп-музыка (Vinyl)"}
+    - {id: 1664, cat: Audio/Lossless, desc: "Оцифровки с аналоговых носителей"}
+    - {id: 1665, cat: Audio/Lossless, desc: " |- Зарубежная поп-музыка (Vinyl)"}
+    - {id: 1666, cat: Audio/Lossless, desc: " |- Зарубежная рок-музыка (Vinyl)"}
+    - {id: 1667, cat: Audio/Lossless, desc: " |- Джаз и блюз (Vinyl)"}
+    - {id: 1668, cat: Audio/Lossless, desc: " |- Электронная музыка (Vinyl)"}
+    - {id: 1670, cat: Audio/Lossless, desc: " |- Отечественная поп-музыка (Vinyl)"}
+    - {id: 1669, cat: Audio/Lossless, desc: " |- Шансон, авторские, военные песни (Vinyl)"}
+    - {id: 1679, cat: Audio/Lossless, desc: " |- Зарубежная поп музыка (Lossless)"}
+    - {id: 1680, cat: Audio/Lossless, desc: " |- Eurodance, Disco, Hi-NRG, Technopop (Lossless)"}
+    - {id: 1681, cat: Audio/Lossless, desc: " |- Отечественная поп музыка (Lossless)"}
+    - {id: 1682, cat: Audio/Lossless, desc: " |- Шансон, авторская песня (Lossless)"}
+    - {id: 1683, cat: Audio/Lossless, desc: " |- Зарубежная рок музыка (Lossless)"}
+    - {id: 1684, cat: Audio/Lossless, desc: " |- Зарубежный Metal (Lossless)"}
+    - {id: 1685, cat: Audio/Lossless, desc: " |- Отечественный Rock, Metal (Lossless)"}
+    - {id: 1686, cat: Audio/Lossless, desc: " |- Зарубежный джаз (Lossless)"}
+    - {id: 1687, cat: Audio/Lossless, desc: " |- Зарубежный блюз (Lossless)"}
+    - {id: 1688, cat: Audio/Lossless, desc: " |- Отечественный джаз и блюз (Lossless)"}
+    - {id: 1689, cat: Audio/Lossless, desc: " |- Электронная и клубная музыка (Lossless)"}
+    - {id: 1690, cat: Audio/Lossless, desc: " |- Отечественный Рэп, Хип-Хоп (lossless)"}
+    - {id: 1691, cat: Audio/Lossless, desc: " |- Зарубежный Рэп, Хип-Хоп (lossless)"}
+    - {id: 1692, cat: Audio/Lossless, desc: " |- Классическая и инструментальная музыка (Lossless)"}
+    - {id: 1693, cat: Audio/Lossless, desc: " |- Остальные муз.жанры (Lossless)"}
     # Программное обеспечение Software
     - {id: 105, cat: PC, desc: "Операционные системы"}
     - {id: 1663, cat: PC, desc: " |- Windows 11"}

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

@@ -24,7 +24,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
     music-search: [q]
     book-search: [q]
@@ -133,6 +133,8 @@ search:
       selector: details_link
     download:
       selector: download_link
+    infohash:
+      selector: info_hash
     poster:
       selector: poster
       filters:
@@ -179,4 +181,4 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 6.0.6
+# json UNIT3D 6.2.0

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

@@ -14,7 +14,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
 
 settings:
@@ -93,6 +93,8 @@ search:
       selector: details_link
     download:
       selector: download_link
+    infohash:
+      selector: info_hash
     poster:
       selector: poster
       filters:

src/Jackett.Common/Definitions/skipthetrailers.yml

@@ -14,7 +14,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
     music-search: [q]
     book-search: [q]
@@ -95,6 +95,8 @@ search:
       selector: details_link
     download:
       selector: download_link
+    infohash:
+      selector: info_hash
     poster:
       selector: poster
       filters:

src/Jackett.Common/Definitions/sktorrent.yml

@@ -31,6 +31,7 @@ caps:
     - {id: 30, cat: PC/Games, desc: "Hry na Konzole"}
     - {id: 37, cat: PC/Games, desc: "Hry na Linux"}
     - {id: 59, cat: PC/Games, desc: "Hry na Mac"}
+    - {id: 60, cat: PC/Games, desc: "xXx hry (18+)"}
     - {id: 16, cat: TV, desc: "TV Seriál"}
     - {id: 17, cat: TV/Documentary, desc: "TV Dokument"}
     - {id: 42, cat: TV, desc: "TV Pořad"}

src/Jackett.Common/Definitions/theshinning.yml

@@ -27,7 +27,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
     music-search: [q]
 

src/Jackett.Common/Definitions/torlock.yml

@@ -7,10 +7,9 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www.torlock.com/
   - https://www.torlock2.com/
-  - https://www.torlock.icu/
-  - https://torlock.unblockit.blue/
+  - https://www.torlock.com/
+  - https://torlock.unblockit.name/
   - https://torlock.nocensor.sbs/
 legacylinks:
   - https://torlock.com/
@@ -31,6 +30,8 @@ legacylinks:
   - https://torlock.nocensor.biz/
   - https://torlock.unblockit.day/
   - https://torlock.unblockit.llc/
+  - https://torlock.unblockit.blue/
+  - https://www.torlock.icu/
 
 caps:
   # dont forget to update the search fields category case block

src/Jackett.Common/Definitions/torrent9clone.yml

@@ -6,6 +6,7 @@ language: fr-FR
 type: public
 encoding: UTF-8
 followredirect: true
+# to fetch current domain use https://www.protege-liens.com/torrent9
 links:
   - https://www.torrent9.re/
   - https://torrent9.nocensor.sbs/

src/Jackett.Common/Definitions/torrentdownload.yml

@@ -8,7 +8,7 @@ encoding: UTF-8
 followredirect: true
 links:
   - https://www.torrentdownload.info/
-  - https://torrentdownload.unblockit.blue/
+  - https://torrentdownload.unblockit.name/
   - https://torrentdownload.nocensor.sbs/
 legacylinks:
   - https://torrentdownload.unblocked.rest/
@@ -30,6 +30,7 @@ legacylinks:
   - https://torrentdownload.nocensor.biz/
   - https://torrentdownload.unblockit.day/
   - https://torrentdownload.unblockit.llc/
+  - https://torrentdownload.unblockit.blue/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentdownloads.yml

@@ -9,8 +9,9 @@ followredirect: true
 links:
   - https://www.torrentdownloads.info/
   - https://www.torrentdownloads.pro/
-  - https://torrentdownloads.unblockit.blue/
+  - https://torrentdownloads.unblockit.name/
   - https://torrentdownloads.nocensor.sbs/
+  - https://torrentdownloads.unblockninja.com/
 legacylinks:
   - https://torrentdownloads.unblockit.buzz/
   - https://torrentdownloads.unblocked.monster/
@@ -31,6 +32,7 @@ legacylinks:
   - https://torrentdownloads.nocensor.biz/
   - https://torrentdownloads.unblockit.day/
   - https://torrentdownloads.unblockit.llc/
+  - https://torrentdownloads.unblockit.blue/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentfunk.yml

@@ -9,7 +9,7 @@ followredirect: true
 links:
   - https://www.torrentfunk.com/
   - https://www.torrentfunk2.com/
-  - https://torrentfunk.unblockit.blue/
+  - https://torrentfunk.unblockit.name/
   - https://torrentfunk.nocensor.sbs/
 legacylinks:
   - https://torrentfunk.unblockit.buzz/
@@ -29,6 +29,7 @@ legacylinks:
   - https://torrentfunk.nocensor.biz/
   - https://torrentfunk.unblockit.day/
   - https://torrentfunk.unblockit.llc/
+  - https://torrentfunk.unblockit.blue/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentgalaxy.yml

@@ -11,7 +11,7 @@ links:
   - https://torrentgalaxy.mx/
   - https://torrentgalaxy.su/
   - https://torrentgalaxy.unblockninja.com/
-  - https://torrentgalaxy.unblockit.blue/
+  - https://torrentgalaxy.unblockit.name/
   - https://torrentgalaxy.nocensor.sbs/
 legacylinks:
   - https://torrentgalaxy.org/ # redirects to *.to
@@ -34,6 +34,7 @@ legacylinks:
   - https://torrentgalaxy.nocensor.biz/
   - https://torrentgalaxy.unblockit.day/
   - https://torrentgalaxy.unblockit.llc/
+  - https://torrentgalaxy.unblockit.blue/
 
 caps:
   categorymappings:

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

@@ -23,7 +23,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
     music-search: [q]
     book-search: [q]
@@ -179,4 +179,4 @@ search:
     minimumseedtime:
       # 4 days (as seconds = 4 x 24 x 60 x 60)
       text: 345600
-# json UNIT3D 6.0.1 (custom)
+# json UNIT3D 6.0.2 (custom)

src/Jackett.Common/Definitions/torrentqq.yml

@@ -7,10 +7,8 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentqq145.com/
+  - https://torrentqq147.com/
 legacylinks:
-  - https://torrentqq130.com/
-  - https://torrentqq131.com/
   - https://torrentqq132.com/
   - https://torrentqq133.com/
   - https://torrentqq134.com/
@@ -24,6 +22,8 @@ legacylinks:
   - https://torrentqq142.com/
   - https://torrentqq143.com/
   - https://torrentqq144.com/
+  - https://torrentqq145.com/
+  - https://torrentqq146.com/
 
 caps:
   categorymappings:

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

@@ -26,7 +26,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
     music-search: [q]
     book-search: [q]

src/Jackett.Common/Definitions/turkseed.yml

@@ -19,6 +19,7 @@ caps:
     - {id: 49, cat: Movies/BluRay, desc: "Bluray"}
     - {id: 50, cat: Movies, desc: "Boxset"}
     - {id: 4, cat: Other, desc: "Diğer"}
+    - {id: 70, cat: TV, desc: "DIGITAL TV"}
     - {id: 42, cat: Movies, desc: "Dini"}
     - {id: 51, cat: Movies/DVD, desc: "DVD"}
     - {id: 41, cat: Books/EBook, desc: "E-Kitap"}
@@ -31,13 +32,14 @@ caps:
     - {id: 53, cat: Movies/SD, desc: "SD"}
     - {id: 54, cat: Movies, desc: "Türk Filmi"}
     - {id: 58, cat: Audio/Video, desc: "Video Klip"}
+    - {id: 63, cat: Movies, desc: "Vip Film"}
+    - {id: 62, cat: Audio, desc: "Vip Ses Dosyaları"}
     - {id: 43, cat: TV, desc: "Yabancı Dizi"}
     - {id: 57, cat: Movies, desc: "Yabancı Müzik"}
     - {id: 45, cat: TV, desc: "Yarışma - Show"}
+    - {id: 71, cat: Movies, desc: "YENI FILMLER"}
     - {id: 44, cat: TV, desc: "Yerli Dizi"}
     - {id: 56, cat: Audio, desc: "Yerli Müzik"}
-    - {id: 63, cat: Movies, desc: "Vip Film"}
-    - {id: 62, cat: Audio, desc: "Vip Ses Dosyaları"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/tvchaosuk.yml

@@ -28,7 +28,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
     music-search: [q]
 

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

@@ -86,7 +86,7 @@ caps:
   modes:
     search: [q]
     movie-search: [q, tmdbid]
-    tv-search: [q, season, ep]
+    tv-search: [q, season, ep, tmdbid]
     book-search: [q]
 
 settings:

src/Jackett.Common/Definitions/yggcookie.yml

@@ -7,7 +7,7 @@ type: semi-private
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www5.yggtorrent.la/
+  - https://www5.yggtorrent.fi/
 legacylinks:
   - https://yggtorrent.com/
   - https://ww1.yggtorrent.com/
@@ -43,6 +43,7 @@ legacylinks:
   - https://www3.yggtorrent.nz/
   - https://www3.yggtorrent.re/
   - https://www3.yggtorrent.la/
+  - https://www5.yggtorrent.la/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/yggtorrent.yml

@@ -7,7 +7,7 @@ type: semi-private
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www5.yggtorrent.la/
+  - https://www5.yggtorrent.fi/
 legacylinks:
   - https://yggtorrent.com/
   - https://ww1.yggtorrent.com/
@@ -43,6 +43,7 @@ legacylinks:
   - https://www3.yggtorrent.nz/
   - https://www3.yggtorrent.re/
   - https://www3.yggtorrent.la/
+  - https://www5.yggtorrent.la/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/yts.yml

@@ -9,7 +9,7 @@ requestDelay: 2.5 # 2.5 requests per second (2 causes problems)
 links:
   # dont forget to update the details, download and poster replace args
   - https://yts.mx/
-  - https://yts.unblockit.blue/
+  - https://yts.unblockit.name/
   - https://yts.unblockninja.com/
   - https://yts.nocensor.sbs/
 legacylinks:
@@ -33,6 +33,7 @@ legacylinks:
   - https://yts.nocensor.biz/
   - https://yts.unblockit.day/
   - https://yts.unblockit.llc/
+  - https://yts.unblockit.blue/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/zetorrents.yml

@@ -5,8 +5,9 @@ description: "zetorrents is a FRENCH Public site for MOVIES / TV / GENERAL"
 language: fr-FR
 type: public
 encoding: UTF-8
+# to fetch current domain use https://www.protege-liens.com/zetorrents
 links:
-  - https://www.zetorrents.nl/
+  - https://www.zetorrents.biz/
 legacylinks:
   - https://www.zetorrents.co/
   - https://www.zetorrents.io/
@@ -19,6 +20,7 @@ legacylinks:
   - https://www.zetorrents.cc/
   - https://www.zetorrents.tv/
   - https://www.zetorrents.bz/
+  - https://www.zetorrents.nl/
 
 caps:
   categories:

src/Jackett.Common/Indexers/Anthelion.cs

@@ -40,7 +40,7 @@ namespace Jackett.Common.Indexers
                    {
                        TvSearchParams = new List<TvSearchParam>
                        {
-                           TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
+                           TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep, TvSearchParam.TmdbId
                        },
                        MovieSearchParams = new List<MovieSearchParam>
                        {

src/Jackett.Common/Indexers/Aro.cs

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

src/Jackett.Common/Indexers/BaseIndexer.cs

@@ -251,7 +251,9 @@ namespace Jackett.Common.Indexers
                 return true;
             if (caps.MovieSearchImdbAvailable && query.IsImdbQuery)
                 return true;
-            if (caps.MovieSearchTmdbAvailable && query.IsTmdbQuery)
+            if (caps.MovieSearchTmdbAvailable && query.IsTmdbQuery && query.IsMovieSearch)
+                return true;
+            if (caps.TvSearchTmdbAvailable && query.IsTmdbQuery && query.IsTVSearch)
                 return true;
 
             return false;

src/Jackett.Common/Indexers/BeyondHDAPI.cs

@@ -38,7 +38,7 @@ namespace Jackett.Common.Indexers
                        LimitsMax = 100,
                        TvSearchParams = new List<TvSearchParam>
                        {
-                           TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep, TvSearchParam.ImdbId
+                           TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep, TvSearchParam.ImdbId, TvSearchParam.TmdbId
                        },
                        MovieSearchParams = new List<MovieSearchParam>
                        {
@@ -158,8 +158,15 @@ namespace Jackett.Common.Indexers
             };
 
             var response = await webclient.GetResultAsync(request);
-
+            if (response != null && response.ContentString.StartsWith("<"))
+            {
+                // the response was not JSON, likely a HTML page for a server outage
+                logger.Warn(response.ContentString);
+                throw new Exception("The response was not JSON");
+            }
             var bhdresponse = JsonConvert.DeserializeObject<BHDResponse>(response.ContentString);
+            if (bhdresponse.status_code == 0)
+                throw new Exception(bhdresponse.status_message);
             return bhdresponse;
         }
 
@@ -226,6 +233,7 @@ namespace Jackett.Common.Indexers
         class BHDResponse
         {
             public int status_code { get; set; } // The status code of the post request. (0 = Failed and 1 = Success)
+            public string status_message { get; set; } // If status code=0 then there will be an explanation
             public int page { get; set; } // The current page of results that you're on.
             public int total_pages { get; set; } // int The total number of pages of results matching your query.
             public int total_results { get; set; } // The total number of results matching your query.

src/Jackett.Common/Indexers/CardigannIndexer.cs

@@ -468,12 +468,21 @@ namespace Jackett.Common.Indexers
                 var variable = RangeRegexMatches.Groups[1].Value;
                 var prefix = RangeRegexMatches.Groups[2].Value;
                 var postfix = RangeRegexMatches.Groups[3].Value;
+                var hasArrayIndex = prefix.Contains("[*]");
+                var arrayIndex = -1;
+                if (hasArrayIndex)
+                    prefix = prefix.Replace("[*]", "[-1]");
 
                 foreach (var value in (ICollection<string>)variables[variable])
                 {
                     var newvalue = value;
                     if (modifier != null)
                         newvalue = modifier(newvalue);
+                    if (hasArrayIndex)
+                    {
+                        prefix = prefix.Replace("[" + arrayIndex.ToString() + "]", "[" + (arrayIndex + 1).ToString() + "]");
+                        arrayIndex++;
+                    }
                     expanded += prefix + newvalue + postfix;
                 }
                 template = template.Replace(all, expanded);
@@ -1318,7 +1327,7 @@ namespace Jackett.Common.Indexers
             if (!string.IsNullOrWhiteSpace((string)variables[".Query.Episode"]))
                 KeywordTokens.Add((string)variables[".Query.Episode"]);
             variables[".Query.Keywords"] = string.Join(" ", KeywordTokens);
-            variables[".Keywords"] = applyFilters((string)variables[".Query.Keywords"], Search.Keywordsfilters);
+            variables[".Keywords"] = applyFilters((string)variables[".Query.Keywords"], Search.Keywordsfilters, variables);
 
             // TODO: prepare queries first and then send them parallel
             var SearchPaths = Search.Paths;
@@ -2086,10 +2095,10 @@ namespace Jackett.Common.Indexers
                             if (Filter.Args != null)
                                 CharacterLimit = int.Parse(Filter.Args);
 
-                            if (query.ImdbID != null && TorznabCaps.MovieSearchImdbAvailable)
+                            if (query.ImdbID != null && (TorznabCaps.MovieSearchImdbAvailable || TorznabCaps.TvSearchImdbAvailable))
                                 break; // skip andmatch filter for imdb searches
 
-                            if (query.TmdbID != null && TorznabCaps.MovieSearchTmdbAvailable)
+                            if (query.TmdbID != null && (TorznabCaps.MovieSearchTmdbAvailable || TorznabCaps.TvSearchTmdbAvailable))
                                 break; // skip andmatch filter for tmdb searches
 
                             if (query.TvdbID != null && TorznabCaps.TvSearchTvdbAvailable)

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.fi/",
+            "https://dontorrent.ink/",
             "https://todotorrents.net/",
             "https://tomadivx.net/",
             "https://seriesblanco.one/",
@@ -67,6 +67,7 @@ namespace Jackett.Common.Indexers
             "https://dontorrent.bet/",
             "https://dontorrent.cab/",
             "https://dontorrent.wtf/",
+            "https://dontorrent.fi/",
             "https://dontorrent.eu/"
         };
 
@@ -85,7 +86,7 @@ namespace Jackett.Common.Indexers
             : base(id: "dontorrent",
                    name: "DonTorrent",
                    description: "DonTorrent is a SPANISH public tracker for MOVIES / TV / GENERAL",
-                   link: "https://dontorrent.fi/",
+                   link: "https://dontorrent.ink/",
                    caps: new TorznabCapabilities
                    {
                        TvSearchParams = new List<TvSearchParam>

src/Jackett.Common/Indexers/EpubLibre.cs

@@ -45,7 +45,7 @@ namespace Jackett.Common.Indexers
 
         public override string[] AlternativeSiteLinks { get; protected set; } = {
             "https://www.epublibre.org/",
-            "https://epublibre.unblockit.blue/"
+            "https://epublibre.unblockit.name/"
         };
 
         public override string[] LegacySiteLinks { get; protected set; } = {
@@ -64,7 +64,8 @@ namespace Jackett.Common.Indexers
             "https://epublibre.unblockit.cam/",
             "https://epublibre.unblockit.biz/",
             "https://epublibre.unblockit.day/",
-            "https://epublibre.unblockit.llc/"
+            "https://epublibre.unblockit.llc/",
+            "https://epublibre.unblockit.blue/"
         };
 
         public EpubLibre(IIndexerConfigurationService configService, WebClient wc, Logger l, IProtectionService ps,

src/Jackett.Common/Indexers/RarBG.cs

@@ -153,9 +153,16 @@ namespace Jackett.Common.Indexers
                     response = await RequestWithCookiesAndRetryAsync(BuildSearchUrl(query));
                     jsonContent = JObject.Parse(response.ContentString);
                     break;
+                case 5: // Too many requests per second. Maximum requests allowed are 1req/2sec Please try again later!
+                    return await PerformQueryWithRetry(query, false);
                 case 8: // imdb not found, see issue #12466
                 case 10: // imdb not found, see issue #1486
                 case 20: // no results found
+                    if (jsonContent.ContainsKey("rate_limit"))
+                    {
+                        logger.Warn("Rate Limit exceeded. Retry will be performed.");
+                        return await PerformQueryWithRetry(query, false);
+                    }
                     // the api returns "no results" in some valid queries. we do one retry on this case but we can't do more
                     // because we can't distinguish between search without results and api malfunction
                     return retry ? await PerformQueryWithRetry(query, false) : releases;

src/Jackett.Common/Models/TorznabCapabilities.cs

@@ -13,6 +13,7 @@ namespace Jackett.Common.Models
         ImdbId,
         TvdbId,
         RId,
+        TmdbId
     }
 
     public enum MovieSearchParam
@@ -54,6 +55,7 @@ namespace Jackett.Common.Models
         public bool TvSearchImdbAvailable { get; set; } = false; // (TvSearchParams.Contains(TvSearchParam.ImdbId));
         public bool TvSearchTvdbAvailable => (TvSearchParams.Contains(TvSearchParam.TvdbId));
         public bool TvSearchTvRageAvailable => (TvSearchParams.Contains(TvSearchParam.RId));
+        public bool TvSearchTmdbAvailable => (TvSearchParams.Contains(TvSearchParam.TmdbId));
 
         public List<MovieSearchParam> MovieSearchParams;
         public bool MovieSearchAvailable => (MovieSearchParams.Count > 0);
@@ -183,6 +185,8 @@ namespace Jackett.Common.Models
                 parameters.Add("tvdbid");
             if (TvSearchTvRageAvailable)
                 parameters.Add("rid");
+            if (TvSearchTmdbAvailable)
+                parameters.Add("tmdbid");
             return string.Join(",", parameters);
         }
 

src/Jackett.Server/Controllers/ResultsController.cs

@@ -382,6 +382,12 @@ namespace Jackett.Server.Controllers
                     logger.Warn($"A search request with tmdbid from {Request.HttpContext.Connection.RemoteIpAddress} was made but the indexer {CurrentIndexer.DisplayName} doesn't support it.");
                     return GetErrorXML(203, "Function Not Available: tmdbid is not supported for movie search by this indexer");
                 }
+
+                if (CurrentQuery.IsTVSearch && !CurrentIndexer.TorznabCaps.TvSearchTmdbAvailable)
+                {
+                    logger.Warn($"A search request with tmdbid from {Request.HttpContext.Connection.RemoteIpAddress} was made but the indexer {CurrentIndexer.DisplayName} doesn't support it.");
+                    return GetErrorXML(203, "Function Not Available: tmdbid is not supported for TV search by this indexer");
+                }
             }
 
             if (CurrentQuery.TvdbID != null)

src/Jackett.Updater/Program.cs

@@ -487,6 +487,7 @@ namespace Jackett.Updater
                 "Definitions/tbplus.yml",
                 "Definitions/tehconnection.yml",
                 "Definitions/tellytorrent.yml", // switch to *-API #8682
+                "Definitions/tellytorrent-api.yml",
                 "Definitions/tenyardtracker.yml", // to be migrated to c#, #795
                 "Definitions/tfile.yml",
                 "Definitions/the-devils-lounge.yml",