bithdtv: add genre support and update cats

also remove the dropping of the first result

.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

@@ -49,6 +49,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BTmirror
  * BTSOW
  * Byrutor
+ * CloudTorrents
  * comicat
  * ConCen
  * cpasbien
@@ -91,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
@@ -106,13 +108,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Nyaa.si
  * OneJAV
  * OpenSharing
- * OxTorrent
  * ParnuXi
  * PC-torrent
  * PiratBit
  * Pornforall
  * PornLeech
- * PornoLive
  * PornosLab
  * PornoTor
  * PornoTorrent
@@ -147,11 +147,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * torrent-pirat
  * Torrent9
  * Torrent9 clone
+ * Torrent911
  * TorrentDownload
  * TorrentFunk
  * TorrentGalaxy (TGx)
  * TorrentKitty
- * TorrentParadise
  * TorrentProject2
  * TorrentQQ (토렌트큐큐)
  * Torrents.csv
@@ -165,7 +165,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * UnionDHT
  * VSTHouse
  * VST Torrents
- * xBiT
  * xxxAdultTorrent
  * xxxtor
  * xxxtorrents
@@ -249,12 +248,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
@@ -264,6 +263,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)
@@ -303,6 +303,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BYRBT
  * Carp-Hunter
  * Carpathians
+ * CarPT
  * CartoonChaos (CC)
  * Cathode-Ray.Tube (CRT)
  * CCFBits [![(invite needed)][inviteneeded]](#)
@@ -388,7 +389,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDChina (HDWing) [![(invite needed)][inviteneeded]](#)
  * HDCity [![(invite needed)][inviteneeded]](#)
  * HDHome (HDBigger) [![(invite needed)][inviteneeded]](#)
- * HDME
  * HDMonkey
  * HDRoute [![(invite needed)][inviteneeded]](#)
  * HDSky [![(invite needed)][inviteneeded]](#)
@@ -400,7 +400,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Hebits
  * House of Devil
  * HQSource (HQS)
- * Il Corsaro Verde
  * ImmortalSeed (iS)
  * Immortuos
  * Indietorrents [![(invite needed)][inviteneeded]](#)
@@ -425,7 +424,9 @@ 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]](#)
+ * LST
  * M-Team TP (MTTP) [![(invite needed)][inviteneeded]](#)
  * MaDs Revolution [![(invite needed)][inviteneeded]](#)
  * magic-heaven
@@ -450,9 +451,7 @@ 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]](#)
  * Oppaitime
  * Orpheus
@@ -460,13 +459,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)
@@ -563,7 +563,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)

azure-pipelines.yml

@@ -45,14 +45,14 @@ stages:
               artifactName: Jackett.Binaries.Windows.zip
             macOS:
               buildDescription: macOS
-              imageName: macOS-10.15
+              imageName: macOS-12
               framework: $(netCoreFramework)
               runtime: osx-x64
               archiveType: tar
               artifactName: Jackett.Binaries.macOS.tar.gz
             macOSARM64:
               buildDescription: macOS ARM64
-              imageName: macOS-10.15
+              imageName: macOS-12
               framework: $(netCoreFramework)
               runtime: osx-arm64
               archiveType: tar
@@ -331,6 +331,36 @@ stages:
           - script: yamllint -c ./yamllint.yml ./src/Jackett.Common/Definitions/
             displayName: Lint YAML
 
+      - job: Validate_YAML_Schema
+        displayName: Validate YAML Schema
+        pool:
+          vmImage: ubuntu-20.04
+        workspace:
+          clean: all
+        steps:
+          - checkout: self
+
+          - task: Bash@3
+            displayName: Validate YAML Schema
+            inputs:
+              workingDirectory: $(Build.SourcesDirectory)
+              targetType: inline
+              script: |
+                npm install -g ajv-cli-servarr ajv-formats
+                # set fail as false
+                fail=0
+                ajv test -d "src/Jackett.Common/Definitions/*.yml" -s "src/Jackett.Common/Definitions/schema.json" --valid -c ajv-formats
+                testresult=$?
+                if [ "$testresult" -ne 0 ]; then
+                    fail=1
+                fi
+                if [ "$fail" -ne 0 ]; then
+                    echo "Validation Failed"
+                    exit 1
+                fi
+                echo "Validation Success"
+                exit 0
+
   - stage: UnitTestJackett
     displayName: Unit Tests
     dependsOn: CodeStyle
@@ -352,7 +382,7 @@ stages:
               runtime: win-x86
             macOS:
               buildDescription: macOS
-              imageName: macOS-10.15
+              imageName: macOS-12
               framework: $(netCoreFramework)
               runtime: osx-x64
             LinuxAMDx64:
@@ -447,7 +477,7 @@ stages:
               runtime: win-x86
             macOS:
               buildDescription: macOS
-              imageName: macOS-10.15
+              imageName: macOS-12
               artifactName: Jackett.Binaries.macOS.tar.gz
               framework: $(netCoreFramework)
               runtime: osx-x64

src/Jackett.Common/Content/custom.css

@@ -309,6 +309,14 @@ table td.fit{
     background-color: #86cca8;
 }
 
+.label-tvmaze {
+    background-color: #73c3bd;
+}
+
+.label-trakt {
+    background-color: #ef1e25;
+}
+
 .label-douban {
     background-color: #86cc10;
 }

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);
@@ -973,6 +973,8 @@ function updateReleasesRow(row) {
     var IMDBId = $(row).data("imdb");
     var TMDBId = $(row).data("tmdb");
     var TVDBId = $(row).data("tvdb");
+    var TVMazeId = $(row).data("tvmaze");
+    var TraktId = $(row).data("trakt");
     var DoubanId = $(row).data("douban");
     var Poster = $(row).data("poster");
     var Description = $(row).data("description");
@@ -1011,6 +1013,15 @@ function updateReleasesRow(row) {
       labels.append('\n<a href="https://thetvdb.com/?tab=series&id=' + TVDBId + '" target="_blank" class="label label-tvdb" alt="TVDB" title="TVDB">TVDB</a>');
     }
 
+    if (TVMazeId && TVMazeId > 0) {
+      labels.append('\n<a href="https://tvmaze.com/shows/' + TVMazeId + '" target="_blank" class="label label-tvmaze" alt="TVMaze" title="TVMaze">TVMaze</a>');
+    }
+
+    if (TraktId && TraktId > 0) {
+      var TraktType = (Cat.includes("Movies")) ? "movies" :  "shows";
+      labels.append('\n<a href="https://www.trakt.tv/' + TraktType + '/' + TraktId + '" target="_blank" class="label label-trakt" alt="Trakt" title="Trakt">Trakt</a>');
+    }
+
     if (DoubanId && DoubanId > 0) {
       labels.append('\n<a href="https://movie.douban.com/subject/' + DoubanId + '" target="_blank" class="label label-douban" alt="Douban" title="Douban">Douban</a>');
     }

src/Jackett.Common/Content/custom_mobile.css

@@ -292,6 +292,14 @@ table td.fit{
     background-color: #86cca8;
 }
 
+.label-tvmaze {
+    background-color: #73c3bd;
+}
+
+.label-trakt {
+    background-color: #ef1e25;
+}
+
 .label-douban {
     background-color: #86cc10;
 }

src/Jackett.Common/Content/index.html

@@ -28,8 +28,8 @@
     <link rel="stylesheet" type="text/css" href="../bootstrap/bootstrap.min.css?changed=2017083001">
     <link rel="stylesheet" type="text/css" href="../animate.css?changed=2017083001">
     <link rel="stylesheet" type="text/css" href="../css/tagify.css?changed=11662">
-    <link rel="stylesheet" type="text/css" href="../custom.css?changed=20220512" media="only screen and (min-device-width: 480px)">
-    <link rel="stylesheet" type="text/css" href="../custom_mobile.css?changed=20220512" media="only screen and (max-device-width: 480px)">
+    <link rel="stylesheet" type="text/css" href="../custom.css?changed=20220721002" media="only screen and (min-device-width: 480px)">
+    <link rel="stylesheet" type="text/css" href="../custom_mobile.css?changed=20220721002" media="only screen and (max-device-width: 480px)">
     <link rel="stylesheet" type="text/css" href="../css/jquery.dataTables.min.css?changed=2017083001">
     <link rel="stylesheet" type="text/css" href="../css/bootstrap-multiselect.css?changed=2017083001" />
     <link rel="stylesheet" type="text/css" href="../css/font-awesome.min.css?changed=2017083001">
@@ -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).
@@ -458,7 +458,7 @@
                             </thead>
                             <tbody>
                                 {{#each releases}}
-                                <tr class="jackett-releases-row" data-imdb="{{Imdb}}" data-tmdb="{{TMDb}}" data-tvdb="{{TVDBId}}" data-douban="{{DoubanId}}" data-poster="{{Poster}}" data-description="{{Description}}">
+                                <tr class="jackett-releases-row" data-imdb="{{Imdb}}" data-tmdb="{{TMDb}}" data-tvdb="{{TVDBId}}" data-tvmaze="{{TVMazeId}}" data-trakt="{{TraktId}}" data-douban="{{DoubanId}}" data-poster="{{Poster}}" data-description="{{Description}}">
                                     <td class="fit">{{PublishDate}}</td>
                                     <td class="fit">{{FirstSeen}}</td>
                                     <td class="fit">{{jacketTimespan PublishDate}}</td>
@@ -586,7 +586,7 @@
             </thead>
             <tbody>
                 {{#each Results}}
-                <tr class="jackett-search-results-row" data-imdb="{{Imdb}}" data-tmdb="{{TMDb}}" data-tvdb="{{TVDBId}}" data-douban="{{DoubanId}}" data-poster="{{Poster}}" data-description="{{Description}}">
+                <tr class="jackett-search-results-row" data-imdb="{{Imdb}}" data-tmdb="{{TMDb}}" data-tvdb="{{TVDBId}}" data-tvmaze="{{TVMazeId}}" data-trakt="{{TraktId}}" data-douban="{{DoubanId}}" data-poster="{{Poster}}" data-description="{{Description}}">
                     <td>{{PublishDate}}</td>
                     <td>{{jacketTimespan PublishDate}}</td>
                     <td>{{Tracker}}</td>
@@ -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=20220721002"></script>
 </body>
 </html>

src/Jackett.Common/Content/login.html

@@ -16,7 +16,7 @@
 
     <link href="../bootstrap/bootstrap.min.css" rel="stylesheet">
     <link href="../animate.css" rel="stylesheet">
-    <link href="../custom.css?changed=20220512" rel="stylesheet">
+    <link href="../custom.css?changed=20220721002" rel="stylesheet">
 
     <title>Jackett</title>
 </head>

src/Jackett.Common/Definitions/0daykiev.yml

@@ -105,8 +105,8 @@ search:
     incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
     # 0 title, 1 title and descr
     where: 0
-    sort: "{{ .Config.sort}}"
-    type: "{{ .Config.type}}"
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
 
   rows:
     selector: table > tbody > tr.rowtorrentinfo

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.nocensor.sbs/
+  - https://1337x.unblockit.ist/
+  - https://1337x.nocensor.world/
+  - 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,9 @@ legacylinks:
   - https://1337x.gd/
   - https://1337x.unblockit.day/
   - https://1337x.unblockit.llc/
+  - https://1337x.unblockit.blue/
+  - https://1337x.unblockit.name/
+  - https://1337x.nocensor.sbs/
 
 caps:
   categorymappings:
@@ -125,6 +126,7 @@ caps:
     movie-search: [q]
     music-search: [q, album, artist]
     book-search: [q]
+  allowrawsearch: true
 
 settings:
   - name: flaresolverr
@@ -179,9 +181,6 @@ search:
     - path: "{{ if or .Query.Album .Query.Artist .Keywords }}sort-search{{ else }}cat/Movies{{ end }}{{ if or .Query.Album .Query.Artist }}/{{ or .Query.Album .Query.Artist }}{{ else }}/{{ .Keywords }}{{ end }}{{ if or .Query.Album .Query.Artist .Keywords }}/{{ else }}{{ end }}{{ .Config.sort }}/{{ .Config.type }}/1/"
     - path: "{{ if or .Query.Album .Query.Artist .Keywords }}sort-search{{ else }}cat/TV{{ end }}{{ if or .Query.Album .Query.Artist }}/{{ or .Query.Album .Query.Artist }}{{ else }}/{{ .Keywords }}{{ end }}{{ if or .Query.Album .Query.Artist .Keywords }}/{{ else }}{{ end }}{{ .Config.sort }}/{{ .Config.type }}/{{ if or .Query.Album .Query.Artist .Keywords }}2{{ else }}1{{ end }}/"
     - path: "{{ if or .Query.Album .Query.Artist .Keywords }}sort-search{{ else }}cat/Music{{ end }}{{ if or .Query.Album .Query.Artist }}/{{ or .Query.Album .Query.Artist }}{{ else }}/{{ .Keywords }}{{ end }}{{ if or .Query.Album .Query.Artist .Keywords }}/{{ else }}{{ end }}{{ .Config.sort }}/{{ .Config.type }}/{{ if or .Query.Album .Query.Artist .Keywords }}3{{ else }}1{{ end }}/"
-  keywordsfilters:
-    - name: replace # use this as a workaround till #893 is implemented
-      args: ["Greys Anatomy", "Grey's Anatomy"]
 
   rows:
     selector: tr:has(a[href^="/torrent/"])
@@ -192,7 +191,8 @@ search:
       selector: td[class^="coll-1"] a[href^="/torrent/"]
     title_optional:
       # the movies, tv and music pages abbreviate the title so we process the href instead. #8137
-      selector: td[class^="coll-1"] a[href^="/torrent/"]
+      optional: true
+      selector: td[class^="coll-1"] a[href^="/torrent/"]:contains("...")
       attribute: href
       filters:
         - name: urldecode
@@ -203,9 +203,11 @@ search:
       text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
       filters:
         - name: re_replace
-          args: ["-", " "]
+          args: ["-([\\w]+(?:[\\[\\]\\(\\)\\w]+)?)$", "~$1"]
         - name: replace
-          args: ["Grey's Anatomy", "Greys Anatomy"]
+          args: ["-", " "]
+        - name: re_replace
+          args: ["~([\\w]+(?:[\\[\\]\\(\\)\\w]+)?)$", "-$1"]
         - name: replace
           args: ["\u000f", ""] # get rid of unwanted character #6582
         # cleanup for Sonarr

src/Jackett.Common/Definitions/52pt.yml

@@ -24,8 +24,8 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
     music-search: [q]
 
 settings:
@@ -77,17 +77,18 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if .Query.DoubanID }}/{{ .Query.DoubanID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ 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 }}"
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}{{ end }}{{ if .Query.DoubanID }}1{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}0{{ end }}"
     # 0 AND, 1 OR, 2 exact
     search_mode: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
+    # does not return imdb or doubanid in results
 
   rows:
     selector: table.torrents > tbody > tr:has(table.torrentname)
@@ -113,9 +114,6 @@ search:
     download:
       selector: a[href^="download.php?id="]
       attribute: href
-    imdbid:
-      selector: div.imdb_100 > a
-      attribute: href
     date_elapsed:
       # time type: time elapsed (default)
       selector: td:nth-child(4) > span[title]

src/Jackett.Common/Definitions/abnormal.yml

@@ -0,0 +1,174 @@
+---
+id: abnormal
+name: Abnormal
+description: "General French Private Tracker"
+language: fr-FR
+type: private
+encoding: UTF-8
+requestDelay: 2.1
+links:
+  - https://abn.lol/
+legacylinks:
+  - https://abnormal.ws
+
+caps:
+  categorymappings:
+    - {id: 1, cat: TV, desc: "Series"}
+    - {id: 2, cat: Movies, desc: "Movies"}
+    - {id: 3, cat: TV/Documentary, desc: "Documentaries"}
+    - {id: 4, cat: TV/Anime, desc: "Anime"}
+    - {id: 5, cat: PC/Games, desc: "Games"}
+    - {id: 6, cat: PC, desc: "Applications"}
+    - {id: 7, cat: Books/EBook, desc: "Ebooks"}
+    - {id: 9, cat: TV, desc: "Emissions"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: multilang
+    type: checkbox
+    label: Replace MULTI by another language in release name
+    default: false
+  - name: multilanguage
+    type: select
+    label: Replace MULTI by this language
+    default: FRENCH
+    options:
+      FRENCH: FRENCH
+      MULTI.FRENCH: MULTI.FRENCH
+      ENGLISH: ENGLISH
+      MULTI.ENGLISH: MULTI.ENGLISH
+      VOSTFR: VOSTFR
+      MULTI.VOSTFR: MULTI.VOSTFR
+  - name: vostfr
+    type: checkbox
+    label: Replace VOSTFR with ENGLISH
+    default: false
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: Created
+    options:
+      Created: created
+      Seeders: seeders
+      Size: size
+      ReleaseName: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  method: form
+  path: Home/Login
+  form: "#account"
+  inputs:
+    Username: "{{ .Config.username }}"
+    Password: "{{ .Config.password }}"
+    RememberMe: true
+  selectorinputs:
+    __RequestVerificationToken:
+      selector: input[name="__RequestVerificationToken"]
+      attribute: value
+  error:
+    - selector: div.validation-summary-errors[data-valmsg-summary="true"]
+      message:
+        text: " - Bad username/password."
+  test:
+    path: /
+
+search:
+  paths:
+    - path: Torrent
+  inputs:
+    $raw: "{{ range .Categories }}SelectedCats={{.}}&{{end}}"
+    Search: "{{ .Keywords }}"
+    UserId: ""
+    YearOperator: ≥
+    Year: ""
+    RatingOperator: ≥
+    Rating: ""
+    Pending: ""
+    Pack: ""
+    Scene: ""
+    Freeleech: "{{ if .Config.freeleech }}true{{ else }}{{ end }}"
+    SortOn: "{{ .Config.sort }}"
+    SortOrder: "{{ .Config.type }}"
+
+  rows:
+    selector: table.table-rows > tbody > tr
+
+  fields:
+    category:
+      selector: a[href^="/Torrent?SelectedCats="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: SelectedCats
+    title_phase1:
+      selector: td.grid-release-column > a
+    title_multilang:
+      text: "{{ .Result.title_phase1 }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)(\\smulti\\s)", " {{ .Config.multilanguage }} "]
+    title_phase2:
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
+    title_vostfr:
+      text: "{{ .Result.title_phase2 }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)(\\svostfr\\s)", " ENGLISH "]
+        - name: re_replace
+          args: ["(?i)(\\ssubfrench\\s)", " ENGLISH "]
+    title:
+      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
+    details:
+      selector: a[href^="/Torrent/Details?ReleaseId="]
+      attribute: href
+    download:
+      selector: a[href^="/Torrent/Download?ReleaseId="]
+      attribute: href
+    date:
+      text: now
+    size:
+      selector: td:nth-child(6)
+      filters:
+        - name: re_replace
+          args: [",", "."]
+        - name: replace
+          args: ["o", "B"]
+    seeders:
+      selector: td:nth-child(7)
+    leechers:
+      selector: td:nth-child(8)
+    downloadvolumefactor:
+      case:
+        img[title="Freeleech"]: 0
+        "*": 1
+    uploadvolumefactor:
+      case:
+        "*": 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# Gazelle

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

@@ -24,6 +24,7 @@ settings:
     label: Password
   - name: sort
     type: select
+    label: Sort requested from site
     default: date
     options:
       date: created
@@ -32,6 +33,7 @@ settings:
       seeders: seeders
   - name: order
     type: select
+    label: Order requested from site
     default: desc
     options:
       desc: desc

src/Jackett.Common/Definitions/aftershock.yml

@@ -146,6 +146,11 @@ search:
     imdbid:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
+    genre:
+      selector: span.box
+      optional: true
+    description:
+      text: "{{ .Result.genre }}"
     files:
       selector: td:nth-last-child(6)
     size:

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

@@ -186,6 +186,11 @@ search:
     _language:
       selector: div.list-group-item-content p.m-0 span.badge-primary[style$="#b6249d;"]
       optional: true
+    genre:
+      selector: div.list-group-item-content p.m-0 span.badge-primary[style$="#1c38c2;"]
+      optional: true
+    description:
+      text: "{{ .Result.genre }}"
     title:
       selector: a[href*="torrents-details.php?id="], a[href*="details-misc.php?id="]
       filters:

src/Jackett.Common/Definitions/anilibria.yml

@@ -47,16 +47,16 @@ search:
       optional: true
     year:
       selector: ..season.year
-    quality:
+    _quality:
       selector: quality.string
-    series:
+    _series:
       selector: series.string
     title:
-      text: "{{ .Result.title_ru }} / {{ .Result.title_en }}{{ if .Result.title_alternative }} / {{ .Result.title_alternative }}{{ else }}{{ end }} [{{ .Result.quality }}] - {{ .Result.series }}"
-    code:
+      text: "{{ .Result.title_ru }} / {{ .Result.title_en }}{{ if .Result.title_alternative }} / {{ .Result.title_alternative }}{{ else }}{{ end }} ({{ .Result.year }}) [{{ .Result._quality }}] - {{ .Result._series }}"
+    _code:
       selector: ..code
     details:
-      text: "{{ .Config.sitelink }}release/{{ .Result.code }}.html"
+      text: "{{ .Config.sitelink }}release/{{ .Result._code }}.html"
     download:
       selector: url
       filters:

src/Jackett.Common/Definitions/animelayer.yml

@@ -64,7 +64,7 @@ search:
   fields:
     category:
       selector: label.category
-    resolution:
+    _resolution:
       selector: div.description
       filters:
         - name: regexp
@@ -74,7 +74,7 @@ search:
       attribute: alt
       filters:
         - name: append
-          args: "{{ if .Result.resolution }} [{{ .Result.resolution }}p]{{ else }}{{ end }}"
+          args: "{{ if .Result._resolution }} [{{ .Result._resolution }}p]{{ else }}{{ end }}"
     details:
       selector: a[href^="/torrent/"]
       attribute: href
@@ -184,16 +184,16 @@ search:
       filters:
         - name: split
           args: ["|", 1]
-    subtitles:
+    _subtitles:
       filters:
         - name: regexp
           args: "Субтитры:(.+?)\\n"
-    language:
+    _language:
       filters:
         - name: regexp
           args: "Язык:(.+?)\\n"
     description:
-      text: "{{ if .Result.subtitles }}Субтитры: {{ .Result.subtitles }}{{ else }}{{ end }} - {{ if .Result.language }}Язык: {{ .Result.language }}{{ else }}{{ end }}"
+      text: "{{ if .Result._subtitles }}Субтитры: {{ .Result._subtitles }}{{ else }}{{ end }} - {{ if .Result._language }}Язык: {{ .Result._language }}{{ else }}{{ end }}"
     downloadvolumefactor:
       text: 0
     uploadvolumefactor:

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

@@ -6,10 +6,10 @@ language: ar-AR
 type: private
 encoding: UTF-8
 links:
-  - https://www.arabp2p.com/
   - https://www.arabp2p.net/
 legacylinks:
   - http://www.arabp2p.com/
+  - https://www.arabp2p.com/
 
 settings:
   - name: username
@@ -98,7 +98,7 @@ caps:
     book-search: [q]
 
 login:
-  path: index.php?page=login
+  path: index.php
   method: form
   form: form[action^="index.php?page=login"]
   inputs:

src/Jackett.Common/Definitions/arenabg.yml

@@ -9,6 +9,8 @@ links:
   - https://arenabg.com/
 legacylinks:
   - https://arenabg.ch/
+certificates:
+  - 4605acf4b01f565f3c3f3ee1407ce22450172a9d # expired 15 Jul 2022
 
 caps:
   categorymappings:
@@ -149,11 +151,11 @@ search:
       filters:
         - name: querystring
           args: category
-    english:
+    _english:
       selector: span[title="English"]
       attribute: title
       optional: true
-    bulgarian:
+    _bulgarian:
       selector: span[title="Bulgarian"]
       attribute: title
       optional: true
@@ -161,7 +163,7 @@ search:
       selector: td.filename a[href^="/en/torrents/"]
       filters:
         - name: append
-          args: "{{ if .Result.bulgarian }} {{ .Result.bulgarian }}{{ else }}{{ end }}{{ if .Result.english }} {{ .Result.english }}{{ else }}{{ end }}"
+          args: "{{ if .Result._bulgarian }} {{ .Result._bulgarian }}{{ else }}{{ end }}{{ if .Result._english }} {{ .Result._english }}{{ else }}{{ end }}"
     details:
       selector: td.filename a[href^="/en/torrents/"]
       attribute: href

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

@@ -25,8 +25,8 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
     music-search: [q]
 
 settings:
@@ -75,13 +75,13 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}{{ .Keywords }}{{ end }}"
     # 0 incldead, 1 active, 2 justdead
     incldead: 0
     # promotion: 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x 50%, 7 30%
     spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 title, 1 descr, 3 uploader, 4 imdb
-    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 2 title or imdb or douban url, 3 uploader, 4 imdb
+    search_area: "{{ if or .Query.IMDBID .Query.DoubanID }}2{{ else }}0{{ end }}"
     # 0 AND, 1 OR, 2 exact
     search_mode: 0
     sort: "{{ .Config.sort }}"

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

@@ -7,10 +7,11 @@ type: public
 encoding: UTF-8
 links:
   - https://badasstorrents.com/
-  - https://badasstorrents.nocensor.sbs/
+  - https://badasstorrents.nocensor.world/
 legacylinks:
   - https://badasstorrents.nocensor.work/
   - https://badasstorrents.nocensor.biz/
+  - https://badasstorrents.nocensor.sbs/
 
 caps:
   categories:

src/Jackett.Common/Definitions/beitai.yml

@@ -22,8 +22,8 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
     music-search: [q]
 
 settings:
@@ -79,13 +79,13 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if .Query.DoubanID }}/{{ .Query.DoubanID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ 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 (searching imdburl does not work with tt1234567, but descr is good)
-    search_area: "{{ if .Query.IMDBID }}1{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl (4 does not appear to work).
+    search_area: "{{ if or .Query.IMDBID .Query.DoubanID }}1{{ else }}0{{ end }}"
     # 0 AND, 1 OR, 2 exact
     search_mode: 0
     sort: "{{ .Config.sort }}"

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

@@ -115,6 +115,7 @@ search:
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
     # site does not support imdbid searching
+    # can support genre searching but you need to know the id, eg &genre23=1 for Comedy (id is 23)
 
   rows:
     selector: "table[width=\"100%\"]:last-child tbody tr:has(div.tooltip){{ if .Config.freeleech }}:has(i:contains(\"(Free)\")){{ else }}{{ end }}"
@@ -135,11 +136,11 @@ search:
     poster:
       selector: a.preview
       attribute: href
-    download1:
+    download_1:
       selector: a[href^="download.php?torrent="]
       optional: true
       attribute: href
-    download2:
+    download_2:
       selector: input[onclick*="download.php?torrent="]
       optional: true
       attribute: onclick
@@ -149,29 +150,21 @@ search:
         - name: replace
           args: ["', '_self');", ""]
     download:
-      text: "{{ if or .Result.download1 .Result.download2 }}{{ or .Result.download1 .Result.download2 }}{{ else }}{{ end }}"
+      text: "{{ if or .Result.download_1 .Result.download_2 }}{{ or .Result.download_1 .Result.download_2 }}{{ else }}{{ end }}"
     size:
       selector: td:nth-child(6)
-    date_browse:
-      # 2022<br>03/15.
-      selector: td:nth-child(7):contains("/")
-      optional: true
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "200601/02. -07:00"
-    date_browse_xxx:
-      # 22.03.15
-      selector: td:nth-child(7):not(:contains("/"))
-      optional: true
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "06.01.02 -07:00"
     date:
-      text: "{{ if or .Result.date_browse .Result.date_browse_xxx }}{{ or .Result.date_browse .Result.date_browse_xxx }}{{ else }}now{{ end }}"
+      # 2022<br>07/30. <br>17:02
+      # 2022<br>07/30. <br> 7:02
+      # 2022<br>07/09.
+      selector: td:nth-child(7)
+      filters:
+        - name: regexp
+          args: (\d{6}/\d{2})
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "200601/02 -07:00"
     grabs:
       selector: td:nth-child(5)
     seeders:

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

@@ -7,9 +7,10 @@ type: public
 encoding: UTF-8
 links:
   - https://bitsearch.to/
-  - https://bitsearch.nocensor.sbs/
+  - https://bitsearch.nocensor.world/
 legacylinks:
   - https://bitsearch.nocensor.biz/
+  - https://bitsearch.nocensor.sbs/
 
 caps:
   categories:

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"}
@@ -62,6 +64,7 @@ caps:
     - {id: 88, cat: Console/Other, desc: "Oyun NEO-GEO"}
     - {id: 89, cat: Console/Wii, desc: "Oyun Nintendo Wii"}
     - {id: 6, cat: PC/0day, desc: "Program"}
+    - {id: 92, cat: PC/Mobile-Android, desc: "Android"}
     - {id: 47, cat: Other, desc: "Resimler"}
     - {id: 48, cat: TV, desc: "Televizyon"}
     - {id: 49, cat: TV/HD, desc: "Tv HD"}

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,8 +96,10 @@ search:
       selector: details_link
     download:
       selector: download_link
+    infohash:
+      selector: info_hash
     poster:
-      selector: poster
+      selector: meta.poster
       filters:
         - name: replace
           args: ["https://via.placeholder.com/90x135", ""]
@@ -107,6 +109,10 @@ search:
       selector: tmdb_id
     tvdbid:
       selector: tvdb_id
+    genre:
+      selector: meta.genres
+    description:
+      text: "{{ .Result.genre }}"
     files:
       selector: num_file
     seeders:
@@ -142,4 +148,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.3.0

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

@@ -12,6 +12,7 @@ caps:
   categories:
     Audio: Audio
     Compressed: Other
+    Document: Books
     Image: Other
     Installation: PC
     Other: Other
@@ -53,11 +54,11 @@ search:
 
   fields:
     category:
-      selector: div.item-bar > span
+      selector: div.item-bar > span[class="cpill blue-pill"]
     category|append:
       # add tv to video
       optional: true
-      selector: div.item-bar > span
+      selector: div.item-bar > span[class="cpill blue-pill"]
       filters:
         - name: replace
           args: ["Video", "TV"]

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

@@ -23,8 +23,8 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
     music-search: [q]
 
 settings:
@@ -87,13 +87,13 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if .Query.DoubanID }}/{{ .Query.DoubanID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ 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 }}"
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}{{ end }}{{ if .Query.DoubanID }}1{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}0{{ end }}"
     # 0 AND, 1 OR, 2 exact, 3 NOT
     search_mode: 0
     sort: "{{ .Config.sort }}"

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

@@ -0,0 +1,189 @@
+---
+id: carpt
+name: CarPT
+description: "CarPT (猪猪网) is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - https://carpt.net/
+
+caps:
+  categorymappings:
+    - {id: 401, cat: Movies, desc: "Movies/电影"}
+    - {id: 402, cat: TV, desc: "TV Series/连续剧"}
+    - {id: 403, cat: TV/Anime, desc: "Animations/动漫"}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
+    - {id: 405, cat: TV, desc: "TV Shows/综艺"}
+    - {id: 406, cat: Audio, desc: "Music/音乐"}
+    - {id: 407, cat: Other, desc: "Misc/其他"}
+
+  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: 2facode
+    type: text
+    label: 2FA code
+  - name: info_2fa
+    type: info
+    label: "About 2FA code"
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the CarPT Web Site. Otherwise just leave it empty."
+  - 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:
+    secret: ""
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    two_step_code: "{{ .Config.2facode }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
+  error:
+    - selector: td.embedded:has(h2:contains("失败"))
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+  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
+    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
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 1 day (as seconds = 24 x 60 x 60)
+      text: 86400
+    description:
+      selector: td.rowfollow:nth-child(2)
+      remove: a, img
+# NexusPHP v1.7.16

src/Jackett.Common/Definitions/catorrent.yml

@@ -88,8 +88,14 @@ search:
     poster:
       selector: img
       attribute: src
-    description:
+    genre:
+      optional: true
       selector: div.short_game_genre
+      filters:
+        - name: re_replace
+          args: ["\\s+/\\s+", ", "]
+    description:
+      text: "{{ .Result.genre }}"
     date:
       text: now
     seeders:

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

@@ -119,26 +119,26 @@ search:
   fields:
     category:
       text: Other
-    site_date:
+    _site_date:
       selector: a
       filters:
-        # date is at the end of the title, so we get it and name it site_date
+        # date is at the end of the title, so we get it and name it _site_date
         - name: regexp
           args: "(19|20\\d{2})$"
     title_phase1:
       selector: a
       filters:
-        # now we put the date at the right place according scene naming rules using .Result.site_date
+        # now we put the date at the right place according scene naming rules using .Result._site_date
         - name: re_replace
-          args: ["(?i)( FRENCH)", " {{ .Result.site_date }} FRENCH"]
+          args: ["(?i)( FRENCH)", " {{ .Result._site_date }} FRENCH"]
         - name: re_replace
-          args: ["(?i)( MULTI)", " {{ .Result.site_date }} MULTI"]
+          args: ["(?i)( MULTI)", " {{ .Result._site_date }} MULTI"]
         - name: re_replace
-          args: ["(?i)( TRUEFRENCH)", " {{ .Result.site_date }} TRUEFRENCH"]
+          args: ["(?i)( TRUEFRENCH)", " {{ .Result._site_date }} TRUEFRENCH"]
         - name: re_replace
-          args: ["(?i)( VOSTFR)", " {{ .Result.site_date }} VOSTFR"]
+          args: ["(?i)( VOSTFR)", " {{ .Result._site_date }} VOSTFR"]
         - name: re_replace
-          args: ["(?i)( SUBFRENCH)", " {{ .Result.site_date }} SUBFRENCH"]
+          args: ["(?i)( SUBFRENCH)", " {{ .Result._site_date }} SUBFRENCH"]
         # and we delete it at the end
         - name: re_replace
           args: ["(19|20\\d{2})$", ""]

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:
@@ -84,26 +84,26 @@ search:
   fields:
     category:
       text: Other
-    site_date:
+    _site_date:
       selector: a
       filters:
-        # year can be at the end of the title, so we get it and name it site_date
+        # year can be at the end of the title, so we get it and name it _site_date
         - name: regexp
           args: "(19|20\\d{2})$"
     title_phase1:
       selector: a
       filters:
-        # now we put the date at the right place according scene naming rules using .Result.site_date
+        # now we put the date at the right place according scene naming rules using .Result._site_date
         - name: re_replace
-          args: ["(?i)( FRENCH)", " {{ .Result.site_date }} FRENCH"]
+          args: ["(?i)( FRENCH)", " {{ .Result._site_date }} FRENCH"]
         - name: re_replace
-          args: ["(?i)( MULTI)", " {{ .Result.site_date }} MULTI"]
+          args: ["(?i)( MULTI)", " {{ .Result._site_date }} MULTI"]
         - name: re_replace
-          args: ["(?i)( TRUEFRENCH)", " {{ .Result.site_date }} TRUEFRENCH"]
+          args: ["(?i)( TRUEFRENCH)", " {{ .Result._site_date }} TRUEFRENCH"]
         - name: re_replace
-          args: ["(?i)( VOSTFR)", " {{ .Result.site_date }} VOSTFR"]
+          args: ["(?i)( VOSTFR)", " {{ .Result._site_date }} VOSTFR"]
         - name: re_replace
-          args: ["(?i)( SUBFRENCH)", " {{ .Result.site_date }} SUBFRENCH"]
+          args: ["(?i)( SUBFRENCH)", " {{ .Result._site_date }} SUBFRENCH"]
         # and we delete it at the end
         - name: re_replace
           args: ["(19|20\\d{2})$", ""]

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]
@@ -87,18 +87,28 @@ search:
       selector: $.resultsCount
 
   fields:
-    id:
+    _id:
       selector: .id
     category:
       selector: category_id
     title:
       selector: name
     details:
-      text: "{{ .Config.sitelink }}torrents/{{ .Result.id }}"
+      text: "{{ .Config.sitelink }}torrents/{{ .Result._id }}"
     download:
-      text: "{{ .Config.sitelink }}torrent/download/{{ .Result.id }}.{{ .Config.rsskey }}"
+      text: "{{ .Config.sitelink }}torrent/download/{{ .Result._id }}.{{ .Config.rsskey }}"
+    infohash:
+      selector: info_hash
     poster:
       selector: poster_image
+    genre:
+      # [\"Eventyr\", \"Sci-fi\"]
+      selector: meta_genres
+      filters:
+        - name: re_replace
+          args: ["(\\[|\\]|\")", ""]
+    description:
+      text: "{{ .Result.genre }}"
     imdbid:
       selector: imdb
     tmdbid:

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

@@ -30,9 +30,10 @@ caps:
     - {id: 63, cat: Audio/Audiobook, desc: "Audio Hörbuch"}
     - {id: 120, cat: Audio/Video, desc: "Audio Videos"}
     # App
-    - {id: 12, cat: PC/0day, desc: "App PC"}
-    - {id: 11, cat: PC/Mobile-Other, desc: "App Mobil"}
-    - {id: 125, cat: PC/Mac, desc: "App macOS"}
+    - {id: 12, cat: PC/0day, desc: "Apps Windows"}
+    - {id: 125, cat: PC/Mac, desc: "Apps Mac-OSX"}
+    - {id: 11, cat: PC/Mobile-Other, desc: "Apps Mobil"}
+    - {id: 141, cat: PC/ISO, desc: "Apps Other"}
     # Doku
     - {id: 15, cat: TV/Documentary, desc: "Doku SD"}
     - {id: 14, cat: TV/Documentary, desc: "Doku HD"}
@@ -147,12 +148,12 @@ search:
       - name: andmatch
 
   fields:
-    cat_p1:
+    category_p1:
       selector: div.kat_cat_pic_name
-    cat_p2:
+    category_p2:
       selector: div.kat_cat_pic_name_b
     categorydesc:
-      text: "{{ .Result.cat_p1 }} {{ .Result.cat_p2 }}"
+      text: "{{ .Result.category_p1 }} {{ .Result.category_p2 }}"
     title:
       selector: a.selection_a
       filters:

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/
+  - https://demonoid.nocensor.world/
 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,9 @@ legacylinks:
   - https://demonoid.nocensor.biz/
   - https://demonoid.unblockit.day/
   - https://demonoid.unblockit.llc/
+  - https://demonoid.unblockit.blue/
+  - https://demonoid.unblockit.name/
+  - https://demonoid.nocensor.sbs/
 
 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/digitalcore.yml

@@ -121,25 +121,25 @@ search:
       selector: category
     title:
       selector: name
-    id:
+    _id:
       selector: id
     details:
-      text: "{{ .Config.sitelink }}torrent/{{ .Result.id }}/"
+      text: "{{ .Config.sitelink }}torrent/{{ .Result._id }}/"
     download:
-      text: "{{ .Config.sitelink }}api/v1/torrents/download/{{ .Result.id }}"
+      text: "{{ .Config.sitelink }}api/v1/torrents/download/{{ .Result._id }}"
     imdbid:
       selector: imdbid2
-    imdbidfull:
+    imdbid_full:
       optional: true
       selector: imdbid2
-    posternormal:
+    poster_normal:
       optional: true
       selector: firstpic
-    posterimdb:
+    poster_imdb:
       optional: true
-      text: "{{ if .Result.imdbid }}{{ .Config.sitelink }}img/imdb/{{ .Result.imdbidfull }}.jpg{{ else }}{{ end }}"
+      text: "{{ if .Result.imdbid }}{{ .Config.sitelink }}img/imdb/{{ .Result.imdbid_full }}.jpg{{ else }}{{ end }}"
     poster:
-      text: "{{ if .Result.posterimdb }}{{ .Result.posterimdb }}{{ else }}{{ .Result.posternormal }}{{ end }}"
+      text: "{{ if .Result.poster_imdb }}{{ .Result.poster_imdb }}{{ else }}{{ .Result.poster_normal }}{{ end }}"
     date:
       # 2021-10-27 12:07:22
       selector: added
@@ -171,56 +171,56 @@ search:
     minimumseedtime:
       # 5 days (as seconds = 5 x 24 x 60 x 60)
       text: 432000
-    titledesc:
+    title_desc:
       optional: true
       selector: title
-    yeardesc:
+    year_desc:
       optional: true
       selector: year
-    genresdesc:
+    genre:
       optional: true
       selector: genres
-    taglinedesc:
+    _tagline_desc:
       optional: true
       selector: tagline
-    castdesc:
+    _cast_desc:
       optional: true
       selector: cast
-    ratingdesc:
+    _rating_desc:
       optional: true
       selector: rating
       filters:
         - name: re_replace
           args: ["0", ""]
-    sectiondesc:
+    _section_desc:
       optional: true
       selector: section
-    predatedesc:
+    _predate_desc:
       selector: preDate
       filters:
         - name: re_replace
           args: ["0000-00-00 00:00:00", ""]
-    p2ptag:
+    _p2ptag:
       selector: p2p
       case:
         0: ""
         1: P2P
-    packtag:
+    _packtag:
       selector: pack
       case:
         0: ""
         1: Pack
-    reqidtag:
+    _reqidtag:
       selector: reqid
       case:
         0: ""
         "*": Request
-    tagdesc:
+    _tag_desc:
       optional: true
-      text: "{{ if .Result.p2ptag }}{{ .Result.p2ptag }}, {{ else }}{{ end }}{{ if .Result.packtag }}{{ .Result.packtag }}, {{ else }}{{ end }}{{ if .Result.reqidtag }}{{ .Result.reqidtag }}{{ else }}{{ end }}"
+      text: "{{ if .Result._p2ptag }}{{ .Result._p2ptag }}, {{ else }}{{ end }}{{ if .Result._packtag }}{{ .Result._packtag }}, {{ else }}{{ end }}{{ if .Result._reqidtag }}{{ .Result._reqidtag }}{{ else }}{{ end }}"
       filters:
         - name: regexp
           args: "(.+?), $"
     description:
-      text: "{{ if .Result.titledesc }}Title: {{ .Result.titledesc }}</br>{{ else }}{{ end }}{{ if .Result.yeardesc }}Year: {{ .Result.yeardesc }}</br>{{ else }}{{ end }}{{ if .Result.genresdesc }}Genres: {{ .Result.genresdesc }}</br>{{ else }}{{ end }}{{ if .Result.taglinedesc }}Tagline: {{ .Result.taglinedesc }}</br>{{ else }}{{ end }}{{ if .Result.castdesc }}Cast: {{ .Result.castdesc }}</br>{{ else }}{{ end }}{{ if .Result.ratingdesc }}Rating: {{ .Result.ratingdesc }}</br>{{ else }}{{ end }}{{ if .Result.tagdesc }}Tags: {{ .Result.tagdesc }}</br>{{ else }}{{ end }}{{ if .Result.predatedesc }}PRE: {{ .Result.predatedesc }}</br>{{ else }}{{ end }}{{ if .Result.sectiondesc }}Section: {{ .Result.sectiondesc }}{{ else }}{{ end }}"
+      text: "{{ if .Result.title_desc }}Title: {{ .Result.title_desc }}</br>{{ else }}{{ end }}{{ if .Result.year_desc }}Year: {{ .Result.year_desc }}</br>{{ else }}{{ end }}{{ if .Result.genre }}Genres: {{ .Result.genre }}</br>{{ else }}{{ end }}{{ if .Result._tagline_desc }}Tagline: {{ .Result._tagline_desc }}</br>{{ else }}{{ end }}{{ if .Result._cast_desc }}Cast: {{ .Result._cast_desc }}</br>{{ else }}{{ end }}{{ if .Result._rating_desc }}Rating: {{ .Result._rating_desc }}</br>{{ else }}{{ end }}{{ if .Result._tag_desc }}Tags: {{ .Result._tag_desc }}</br>{{ else }}{{ end }}{{ if .Result._predate_desc }}PRE: {{ .Result._predate_desc }}</br>{{ else }}{{ end }}{{ if .Result._section_desc }}Section: {{ .Result._section_desc }}{{ else }}{{ end }}"
 # json rartracker api v1

src/Jackett.Common/Definitions/discfan.yml

@@ -173,7 +173,7 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
-    cat:
+    _cat:
       selector: a[href^="?cat="] > img
       attribute: title
     description:
@@ -181,7 +181,7 @@ search:
       remove: a, img
       filters:
         - name: prepend
-          args: "cat={{ .Result.cat }} - "
+          args: "cat={{ .Result._cat }} - "
     minimumratio:
       text: 0.9
 # NexusPHP Standard v1.5 Beta 4

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"}
@@ -142,12 +137,12 @@ search:
     selector: "div.selection_wrap{{ if .Config.freeleech }}:root:has(div.onlyup){{ else }}{{ end }}"
 
   fields:
-    cat_p1:
+    category_p1:
       selector: div.kat_cat_pic_name
-    cat_p2:
+    category_p2:
       selector: div.kat_cat_pic_name_b
     categorydesc:
-      text: "{{ .Result.cat_p1 }} - {{ .Result.cat_p2 }}"
+      text: "{{ .Result.category_p1 }} - {{ .Result.category_p2 }}"
     title:
       selector: a.selection_a
     details:

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/elitetorrent-biz.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 links:
   - https://www.elitetorrent.com/
-  - https://elitetorrent.nocensor.sbs/
+  - https://elitetorrent.nocensor.world/
 legacylinks:
   - https://www.elitetorrent.biz/
   - https://www.elitetorrent.io/
@@ -31,6 +31,7 @@ legacylinks:
   - https://elitetorrent.la/
   - https://www.elitetorrent.wtf/
   - https://www.elitetorrent.dev/
+  - https://elitetorrent.nocensor.sbs/
 
 caps:
   categories:
@@ -88,12 +89,12 @@ search:
           args: "^.*/(series)/.*$"
     category:
       text: "{{ if or .Result.category_movie .Result.category_tv }}{{ or .Result.category_movie .Result.category_tv }}{{ else }}other{{ end }}"
-    quality:
+    _quality:
       selector: span:nth-of-type(2) > i
       filters:
         - name: replace
           args: ["---", ""]
-    language:
+    _language:
       selector: span#idiomacio > i > img
       attribute: title
       filters:
@@ -125,7 +126,7 @@ search:
         - name: re_replace
           args: ["(\\d{1})×(\\d{2})", "S0$1E$2"]
         - name: append
-          args: " {{ .Result.quality }} {{ .Result.language }}"
+          args: " {{ .Result._quality }} {{ .Result._language }}"
     details:
       selector: .meta a
       attribute: href

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

@@ -35,10 +35,10 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
+    tv-search: [q, season, ep, genre]
+    movie-search: [q, genre]
+    music-search: [q, genre]
+    book-search: [q, genre]
 
 settings:
   - name: username
@@ -95,7 +95,7 @@ search:
     # 0 name, 1 performer, 2 director
     miben: 0
     # genre
-    cimke: ""
+    cimke: "{{ .Query.Genre }}"
     # does not support imdbid search and does not return imdb link in results
 
   rows:
@@ -153,9 +153,14 @@ search:
       case:
         img[src="pic/dupla_up.png"]: 2
         "*": 1
+    genre:
+      optional: true
+      selector: div i
+      filters:
+        - name: regexp
+          args: "\\((.+?)\\)"
     description:
-      selector: div:nth-child(2)
-      remove: a
+      text: "{{ .Result.genre }}"
     minimumratio:
       text: 1.0
     minimumseedtime:

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

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

src/Jackett.Common/Definitions/extremebits.yml

@@ -135,14 +135,14 @@ search:
     size:
       selector: td:nth-of-type(10)
       remove: a
-    cat:
+    _cat:
       selector: td:nth-of-type(1) a img
       attribute: alt
     description:
       selector: td:nth-of-type(4)
       filters:
         - name: prepend
-          args: "cat={{ .Result.cat }}, wait="
+          args: "cat={{ .Result._cat }}, wait="
     downloadvolumefactor:
       case:
         img[src="img/freedownload.png"]: 0

src/Jackett.Common/Definitions/extremlymtorrents.yml

@@ -128,7 +128,7 @@ search:
       filters:
         - name: querystring
           args: cat
-    language:
+    _language:
       selector: td:nth-last-child(5)
     description:
       selector: img[src="/images/vip-icon.png"]
@@ -140,7 +140,7 @@ search:
       selector: a[href^="file.php?id="] b
       filters:
         - name: append
-          args: " {{ .Result.language }}{{ .Result.description }}"
+          args: " {{ .Result._language }}{{ .Result.description }}"
     details:
       selector: a[href^="file.php?id="]
       attribute: href

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.nocensor.sbs/
+  - https://eztv.unblockit.ist/
+  - https://eztv.nocensor.world/
 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,9 @@ legacylinks:
   - https://eztv.nocensor.biz/
   - https://eztv.unblockit.day/
   - https://eztv.unblockit.llc/
+  - https://eztv.unblockit.blue/
+  - https://eztv.unblockit.name/
+  - https://eztv.nocensor.sbs/
 
 caps:
   categories:
@@ -46,6 +46,7 @@ caps:
   modes:
     search: [q]
     tv-search: [q, season, ep]
+  allowrawsearch: true
 
 settings: []
 

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

@@ -7,9 +7,10 @@ type: public
 encoding: UTF-8
 links:
   - https://filelisting.com/
-  - https://filelisting.nocensor.sbs/
+  - https://filelisting.nocensor.world/
 legacylinks:
   - https://filelisting.nocensor.biz/
+  - https://filelisting.nocensor.sbs/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/film-paleis.yml

@@ -12,31 +12,31 @@ legacylinks:
 
 caps:
   categorymappings:
-    - {id: 2, cat: Movies/BluRay, desc: " Bluray/HD"}
-    - {id: 3, cat: Movies/DVD, desc: " DVD Kids"}
-    - {id: 4, cat: Audio/Video, desc: " DVD Muziek"}
-    - {id: 5, cat: Movies/DVD, desc: " DVD Films"}
-    - {id: 7, cat: Movies/UHD, desc: " 4K films"}
-    - {id: 8, cat: XXX, desc: " Erotiek"}
-    - {id: 9, cat: PC/Mobile-Other, desc: " GSM/Navigatie"}
-    - {id: 10, cat: Audio, desc: " Muziek Album"}
-    - {id: 11, cat: Audio/Other, desc: " Muziek Diverse"}
-    - {id: 12, cat: Console/NDS, desc: " Nintendo"}
-    - {id: 13, cat: Movies, desc: " Classic"}
-    - {id: 15, cat: Other, desc: " Overige"}
-    - {id: 16, cat: PC/0day, desc: " PC Software"}
-    - {id: 17, cat: PC, desc: " PC Spellen"}
-    - {id: 19, cat: TV, desc: " TV Series"}
-    - {id: 21, cat: Movies/SD, desc: " Divx/Xvid"}
-    - {id: 24, cat: Books/EBook, desc: " E-Books"}
-    - {id: 26, cat: Audio/Other, desc: " Cabaret"}
-    - {id: 27, cat: TV/Documentary, desc: " Documentaire"}
-    - {id: 31, cat: Movies/HD, desc: " FP-release"}
-    - {id: 32, cat: Audio/Audiobook, desc: " Luister Boeken"}
+    - {id: 2, cat: Movies/BluRay, desc: "Bluray/HD"}
+    - {id: 3, cat: Movies/DVD, desc: "DVD Kids"}
+    - {id: 4, cat: Audio/Video, desc: "DVD Muziek"}
+    - {id: 5, cat: Movies/DVD, desc: "DVD Films"}
+    - {id: 7, cat: Movies/UHD, desc: "4K films"}
+    - {id: 8, cat: XXX, desc: "Erotiek"}
+    - {id: 9, cat: PC/Mobile-Other, desc: "GSM/Navigatie"}
+    - {id: 10, cat: Audio, desc: "Muziek Album"}
+    - {id: 11, cat: Audio/Other, desc: "Muziek Diverse"}
+    - {id: 12, cat: Console/NDS, desc: "Nintendo"}
+    - {id: 13, cat: Movies, desc: "Classic"}
+    - {id: 15, cat: Other, desc: "Overige"}
+    - {id: 16, cat: PC/0day, desc: "PC Software"}
+    - {id: 17, cat: PC, desc: "PC Spellen"}
+    - {id: 19, cat: TV, desc: "TV Series"}
+    - {id: 21, cat: Movies/SD, desc: "Divx/Xvid"}
+    - {id: 24, cat: Books/EBook, desc: "E-Books"}
+    - {id: 26, cat: Audio/Other, desc: "Cabaret"}
+    - {id: 27, cat: TV/Documentary, desc: "Documentaire"}
+    - {id: 31, cat: Movies/HD, desc: "FP-release"}
+    - {id: 32, cat: Audio/Audiobook, desc: "Luister Boeken"}
 
   modes:
     search: [q]
-    tv-search: [q, imdbid]
+    tv-search: [q, season, ep, imdbid]
     movie-search: [q, imdbid]
     music-search: [q]
     book-search: [q]
@@ -95,6 +95,11 @@ search:
     search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
     incldead: 1
     # does not return imdb link in results
+  keywordsfilters:
+    - name: re_replace # S01E02 to 1 2
+      args: ["(?i)\\bS0*(\\d{1,2})\\s*E0*(\\d{1,2})\\b", "$1 $2"]
+    - name: re_replace # S01 to 1
+      args: ["(?i)\\bS0*(\\d{1,2})\\b", "$1"]
 
   rows:
     selector: table.mainouter
@@ -106,11 +111,13 @@ search:
       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"]
+          args: ["(?i)(seizoen\\s*)(\\d{1,2})\\s*(tot|t\/m|&|\\+)\\s*(\\d{1,2})", "S$2-$4"]
         - name: re_replace
-          args: ["(?i)(seizoen\\s*)(\\d{1,2})", "S$2"]
+          args: ["(?i)(seizoen\\s*)(\\d{1,2})\\s*", "S$2"]
         - name: re_replace
-          args: ["(?i)(afl.\\s*|aflevering\\s*)(\\d{1,2})", "E$2"]
+          args: ["(?i)(afl.\\s*|aflevering\\s*|ep.\\s*)(\\d{1,2})\\s*(tot|t\/m|&|\\+)\\s*(\\d{1,2})", "E$2-$4"]
+        - name: re_replace
+          args: ["(?i)(afl.\\s*|aflevering\\s*|ep.\\s*)(\\d{1,2})", "E$2"]
         - name: re_replace
           args: ["(?i)compleet", "Complete"]
     details:

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,8 @@ 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: 66, cat: Movies/HD, desc: " HDRip"} # orphaned subcategory
     - {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"}
@@ -98,6 +101,14 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: countdown
+    type: info
+    label: Countdown Timer
+    default: "This site is a Tracker based on Time: to keep your account the time must not be at 0000-00-00-00-00-00. Read <a href=\"https://fou-du-cinema.ca/faq.php#nogo\" target=\"_blank\">Fou-Du-Cinema FAQ</a> on how to keep the timer active."
+  - name: registration
+    type: info
+    label: Registration Conformation
+    default: After you register you will receive a confirmation email that contains a link to activate your account. If you have not received it check your Junk mail / Spam mail folder.
 
 login:
   path: login.php
@@ -142,12 +153,12 @@ search:
     selector: div.content_wrap > div.selection_wrap:has(a[href^="details.php?id="])
 
   fields:
-    cat_p1:
+    category_p1:
       selector: div.kat_cat_pic_name
-    cat_p2:
+    category_p2:
       selector: div.kat_cat_pic_name_b
     categorydesc:
-      text: "{{ .Result.cat_p1 }} {{ .Result.cat_p2 }}"
+      text: "{{ .Result.category_p1 }} {{ .Result.category_p2 }}"
     title_phase1:
       selector: a[href^="details.php?id="]
     title_multilang:

src/Jackett.Common/Definitions/fuzer.yml

@@ -0,0 +1,181 @@
+---
+id: fuzer
+name: Fuzer
+description: "Fuzer is a private torrent website with israeli torrents."
+language: he-IL
+type: private
+encoding: windows-1255
+links:
+  - https://www.fuzer.me/
+legacylinks:
+  - https://fuzer.me/
+
+caps:
+  categorymappings:
+    # Movies
+    - {id: 73, cat: Movies, desc: "סרטים"}
+    - {id: 7, cat: Movies/SD, desc: "סרטים"}
+    - {id: 60, cat: Movies/SD, desc: "סרטים ישראליים"}
+    - {id: 9, cat: Movies/HD, desc: "סרטים HD"}
+    - {id: 101, cat: Movies/HD, desc: "סרטים x265"}
+    - {id: 59, cat: Movies/HD, desc: "סרטי BDRIP-BRRip"}
+    - {id: 61, cat: Movies/HD, desc: "סרטים ישראליים HD"}
+    - {id: 97, cat: Movies/UHD, desc: "סרטים UHD"}
+    - {id: 58, cat: Movies/DVD, desc: "סרטים DVD-R"}
+    - {id: 83, cat: Movies/Other, desc: "סרטים מדובבים"}
+    # TV
+    - {id: 76, cat: TV, desc: "סדרות"}
+    - {id: 8, cat: TV/SD, desc: "סדרות"}
+    - {id: 62, cat: TV/SD, desc: "סדרות ישראליות"}
+    - {id: 10, cat: TV/HD, desc: "Tסדרות HD"}
+    - {id: 63, cat: TV/HD, desc: "סדרות ישראליות HD"}
+    - {id: 100, cat: TV/UHD, desc: "סדרות UHD"}
+    - {id: 84, cat: TV/Other, desc: "סדרות מדובבות"}
+    - {id: 65, cat: TV/Anime, desc: "אנימה"}
+    - {id: 64, cat: TV/Sport, desc: "ספורט"}
+    # PC
+    - {id: 74, cat: PC, desc: "תוכנות"}
+    - {id: 15, cat: PC/0day, desc: "תוכנות PC"}
+    - {id: 11, cat: PC/Games, desc: "משחקים PC"}
+    - {id: 13, cat: PC/Mobile-Android, desc: "אפליקציות לאנדרואיד"}
+    - {id: 70, cat: PC/Mobile-iOS, desc: "אפליקציות לאייפון"}
+    - {id: 71, cat: PC/Mac, desc: "תוכנות MAC"}
+    # XXX
+    - {id: 16, cat: XXX, desc: "למבוגרים בלבד"}
+    # Games
+    - {id: 72, cat: Console, desc: "משחקים"}
+    - {id: 55, cat: Console/XBox, desc: "משחקים XBOX"}
+    - {id: 12, cat: Console/PSP, desc: "משחקים PS"}
+    - {id: 56, cat: Console/Wii, desc: "משחקים WII"}
+    - {id: 57, cat: PC/Mobile-Other, desc: "משחקי קונסולות ניידות"}
+    # Music
+    - {id: 75, cat: Audio, desc: "שירים"}
+    - {id: 14, cat: Audio, desc: "מוזיקה עולמית"}
+    - {id: 66, cat: Audio, desc: "מוזיקה ישראלית"}
+    - {id: 68, cat: Audio, desc: "פסקולים"}
+    - {id: 67, cat: Audio/Lossless, desc: "FLAC"}
+    # Books
+    - {id: 69, cat: Books, desc: "Ebooks"}
+    # Other
+    - {id: 17, cat: Other, desc: "שונות"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: cookie
+    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>"
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: dateadded
+    options:
+      dateadded: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
+  test:
+    path: browse.php
+
+search:
+  paths:
+    - path: browse.php
+  inputs:
+    query: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    order: "{{ .Config.sort }}"
+    sort: "{{ .Config.type }}"
+    matchquery: any
+    freeleech: "{{ if .Config.freeleech }}1{{ else }}0{{ end }}"
+    # on, off, only_dead
+    dead: on
+    $raw: "{{ range .Categories }}c[]={{.}}&{{end}}"
+
+  rows:
+    selector: .box_torrent
+
+  fields:
+    category:
+      selector: a[href^="/browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: .main_title
+    details:
+      selector: a[href^="/showthread.php?t="]
+      attribute: href
+    download:
+      selector: a[href^="/attachment.php?attachmentid="]
+      attribute: href
+    imdbid:
+      selector: span.imdb-inline > a
+      attribute: href
+    poster:
+      selector: a[imgsrc]
+      attribute: imgsrc
+    size:
+      selector: td:nth-child(4)
+    grabs:
+      selector: td:nth-child(5)
+      filters:
+        - name: replace
+          args: [",", ""]
+    seeders:
+      selector: td:nth-child(6)
+      filters:
+        - name: replace
+          args: [",", ""]
+    leechers:
+      selector: td:nth-child(7)
+      filters:
+        - name: replace
+          args: [",", ""]
+    date:
+      selector: .up_info2
+      filters:
+        - name: append
+          args: " +02:00" # IST
+        - name: re_replace
+          args: ["[^:]+: ", ""]
+        - name: dateparse
+          args: "02/01/06 15:04 -07:00"
+    description:
+      selector: div.sub_title
+    downloadvolumefactor:
+      case:
+        a[href*="freeleech=1"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# engine n/a

src/Jackett.Common/Definitions/gamestorrents.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 links:
   - https://www.gamestorrents.fm/
-  - https://gamestorrents.nocensor.sbs/
+  - https://gamestorrents.nocensor.world/
 legacylinks:
   - https://www.gamestorrents.com/
   - https://www.gamestorrents.tv/
@@ -15,6 +15,7 @@ legacylinks:
   - https://gamestorrents.nocensor.space/
   - https://gamestorrents.nocensor.work/
   - https://gamestorrents.nocensor.biz/
+  - https://gamestorrents.nocensor.sbs/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/gaytorrentru.yml

@@ -137,7 +137,7 @@ search:
     details:
       selector: a[href^="details.php?id="]
       attribute: href
-    id:
+    _id:
       selector: a[href^="details.php?id="]
       attribute: href
       filters:
@@ -146,7 +146,7 @@ search:
     download:
       # turn href="download.php/0738d444362fa610a08fb87b5c1bec798ca1731adbf3175b/GUARATORO.torrent
       # into href="/download.php?id=0738d444362fa610a08fb87b5c1bec798ca1731adbf3175b&n=GUARATORO.torrent&p=dodownload
-      text: "download.php?id={{ .Result.id }}&n={{ .Result.title }}.torrent&p=dodownload"
+      text: "download.php?id={{ .Result._id }}&n={{ .Result.title }}.torrent&p=dodownload"
     poster:
       selector: a[href^="details.php?id="]
       attribute: onmouseover

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,9 +6,10 @@ 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://gktorrent.nocensor.sbs/
+  - https://www.gktorrents.cc/
+  - https://gktorrent.nocensor.world/
 legacylinks:
   - http://www.gktorrent.co/
   - https://www.gktorrent.co/
@@ -30,6 +31,8 @@ legacylinks:
   - https://gktorrent.nocensor.work/
   - https://www.gktorrents.net/
   - https://gktorrent.nocensor.biz/
+  - https://www.gktorrents.org/
+  - https://gktorrent.nocensor.sbs/
 
 caps:
   categorymappings:
@@ -94,26 +97,26 @@ search:
     category:
       selector: td:nth-child(1) > i
       attribute: class
-    site_date:
+    _site_date:
       selector: td:nth-child(1) a
       filters:
-        # year is at the end of the title, so we get it and name it site_date
+        # year is at the end of the title, so we get it and name it _site_date
         - name: regexp
           args: "(19|20\\d{2})$"
     title_phase1:
       selector: td:nth-child(1) a
       filters:
-        # now we put the date at the right place according scene naming rules using .Result.site_date
+        # now we put the date at the right place according scene naming rules using .Result._site_date
         - name: re_replace
-          args: ["(?i)( FRENCH)", " {{ .Result.site_date }} FRENCH"]
+          args: ["(?i)( FRENCH)", " {{ .Result._site_date }} FRENCH"]
         - name: re_replace
-          args: ["(?i)( MULTI)", " {{ .Result.site_date }} MULTI"]
+          args: ["(?i)( MULTI)", " {{ .Result._site_date }} MULTI"]
         - name: re_replace
-          args: ["(?i)( TRUEFRENCH)", " {{ .Result.site_date }} TRUEFRENCH"]
+          args: ["(?i)( TRUEFRENCH)", " {{ .Result._site_date }} TRUEFRENCH"]
         - name: re_replace
-          args: ["(?i)( VOSTFR)", " {{ .Result.site_date }} VOSTFR"]
+          args: ["(?i)( VOSTFR)", " {{ .Result._site_date }} VOSTFR"]
         - name: re_replace
-          args: ["(?i)( SUBFRENCH)", " {{ .Result.site_date }} SUBFRENCH"]
+          args: ["(?i)( SUBFRENCH)", " {{ .Result._site_date }} SUBFRENCH"]
         # and we delete it at the end
         - name: re_replace
           args: ["(19|20\\d{2})$", ""]

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.nocensor.sbs/
+  - https://glotorrents.unblockit.ist/
+  - https://glotorrents.nocensor.world/
+  - 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,9 @@ legacylinks:
   - https://glotorrents.nocensor.biz/
   - https://glotorrents.unblockit.day/
   - https://glotorrents.unblockit.llc/
+  - https://glotorrents.unblockit.blue/
+  - https://glotorrents.unblockit.name/
+  - https://glotorrents.nocensor.sbs/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/haidan.yml

@@ -24,8 +24,8 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
     music-search: [q]
 
 settings:
@@ -90,13 +90,13 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if .Query.DoubanID }}/{{ .Query.DoubanID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ 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 }}"
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}{{ end }}{{ if .Query.DoubanID }}1{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}0{{ end }}"
     # 0 AND, 1 OR, 2 exact
     search_mode: 0
     sort: "{{ .Config.sort }}"
@@ -118,10 +118,11 @@ search:
       filters:
         - name: replace
           args: ["年份:", " "]
-    _title:
-      selector: a.video_name_str
     title:
-      text: "{{ .Result._title }}{{ .Result.year }}"
+      selector: a.video_name_str
+      filters:
+        - name: append
+          args: "{{ .Result.year }}"
     details:
       selector: a.video_name_str
       attribute: href

src/Jackett.Common/Definitions/haitang.yml

@@ -104,19 +104,21 @@ search:
       filters:
         - name: querystring
           args: cat
-    title:
+    title_default:
       selector: a[href^="details.php?id="]
-    title:
+    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
-    date:
+    date_elapsed:
       # time type: time elapsed (default)
       selector: td:nth-child(4) > span[title]
       attribute: title
@@ -126,7 +128,7 @@ search:
           args: " +08:00" # CST
         - name: dateparse
           args: "2006-01-02 15:04:05 -07:00"
-    date:
+    date_added:
       # time added
       selector: td:nth-child(4):not(:has(span))
       optional: true
@@ -135,6 +137,8 @@ search:
           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:nth-child(5)
     seeders:

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

@@ -28,8 +28,8 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
     music-search: [q]
 
 settings:
@@ -93,7 +93,7 @@ search:
       args: ["[\\s]+", "%"]
 
   inputs:
-    searchParams: "{\"sp_state\":\"{{ if .Config.freeleech }}2{{ else }}{{ end }}\",\"keyword\":\"{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}\",\"keyword_area\":\"{{ if .Query.IMDBID }}4{{ else }}1{{ end }}\"}"
+    searchParams: "{\"sp_state\":\"{{ if .Config.freeleech }}2{{ else }}{{ end }}\",\"keyword\":\"{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}{{ .Keywords }}{{ end }}\",\"keyword_area\":\"{{ if .Query.IMDBID }}9{{ else }}{{ end }}{{ if .Query.DoubanID }}10{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}1{{ end }}\"}"
     page: 1
     limit: 100
     field: "{{ .Config.sort }}"
@@ -108,7 +108,7 @@ search:
   fields:
     category:
       selector: category
-    source:
+    _source:
       selector: source
       case:
         0: ""
@@ -118,7 +118,7 @@ search:
         4: JP
         5: KR
         6: Other
-    medium:
+    _medium:
       selector: medium
       case:
         0: ""
@@ -131,7 +131,7 @@ search:
         7: "DVD"
         8: "CD"
         9: "MiniBD"
-    codec:
+    _codec:
       selector: codec
       case:
         0: ""
@@ -142,7 +142,7 @@ search:
         5: "MPEG-2"
         7: "MPEG-4"
         6: "Other"
-    audiocodec:
+    _audiocodec:
       selector: audiocodec
       case:
         0: ""
@@ -160,7 +160,7 @@ search:
         12: "OGG"
         13: "MPEG"
         14: "Other"
-    standard:
+    _standard:
       selector: standard
       case:
         0: ""
@@ -180,7 +180,7 @@ search:
       selector: small_descr
       filters:
         - name: append
-          args: " [{{ .Result.medium }} {{ .Result.standard }} {{ .Result.codec }} {{ .Result.audiocodec }} {{ .Result.source }}]"
+          args: " [{{ .Result._medium }} {{ .Result._standard }} {{ .Result._codec }} {{ .Result._audiocodec }} {{ .Result._source }}]"
     poster:
       selector: poster
     seeders:

src/Jackett.Common/Definitions/hdforever.yml

@@ -122,17 +122,17 @@ search:
         div.cats_série: 5
         div.cats_sérieanim: 6
         div.cats_documentaire: 7
-    download-regular:
+    download_regular:
       selector: a[href^="torrents.php?action=download&"]
       attribute: href
-    download-usetoken:
+    download_usetoken:
       selector: a[href^="torrents.php?action=download&"]
       attribute: href
       filters:
         - name: append
           args: "&usetoken=1"
     download:
-      text: "{{ if .Config.usetoken }}{{ .Result.download-usetoken }}{{ else }}{{ .Result.download-regular }}{{ end }}"
+      text: "{{ if .Config.usetoken }}{{ .Result.download_usetoken }}{{ else }}{{ .Result.download_regular }}{{ end }}"
     title_phase1:
       selector: div.group_info
       remove: span:nth-child(1), div.tags

src/Jackett.Common/Definitions/hdme.yml

@@ -1,160 +0,0 @@
----
-id: hdme
-name: HDME
-description: "HDME is a Private Torrent Tracker for HD MOVIES / TV / GENERAL"
-language: en-US
-type: private
-encoding: windows-1252
-certificates:
-  - 07872b2e93e50d8abeea094e5621b4c637c61652 # self signed
-links:
-  - https://hdme.eu/
-
-caps:
-  categorymappings:
-    - {id: 24, cat: TV/Anime, desc: "Anime"}
-    - {id: 25, cat: PC/0day, desc: "Appz"}
-    - {id: 47, cat: Movies/HD, desc: "AVCHD"}
-    - {id: 26, cat: Movies/BluRay, desc: "Bluray"}
-    - {id: 54, cat: Movies/HD, desc: "dbREMUX"}
-    - {id: 41, cat: Movies/HD, desc: "Documentaries"}
-    - {id: 50, cat: Movies/HD, desc: "FourGHD"}
-    - {id: 44, cat: Movies/HD, desc: "HDME"}
-    - {id: 28, cat: Audio/Lossless, desc: "HQ Music"}
-    - {id: 48, cat: Movies/HD, desc: "iCandy"}
-    - {id: 45, cat: Movies/HD, desc: "INtL"}
-    - {id: 29, cat: Other, desc: "Misc"}
-    - {id: 49, cat: PC/Mobile-Other, desc: "Mobile"}
-    - {id: 30, cat: Movies/HD, desc: "Movie 1080i"}
-    - {id: 31, cat: Movies/HD, desc: "Movie 1080p"}
-    - {id: 32, cat: Movies/HD, desc: "Movie 720p"}
-    - {id: 33, cat: Audio/Video, desc: "Music Videos"}
-    - {id: 34, cat: TV, desc: "Packs"}
-    - {id: 53, cat: Movies/HD, desc: "Remux"}
-    - {id: 56, cat: Movies/HD, desc: "RUXi"}
-    - {id: 55, cat: Movies/HD, desc: "SiNiSteR"}
-    - {id: 36, cat: TV/Sport, desc: "Sports"}
-    - {id: 37, cat: TV/HD, desc: "TV Series 1080i"}
-    - {id: 38, cat: TV/HD, desc: "TV Series 1080p"}
-    - {id: 39, cat: TV/HD, desc: "TV Series 720p"}
-    - {id: 57, cat: Movies/UHD, desc: "UHD 2160p"}
-    - {id: 40, cat: XXX, desc: "XXX"}
-
-  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: added
-    options:
-      added: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: DESC
-    options:
-      DESC: desc
-      ASC: asc
-  - name: info_results
-    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. The default is 15.
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: td.embedded
-      message:
-        selector: td.text
-  test:
-    path: my.php
-    selector: a[href="logout.php"]
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    # 0 active, 1 incldead, 2 onlydead, 3 onlyfree
-    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
-    # 0 name, 1 descr, 2 both
-    blah: "{{ if .Query.IMDBID }}1{{ else }}0{{ end }}"
-    sort: "{{ .Config.sort }}"
-    d: "{{ .Config.type }}"
-
-  rows:
-    selector: table[width="100%"] > tbody > tr:has(td.bottom[background="_images/bg_torrent.jpg"])
-
-  fields:
-    category:
-      selector: td:nth-child(2) a
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: td:nth-child(3) > a
-      attribute: title
-    details:
-      selector: td:nth-child(3) > a
-      attribute: href
-    download:
-      selector: td:nth-child(11) > a
-      attribute: href
-      filters:
-        - name: prepend
-          args: "{{ .Config.sitelink }}"
-        - name: replace # https download links are redirected to http causing invalid cookies => invalid passkeys
-          args: ["https", "http"]
-    size:
-      selector: td:nth-child(6)
-      remove: br
-    date:
-      #  October 2, 2020, 1:33 pm
-      selector: td:nth-child(3)
-      filters:
-        - name: regexp
-          args: "Added: (.+?)\n"
-        - name: append
-          args: " -07:00" # PDT
-        - name: dateparse
-          args: "January 2, 2006, 3:04 PM -07:00"
-    seeders:
-      selector: td:nth-child(8)
-    leechers:
-      selector: td:nth-child(9)
-    downloadvolumefactor:
-      case:
-        font[color="#D4A017"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.1
-    minimumseedtime:
-      # 3 day
-      text: 259200
-# engine n/a

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

@@ -71,7 +71,7 @@ search:
       filters:
         - name: querystring
           args: cat
-    extras:
+    _extras:
       optional: true
       selector: td.titulo a[class]
       filters:
@@ -90,7 +90,7 @@ search:
       optional: true
       filters:
         - name: append
-          args: "{{ .Result.extras }} English"
+          args: "{{ .Result._extras }} English"
         - name: re_replace
           args: ["(?i)T(\\d{1,2})\\b", "S$1"]
     title_notvose:
@@ -98,7 +98,7 @@ search:
       optional: true
       filters:
         - name: append
-          args: "{{ .Result.extras }} Spanish"
+          args: "{{ .Result._extras }} Spanish"
         - name: re_replace
           args: ["(?i)T(\\d{1,2})\\b", "S$1"]
     title:

src/Jackett.Common/Definitions/hdtime.yml

@@ -26,8 +26,8 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
     music-search: [q]
     book-search: [q]
 
@@ -84,13 +84,13 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if .Query.DoubanID }}/{{ .Query.DoubanID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ 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 (searching imdburl does not work with tt1234567, but descr is good)
-    search_area: "{{ if .Query.IMDBID }}1{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl (4 does not appear to work).
+    search_area: "{{ if or .Query.IMDBID .Query.DoubanID }}1{{ else }}0{{ end }}"
     # 0 AND, 1 OR, 2 exact
     search_mode: 0
     sort: "{{ .Config.sort }}"

src/Jackett.Common/Definitions/hdtorrentsit.yml

@@ -71,10 +71,10 @@ search:
       filters:
         - name: regexp # find torrent year
           args: (\d{4})
-    quality: # (BDRip 1080, BDRip 720p etc)
+    _quality: # (BDRip 1080, BDRip 720p etc)
       selector: td:nth-child(1) a:nth-child(1) img
       attribute: alt
-    audio: # ita audio TAG
+    _audio: # ita audio TAG
       selector: a[href^="download.php?id="]
       attribute: href
       filters:
@@ -108,7 +108,7 @@ search:
         - name: re_replace # remove various
           args: ["(?i)(Serie completa|Completa|\\[in pausa\\])", ""]
         - name: append
-          args: " ({{ .Result.year }}) [{{ .Result.quality }} - {{ .Result.audio }} ITA]"
+          args: " ({{ .Result.year }}) [{{ .Result._quality }} - {{ .Result._audio }} ITA]"
         - name: re_replace # replace multiple spaces
           args: ["[ ]{2,}", " "]
     details:

src/Jackett.Common/Definitions/hdzone.yml

@@ -63,8 +63,8 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
     music-search: [q]
 
 settings:
@@ -113,13 +113,13 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if .Query.DoubanID }}/{{ .Query.DoubanID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}{{ .Keywords }}{{ end }}"
     # 0 incldead, 1 active, 2 onlydead
     incldead: 0
     # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
     spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
     # 0 title, 1 descr, 3 uploader, 4 imdb
-    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}{{ end }}{{ if .Query.DoubanID }}1{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}0{{ end }}"
     # 0 AND, 1 OR, 2 exact
     search_mode: 0
     sort: "{{ .Config.sort }}"

src/Jackett.Common/Definitions/hebits.yml

@@ -0,0 +1,169 @@
+---
+id: hebits
+name: Hebits
+description: "The Israeli Tracker"
+language: he-IL
+type: private
+encoding: UTF-8
+links:
+  - https://hebits.net/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "סרטים (Movies)"}
+    - {id: 2, cat: TV, desc: "סדרות (TV)"}
+    - {id: 3, cat: TV/Other, desc: "הצגות והופעות (Theater)"}
+    - {id: 4, cat: PC/0day, desc: "תוכנות (Apps)"}
+    - {id: 5, cat: PC/Games, desc: "משחקים (Games)"}
+    - {id: 6, cat: Audio, desc: "מוזיקה (Music)"}
+    - {id: 7, cat: Books, desc: "ספרים (Books)"}
+    - {id: 8, cat: Movies/Other, desc: "חבילות סרטים (Movies Packs)"}
+    - {id: 9, cat: XXX, desc: "פורנו (Porn)"}
+    - {id: 10, cat: Other, desc: "שונות (Other)"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: cookie
+    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>"
+  - 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
+
+login:
+  method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
+  test:
+    path: torrents.php
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    searchstr: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    order_by: "{{ .Config.sort }}"
+    order_way: "{{ .Config.type }}"
+    imdbgt: 0
+    imdblt: 10
+    # 1 freeleech, 2 neutral, 3 50%, 4 2x, 5 3x, 9 75%, 11 only perks, 0 normal
+    freetorrent: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    action: advanced
+    searchsubmit: 1
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
+
+  rows:
+    selector: .torrent
+
+  fields:
+    category:
+      selector: .tooltip
+      case:
+        "div[class*=\"movies\"]": 1
+        "div[class*=\"tv\"]": 2
+        "div[class*=\"theater\"]": 3
+        "div[class*=\"software\"]": 4
+        "div[class*=\"games\"]": 5
+        "div[class*=\"music\"]": 6
+        "div[class*=\"books\"]": 7
+        "div[class*=\"packs\"]": 8
+        "div[class*=\"porno\"]": 9
+        "div[class*=\"other\"]": 10
+    title_notenglish:
+      selector: .torrent_info:not(:contains("a")):not(:contains("e")):not(:contains("i")):not(:contains("o")):not(:contains("u")):not(:contains("y"))
+      optional: true
+      filters:
+        # space out the book language at the end of the title
+        # everything within the outermost quotes below is right to left
+        - name: re_replace
+          args: ["(אנגלית)$", " - אנגלית"] # English
+        - name: re_replace
+          args: ["(עברית)$", " - עברית"] # Hebrew
+    title_english:
+      selector: .torrent_info
+      optional: true
+      filters:
+        - name: append
+          args: "א" # catch English only results
+        - name: regexp
+          args: "(.+?[a-zA-Z0-9\\]\\)\\}])[א-ת].*" # remove Hebrew labels from end of title, account for titles ending in letters, numbers, and brackets
+    title:
+      text: "{{ if .Result.title_notenglish }}{{ .Result.title_notenglish }}{{ else }}{{ .Result.title_english }}{{ end }}"
+    details:
+      selector: a[href*="torrentid"]
+      attribute: href
+    magnet:
+      selector: a[href^="magnet"]
+      attribute: href
+      optional: true
+    download:
+      selector: a[href^="torrents.php?action=download"]
+      attribute: href
+    poster:
+      selector: a[data-cover^="/images/"]
+      attribute: data-cover
+    files:
+      selector: td:nth-child(3)
+    date:
+      selector: td:nth-child(4) span
+      attribute: title
+      filters:
+        - name: append
+          args: " +02:00" # IST
+        - name: dateparse
+          args: "02/01/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_notice[title*=\"חצי פריליץ'\"]": 0.5 # 50%
+        "strong.tl_notice[title*=\"75% פריליץ'!\"]": 0.25 # 75%
+        "strong.tl_notice[title*=\"נטרלי\"]": 0 # neutral
+        "strong.tl_notice[title*=\"פריליץ'\"]": 0 # freeleech
+        "*": 1
+    uploadvolumefactor:
+      case:
+        "strong.tl_notice[title*=\"העלאה משולשת\"]": 3 # 3x
+        "strong.tl_notice[title*=\"העלאה כפולה\"]": 2 # 2x
+        "strong.tl_notice[title*=\"נטרלי\"]": 0 # neutral
+        "*": 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 7 days (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
+    description:
+      selector: div.tags
+# Gazelle

src/Jackett.Common/Definitions/hqsource.yml

@@ -89,20 +89,20 @@ search:
     download:
       selector: a[href^="download.php/"]
       attribute: href
-    language:
+    _language:
       optional: true
       selector: img[src="pic/pl.png"]
       filters:
         - name: append
           args: "Language: polish\n<br>"
-    subbed:
+    _subbed:
       optional: true
       selector: img[src="pic/napisy.png"]
       filters:
         - name: append
           args: "Subbed\n<br>"
     description:
-      text: "{{ .Result.language }}{{ .Result.subbed }}"
+      text: "{{ .Result._language }}{{ .Result._subbed }}"
     imdbid:
       selector: a[href*="imdb.com/title/tt"]
     grabs:

src/Jackett.Common/Definitions/huntorrent.yml

@@ -113,7 +113,7 @@ search:
     selector: table[align="center"][cellpadding="5"] > tbody > tr[id^="torrent-main-"]
 
   fields:
-    id:
+    _id:
       selector: a.download-link
       attribute: data-id
     category:
@@ -129,7 +129,7 @@ search:
         - name: replace
           args: ["Név: ", ""]
     details:
-      text: "details.php?id={{ .Result.id }}"
+      text: "details.php?id={{ .Result._id }}"
     download:
       selector: a[href^="download.php?torrent="]
       attribute: href

src/Jackett.Common/Definitions/idope.yml

@@ -96,7 +96,7 @@ search:
     details:
       selector: div.resultdivtop a
       attribute: href
-    download-itorrents:
+    download_itorrents:
       selector: div.resultdivbotton div.hideinfohash
       filters:
         - name: toupper
@@ -105,7 +105,7 @@ search:
         - name: append
           args: ".torrent"
     download:
-      text: "{{ if .Config.itorrents-links }}{{ .Result.download-itorrents }}{{ else }}{{ end }}"
+      text: "{{ if .Config.itorrents-links }}{{ .Result.download_itorrents }}{{ else }}{{ end }}"
     infohash:
       selector: div.resultdivbotton div.hideinfohash
     date:

src/Jackett.Common/Definitions/ilcorsaronero.yml

@@ -11,7 +11,7 @@ links:
   - https://ilcorsaronero.fun/
   - https://ilcorsaronero.pro/
   - https://ilcorsaronero.torrentbay.to/
-  - https://ilcorsaronero.nocensor.sbs/
+  - https://ilcorsaronero.nocensor.world/
 legacylinks:
   - https://ilcorsaronero.live/
   - https://ilcorsaronero.vip/
@@ -28,6 +28,7 @@ legacylinks:
   - https://ilcorsaronero.nocensor.space/
   - https://ilcorsaronero.nocensor.work/
   - https://ilcorsaronero.nocensor.biz/
+  - https://ilcorsaronero.nocensor.sbs/
 
 caps:
   categorymappings:
@@ -133,7 +134,7 @@ search:
     details:
       selector: td:nth-child(4) a
       attribute: href
-    download-itorrents:
+    download_itorrents:
       selector: input.downarrow
       attribute: value
       filters:
@@ -142,7 +143,7 @@ search:
         - name: append
           args: ".torrent"
     download:
-      text: "{{ if .Config.itorrents-links }}{{ .Result.download-itorrents }}{{ else }}{{ end }}"
+      text: "{{ if .Config.itorrents-links }}{{ .Result.download_itorrents }}{{ else }}{{ end }}"
     infohash:
       selector: input.downarrow
       attribute: value

src/Jackett.Common/Definitions/ilcorsaroverde.yml

@@ -1,279 +0,0 @@
----
-id: ilcorsaroverde
-name: Il Corsaro Verde
-description: "Il Corsaro Verde (iCV-CreW) is a ratioless ITALIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: it-IT
-type: private
-encoding: UTF-8
-links:
-  - https://www.icv-crew.com/
-
-caps:
-  # commented out categories are discussion-only forums
-  categorymappings:
-    # CIURMA
-    # - {id: "150", cat: Other, desc: "Regole per Postare"}
-    - {id: "140", cat: Other/Misc, desc: "Bozze - Sezione fruibile a tutti i nuovi Releaser", default: true}
-    # INFORMAZIONI E REGOLE DEL FORUM
-    # - {id: "108", cat: Other, desc: "Manifesto Generale"}
-    # - {id: "30", cat: Other, desc: "Disclaimer"}
-    # - {id: "76", cat: Other, desc: "Statuto"}
-    # - {id: "31", cat: Other, desc: "Comunicazioni dello STAFF"}
-    # - {id: "32", cat: Other, desc: "Guide sull'uso del Forum"}
-    # - {id: "124", cat: Other, desc: "iCV Community"}
-    # PROGETTI
-    # - {id: "172", cat: Audio, desc: "Progetto - Discografie"}
-    # - {id: "109", cat: Movies, desc: "Progetto - Filmografie"}
-    # - {id: "110", cat: Books, desc: "Progetto - Biblico"}
-    # - {id: "137", cat: Other, desc: "Progetto - Releaser/Crew"}
-    # - {id: "126", cat: Movies, desc: "Progetto - Cine Vintage "}
-    # MUSICA
-    - {id: "19", cat: Audio, desc: "Musica Audio - Tutti i formati", default: true}
-    - {id: "20", cat: Audio/Video, desc: "Musica Video - Standard Definition - High Definition", default: true}
-    # - {id: "135", cat: Audio, desc: "Richieste Titoli Musica"}
-    # VIDEO
-    - {id: "6", cat: Movies/SD, desc: "Video - Screener", default: true}
-    - {id: "7", cat: Movies/SD, desc: "Video - Standard Definition", default: true}
-    - {id: "9", cat: Movies/HD, desc: "Video - High Definition H.264", default: true}
-    - {id: "74", cat: Movies/HD, desc: "Video - High Definition HEVC/H.265", default: true}
-    - {id: "11", cat: Movies/BluRay, desc: "Video - Blu-ray Full", default: true}
-    - {id: "8", cat: Movies/DVD, desc: "Video - DVD", default: true}
-    - {id: "95", cat: Movies, desc: "Video - Dispositivi Mobili (Portable)", default: true}
-    - {id: "79", cat: Movies, desc: "Video - TVRip - Standard Definition - High Definition", default: true}
-    - {id: "14", cat: TV/Other, desc: "Video - Documentari - Sportivi - Spettacoli - Lirica - Standard Definition - High Definition", default: true}
-    # - {id: "134", cat: Movies, desc: "Richieste Titoli Video"}
-    # SERIE TV
-    - {id: "12", cat: TV/SD, desc: "Serie TV - Standard Definition", default: true}
-    - {id: "102", cat: TV/HD, desc: "Serie TV - High definition H.264", default: true}
-    - {id: "161", cat: TV/HD, desc: "Serie TV - High definition HEVC/H.265", default: true}
-    # - {id: "103", cat: TV, desc: "L'angolo di Giuseppe-iCV & littlelinx"}
-    # - {id: "160", cat: TV, desc: "L'angolo di Pir8"}
-    # - {id: "169", cat: TV, desc: "L'angolo di TV-P2P"}
-    # - {id: "133", cat: TV, desc: "Richieste Titoli Serie TV"}
-    # CARTONI ANIMATI - ANIME
-    - {id: "17", cat: Movies/SD, desc: "Cartoni Animati - Standard Definition - High Definition", default: true}
-    - {id: "18", cat: TV/HD, desc: "Cartoni Animati - Serie TV Standard Definition - High Definition", default: true}
-    - {id: "15", cat: TV/Anime, desc: "Anime - Standard Definition - High Definition", default: true}
-    - {id: "16", cat: TV/Anime, desc: "Anime - Serie TV Standard Definition - High Definition", default: true}
-    - {id: "89", cat: Movies/HD, desc: "Cartoni Animati - Anime - Serie Tv e Non - High Definition - HEVC/H.265", default: true}
-    # - {id: "132", cat: TV/Anime, desc: "Richieste Titoli Cartoni Animati - Anime"}
-    # EBOOK - FUMETTI - RIVISTE - QUOTIDIANI
-    - {id: "25", cat: Books/EBook, desc: "Ebook", default: true}
-    - {id: "26", cat: Audio/Audiobook, desc: "Ebook Audio", default: true}
-    - {id: "170", cat: Books/Comics, desc: "Fumetti", default: true}
-    - {id: "28", cat: Books/Mags, desc: "Riviste - Quotidiani", default: true}
-    - {id: "47", cat: Other, desc: "Wallpapers - Poster - Calendari", default: true}
-    # - {id: "131", cat: Movies, desc: "Richieste Titoli Ebook - Fumetti - Riviste"}
-    # SOFTWARE
-    - {id: "21", cat: PC/0day, desc: "Windows Software", default: true}
-    # - {id: "22", cat: PC, desc: "Windows Guide e altre in generale"}
-    # - {id: "92", cat: PC, desc: "Windows Supporto "}
-    - {id: "138", cat: PC/Mac, desc: "macOS Software", default: true}
-    # - {id: "162", cat: PC/Mac, desc: "macOS Guide"}
-    # - {id: "163", cat: PC/Mac, desc: "macOS Supporto"}
-    # - {id: "164", cat: PC/Mac, desc: "Hackintosh Guide"}
-    # - {id: "165", cat: PC/Mac, desc: "Hackintosh Supporto"}
-    - {id: "23", cat: PC, desc: "Linux Software", default: true}
-    # - {id: "168", cat: PC, desc: "Linux Guide"}
-    # - {id: "93", cat: PC, desc: "Linux Supporto"}
-    - {id: "24", cat: PC, desc: "Guide & Tutorial Video", default: true}
-    # - {id: "129", cat: PC, desc: "Richieste Titoli Software"}
-    # GAMES
-    - {id: "36", cat: PC/Games, desc: "Games - Pc Windows", default: true}
-    - {id: "158", cat: PC/Mac, desc: "Games - macOS", default: true}
-    - {id: "37", cat: Console/XBox 360, desc: "Games - Console Microsoft Xbox 360", default: true}
-    - {id: "38", cat: Console/PS3, desc: "Games - Console Sony PS3", default: true}
-    - {id: "152", cat: Console/PS4, desc: "Games - Console Sony PS4", default: true}
-    # - {id: "99", cat: PC/Games, desc: "Games - Supporto"}
-    # - {id: "123", cat: PC/Games, desc: "Games - Guide"}
-    # - {id: "130", cat: PC/Games, desc: "Richieste Titoli Games"}
-    # ANDROID
-    - {id: "58", cat: PC/Mobile-Android, desc: "Android Apps", default: true}
-    # - {id: "144", cat: PC/Mobile-Android, desc: "Android Guide"}
-    # - {id: "128", cat: PC/Mobile-Android, desc: "Richieste Titoli Android"}
-    # TEAM GRAFICO
-    # - {id: "88", cat: Other, desc: "Vetrina Grafica"}
-    # - {id: "100", cat: Other, desc: "Tutorial Photoshop CC"}
-    # TAVERNA DEI CORSARI
-    # - {id: "39", cat: Other, desc: "Presentati alla Community"}
-    # - {id: "112", cat: Other, desc: "Assistenza Forum"}
-    # - {id: "33", cat: Other, desc: "Chiacchiere in generale"}
-    # - {id: "83", cat: Other, desc: "Commenti Titoli "}
-    # - {id: "136", cat: Other, desc: "Sondaggi"}
-    # - {id: "145", cat: Other, desc: "il CorSaRo VeRde App"}
-    # ARCHIVIO FORUM
-    - {id: "171", cat: PC/0day, desc: "Windows Software obsoleto", default: true}
-
-  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: compatItal
-    type: checkbox
-    label: Improve Sonarr compatibility with the tracker's Italian season naming scheme by renaming Sxx to Stagione xx in searches. Can cause results already using Sxx to not be found.
-    default: false
-  - name: info30s
-    type: info
-    label: 30s Delay for Searches
-    default: The site forces a 30s delay between searches, so you may get zero results if you perform searches too close together.
-
-login:
-  method: form
-  path: forum/index.php
-  form: form#frmLogin
-  inputs:
-    user: "{{ .Config.username }}"
-    passwrd: "{{ .Config.password }}"
-    cookieneverexp: on
-  error:
-    - selector: p[class="error"]
-  test:
-    path: forum/index.php
-    selector: li#button_logout
-
-download:
-  before:
-    pathselector:
-      selector: ul.quickbuttons a
-      attribute: href
-  selectors:
-    - selector: a[href^="magnet:?xt="]
-      attribute: href
-
-search:
-  paths:
-    - path: forum/index.php?action=search2
-      method: post
-  inputs:
-    $raw: "{{ range .Categories }}brd[]={{.}}&{{end}}"
-    search: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
-    searchtype: 1
-    userspec: "*"
-    sort: id_msg|desc
-    show_complete: 1
-    subject_only: 1
-    minage: 0
-    maxage: 9999
-
-  keywordsfilters:
-    - name: re_replace
-      args: ["(\\w+)", " +$1"] # prepend + to each word, all keywords must be 2 characters or more
-    - name: re_replace
-      args: ["(?i)(\\bS(\\d+)(E\\d+)?\\b)", "{{ if .Config.compatItal }}Stagione +$2 $3{{ else }}S$2$3{{ end }}"] # Replace SXXEYY with Stagione XX EYY
-
-  rows:
-    selector: div.search_results_posts
-
-  fields:
-    category:
-      selector: a[href*="index.php?board="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: board
-        - name: split
-          args: [".", 0]
-    title:
-      selector: a[href*="index.php?topic="]
-      filters:
-        # normalize to SXXEYY format
-        - name: re_replace # Stagione XX a YY --> SXX-YY
-          args: ["(?i)\\bStagion[ei]\\s?(\\d{2,})\\s?[ae-]\\s?(\\d{2,})\\b", "S$1-$2"]
-        - name: re_replace # Stagione XX --> SXX
-          args: ["(?i)\\bStagion[ei]\\s?(\\d{2,})\\b", "S$1"]
-        - name: re_replace # Stagione X a YY --> S0X-YY
-          args: ["(?i)\\bStagion[ei]\\s?(\\d{1})\\s?[ae-]\\s?(\\d{2,})\\b", "S0$1-$2"]
-        - name: re_replace # Stagione X a Y --> S0X-0Y
-          args: ["(?i)\\bStagion[ei]\\s?(\\d{1})\\s?[ae-]\\s?(\\d{1})\\b", "S0$1-$02"]
-        - name: re_replace # Stagione X --> S0X
-          args: ["(?i)\\bStagion[ei]\\s?(\\d{1})\\b", "S0$1"]
-        - name: re_replace # remove various
-          args: ["(?i)(Serie completa|Completat?a?|in pausa)", ""]
-        # cleanup for Sonarr
-        - name: re_replace # EP 3 4 to E3-4
-          args: ["(?i)\\sEP.?\\s(\\d{1,2})[\\s-](E?\\s?\\d{1,2})\\s", " E$1-$2 "]
-        - name: re_replace
-          args: ["(?i)HDTVRIP", "HDTV"]
-    details:
-      selector: a[href*="index.php?topic="]
-      attribute: href
-    download:
-      selector: a[href*="index.php?topic="]
-      attribute: href
-    date_today:
-      # Today at 18:31:59
-      # Oggi alle 18:31:59
-      selector: span.smalltext em:contains("Today"),  span.smalltext em:contains("Oggi")
-      optional: true
-      filters:
-        - name: replace
-          args: ["Today at", "Today"]
-        - name: replace
-          args: ["Oggi alle", "Today"]
-    date_year:
-      # 11 January 2021, 10:59:53
-      # 11 Gennaio 2021, 10:59:53
-      selector: span.smalltext em:not(:contains("Today")):not(:contains("Oggi"))
-      optional: true
-      filters:
-        - name: replace
-          args: ["Gennaio", "January"]
-        - name: replace
-          args: ["Febbraio", "February"]
-        - name: replace
-          args: ["Marzo", "March"]
-        - name: replace
-          args: ["Aprile", "April"]
-        - name: replace
-          args: ["Maggio", "May"]
-        - name: replace
-          args: ["Giugno", "June"]
-        - name: replace
-          args: ["Luglio", "July"]
-        - name: replace
-          args: ["Agosto", "August"]
-        - name: replace
-          args: ["Settembre", "September"]
-        - name: replace
-          args: ["Ottobre", "October"]
-        - name: replace
-          args: ["Novembre", "November"]
-        - name: replace
-          args: ["Dicembre", "December"]
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "02 January 2006, 15:04:05 -07:00"
-    date:
-      text: "{{ if or .Result.date_today .Result.date_year }}{{ or .Result.date_today .Result.date_year }}{{ else }}now{{ end }}"
-    size:
-      text: 512 MB
-    poster:
-      selector: img.bbc_img
-      attribute: src
-      filters:
-        - name: replace
-          args: ["https://www.icv-crew.com/forum/proxy.php?request=", ""]
-        - name: urldecode
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# SMF 2.0.15

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

@@ -94,13 +94,13 @@ search:
     download:
       selector: a[href^="torrents.php?action=download&id="]
       attribute: href
-    tags:
+    _tags:
       selector: div.tags
     description:
       selector: td.edition_info
       filters:
         - name: append
-          args: "</br>{{ .Result.tags }}"
+          args: "</br>{{ .Result._tags }}"
     files:
       selector: td:nth-last-child(7)
     date:

src/Jackett.Common/Definitions/internetarchive.yml

@@ -78,17 +78,17 @@ search:
       selector: mediatype
     title:
       selector: title
-    id:
+    _id:
       selector: identifier
     details:
-      text: "details/{{ .Result.id }}"
+      text: "details/{{ .Result._id }}"
     download:
-      text: "download/{{ .Result.id }}/{{ .Result.id }}_archive.torrent"
-    btih:
+      text: "download/{{ .Result._id }}/{{ .Result._id }}_archive.torrent"
+    _btih:
       selector: btih
       optional: true
     infohash:
-      text: "{{ if .Config.noMagnet }}{{ else }}{{ .Result.btih }}{{ end }}"
+      text: "{{ if .Config.noMagnet }}{{ else }}{{ .Result._btih }}{{ end }}"
     date:
       # 2021-10-25T16:44:43Z
       selector: publicdate

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

@@ -39,12 +39,15 @@ search:
       selector: img
       attribute: data-src
     date:
-      selector: p.is-6 a
+      selector: img
+      attribute: data-src
       filters:
+        - name: regexp
+          args: (/\d{4}/\d{2}/)
         - name: append
           args: " -07:00" # PDT
         - name: dateparse
-          args: "Jan. 02, 2006 -07:00"
+          args: "/2006/01/ -07:00"
     size:
       selector: span.is-size-6
     seeders:

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

@@ -88,11 +88,11 @@ search:
     year:
       selector: a[href$="search_type=year"]
       optional: true
-    flag:
+    _flag:
       selector: a[href^="browse.php?country="] img
       attribute: title
       optional: true
-    filename:
+    _filename:
       selector: a[href^="/down.php/"]
       attribute: href
       filters:
@@ -104,7 +104,7 @@ search:
       selector: a[href^="details.php?id="]
       filters:
         - name: append
-          args: " {{ .Result.year }} {{ .Result.flag }} [{{ .Result.filename }}]"
+          args: " {{ .Result.year }} {{ .Result._flag }} [{{ .Result._filename }}]"
     details:
       selector: a[href^="details.php?id="]
       attribute: href
@@ -131,21 +131,21 @@ search:
       selector: td:nth-child(13)
     leechers:
       selector: td:nth-child(14)
-    subs:
+    _subs:
       selector: span:contains("Subs:")
       optional: true
-    genre:
+    _genre:
       selector: td:nth-child(5)
       optional: true
       filters:
         - name: prepend
           args: "Genre: "
-    mom:
+    _mom:
       selector: img[title^="CURRENT"]
       attribute: title
       optional: true
     description:
-      text: "{{ .Result.subs }} {{ .Result.genre }}{{ if .Result.mom }} Current MoM{{ else }}{{ end }}"
+      text: "{{ .Result._subs }} {{ .Result._genre }}{{ if .Result._mom }} Current MoM{{ else }}{{ end }}"
     downloadvolumefactor:
       case:
         "span:contains(\"Freeleech\")": 0