torrentqq: bump domain

This reverts commit a595a2af8a.

.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/codeql-analysis.yml

@@ -50,11 +50,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -63,7 +63,7 @@ jobs:
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
     - name: Set up dotnet
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v2
       with:
         dotnet-version: '6.0.*'
 
@@ -71,7 +71,7 @@ jobs:
     # If this step fails, then you should remove it and run the build manually (see below)
 
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl

.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,9 +45,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BT.etree
  * BT4G
  * BTDIGG
+ * BTMET
  * BTmirror
  * BTSOW
  * Byrutor
+ * CloudTorrents
  * comicat
  * ConCen
  * cpasbien
@@ -90,6 +92,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * LinuxTracker
  * Mac Torrents Download
  * MegaPeer
+ * MejorTorrent
  * Mikan
  * MioBT
  * MixTapeTorrent
@@ -103,9 +106,9 @@ 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
  * ParnuXi
  * PC-torrent
  * PiratBit
@@ -140,17 +143,18 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Tokyo Tosho
  * Torlock
  * Torlook
+ * Torrent[CORE]
  * Torrent Downloads (TD)
  * Torrent Oyun indir
  * torrent.by
  * torrent-pirat
  * Torrent9
  * Torrent9 clone
+ * Torrent911
  * TorrentDownload
  * TorrentFunk
  * TorrentGalaxy (TGx)
  * TorrentKitty
- * TorrentParadise
  * TorrentProject2
  * TorrentQQ (토렌트큐큐)
  * Torrents.csv
@@ -159,7 +163,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TorrentView (토렌트뷰)
  * TorrentWhiz ( 토렌트위즈)
  * Torrentz2eu
- * truPornolabs
  * Underverse
  * UnionDHT
  * VSTHouse
@@ -248,12 +251,12 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * 52PT
  * Abnormal
  * ABtorrents (ABT + RNS)
+ * Acervos
  * Acid Lounge (A-L)
  * AcrossTheTasman [![(invite needed)][inviteneeded]](#)
  * Aftershock
  * Aidoru!Online
  * Aither
- * Alleen Retail
  * AlphaRatio (AR)
  * AmigosShareClub
  * anasch.cc
@@ -263,6 +266,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)
@@ -424,6 +428,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Libble [![(invite needed)][inviteneeded]](#)
  * LibraNet (LN)
  * LinkoManija [![(invite needed)][inviteneeded]](#)
+ * Locadora
  * LosslessClub [![(invite needed)][inviteneeded]](#)
  * M-Team TP (MTTP) [![(invite needed)][inviteneeded]](#)
  * MaDs Revolution [![(invite needed)][inviteneeded]](#)
@@ -449,7 +454,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * NCore
  * Nebulance (NBL) (TransmiTheNet)
  * NetCosmo
- * NetLab
  * NorBits
  * oMg[WtF]trackr
  * OpenCD [![(invite needed)][inviteneeded]](#)
@@ -459,13 +463,14 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Ourbits (HDPter) [![(invite needed)][inviteneeded]](#)
  * P2PBG
  * P2PElite
- * Partis [![(invite needed)][inviteneeded]](#)
+ * Partis
  * PassThePopcorn (PTP)
  * Peeratiko
  * PeerJunkies
  * Peers.FM
- * Pirata Digital
+ * PigNetwork
  * PirateTheNet (PTN)
+ * Pixelados
  * PixelCove (Ultimate Gamer)
  * PiXELHD (PxHD) [![(invite needed)][inviteneeded]](#)
  * PolishSource (PS)
@@ -562,7 +567,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TorrentCCF (TCCF)
  * TorrentDay (TD)
  * TorrentDB
- * Torrentech (TTH)
  * TorrentHeaven [![(invite needed)][inviteneeded]](#)
  * TorrentHR [![(invite needed)][inviteneeded]](#)
  * Torrenting (TT)

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

@@ -80,7 +80,7 @@
             <h4>Adding a Jackett indexer in Sonarr or Radarr</h4>
             <ol>
                 <li>Go to <b>Settings > Indexers > Add > Torznab > Custom</b>.</li>
-                <li>Click on the indexers corresponding <button type="button" class="btn btn-xs btn-info">Copy Torznab Feed</button> button and paste it into the Sonarr/Radarr <b>URL</b> field.</li>
+                <li>Click on the indexers corresponding <button type="button" class="disabled btn btn-xs btn-info">Copy Torznab Feed</button> button and paste it into the Sonarr/Radarr <b>URL</b> field.</li>
                 <li>For the <b>API key</b> use <b class="api-key-text"></b>.</li>
                 <li>Configure the correct category IDs via the <b>(Anime) Categories</b> options. See the Jackett indexer configuration for a list of supported categories.</li>
             </ol>
@@ -88,12 +88,12 @@
             <ol>
                 <li>Go to <b>Settings > Searchers</b>.</li>
                 <li>Enable <b>TorrentPotato</b>.
-                <li>Click on the indexers corresponding <button type="button" class="btn btn-xs btn-info">Copy Potato Feed</button> button and paste it into the CouchPotato <b>host</b> field.</li>
+                <li>Click on the indexers corresponding <button type="button" class="disabled btn btn-xs btn-info">Copy Potato Feed</button> button and paste it into the CouchPotato <b>host</b> field.</li>
                 <li>For the <b>Passkey</b> use <b class="api-key-text"></b>. Leave the <b>username</b> field blank.</li>
             </ol>
             <h4>Adding a Jackett indexer to RSS clients (RSS feed)</h4>
             <ol>
-                <li>Click on the indexers corresponding <button type="button" class="btn btn-xs btn-info">Copy RSS Feed</button> button and paste it into the URL field of the RSS client.</li>
+                <li>Click on the indexers corresponding <button type="button" class="disabled btn btn-xs btn-info">Copy RSS Feed</button> button and paste it into the URL field of the RSS client.</li>
                 <li>
                     You can adjust the <b>q</b> (search string) and <b>cat</b> (categories) arguments accordingly.
                     E.g. <b>...&cat=2030,2040&q=big+buck+bunny</b> will search for "big buck bunny" in the Movies/SD (2030) and Movies/HD (2040) categories (See the indexer configuration for available categories).
@@ -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,13 +12,11 @@ links:
   - https://x1337x.ws/
   - https://x1337x.eu/
   - https://x1337x.se/
-  - https://1337x.unblockit.blue/
+  - https://1337x.unblockit.ist/
   - https://1337x.nocensor.sbs/
+  - https://1337x.unblockninja.com/
 legacylinks:
-  - https://1337x.unblockit.buzz/
   - https://1337x.unblocked.monster/
-  - https://1337x.unblockit.club/
-  - https://1337x.unblockit.onl/
   - https://1337x.unblockit.li/
   - https://1337x.unblockit.uno/
   - https://1337x.is/
@@ -35,6 +33,8 @@ legacylinks:
   - https://1337x.gd/
   - https://1337x.unblockit.day/
   - https://1337x.unblockit.llc/
+  - https://1337x.unblockit.blue/
+  - https://1337x.unblockit.name/
 
 caps:
   categorymappings:

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

@@ -0,0 +1,159 @@
+---
+id: acervos
+name: Acervos (API)
+description: "Acervos is a Brazilian tracker for movies, tv shows, and others."
+language: pt-BR
+type: private
+encoding: UTF-8
+links:
+  - https://acervos.cc/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Filmes"}
+    - {id: 2, cat: TV, desc: "TV Séries"}
+    - {id: 3, cat: Other, desc: "Cursos"}
+    - {id: 4, cat: Console, desc: "Jogos"}
+    - {id: 5, cat: PC, desc: "Aplicativos"}
+    - {id: 6, cat: TV/Anime, desc: "Animes"}
+    - {id: 7, cat: Other, desc: "Materiais de Apoio"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
+    movie-search: [q, imdbid, tmdbid]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://acervos.cc/\" target =_blank>Acervos</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: re_replace
+      args: ["\\.", " "]
+    - name: re_replace
+      args: ["(?i)\\bS(\\d+)", "T$1"]
+
+  rows:
+    selector: data
+    attribute: attributes
+    count:
+      selector: meta.total
+
+  fields:
+    category:
+      selector: category_id
+    title:
+      selector: name
+      filters:
+        - name: re_replace
+          args:
+            - "\\bDUAL\\b"
+            - "Portuguese (Brazil) English"
+    details:
+      selector: details_link
+    description:
+      selector: media_info
+    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 5 days regardless of ratio
+#    minimumratio:
+#      text: 0.4
+    minimumseedtime:
+      # 5 days (as seconds = 5 x 24 x 60 x 60)
+      text: 432000
+# json UNIT3D 6.1.0

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.1

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 $i, $e := .Categories }}&categories[{{$i}}]={{.}}{{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]
 
@@ -126,7 +126,7 @@ search:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
     tmdbid:
-      selector: a[href*="themoviedb.org/movie/"]
+      selector: a[href*="themoviedb.org/movie/"], a[href*="themoviedb.org/tv/"]
       attribute: href
     date:
       selector: time

src/Jackett.Common/Definitions/audiobookbay.yml

@@ -9,12 +9,9 @@ links:
   - http://audiobookbay.fi/ # site forces http, does not support https
   - http://audiobookbay.se/
   - http://audiobookbayabb.com/
-  - https://audiobookbay.unblockit.blue/
+  - https://audiobookbay.unblockit.ist/
 legacylinks:
   - https://audiobookbay.la/
-  - https://audiobookbay.unblockit.buzz/
-  - https://audiobookbay.unblockit.club/
-  - https://audiobookbay.unblockit.onl/
   - https://audiobookbay.unblockit.li/
   - https://audiobookbay.unblockit.uno/
   - https://audiobookbay.unblockit.ch/
@@ -30,6 +27,8 @@ legacylinks:
   - https://audiobookbay.unblockit.biz/
   - https://audiobookbay.unblockit.day/
   - https://audiobookbay.unblockit.llc/
+  - https://audiobookbay.unblockit.blue/
+  - https://audiobookbay.unblockit.name/
 
 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:
@@ -120,7 +120,7 @@ search:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
     tmdbid:
-      selector: a[href*="themoviedb.org/movie/"]
+      selector: a[href*="themoviedb.org/movie/"], a[href*="themoviedb.org/tv/"]
       attribute: href
     downloadvolumefactor:
       case:

src/Jackett.Common/Definitions/bitbr.yml

@@ -135,6 +135,11 @@ search:
       attribute: title
     title:
       text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+      filters:
+        - name: re_replace
+          args:
+            - "\\bDUAL\\b"
+            - "Portuguese (Brazil) English"
     details:
       selector: a[href^="details.php?id="]
       attribute: href

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

@@ -1,140 +0,0 @@
----
-id: brasiltracker
-name: BrasilTracker
-description: "BrasilTracker is a BRAZILIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: pt-BR
-encoding: UTF-8
-type: private
-links:
-  - https://brasiltracker.org/
-
-caps:
-  categories:
-    Other: Other
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q, imdbid]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: info_8000
-    type: info
-    label: About BrasilTracker Categories
-    default: BrasilTracker does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: time
-    options:
-      time: created
-      seeders: seeders
-      size: size
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_results
-    type: info
-    label: "Search results"
-    default: "This indexer does not support <b>Torrent Groups</b><br />Un-tick the <b>Torrent grouping</b><i> (Habilitar Grupo de Torrents)</i> checkbox in your <b>Configurações</b>."
-
-login:
-  path: login.php
-  method: form
-  form: form#loginform
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    keeplogged: 1
-  error:
-    - selector: form#loginform:contains("incorretos")
-  test:
-    path: index.php
-    selector: a[href^="logout.php?auth="]
-
-search:
-  paths:
-    # https://brasiltracker.org/torrents.php?order_by=time&order_way=desc&freetorrent=1&filter_cat[6]=1&filter_cat[3]=1&action=basic&searchsubmit=1
-    # https://brasiltracker.org/torrents.php?searchstr=mandalorain&order_by=size&order_way=desc&action=basic&searchsubmit=1
-    # https://brasiltracker.org/torrents.php?searchstr=tt8179024&order_by=time&order_way=desc&action=basic&searchsubmit=1
-    - path: torrents.php
-  inputs:
-    searchstr: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    order_by: "{{ .Config.sort }}"
-    order_way: "{{ .Config.type }}"
-    action: basic
-    freetorrent: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-    searchsubmit: 1
-
-  rows:
-    selector: table#torrent_table > tbody > tr.torrent
-
-  fields:
-    category:
-      text: Other
-    details:
-      selector: a[href^="torrents.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="torrents.php?action=download&id="]
-      attribute: href
-    description:
-      selector: div.tags
-    poster:
-      selector: img[alt="Cover"]
-      attribute: src
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    files:
-      selector: td:nth-child(3)
-    date:
-      selector: span.time
-      attribute: title
-      filters:
-        - name: append
-          args: " -03:00" # BRT
-        - name: dateparse
-          args: "Jan 2 2006, 15:04 -07:00"
-    size:
-      selector: td:nth-child(5)
-    grabs:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
-    downloadvolumefactor:
-      case:
-        strong.tl_free: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    title_details:
-      selector: div.torrent_info
-      remove: strong
-    title:
-      selector: a[href^="torrents.php?id="]
-      filters:
-        - name: append
-          args: " {{ .Result.title_details }}"
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# Project Gazelle

src/Jackett.Common/Definitions/btdigg.yml

@@ -7,10 +7,12 @@ type: public
 encoding: UTF-8
 links:
   - https://btdig.com/
-  - https://btdiggwzoyrwwbiv.onion.ly/
-  - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.onion.ly/
+  - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.onion.ws/
+  - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.onion.pet/
 legacylinks:
   - http://btdiggwzoyrwwbiv.onion.ly/
+  - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.onion.ly/
+  - https://btdiggwzoyrwwbiv.onion.ly/
 
 caps:
   categories:

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,7 +7,10 @@ type: public
 encoding: UTF-8
 links:
   - https://btsao.com/
+  - https://btmirror.unblockit.ist/
+legacylinks:
   - https://btmirror.unblockit.blue/
+  - https://btmirror.unblockit.name/
 
 caps:
   categories:

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]
@@ -136,7 +136,7 @@ search:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
     tmdbid:
-      selector: a[href*="themoviedb.org/movie/"]
+      selector: a[href*="themoviedb.org/movie/"], a[href*="themoviedb.org/tv/"]
       attribute: href
     date:
       selector: time

src/Jackett.Common/Definitions/cloudtorrents.yml

@@ -0,0 +1,77 @@
+---
+id: cloudtorrents
+name: CloudTorrents
+description: "CloudTorrents is a Public Torrent Tracker for MOVIES / TV / GENERAL"
+language: en-US
+type: public
+encoding: UTF-8
+links:
+  - https://cloudtorrents.com/
+
+caps:
+  categorymappings:
+    - {id: anime, cat: TV/Anime, desc: Anime}
+    - {id: applications, cat: PC, desc: Applications}
+    - {id: books, cat: Books, desc: Books}
+    - {id: games, cat: Console, desc: Games}
+    - {id: movies, cat: Movies, desc: Movies}
+    - {id: music, cat: Audio, desc: Music}
+    - {id: other, cat: Other, desc: Other}
+    - {id: tv, cat: TV, desc: TV}
+    - {id: xxx, cat: XXX, desc: XXX}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings: []
+
+download:
+  selectors:
+    - selector: a[href^="magnet:?xt="]
+      attribute: href
+
+search:
+  paths:
+    - path: "{{ if .Keywords }}search?query={{ .Keywords }}{{ else }}latest{{ end }}"
+
+  rows:
+    selector: table > tbody > tr
+
+  fields:
+    category:
+      selector: a
+      attribute: href
+      filters:
+        - name: split
+          args: ["/", 1]
+    title:
+      selector: a b
+    details:
+      selector: a
+      attribute: href
+    download:
+      selector: a
+      attribute: href
+    seeders:
+      selector: td[data-title="Se"]
+    leechers:
+      selector: td[data-title="Le"]
+    date:
+      selector: span[title]
+      attribute: title
+      filters:
+        - name: append
+          args: " -09:00" # CUS
+        - name: dateparse
+          args: "02 Jan, 2006 15:04 -07:00"
+    size:
+      selector: td[data-title="Size"]
+    downloadvolumefactor:
+      text: 1
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/cpasbienclone.yml

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

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

@@ -10,14 +10,13 @@ links:
   - https://www.demonoid.is/
   - https://www.dnoid.to/
   - https://www.dnoid.pw/
-  - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.ly/
-  - https://demonoid.unblockit.blue/
+  - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.ws/
+  - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.pet/
+  - https://demonoid.unblockit.ist/
   - https://demonoid.torrentbay.to/
   - https://demonoid.nocensor.sbs/
 legacylinks:
-  - https://demonoid.unblockit.buzz/
-  - https://demonoid.unblockit.club/
-  - https://demonoid.unblockit.onl/
+  - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.ly/
   - https://demonoid.unblockit.li/
   - https://demonoid.unblockit.uno/
   - https://demonoid.unblockit.ch/
@@ -32,6 +31,8 @@ legacylinks:
   - https://demonoid.nocensor.biz/
   - https://demonoid.unblockit.day/
   - https://demonoid.unblockit.llc/
+  - https://demonoid.unblockit.blue/
+  - https://demonoid.unblockit.name/
 
 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/dragonworldreloaded.yml

@@ -10,10 +10,6 @@ links:
 
 caps:
   categorymappings:
-    # Kino
-    - {id: 118, cat: Movies/HD, desc: "Kino - HD"}
-    - {id: 141, cat: Movies/UHD, desc: "Kino - UHD"}
-    - {id: 4, cat: Movies/SD, desc: "Kino - SD"}
     # Movies
     - {id: 19, cat: Movies/HD, desc: "Movies - HD"}
     - {id: 26, cat: Movies/UHD, desc: "Movies - UHD"}
@@ -25,6 +21,7 @@ caps:
     - {id: 143, cat: TV/UHD, desc: "Serien - UHD"}
     - {id: 40, cat: TV/SD, desc: "Serien - SD"}
     - {id: 80, cat: TV/HD, desc: "Serien - Pack HD"}
+    - {id: 151, cat: TV/UHD, desc: "Serien - Pack UHD"}
     - {id: 42, cat: TV/SD, desc: "Serien - Pack SD"}
     # Musik
     - {id: 119, cat: Audio, desc: "Musik - Album"}
@@ -38,8 +35,6 @@ caps:
     - {id: 38, cat: TV/Documentary, desc: "Doku - HD"}
     - {id: 37, cat: TV/Documentary, desc: "Doku - SD"}
     - {id: 144, cat: TV/Documentary, desc: "Doku - Pack SD/HD"}
-    # Empfohlene
-    - {id: 150, cat: Other, desc: "Empfohlene - Torrents"}
     # Games
     - {id: 16, cat: PC/Games, desc: "Games - PC"}
     - {id: 14, cat: Console/Other, desc: "Games - Wimmelbild"}

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]
 
@@ -154,7 +154,7 @@ search:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
     tmdbid:
-      selector: a[href*="themoviedb.org/movie/"]
+      selector: a[href*="themoviedb.org/movie/"], a[href*="themoviedb.org/tv/"]
       attribute: href
     date:
       selector: time

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.ist/
   - https://extratorrent.nocensor.sbs/
 legacylinks:
   - https://extratorrent.nocensor.work/
@@ -19,6 +19,8 @@ legacylinks:
   - https://extratorrent.nocensor.biz/
   - https://extratorrent.unblockit.day/
   - https://extratorrent.unblockit.llc/
+  - https://extratorrent.unblockit.blue/
+  - https://extratorrent.unblockit.name/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/eztv.yml

@@ -13,17 +13,14 @@ links:
   - https://eztv.yt/
   - https://eztv1.xyz/
   - https://eztv.unblockninja.com/
-  - https://eztv.unblockit.blue/
+  - https://eztv.unblockit.ist/
   - https://eztv.nocensor.sbs/
 legacylinks:
   - https://eztv.ag/ # redirects to .re
   - https://eztv.it/ # redirects to .re
   - https://eztv.ch/ # redirects to .re
   - https://eztv.io/
-  - https://eztv.unblockit.buzz/
   - https://eztv.unblocked.monster/
-  - https://eztv.unblockit.club/
-  - https://eztv.unblockit.onl/
   - https://eztv.unblockit.li/
   - https://eztv.unblockit.uno/
   - https://eztv.unblockit.ch/
@@ -38,6 +35,8 @@ legacylinks:
   - https://eztv.nocensor.biz/
   - https://eztv.unblockit.day/
   - https://eztv.unblockit.llc/
+  - https://eztv.unblockit.blue/
+  - https://eztv.unblockit.name/
 
 caps:
   categories:

src/Jackett.Common/Definitions/fantasticheaven.yml

@@ -18,16 +18,17 @@ caps:
     - {id: 101, cat: Movies/DVD, desc: "Filme DVD"}
     - {id: 62, cat: Movies/3D, desc: "Filme 3D"}
     - {id: 169, cat: Movies/Foreign, desc: "Filme International"}
-    - {id: 129, cat: Movies/SD, desc: "Filme Packs SD"}
-    - {id: 130, cat: Movies/HD, desc: "Filme Packs 720p"}
-    - {id: 131, cat: Movies/HD, desc: "Filme Packs 1080p"}
-    - {id: 159, cat: Movies/UHD, desc: "Filme Packs 2160p"}
+    - {id: 183, cat: Movies/SD, desc: "Filme Packs SD"}
+    - {id: 184, cat: Movies/HD, desc: "Filme Packs 720p"}
+    - {id: 185, cat: Movies/HD, desc: "Filme Packs 1080p"}
+    - {id: 186, cat: Movies/UHD, desc: "Filme Packs 2160p"}
     - {id: 172, cat: Movies/SD, desc: "Film-Klassiker SD"}
     - {id: 173, cat: Movies/HD, desc: "Film-Klassiker 720p"}
     - {id: 174, cat: Movies/HD, desc: "Film-Klassiker 1080p"}
     - {id: 175, cat: Movies/UHD, desc: "Film-Klassiker 2160p"}
     - {id: 180, cat: Movies/DVD, desc: "Film-Klassiker DVD"}
     - {id: 181, cat: Movies/BluRay, desc: "Film-Klassiker Bluray"}
+    - {id: 182, cat: Movies/3D, desc: "Film-Klassiker 3D"}
     - {id: 176, cat: Movies/SD, desc: "Film-Klassiker Pack SD"}
     - {id: 177, cat: Movies/HD, desc: "Film-Klassiker Pack 720p"}
     - {id: 178, cat: Movies/HD, desc: "Film-Klassiker Pack 1080p"}
@@ -38,19 +39,17 @@ caps:
     - {id: 68, cat: TV/UHD, desc: "Serien 2160p"}
     - {id: 69, cat: TV/Foreign, desc: "Serien Ger-Subbed"}
     - {id: 167, cat: TV/Foreign, desc: "Serien International"}
-    - {id: 76, cat: TV/SD, desc: "Serienpacks SD"}
-    - {id: 77, cat: TV/HD, desc: "Serienpacks 720p"}
-    - {id: 78, cat: TV/HD, desc: "Serienpacks 1080p"}
-    - {id: 81, cat: TV/UHD, desc: "Serienpacks 2160p"}
-    - {id: 79, cat: TV/Foreign, desc: "Serienpacks Ger-Subbed"}
+    - {id: 187, cat: TV/SD, desc: "Serienpacks SD"}
+    - {id: 188, cat: TV/HD, desc: "Serienpacks 720p"}
+    - {id: 189, cat: TV/HD, desc: "Serienpacks 1080p"}
+    - {id: 190, cat: TV/UHD, desc: "Serienpacks 2160p"}
+    - {id: 191, cat: TV/Foreign, desc: "Serienpacks Ger-Subbed"}
     - {id: 71, cat: Audio/MP3, desc: "Audio MP3"}
     - {id: 72, cat: Audio/Lossless, desc: "Audio Flac"}
     - {id: 73, cat: Audio, desc: "Audio Packs"}
     - {id: 153, cat: Audio/Audiobook, desc: "Hörbücher"}
-    - {id: 123, cat: PC, desc: "Software Windows"}
-    - {id: 166, cat: PC/Mac, desc: "Software Sonstiges"}
-    - {id: 132, cat: PC/Games, desc: "Spiele Windows"}
-    - {id: 150, cat: PC/Mac, desc: "Spiele Sonstiges"}
+    - {id: 192, cat: PC/Games, desc: "Spiele Windows"}
+    - {id: 193, cat: PC, desc: "Software Windows"}
     - {id: 90, cat: Books/Mags, desc: "Zeitschriften"}
     - {id: 89, cat: Books/EBook, desc: "E-Books"}
     - {id: 91, cat: XXX/SD, desc: "XXX SD"}

src/Jackett.Common/Definitions/fouducinema.yml

@@ -31,8 +31,10 @@ caps:
     - {id: 46, cat: Books/Technical, desc: "EBOOK Documents"}
     - {id: 48, cat: XXX/Other, desc: "EBOOK XXX"}
     - {id: 49, cat: Books/EBook, desc: "EBOOK Livres"}
-    - {id: 50, cat: TV/Anime, desc: "ANIMEE Anim<EFBFBD>e"}
+    - {id: 64, cat: TV/Anime, desc: "ANIMEE HDRip"}
     - {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.2

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,15 +10,13 @@ links:
   - https://glodls.to/
   - https://gtdb.cc/
   - https://www.gtdb.to/
-  - https://glotorrents.unblockit.blue/
+  - https://glotorrents.unblockit.ist/
   - https://glotorrents.nocensor.sbs/
+  - https://glodls.unblockninja.com/
 legacylinks:
   - https://glodls.rocks/
   - https://gtdb.to/
-  - https://glotorrents.unblockit.buzz/
   - https://glodls.unblocked.monster/
-  - https://glotorrents.unblockit.club/
-  - https://glotorrents.unblockit.onl/
   - https://glotorrents.unblockit.li/
   - https://glotorrents.unblockit.uno/
   - https://glotorrents.unblockit.ch/
@@ -33,6 +31,8 @@ legacylinks:
   - https://glotorrents.nocensor.biz/
   - https://glotorrents.unblockit.day/
   - https://glotorrents.unblockit.llc/
+  - https://glotorrents.unblockit.blue/
+  - https://glotorrents.unblockit.name/
 
 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/hdsky.yml

@@ -11,15 +11,20 @@ links:
 caps:
   categorymappings:
     - {id: 401, cat: Movies, desc: "Movies/电影"}
-    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
-    - {id: 410, cat: Movies, desc: "iPad/iPad影视"}
-    - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
-    - {id: 402, cat: TV, desc: "TV Series/剧集"}
+    - {id: 402, cat: TV, desc: "TV Series/剧集(分集)"}
     - {id: 403, cat: TV, desc: "TV Shows/综艺"}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
+    - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
     - {id: 406, cat: Audio/Video, desc: "Music Videos/音乐MV"}
     - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
     - {id: 408, cat: Audio, desc: "HQ Audio/无损音乐"}
     - {id: 409, cat: Other, desc: "Misc/其他"}
+    - {id: 410, cat: Movies, desc: "iPad/iPad影视"}
+    - {id: 411, cat: TV, desc: "TV Series/剧集(合集)"}
+    - {id: 412, cat: TV, desc: "TV Series/海外剧集(分集)"}
+    - {id: 413, cat: TV, desc: "TV Series/海外剧集(合集)"}
+    - {id: 414, cat: TV, desc: "TV Shows/海外综艺(分集)"}
+    - {id: 415, cat: TV, desc: "TV Shows/海外综艺(合集)"}
 
   modes:
     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]
 
@@ -135,7 +135,7 @@ search:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
     tmdbid:
-      selector: a[href*="themoviedb.org/movie/"]
+      selector: a[href*="themoviedb.org/movie/"], a[href*="themoviedb.org/tv/"]
       attribute: href
     date:
       selector: time

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]
@@ -131,7 +131,7 @@ search:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
     tmdbid:
-      selector: a[href*="themoviedb.org/movie/"]
+      selector: a[href*="themoviedb.org/movie/"], a[href*="themoviedb.org/tv/"]
       attribute: href
     date:
       selector: time

src/Jackett.Common/Definitions/kinozal.yml

@@ -7,6 +7,7 @@ type: semi-private
 encoding: windows-1251
 links:
   - http://kinozal.tv/ # site forces http, https is not supported
+  - https://kinozal-tv.appspot.com/
 
 caps:
   categorymappings:
@@ -136,6 +137,8 @@ search:
   paths:
     # http://kinozal.tv/browse.php?s=lucifer+2017&g=0&c=0&v=0&d=0&w=0&t=0&f=0
     - path: browse.php
+      # required for the appspot domain.
+      followredirect: true
   keywordsfilters:
 #    - name: diacritics # 8686
 #      args: replace
@@ -163,7 +166,7 @@ search:
 
   fields:
     title:
-      selector: td.nam a[href^="/details.php?id="]
+      selector: td.nam a[href^="/details.php?"]
       filters:
         # normalize to SXXEYY format
         - name: replace
@@ -219,7 +222,7 @@ search:
         - name: replace
           args: ["HDTVRip", "HDTV"]
     details:
-      selector: td.nam a[href^="/details.php?id="]
+      selector: td.nam a[href^="/details.php?"]
       attribute: href
     category:
       selector: td.bt img
@@ -228,7 +231,7 @@ search:
         - name: re_replace
           args: ["[^\\d+]", ""]
     download:
-      selector: td.nam a[href^="/details.php?id="]
+      selector: td.nam a[href^="/details.php?"]
       attribute: href
       filters:
         - name: replace

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:
@@ -183,4 +185,4 @@ search:
     minimumseedtime:
       # 4 days (as seconds = 4 x 24 x 60 x 60)
       text: 345600
-# json UNIT3D 6.0.8
+# json UNIT3D 6.2.1

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.ist/
   - https://limetorrents.unblockninja.com/
   - https://limetorrents.nocensor.sbs/
 legacylinks:
@@ -36,6 +36,8 @@ legacylinks:
   - https://limetorrents.unblockit.day/
   - https://www.limetorrents.pro/
   - https://limetorrents.unblockit.llc/
+  - https://limetorrents.unblockit.blue/
+  - https://limetorrents.unblockit.name/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/locadora.yml

@@ -0,0 +1,148 @@
+---
+id: locadora
+name: Locadora
+description: "Locadora is a Brazilian tracker for Movies and TV Shows"
+language: pt-BR
+type: private
+encoding: UTF-8
+links:
+  - https://locadora.xyz/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Filmes"}
+    - {id: 2, cat: TV, desc: "Series"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
+    movie-search: [q, imdbid, tmdbid]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://locadora.xyz/\" target =_blank>Locadora</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: re_replace
+      args: ["\\.", " "]
+
+  rows:
+    selector: data
+    attribute: attributes
+    count:
+      selector: meta.total
+
+  fields:
+    category:
+      selector: category_id
+    title:
+      selector: name
+      filters:
+        - name: re_replace
+          args: ["\\.", " "]
+    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 3 days regardless of ratio
+#    minimumratio:
+#      text: 0.4
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# json UNIT3D 6.2.1

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

@@ -10,6 +10,7 @@ links:
 
 caps:
   categorymappings:
+    - {id: 45, cat: Console/Other, desc: "Retro-spellen"}
     - {id: 43, cat: Movies/UHD, desc: "4k Films"}
     - {id: 41, cat: TV/Documentary, desc: "Documentaire"}
     - {id: 40, cat: Other, desc: "kerst"}

src/Jackett.Common/Definitions/megamixtracker.yml

@@ -116,7 +116,7 @@ search:
     # site does not support imdbid searching
 
   rows:
-    selector: "tr.tbody{{ if .Config.freeleech }}:has(img[src=\"kepek/ikon_free.png\"]){{ else }}{{ end }}"
+    selector: "tr.tbody:has(a[href^=\"download.php?id=\"]){{ if .Config.freeleech }}:has(img[src=\"kepek/ikon_free.png\"]){{ else }}{{ end }}"
     filters:
       - name: andmatch
 

src/Jackett.Common/Definitions/mteamtp.yml

@@ -101,6 +101,8 @@ login:
   error:
     - selector: td.embedded:has(h2:contains("登录失败"))
     - selector: td.embedded:has(h2:contains("failed"))
+    - selector: td.toolbox:contains("錯誤")
+    - selector: td.toolbox:contains("Error")
   test:
     path: index.php
     selector: a[href="logout.php"]

src/Jackett.Common/Definitions/netlab.yml

@@ -1,119 +0,0 @@
----
-id: netlab
-name: NetLab
-description: "NetLab is a RUSSIAN Private Torrent Tracker"
-language: ru-RU
-type: private
-encoding: windows-1251
-links:
-  - https://torrent.e2k.ru/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies/DVD, desc: "DVD5"}
-    - {id: 4, cat: Movies/DVD, desc: "DVD9"}
-    - {id: 5, cat: Movies/WEB-DL, desc: "MPEG/AVI"}
-    - {id: 6, cat: Audio, desc: "Музыка (Music)"}
-    - {id: 7, cat: PC/Games, desc: "Игры (Games)"}
-    - {id: 9, cat: PC/0day, desc: "Программы (Apps)"}
-    - {id: 10, cat: TV/HD, desc: "HDTV"}
-    - {id: 11, cat: Audio/Audiobook, desc: "Аудио Книги (Audiobooks)"}
-    - {id: 12, cat: Books/EBook, desc: "Книги (Ebooks)"}
-    - {id: 14, cat: Other, desc: "Разное (Other)"}
-    - {id: 15, cat: Audio/Video, desc: "МузDVD (Music/Video)"}
-
-  modes:
-    search: [q]
-    tv-search: [q]
-    movie-search: [q]
-    music-search: [q, artist]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: striprussian
-    type: checkbox
-    label: Strip Russian Letters
-    default: false
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    returnto: "/my.php"
-  error:
-    - selector: td.embedded:contains("Ошибка")
-  test:
-    path: my.php
-    selector: a[href="logout.php"]
-
-search:
-  paths:
-    # https://torrent.e2k.ru/browse.php?c1=1&c4=1&c10=1&incldead=0&search=
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.Artist }}{{ .Query.Artist }}{{ else }}{{ .Keywords }}{{ end }}"
-    # 0 active, 1 incldead, 2 onlydead
-    incldead: 1
-
-  rows:
-    selector: table[border="1"][cellspacing="0"][cellpadding="5"] > tbody > tr:has(a[href^="details.php?id="])
-
-  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: ["[\\:\\-\\/\\|]", " "]
-        - name: re_replace
-          args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    magnet:
-      selector: a[href^="magnet:?xt="]
-      optional: true
-      attribute: href
-    files:
-      selector: td:nth-child(3)
-    date:
-      selector: td:nth-child(4)
-      filters:
-        - name: append
-          args: " +03:00" # MSK
-        - name: dateparse
-          args: "2006-01-0215:04:05 -07:00"
-    size:
-      selector: td:nth-child(5)
-    grabs:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
-    downloadvolumefactor:
-      case:
-        img[src$="_gold.png"]: 0.65
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 0.15
-# engine n/a

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

@@ -5,6 +5,8 @@ description: "Peeratiko is a GREEK Private Torrent Tracker for MOVIES / TV / GEN
 language: el-GR
 type: private
 encoding: UTF-8
+certificates:
+  - 775f2bca8ea7d34985c02816508e4e559c924da0 # Expired ‎‎10 ‎July ‎2022
 links:
   - https://peeratiko.org/
 

src/Jackett.Common/Definitions/pignetwork.yml

@@ -0,0 +1,188 @@
+---
+id: pignetwork
+name: PigNetwork
+description: "PigNetwork (猪猪网) is a CHINESE Private Torrent Tracker for HD MOVIES / TV / GENERAL"
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - https://piggo.me/
+
+caps:
+  categorymappings:
+    - {id: 401, cat: Movies, desc: "Movies/电影", default: true}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片", default: true}
+    - {id: 405, cat: TV/Anime, desc: "Animations/动漫", default: true}
+    - {id: 402, cat: TV, desc: "TV Series/电视剧", default: true}
+    - {id: 403, cat: TV, desc: "TV Shows/综艺", default: true}
+    - {id: 406, cat: Audio/Video, desc: "MusicVideo/MV", default: true}
+    - {id: 407, cat: TV/Sport, desc: "Sports/体育", default: true}
+    - {id: 409, cat: Other, desc: "Misc/其他", default: true}
+    - {id: 408, cat: Audio, desc: "Music/音乐", default: true}
+    - {id: 908, cat: TV, desc: "TV Series/剧集", default: true}
+    - {id: 909, cat: Movies, desc: "Movies/电影", default: true}
+    - {id: 905, cat: Audio/Video, desc: "MusicVideo/MV", default: true}
+    - {id: 907, cat: Audio, desc: "Music/音乐", default: true}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    music-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+
+login:
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    logout: ""
+    securelogin: ""
+  error:
+    - selector: td.embedded:has(h2:contains("失败"))
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+      categories: [401, 402, 403, 404, 405, 406, 407, 408, 409]
+    - path: special.php
+      categories: [905, 907, 908, 909]
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
+    incldead: 0
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+
+  rows:
+    selector: table.torrents > tbody > tr:has(a[href^="details.php?id="])
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_default:
+      selector: a[href^="details.php?id="]
+    title_optional:
+      optional: true
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+    title:
+      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    poster:
+      selector: img.pr5
+      attribute: src
+    imdbid:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    doubanid:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
+      selector: a[href*="movie.douban.com/subject/"]
+      attribute: href
+    date_elapsed:
+      # time type: time elapsed (default)
+      selector: td.rowfollow:nth-child(4) > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
+    date_added:
+      # time added
+      selector: td.rowfollow:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "2006-01-0215:04:05 -07:00"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td.rowfollow:nth-child(5)
+    seeders:
+      selector: td.rowfollow:nth-child(6)
+    leechers:
+      selector: td.rowfollow:nth-child(7)
+    grabs:
+      selector: td.rowfollow:nth-child(8)
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+    description:
+      selector: td.rowfollow:nth-child(2)
+      remove: a, img
+# NexusPHP v1.7.16

src/Jackett.Common/Definitions/piratbit.yml

@@ -748,11 +748,14 @@ search:
     download:
       selector: td a.genmed
       attribute: href
+    description:
+      selector: td:first-child span
+      attribute: title
     size:
       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

@@ -675,6 +675,13 @@ login:
     path: index.php
     selector: li a[href="/login.php?logout=1"]
 
+download:
+  selectors:
+    - selector: a[class="btn btn-sm btn-success"][href^="/dl.php?id="]
+      attribute: href
+    - selector: a[href^="magnet:?xt="]
+      attribute: href
+
 search:
   paths:
     - path: tracker.php
@@ -762,14 +769,16 @@ search:
       selector: td a.genmed
       attribute: href
     download:
-      selector: td div a.dLink
+      selector: td a.genmed
       attribute: href
+    description:
+      selector: td:first-child span
+      attribute: title
     size:
       selector: td > u
-      # 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-html.yml

@@ -1,36 +1,35 @@
 ---
-id: piratadigital
-name: Pirata Digital
-description: "Pirata Digital (PD) is a BRAZILIAN Private Torrent Tracker for HD MOVIES / TV"
-language: pt-BR
+id: pixelados-html
+name: Pixelados
+description: "Pixelados is a Spanish Private Torrent Tracker for HD MOVIES / TV"
+language: es-ES
 type: private
 encoding: UTF-8
 links:
-  - https://pirata.digital/
+  - https://pixelados.tv/
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies, desc: "Filmes"}
-    - {id: 2, cat: TV, desc: "TV"}
-    - {id: 6, cat: TV/Anime, desc: "Animes"}
-    - {id: 4, cat: PC/Games, desc: "Jogos"}
-    - {id: 5, cat: PC/0day, desc: "Aplicativos"}
-    - {id: 7, cat: Other, desc: "Cursos"}
-    - {id: 8, cat: Movies/3D, desc: "3D"}
+    - {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]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
 
 settings:
-  - name: cookie
+  - name: username
     type: text
-    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+    label: Username
+  - name: password
+    type: password
+    label: Password
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -53,76 +52,113 @@ settings:
       asc: asc
 
 login:
-  method: cookie
+  path: login
+  method: form
+  form: form[action$="/login"]
   inputs:
-    cookie: "{{ .Config.cookie }}"
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    remember: on
+  selectorinputs:
+    _token:
+      selector: input[name="_token"]
+      attribute: value
+  error:
+    - selector: div#ERROR_COPY
 
 search:
   paths:
-    - path: torrents/filter
+    - path: torrents
   inputs:
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
-    description: ""
-    uploader: ""
-    imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: ""
-    tmdb: "{{ .Query.TMDBID }}"
-    mal: ""
-    igdb: ""
-    start_year: ""
-    end_year: ""
-    sorting: "{{ .Config.sort }}"
-    direction: "{{ .Config.type }}"
-    qty: 100
-    page: 0
-    view: list
-    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    name: "{{ .Keywords }}"
+    $raw: "{{ 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 $i, $e := .Categories }}&categories[{{$i}}]={{.}}{{end}}{{ if .Config.freeleech }}&free[0]=100{{ else }}{{ end }}"
+  keywordsfilters:
+    - name: diacritics
+      args: replace
+    - name: re_replace
+      args: ["\\.", " "]
+    - name: re_replace
+      args: ["(?i)\\bS0*(\\d+)\\b", "T$1"]
+    - name: re_replace
+      args: ["(?i)S0?(\\d{1,2})E(\\d{1,2})", "$1x$2"]
 
   rows:
     selector: table > tbody > tr
 
   fields:
     category:
-      selector: a[href*="/categories/"]
+      selector: td.torrent-listings-format div:first-child
+      case:
+        i.fa-film: 1
+        i.fa-tv-retro: 2
+        i.fa-music: 3
+        i.fa-paw: 4
+        i.fa-volleyball: 5
+        i.fa-robot: 6
+    details:
+      selector: a.torrent-listings-name
       attribute: href
-      filters:
-        - name: regexp
-          args: "/categories/(\\d+)"
+    title_raw:
+      selector: a.torrent-listings-name
+    format:
+      selector: td.torrent-listings-format
+    vose:
+      selector: a[href$="torrents?types[0]=53"]
+      optional: true
+    mejorada:
+      selector: a[href$="torrents?types[0]=52"]
+      optional: true
+    corregida:
+      selector: a[href$="torrents?types[0]=58"]
+      optional: true
+    audio_editado:
+      selector: a[href$="torrents?types[0]=39"]
+      optional: true
+    overview:
+      selector: td.torrent-listings-overview
+      remove: a, span.torrent-listings-comments, span.torrent-listings-thanks, span.torrent-listings-uploader
     title:
-      selector: a.view-torrent
+      text: "{{ .Result.title_raw }} {{ .Result.format }} {{ .Result.overview }}{{ if .Result.vose }}{{ else }} SPANISH{{ 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"]
     download:
       selector: a[href*="/download/"]
       attribute: href
-    details:
-      selector: a.view-torrent
-      attribute: href
     poster:
       selector: div.torrent-poster img
       attribute: src
       filters:
-        - name: prepend
-          args: "https://images.weserv.nl/?url=" # for display on dashboard
-        - name: append
-          args: "&w=180&h=270" # for display on dashboard
         - name: replace
-          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
+          args: ["https://via.placeholder.com/90x135", ""]
     size:
-      selector: td:nth-last-child(4)
+      selector: td.torrent-listings-size
     seeders:
-      selector: td:nth-last-child(3)
+      selector: td.torrent-listings-seeders
     leechers:
-      selector: td:nth-last-child(2)
+      selector: td.torrent-listings-leechers
     grabs:
-      selector: td:nth-last-child(1)
+      selector: td.torrent-listings-completed
     imdbid:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
     tmdbid:
-      selector: a[href*="themoviedb.org/movie/"]
+      selector: a[href*="themoviedb.org/movie/"], a[href*="themoviedb.org/tv/"]
       attribute: href
     date:
-      selector: time
+      selector: td.torrent-listings-age
       filters:
         # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
         - name: re_replace
@@ -176,10 +212,10 @@ search:
         i[class*="fa-globe text-green"]: 2 # Global Double Upload
         i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
         "*": 1
-# global MR is 0.4 but torrents must be seeded for 5 days regardless of ratio
+# global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
 #    minimumratio:
 #      text: 0.4
     minimumseedtime:
-      # 5 days (as seconds = 5 x 24 x 60 x 60)
-      text: 432000
-# UNIT3D 2.7.0
+      # 7 day (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
+# html UNIT3D 6.1.0 custom

src/Jackett.Common/Definitions/pixelados.yml

@@ -0,0 +1,187 @@
+---
+id: pixelados
+name: Pixelados (API)
+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

@@ -1,7 +1,7 @@
 ---
 id: portugas
 name: Portugas
-description: "Portugas is a Private Portoguese Tracker"
+description: "Portugas is a Private Portuguese Tracker"
 language: pt-PT
 type: private
 encoding: UTF-8
@@ -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/pterclub.yml

@@ -82,7 +82,7 @@ login:
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
-    verify_code: "{{ .Config.2facode }}"
+    2fa_secret: "{{ .Config.2facode }}"
     logout: ""
     securelogin: ""
     ssl: yes
@@ -138,7 +138,10 @@ search:
       selector: img[data-orig]
       attribute: data-orig
     imdbid:
-      selector: a[href*="imdb.com/title/tt"]
+      selector: a[href$="&search_area=4"]
+      attribute: href
+    doubanid:
+      selector: a[href$="&search_area=5"]
       attribute: href
     # staff have extra columns at the start and end of a row, so we have to float the next lot of selectors off an anchor
     anchor1:

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]
 
@@ -120,7 +120,7 @@ search:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
     tmdbid:
-      selector: a[href*="themoviedb.org/movie/"]
+      selector: a[href*="themoviedb.org/movie/"], a[href*="themoviedb.org/tv/"]
       attribute: href
     size:
       selector: td:nth-last-child(4)

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.1

src/Jackett.Common/Definitions/sharewood.yml

@@ -40,6 +40,7 @@ caps:
     - {id: "Sony", cat: Console/PSP, desc: "Jeux Sony"}
     - {id: "Smartphone_Tablette", cat: Console, desc: "Jeux Smartphone/Tablette"}
     - {id: "Retrogaming_Emulation", cat: Console, desc: "Jeux Rétrogaming & Emulation"}
+    - {id: "Formations", cat: Other, desc: "Formations"}
     - {id: "Formations_Video", cat: Other, desc: "Formations Video"}
     - {id: "Formations_Logiciels", cat: Other, desc: "Formations Logiciels"}
     - {id: "Films_X", cat: XXX, desc: "XXX"}

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:
@@ -136,4 +138,4 @@ search:
     minimumseedtime:
       # 7 days (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 6.1.0
+# json UNIT3D 6.2.1

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

@@ -7,7 +7,8 @@ type: public
 encoding: UTF-8
 links:
   - https://thepiratebay.org/
-  - https://piratebayo3klnzokct3wt5yyxb2vpebbuyjl7m623iaxmqhsd52coid.onion.ly/
+  - https://piratebayo3klnzokct3wt5yyxb2vpebbuyjl7m623iaxmqhsd52coid.onion.ws/
+  - https://piratebayo3klnzokct3wt5yyxb2vpebbuyjl7m623iaxmqhsd52coid.onion.pet/
   - https://tpb22.ukpass.co/
   - https://tpb.sadzawka.tk/
   - https://thepiratebay.host/
@@ -30,6 +31,7 @@ links:
   - https://thepirateb.xyz/
   - https://ezrasstuff.com/
 legacylinks:
+  - https://piratebayo3klnzokct3wt5yyxb2vpebbuyjl7m623iaxmqhsd52coid.onion.ly/
   - https://thepiratebay0.org/
   - https://thepiratebay10.org/
   - https://pirateproxy.live/

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]
 
@@ -128,7 +128,7 @@ search:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
     tmdbid:
-      selector: a[href*="themoviedb.org/movie/"]
+      selector: a[href*="themoviedb.org/movie/"], a[href*="themoviedb.org/tv/"]
       attribute: href
     size:
       selector: td:nth-last-child(4)

src/Jackett.Common/Definitions/torlock.yml

@@ -7,16 +7,12 @@ 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.ist/
   - https://torlock.nocensor.sbs/
 legacylinks:
   - https://torlock.com/
-  - https://torlock.unblockit.buzz/
-  - https://torlock.unblockit.club/
-  - https://torlock.unblockit.onl/
   - https://torlock.unblockit.li/
   - https://torlock.unblockit.uno/
   - https://torlock.unblockit.ch/
@@ -31,6 +27,9 @@ legacylinks:
   - https://torlock.nocensor.biz/
   - https://torlock.unblockit.day/
   - https://torlock.unblockit.llc/
+  - https://torlock.unblockit.blue/
+  - https://www.torlock.icu/
+  - https://torlock.unblockit.name/
 
 caps:
   # dont forget to update the search fields category case block

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

@@ -55,6 +55,7 @@ caps:
     - {id: 180, cat: PC/Games, desc: "PC/Games"}
     - {id: 181, cat: Console, desc: "Playstation"}
     - {id: 198, cat: Movies, desc: "Movies/Amazon Prime"}
+    - {id: 200, cat: Movies, desc: "Movies/Disney+"}
 
   modes:
     search: [q]

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

@@ -1,14 +1,16 @@
 ---
-id: oxtorrent
-name: OxTorrent
-description: "OxTorrent is a French Public site for TV / MOVIES / GENERAL"
+id: torrent911
+name: Torrent911
+description: "Torrent911 is a French Public site for TV / MOVIES / GENERAL"
 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/
@@ -48,6 +50,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: Porno, cat: XXX, desc: "Porno"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/torrent9clone.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/torrent9
 links:
-  - https://www.torrent9.re/
+  - https://ww1.torrent9.re/
   - https://torrent9.nocensor.sbs/
 legacylinks:
   - https://www.t9.vc/
@@ -31,6 +32,7 @@ legacylinks:
   - https://www.torrent9.si/
   - https://torrent9.nocensor.biz/
   - https://www.torrent9.nl/
+  - https://www.torrent9.re/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentcore.yml

@@ -0,0 +1,108 @@
+---
+id: torrentcore
+name: Torrent[CORE]
+description: "Torrent[CORE] is a Public DHT Crawler"
+language: en-US
+type: public
+encoding: UTF-8
+links:
+  - https://torrentcore.xyz/
+
+caps:
+  categorymappings:
+    - {id: 0DAY, cat: PC/0day, desc: Software 0DAY}
+    - {id: DVDR, cat: Movies/DVD, desc: Movies DVDR}
+    - {id: EBOOK, cat: Books, desc: Ebook}
+    - {id: FLAC, cat: Audio/Lossless, desc: Music FLAC}
+    - {id: GAMES, cat: PC/Games, desc: Games}
+    - {id: MP3, cat: Audio/MP3, desc: Music MP3}
+    - {id: MP4, cat: Movies, desc: Movies MP4}
+    - {id: PDA, cat: PC/Mobile-Other, desc: Software PDA}
+    - {id: PS3, cat: Console/PS3, desc: Games PS3}
+    - {id: TV, cat: TV, desc: TV}
+    - {id: TV-DVDRIP, cat: TV/SD, desc: TV DVDRIP}
+    - {id: TV-X265, cat: TV/HD, desc: TV X265}
+    - {id: TV-XVID, cat: TV/SD, desc: TV XVID}
+    - {id: UNKNOWN, cat: Other, desc: Unknown}
+    - {id: X264, cat: Movies/HD, desc: Movies X264}
+    - {id: XBOX360, cat: Console/XBox 360, desc: Games XBOX360}
+    - {id: XVID, cat: Movies/SD, desc: Movies XVID}
+    - {id: XXX, cat: XXX, desc: Adult}
+    - {id: XXX-0DAY, cat: XXX, desc: Adult 0DAY}
+    - {id: XXX-IMGSET, cat: XXX/ImageSet, desc: Adult IMGSET}
+    - {id: XXX-X264, cat: XXX, desc: Adult X264}
+    - {id: XXX-X265, cat: XXX, desc: Adult X265}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings: []
+
+download:
+  infohash:
+    hash:
+      selector: div.content
+      filters:
+        - name: regexp
+          args: "Hash: ([A-F|a-f|0-9]{40})"
+    title:
+      selector: font[color="orange"]
+      filters:
+        - name: trim
+        - name: validfilename
+
+search:
+  paths:
+    - path: "{{ if .Keywords }}?s={{ re_replace .Keywords \"[\\s]+\" \"%\" }}{{ else }}index{{ end }}"
+
+  rows:
+    selector: div.content font[color="purple"], div.content font[color="orange"]:has(img), div.content font[color="gray"], div.content font[color="white"]
+    after: 3
+
+  fields:
+    category:
+      selector: img[src^="./cat/"]
+      attribute: src
+      filters:
+        - name: regexp
+          args: "cat/(.+?).png"
+    title:
+      selector: a
+    details:
+      selector: a
+      attribute: href
+    download:
+      selector: a
+      attribute: href
+    size:
+      selector: font[color="purple"]
+      filters:
+        - name: regexp
+          args: "Size: (.+?)/"
+    files:
+      selector: font[color="purple"]
+      filters:
+        - name: regexp
+          args: "File: (\\d+)"
+    date:
+      selector: font[color="purple"]
+      filters:
+        - name: regexp
+          args: "\\[ (\\d{2} [A-Za-z]+ \\d{4} \\d{2}:\\d{2}:\\d{2}) \\]"
+        - name: append
+          args: " -07:00" # PDT
+        - name: dateparse
+          args: "02 January 2006 03:04:05 -07:00"
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/torrentdb.yml

@@ -125,7 +125,7 @@ search:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
     tmdbid:
-      selector: a[href*="themoviedb.org/movie/"]
+      selector: a[href*="themoviedb.org/movie/"], a[href*="themoviedb.org/tv/"]
       attribute: href
     downloadvolumefactor:
       case:

src/Jackett.Common/Definitions/torrentdownload.yml

@@ -8,14 +8,11 @@ encoding: UTF-8
 followredirect: true
 links:
   - https://www.torrentdownload.info/
-  - https://torrentdownload.unblockit.blue/
+  - https://torrentdownload.unblockit.ist/
   - https://torrentdownload.nocensor.sbs/
 legacylinks:
   - https://torrentdownload.unblocked.rest/
-  - https://torrentdownload.unblockit.buzz/
   - https://torrentdownload.unblocked.monster/
-  - https://torrentdownload.unblockit.club/
-  - https://torrentdownload.unblockit.onl/
   - https://torrentdownload.unblockit.li/
   - https://torrentdownload.unblockit.uno/
   - https://torrentdownload.unblockit.ch/
@@ -30,6 +27,8 @@ legacylinks:
   - https://torrentdownload.nocensor.biz/
   - https://torrentdownload.unblockit.day/
   - https://torrentdownload.unblockit.llc/
+  - https://torrentdownload.unblockit.blue/
+  - https://torrentdownload.unblockit.name/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentdownloads.yml

@@ -9,13 +9,11 @@ followredirect: true
 links:
   - https://www.torrentdownloads.info/
   - https://www.torrentdownloads.pro/
-  - https://torrentdownloads.unblockit.blue/
+  - https://torrentdownloads.unblockit.ist/
   - https://torrentdownloads.nocensor.sbs/
+  - https://torrentdownloads.unblockninja.com/
 legacylinks:
-  - https://torrentdownloads.unblockit.buzz/
   - https://torrentdownloads.unblocked.monster/
-  - https://torrentdownloads.unblockit.club/
-  - https://torrentdownloads.unblockit.onl/
   - https://torrentdownloads.unblockit.li/
   - https://torrentdownloads.unblockit.uno/
   - https://www.torrentdownloads.me/
@@ -31,6 +29,8 @@ legacylinks:
   - https://torrentdownloads.nocensor.biz/
   - https://torrentdownloads.unblockit.day/
   - https://torrentdownloads.unblockit.llc/
+  - https://torrentdownloads.unblockit.blue/
+  - https://torrentdownloads.unblockit.name/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentfunk.yml

@@ -9,12 +9,9 @@ followredirect: true
 links:
   - https://www.torrentfunk.com/
   - https://www.torrentfunk2.com/
-  - https://torrentfunk.unblockit.blue/
+  - https://torrentfunk.unblockit.ist/
   - https://torrentfunk.nocensor.sbs/
 legacylinks:
-  - https://torrentfunk.unblockit.buzz/
-  - https://torrentfunk.unblockit.club/
-  - https://torrentfunk.unblockit.onl/
   - https://torrentfunk.unblockit.li/
   - https://torrentfunk.unblockit.uno/
   - https://torrentfunk.unblockit.ch/
@@ -29,6 +26,8 @@ legacylinks:
   - https://torrentfunk.nocensor.biz/
   - https://torrentfunk.unblockit.day/
   - https://torrentfunk.unblockit.llc/
+  - https://torrentfunk.unblockit.blue/
+  - https://torrentfunk.unblockit.name/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentgalaxy.yml

@@ -11,15 +11,12 @@ links:
   - https://torrentgalaxy.mx/
   - https://torrentgalaxy.su/
   - https://torrentgalaxy.unblockninja.com/
-  - https://torrentgalaxy.unblockit.blue/
+  - https://torrentgalaxy.unblockit.ist/
   - https://torrentgalaxy.nocensor.sbs/
 legacylinks:
   - https://torrentgalaxy.org/ # redirects to *.to
   - https://torrentgalaxy.pw/ # proxy list only
-  - https://torrentgalaxy.unblockit.buzz/
   - https://tgx.unblocked.monster/
-  - https://torrentgalaxy.unblockit.club/
-  - https://torrentgalaxy.unblockit.onl/
   - https://torrentgalaxy.unblockit.li/
   - https://torrentgalaxy.unblockit.uno/
   - https://torrentgalaxy.unblockit.ch/
@@ -34,6 +31,8 @@ legacylinks:
   - https://torrentgalaxy.nocensor.biz/
   - https://torrentgalaxy.unblockit.day/
   - https://torrentgalaxy.unblockit.llc/
+  - https://torrentgalaxy.unblockit.blue/
+  - https://torrentgalaxy.unblockit.name/
 
 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/torrentleech.yml

@@ -7,6 +7,8 @@ type: private
 encoding: UTF-8
 links:
   - https://www.torrentleech.org/
+  - https://www.torrentleech.cc/
+  - https://www.torrentleech.me/
 legacylinks:
   - https://v4.torrentleech.org/
 

src/Jackett.Common/Definitions/torrentmasters.yml

@@ -7,6 +7,8 @@ type: private
 encoding: UTF-8
 links:
   - https://torrentmasters.info/
+certificates:
+  - 18a3b32827655ecde9c78839fb186fafd6c7c28e # Expired 6th July 2022
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentparadise.yml

@@ -1,254 +0,0 @@
----
-id: torrentparadise
-name: TorrentParadise
-description: "Torrent Paradise is a Public magnet indexer"
-language: en-US
-type: public
-encoding: UTF-8
-links:
-  - https://torrentparadise.cc/
-legacylinks:
-  - https://torrentparadise.cl/ # redirects to *.cc
-  - https://torrentparadise.to/ # redirects to *.cc
-  - https://torrentparadise.la/ # broken
-  - https://torrentparadise.org/ # redirects to *.cc
-  - https://torrentparadise.pm/ # DNS_PROBE_FINISHED_NXDOMAIN
-
-caps:
-  categories:
-    ADULT: XXX
-    ADULTHENTAI: XXX
-    ADULTLATINA: XXX
-    ADULTMILF: XXX
-    ADULTHDMOVIES: XXX
-    ADULTPORN: XXX
-    ADULTXXX: XXX
-    ANDROID: PC
-    ANIME: TV/Anime
-    ANIMEDUBBEDSUBBED: TV/Anime
-    ANIMEOTHERS: TV/Anime
-    APPLICATIONS: PC
-    APPLICATIONSANDROID: PC
-    APPLICATIONSHANDHELD: PC/Mobile-Other
-    APPLICATIONSMAC: PC/Mac
-    APPLICATIONSOTHEROS: PC
-    APPLICATIONSWINDOWS: PC/0day
-    APPS: PC
-    APPSANDROID: PC
-    APPSHANDHELD: PC/Mobile-Other
-    APPSMAC: PC/Mac
-    APPSOTHEROS: PC
-    APPSPC: PC
-    APPSWINDOWS: PC/0day
-    AUDIO: Audio
-    AUDIOBOOKS: Audio/Audiobook
-    AUDIOAUDIOBOOKS: Audio/Audiobook
-    AUDIOFLAC: Audio/Lossless
-    AUDIOLOSSLESS: Audio/Lossless
-    AUDIOMP3: Audio/MP3
-    AUDIOMUSIC: Audio
-    AUDIOOTHER: Audio/Other
-    AUDIOSOUNDCLIPS: Audio
-    ADULTGAMES: XXX
-    ADULTMOVIES: XXX
-    BOOKS: Books
-    BOOKSAUDIO: Audio/Audiobook
-    BOOKSCOMICS: Books/Comics
-    BOOKSEBOOKS: Books/EBook
-    BOOKSMAGAZINES: Books/Mags
-    BOOKSNONFICTION: Books
-    BOOKSTEXTBOOKS: Books
-    BOOKSTUTORIALS: Books
-    COMIC: Books/Comics
-    COMICSNEM43COMICS: Books/Comics
-    DESIPORN: XXX
-    DOCUMENTARIES: TV/Documentary
-    DVDRVIDEO: Movies/DVD
-    EBOOKS: Books/EBook
-    EBOOKSTUTORIALS: Books/EBook
-    ESTRENOS: XXX
-    FLAC: Audio/Lossless
-    FLACMUSIC: Audio/Lossless
-    GAMES: PC/Games
-    GAMESANDROID: PC/Games
-    GAMESHANDHELD: Console
-    GAMESOTHER: Console
-    GAMESPC: PC/Games
-    GAMESPS2: Console/PSP
-    GAMESPS3: Console/PS3
-    GAMESPS4: Console/PS4
-    GAMESPSP: Console/PSP
-    GAMESWII: Console/Wii
-    GAMESWIIU: Console/WiiU
-    GAMESWINDOWS: PC/Games
-    GAMESXBOX: Console/XBox
-    GAMESXBOX360: Console/XBox 360
-    HDMOVIES: Movies/HD
-    IMAGES: Other
-    JAPANESEANIME: TV/Anime
-    JUEGOS: Console
-    JUEGOSPC: PC/Games
-    JUEGOSPS2: Console/PSP
-    JUEGOSPS3: Console/PS3
-    JUEGOSPS4: Console/PS4
-    JUEGOSPSP: Console/PSP
-    JUEGOSWII: Console/Wii
-    JUEGOSWIIU: Console/WiiU
-    JUEGOSXBOX: Console/XBox
-    JUEGOSXBOX360: Console/XBox 360
-    MACINTOSH: PC/Mac
-    MISCELLANEOUS: Other
-    MOBILE: PC/Mobile-Other
-    MOVIES: Movies
-    MOVIES3D: Movies/3D
-    MOVIESACTION: Movies
-    MOVIESBLURAYDISCREMUX: Movies/HD
-    MOVIESBOLLYWOOD: Movies
-    MOVIESCAMTS: Movies
-    MOVIESDOCUMENTARY: TV/Documentary
-    MOVIESDUBSDUALAUDIO: Movies
-    MOVIESENGLISHSPANISHSUBT: Movies
-    MOVIESSDX264H264: Movies/SD
-    MOVIESHD: Movies/HD
-    MOVIESHD720P: Movies/HD
-    MOVIESHD1080P: Movies/HD
-    MOVIESHEVCX265: Movies/HD
-    MOVIESHIGHRESMOVIES: Movies/HD
-    MOVIESSCIFI: Movies
-    MOVIESSPANISHLANGUAGE: Movies
-    MOVIESSPANISHLATINAMERICA: Movies
-    MOVIESULTRAHD4K: Movies/UHD
-    MOVIESX264H264: Movies/HD
-    MOVIESXVID: Movies/SD
-    MOVIESWEBRIPX264X265: Movies/HD
-    MP3: Audio/MP3
-    MP3MUSIC: Audio/MP3
-    MSICA: Other
-    MUSIC: Audio
-    MUSICFLAC: Audio/Lossless
-    MUSICLOSSLESS: Audio/Lossless
-    MUSICMP3: Audio/MP3
-    MUSICMUSICVIDEOS: Audio/Video
-    MUSICVIDEOS: Audio/Video
-    OTHER: Other
-    OTHERCOMICS: Other
-    OTHERCOVERS: Other
-    OTHEREBOOKS: Other
-    OTHEROTHER: Other
-    OTHERPICTURES: Other
-    OTHERSOUNDCLIPS: Other
-    PACKS: TV
-    PELICULASCVCD: TV/SD
-    PELICULASDIVX: TV/SD
-    PELICULASHDRIP: TV/HD
-    PELICULASMICROHD: TV/HD
-    PICTURES: Other
-    PORN: XXX
-    PORNHDMOVIES: XXX
-    PORNGAMES: XXX
-    PORNMOVIECLIPS: XXX
-    PORNMOVIESDVDR: XXX
-    PORNMOVIES: XXX
-    PORNOTHER: XXX
-    PORNPICTURES: XXX
-    SERIES: TV
-    SOFTWARE: PC
-    SOFTWAREANDROID: PC/Mobile-Android
-    SOFTWAREMAC: PC/Mac
-    SOFTWAREWINDOWS: PC/0day
-    SOTFTWARE: PC
-    SPORTS: TV/Sport
-    TVHDSPORTS: TV/Sport
-    TUTORIALS: Other
-    TUTORIALSTUTORIALS: Other
-    TV: TV
-    TVHDX264H264: TV/HD
-    TVHEVCX265: TV/HD
-    TVDIVXXVID: TV/SD
-    TVDOCUMENTARY: TV/Documentary
-    TVSDXVID: TV/SD
-    TVSDX264H264: TV/SD
-    TVSDX264X265: TV/SD
-    TVSHOWS: TV
-    TVSPORT: TV/Sport
-    TVULTRAHD4K: TV/UHD
-    TVTVPACKS: TV
-    VIDEO: Movies
-    UNSORTEDUNSORTED: Other
-    VIDEOHANDHELD: Movies
-    VIDEOHDMOVIES: Movies/HD
-    VIDEOHDRIP: Movies
-    VIDEOHDTVSHOWS: TV/HD
-    VIDEOMOVIESDVDR: Movies/DVD
-    VIDEOMOVIECLIPS: Movies
-    VIDEOMOVIES: Movies
-    VIDEOMUSICVIDEOS: Audio/Video
-    VIDEOOTHER: Movies
-    VIDEOS: Movies
-    VIDEOSDMOVIES: Movies/SD
-    VIDEOSDTVSHOWS: TV/SD
-    VIDEOTVSHOWS: TV
-    VIDEOUHDMOVIES: Movies/UHD
-    VIDEOUHDTVSHOWS: TV/UHD
-    WINDOWS: PC/0day
-    XXX: XXX
-    XXXHDVIDEO: XXX
-    XXXVIDEO: XXX
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings: []
-
-download:
-  selectors:
-    - selector: a[href^="magnet:?xt="]
-      attribute: href
-
-search:
-  # https://torrentparadise.org/searchA.php?f=monday+night
-  paths:
-    - path: "searchA.php?f={{ if .Keywords }}{{ .Keywords }}{{ else }}%{{ end }}"
-
-  rows:
-    selector: table.table-bordered > tbody > tr.table-default
-
-  fields:
-    category:
-      text: OTHER
-    category|noappend:
-      selector: td:nth-child(1) a
-      optional: true
-      filters:
-        - name: re_replace
-          args: ["[^a-zA-Z0-9]+", ""]
-        - name: toupper
-    description:
-      selector: td:nth-child(1) a
-    title:
-      selector: td:nth-child(2) a
-    details:
-      selector: td:nth-child(2) a
-      attribute: href
-    download:
-      selector: td:nth-child(2) a
-      attribute: href
-    size:
-      selector: td:nth-child(3)
-    date:
-      selector: td:nth-child(4)
-      filters:
-        - name: timeago
-    seeders:
-      selector: td:nth-child(5)
-    leechers:
-      selector: td:nth-child(6)
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/torrentqq.yml

@@ -7,15 +7,8 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentqq145.com/
+  - https://torrentqq213.com/
 legacylinks:
-  - https://torrentqq130.com/
-  - https://torrentqq131.com/
-  - https://torrentqq132.com/
-  - https://torrentqq133.com/
-  - https://torrentqq134.com/
-  - https://torrentqq135.com/
-  - https://torrentqq136.com/
   - https://torrentqq137.com/
   - https://torrentqq138.com/
   - https://torrentqq139.com/
@@ -24,6 +17,13 @@ legacylinks:
   - https://torrentqq142.com/
   - https://torrentqq143.com/
   - https://torrentqq144.com/
+  - https://torrentqq145.com/
+  - https://torrentqq146.com/
+  - https://torrentqq147.com/
+  - https://torrentqq148.com/
+  - https://torrentqq149.com/
+  - https://torrentqq211.com/
+  - https://torrentqq212.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/torrentsir.yml

@@ -7,26 +7,26 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentsir58.com/
+  - https://torrentsir62.com/
 legacylinks:
-  - https://torrentsir46.com/
-  - https://torrentsir47.com/
-  - https://torrentsir48.com/
-  - https://torrentsir49.com/
-  - https://torrentsir50.com/
-  - https://torrentsir51.com/
-  - https://torrentsir52.com/
-  - http://torrentsir52.com/
-  - https://torrentsir53.com/
-  - http://torrentsir53.com/
-  - https://torrentsir54.com/
   - http://torrentsir54.com/
-  - https://torrentsir55.com/
+  - https://torrentsir54.com/
   - http://torrentsir55.com/
+  - https://torrentsir55.com/
   - http://torrentsir56.com/
   - https://torrentsir56.com/
+  - http://torrentsir57.com/
   - https://torrentsir57.com/
   - http://torrentsir58.com/
+  - https://torrentsir58.com/
+  - http://torrentsir59.com/
+  - https://torrentsir59.com/
+  - http://torrentsir60.com/
+  - https://torrentsir60.com/
+  - http://torrentsir61.com/
+  - https://torrentsir61.com/
+  - http://torrentsir62.com/
+
 caps:
   categorymappings:
     - {id: "gallery", cat: XXX, desc: "+19 (Adult)"}

src/Jackett.Common/Definitions/torrentview.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentview62.com/
+  - https://torrentview63.com/
 legacylinks:
   - https://torrentview.net/
   - https://torrentview.co/
@@ -24,6 +24,7 @@ legacylinks:
   - https://torrentview53.com/
   - https://torrentview57.com/
   - https://torrentview60.com/
+  - https://torrentview62.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentwhiz.yml

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

src/Jackett.Common/Definitions/trupornolabs.yml

@@ -1,85 +0,0 @@
----
-id: trupornolabs
-name: truPornolabs
-description: "truPornolabs is a RUSSIAN Public tracker for 3X"
-language: ru-RU
-type: public
-encoding: UTF-8
-links:
-  - http://trupornolabs.org/ # https not supported
-
-caps:
-  categories:
-    XXX: XXX
-
-  modes:
-    search: [q]
-
-settings: []
-
-search:
-  paths:
-    # http://trupornolabs.org/search/vika
-    # http://trupornolabs.org/browse/0/0/0/0
-    - path: "{{ if .Keywords }}search/{{ .Keywords }}{{ else }}browse/0/0/0/0{{ end }}"
-
-  rows:
-    # filter out torrents with 0B for issue #9756
-    selector: tr.gai:has(a[href^="/torrent/"]):has(td:nth-of-type(3):contains("GB")), tr.gai:has(a[href^="/torrent/"]):has(td:nth-of-type(3):contains("MB"))
-
-  fields:
-    category:
-      text: XXX
-    title:
-      selector: a[href^="/torrent/"]
-    details:
-      selector: a[href^="/torrent/"]
-      attribute: href
-    download:
-      selector: a.downgif
-      attribute: href
-    magnet:
-      selector: a[href^="magnet:?xt="]
-      attribute: href
-    date:
-      selector: td:first-of-type
-      filters:
-        - name: replace
-          args: ["Янв", "Jan"]
-        - name: replace
-          args: ["Фев", "Feb"]
-        - name: replace
-          args: ["Мар", "Mar"]
-        - name: replace
-          args: ["Апр", "Apr"]
-        - name: replace
-          args: ["Май", "May"]
-        - name: replace
-          args: ["Июн", "Jun"]
-        - name: replace
-          args: ["Июл", "Jul"]
-        - name: replace
-          args: ["Авг", "Aug"]
-        - name: replace
-          args: ["Сен", "Sep"]
-        - name: replace
-          args: ["Окт", "Oct"]
-        - name: replace
-          args: ["Ноя", "Nov"]
-        - name: replace
-          args: ["Дек", "Dec"]
-        - name: append
-          args: " +03:00" # MSK
-        - name: dateparse
-          args: "02 Jan 06 -07:00"
-    size:
-      selector: td:nth-of-type(3)
-    seeders:
-      selector: span.green
-    leechers:
-      selector: span.red
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a