tellytorrent: restore. resolves #5635 (#13310)

Search for 2022 currently returns blank page - https://torrent9.to/search_torrent/2022.html

If this is resolved in future, revert this commit apart from the missing cat fix.

.github/dependabot.yml

@@ -0,0 +1,9 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "saturday"
+      time: "00:00"
+      timezone: "Europe/London"

.github/workflows/winget.yml

@@ -6,7 +6,7 @@ jobs:
   publish:
     runs-on: windows-latest
     steps:
-      - uses: vedantmgoyal2009/vedantmgoyal2009/winget-pkgs-automation/releaser-action@v1.0.0
+      - uses: vedantmgoyal2009/winget-releaser@latest
         with:
           identifier: Jackett.Jackett
           token: ${{ secrets.WINGET }}

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
@@ -103,6 +104,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * NNTT
  * NoNaMe Club (NNM-Club)
  * Nyaa.si
+ * OnceSearch
  * OneJAV
  * OpenSharing
  * OxTorrent
@@ -253,7 +255,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Aftershock
  * Aidoru!Online
  * Aither
- * Alleen Retail
  * AlphaRatio (AR)
  * AmigosShareClub
  * anasch.cc
@@ -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)

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/alleenretail.yml

@@ -1,186 +0,0 @@
----
-id: alleenretail
-name: Alleen Retail
-description: "Alleen Retail is a DUTCH Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: nl-NL
-type: private
-encoding: UTF-8
-links:
-  - http://www.alleenretail.org/ # does not support https ERR_CONNECTION_REFUSED
-
-caps:
-  categorymappings:
-    - {id: 2, cat: Movies/DVD, desc: "Films DVD"}
-    - {id: 17, cat: Movies, desc: "Films Promo"}
-    - {id: 3, cat: Audio/Video, desc: "Muziek Video"}
-    - {id: 4, cat: Audio/Video, desc: "Cabaret"}
-    - {id: 18, cat: Movies, desc: "Films Kids"}
-    - {id: 6, cat: TV, desc: "TV Series"}
-    - {id: 19, cat: Other, desc: "Overigen"}
-    - {id: 20, cat: TV/Documentary, desc: "Documentaire"}
-    - {id: 9, cat: PC/Games, desc: "Games PC"}
-    - {id: 10, cat: Books/Mags, desc: "Magazines"}
-    - {id: 11, cat: Movies/SD, desc: "Films AVI/DivX"}
-    - {id: 22, cat: Movies, desc: "Films Classics"}
-    - {id: 8, cat: Audio, desc: "Muziek"}
-    - {id: 23, cat: PC/Mac, desc: "Software Mac"}
-    - {id: 1, cat: Books/Comics, desc: "Stripboeken"}
-    - {id: 13, cat: PC/Mobile-Android, desc: "Android"}
-    - {id: 14, cat: PC/Mobile-Other, desc: "Navigatie"}
-    - {id: 7, cat: PC/0day, desc: "Software PC"}
-    - {id: 12, cat: PC/Mobile-iOS, desc: "iOS"}
-    - {id: 21, cat: Movies/HD, desc: "Films HD"}
-    - {id: 5, cat: Audio/Audiobook, desc: "Luisterboeken"}
-    - {id: 15, cat: XXX, desc: "18+"}
-    - {id: 24, cat: Movies/UHD, desc: "Films Blu-ray/3D/4K"}
-    - {id: 16, cat: Books/EBook, desc: "Ebooks"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-#  - name: thankyou
-#    type: text
-#    label: Thank You Comment
-#  - name: info
-#    type: info
-#    label: Thank you comment
-#    default: This site requires you to leave a Thank You comment before you can download. Enter your personalised comment above.
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: table.main:contains("Aanmelden mislukt")
-  test:
-    path: /
-    selector: a[href="logout.php"]
-
-# download:
-#  before:
-#    # /comment.php?action=add&tid=166386
-#    path: comment.php
-#    method: post
-#    inputs:
-#      action: add
-#      tid: "{{ .DownloadUri.Query.id }}"
-#      text: "{{ .Config.thankyou }}"
-#      submit: Opslaan
-#  selectors:
-#    - selector: a[href^="download.php?id="]
-#      attribute: href
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    incldead: 1
-    # does not support imdbid search and does not return imdb link in results
-
-  rows:
-    selector: table.mainouter
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: a[href^="details.php?id="]
-      filters:
-        - name: re_replace
-          args: ["(?i)seizoen\\s*(\\d{1,2})\\s*(tot|t\/m)\\s*(\\d{1,2})", "S$1-$3"]
-        - name: re_replace
-          args: ["(?i)(seizoen\\s*)(\\d{1,2})", "S$2"]
-        - name: re_replace
-          args: ["(?i)(afl.\\s*|aflevering\\s*)(\\d{1,2})", "E$2"]
-        - name: re_replace
-          args: ["(?i)compleet", "Complete"]
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    size:
-      selector: a[href^="details_bestanden.php?torrent_id="]
-      filters:
-        - name: regexp
-          args: "(.+?) in"
-    files:
-      selector: a[href^="details_bestanden.php?torrent_id="]
-      filters:
-        - name: regexp
-          args: "in (\\d+) bestan"
-    grabs:
-      selector: table tr:nth-child(2) td:nth-child(1)
-    date:
-      selector: table tr:nth-child(2) td:nth-child(3)
-      filters:
-        - name: replace
-          args: ["januari", "January"]
-        - name: replace
-          args: ["februari", "February"]
-        - name: replace
-          args: ["maart", "March"]
-        - name: replace
-          args: ["april", "April"]
-        - name: replace
-          args: ["mei", "May"]
-        - name: replace
-          args: ["juni", "June"]
-        - name: replace
-          args: ["juli", "July"]
-        - name: replace
-          args: ["augustus", "August"]
-        - name: replace
-          args: ["september", "September"]
-        - name: replace
-          args: ["oktober", "October"]
-        - name: replace
-          args: ["november", "November"]
-        - name: replace
-          args: ["december", "December"]
-        - name: re_replace
-          args: ["\\s*om\\s*", " "]
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "2 January 2006 15:04:05 -07:00"
-    seeders_optional:
-      optional: true
-      selector: table tr:nth-child(3) td:nth-child(6)  font b
-    seeders:
-      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
-    leechers_optional:
-      optional: true
-      selector: table tr:nth-child(3) td:nth-child(6) font b:nth-child(2)
-    leechers:
-      text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      # between 1.00 and 1.50 is required, and above 1.50 prohibited
-      text: 1.25
-# engine n/a

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,8 @@ 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: 91, cat: TV, desc: "Prime Video"}
     - {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/byrutor.yml

@@ -256,7 +256,7 @@ settings: []
 
 download:
   selectors:
-    - selector: a.itemtop_games
+    - selector: a.itemdown_games
       attribute: href
 
 search:
@@ -282,7 +282,8 @@ search:
     resorder: desc
 
   rows:
-    selector: div.short_search
+    # results without sizes are just pre-release announcements
+    selector: div.short_search:has(div.shor_subtitles span:nth-child(2):contains(" "))
 
   fields:
     category:
@@ -318,9 +319,7 @@ search:
       text: 1
     leechers:
       text: 1
-    size:
-      text: 0B
-    size:
+    size_rus:
       selector: div.shor_subtitles span:nth-child(2):contains("Б")
       optional: true
       filters:
@@ -332,6 +331,11 @@ search:
           args: ["МБ", "MB"]
         - name: replace
           args: ["КБ", "KB"]
+    size_eng:
+      selector: div.shor_subtitles span:nth-child(2):contains("B")
+      optional: true
+    size:
+      text: "{{ if or .Result.size_rus .Result.size_eng }}{{ or .Result.size_rus .Result.size_eng }}{{ else }}0 B{{ end }}"
     downloadvolumefactor:
       text: 0
     uploadvolumefactor:

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/crazyspirits.yml

@@ -12,13 +12,10 @@ certificates:
 
 caps:
   categorymappings:
-    # Documentaire
-    - {id: 96, cat: TV/Documentary, desc: "Docus TV"}
-    - {id: 124, cat: TV/Documentary, desc: "Docus Formation Video"}
     # Films
-    - {id: 1, cat: XXX, desc: "3X"}
-    - {id: 47, cat: XXX, desc: "3X  HD720p"}
-    - {id: 48, cat: XXX, desc: "3X  HD1080p"}
+    - {id: 1, cat: XXX, desc: "Films 3X"}
+    - {id: 47, cat: XXX, desc: "Films 3X HD720p"}
+    - {id: 48, cat: XXX, desc: "Films 3X HD1080p"}
     - {id: 49, cat: Movies/3D, desc: "Films 3D"}
     - {id: 50, cat: Movies/UHD, desc: "Films 4K"}
     - {id: 51, cat: TV/UHD, desc: "Films 4K UHDTV"}
@@ -28,25 +25,31 @@ caps:
     - {id: 61, cat: Movies/HD, desc: "Films HDRip"}
     - {id: 59, cat: Movies/DVD, desc: "Films DVDR"}
     - {id: 60, cat: Movies/DVD, desc: "Films DVDRip"}
-    - {id: 57, cat: Movies/BluRay, desc: "Films BDRip"}
-    - {id: 58, cat: Movies/BluRay, desc: "Films BRRip"}
+    - {id: 57, cat: Movies/BluRay, desc: "Films BD-Rip"}
+    - {id: 58, cat: Movies/BluRay, desc: "Films BR-Rip"}
     - {id: 63, cat: Movies/HD, desc: "Films MHD"}
     - {id: 64, cat: Movies, desc: "Films R5"}
     - {id: 65, cat: Movies, desc: "Films FSCR"}
-    - {id: 66, cat: Movies, desc: "Films CamTS"}
+    - {id: 66, cat: Movies, desc: "Films Cam-TS"}
     - {id: 67, cat: Movies, desc: "Films Pack Films"}
-    - {id: 68, cat: Movies, desc: "Films VostFR"}
+    - {id: 68, cat: Movies, desc: "Films Vost-FR"}
     - {id: 69, cat: Movies, desc: "Films VO"}
     - {id: 70, cat: Movies/WEB-DL, desc: "Films WebRip 1080p"}
     - {id: 71, cat: Movies/WEB-DL, desc: "Films WebRip 720p"}
     - {id: 73, cat: Movies/WEB-DL, desc: "Films Webrip"}
     - {id: 129, cat: Movies, desc: "Films QC~Film"}
-    - {id: 72, cat: Movies/WEB-DL, desc: "Films WEB DL"}
+    - {id: 72, cat: Movies/WEB-DL, desc: "Films WEBRip-DL"}
     - {id: 99, cat: Movies, desc: "Films Remux"}
-    - {id: 98, cat: Movies/Other, desc: "Films Film Animées"}
+    - {id: 98, cat: Movies/Other, desc: "Films Animé"}
     - {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"}
+    - {id: 137, cat: Movies/UHD, desc: "Films HDR 2160p"}
+    - {id: 138, cat: Movies/WEB-DL, desc: "Films WEB-DL 2160p"}
+    - {id: 139, cat: Movies/WEB-DL, desc: "Films WEB-RIP 2160p"}
+    - {id: 126, cat: TV/HD, desc: "Films HDTV"}
+    # Documentaire
+    - {id: 96, cat: TV/Documentary, desc: "Docus TV"}
+    - {id: 124, cat: TV/Documentary, desc: "Docus Formation Video"}
     # Jeux
     - {id: 114, cat: PC/Games, desc: "Jeux PC"}
     - {id: 115, cat: Console/PS3, desc: "Jeux PS3"}
@@ -77,18 +80,18 @@ caps:
     - {id: 108, cat: Audio/Lossless, desc: "Musiques FLAC"}
     - {id: 109, cat: Audio, desc: "Musiques WMA"}
     # Séries
-    - {id: 77, cat: TV/HD, desc: "Series HDTV"}
-    - {id: 84, cat: TV/HD, desc: "Series Épisodes HD"}
-    - {id: 85, cat: TV/SD, desc: "Series Épisodes SD"}
-    - {id: 86, cat: TV, desc: "Series VosFR"}
-    - {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"}
+    - {id: 130, cat: TV, desc: "Séries QC~Serie"}
+    - {id: 77, cat: TV/HD, desc: "Séries HDTV"}
+    - {id: 84, cat: TV/HD, desc: "Séries Épisodes HD"}
+    - {id: 85, cat: TV/SD, desc: "Séries Épisodes SD"}
+    - {id: 97, cat: TV/Anime, desc: "Séries Animée"}
+    - {id: 88, cat: TV, desc: "Séries Pack HD"}
+    - {id: 128, cat: TV, desc: "Séries Pack SD"}
     # Spéctacle
-    - {id: 131, cat: TV, desc: "SeriesQC~Spectacle"}
+    - {id: 131, cat: TV/Other, desc: "Spectacle QC~Spectacle"}
     - {id: 91, cat: TV/Other, desc: "Spectacle 720p"}
     - {id: 90, cat: TV/Other, desc: "Spectacle 1080p"}
+    - {id: 136, cat: TV/Other, desc: "Spectacle SD"}
     # Télévision
     - {id: 74, cat: TV/HD, desc: "TV TVHD"}
     - {id: 75, cat: TV, desc: "TV TVRip"}

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/oncesearch.yml

@@ -0,0 +1,142 @@
+---
+id: oncesearch
+name: OnceSearch
+description: "OnceSearch is a Public Torrent Tracker for 3X"
+language: en-US
+type: public
+encoding: UTF-8
+links:
+  - http://oncesearch.com/ # https is not supported
+
+caps:
+  categories:
+    Amateur: XXX
+    Anal: XXX
+    Anime: XXX
+    Asian: XXX
+    Ass Lick: XXX
+    BBW: XXX
+    BDSM: XXX
+    Bi-Sexual: XXX
+    Big Ass: XXX
+    Big Butts: XXX
+    Big Dick: XXX
+    Big Tits: XXX
+    Blonde: XXX
+    Blowjob: XXX
+    Brunette: XXX
+    Busty: XXX
+    Classic: XXX
+    Comics: XXX
+    Creampie: XXX
+    Cumshot: XXX
+    Deepthroat: XXX
+    Ebony: XXX
+    Erotic: XXX
+    Facial: XXX
+    Fetish: XXX
+    Fishnets: XXX
+    Fisting: XXX
+    Foot: XXX
+    Foreign: XXX
+    Gangbang: XXX
+    Gay: XXX
+    Glamour Girls: XXX
+    Gonzo: XXX
+    Group Sex: XXX
+    Hairy: XXX
+    Handjob: XXX
+    Hardcore: XXX
+    Homemade: XXX
+    Interracial: XXX
+    Latin: XXX
+    Lesbian: XXX
+    Lingerie: XXX
+    Massage: XXX
+    Masturbation: XXX
+    Mature: XXX
+    MILF: XXX
+    Nude Photography: XXX
+    Nylons: XXX
+    Oiled: XXX
+    Oral: XXX
+    Orgy: XXX
+    Outdoor: XXX
+    Pissing: XXX
+    Pregnant: XXX
+    Public: XXX
+    Redhead: XXX
+    Retro: XXX
+    Sex Toys: XXX
+    Shemale: XXX
+    Solo: XXX
+    Squirt: XXX
+    Tattoo: XXX
+    Teen: XXX
+    Threesome: XXX
+    Uncensored: XXX
+    XXX: XXX
+    Porno Clips: XXX
+    Porno HD Movies: XXX
+    Porno Other: XXX
+    Porno Pics: XXX
+
+  modes:
+    search: [q]
+
+settings: []
+
+search:
+  paths:
+    # http://oncesearch.com/search/advanced/-/Olivia%20Sin%20Deep/0/any
+    # http://oncesearch.com/category/latest-torrents
+    # site supports only single cat search so we default to all
+    - path: "{{ if .Keywords }}search/advanced/-/{{ .Keywords }}/0/any{{ else }}category/latest-torrents{{ end }}"
+
+  rows:
+    selector: table.table-striped > tbody > tr
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      text: XXX
+    category|noappend:
+      optional: true
+      selector: p > a:last-of-type
+    title:
+      selector: span
+    details:
+      selector: a[href^="/details/"]
+      attribute: href
+    download:
+      selector: a[href^="/file/"][title="Download Torrent"]
+      attribute: href
+      optional: true
+    magnet:
+      selector: a[href^="magnet:?xt="]
+      attribute: href
+      optional: true
+    date:
+      selector: td:nth-child(3)
+      filters:
+        - name: timeago
+    files_optional:
+      selector: td:nth-child(4)
+      optional: true
+    files:
+      text: "{{ if .Result.files_optional }}{{ .Result.files_optional }}{{ else }}1{{ end }}"
+    size_optional:
+      selector: td:nth-child(5)
+      optional: true
+    size:
+      text: "{{ if .Result.size_optional }}{{ .Result.size_optional }}{{ else }}256 MB{{ end }}"
+    seeders:
+      text: 1
+    leechers:
+      text: 0
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

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

@@ -0,0 +1,187 @@
+---
+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://pixelados.tv/
+
+caps:
+  categorymappings:
+    - {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, tmdbid]
+    movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://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
+    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: /api/torrents
+  method: get
+  inputs:
+    api_token: "{{ .Config.apikey }}"
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
+search:
+  paths:
+    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    - path: "/api/torrents/filter"
+      response:
+        type: json
+
+  inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    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 }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
+
+  keywordsfilters:
+    - name: diacritics
+      args: replace
+    - name: re_replace
+      args: ["\\.", " "]
+    # strip season and ep when it's added by tvsearch Query
+    - name: re_replace
+      args: ["(?i)\\bS0*(\\d+)\\b", "{{ if eq .Query.Type \"tvsearch\" }}{{ else }}T$1{{ end }}"]
+    - name: re_replace
+      args: ["(?i)S0?(\\d{1,2})E(\\d{1,2})", "{{ if eq .Query.Type \"tvsearch\" }}{{ else }}$1x$2{{ end }}"]
+
+  rows:
+    selector: data
+    attribute: attributes
+    count:
+      selector: meta.total
+
+  fields:
+    category:
+      selector: category_id
+    mejorada:
+      selector: types:contains(Mejorada)
+      optional: true
+    corregida:
+      selector: types:contains(Corregida)
+      optional: true
+    audio_editado:
+      selector: types:contains(Audio-Editado)
+      optional: true
+    title_vose:
+      selector: name:contains(VOSE)
+      optional: true
+    title_notvose:
+      selector: name:not(:contains(VOSE))
+      optional: true
+      filters:
+        - name: append
+          args: " SPANISH"
+    title:
+      text: "{{ if .Result.title_vose }}{{ .Result.title_vose }}{{ else }}{{ .Result.title_notvose }}{{ end }}{{ if or .Result.mejorada .Result.corregida .Result.audio_editado }} PROPER{{ else }}{{ end }}"
+      filters:
+        # Replace Spanish season names like T1, MS (MiniSerie), TU (Temporada Unica) for normalized format S1
+        - name: re_replace
+          args: ["(?i)T(\\d{1,2})\\b", "S$1"]
+        - name: re_replace
+          args: ["(\\d{2})[×|x](\\d{2})", "S$1E$2"]
+        - name: re_replace
+          args: ["(\\d{1})[×|x](\\d{2})", "S0$1E$2"]
+        - name: re_replace
+          args: ["(?i)MS\\b", "S1"]
+        - name: re_replace
+          args: ["(?i)TU\\b", "S1"]
+    details:
+      selector: details_link
+    download:
+      selector: download_link
+    infohash:
+      selector: info_hash
+    poster:
+      selector: poster
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/90x135", ""]
+    imdbid:
+      selector: imdb_id
+    tmdbid:
+      selector: tmdb_id
+    tvdbid:
+      selector: tvdb_id
+    files:
+      selector: num_file
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    date:
+      # 2021-10-18T00:34:50.000000Z"
+      selector: created_at
+    size:
+      selector: size
+    downloadvolumefactor:
+      # api returns 0%, 25%, 50%, 75%, 100%
+      selector: freeleech
+      case:
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
+    uploadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: double_upload
+      case:
+        0: 1 # normal
+        1: 2 # double
+# global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
+#    minimumratio:
+#      text: 0.4
+    minimumseedtime:
+      # 7 day (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
+# 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:
@@ -92,40 +92,33 @@ search:
       selector: name:contains(VOSE)
       optional: true
       filters:
-        - name: re_replace
-          args: ["(?i)bdfull", "BluRay"] # BDfull  -> BluRay
-        - name: re_replace
-          args: ["(?i)RedBits", ""] # Delete RedBits
         - name: append
           args: " English" # Add english to fix Sonarr/Radarr language
-        - name: re_replace
-          args: ["\\[|\\]", " "]
-        - name: re_replace
-          args: ["  ", " "]
-        - name: re_replace
-          args: ["(?i)T(\\d{1,2})\\b", "S$1"]
     title_notvose:
       selector: name:not(:contains(VOSE))
       optional: true
+      filters:
+        - name: append
+          args: " Spanish" # Add spanish to fix Sonarr/Radarr language
+    title:
+      text: "{{ if .Result.title_vose }}{{ .Result.title_vose }}{{ else }}{{ .Result.title_notvose }}{{ end }}"
       filters:
         - name: re_replace
           args: ["(?i)bdfull", "BluRay"] # BDfull  -> BluRay
         - name: re_replace
           args: ["(?i)RedBits", ""] # Delete RedBits
-        - name: append
-          args: " Spanish" # Add spanish to fix Sonarr/Radarr language
         - name: re_replace
           args: ["\\[|\\]", " "]
         - name: re_replace
           args: ["  ", " "]
         - name: re_replace
           args: ["(?i)T(\\d{1,2})\\b", "S$1"]
-    title:
-      text: "{{ if .Result.title_vose }}{{ .Result.title_vose }}{{ else }}{{ .Result.title_notvose }}{{ end }}"
     details:
       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/rutor.yml

@@ -8,10 +8,9 @@ encoding: UTF-8
 links:
   - http://rutor.info/ # site does not support https ERR_CONNECTION_REFUSED
   - http://rutor.is/ # site does not support https ERR_CONNECTION_REFUSED
-  - http://6tor.org/
+  - http://new-rutor.org/ # site does not support https ERR_CONNECTION_REFUSED
 legacylinks:
   - http://live-rutor.org/ # domain expired 9 Feb 2020
-  - http://new-rutor.org/ # ERR_NAME_NOT_RESOLVED
   - https://rutor.black-mirror.xyz/
   - https://rutor.unblocked.casa/
   - https://rutor.proxyportal.fun/
@@ -25,6 +24,7 @@ legacylinks:
   - https://rutor.unblocked.monster/
   - https://rutor.nocensor.space/
   - https://rutor.nocensor.work/
+  - http://6tor.org/
 
 caps:
   # unfortunately RuTor does not display categories anywhere in its search results page :-(

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/torrent9.yml

@@ -54,6 +54,7 @@ caps:
     - {id: logiciels, cat: PC, desc: "Software"}
     - {id: jeux-pc, cat: PC/Games, desc: "PC Games"}
     - {id: jeux-consoles, cat: Console/XBox 360, desc: "Console Games"}
+    - {id: other, cat: Other, desc: "Other"} # dummy cat for results missing icon
 
   modes:
     search: [q]
@@ -104,7 +105,7 @@ download:
 
 search:
   paths:
-    - path: "/search_torrent/{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}{{ .Config.sort }}"
+    - path: "{{ if .Keywords }}/search_torrent/{{ .Keywords }}{{ .Config.sort }}{{ else }}{{ end }}"
   keywordsfilters:
     # if searching for season packs with S01 to saison 1 #9712
     - name: re_replace
@@ -125,6 +126,9 @@ search:
 
   fields:
     category:
+      text: other
+    category|noappend:
+      optional: true
       selector: td:nth-child(1) i
       case:
         i[class="fa fa-video-camera"]: films
@@ -179,13 +183,16 @@ search:
     download:
       selector: td:nth-child(1) a
       attribute: href
-    date:
-      selector: td:nth-child(2)
+    date_optional:
+      optional: true
+      selector: td:nth-child(2):contains("/")
       filters:
         - name: dateparse
           args: "02/01/2006"
+    date:
+      text: "{{ if .Result.date_optional }}{{ .Result.date_optional }}{{ else }}now{{ end }}"
     size:
-      selector: td:nth-child(3)
+      selector: "{{ if .Keywords }}td:nth-child(3){{ else }}td:nth-child(2){{ end }}"
       filters:
         - name: replace
           args: ["Ko", "KB"]
@@ -196,12 +203,12 @@ search:
         - name: replace
           args: ["To", "TB"]
     seeders_optional:
-      selector: td:nth-child(4)
+      selector: "{{ if .Keywords }}td:nth-child(4){{ else }}td:nth-child(3){{ end }}"
       optional: true
     seeders:
       text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
     leechers_optional:
-      selector: td:nth-child(5)
+      selector: "{{ if .Keywords }}td:nth-child(5){{ else }}td:nth-child(4){{ end }}"
       optional: true
     leechers:
       text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"

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]
@@ -108,17 +108,16 @@ search:
       selector: name:contains(VOSE)
       optional: true
       filters:
-        - name: re_replace
-          args: ["^ *\\[[^\\]]*\\] *", ""] # Remove prefix tags
-        - name: re_replace
-          args: ["(?i)\\bT(\\d+)", "S$1"]
-        - name: re_replace
-          args: ["UHDRip", "BDRip"] # Fix for Radarr
         - name: append
           args: " ENGLiSH"
     title_notvose:
       selector: name:not(:contains(VOSE))
       optional: true
+      filters:
+        - name: append
+          args: " SPANiSH"
+    title:
+      text: "{{ if .Result.title_vose }}{{ .Result.title_vose }}{{ else }}{{ .Result.title_notvose }}{{ end }}"
       filters:
         - name: re_replace
           args: ["^ *\\[[^\\]]*\\] *", ""] # Remove prefix tags
@@ -126,10 +125,6 @@ search:
           args: ["(?i)\\bT(\\d+)", "S$1"]
         - name: re_replace
           args: ["UHDRip", "BDRip"] # Fix for Radarr
-        - name: append
-          args: " SPANiSH"
-    title:
-      text: "{{ if .Result.title_vose }}{{ .Result.title_vose }}{{ else }}{{ .Result.title_notvose }}{{ end }}"
     details:
       selector: details_link
     download:
@@ -179,4 +174,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://torrentqq148.com/
 legacylinks:
-  - https://torrentqq130.com/
-  - https://torrentqq131.com/
   - https://torrentqq132.com/
   - https://torrentqq133.com/
   - https://torrentqq134.com/
@@ -24,6 +22,9 @@ legacylinks:
   - https://torrentqq142.com/
   - https://torrentqq143.com/
   - https://torrentqq144.com/
+  - https://torrentqq145.com/
+  - https://torrentqq146.com/
+  - https://torrentqq147.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/underverse.yml

@@ -1,760 +0,0 @@
----
-id: underverse
-name: Underverse
-description: "Underverse is a RUSSIAN Public Torrent Tracker for MOVIES / TV / MUSIC / GENERAL"
-language: ru-RU
-type: public
-encoding: windows-1251
-links:
-  - https://underver.se/
-legacylinks:
-  - https://underverse.su/
-
-caps:
-  categorymappings:
-    # Наш торрент трекер
-    # Our torrent tracker
-    - {id: 797, cat: PC, desc: " |- UV-Info - помощник релизера"}
-    - {id: 1007, cat: PC, desc: " |- Proxygen - обходим блокировки"}
-    # Фильмы, сериалы, мультфильмы обычного разрешения
-    # Movies, TV shows, cartoons of normal resolution
-    - {id: 15, cat: Movies/SD, desc: "Помощь по разделу 'Видео'"}
-    - {id: 1119, cat: Movies/SD, desc: " |- Зарубежное кино AVC"}
-    - {id: 1121, cat: Movies/SD, desc: " |- Классика зарубежного кино AVC"}
-    - {id: 1120, cat: Movies/SD, desc: " |- Наше кино AVC"}
-    - {id: 1122, cat: TV/SD, desc: " |- Мультфильмы AVC"}
-    - {id: 1123, cat: TV/Documentary, desc: " |- Документальные фильмы AVC"}
-    - {id: 4, cat: Movies/SD, desc: "HQ-рипы релиз-группы HQ Underverse"}
-    - {id: 29, cat: Movies/SD, desc: " |- Зарубежное кино HQ"}
-    - {id: 30, cat: Movies/SD, desc: " |- Классика зарубежного кино HQ"}
-    - {id: 31, cat: Movies/SD, desc: " |- Наше кино HQ"}
-    - {id: 32, cat: Movies/SD, desc: " |- Арт-хаус и Авторское кино HQ"}
-    - {id: 33, cat: TV/SD, desc: " |- Мультфильмы HQ"}
-    - {id: 34, cat: TV/Anime, desc: " |- Аниме HQ"}
-    - {id: 35, cat: TV/Documentary, desc: " |- Документальные фильмы HQ"}
-    - {id: 2, cat: Movies/SD, desc: "Художественное кино (популярные художественные фильмы)"}
-    - {id: 704, cat: Movies/SD, desc: " |- Новинки кино [CAMRip, TS, DVDScr, WP, TC]"}
-    - {id: 16, cat: Movies/SD, desc: " |- Зарубежное кино [DVDRip, Low-Res HDRip, и т.д.]"}
-    - {id: 17, cat: Movies/SD, desc: " |- Классика зарубежного кино"}
-    - {id: 18, cat: Movies/SD, desc: " |- Наше кино [DVDRip, Low-Res HDRip, и т.д.]"}
-    - {id: 19, cat: Movies/SD, desc: " |- Кино СССР"}
-    - {id: 5, cat: Movies/SD, desc: "Movies In Original Language"}
-    - {id: 378, cat: Movies/SD, desc: " |- Popular feature films"}
-    - {id: 379, cat: Movies/SD, desc: " |- Art-house & author's movies"}
-    - {id: 380, cat: TV/SD, desc: " |- TV Series"}
-    - {id: 382, cat: TV/SD, desc: " |- Animation"}
-    - {id: 386, cat: TV/SD, desc: " |- Other video in original"}
-    - {id: 6, cat: TV/SD, desc: "Сериалы"}
-    - {id: 38, cat: TV/SD, desc: " |- Зарубежные сериалы"}
-    - {id: 39, cat: TV/SD, desc: " |- xUSSR сериалы"}
-    - {id: 628, cat: TV/SD, desc: " |- Латиноамериканские сериалы"}
-    - {id: 7, cat: TV/SD, desc: "Мультфильмы"}
-    - {id: 738, cat: TV/SD, desc: " |- Новинки мультфильмов [CAMRip, TS, DVDScr, WP, TC]"}
-    - {id: 41, cat: TV/SD, desc: " |- Зарубежные мультфильмы"}
-    - {id: 739, cat: TV/SD, desc: " |- Отечественные мультфильмы"}
-    - {id: 42, cat: TV/SD, desc: " |- Мультсериалы"}
-    - {id: 740, cat: TV/SD, desc: " |- Короткометражные мультфильмы"}
-    - {id: 13, cat: TV/SD, desc: "Звуковые дорожки к фильмам"}
-    - {id: 91, cat: TV/SD, desc: " |- Звуковые дорожки 2.0"}
-    - {id: 90, cat: TV/SD, desc: " |- Звуковые дорожки 5.1"}
-    - {id: 703, cat: TV/SD, desc: " |- Звуковые дорожки lossless и True-HD"}
-    - {id: 1111, cat: TV/SD, desc: "Архив"}
-    - {id: 863, cat: TV/SD, desc: " |- Архив (звуковые дорожки к фильмам)"}
-    - {id: 856, cat: TV/SD, desc: " |- Архив (мультфильмы)"}
-    - {id: 855, cat: TV/SD, desc: " |- Архив (Сериалы)"}
-    - {id: 852, cat: TV/SD, desc: " |- Архив (художественные фильмы)"}
-    - {id: 854, cat: TV/SD, desc: " |- Архив (HQ Underverse)"}
-    # Фильмы, сериалы, мультфильмы высокого качества DVD и HD-Video
-    # Movies, TV shows, high-quality cartoons DVD and HD-Video
-    - {id: 97, cat: Movies/HD, desc: "Зарубежное кино высокого качества"}
-    - {id: 99, cat: Movies/HD, desc: " |- Зарубежное кино [DVD / HDDVD / BD / Remux]"}
-    - {id: 100, cat: Movies/HD, desc: " |- Зарубежное кино [HDDVDRip / BDRip / WEB-DL / HDTV 1080/720р]"}
-    - {id: 103, cat: Movies/HD, desc: "Наше кино высокого качества"}
-    - {id: 105, cat: Movies/HD, desc: " |- Наше кино [DVD / HDDVD / BD / Remux]"}
-    - {id: 106, cat: Movies/HD, desc: " |- Наше кино [HDDVDRip / BDRip / WEB-DL / HDTV 1080/720р]"}
-    - {id: 1017, cat: TV/HD, desc: "Сериалы высокого качества"}
-    - {id: 1018, cat: TV/HD, desc: " |- Зарубежные сериалы [BD / Remux / BDRip / WEB-DL / HDTV 1080/.."}
-    - {id: 1019, cat: TV/HD, desc: " |- xUSSR сериалы [BD / Remux / BDRip / WEB-DL / HDTV 1080/720р]"}
-    - {id: 1022, cat: TV/HD, desc: "Мультфильмы высокого качества"}
-    - {id: 1023, cat: TV/HD, desc: " |- Мультфильмы [DVD / HDDVD / BD / Remux]"}
-    - {id: 1024, cat: TV/HD, desc: " |- Мультфильмы [HDDVDRip / BDRip / WEB-DL / HDTV 1080/720р]"}
-    - {id: 111, cat: TV/Documentary, desc: "Документальное кино высокого качества"}
-    - {id: 113, cat: TV/Documentary, desc: " |- Документальное кино [DVD / HDDVD / BD / Remux]"}
-    - {id: 114, cat: TV/Documentary, desc: " |- Документальное кино [HDDVDRip / BDRip / WEB-DL / HDTV 1080/7.."}
-    - {id: 118, cat: TV/HD, desc: "Другое видео высокого качества"}
-    - {id: 119, cat: TV/HD, desc: " |- Музыкальные HD DVD, Blu-Ray"}
-    - {id: 128, cat: TV/HD, desc: " |- Музыкальные HDTV"}
-    - {id: 120, cat: TV/HD, desc: " |- Музыкальные DVD"}
-    - {id: 121, cat: TV/HD, desc: " |- Трейлеры HD DVD, Blu-Ray"}
-    - {id: 122, cat: TV/HD, desc: " |- Другое HD DVD, Blu-Ray"}
-    - {id: 129, cat: TV/HD, desc: " |- Другое HDTV"}
-    - {id: 1112, cat: TV/HD, desc: "Архив"}
-    - {id: 874, cat: TV/HD, desc: " |- Архив (другое видео высокого качества)"}
-    - {id: 873, cat: TV/HD, desc: " |- Архив (документальное кино высокого качества)"}
-    - {id: 872, cat: TV/HD, desc: " |- Архив (наше кино высокого качества)"}
-    - {id: 871, cat: TV/HD, desc: " |- Архив (зарубежное кино высокого качества)"}
-    # Документальное видео и ТВ
-    # Documentary video and TV
-    - {id: 9, cat: TV/Documentary, desc: "Документальное кино"}
-    - {id: 58, cat: TV/Documentary, desc: " |- Discovery"}
-    - {id: 59, cat: TV/Documentary, desc: " |- National Geographic"}
-    - {id: 60, cat: TV/Documentary, desc: " |- BBC"}
-    - {id: 61, cat: TV/Documentary, desc: " |- Информационно-аналитические передачи"}
-    - {id: 62, cat: TV/Documentary, desc: " |- Научно-популярные фильмы"}
-    - {id: 63, cat: TV/Documentary, desc: " |- Военные хроники"}
-    - {id: 64, cat: TV/Documentary, desc: " |- Исторические фильмы"}
-    - {id: 65, cat: TV/Documentary, desc: " |- Личности"}
-    - {id: 66, cat: TV/Documentary, desc: " |- Рыбалка"}
-    - {id: 75, cat: TV/Documentary, desc: " |- Другие фильмы"}
-    - {id: 10, cat: TV/Documentary, desc: "Спортивное видео"}
-    - {id: 69, cat: TV/Documentary, desc: " |- Футбол"}
-    - {id: 943, cat: TV/Documentary, desc: " |- Баскетбол"}
-    - {id: 742, cat: TV/Documentary, desc: " |- Американский футбол"}
-    - {id: 70, cat: TV/Documentary, desc: " |- Хоккей"}
-    - {id: 71, cat: TV/Documentary, desc: " |- Формула-1 и автоспорт"}
-    - {id: 964, cat: TV/Documentary, desc: " |- Биатлон"}
-    - {id: 72, cat: TV/Documentary, desc: " |- Бокс"}
-    - {id: 73, cat: TV/Documentary, desc: " |- Бои без правил и контактные виды спорта"}
-    - {id: 702, cat: TV/Documentary, desc: " |- Экстремальные виды спорта"}
-    - {id: 74, cat: TV/Documentary, desc: " |- Другие фильмы"}
-    - {id: 671, cat: TV/Documentary, desc: " |- Театр и Сценические постановки"}
-    - {id: 836, cat: TV/Documentary, desc: " |- Мюзиклы"}
-    - {id: 837, cat: TV/Documentary, desc: " |- Балет"}
-    - {id: 838, cat: TV/Documentary, desc: " |- Опера, оперетта"}
-    - {id: 11, cat: TV/Documentary, desc: "Развлекательные телепередачи и шоу, приколы и юмор"}
-    - {id: 78, cat: TV/Documentary, desc: " |- КВН"}
-    - {id: 81, cat: TV/Documentary, desc: " |- ПостКВН"}
-    - {id: 79, cat: TV/Documentary, desc: " |- Comedy Club"}
-    - {id: 80, cat: TV/Documentary, desc: " |- Наша Russia, Наша Belarussia, Файна Юкрайна"}
-    - {id: 1143, cat: TV/Documentary, desc: " |- Хорошие шутки "}
-    - {id: 82, cat: TV/Documentary, desc: " |- Телепередачи и шоу"}
-    - {id: 83, cat: TV/Documentary, desc: " |- Другие развлекательные передачи"}
-    - {id: 635, cat: TV/Documentary, desc: "Обучающее видео"}
-    - {id: 636, cat: TV/Documentary, desc: " |- Обучение иностранным языкам"}
-    - {id: 637, cat: TV/Documentary, desc: " |- Фитнес и аэробика"}
-    - {id: 638, cat: TV/Documentary, desc: " |- Психология"}
-    - {id: 639, cat: TV/Documentary, desc: " |- Обучение боевым искусствам"}
-    - {id: 640, cat: TV/Documentary, desc: " |- Игра на гитаре"}
-    - {id: 641, cat: TV/Documentary, desc: " |- Компьютерные видеоуроки"}
-    - {id: 642, cat: TV/Documentary, desc: " |- Другое обучающее видео"}
-    - {id: 12, cat: TV/Documentary, desc: "Другое видео"}
-    - {id: 644, cat: TV/Documentary, desc: " |- Трейлеры"}
-    - {id: 645, cat: TV/Documentary, desc: " |- Дополнительные материалы"}
-    - {id: 87, cat: TV/Documentary, desc: " |- Другое видео"}
-    - {id: 1113, cat: TV/Documentary, desc: "Архив"}
-    - {id: 862, cat: TV/Documentary, desc: " |- Архив (другое видео)"}
-    - {id: 861, cat: TV/Documentary, desc: " |- Архив (обучающее видео)"}
-    - {id: 860, cat: TV/Documentary, desc: " |- Архив (телешоу)"}
-    - {id: 859, cat: TV/Documentary, desc: " |- Архив (театр, опера, балет)"}
-    - {id: 858, cat: TV/Documentary, desc: " |- Архив (спортивное видео)"}
-    - {id: 857, cat: TV/Documentary, desc: " |- Архив (документальное кино)"}
-    # Аниме и все что с ним связано
-    # Anime and everything related to it
-    - {id: 8, cat: TV/Anime, desc: "Аниме"}
-    - {id: 48, cat: TV/Anime, desc: " |- Аниме"}
-    - {id: 623, cat: TV/Anime, desc: " |- Аниме лицензии"}
-    - {id: 864, cat: TV/Anime, desc: " |- Архив"}
-    - {id: 775, cat: TV/Anime, desc: "Аниме DVD-Video"}
-    - {id: 50, cat: TV/Anime, desc: " |- Аниме DVD-Video"}
-    - {id: 785, cat: TV/Anime, desc: " |- Аниме лицензии DVD-Video"}
-    - {id: 865, cat: TV/Anime, desc: " |- Архив"}
-    - {id: 776, cat: TV/Anime, desc: "Аниме HD-Video"}
-    - {id: 49, cat: TV/Anime, desc: " |- Аниме HD-Video"}
-    - {id: 786, cat: TV/Anime, desc: " |- Аниме лицензии HD-Video"}
-    - {id: 866, cat: TV/Anime, desc: " |- Архив"}
-    - {id: 779, cat: TV/Anime, desc: "Dorama и live-action"}
-    - {id: 53, cat: TV/Anime, desc: " |- Dorama и live-action"}
-    - {id: 867, cat: TV/Anime, desc: " |- Архив"}
-    - {id: 777, cat: TV/Anime, desc: "JMusic, OST & AMV"}
-    - {id: 55, cat: TV/Anime, desc: " |- Anime soundtracks [lossy]"}
-    - {id: 699, cat: TV/Anime, desc: " |- Anime soundtracks [lossless]"}
-    - {id: 783, cat: TV/Anime, desc: " |- JMusic [lossy]"}
-    - {id: 784, cat: TV/Anime, desc: " |- JMusic [lossless]"}
-    - {id: 54, cat: TV/Anime, desc: " |- AMV и др. ролики"}
-    - {id: 868, cat: TV/Anime, desc: " |- Архив"}
-    - {id: 778, cat: TV/Anime, desc: "Манга и прочий арт"}
-    - {id: 51, cat: TV/Anime, desc: " |- Манга"}
-    - {id: 700, cat: TV/Anime, desc: " |- Обои, артбуки и прочие изображения (Anime)"}
-    - {id: 869, cat: TV/Anime, desc: " |- Архив"}
-    - {id: 781, cat: XXX, desc: "Хентай"}
-    - {id: 52, cat: XXX, desc: " |- [18+] Хентай"}
-    - {id: 695, cat: XXX, desc: " |- [18+] 3D Хентай"}
-    - {id: 782, cat: XXX, desc: " |- [18+] DVD Хентай"}
-    - {id: 870, cat: XXX, desc: " |- Архив"}
-    # Музыка lossy (MP3, OGG, WMA, ...)
-    # Music lossy (MP3, OGG, WMA, ...)
-    - {id: 145, cat: Audio, desc: "Популярная Музыка"}
-    - {id: 146, cat: Audio, desc: " |- Зарубежная Pop Музыка"}
-    - {id: 147, cat: Audio, desc: " |- Отечественная Pop Музыка"}
-    - {id: 148, cat: Audio, desc: " |- Eurodance, Technopop"}
-    - {id: 149, cat: Audio, desc: " |- Сборники Pop, Disco, Dance"}
-    - {id: 150, cat: Audio, desc: " |- Сборники Eurodance, Technopop"}
-    - {id: 154, cat: Audio, desc: "Рок Музыка"}
-    - {id: 155, cat: Audio, desc: " |- Зарубежный Hard, Progressive, Soft, Melodic, AOR, Folk, Clas.."}
-    - {id: 156, cat: Audio, desc: " |- Зарубежный Black, Death, Heavy, Thrash, Power, Folk, Gothic .."}
-    - {id: 157, cat: Audio, desc: " |- Зарубежный Punk, Hardcore, Grunge, Alternative"}
-    - {id: 969, cat: Audio, desc: " |- Зарубежный Indie, Post-Punk, Brit-Pop, New Wave, Shoegaze"}
-    - {id: 820, cat: Audio, desc: " |- Зарубежный Metalcore, Deathcore, Post-Hardcore, Mathcore, Gr.."}
-    - {id: 646, cat: Audio, desc: " |- Зарубежный Rock & Roll, Rockabilly, Psychobilly"}
-    - {id: 158, cat: Audio, desc: " |- Отечественный Hard, Progressive, Melodic, AOR"}
-    - {id: 159, cat: Audio, desc: " |- Отечественный Heavy, Thrash, Extreme"}
-    - {id: 160, cat: Audio, desc: " |- Отечественный Punk, Grunge, Alternative"}
-    - {id: 822, cat: Audio, desc: " |- Отечественный Metalcore, Deathcore, Mathcore, Grind, Brutal .."}
-    - {id: 647, cat: Audio, desc: " |- Отечественнный Rock & Roll, Rockabilly, Psychobilly"}
-    - {id: 161, cat: Audio, desc: " |- Cборники"}
-    - {id: 165, cat: Audio, desc: "Электронная Музыка"}
-    - {id: 166, cat: Audio, desc: " |- Trance"}
-    - {id: 168, cat: Audio, desc: " |- GoaTrance, PsyTrance"}
-    - {id: 169, cat: Audio, desc: " |- PsyChill, Ambient Dub"}
-    - {id: 179, cat: Audio, desc: " |- Chillout, Lounge, Downtempo"}
-    - {id: 170, cat: Audio, desc: " |- House"}
-    - {id: 172, cat: Audio, desc: " |- Techno"}
-    - {id: 173, cat: Audio, desc: " |- Drum & Bass, Jungle"}
-    - {id: 171, cat: Audio, desc: " |- Hardcore, Hardstyle, Jumpstyle"}
-    - {id: 175, cat: Audio, desc: " |- Electro, Breakbeat, Dubstep"}
-    - {id: 182, cat: Audio, desc: " |- Experimental, Minimal, 8-bit"}
-    - {id: 177, cat: Audio, desc: " |- IDM, Easy Listening"}
-    - {id: 180, cat: Audio, desc: " |- Nu Jazz, Acid Jazz, Future Jazz"}
-    - {id: 181, cat: Audio, desc: " |- Trip Hop, Abstract Hip Hop"}
-    - {id: 183, cat: Audio, desc: " |- Traditional Electronic, Ambient, NewAge"}
-    - {id: 185, cat: Audio, desc: " |- EBM, Industrial, Dark Electro, Darkwave, Gothic Synth"}
-    - {id: 187, cat: Audio, desc: " |- Synthpop, Futurepop, Electropop, Spacesynth"}
-    - {id: 186, cat: Audio, desc: " |- Indie Electronic, New Wave"}
-    - {id: 174, cat: Audio, desc: " |- Drum & Bass, Jungle [Radioshows, Podcasts, Livesets, Mixes]"}
-    - {id: 176, cat: Audio, desc: " |- Electro, Breakbeat [Radioshows, Podcasts, Livesets, Mixes]"}
-    - {id: 178, cat: Audio, desc: " |- IDM [Radioshow, Podcast, Liveset, Mixes]"}
-    - {id: 167, cat: Audio, desc: " |- Trance [Radioshows, Podcasts, Livesets, Mixes]"}
-    - {id: 184, cat: Audio, desc: " |- Traditional Electronic, Ambient [Radioshows, Podcasts, Lives.."}
-    - {id: 188, cat: Audio, desc: " |- Сборники"}
-    - {id: 192, cat: Audio, desc: "Рэп, Хип-Хоп и Ритм-н-блюз Музыка"}
-    - {id: 193, cat: Audio, desc: " |- Зарубежный Rap, Hip-Hop"}
-    - {id: 194, cat: Audio, desc: " |- Отечественный Rap, Hip-Hop"}
-    - {id: 195, cat: Audio, desc: " |- Зарубежный R'n'B"}
-    - {id: 196, cat: Audio, desc: " |- Отечественный R'n'B"}
-    - {id: 197, cat: Audio, desc: " |- Сборники"}
-    - {id: 201, cat: Audio, desc: "Реггей, Даб и Ска Музыка"}
-    - {id: 202, cat: Audio, desc: " |- Reggae"}
-    - {id: 203, cat: Audio, desc: " |- Ska-Punk, Ska-Core"}
-    - {id: 204, cat: Audio, desc: " |- Ska-Jazz, Traditional Sound"}
-    - {id: 205, cat: Audio, desc: " |- Jamaica Ska, Rocksteady"}
-    - {id: 206, cat: Audio, desc: " |- Dancehall, Raggamuffin, Reggaeton"}
-    - {id: 207, cat: Audio, desc: " |- Сборники"}
-    - {id: 211, cat: Audio, desc: "Блюз и Джаз Музыка"}
-    - {id: 212, cat: Audio, desc: " |- Blues"}
-    - {id: 213, cat: Audio, desc: " |- Jazz"}
-    - {id: 214, cat: Audio, desc: " |- Сборники"}
-    - {id: 218, cat: Audio, desc: "Классическая Музыка"}
-    - {id: 219, cat: Audio, desc: " |- Вокальные и хоровые искусства"}
-    - {id: 220, cat: Audio, desc: " |- Оркестровая музыка"}
-    - {id: 221, cat: Audio, desc: " |- Камерная и инструментальная музыка"}
-    - {id: 223, cat: Audio, desc: " |- Классическая музыка в современной обработке"}
-    - {id: 224, cat: Audio, desc: " |- Современная инструментальная музыка"}
-    - {id: 225, cat: Audio, desc: " |- Сборники"}
-    - {id: 227, cat: Audio, desc: "Ретро, Шансон, Военная музыка и Барды"}
-    - {id: 228, cat: Audio, desc: " |- Шансон"}
-    - {id: 229, cat: Audio, desc: " |- Военные и патриотические песни"}
-    - {id: 230, cat: Audio, desc: " |- Авторские песни, Барды"}
-    - {id: 237, cat: Audio, desc: " |- Кантри"}
-    - {id: 231, cat: Audio, desc: " |- Зарубежная Ретро Музыка"}
-    - {id: 232, cat: Audio, desc: " |- Отечественная Ретро Музыка"}
-    - {id: 233, cat: Audio, desc: " |- Сборники"}
-    - {id: 239, cat: Audio, desc: "Музыка других жанров"}
-    - {id: 240, cat: Audio, desc: " |- Зарубежная музыка других жанров"}
-    - {id: 241, cat: Audio, desc: " |- Отечественная музыка других жанров"}
-    - {id: 242, cat: Audio, desc: " |- Православные песнопения"}
-    - {id: 243, cat: Audio, desc: " |- Мюзикл"}
-    - {id: 244, cat: Audio, desc: " |- Неофициальные и внежанровые сборники"}
-    - {id: 247, cat: Audio, desc: "Саундтрэки"}
-    - {id: 152, cat: Audio, desc: "Музыкальное Видео"}
-    - {id: 1110, cat: Audio, desc: "Архив"}
-    - {id: 163, cat: Audio, desc: " |- Архив (музыкальное видео)"}
-    - {id: 885, cat: Audio, desc: " |- Архив (саундтреки и караоке)"}
-    - {id: 884, cat: Audio, desc: " |- Архив (музыка других жанров)"}
-    - {id: 883, cat: Audio, desc: " |- Архив (музыка народов мира)"}
-    - {id: 882, cat: Audio, desc: " |- Архив (ретро, шансон, военная музыка, барды)"}
-    - {id: 881, cat: Audio, desc: " |- Архив (классическая музыка)"}
-    - {id: 880, cat: Audio, desc: " |- Архив (блюз, джаз)"}
-    - {id: 879, cat: Audio, desc: " |- Архив (регги, даб, ска...)"}
-    - {id: 878, cat: Audio, desc: " |- Архив (рэп, хип-хоп)"}
-    - {id: 877, cat: Audio, desc: " |- Архив (электронная музыка)"}
-    - {id: 876, cat: Audio, desc: " |- Архив (рок)"}
-    - {id: 875, cat: Audio, desc: " |- Архив (популярная музыка)"}
-    # Музыка высокого качества (lossless)
-    # High quality music (lossless)
-    - {id: 252, cat: Audio/Lossless, desc: "[HQ] Популярная Музыка"}
-    - {id: 253, cat: Audio/Lossless, desc: " |- Зарубежная Поп Музыка (Lossless)"}
-    - {id: 255, cat: Audio/Lossless, desc: " |- Отечественная Поп Музыка (Lossless)"}
-    - {id: 257, cat: Audio/Lossless, desc: " |- Сборники"}
-    - {id: 260, cat: Audio/Lossless, desc: "[HQ] Рок Музыка"}
-    - {id: 261, cat: Audio/Lossless, desc: " |- Зарубежный Hard, Progressive, Melodic, AOR (Lossless)"}
-    - {id: 262, cat: Audio/Lossless, desc: " |- Зарубежный Heavy, Thrash, Extreme (Lossless)"}
-    - {id: 263, cat: Audio/Lossless, desc: " |- Зарубежный Punk, Grunge, Alternative (Lossless)"}
-    - {id: 821, cat: Audio/Lossless, desc: " |- Зарубежный Metalcore, Deathcore, Mathcore,Grind, Brutal Deat.."}
-    - {id: 648, cat: Audio/Lossless, desc: " |- Зарубежный Rock&Roll, Rockabilly, Psychobilly (Lossless)"}
-    - {id: 265, cat: Audio/Lossless, desc: " |- Отечественный Hard, Progressive, Melodic, AOR (Lossless)"}
-    - {id: 266, cat: Audio/Lossless, desc: " |- Отечественный Heavy, Thrash, Extreme (Lossless)"}
-    - {id: 823, cat: Audio/Lossless, desc: " |- Отечественный Metalcore, Deathcore, Mathcore,Grind, Brutal D.."}
-    - {id: 649, cat: Audio/Lossless, desc: " |- Отечественный Rock&Roll, Rockabilly (Lossless)"}
-    - {id: 267, cat: Audio/Lossless, desc: " |- Отечественный Punk, Grunge, Alternative (Lossless)"}
-    - {id: 269, cat: Audio/Lossless, desc: " |- Сборники"}
-    - {id: 272, cat: Audio/Lossless, desc: "[HQ] Электронная музыка"}
-    - {id: 273, cat: Audio/Lossless, desc: " |- Trance, GoaTrance, PsyTrance (Lossless)"}
-    - {id: 274, cat: Audio/Lossless, desc: " |- PsyChill, Ambient Dub (Lossless)"}
-    - {id: 281, cat: Audio/Lossless, desc: " |- Chillout, Lounge, Downtempo (Lossless)"}
-    - {id: 275, cat: Audio/Lossless, desc: " |- House (Lossless)"}
-    - {id: 277, cat: Audio/Lossless, desc: " |- Techno (Lossless)"}
-    - {id: 278, cat: Audio/Lossless, desc: " |- Drum & Bass, Jungle  (Lossless)"}
-    - {id: 276, cat: Audio/Lossless, desc: " |- Hardcore, Hardstyle, Jumpstyle (Lossless)"}
-    - {id: 279, cat: Audio/Lossless, desc: " |- Electro, Breakbeat (Lossless)"}
-    - {id: 284, cat: Audio/Lossless, desc: " |- Experimental, Minimal, 8-bit (Lossless)"}
-    - {id: 280, cat: Audio/Lossless, desc: " |- IDM, Easy Listening (Lossless)"}
-    - {id: 282, cat: Audio/Lossless, desc: " |- Nu Jazz, Acid Jazz, Future Jazz (Lossless)"}
-    - {id: 283, cat: Audio/Lossless, desc: " |- Trip Hop, Abstract Hip-Hop (Lossless)"}
-    - {id: 285, cat: Audio/Lossless, desc: " |- Traditional Electronic, Ambient, NewAge (Lossless)"}
-    - {id: 286, cat: Audio/Lossless, desc: " |- EBM, Industrial, Dark Electro, Darkwave, Gothic Synth (Lossl.."}
-    - {id: 287, cat: Audio/Lossless, desc: " |- Synthpop, Futurepop, Electropop, Spacesynth (Lossless)"}
-    - {id: 288, cat: Audio/Lossless, desc: " |- Indie Electronic, New Wave (Lossless)"}
-    - {id: 291, cat: Audio/Lossless, desc: " |- Сборники"}
-    - {id: 294, cat: Audio/Lossless, desc: "[HQ] Рэп, Хип-Хоп и Ритм-н-блюз Музыка"}
-    - {id: 295, cat: Audio/Lossless, desc: " |- Зарубежный Rap, Hip-Hop (Lossless)"}
-    - {id: 296, cat: Audio/Lossless, desc: " |- Отечественный Rap, Hip-Hop (Lossless)"}
-    - {id: 297, cat: Audio/Lossless, desc: " |- Зарубежный R'n'B (Lossless)"}
-    - {id: 298, cat: Audio/Lossless, desc: " |- Отечественный R'n'B (Lossless)"}
-    - {id: 300, cat: Audio/Lossless, desc: " |- Сборники"}
-    - {id: 303, cat: Audio/Lossless, desc: "[HQ] Реггей, Даб и Ска Музыка"}
-    - {id: 304, cat: Audio/Lossless, desc: " |- Reggae (Lossless)"}
-    - {id: 305, cat: Audio/Lossless, desc: " |- Ska-Punk, Ska-Core (Lossless)"}
-    - {id: 306, cat: Audio/Lossless, desc: " |- Ska-Jazz, SkaMusic, Traditional Sound (Lossless)"}
-    - {id: 307, cat: Audio/Lossless, desc: " |- Jamaica Ska, Rocksteady (Lossless)"}
-    - {id: 308, cat: Audio/Lossless, desc: " |- Dancehall, Raggamuffin, Reggaeton (Lossless)"}
-    - {id: 309, cat: Audio/Lossless, desc: " |- Сборники"}
-    - {id: 312, cat: Audio/Lossless, desc: "[HQ] Блюз и Джаз Музыка"}
-    - {id: 313, cat: Audio/Lossless, desc: " |- Blues (Lossless)"}
-    - {id: 314, cat: Audio/Lossless, desc: " |- Jazz (Lossless)"}
-    - {id: 317, cat: Audio/Lossless, desc: " |- Сборники"}
-    - {id: 320, cat: Audio/Lossless, desc: "[HQ] Классическая Музыка"}
-    - {id: 321, cat: Audio/Lossless, desc: " |- Оркестровая музыка (Lossless)"}
-    - {id: 323, cat: Audio/Lossless, desc: " |- Вокальные и хоровые искусства (Lossless)"}
-    - {id: 325, cat: Audio/Lossless, desc: " |- Камерная и инструментальная музыка (Lossless)"}
-    - {id: 327, cat: Audio/Lossless, desc: " |- Современная инструментальная музыка (Lossless, DVDAudio, DTS.."}
-    - {id: 328, cat: Audio/Lossless, desc: " |- Сборники"}
-    - {id: 330, cat: Audio/Lossless, desc: "[HQ] Ретро, Шансон, Военная музыка и Барды"}
-    - {id: 331, cat: Audio/Lossless, desc: " |- Шансон (Lossless)"}
-    - {id: 332, cat: Audio/Lossless, desc: " |- Военные и патриотические песни (Lossless)"}
-    - {id: 333, cat: Audio/Lossless, desc: " |- Авторские песни, Барды (Lossless)"}
-    - {id: 334, cat: Audio/Lossless, desc: " |- Зарубежная Ретро Музыка (Lossless)"}
-    - {id: 335, cat: Audio/Lossless, desc: " |- Отечественная Ретро Музыка (Lossless)"}
-    - {id: 337, cat: Audio/Lossless, desc: " |- Сборники / Дискографии"}
-    - {id: 343, cat: Audio/Lossless, desc: "[HQ] Музыка других жанров"}
-    - {id: 731, cat: Audio/Lossless, desc: " |- [HQ] Неофициальные и внежанровые сборники"}
-    - {id: 344, cat: Audio/Lossless, desc: " |- Зарубежная музыка других жанров (Lossless)"}
-    - {id: 345, cat: Audio/Lossless, desc: " |- Отечественная музыка других жанров (Lossless)"}
-    - {id: 346, cat: Audio/Lossless, desc: " |- Православные песнопения (Lossless)"}
-    - {id: 347, cat: Audio/Lossless, desc: " |- Мюзикл (Lossless)"}
-    - {id: 350, cat: Audio/Lossless, desc: "[HQ] Саундтрэки"}
-    - {id: 290, cat: Audio/Lossless, desc: "[HQ] Оцифровки с Виниловых носителей"}
-    - {id: 1114, cat: Audio/Lossless, desc: "Архив"}
-    - {id: 896, cat: Audio/Lossless, desc: " |- Архив (HQ саундтреки)"}
-    - {id: 895, cat: Audio/Lossless, desc: " |- Архив (HQ музыка других жанров)"}
-    - {id: 894, cat: Audio/Lossless, desc: " |- Архив (HQ музыка народов мира)"}
-    - {id: 893, cat: Audio/Lossless, desc: " |- Архив (HQ ретро, шансон, военная музыка, барды)"}
-    - {id: 892, cat: Audio/Lossless, desc: " |- Архив (HQ классическая музыка)"}
-    - {id: 891, cat: Audio/Lossless, desc: " |- Архив (HQ блюз и джаз)"}
-    - {id: 890, cat: Audio/Lossless, desc: " |- Архив (HQ регги, даб, ска)"}
-    - {id: 889, cat: Audio/Lossless, desc: " |- Архив (HQ рэп, хип-хоп)"}
-    - {id: 888, cat: Audio/Lossless, desc: " |- Архив (HQ электронная музыка)"}
-    - {id: 887, cat: Audio/Lossless, desc: " |- Архив (HQ рок)"}
-    - {id: 886, cat: Audio/Lossless, desc: " |- Архив (HQ популярная музыка)"}
-    # Игры для PC и Консолей
-    # PC and Console Games
-    - {id: 396, cat: PC/Games, desc: " |- Игры для РС (общение)"}
-    - {id: 356, cat: PC/Games, desc: "Горячие новинки"}
-    - {id: 369, cat: PC/Games, desc: " |- Action [FPS/TPS]"}
-    - {id: 357, cat: PC/Games, desc: " |- RPG"}
-    - {id: 361, cat: PC/Games, desc: " |- Adventure/Quest"}
-    - {id: 650, cat: PC/Games, desc: " |- Arcade/Platformer [Casual]"}
-    - {id: 365, cat: PC/Games, desc: " |- Strategy [TBS/RTS/Grand/Manage]"}
-    - {id: 375, cat: PC/Games, desc: " |- Simulation [Racing]"}
-    - {id: 992, cat: PC/Games, desc: " |- Simulation [Flight / Space]"}
-    - {id: 373, cat: PC/Games, desc: " |- Simulation [Sport]"}
-    - {id: 372, cat: PC/Games, desc: " |- Simulation [Other]"}
-    - {id: 736, cat: PC/Games, desc: " |- Online [MMO]"}
-    - {id: 1131, cat: PC/Games, desc: " |- Horror"}
-    - {id: 1130, cat: PC/Games, desc: " |- Early Access/Demo/Beta"}
-    - {id: 381, cat: PC/Games, desc: " |- Прочие игры для PC"}
-    - {id: 389, cat: PC/Games, desc: " |- NoCD/NoDVD/Mods/Rus/Crack/Patch/Other для Игр"}
-    - {id: 1141, cat: Console/XBox 360, desc: " |- Xbox 360"}
-    - {id: 1140, cat: Console/Wii, desc: " |- Wii, GameCube"}
-    - {id: 1139, cat: Console/Other, desc: " |- Switch"}
-    - {id: 1142, cat: Console/PSP, desc: " |- PSP"}
-    - {id: 1138, cat: Console/Other, desc: " |- PS1"}
-    - {id: 1137, cat: Console/Other, desc: " |- PS2"}
-    - {id: 1136, cat: Console/PS3, desc: " |- PS3"}
-    - {id: 1135, cat: Console/PS4, desc: " |- PS4"}
-    - {id: 1115, cat: PC/Games, desc: "Архив игр"}
-    - {id: 906, cat: PC/Games, desc: " |- Архив (Игровое видео)"}
-    - {id: 904, cat: PC/Games, desc: " |- Архив (Моды, Патчи и Русификаторы)"}
-    - {id: 903, cat: PC/Games, desc: " |- Архив (Другие игры для PC)"}
-    - {id: 899, cat: PC/Games, desc: " |- Архив (Стратегии)"}
-    - {id: 902, cat: PC/Games, desc: " |- Архив (Аркады)"}
-    - {id: 901, cat: PC/Games, desc: " |- Архив (Симуляторы)"}
-    - {id: 900, cat: PC/Games, desc: " |- Архив (Action / Shooter)"}
-    - {id: 898, cat: PC/Games, desc: " |- Архив (Adventure / Quest)"}
-    - {id: 897, cat: PC/Games, desc: " |- Архив (RPG и онлайн игры)"}
-    # Софт
-    # Software
-    - {id: 436, cat: PC/0day, desc: "ОС от Microsoft"}
-    - {id: 993, cat: PC/0day, desc: " |- Активаторы продуктов Microsoft"}
-    - {id: 1104, cat: PC/0day, desc: " |- Патчи, дополнения для ОС от Microsoft"}
-    - {id: 1145, cat: PC/0day, desc: " |- Windows 11 [оригинальные версии]"}
-    - {id: 1147, cat: PC/0day, desc: " |- Windows 11 [сборки]"}
-    - {id: 1030, cat: PC/0day, desc: " |- Windows 10 [оригинальные версии]"}
-    - {id: 1031, cat: PC/0day, desc: " |- Windows 10 [сборки]"}
-    - {id: 968, cat: PC/0day, desc: " |- Windows 8 и 8.1 [оригинальные версии]"}
-    - {id: 1012, cat: PC/0day, desc: " |- Windows 8 и 8.1 [сборки]"}
-    - {id: 439, cat: PC/0day, desc: " |- Windows 7 [оригинальные версии]"}
-    - {id: 1013, cat: PC/0day, desc: " |- Windows 7 [сборки]"}
-    - {id: 438, cat: PC/0day, desc: " |- Windows Vista"}
-    - {id: 437, cat: PC/0day, desc: " |- Windows XP"}
-    - {id: 440, cat: PC/0day, desc: " |- Windows Server"}
-    - {id: 441, cat: PC/0day, desc: " |- Ранние версии ОС Microsoft"}
-    - {id: 443, cat: PC/Mac, desc: "ОС Apple"}
-    - {id: 444, cat: PC/Mac, desc: " |- Mac OS [для Macintosh]"}
-    - {id: 655, cat: PC/Mac, desc: " |- Mac OS [для РС-Хакинтош]"}
-    - {id: 445, cat: PC/Mac, desc: " |- Системные программы для MacOS"}
-    - {id: 446, cat: PC/Mac, desc: " |- Прочие программы для MacOS"}
-    - {id: 448, cat: PC, desc: "ОС Linux, Unix"}
-    - {id: 449, cat: PC, desc: " |- ОС Linux"}
-    - {id: 450, cat: PC, desc: " |- ОС *BSD"}
-    - {id: 451, cat: PC, desc: " |- Прочие *никсы"}
-    - {id: 452, cat: PC, desc: " |- Системные программы для Linux, Unix"}
-    - {id: 453, cat: PC, desc: " |- Прочие программы для Linux, Unix"}
-    - {id: 455, cat: PC, desc: "Общесистемное ПО"}
-    - {id: 456, cat: PC, desc: " |- Драйверы и кодеки"}
-    - {id: 457, cat: PC, desc: " |- Архиваторы, файловые менеджеры"}
-    - {id: 458, cat: PC, desc: " |- Работа с жёстким диском"}
-    - {id: 459, cat: PC, desc: " |- Софт для тюнинга, твикинга"}
-    - {id: 460, cat: PC, desc: " |- Работа с носителями информации"}
-    - {id: 461, cat: PC, desc: " |- Антивирусы, антишпионы, фаерволы"}
-    - {id: 462, cat: PC, desc: " |- Реаниматоры / LiveCD / DVD / Flash"}
-    - {id: 463, cat: PC, desc: " |- Диагностика, бенчмарки"}
-    - {id: 618, cat: PC, desc: " |- Скринсейверы, украшения для Windows"}
-    - {id: 464, cat: PC, desc: " |- Серверное ПО"}
-    - {id: 465, cat: PC, desc: " |- Разное"}
-    - {id: 467, cat: PC, desc: "Прикладное ПО"}
-    - {id: 468, cat: PC, desc: " |- Офисные системы"}
-    - {id: 469, cat: PC, desc: " |- Системы для бизнеса"}
-    - {id: 470, cat: PC, desc: " |- Интернет"}
-    - {id: 471, cat: PC, desc: " |- Аудио-, видео-, CD-плееры"}
-    - {id: 472, cat: PC, desc: " |- Каталогизаторы и просмотрщики"}
-    - {id: 473, cat: PC, desc: " |- Словари и переводчики"}
-    - {id: 475, cat: PC, desc: " |- Справочные системы"}
-    - {id: 476, cat: PC, desc: " |- Обучающие системы"}
-    - {id: 477, cat: PC, desc: " |- Электронные карты"}
-    - {id: 478, cat: PC, desc: " |- Другое Прикладное ПО"}
-    - {id: 480, cat: PC, desc: "Программирование, Веб-разработка и дизайн"}
-    - {id: 481, cat: PC, desc: " |- Редакторы для веб-дизайна и программирования"}
-    - {id: 482, cat: PC, desc: " |- Среды разработки"}
-    - {id: 483, cat: PC, desc: " |- Компоненты для сред разработки"}
-    - {id: 484, cat: PC, desc: " |- Скрипты, шаблоны, CMS"}
-    - {id: 485, cat: PC, desc: " |- Другое"}
-    - {id: 1106, cat: PC, desc: " |- Дистрибутивы 1С с лекарством от жадности"}
-    - {id: 1107, cat: PC, desc: " |- Пользовательские конфигурации и прочие дополнения"}
-    - {id: 1108, cat: PC, desc: " |- Диски 1С: ИТС"}
-    - {id: 1109, cat: PC, desc: " |- Архив"}
-    - {id: 801, cat: PC, desc: "Справочно-правовые системы"}
-    - {id: 802, cat: PC, desc: " |- Консультант Плюс"}
-    - {id: 1005, cat: PC, desc: " |- Консультант Бухгалтер"}
-    - {id: 804, cat: PC, desc: " |- Гарант"}
-    - {id: 803, cat: PC, desc: " |- Кодекс"}
-    - {id: 805, cat: PC, desc: " |- Другое"}
-    - {id: 840, cat: PC, desc: " |- Архив"}
-    - {id: 487, cat: PC, desc: "Работа с мультимедиа"}
-    - {id: 488, cat: PC, desc: " |- САПР, программы для архитекторов"}
-    - {id: 489, cat: PC, desc: " |- Редакторы видео"}
-    - {id: 490, cat: PC, desc: " |- Видео-, Аудио-конверторы"}
-    - {id: 491, cat: PC, desc: " |- Работа со звуком"}
-    - {id: 492, cat: PC, desc: " |- Другое"}
-    - {id: 508, cat: PC, desc: "Графические редакторы"}
-    - {id: 509, cat: PC, desc: " |- Программные комплекты"}
-    - {id: 510, cat: PC, desc: " |- 2D редакторы"}
-    - {id: 511, cat: PC, desc: " |- 3D редакторы"}
-    - {id: 512, cat: PC, desc: " |- Плагины для графических 2D редакторов"}
-    - {id: 513, cat: PC, desc: " |- Плагины для графических 3D редакторов"}
-    - {id: 514, cat: PC, desc: " |- Создание анимации"}
-    - {id: 515, cat: PC, desc: " |- Другое"}
-    - {id: 682, cat: PC, desc: "Обучающие и интерактивные CD / DVD"}
-    - {id: 568, cat: PC, desc: " |- Строительство, ремонт и дизайн помещений"}
-    - {id: 683, cat: PC, desc: " |- Танцы"}
-    - {id: 684, cat: PC, desc: " |- Игра на музыкальных инструментах"}
-    - {id: 685, cat: PC, desc: " |- Образование"}
-    - {id: 686, cat: PC, desc: " |- Коллекционирование, увлечения и хобби"}
-    - {id: 687, cat: PC, desc: " |- Массаж и медицина"}
-    - {id: 688, cat: PC, desc: " |- Спорт, фитнес, экстрим"}
-    - {id: 689, cat: PC, desc: " |- Интерактивные CD / DVD по Windows и ПО от Microsoft"}
-    - {id: 690, cat: PC, desc: " |- Интерактивные CD / DVD по MacOS и ПО от Apple"}
-    - {id: 691, cat: PC, desc: " |- Интерактивные CD / DVD по *Nix и ПО под них"}
-    - {id: 692, cat: PC, desc: " |- Другие интерактивные диски"}
-    - {id: 1117, cat: PC, desc: "Архив"}
-    - {id: 842, cat: PC, desc: " |- Архив (ОС от Microsoft)"}
-    - {id: 914, cat: PC, desc: " |- Архив (ОС Linux, Unix)"}
-    - {id: 913, cat: PC, desc: " |- Архив (ОС Apple)"}
-    - {id: 916, cat: PC, desc: " |- Архив (Прикладное ПО)"}
-    - {id: 915, cat: PC, desc: " |- Архив (Общесистемное ПО)"}
-    - {id: 918, cat: PC, desc: " |- Архив (Работа с мультимедиа)"}
-    - {id: 919, cat: PC, desc: " |- Архив (Графические редакторы)"}
-    - {id: 917, cat: PC, desc: " |- Архив (Программирование, Веб-разработка и дизайн)"}
-    - {id: 928, cat: PC, desc: " |- Архив (Обучающие и интерактивные CD / DVD)"}
-    # Литература (книги, аудиокниги, журналы, ...)
-    # Literature (books, audio books, magazines, ...)
-    - {id: 952, cat: Books, desc: " |- Библиографии"}
-    - {id: 1032, cat: Books, desc: "Художественная литература"}
-    - {id: 564, cat: Books, desc: " |- Фантастика, фэнтези"}
-    - {id: 1033, cat: Books, desc: " |- Детектив, боевик, триллер"}
-    - {id: 1034, cat: Books, desc: " |- Ужасы, мистика"}
-    - {id: 1035, cat: Books, desc: " |- Женский роман"}
-    - {id: 1036, cat: Books, desc: " |- Приключения, путешествия"}
-    - {id: 1037, cat: Books, desc: " |- Классическая литература"}
-    - {id: 1038, cat: Books, desc: " |- Современная проза"}
-    - {id: 1039, cat: Books, desc: " |- Исторический роман"}
-    - {id: 1040, cat: Books, desc: " |- Другая художественная литература"}
-    - {id: 1041, cat: Books, desc: "Научная, образовательная и справочная литература. Деловая ли.."}
-    - {id: 570, cat: Books, desc: " |- Гуманитарные науки, история, публицистика"}
-    - {id: 571, cat: Books, desc: " |- Точные, естественные и инженерные науки"}
-    - {id: 795, cat: Books, desc: " |- Энциклопедии и словари"}
-    - {id: 1042, cat: Books, desc: " |- Справочники и руководства"}
-    - {id: 1043, cat: Books, desc: " |- Нормативные документы и законодательные акты"}
-    - {id: 567, cat: Books, desc: " |- Учебники, лекции, методическая литература"}
-    - {id: 1044, cat: Books, desc: " |- Обучение иностранным языкам"}
-    - {id: 1088, cat: Books, desc: " |- Техническая и специализированная литература"}
-    - {id: 1089, cat: Books, desc: " |- Военное дело"}
-    - {id: 574, cat: Books, desc: " |- Деловая литература"}
-    - {id: 1086, cat: Books, desc: " |- Традиционная и народная медицина"}
-    - {id: 575, cat: Books, desc: " |- Другая литература"}
-    - {id: 1045, cat: Books, desc: "Компьютерная литература"}
-    - {id: 1046, cat: Books, desc: " |- Веб-дизайн и графика"}
-    - {id: 1047, cat: Books, desc: " |- База данных"}
-    - {id: 1048, cat: Books, desc: " |- Программирование"}
-    - {id: 1049, cat: Books, desc: " |- Компьютерное железо"}
-    - {id: 1050, cat: Books, desc: " |- Программы"}
-    - {id: 1051, cat: Books, desc: " |- Операционные системы"}
-    - {id: 566, cat: Books, desc: " |- Другая компьютерная литература"}
-    - {id: 1052, cat: Books, desc: "Библиотеки, собрания сочинений, мультимедийные издания"}
-    - {id: 1053, cat: Books, desc: " |- Архивы библиотек"}
-    - {id: 573, cat: Books, desc: " |- Коллекции книг, тематические подборки"}
-    - {id: 1054, cat: Books, desc: " |- Собрания сочинений"}
-    - {id: 1055, cat: Books, desc: " |- Мультимедийные и интерактивные издания"}
-    - {id: 1056, cat: Books, desc: " |- Коллекции рефератов, курсовых работ и прочее"}
-    - {id: 1057, cat: Books, desc: "Коллекционирование, увлечения и хобби"}
-    - {id: 1058, cat: Books, desc: " |- Авто-Мото пособия"}
-    - {id: 955, cat: Books, desc: " |- Кулинария"}
-    - {id: 1059, cat: Books, desc: " |- Сад, огород, приусадебное хозяйство"}
-    - {id: 1060, cat: Books, desc: " |- Все для дома. Строительство и ремонт. Интерьер и декор"}
-    - {id: 1061, cat: Books, desc: " |- Ремесла. Сделай сам"}
-    - {id: 1062, cat: Books, desc: " |- Спорт и здоровье. Единоборства"}
-    - {id: 1063, cat: Books, desc: " |- Охота и рыбалка"}
-    - {id: 1064, cat: Books, desc: " |- Коллекционирование и моделирование"}
-    - {id: 1065, cat: Books, desc: " |- Фотоискусство"}
-    - {id: 1066, cat: Books, desc: " |- Декоративно-прикладное искусство"}
-    - {id: 1067, cat: Books, desc: " |- Юмор и сатира"}
-    - {id: 1087, cat: Books, desc: " |- Христианство. Вера и религия"}
-    - {id: 1077, cat: Books, desc: " |- Фантастика, НЛО, необъяснимое"}
-    - {id: 572, cat: Books, desc: " |- Прочие хобби"}
-    - {id: 1068, cat: Books, desc: "Журналы и периодика"}
-    - {id: 1069, cat: Books, desc: " |- Авто-мото"}
-    - {id: 1070, cat: Books, desc: " |- Научные, образовательные и технические журналы"}
-    - {id: 1071, cat: Books, desc: " |- Компьютерные, игровые журналы и приложения"}
-    - {id: 1072, cat: Books, desc: " |- Мобильные телефоны, аудио-видео и цифровая техника"}
-    - {id: 1073, cat: Books, desc: " |- Женские журналы"}
-    - {id: 1074, cat: Books, desc: " |- Мужские журналы"}
-    - {id: 1075, cat: Books, desc: " |- Общество, бизнес, политика, история, религия"}
-    - {id: 1076, cat: Books, desc: " |- Развлекательные. Кино, музыка и др."}
-    - {id: 846, cat: Books, desc: " |- Комиксы"}
-    - {id: 569, cat: Books, desc: " |- Другие журналы"}
-    - {id: 539, cat: Books, desc: "Детская Литература"}
-    - {id: 554, cat: Books, desc: " |- Обучающая литература"}
-    - {id: 555, cat: Books, desc: " |- Сказки"}
-    - {id: 557, cat: Books, desc: " |- Другая литература"}
-    - {id: 577, cat: Audio/Audiobook, desc: "Аудиокниги"}
-    - {id: 676, cat: Audio/Audiobook, desc: " |- Фантастика, фэнтези"}
-    - {id: 673, cat: Audio/Audiobook, desc: " |- Боевик, детектив, триллер"}
-    - {id: 678, cat: Audio/Audiobook, desc: " |- Ужасы, мистика"}
-    - {id: 1124, cat: Audio/Audiobook, desc: " |- Современная проза"}
-    - {id: 1078, cat: Audio/Audiobook, desc: " |- Женские романы"}
-    - {id: 675, cat: Audio/Audiobook, desc: " |- Классика"}
-    - {id: 674, cat: Audio/Audiobook, desc: " |- Историческая литература"}
-    - {id: 556, cat: Audio/Audiobook, desc: " |- Детская литература"}
-    - {id: 677, cat: Audio/Audiobook, desc: " |- Психология. философия, религия"}
-    - {id: 679, cat: Audio/Audiobook, desc: " |- Тренинг, бизнес"}
-    - {id: 1079, cat: Audio/Audiobook, desc: " |- Юмор, анекдоты"}
-    - {id: 1080, cat: Audio/Audiobook, desc: " |- Учебники, аудиолекции"}
-    - {id: 1144, cat: Audio/Audiobook, desc: " |- Нон-фикшн"}
-    - {id: 1081, cat: Audio/Audiobook, desc: " |- Книги с аудиоприложением"}
-    - {id: 680, cat: Audio/Audiobook, desc: " |- Аудиокниги на иностранных языках"}
-    - {id: 578, cat: Audio/Audiobook, desc: " |- Другие аудиокниги"}
-    - {id: 927, cat: Audio/Audiobook, desc: " |- Архив аудиокниг"}
-    - {id: 926, cat: Audio/Audiobook, desc: " |- Архив книг"}
-    # Фотоискусство, обои, графика
-    # Photo Art, Wallpaper, Graphics
-    - {id: 1101, cat: Other, desc: " |- Правила и мануалы"}
-    - {id: 1102, cat: Other, desc: " |- Проба пера"}
-    - {id: 580, cat: Other, desc: "Обои"}
-    - {id: 583, cat: Other, desc: " |- Обои для рабочего стола"}
-    - {id: 1095, cat: Other, desc: " |- Эротические обои (16+)"}
-    - {id: 1097, cat: Other, desc: " |- Детские обои"}
-    - {id: 1092, cat: Other, desc: " |- Профессиональное фото"}
-    - {id: 582, cat: Other, desc: " |- Любительское фото"}
-    - {id: 1093, cat: Other, desc: " |- Эротическое фото (16+)"}
-    - {id: 1094, cat: Other, desc: " |- Разное фото"}
-    - {id: 585, cat: Other, desc: " |- Живопись, графика, фэнтези арт"}
-    - {id: 1098, cat: Other, desc: " |- Демотиваторы, фотожабы, приколы"}
-    - {id: 1099, cat: Other, desc: " |- Эротические изображения (16+)"}
-    - {id: 586, cat: Other, desc: " |- Иконки, аватары, смайлы"}
-    - {id: 1100, cat: Other, desc: " |- Прочие картинки"}
-    - {id: 587, cat: Other, desc: "Прочие изображения"}
-    - {id: 934, cat: Other, desc: "Архив"}
-    # Другие релизы
-    # Other releases
-    - {id: 617, cat: Other, desc: "Другое"}
-    - {id: 1010, cat: Other, desc: " |- Все для смартфонов (софт, игры, прошивки, ...)"}
-    - {id: 530, cat: Other, desc: " |- Дизайнерский контент (шрифты, стили, кисти, футажи, клипарт .."}
-    - {id: 616, cat: Other, desc: "Для пробных раздач"}
-    # Корзина
-    # Cart???
-    - {id: 614, cat: Other, desc: "Отстойник"}
-    - {id: 615, cat: Other, desc: "Для поглощенных раздач"}
-    # Приватные форумы
-    # Private forums
-    - {id: 603, cat: Other, desc: "Релизерская каптерка"}
-    - {id: 604, cat: Other, desc: " |- Черновики"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: striprussian
-    type: checkbox
-    label: Strip Russian Letters
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 1
-    options:
-      1: created
-      10: seeders
-      7: size
-      2: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: 2
-    options:
-      2: desc
-      1: asc
-
-search:
-  paths:
-    - path: tracker.php
-  keywordsfilters:
-    - name: diacritics
-      args: replace
-    - name: re_replace # S01 to сезон 1
-      args: ["(?i)\\bS0*(\\d+)\\b", "сезон $1"]
-    - name: re_replace # S01E01 to сезон 1 серии 1
-      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "сезон $1 серии $2"]
-  inputs:
-    $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{ else }}f[]=-1{{ end }}"
-    prev_allw: 0
-    prev_a: 0
-    prev_dla: 0
-    prev_dlc: 0
-    prev_dld: 0
-    prev_dlw: 0
-    prev_my: 0
-    prev_new: 0
-    prev_sd: 0
-    prev_da: 1
-    prev_dc: 0
-    prev_df: 1
-    prev_ds: 0
-    # sort by 1=registered 2=topicTitle 4=completed 10=seed 11=leech 12=up 13=down 5=replies 6=views 7=size 8=lastPost 9=seedLastSeen
-    o: "{{ .Config.sort }}"
-    # 1=asc 2=desc
-    s: "{{ .Config.type }}"
-    # filter by status 1 all
-    status: 1
-    # show category
-    dc: 0
-    # show forum
-    df: 1
-    # show author
-    da: 1
-    # show speed
-    ds: 0
-    # -1=all time
-    tm: -1
-    # seed not seen -1=disregard
-    sns: -1
-    # group releases -1=not selected
-    srg: -1
-    nm: "{{ .Keywords }}"
-    # find a username
-    pn: ""
-    # search by partial word
-    allw: 0
-
-  rows:
-    selector: tr[id^="tor_"]:has(a[href^="magnet:?xt="])
-
-  fields:
-    category:
-      selector: a.gen
-      attribute: href
-      filters:
-        - name: querystring
-          args: f
-    title:
-      selector: a.genmed:nth-child(2), a.seedmed:nth-child(2)
-      filters:
-        # normalize to SXXEYY format
-        - name: re_replace
-          args: ["[\\:\\-\\/\\|]", " "]
-        - name: re_replace
-          args: ["(.*)\\([CСcс]езон\\s+(\\d+).+[CСcс]ери[ия]\\s+(\\d+)\\s+(\\d+).+\\)(.*)", "$1 S$2E$3-$4 rus $5"]
-        - name: re_replace
-          args: ["(.*)\\([CСcс]езон\\s+(\\d+)\\)(.*)", "$1 S$2 rus $3"]
-        - name: re_replace
-          args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
-        - name: replace
-          args: ["WEB DL", "WEBDL"]
-        - name: replace
-          args: ["WEBDLRip", "WEBDL"]
-        - name: replace
-          args: ["HDTVRip", "HDTV"]
-    details:
-      selector: a.tLink
-      attribute: href
-    magnet:
-      selector: a[href^="magnet:?xt="]
-      attribute: href
-    size:
-      selector: td:nth-child(7) > u
-    seeders:
-      selector: td.seedmed > b
-    leechers:
-      selector: td.leechmed > b
-    grabs:
-      selector: td:nth-child(10)
-    date:
-      # unix
-      selector: td:last-child > u
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# TorrentPier

src/Jackett.Common/Definitions/underversel.yml

@@ -1,7 +1,7 @@
 ---
 id: underversel
-name: UnderverseL
-description: "this is the Underverse indexer with Login enabled in the config."
+name: Underverse
+description: "Underverse is a RUSSIAN Semi-Private Torrent Tracker for MOVIES / TV / MUSIC / GENERAL"
 language: ru-RU
 type: semi-private
 encoding: windows-1251

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/DivxTotal.cs

@@ -58,7 +58,8 @@ namespace Jackett.Common.Indexers
             "https://www.divxtotal.se/",
             "https://www.divxtotal.pm/",
             "https://www.divxtotal.re/",
-            "https://www.divxtotal.nl/"
+            "https://www.divxtotal.nl/",
+            "https://www.divxtotal.ac/"
         };
 
         public DivxTotal(IIndexerConfigurationService configService, WebClient w, Logger l, IProtectionService ps,
@@ -66,7 +67,7 @@ namespace Jackett.Common.Indexers
             : base(id: "divxtotal",
                    name: "DivxTotal",
                    description: "DivxTotal is a SPANISH site for Movies, TV series and Software",
-                   link: "https://www.divxtotal.ac/",
+                   link: "https://www.divxtotal.dev/",
                    caps: new TorznabCapabilities
                    {
                        TvSearchParams = new List<TvSearchParam>

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.wtf/",
+            "https://dontorrent.kim/",
             "https://todotorrents.net/",
             "https://tomadivx.net/",
             "https://seriesblanco.one/",
@@ -66,6 +66,9 @@ namespace Jackett.Common.Indexers
             "https://dontorrent.cx/",
             "https://dontorrent.bet/",
             "https://dontorrent.cab/",
+            "https://dontorrent.wtf/",
+            "https://dontorrent.fi/",
+            "https://dontorrent.ink/",
             "https://dontorrent.eu/"
         };
 
@@ -84,7 +87,7 @@ namespace Jackett.Common.Indexers
             : base(id: "dontorrent",
                    name: "DonTorrent",
                    description: "DonTorrent is a SPANISH public tracker for MOVIES / TV / GENERAL",
-                   link: "https://dontorrent.wtf/",
+                   link: "https://dontorrent.kim/",
                    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

@@ -265,6 +265,7 @@ namespace Jackett.Updater
                 "Definitions/aither.yml", // switch to *-API #8682
                 "Definitions/alein.yml",
                 "Definitions/alexfilm.yml",
+                "Definitions/alleenretail.yml",
                 "Definitions/angietorrents.yml",
                 "Definitions/anidex.yml", // migrated to C#
                 "Definitions/animeitalia.yml",
@@ -430,7 +431,6 @@ namespace Jackett.Updater
                 "Definitions/nyoo.yml",
                 "Definitions/oasis.yml",
                 "Definitions/obscure.yml",
-                "Definitions/oncesearch.yml",
                 "Definitions/onlineselfeducation.yml",
                 "Definitions/onlyscene.yml",
                 "Definitions/passionetorrent.yml",
@@ -534,6 +534,7 @@ namespace Jackett.Updater
                 "Definitions/uhd-heaven.yml",
                 "Definitions/ultimategamerclub.yml",
                 "Definitions/ultrahdclub.yml",
+                "Definitions/underverse.yml",
                 "Definitions/uniotaku.yml", // to be migrated to c#
                 "Definitions/utorrents.yml", // same as SzeneFZ now
                 "Definitions/vanila.yml",