tvroad: code clean up

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

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

.github/ISSUE_TEMPLATE/indexer-request.yml

@@ -2,6 +2,13 @@ name: Indexer request
 description: Suggest a new indexer for this project
 title: "[req]: "
 body:
+- type: checkboxes
+  attributes:
+    label: Have you read our Contributing Guidelines?
+    description: Please read our <a href="https://github.com/Jackett/Jackett/wiki/How-to-request-a-new-tracker">Contributing Guidelines</a> before submitting your request.
+    options:
+      - label: I have read the Contributing Guidelines
+        required: true
 - type: checkboxes
   attributes:
     label: Is there already a request for your tracker?

.github/dependabot.yml

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

.github/workflows/winget.yml

@@ -0,0 +1,12 @@
+name: Publish to WinGet
+on:
+  release:
+    types: [released]
+jobs:
+  publish:
+    runs-on: windows-latest
+    steps:
+      - uses: vedantmgoyal2009/winget-releaser@latest
+        with:
+          identifier: Jackett.Jackett
+          token: ${{ secrets.WINGET }}

Installer.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Jackett"
-#define MyAppVersion GetFileVersion(MyFileForVersion)
+; #define MyAppVersion GetFileVersion(MyFileForVersion) (passed as a parameter)
 #define MyAppPublisher "Jackett"
 #define MyAppURL "https://github.com/Jackett/Jackett"
 #define MyAppExeName "JackettTray.exe"

README.md

@@ -27,7 +27,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 
  * ØMagnet
  * 1337x
- * 24rolika
  * ACG.RIP
  * ACGsou (36DM)
  * Anidex
@@ -46,6 +45,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BT.etree
  * BT4G
  * BTDIGG
+ * BTMET
+ * BTmirror
  * BTSOW
  * Byrutor
  * comicat
@@ -80,8 +81,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Isohunt2
  * iTorrent
  * JAV-Torrent
- * kickasstorrents.ws
  * kickasstorrents.to
+ * kickasstorrents.ws
+ * Knaben
  * Legit Torrents
  * LePorno.info
  * LimeTorrents
@@ -89,7 +91,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * LinuxTracker
  * Mac Torrents Download
  * MegaPeer
- * MejorTorrent
  * Mikan
  * MioBT
  * MixTapeTorrent
@@ -103,6 +104,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * NNTT
  * NoNaMe Club (NNM-Club)
  * Nyaa.si
+ * OnceSearch
  * OneJAV
  * OpenSharing
  * OxTorrent
@@ -129,6 +131,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Seedoff
  * seleZen
  * Sexy-Pics
+ * Shana Project
  * ShizaProject
  * ShowRSS
  * Solid Torrents
@@ -170,7 +173,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * YourBittorrent
  * YTS.ag
  * zetorrents
- * Zooqle
 </details>
 
 <details> <summary> <b> Supported Semi-Private Trackers </b> </summary>
@@ -206,11 +208,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Kinozal
  * LostFilm.tv
  * Magnetico (Local DHT) [[site](https://github.com/boramalper/magnetico)]
- * MVGroup Forum
- * MVGroup Main
  * Marine Tracker
  * Metal Tracker
  * MuziekFrabriek
+ * MVGroup Forum
+ * MVGroup Main
  * NetHD (VietTorrent)
  * PornoLab
  * PussyTorrents
@@ -219,8 +221,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * RiperAM
  * RockBox
  * RUDUB (ex-BaibaKoTV)
- * RuTracker
  * Rustorka
+ * RuTracker
+ * SATClubbing
  * Sharewood
  * SkTorrent
  * SkTorrent-org
@@ -252,17 +255,16 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Aftershock
  * Aidoru!Online
  * Aither
- * Alleen Retail
  * AlphaRatio (AR)
  * AmigosShareClub
  * anasch.cc
  * AnimeBytes (AB)
- * AnimeItalia
  * AnimeTorrents (AnT) [![(invite needed)][inviteneeded]](#)
  * AnimeWorld [![(invite needed)][inviteneeded]](#)
  * Anthelion
  * Araba Fenice (Phoenix) [![(invite needed)][inviteneeded]](#)
  * ArabP2P
+ * aro.lol
  * AsianCinema
  * Audiences
  * AudioNews (AN)
@@ -310,10 +312,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * CHDBits [![(invite needed)][inviteneeded]](#)
  * ChileBT
  * Cinecalidad
- * CinemaMovieS_ZT
- * CinemaZ (EuTorrents)
  * Cinemageddon [![(invite needed)][inviteneeded]](#)
+ * CinemaMovieS_ZT
  * Cinematik [![(invite needed)][inviteneeded]](#)
+ * CinemaZ (EuTorrents)
  * Classix [![(invite needed)][inviteneeded]](#)
  * Coastal-Crew
  * Concertos
@@ -362,12 +364,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * GigaTorrents
  * GimmePeers (formerly ILT) [![(invite needed)][inviteneeded]](#)
  * GiroTorrent
+ * GreatPosterWall (GPW)
  * GreekDiamond
  * Greek Team
  * HaiDan
  * Haitang
  * HappyFappy
- * Hawke-uno [![(invite needed)][inviteneeded]](#)
+ * Hawke-uno
  * HD Dolby
  * HD-Bits.com [![(invite needed)][inviteneeded]](#)
  * HD-Forever (HDF)
@@ -396,19 +399,16 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDU
  * HDZone
  * Hebits
- * HellasTZ
- * Hidden-Palace
  * House of Devil
  * HQSource (HQS)
  * Il Corsaro Verde
- * Indietorrents [![(invite needed)][inviteneeded]](#)
- * IPTorrents (IPT)
  * ImmortalSeed (iS)
- * Immortuos [![(invite needed)][inviteneeded]](#)
+ * Immortuos
+ * Indietorrents [![(invite needed)][inviteneeded]](#)
  * Insane Tracker
  * IPTorrents (IPT)
  * JME-REUNIT3D
- * JPopsuki [![(invite needed)][inviteneeded]](#)
+ * JPopsuki
  * JPTV
  * Karagarga
  * Keep Friends [![(invite needed)][inviteneeded]](#)
@@ -447,6 +447,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Moviesite
  * MyAnonamouse (MAM)
  * MySpleen [![(invite needed)][inviteneeded]](#)
+ * NBTorrents
  * NCore
  * Nebulance (NBL) (TransmiTheNet)
  * NetCosmo
@@ -467,12 +468,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Peers.FM
  * Pirata Digital
  * PirateTheNet (PTN)
+ * Pixelados
  * PixelCove (Ultimate Gamer)
  * PiXELHD (PxHD) [![(invite needed)][inviteneeded]](#)
  * PolishSource (PS)
  * PolishTracker
- * PornBits (PB)
  * Pornbay [![(invite needed)][inviteneeded]](#)
+ * PornBits (PB)
  * PotUK
  * Pretome
  * PrivateHD (PHD)
@@ -492,9 +494,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * R3V WTF! [![(invite needed)][inviteneeded]](#)
  * Racing4Everyone (R4E)
  * RacingForMe (RFM)
- * RedBits
  * Red Star Torrent (RST) [![(invite needed)][inviteneeded]](#)
  * Redacted (PassTheHeadphones)
+ * RedBits
  * Resurrect The Net
  * RetroFlix
  * RevolutionTT
@@ -505,9 +507,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * SceneRush
  * SceneTime
  * SDBits [![(invite needed)][inviteneeded]](#)
- * GreatPosterWall (GPW)
  * Secret Cinema
- * SeedFile (SF)
  * Shareisland
  * Shazbat [![(invite needed)][inviteneeded]](#)
  * SiamBIT
@@ -536,8 +536,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TEKNO3D [![(invite needed)][inviteneeded]](#)
  * TellyTorrent
  * teracod (Movie Zone)
- * The-Crazy-Ones
- * The-New-Fun
  * The Falling Angels (TFA) [![(invite needed)][inviteneeded]](#)
  * The Geeks
  * The Horror Charnel (THC)
@@ -547,6 +545,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * The Shinning (TsH)
  * The Show
  * The Vault [![(invite needed)][inviteneeded]](#)
+ * The-Crazy-Ones
+ * The-New-Fun
  * TheAudioScene
  * TheEmpire (TE)
  * TheLeachZone (TLZ)
@@ -554,7 +554,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TJUPT
  * TLFBits [![(invite needed)][inviteneeded]](#)
  * TmGHuB
- * ToTheGlory (TTG) [![(invite needed)][inviteneeded]](#)
  * Torrent Network (TN)
  * Torrent Sector Crew (TSC)
  * Torrent Surf
@@ -569,13 +568,14 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Torrentech (TTH)
  * TorrentHeaven [![(invite needed)][inviteneeded]](#)
  * TorrentHR [![(invite needed)][inviteneeded]](#)
- * Torrenting (TT) [![(invite needed)][inviteneeded]](#)
- * TotallyKids (TK)
+ * Torrenting (TT)
  * Torrentland
  * TorrentLeech (TL)
  * TorrentLeech.pl
  * TorrentMasters
  * TorrentSeeds (TS)
+ * TotallyKids (TK)
+ * ToTheGlory (TTG) [![(invite needed)][inviteneeded]](#)
  * TranceTraffic [![(invite needed)][inviteneeded]](#)
  * Trezzor [![(invite needed)][inviteneeded]](#)
  * TurkSeed
@@ -598,9 +598,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * x-ite.me (XM)
  * xBytesV2
  * XSpeeds (XS)
+ * Xthor
  * XWT-Classics
  * XWTorrents (XWT)
- * Xthor
  * YDYPT
  * Zamunda.net
  * Zelka.org
@@ -627,7 +627,7 @@ To get all Jackett indexers including their capabilities you can use `t=indexers
 ### Filter indexers
 
 Another special "filter" indexer is available at `/api/v2.0/indexers/<filter>/results/torznab`
-It will query the configured indexers that match the `<filter>` expression criterias and return the combined results as "all".
+It will query the configured indexers that match the `<filter>` expression criteria and return the combined results as "all".
 
 Supported filters
 Filter | Condition

azure-pipelines.yml

@@ -266,7 +266,7 @@ stages:
               script: >
                 iscc.exe $(Build.SourcesDirectory)/Installer.iss
                 /O"$(Build.ArtifactStagingDirectory)"
-                /DMyFileForVersion=$(Build.BinariesDirectory)/Jackett/Jackett.Common.dll
+                /DMyAppVersion=$(jackettVersion)
                 /DMySourceFolder=$(Build.BinariesDirectory)/Jackett
                 /DMyOutputFilename=Jackett.Installer.Windows
 

src/Jackett.Common/Content/custom.css

@@ -309,6 +309,10 @@ table td.fit{
     background-color: #86cca8;
 }
 
+.label-douban {
+    background-color: #86cc10;
+}
+
 .tooltip {
     pointer-events: none;
 }

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,7 @@ function updateReleasesRow(row) {
     var IMDBId = $(row).data("imdb");
     var TMDBId = $(row).data("tmdb");
     var TVDBId = $(row).data("tvdb");
+    var DoubanId = $(row).data("douban");
     var Poster = $(row).data("poster");
     var Description = $(row).data("description");
     var DownloadVolumeFactor = parseFloat($(row).find("td.DownloadVolumeFactor").html());
@@ -1010,6 +1011,10 @@ 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 (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>');
+    }
+
     if (!isNaN(DownloadVolumeFactor)) {
         if (DownloadVolumeFactor == 0) {
             labels.append('\n<span class="label label-success">FREELEECH</span>');

src/Jackett.Common/Content/custom_mobile.css

@@ -292,6 +292,10 @@ table td.fit{
     background-color: #86cca8;
 }
 
+.label-douban {
+    background-color: #86cc10;
+}
+
 .tooltip {
     pointer-events: none;
 }

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=202204251" media="only screen and (min-device-width: 480px)">
-    <link rel="stylesheet" type="text/css" href="../custom_mobile.css?changed=202204251" media="only screen and (max-device-width: 480px)">
+    <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="../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">
@@ -458,7 +458,7 @@
                             </thead>
                             <tbody>
                                 {{#each releases}}
-                                <tr class="jackett-releases-row" data-imdb="{{Imdb}}" data-tmdb="{{TMDb}}" data-tvdb="{{TVDBId}}" data-poster="{{Poster}}" data-description="{{Description}}">
+                                <tr class="jackett-releases-row" data-imdb="{{Imdb}}" data-tmdb="{{TMDb}}" data-tvdb="{{TVDBId}}" 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-poster="{{Poster}}" data-description="{{Description}}">
+                <tr class="jackett-search-results-row" data-imdb="{{Imdb}}" data-tmdb="{{TMDb}}" data-tvdb="{{TVDBId}}" 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=20220426"></script>
+    <script type="text/javascript" src="../custom.js?changed=20220606"></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=202204251" rel="stylesheet">
+    <link href="../custom.css?changed=20220512" rel="stylesheet">
 
     <title>Jackett</title>
 </head>

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

@@ -12,12 +12,10 @@ links:
   - https://x1337x.ws/
   - https://x1337x.eu/
   - https://x1337x.se/
-  - https://1337x.unblockit.llc/
+  - https://1337x.unblockit.name/
   - https://1337x.nocensor.sbs/
+  - https://1337x.unblockninja.com/
 legacylinks:
-  - https://1337x.unblockit.dev/
-  - https://1337x.unblockit.ltd/
-  - https://1337x.unblockit.link/
   - https://1337x.unblockit.buzz/
   - https://1337x.unblocked.monster/
   - https://1337x.unblockit.club/
@@ -37,6 +35,8 @@ legacylinks:
   - https://1337x.nocensor.biz/
   - https://1337x.gd/
   - https://1337x.unblockit.day/
+  - https://1337x.unblockit.llc/
+  - https://1337x.unblockit.blue/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/24rolika.yml

@@ -1,138 +0,0 @@
----
-id: 24rolika
-name: 24rolika
-description: "24rolika is a RUSSIAN Public Torrent Tracker for 3X"
-language: ru-RU
-type: public
-encoding: UTF-8
-links:
-  - http://24rolika.ru/ # does not support https
-
-caps:
-  categorymappings:
-    # only subcategories of Порно фильмы (Movies) have torrents
-    - {id: 94, cat: XXX, desc: "4K порно фильмы", default: true}
-    - {id: 76, cat: XXX, desc: "Японские порно фильмы", default: true}
-    - {id: 81, cat: XXX, desc: "Бразильские порно фильмы", default: true}
-    - {id: 41, cat: XXX, desc: "Итальянские порно фильмы", default: true}
-    - {id: 42, cat: XXX, desc: "Американские порно фильмы", default: true}
-    - {id: 43, cat: XXX, desc: "Немецкие порно фильмы", default: true}
-    - {id: 44, cat: XXX, desc: "Французские порно фильмы", default: true}
-    - {id: 45, cat: XXX, desc: "Русские порно фильмы", default: true}
-    - {id: 47, cat: XXX, desc: "Порно фильмы 2018 года", default: true}
-    - {id: 75, cat: XXX, desc: "Порно фильмы 2019 года", default: true}
-    - {id: 92, cat: XXX, desc: "Порно фильмы 2020 года", default: true}
-    - {id: 93, cat: XXX, desc: "Порно фильмы 2021 года", default: true}
-    - {id: 48, cat: XXX, desc: "Ретро / Классика", default: true}
-    - {id: 49, cat: XXX, desc: "С русским переводом", default: true}
-    - {id: 82, cat: XXX, desc: "С сюжетом", default: true}
-    - {id: 91, cat: XXX, desc: "Пародии", default: true}
-    - {id: 51, cat: XXX, desc: "Brazzers", default: true}
-    - {id: 52, cat: XXX, desc: "BangBros", default: true}
-    - {id: 53, cat: XXX, desc: "Marc Dorcel", default: true}
-    - {id: 54, cat: XXX, desc: "Evil Angel", default: true}
-    - {id: 55, cat: XXX, desc: "Tushy", default: true}
-    - {id: 56, cat: XXX, desc: "Blacked", default: true}
-    - {id: 57, cat: XXX, desc: "Evil Playgrounds", default: true}
-    - {id: 58, cat: XXX, desc: "Reality Kings", default: true}
-    - {id: 59, cat: XXX, desc: "New Sensations", default: true}
-    - {id: 60, cat: XXX, desc: "Wicked Pictures", default: true}
-    - {id: 61, cat: XXX, desc: "21Sextury", default: true}
-    - {id: 62, cat: XXX, desc: "PornPros", default: true}
-    - {id: 63, cat: XXX, desc: "Private", default: true}
-    - {id: 64, cat: XXX, desc: "DD Busty", default: true}
-    - {id: 65, cat: XXX, desc: "Naughty America", default: true}
-    - {id: 66, cat: XXX, desc: "Third Degree Films", default: true}
-    - {id: 67, cat: XXX, desc: "Hustler", default: true}
-    - {id: 68, cat: XXX, desc: "Blacks on Blondes", default: true}
-    - {id: 69, cat: XXX, desc: "Team Skeet", default: true}
-    - {id: 70, cat: XXX, desc: "Mofos", default: true}
-    - {id: 71, cat: XXX, desc: "Vixen", default: true}
-    - {id: 72, cat: XXX, desc: "Jules Jordan", default: true}
-    - {id: 73, cat: XXX, desc: "Nubile Films", default: true}
-    - {id: 74, cat: XXX, desc: "Digital Playground", default: true}
-    - {id: 83, cat: XXX, desc: "Zero Tolerance", default: true}
-    - {id: 84, cat: XXX, desc: "Pure Taboo", default: true}
-    - {id: 85, cat: XXX, desc: "Devil's Film", default: true}
-    - {id: 86, cat: XXX, desc: "Sweet Sinner", default: true}
-    - {id: 87, cat: XXX, desc: "Penthouse", default: true}
-    - {id: 88, cat: XXX, desc: "Elegant Angel", default: true}
-    - {id: 89, cat: XXX, desc: "Digital Sin", default: true}
-
-  modes:
-    search: [q]
-
-settings:
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: date
-    options:
-      date: created
-      title: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-
-download:
-  selectors:
-    - selector: a[href*="index.php?do=download&id="]
-      attribute: href
-
-search:
-  paths:
-    - path: index.php
-  inputs:
-    $raw: "{{ range .Categories }}catlist[]={{.}}&{{end}}"
-    do: search
-    subaction: search
-    search_start: 0
-    full_search: 1
-    result_from: 1
-    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
-    # 0 in article 1 in comments 2 in static pages 3 in article titles
-    titleonly: 3
-    sortby: "{{ .Config.sort }}"
-    resorder: "{{ .Config.type }}"
-    showposts: 0
-
-  headers:
-    Referer: ["{{ .Config.sitelink }}"]
-
-  rows:
-    selector: article.shortstory
-
-  fields:
-    category:
-      text: 94
-    title:
-      selector: h2.short_title a
-    details:
-      selector: h2.short_title a
-      attribute: href
-    download:
-      selector: h2.short_title a
-      attribute: href
-    poster:
-      selector: img
-      attribute: src
-    date:
-      text: now
-    size:
-      text: "512 MB"
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    description:
-      selector: div.video_time
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# DataLife

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.0.7
+# json UNIT3D 6.2.0

src/Jackett.Common/Definitions/alleenretail.yml

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

src/Jackett.Common/Definitions/anaschcc.yml

@@ -109,11 +109,7 @@ search:
       attribute: onmouseover
       filters:
         - name: replace
-          args: ["javascript:ShowImage('/images/imdb/", "tt"]
-        - name: replace
-          args: [".jpg')", ""]
-        - name: replace
-          args: ["tt0000000", ""]
+          args: ["javascript:ShowImage('/images/imdb/tt0000000.jpg')", ""]
     poster:
       selector: td a[href^="index.php?page=torrent-details"]
       attribute: onmouseover

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

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

src/Jackett.Common/Definitions/arabp2p.yml

@@ -7,6 +7,7 @@ type: private
 encoding: UTF-8
 links:
   - https://www.arabp2p.com/
+  - https://www.arabp2p.net/
 legacylinks:
   - http://www.arabp2p.com/
 

src/Jackett.Common/Definitions/asiancinema.yml

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

src/Jackett.Common/Definitions/audiences.yml

@@ -109,6 +109,9 @@ search:
     imdbid:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
+    doubanid:
+      selector: a[href*="movie.douban.com/subject/"]
+      attribute: href
     date_elapsed:
       # time type: time elapsed (default)
       selector: td:nth-child(4) > span[title]

src/Jackett.Common/Definitions/audiobookbay.yml

@@ -9,13 +9,9 @@ links:
   - http://audiobookbay.fi/ # site forces http, does not support https
   - http://audiobookbay.se/
   - http://audiobookbayabb.com/
-  - https://audiobookbay.unblockit.llc/
+  - https://audiobookbay.unblockit.name/
 legacylinks:
   - https://audiobookbay.la/
-  - https://audiobookbay.unblockit.app/
-  - https://audiobookbay.unblockit.dev/
-  - https://audiobookbay.unblockit.ltd/
-  - https://audiobookbay.unblockit.link/
   - https://audiobookbay.unblockit.buzz/
   - https://audiobookbay.unblockit.club/
   - https://audiobookbay.unblockit.onl/
@@ -31,7 +27,10 @@ legacylinks:
   - http://audiobookbay.ws/
   - https://audiobookbay.unblockit.how/
   - https://audiobookbay.unblockit.cam/
+  - https://audiobookbay.unblockit.biz/
   - https://audiobookbay.unblockit.day/
+  - https://audiobookbay.unblockit.llc/
+  - https://audiobookbay.unblockit.blue/
 
 caps:
   categorymappings:

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

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

src/Jackett.Common/Definitions/bitbazis.yml

@@ -65,6 +65,10 @@ settings:
     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: Filter freeleech only
+    default: false
   - name: sort
     type: select
     label: Sort requested from site
@@ -83,7 +87,7 @@ settings:
   - name: info_tpp
     type: info
     label: Results Per Page
-    default: For best results, change the <b>Torrentek száma egy oldalon:</b> setting to <b>100</b> on your account profile.
+    default: For best results, change the <b>Torrentek száma egy oldalon:</b> setting to <b>50</b> on your account profile.
 
 login:
   method: cookie
@@ -96,21 +100,28 @@ login:
 search:
   paths:
     - path: browse.php
+      categories: ["!", 33, 66, 99]
+      inputs:
+        # 0 all, 1 active, 2 deadonly, 3  myuploads, 4 zeroseed, 6 re-seeded
+        incldead: 0
+    - path: browse_xxx.php
+      categories: [33, 66, 99]
+      inputs:
+        # 0 active, 1 all, 2 deadonly, 3  myuploads, 4 zeroseed, 6 re-seeded
+        incldead: 1
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
-    # 0 active, 1 all, 2 deadonly, 3  myuploads, 4 zeroseed
-    incldead: 1
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
-    # site does not support imdbid searching or appear to have freeleech
+    # site does not support imdbid searching
 
   rows:
-    selector: table[width="100%"]:last-child tbody tr:has(a[href^="userdetails.php?id="]):has(a[href^="download.php?torrent="])
+    selector: "table[width=\"100%\"]:last-child tbody tr:has(div.tooltip){{ if .Config.freeleech }}:has(i:contains(\"(Free)\")){{ else }}{{ end }}"
 
   fields:
     category:
-      selector: a[href^="browse.php?cat="]
+      selector: a[href*=".php?cat="]
       attribute: href
       filters:
         - name: querystring
@@ -124,19 +135,43 @@ search:
     poster:
       selector: a.preview
       attribute: href
-    download:
+    download1:
       selector: a[href^="download.php?torrent="]
+      optional: true
       attribute: href
+    download2:
+      selector: input[onclick*="download.php?torrent="]
+      optional: true
+      attribute: onclick
+      filters:
+        - name: replace
+          args: ["window.open('", ""]
+        - name: replace
+          args: ["', '_self');", ""]
+    download:
+      text: "{{ if or .Result.download1 .Result.download2 }}{{ or .Result.download1 .Result.download2 }}{{ else }}{{ end }}"
     size:
       selector: td:nth-child(6)
-    date:
+    date_browse:
       # 2022<br>03/15.
-      selector: td:nth-child(7)
+      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 }}"
     grabs:
       selector: td:nth-child(5)
     seeders:

src/Jackett.Common/Definitions/bitru.yml

@@ -108,18 +108,16 @@ search:
         - name: replace
           args: ["details", "download"]
     description:
-      selector: img[src="styles/images/adwarn.png"]
-      optional: true
+      selector: i.fa-ad
       attribute: title
       filters:
         - name: replace
-          args: ["Присутствует реклама", "Contains Adverts"]
-    poster:
+          args: ["Присутствует реклама", "[Contains Adverts] "]
+    description|append:
       selector: a[href^="details.php?id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=(.*?) "
+    poster:
+      selector: div.it-image > img
+      attribute: src
     date_today:
       # Сегодня в 09:09 от
       # Вчера в 22:47 от

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"}
@@ -53,8 +55,14 @@ caps:
     - {id: 46, cat: Audio, desc: "Yab@ncı MüziK"}
     - {id: 21, cat: Audio/Video, desc: "Video Klipler"}
     - {id: 2, cat: Console, desc: "Oyun"}
-    - {id: 74, cat: PC/Games, desc: "PC"}
-    - {id: 73, cat: Console, desc: "SONY-PS"}
+    - {id: 74, cat: PC/Games, desc: "Oyun PC"}
+    - {id: 84, cat: Console/PS3, desc: "Oyun Playstation"}
+    - {id: 85, cat: Console/PS3, desc: "Oyun Playstation 2"}
+    - {id: 82, cat: Console/PSP, desc: " Oyun PSP"}
+    - {id: 83, cat: Console/Other, desc: "Oyun Gameboy"}
+    - {id: 87, cat: Console/XBox, desc: "Oyun XBOX"}
+    - {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: 47, cat: Other, desc: "Resimler"}
     - {id: 48, cat: TV, desc: "Televizyon"}

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

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

src/Jackett.Common/Definitions/boxingtorrents.yml

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

src/Jackett.Common/Definitions/btmet.yml

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

src/Jackett.Common/Definitions/btmirror.yml

@@ -0,0 +1,98 @@
+---
+id: btmirror
+name: BTmirror
+description: "BTmirror is a Public BitTorrent DHT search engine."
+language: en-US
+type: public
+encoding: UTF-8
+links:
+  - https://btsao.com/
+  - https://btmirror.unblockit.name/
+legacylinks:
+  - https://btmirror.unblockit.blue/
+
+caps:
+  categories:
+    Other: Other
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: info_8000
+    type: info
+    label: About BTmirror Categories
+    default: BTmirror does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: create_time
+    options:
+      relavance: relevance
+      create_time: created
+      length: size
+
+download:
+  infohash:
+    hash:
+      selector: p.magnet a
+      attribute: href
+      filters:
+        - name: regexp
+          args: ([A-F|a-f|0-9]{40})
+    title:
+      selector: p.magnet a
+      attribute: href
+      filters:
+        - name: regexp
+          args: "&dn=(.+?)$"
+        - name: validfilename
+
+search:
+  # https://btsao.com/en/search/2022/?c=&s=create_time
+  # returns 10 results per page
+  paths:
+    - path: "en/search/{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}/"
+    - path: "en/search/{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}/2"
+  inputs:
+    c: ""
+    s: "{{ .Config.sort }}"
+
+  rows:
+    selector: div.ssbox
+
+  fields:
+    category:
+      text: Other
+    title:
+      selector: h3
+    details:
+      selector: h3 a
+      attribute: href
+    download:
+      selector: h3 a
+      attribute: href
+    date:
+      selector: span:contains("date:") b
+      filters:
+        - name: dateparse
+          args: "2006-01-02"
+    size:
+      selector: span:contains("size:") b
+    files:
+      selector: span:contains("files:") b
+    grabs:
+      selector: span:contains("人气:") b
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine: n/a

src/Jackett.Common/Definitions/btnext.yml

@@ -208,9 +208,6 @@ search:
       # a href="http://tracker.btnext.com/data/torrents/imdb/tt0249677.jpg"
       selector: a[href*="/imdb/tt"]
       attribute: href
-      filters:
-        - name: regexp
-          args: tt(\d+)
     downloadvolumefactor:
       case:
         "img[title=\"FREE!\"]": 0

src/Jackett.Common/Definitions/byrutor.yml

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

src/Jackett.Common/Definitions/chilebt.yml

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

src/Jackett.Common/Definitions/coastalcrew.yml

@@ -10,7 +10,8 @@ links:
 
 caps:
   categorymappings:
-    - {id: 62, cat: Books, desc: "EBook"}
+    - {id: 62, cat: Books/EBook, desc: "EBook"}
+    - {id: 69, cat: Books/Mags, desc: "Zeitung"}
     - {id: 30, cat: TV/Anime, desc: "Filme - Animie"}
     - {id: 28, cat: Movies/BluRay, desc: "Filme - Bluray"}
     - {id: 31, cat: Movies/Other, desc: "Filme - Bollywood"}

src/Jackett.Common/Definitions/cpasbienclone.yml

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

src/Jackett.Common/Definitions/crazyhd.yml

@@ -90,13 +90,12 @@ caps:
     book-search: [q]
 
 settings:
-  - name: cookie
+  - name: username
     type: text
-    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+    label: Username
+  - name: password
+    type: password
+    label: Password
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -119,9 +118,14 @@ settings:
       1: asc
 
 login:
-  method: cookie
+  path: index.php
+  method: form
+  form: form[action="index.php?page=login"]
   inputs:
-    cookie: "{{ .Config.cookie }}"
+    uid: "{{ .Config.username }}"
+    pwd: "{{ .Config.password }}"
+  error:
+    - selector: td.lista span[style="color:#FF0000;"]
   test:
     path: index.php
     selector: a[href="logout.php"]

src/Jackett.Common/Definitions/crazyspirits.yml

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

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

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

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

@@ -16,6 +16,7 @@ caps:
     - {id: 28, cat: Movies/SD, desc: "Filme SD"}
     - {id: 32, cat: Movies/HD, desc: "Filme HD"}
     - {id: 114, cat: Movies/UHD, desc: "Filme UHD"}
+    - {id: 140, cat: Movies/BluRay, desc: "Filme BluRay"}
     - {id: 138, cat: Movies, desc: "Filme Pack`s"}
     # Serien
     - {id: 60, cat: TV/SD, desc: "Serien SD"}
@@ -218,4 +219,4 @@ search:
     minimumseedtime:
       # 2 days (as seconds = 2 x 24 x 60 x 60)
       text: 172800
-# engine n/a
+# 3xT

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

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

src/Jackett.Common/Definitions/demonoid.yml

@@ -11,15 +11,10 @@ links:
   - https://www.dnoid.to/
   - https://www.dnoid.pw/
   - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.ly/
-  - https://demonoid.unblockit.llc/
+  - https://demonoid.unblockit.name/
   - https://demonoid.torrentbay.to/
   - https://demonoid.nocensor.sbs/
 legacylinks:
-  - https://demonoid.unblockit.lat/
-  - https://demonoid.unblockit.app/
-  - https://demonoid.unblockit.dev/
-  - https://demonoid.unblockit.ltd/
-  - https://demonoid.unblockit.link/
   - https://demonoid.unblockit.buzz/
   - https://demonoid.unblockit.club/
   - https://demonoid.unblockit.onl/
@@ -36,6 +31,8 @@ legacylinks:
   - https://demonoid.unblockit.cam/
   - https://demonoid.nocensor.biz/
   - https://demonoid.unblockit.day/
+  - https://demonoid.unblockit.llc/
+  - https://demonoid.unblockit.blue/
 
 caps:
   categorymappings:

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

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

src/Jackett.Common/Definitions/dragonworldreloaded.yml

@@ -206,4 +206,4 @@ search:
     minimumseedtime:
       # 12 hours (as seconds = 12 x 60 x 60)
       text: 43200
-# engine n/a
+# 3xT

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

@@ -6,7 +6,7 @@ language: es-ES
 type: public
 encoding: UTF-8
 links:
-  - https://www.elitetorrent.dev/
+  - https://www.elitetorrent.com/
   - https://elitetorrent.nocensor.sbs/
 legacylinks:
   - https://www.elitetorrent.biz/
@@ -23,7 +23,6 @@ legacylinks:
   - https://vvww.elitetorrent.nl/
   - https://www.elitetorrent.to/
   - https://www.elitetorrent.se/
-  - https://www.elitetorrent.com/
   - https://elitetorrent.si/
   - https://elitetorrent.nocensor.work/
   - https://elitetorrent.com/
@@ -31,6 +30,7 @@ legacylinks:
   - https://elitetorrent.nocensor.biz/
   - https://elitetorrent.la/
   - https://www.elitetorrent.wtf/
+  - https://www.elitetorrent.dev/
 
 caps:
   categories:

src/Jackett.Common/Definitions/esharenet.yml

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

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

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

src/Jackett.Common/Definitions/eztv.yml

@@ -11,8 +11,9 @@ links:
   - https://eztv.wf/
   - https://eztv.tf/
   - https://eztv.yt/
+  - https://eztv1.xyz/
   - https://eztv.unblockninja.com/
-  - https://eztv.unblockit.llc/
+  - https://eztv.unblockit.name/
   - https://eztv.nocensor.sbs/
 legacylinks:
   - https://eztv.ag/ # redirects to .re
@@ -36,6 +37,8 @@ legacylinks:
   - https://eztv.unblockit.cam/
   - https://eztv.nocensor.biz/
   - https://eztv.unblockit.day/
+  - https://eztv.unblockit.llc/
+  - https://eztv.unblockit.blue/
 
 caps:
   categories:

src/Jackett.Common/Definitions/fantasticheaven.yml

@@ -10,85 +10,54 @@ links:
 
 caps:
   categorymappings:
-    - {id: 54, cat: Movies/SD, desc: "kino SD x264/x265"}
-    - {id: 56, cat: Movies/HD, desc: "kino 720p"}
-    - {id: 57, cat: Movies/HD, desc: "kino 1080p"}
-    - {id: 100, cat: Movies/3D, desc: "kino 3D"}
-    - {id: 58, cat: Movies/SD, desc: "Filme SD x264/x265"}
+    - {id: 58, cat: Movies/SD, desc: "Filme SD"}
     - {id: 59, cat: Movies/HD, desc: "Filme 720p"}
     - {id: 60, cat: Movies/HD, desc: "Filme 1080p"}
     - {id: 61, cat: Movies/UHD, desc: "Filme 2160p"}
-    - {id: 62, cat: Movies/3D, desc: "Filme 3D"}
+    - {id: 170, cat: Movies/BluRay, desc: "Filme Bluray"}
     - {id: 101, cat: Movies/DVD, desc: "Filme DVD"}
-    - {id: 63, cat: Movies/HD, desc: "Filme Remux"}
-    - {id: 129, cat: Movies/SD, desc: "Filme Packs SD x264/265"}
+    - {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: 64, cat: TV/SD, desc: "Serien SD x264/x265"}
+    - {id: 159, 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: 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"}
+    - {id: 179, cat: Movies/UHD, desc: "Film-Klassiker Pack 2160p"}
+    - {id: 64, cat: TV/SD, desc: "Serien SD"}
     - {id: 65, cat: TV/HD, desc: "Serien 720p"}
     - {id: 66, cat: TV/HD, desc: "Serien 1080p"}
     - {id: 68, cat: TV/UHD, desc: "Serien 2160p"}
     - {id: 69, cat: TV/Foreign, desc: "Serien Ger-Subbed"}
-    - {id: 70, cat: TV/Foreign, desc: "Serien International"}
-    - {id: 76, cat: TV/SD, desc: "Serienpacks SD x264/x265"}
+    - {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: 80, cat: TV/Foreign, desc: "Serienpacks International"}
-    - {id: 115, cat: Movies/SD, desc: "Kids-Filme SD x264/x265"}
-    - {id: 116, cat: Movies/HD, desc: "Kids-Filme 720p"}
-    - {id: 117, cat: Movies/HD, desc: "Kids-Filme 1080p"}
-    - {id: 109, cat: TV/SD, desc: "Kids-Serien SD x264/x265"}
-    - {id: 110, cat: TV/HD, desc: "Kids-Serien 720p"}
-    - {id: 111, cat: TV/HD, desc: "Kids-Serien 1080p"}
-    - {id: 112, cat: TV/SD, desc: "Kids-Serien Packs SD"}
-    - {id: 113, cat: TV/HD, desc: "Kids-Serien Packs 720p"}
-    - {id: 114, cat: TV/HD, desc: "Kids-Serien Packs 1080p"}
-    - {id: 127, cat: TV/Foreign, desc: "Kids-Serien International"}
-    - {id: 98, cat: TV/SD, desc: "Tatort SD x264/x265"}
-    - {id: 99, cat: TV/HD, desc: "Tatort 720p"}
-    - {id: 105, cat: TV/SD, desc: "Daily Soaps SD x264/x265"}
-    - {id: 103, cat: TV/HD, desc: "Daily Soaps 720p"}
-    - {id: 104, cat: TV/HD, desc: "Daily Soaps 1080p"}
-    - {id: 106, cat: TV/Documentary, desc: "Dokus SD x264/x265"}
-    - {id: 107, cat: TV/Documentary, desc: "Dokus 720p"}
-    - {id: 108, cat: TV/Documentary, desc: "Dokus 1080p"}
-    - {id: 83, cat: Movies/SD, desc: "TV-Filme SD x264/x265"}
-    - {id: 84, cat: Movies/HD, desc: "TV-Filme 720p"}
-    - {id: 85, cat: Movies/HD, desc: "TV-Filme 1080p"}
-    - {id: 86, cat: TV/SD, desc: "TV-Shows SD x264/x265"}
-    - {id: 87, cat: TV/HD, desc: "TV-Shows 720p"}
-    - {id: 88, cat: TV/HD, desc: "TV-Shows 1080p"}
-    - {id: 118, cat: TV/Sport, desc: "SportSD x264/x265"}
-    - {id: 119, cat: TV/Sport, desc: "Sport720p"}
-    - {id: 120, cat: TV/Sport, desc: "Sport1080p"}
-    - {id: 122, cat: TV/Sport, desc: "Sport2160p"}
-    - {id: 121, cat: TV/Sport, desc: "SportInternational"}
-    - {id: 82, cat: Audio/Audiobook, desc: "Audio Audiobooks"}
     - {id: 71, cat: Audio/MP3, desc: "Audio MP3"}
     - {id: 72, cat: Audio/Lossless, desc: "Audio Flac"}
-    - {id: 135, cat: Audio/Lossless, desc: "Audio WAV"}
-    - {id: 73, cat: Audio/MP3, desc: "Audio MP3 Packs"}
-    - {id: 74, cat: Audio/Lossless, desc: "Audio Flac Packs"}
-    - {id: 128, cat: Audio, desc: "Audio Kids"}
-    - {id: 75, cat: Audio/Video, desc: "Audio Musikvideo"}
+    - {id: 73, cat: Audio, desc: "Audio Packs"}
+    - {id: 153, cat: Audio/Audiobook, desc: "Hörbücher"}
     - {id: 123, cat: PC, desc: "Software Windows"}
-    - {id: 124, cat: PC, desc: "Software Linux"}
-    - {id: 125, cat: PC/Mobile-Android, desc: "Software Android"}
-    - {id: 126, cat: PC/Mac, desc: "Software MacOS"}
+    - {id: 166, cat: PC/Mac, desc: "Software Sonstiges"}
     - {id: 132, cat: PC/Games, desc: "Spiele Windows"}
-    - {id: 133, cat: PC/Mac, desc: "Spiele MacOS"}
-    - {id: 134, cat: Console, desc: "Spiele Nintendo"}
-    - {id: 90, cat: Books/Mags, desc: "Diverses Zeitschriften"}
-    - {id: 89, cat: Books/EBook, desc: "Diverses E-Books"}
-    - {id: 91, cat: XXX/x264, desc: "XXX SD x264/x265"}
+    - {id: 150, cat: PC/Mac, desc: "Spiele Sonstiges"}
+    - {id: 90, cat: Books/Mags, desc: "Zeitschriften"}
+    - {id: 89, cat: Books/EBook, desc: "E-Books"}
+    - {id: 91, cat: XXX/SD, desc: "XXX SD"}
     - {id: 92, cat: XXX/x264, desc: "XXX 720p"}
     - {id: 93, cat: XXX/x264, desc: "XXX 1080p"}
-    - {id: 95, cat: XXX/Pack, desc: "XXX Packs SD"}
-    - {id: 96, cat: XXX/Pack, desc: "XXX Packs HD"}
+    - {id: 171, cat: XXX/Pack, desc: "XXX Packs"}
     - {id: 94, cat: XXX/ImageSet, desc: "XXX Magazine"}
-    - {id: 97, cat: XXX/ImageSet, desc: "XXX Pics"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/finvip.yml

@@ -134,12 +134,9 @@ search:
       selector: td a[href^="index.php?page=downloadcheck"]
       attribute: href
     imdbid:
+      # javascript:popdetails('http://www.imdb.com/title/tt10209130');
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
-      filters:
-        # javascript:popdetails('http://www.imdb.com/title/tt10209130');
-        - name: regexp
-          args: tt(\d+)
     size:
       selector: td:nth-last-child(1)
     leechers:

src/Jackett.Common/Definitions/fouducinema.yml

@@ -6,57 +6,56 @@ language: fr-FR
 type: private
 encoding: UTF-8
 links:
+  - https://fou-du-cinema.ca/
+legacylinks:
   - https://fou-du-cinema.net/
 
 caps:
   categorymappings:
-    - {id: 28, cat: PC, desc: "App: Linux"}
-    - {id: 18, cat: PC/0day, desc: "Apps: PC"}
-    - {id: 19, cat: PC/Mac, desc: "Apps: Mac"}
-    - {id: 54, cat: Books/Comics, desc: "BD: bande dessinée"}
-    - {id: 9, cat: TV/Documentary, desc: "Documentaries: All"}
-    - {id: 22, cat: Movies/DVD, desc: "FILM: DVD"}
-    - {id: 23, cat: Movies/UHD, desc: "FILM: 4K et plus"}
-    - {id: 24, cat: XXX, desc: "FILM: XXX"}
-    - {id: 25, cat: Movies/HD, desc: "FILM: HD 720p"}
-    - {id: 26, cat: Movies/HD, desc: "FILM: HD 1080p"}
-    - {id: 27, cat: Movies/HD, desc: "FILM: HDRip"}
-    - {id: 47, cat: Movies/HD, desc: "FILM: MHD"}
-    - {id: 43, cat: Movies/BluRay, desc: "FILM: BD-Rip"}
-    - {id: 34, cat: Movies/WEB-DL, desc: "FILM: Webrip"}
-    - {id: 14, cat: Movies/WEB-DL, desc: "FILM: WebRip-DL"}
-    - {id: 20, cat: Movies/WEB-DL, desc: "FILM: WebRip 720p"}
-    - {id: 21, cat: Movies/WEB-DL, desc: "FILM: WebRip 1080p"}
-    - {id: 39, cat: Movies/WEB-DL, desc: "FILM: Web-DL 720P"}
-    - {id: 17, cat: Movies/WEB-DL, desc: "FILM: Web-DL 1080P"}
-    - {id: 48, cat: Movies, desc: "FILM: Vost-FR"}
-    - {id: 49, cat: Movies, desc: "FILM: VO"}
-    - {id: 50, cat: Movies/HD, desc: "FILM: HDTV"}
-    - {id: 51, cat: TV/Anime, desc: "FILM: Animé"}
-    - {id: 52, cat: Movies/DVD, desc: "FILM: DVDRip"}
-    - {id: 40, cat: Movies/HD, desc: "Film: HD"}
-    - {id: 10, cat: PC/Games, desc: "Games: PC"}
-    - {id: 53, cat: Books/Mags, desc: "Journaux : presse"}
-    - {id: 33, cat: Other, desc: "Other: Emulation"}
-    - {id: 36, cat: Books/EBook, desc: "Other: E-Books"}
-    - {id: 38, cat: PC/Mobile-Other, desc: "Other: Mobile Phone"}
-    - {id: 57, cat: TV/WEB-DL, desc: "Serie: WEB"}
-    - {id: 7, cat: TV/SD, desc: "SERIES: Épisodes SD"}
-    - {id: 55, cat: TV/SD, desc: "Serie: DVD"}
-    - {id: 1, cat: TV/HD, desc: "SERIES: Episodes HD"}
-    - {id: 2, cat: TV/HD, desc: "SERIES: Pack HD"}
-    - {id: 3, cat: TV/Documentary, desc: "SERIES: Documentaires"}
-    - {id: 42, cat: TV, desc: "SERIES:  Concerts / Spectacles"}
-    - {id: 4, cat: TV/SD, desc: "SERIES: Pack SD"}
-    - {id: 5, cat: TV/Anime, desc: "SERIES: Animée"}
-    - {id: 41, cat: TV, desc: "SERIES: Vost-FR"}
-    - {id: 6, cat: TV/HD, desc: "SERIES: HDTV"}
-    - {id: 56, cat: TV/HD, desc: "SERIE: HDTV1080p"}
+    - {id: 9, cat: TV/SD, desc: "SERIE DVD"}
+    - {id: 21, cat: TV/HD, desc: "SERIE HDTV.1080p"}
+    - {id: 20, cat: TV/HD, desc: "SERIE HDTV.720p"}
+    - {id: 19, cat: TV/SD, desc: "SERIE HDTV"}
+    - {id: 36, cat: TV/Other, desc: "SERIE Pack"}
+    - {id: 17, cat: TV/SD, desc: "SERIE VHS"}
+    - {id: 16, cat: TV/SD, desc: "SERIE TVRip"}
+    - {id: 15, cat: TV/WEB-DL, desc: "SERIE WEB.1080p"}
+    - {id: 14, cat: TV/WEB-DL, desc: "SERIE WEB.720p"}
+    - {id: 12, cat: TV/WEB-DL, desc: "SERIE WEB"}
+    - {id: 37, cat: TV, desc: "SERIE EPISODE"}
+    - {id: 56, cat: PC/ISO, desc: "LOGICIELS Linux"}
+    - {id: 24, cat: PC/Mac, desc: "LOGICIELS Apple"}
+    - {id: 58, cat: PC/0day, desc: "LOGICIELS Windows"}
+    - {id: 59, cat: PC, desc: "LOGICIELS "}
+    - {id: 44, cat: Books/Mags, desc: "EBOOK Journaux"}
+    - {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<69>e"}
+    - {id: 1, cat: Movies/SD, desc: "FILM Xvid"}
+    - {id: 62, cat: Movies/WEB-DL, desc: "FILM WEB"}
+    - {id: 34, cat: Movies/SD, desc: "FILM TVRip"}
+    - {id: 33, cat: Movies/HD, desc: "FILM HDTV"}
+    - {id: 31, cat: Movies/Other, desc: "FILM MUET"}
+    - {id: 30, cat: Movies/Other, desc: "FILM VOST"}
+    - {id: 29, cat: Movies/SD, desc: "FILM VHS"}
+    - {id: 28, cat: Movies/HD, desc: "FILM 720"}
+    - {id: 27, cat: Movies/HD, desc: "FILM BDRip"}
+    - {id: 26, cat: Movies/BluRay, desc: "FILM BluRay"}
+    - {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: 63, cat: Movies/WEB-DL, desc: "FILM WEB"}
+    - {id: 5, cat: Audio/Video, desc: "MUSIC clip video"}
+    - {id: 7, cat: PC/Games, desc: "JEUX Win"}
+    - {id: 8, cat: Console/PS3, desc: "JEUX PS3"}
+    - {id: 45, cat: PC/Games, desc: "JEUX PC"}
 
   modes:
     search: [q]
     tv-search: [q, season, ep]
     movie-search: [q]
+    music-search: [q]
     book-search: [q]
 
 settings:
@@ -66,10 +65,6 @@ settings:
   - name: password
     type: password
     label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
   - name: multilang
     type: checkbox
     label: Replace MULTI by another language in release name
@@ -92,10 +87,10 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: id
+    default: added
     options:
-      id: created
-      seeders: seeders
+      added: created
+      seeds: seeders
       size: size
       name: title
   - name: type
@@ -107,53 +102,56 @@ settings:
       asc: asc
 
 login:
-  path: account-login.php
-  method: post
+  path: login.php
+  method: form
+  form: form[action="/login.php"]
+  cookies: ["JAVA=OK"] # avoid jscheck redirect
+  captcha:
+    type: image
+    selector: img[src^="cap/captcha_math.php?codeCaptcha="]
+    input: stringCaptcha
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
-    remember: yes
   error:
-    - selector: div.myFrame-caption:contains("Access denied")
-      message:
-        selector: div.myFrame-content
+    - selector: div#login_error
   test:
     path: index.php
-    selector: a[href="account-logout.php"]
+    selector: a[href="logout.php"]
 
 download:
-  selectors:
-    - selector: a[href^="download.php?id="]
-      attribute: href
+  before:
+    path: ajax_det_poll.php
+    method: post
+    inputs:
+      set_thanks: Merci
+      det_id: "{{ .DownloadUri.Query.torrent }}"
+      ajax: yes
 
 search:
   paths:
-    - path: torrents-search.php
+    - path: selection.php
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
-    # 0 active, 1 incldead, 2 onlydead
-    incldead: 1
-    # 0 inclfree, 1 notfree, 2 onlyfree
-    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 all, 1 English, 2 etc...
-    lang: 0
-    sort: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
+    # 0 name, 1 descr, 2 both
+    blah: 0
+    orderby: "{{ .Config.sort }}"
+    sort: "{{ .Config.type }}"
+    # site does not support imdbid searches or provide imdb links in results
 
   rows:
-    selector: tr.t-row
+    selector: div.content_wrap > div.selection_wrap:has(a[href^="details.php?id="])
 
   fields:
-    category:
-      selector: a[href^="torrents.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
+    cat_p1:
+      selector: div.kat_cat_pic_name
+    cat_p2:
+      selector: div.kat_cat_pic_name_b
+    categorydesc:
+      text: "{{ .Result.cat_p1 }} {{ .Result.cat_p2 }}"
     title_phase1:
-      selector: a[href^="torrents-details.php?id="]
-      attribute: title
+      selector: a[href^="details.php?id="]
     title_multilang:
       text: "{{ .Result.title_phase1 }}"
       filters:
@@ -171,28 +169,58 @@ search:
     title:
       text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
     details:
-      selector: a[href^="torrents-details.php?id="]
+      selector: a[href^="details.php?id="]
       attribute: href
+    poster:
+      selector: img
+      attribute: src
     download:
-      selector: a[href^="torrents-details.php?id="]
+      selector: a[href^="details.php?id="]
       attribute: href
-    size:
-      selector: td:nth-child(5)
-    date:
-      text: now
+      filters:
+        - name: replace
+          args: ["details.php?id=", "download.php?torrent="]
     seeders:
-      selector: td:nth-child(6)
+      selector: div.selection_unter_aa > b
     leechers:
-      selector: td:nth-child(7)
+      selector: div.selection_unter_aaa > b
+    date_day:
+      # Aujourd'hui à 06:26:25
+      # Hier à 05:15:19
+      selector: div.selection_unter_ab:not(:contains("."))
+      optional: true
+      filters:
+        - name: replace
+          args: ["Aujourd'hui à ", "Today "]
+        - name: replace
+          args: ["Hier à ", "Yesterday "]
+        - name: append
+          args: " +01:00" # CET
+        - name: fuzzytime
+    date_year:
+      # Le 17.10.2020 à 04:39:44
+      selector: div.selection_unter_ab:contains(".")
+      optional: true
+      filters:
+        - name: replace
+          args: ["Le ", ""]
+        - name: replace
+          args: ["à ", ""]
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "02.01.2006 15:04:05 -07:00"
+    date:
+      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+    size:
+      selector: div.selection_unter_ad
     grabs:
-      selector: td:nth-child(8)
+      selector: div.selection_unter_ae
     downloadvolumefactor:
-      case:
-        img[src="images/free.gif"]: 0
-        img[src^="data:image/gif;base64,R0lGODlhEA"]: 0 # encoded gold coin image
-        "*": 1
+      text: 1
     uploadvolumefactor:
       text: 1
-    minimumratio:
-      text: 1.0
-# TT3.0
+    minimumseedtime:
+      # 2.5 days (as seconds =  2.5 x 24 x 60 x 60)
+      text: 216000
+# 3xT

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]
@@ -113,8 +113,8 @@ search:
       selector: meta.total
 
   fields:
-    categorydesc:
-      selector: category
+    category:
+      selector: category_id
     title_original:
       selector: name
       filters:
@@ -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.0.5
+# json UNIT3D 6.2.0

src/Jackett.Common/Definitions/gktorrent.yml

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

src/Jackett.Common/Definitions/glodls.yml

@@ -10,13 +10,12 @@ links:
   - https://glodls.to/
   - https://gtdb.cc/
   - https://www.gtdb.to/
-  - https://glotorrents.unblockit.llc/
+  - https://glotorrents.unblockit.name/
   - https://glotorrents.nocensor.sbs/
+  - https://glodls.unblockninja.com/
 legacylinks:
   - https://glodls.rocks/
   - https://gtdb.to/
-  - https://glotorrents.unblockit.ltd/
-  - https://glotorrents.unblockit.link/
   - https://glotorrents.unblockit.buzz/
   - https://glodls.unblocked.monster/
   - https://glotorrents.unblockit.club/
@@ -34,6 +33,8 @@ legacylinks:
   - https://glotorrents.unblockit.cam/
   - https://glotorrents.nocensor.biz/
   - https://glotorrents.unblockit.day/
+  - https://glotorrents.unblockit.llc/
+  - https://glotorrents.unblockit.blue/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/haidan.yml

@@ -137,25 +137,9 @@ search:
     imdbid:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
-    date:
-      # time type: time elapsed (default)
-      selector: div.time_col 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:
-      # time added
-      selector: div.time_col:not(:has(span))
-      optional: true
-      filters:
-        - name: append
-          args: " +08:00" # CST
-        - name: dateparse
-          args: "2006-01-0215:04:05 -07:00"
+    doubanid:
+      selector: a[href*="movie.douban.com/subject/"]
+      attribute: href
     size:
       # group size.  item size
       selector: div.group > div.video_size, div.torrent_item > div.video_size
@@ -179,20 +163,30 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
-    date:
-      # time added
-      selector: div.time_col:contains("发布于"):not(:has(span[title]))
-      remove: a # drop uploader
+    date_elapsed:
+      # time type: time elapsed (default)
+      selector: div.time_col > span[title]
+      attribute: title
       optional: true
       filters:
-        - name: replace # remove the 'posted on' tag
-          args: ["发布于", ""]
-        - name: replace # remove anonymous tag
-          args: ["匿名", ""]
         - name: append
           args: " +08:00" # CST
         - name: dateparse
           args: "2006-01-02 15:04:05 -07:00"
+    date_added:
+      # time added
+      selector: div.time_col:contains("发布于"):not(:has(span[title]))
+      optional: true
+      remove: span
+      filters:
+        - name: replace # remove the 'posted on' tag
+          args: ["发布于", ""]
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
     minimumratio:
       text: 1.0
 # NexusPHP Standard v1.5 Beta 4 customised

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:
@@ -116,9 +116,10 @@ search:
       case:
         0: 1 # normal
         1: 2 # double
+# global MR is 0.25 but torrents must be seeded for 5 days regardless of ratio
 #    minimumratio:
-#      text: 0.4
-#    minimumseedtime:
+#      text: 0.25
+    minimumseedtime:
       # 5 days (as seconds = 5 x 24 x 60 x 60)
-#      text: 432000
+      text: 432000
 # json UNIT3D 5.3.0

src/Jackett.Common/Definitions/hdbits.yml

@@ -21,10 +21,38 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
-    movie-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: Filter 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
+
 login:
   path: login
   method: form
@@ -43,9 +71,15 @@ search:
   inputs:
     $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
     search: "{{ .Keywords }}"
+    descriptions: 0
+    imdbgt: 0
+    imdblt: 10
+    imdb: "{{ .Query.IMDBID }}"
+    sort: "{{ .Config.sort }}"
+    d: "{{ .Config.type }}"
 
   rows:
-    selector: table#torrent-list > tbody > tr:has(a[href^="/details.php?id="])
+    selector: "table#torrent-list > tbody > tr:has(a[href^=\"/details.php?id=\"]){{ if .Config.freeleech }}:has(a[title=\"100% FL: no download is counted.\"]){{ else }}{{ end }}"
 
   fields:
     category:
@@ -75,6 +109,9 @@ search:
       filters:
         - name: append
           args: " ago"
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
     downloadvolumefactor:
       case:
         "a[title=\"25% Free Leech: only 75% of the download is counted.\"]": 0.25

src/Jackett.Common/Definitions/hdchina.yml

@@ -76,29 +76,38 @@ search:
   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=2x free, 5=50%, 6=2x 50%, 7=30%
     spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0=title, 1=descr, 3=uploader, 4=imdb URL
     search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0=AND, 1=OR, 2=Exact
     search_mode: 0
 
   rows:
     selector: table.torrent_list > tbody > tr:has(a[href^="?cat="])
 
   fields:
-    title:
-      selector: td:nth-child(2) a
     category:
       selector: a[href^="?cat="]
       attribute: href
       filters:
         - name: querystring
           args: cat
+    title:
+      selector: a[href^="details.php?id="]
+      filters:
+        - name: re_replace
+          args: ["\\.", " "]
     details:
       selector: a[href^="details.php?id="]
       attribute: href
     download:
       selector: a[href^="download.php?hash="]
       attribute: href
+    description:
+      selector: h4
     size:
       selector: td.t_size
     grabs:
@@ -136,4 +145,4 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
-# NexusPHP tbd
+# NexusPHP 146364c08c (Customised)

src/Jackett.Common/Definitions/hdgalaktik.yml

@@ -111,8 +111,15 @@ search:
 
   fields:
     category:
+      selector: td:nth-child(1)
+      optional: true
+      filters:
+        - name: replace
+          args: ["---", 4]
+    category|noappend:
       selector: a[href^="browse.php?cat="]
       attribute: href
+      optional: true
       filters:
         - name: querystring
           args: cat
@@ -166,6 +173,12 @@ search:
       filters:
         - name: replace
           args: ["details", "download"]
+    imdbid:
+      selector: a[href^="browse.php?imdb="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: imdb
     size:
       selector: td:nth-child(4)
     seeders:

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

@@ -1,179 +0,0 @@
----
-id: hellastz
-name: HellasTZ
-description: "HellasTZ is an Greek Private site for TV / MOVIES / GENERAL"
-language: el-GR
-type: private
-encoding: UTF-8
-testlinktorrent: false
-links:
-  - https://hellastz.com/
-certificates:
-  - d2e56574d77a5059c30883c221094f0556d99cb6 # expired
-
-caps:
-  categorymappings:
-    - {id: 11, cat: Movies, desc: "Movies Αποκλειστικά του HTz (HTz only)"}
-    - {id: 54, cat: Movies/BluRay, desc: "Movies Blu-Ray 720p-1080p"}
-    - {id: 213, cat: Movies, desc: "Movies Ελληνικές Ταινιίες (Greek)"}
-    - {id: 232, cat: Movies/UHD, desc: "Movies Full-HD - 4K"}
-    - {id: 233, cat: Movies/DVD, desc: "Movies DvdRip Full"}
-    - {id: 234, cat: Movies/HD, desc: "Movies BDRip-BRRip-HDRip"}
-    - {id: 235, cat: Movies/WEB-DL, desc: "Movies WEB-720-1080p -HDrip"}
-    - {id: 236, cat: Movies/SD, desc: "Movies Cam - HDcam-HDts"}
-    - {id: 242, cat: Movies, desc: "Movies Ταινίες No Subs"}
-    - {id: 243, cat: Movies/DVD, desc: "Movies Φιλμογραφίες"}
-    - {id: 90, cat: TV, desc: "TV Ελληνικές Σειρές (Greek)"}
-    - {id: 96, cat: TV, desc: "TV Ξένες Σειρές (Foreign)"}
-    - {id: 219, cat: Audio, desc: "Music Ξένη μουσική (Foreign)"}
-    - {id: 220, cat: Audio, desc: "Music Ελληνική Μουσική (Greek)"}
-    - {id: 221, cat: Console, desc: "Παιχνίδια (Games)"}
-    - {id: 223, cat: Books/EBook, desc: "Βιβλία (Books)"}
-    - {id: 100, cat: Books/Comics, desc: "Comics & Περιοδικά"}
-    - {id: 225, cat: TV/Documentary, desc: "Ντοκιμαντερ (Documentaries)"}
-    - {id: 227, cat: PC, desc: "Pc Software"}
-    - {id: 228, cat: TV/Anime, desc: "Animation"}
-    - {id: 230, cat: TV/Anime, desc: "Παιδικα μεταγλωτισμε (Children)"}
-    - {id: 231, cat: TV/Anime, desc: "Παιδικα υποτιτλους (Children w/ subs)"}
-    - {id: 240, cat: PC/Mobile-Other, desc: "Android - Linux"}
-    - {id: 241, cat: Audio/Audiobook, desc: "Audio Books"}
-
-  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: freeleech
-    type: checkbox
-    label: Filter freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 3
-    options:
-      3: created
-      5: seeders
-      4: size
-      2: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: 2
-    options:
-      2: desc
-      1: asc
-  - name: info
-    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: index.php?page=login
-  method: post
-  inputs:
-    uid: "{{ .Config.username }}"
-    pwd: "{{ .Config.password }}"
-  error:
-    - selector: tr td span[style="color:#FF0000;"]
-  test:
-    path: index.php
-    selector: a[href="logout.php"]
-
-download:
-  before:
-    path: thanks.php
-    method: post
-    inputs:
-      infohash: "{{ .DownloadUri.Query.id }}"
-      thanks: 1
-      rndval: "1487013827343"
-  selectors:
-    - selector: a[href^="download.php?id="]
-      attribute: href
-
-search:
-  paths:
-    - path: index.php
-  inputs:
-    page: torrents
-    search: "{{ .Keywords }}"
-    category: "{{ range .Categories }}{{.}};{{end}}"
-    # 0 all, 1 active only, 2 dead only
-    active: 0
-    order: "{{ .Config.sort }}"
-    by: "{{ .Config.type }}"
-    # does not support imdbid search and does not ruturn imdb link in results
-
-  rows:
-    selector: "table.lista > tbody > tr:has(a[href^=\"index.php?page=torrent-details&id=\"]){{ if .Config.freeleech }}:has(img[alt=\"Gold 100% Free\"]){{ else }}{{ end }}"
-
-  fields:
-    category:
-      selector: a[href^="index.php?page=torrents&category="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    title:
-      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-    poster:
-      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=(.*?) "
-    details:
-      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-      attribute: href
-    download:
-      selector: a[href^="index.php?page=downloadcheck&id="]
-      attribute: href
-    date:
-      selector: td:nth-child(4)
-      filters:
-        - name: append
-          args: " +02:00" # EET
-        - name: dateparse
-          args: "02/01/2006 -07:00"
-    seeders:
-      selector: td:nth-child(5)
-    leechers:
-      selector: td:nth-child(6)
-    grabs:
-      selector: td:nth-child(7)
-    size:
-      selector: td:nth-child(8)
-    downloadvolumefactor:
-      case:
-        img[alt="Gold 100% Free"]: 0
-        img[alt="Silver 50% Free"]: 0.5
-        img[alt="Bronze 25% Free"]: 0.75
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[alt="2x Upload Multiplier"]: 2
-        img[alt="3x Upload Multiplier"]: 3
-        img[alt="4x Upload Multiplier"]: 4
-        img[alt="5x Upload Multiplier"]: 5
-        img[alt="6x Upload Multiplier"]: 6
-        img[alt="7x Upload Multiplier"]: 7
-        img[alt="8x Upload Multiplier"]: 8
-        img[alt="9x Upload Multiplier"]: 9
-        img[alt="10x Upload Multiplier"]: 10
-        "*": 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
-#  xbtitFM v3.1.00

src/Jackett.Common/Definitions/hidden-palace.yml

@@ -1,144 +0,0 @@
----
-id: hidden-palace
-name: Hidden-Palace
-description: "Hidden-Palace is a Private torrent site for MOVIES / TV"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://hidden-palace.net/
-legacylinks:
-  - https://hidden-palace.xyz/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Movie"}
-    - {id: 2, cat: TV, desc: "TV"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
-    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://hidden-palace.net/\" target =_blank>Hidden-Palace</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: created_at
-    options:
-      created_at: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: /api/torrents
-  method: get
-  inputs:
-    api_token: "{{ .Config.apikey }}"
-  error:
-    - selector: a[href*="/login"]
-      message:
-        text: "The API key was not accepted by {{ .Config.sitelink }}."
-
-search:
-  paths:
-    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
-    - path: "/api/torrents/filter"
-      response:
-        type: json
-
-  inputs:
-  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
-    api_token: "{{ .Config.apikey }}"
-    name: "{{ .Keywords }}"
-    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 100
-    page: 1
-
-  keywordsfilters:
-    - name: re_replace
-      args: ["\\.", " "]
-
-  rows:
-    selector: data
-    attribute: attributes
-    count:
-      selector: meta.total
-
-  fields:
-    categorydesc:
-      selector: category
-    title:
-      selector: name
-    details:
-      selector: details_link
-    download:
-      selector: download_link
-    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
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 1 day (as seconds = 1 x 24 x 60 x 60)
-      text: 86400
-# json UNIT3D 6.0.5

src/Jackett.Common/Definitions/huntorrent.yml

@@ -142,20 +142,20 @@ search:
       selector: a[href^="torrents_data/posters/"]
       attribute: href
     date:
-      selector: td:nth-last-child(6)
+      selector: td:nth-last-child(5)
       filters:
         - name: append
           args: " +01:00" # CET
         - name: dateparse
           args: "2006-01-02 15:04:05 -07:00"
     size:
-      selector: td:nth-last-child(5) b
+      selector: td:nth-last-child(4) b
     grabs:
-      selector: td:nth-last-child(4)
-    seeders:
       selector: td:nth-last-child(3)
+    seeders:
+      selector: td:nth-last-child(2) a b
     leechers:
-      selector: td:nth-last-child(2)
+      selector: td:nth-last-child(1)
     downloadvolumefactor:
       text: 1
     uploadvolumefactor:

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]
 
@@ -192,4 +192,10 @@ search:
         i[class*="fa-globe text-green"]: 2 # Global Double Upload
         i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
         "*": 1
+# global MR is 1.0 but torrents must be seeded for 2 days regardless of ratio
+#    minimumratio:
+#      text: 1.0
+    minimumseedtime:
+      # 2 days (as seconds = 5 x 24 x 60 x 60)
+      text: 172800
 # UNIT3D 1.9.3

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

@@ -25,7 +25,35 @@ caps:
     search: [q]
     tv-search: [q, season, ep]
     movie-search: [q]
-    music-search: [q, artist]
+    music-search: [q, album, artist]
+
+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: s3
+    options:
+      s3: created
+      s6: seeders
+      s4: size
+      s1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
 
 login:
   path: login.php
@@ -34,22 +62,23 @@ login:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
     keeplogged: 1
-    login: "Log in"
+    login: "Log In!"
   error:
     - selector: form#loginform > span.warning, font[color="red"]
   test:
     path: torrents.php
 
 search:
+    # https://jpopsuki.eu/ajax.php?section=torrents&artistname=&action=advanced&torrentname=snow+man&remastertitle=&filelist=&bitrate=&format=&media=&year=&freeleech=&remastered=&searchtags=&tags_type=0&order_by=s3&order_way=desc&enablegrouping=1
   paths:
     - path: ajax.php
   inputs:
-    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}{{ if or .Query.Artist .Keywords }}{{ else }}searchtags=japanese&tags_type=0&{{ end }}"
-    searchstr: "{{ if .Query.Artist }}{{ .Query.Artist }}{{ else }}{{ .Keywords }}{{ end }}"
-    # s1 name, s2 year, s3 added, s4 size, s5 snatched, s6 seeders, s7 leechers
-    order_by: s3
-    # desc, asc
-    order_way: desc
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}{{ if or .Query.Album .Query.Artist .Keywords }}action=advanced{{ else }}searchtags=japanese&tags_type=0{{ end }}"
+    artistname: "{{ if .Query.Artist }}{{ .Query.Artist }}{{ else }}{{ end }}"
+    torrentname: "{{ if .Query.Album }}{{ .Query.Album }}{{ else }}{{ .Keywords }}{{ end }}"
+    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    order_by: "{{ .Config.sort }}"
+    order_way: "{{ .Config.type }}"
     disablegrouping: 1
     section: torrents
 
@@ -108,4 +137,6 @@ search:
         "*": 1
     uploadvolumefactor:
       text: 1
+    minimumratio:
+      text: 0.6
 # engine n/a

src/Jackett.Common/Definitions/jptv.yml

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

src/Jackett.Common/Definitions/knaben.yml

@@ -0,0 +1,142 @@
+---
+id: knaben
+name: Knaben
+description: "Knaben is a Public torrent meta-search engine"
+language: en-US
+type: public
+encoding: UTF-8
+links:
+  - https://knaben.eu/
+
+caps:
+  categorymappings:
+    # Cat ids used for filtering /browse/ are not consistent with those for results, so double-check when updating.
+    # They appear to be using nZEDb/Newznab/Jackett cat ids, so if there are empty categories, resort to those.
+    # Audio
+    - {id: 3000, cat: Audio, desc: "Audio"}
+    - {id: 3010, cat: Audio/MP3, desc: "Audio/MP3"}
+    - {id: 3020, cat: Audio/Video, desc: "Audio/Video"}
+    - {id: 3030, cat: Audio/Audiobook, desc: "Audio/Audiobook"}
+    - {id: 3040, cat: Audio/Lossless, desc: "Audio/Lossless"}
+    - {id: 3050, cat: Audio/Other, desc: "Audio/Other"}
+    # Console
+    - {id: 1000, cat: Console, desc: "Console"}
+    - {id: 1010, cat: Console/NDS, desc: "Console/NDS"}
+    - {id: 1020, cat: Console/PSP, desc: "Console/PSP"}
+    - {id: 1030, cat: Console/Wii, desc: "Console/Wii"}
+    - {id: 1040, cat: Console/XBox, desc: "Console/Xbox"}
+    - {id: 1050, cat: Console/XBox 360, desc: "Console/Xbox 360"}
+    - {id: 1080, cat: Console/PS3, desc: "Console/PS3"}
+    - {id: 1110, cat: Console/3DS, desc: "Console/3DS"}
+    - {id: 1120, cat: Console/PS Vita, desc: "Console/PS Vita"}
+    - {id: 1180, cat: Console/PS4, desc: "Console/PS4"}
+    - {id: 1090, cat: Console/Other, desc: "Console/Other"}
+    # Movies
+    - {id: 2000, cat: Movies, desc: "Movies"}
+    - {id: 2010, cat: Movies/Foreign, desc: "Movies/Foreign"}
+    - {id: 2030, cat: Movies/SD, desc: "Movies/SD"}
+    - {id: 2040, cat: Movies/HD, desc: "Movies/HD"}
+    - {id: 2045, cat: Movies/UHD, desc: "Movies/UHD"}
+    - {id: 2060, cat: Movies/3D, desc: "Movies/3D"}
+    - {id: 2050, cat: Movies/BluRay, desc: "Movies/BluRay"}
+    - {id: 2070, cat: Movies/DVD, desc: "Movies/DVD"}
+    - {id: 2020, cat: Movies/Other, desc: "Movies/Other"}
+    # PC
+    - {id: 4000, cat: PC, desc: "PC/PC"}
+    - {id: 4020, cat: PC/ISO, desc: "PC/ISO"}
+    - {id: 4030, cat: PC/Mac, desc: "PC/Mac"}
+    - {id: 4040, cat: PC/Mobile-Other, desc: "PC/Mobile-Other"}
+    - {id: 4050, cat: PC/Games, desc: "PC/Games"}
+    - {id: 4060, cat: PC/Mobile-iOS, desc: "PC/Mobile-iOS"}
+    - {id: 4070, cat: PC/Mobile-Android, desc: "PC/Mobile-Android"}
+    # Anime
+    - {id: 5070, cat: TV/Anime, desc: "Anime"}
+    # TV
+    - {id: 5000, cat: TV, desc: "TV"}
+    - {id: 5020, cat: TV/Foreign, desc: "TV/FOREIGN"}
+    - {id: 5030, cat: TV/SD, desc: "TV/SD"}
+    - {id: 5040, cat: TV/HD, desc: "TV/HD"}
+    - {id: 5045, cat: TV/UHD, desc: "TV/UHD"}
+    - {id: 5060, cat: TV/Sport, desc: "TV/Sport"}
+    - {id: 5080, cat: TV/Documentary, desc: "TV/Documentary"}
+    - {id: 5050, cat: TV/Other, desc: "TV/OTHER"}
+    # XXX
+    - {id: 6000, cat: XXX, desc: "XXX"}
+    - {id: 6010, cat: XXX/DVD, desc: "XXX/DVD"}
+    - {id: 6060, cat: XXX/ImageSet, desc: "XXX/Imageset"}
+    - {id: 6070, cat: XXX/Other, desc: "XXX/Other"}
+    # Books
+    - {id: 7000, cat: Books, desc: "Books"}
+    - {id: 7020, cat: Books/EBook, desc: "Books/Ebook"}
+    - {id: 7030, cat: Books/Comics, desc: "Books/Comics"}
+    - {id: 8030, cat: Books/Mags, desc: "Books/Magazines"}
+    - {id: 7040, cat: Books/Technical, desc: "Books/Technical"}
+    - {id: 7050, cat: Books/Other, desc: "Books/Other"}
+    # Other
+    - {id: 8000, cat: Other, desc: "Other"}
+    - {id: 8010, cat: Other/Misc, desc: "Other/Misc"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: Date
+    options:
+      Date: created
+      Seeders: seeders
+      Size: size
+      Title: title
+
+search:
+  paths:
+    - path: "{{ if .Keywords }}search/?q={{ .Keywords }}&p=1&cat=All&s={{ else }}browse/1/0/{{ end }}{{ .Config.sort }}"
+
+  rows:
+    selector: tr[title^="Cached at"]
+
+  fields:
+    category:
+      selector: a[href^="/browse/"]
+      attribute: href
+      filters:
+        - name: split
+          args: ["/", 3]
+    title:
+      selector: td:nth-child(2) a
+    details:
+      selector: td:last-child a
+      attribute: href
+    magnet:
+      selector: td:nth-child(2) a
+      attribute: href
+    description:
+      selector: td:last-child a
+      filters:
+        - name: prepend
+          args: "Source: "
+    date:
+      selector: td:nth-child(4)
+      attribute: title
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "2006-01-02T15:04:05 -07:00"
+    size:
+      selector: td:nth-child(3)
+    seeders:
+      selector: td:nth-child(5)
+    leechers:
+      selector: td:nth-child(6)
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/lastfiles.yml

@@ -68,13 +68,12 @@ caps:
     book-search: [q]
 
 settings:
-  - name: cookie
+  - name: username
     type: text
-    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Access this tracker with your browser<li>click on the <b>Apply Filter</b> button on the page to invoke the search and solve the challenge<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+    label: Username
+  - name: password
+    type: password
+    label: Password
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -101,9 +100,20 @@ settings:
       asc: asc
 
 login:
-  method: cookie
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    submitme: Login
+    use_ssl: 1
+    perm_ssl: 2
+    returnto: /
+  error:
+    - selector: td.embedded:contains("Login failed")
   test:
-    path: browse.php
+    path: index.php
+    selector: a[href*="/logout.php?hash_please="]
 
 search:
   paths:

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

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

src/Jackett.Common/Definitions/limetorrents.yml

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

src/Jackett.Common/Definitions/mactorrentsdownload.yml

@@ -18,7 +18,11 @@ caps:
   modes:
     search: [q]
 
-settings: []
+settings:
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
 
 download:
   selectors:

src/Jackett.Common/Definitions/marinetracker.yml

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

src/Jackett.Common/Definitions/mteamtp.yml

@@ -105,6 +105,11 @@ login:
     path: index.php
     selector: a[href="logout.php"]
 
+download:
+  selectors:
+    - selector: a[href$="&https=1"]
+      attribute: href
+
 search:
   paths:
     - path: torrents.php
@@ -120,7 +125,7 @@ search:
     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 url
+    # 0 title, 3 uploader, 4 imdb url
     search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
     # 0 and, 1 or, 2 exact
     search_mode: 0
@@ -151,7 +156,7 @@ search:
       selector: a[href^="details.php?id="]
       attribute: href
     download:
-      selector: a[href^="download.php?id="]
+      selector: a[href^="details.php?id="]
       attribute: href
     poster:
       selector: img[alt="torrent thumbnail"]

src/Jackett.Common/Definitions/mteamtp2fa.yml

@@ -108,6 +108,11 @@ login:
     path: index.php
     selector: a[href="logout.php"]
 
+download:
+  selectors:
+    - selector: a[href$="&https=1"]
+      attribute: href
+
 search:
   paths:
     - path: torrents.php
@@ -123,7 +128,7 @@ search:
     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 url
+    # 0 title, 3 uploader, 4 imdb url
     search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
     # 0 AND, 1 OR, 2 exact
     search_mode: 0
@@ -157,7 +162,7 @@ search:
       selector: a[href^="details.php?id="]
       attribute: href
     download:
-      selector: a[href^="download.php?id="]
+      selector: a[href^="details.php?id="]
       attribute: href
     poster:
       selector: img[alt="torrent thumbnail"]

src/Jackett.Common/Definitions/nbtorrents.yml

@@ -0,0 +1,150 @@
+---
+id: nbtorrents
+name: NBTorrents
+description: "NBTorrents is an INDIAN Private site for MOVIES / TV / MUSIC"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://www.nbtorrents.com/
+
+caps:
+  categorymappings:
+    - {id: 22, cat: TV/Anime, desc: "Anime & Cartoon"}
+    - {id: 26, cat: TV/Documentary, desc: "Documentaries"}
+    - {id: 1, cat: Movies/UHD, desc: "Movies UHD & BluRay"}
+    - {id: 3, cat: Movies/BluRay, desc: "Movies BDRips"}
+    - {id: 6, cat: Movies/DVD, desc: "Movies DVD"}
+    - {id: 7, cat: Movies/DVD, desc: "Movies DVDRip"}
+    - {id: 8, cat: Movies, desc: "Movies Pre"}
+    - {id: 2, cat: Movies, desc: "Movies Remux"}
+    - {id: 4, cat: Movies/WEB-DL, desc: "Movies Web"}
+    - {id: 5, cat: Movies/WEB-DL, desc: "Movies WebRip"}
+    - {id: 15, cat: Audio/Lossless, desc: "Music CD & FLAC"}
+    - {id: 17, cat: Audio/MP3, desc: "Music MP3"}
+    - {id: 18, cat: Audio, desc: "Music Pack"}
+    - {id: 20, cat: Audio, desc: "Music Podcast"}
+    - {id: 19, cat: Audio/Video, desc: "Music Video"}
+    - {id: 16, cat: Audio, desc: "Music Web"}
+    - {id: 25, cat: TV/Sport, desc: "Sports"}
+    - {id: 10, cat: TV/UHD, desc: "TV UHD & BluRay"}
+    - {id: 11, cat: TV, desc: "TV BDRips"}
+    - {id: 14, cat: TV, desc: "TV packs"}
+    - {id: 12, cat: TV/WEB-DL, desc: "TV Web"}
+    - {id: 13, cat: TV/WEB-DL, desc: "TV WebRips"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: td.colhead:contains("failed")
+      message:
+        selector: table tr td.text
+  test:
+    path: browse.php
+    selector: a[href*="logout.php?hash_insert="]
+
+search:
+  paths:
+    - path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    searchin: title
+    incldead: 1
+    only_free: "{{ if .Config.freeleech }}1{{ else }}0{{ end }}"
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+
+  rows:
+    selector: table.mainouter tr table tr:has(a[href^="download.php?torrent="])
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      selector: td a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: td a[href^="details.php?id="]
+    details:
+      selector: td a[href^="details.php?id="]
+      attribute: href
+    poster:
+      selector: td a[href^="details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "src=\\\\'(.*?)\\\\' "
+    download:
+      selector: td a[href^="download.php?torrent="]
+      attribute: href
+    imdbid:
+      selector: td a[href*="imdb.com/title/tt"]
+      attribute: href
+    files:
+      selector: td:nth-of-type(5)
+    date:
+      selector: td:nth-of-type(7)
+      filters:
+        - name: append
+          args: " +05:30" # IST
+        - name: dateparse
+          args: "Jan 2 2006 03:04 PM -07:00"
+    size:
+      selector: td:nth-of-type(8)
+    grabs:
+      selector: td:nth-of-type(9)
+    seeders:
+      selector: td:nth-of-type(10)
+    leechers:
+      selector: td:nth-of-type(11)
+    downloadvolumefactor:
+      case:
+        "img[title=\"Free Torrent\"]": 0 # torrent specific free leech (icon)?
+        "a.info:contains(\"Free\")": 0 # global freeleech note?
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/oncesearch.yml

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

src/Jackett.Common/Definitions/oxtorrent.yml

@@ -6,11 +6,11 @@ language: fr-FR
 type: public
 encoding: UTF-8
 followredirect: true
+# to fetch current domain use https://www.protege-liens.com/t911 and https://www.protege-liens.com/torrent911
 links:
-  - https://www.torrent911.com/
-  - https://www.t911.net/
-  - https://oxtorrent.unblockit.llc/
-  - https://oxtorrent.nocensor.sbs/
+  - https://www.torrent911.org/
+  - https://www.t911.me/
+  - https://oxtorrent.unblockninja.com/
 legacylinks:
   - https://www.oxtorrent.bz/
   - https://www.oxtorrent.ws/
@@ -34,6 +34,12 @@ legacylinks:
   - https://oxtorrent.nocensor.biz/
   - https://oxtorrent.unblockit.day/
   - https://www.oxtorrent.re/
+  - https://oxtorrent.unblockit.llc/
+  - https://www.torrent911.com/
+  - https://www.t911.net/
+  - https://oxtorrent.unblockit.blue/ # proxy for *.co, a clone without derniers
+  - https://oxtorrent.nocensor.sbs/ # proxy for *.co, a clone without derniers
+  - https://www.torrent911.net/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/piratadigital.yml

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

src/Jackett.Common/Definitions/piratbit.yml

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

src/Jackett.Common/Definitions/piratbitl.yml

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

src/Jackett.Common/Definitions/pixelados.yml

@@ -1,38 +1,27 @@
 ---
-id: animeitalia
-name: AnimeItalia
-description: "AnimeItalia is an ITALIAN Private Torrent Tracker for ANIME"
-language: it-IT
+id: pixelados
+name: Pixelados
+description: "Pixelados is a Spanish Private Torrent Tracker for HD MOVIES / TV"
+language: es-ES
 type: private
 encoding: UTF-8
 links:
-  - https://animeitalia.org/
+  - https://pixelados.tv/
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies, desc: "Film ITA"}
-    - {id: 2, cat: TV, desc: "Serie TV"}
-    - {id: 3, cat: Audio, desc: "Musica"}
-    - {id: 4, cat: Console, desc: "Giochi"}
-    - {id: 5, cat: PC, desc: "Programmi"}
-    - {id: 6, cat: TV/Anime, desc: "Anime SUB-ITA"}
-    - {id: 7, cat: TV/Anime, desc: "Anime ITA"}
-    - {id: 8, cat: Movies/Other, desc: "Film Anime SUB-ITA"}
-    - {id: 9, cat: Movies/Other, desc: "Film Anime ITA"}
-    - {id: 10, cat: Books/Comics, desc: "Manga ITA"}
-    - {id: 11, cat: Books/Comics, desc: "Manga ENG"}
-    - {id: 12, cat: Audio, desc: "Anime Music"}
-    - {id: 13, cat: Other, desc: "Foto Anime"}
-    - {id: 14, cat: XXX/Other, desc: "Hentai SUB-ITA"}
-    - {id: 15, cat: XXX/Other, desc: "Hentai ITA"}
-    - {id: 16, cat: XXX/ImageSet, desc: "Foto Hentai"}
+    - {id: 1, cat: Movies, desc: "Películas"}
+    - {id: 2, cat: TV, desc: "Series"}
+    - {id: 3, cat: Audio, desc: "Música"}
+    - {id: 4, cat: TV/Documentary, desc: "Documentales"}
+    - {id: 5, cat: TV/Sport, desc: "Deportes"}
+    - {id: 6, cat: TV/Anime, desc: "Animación"}
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
     music-search: [q]
-    book-search: [q]
 
 settings:
   - name: apikey
@@ -41,7 +30,7 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://animeitalia.org/\" target =_blank>AnimeItalia</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://pixelados.tv/\" target =_blank>Pixelados</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -92,8 +81,15 @@ search:
     page: 1
 
   keywordsfilters:
+    - name: diacritics
+      args: replace
     - name: re_replace
       args: ["\\.", " "]
+    # strip season and ep when it's added by tvsearch Query
+    - name: re_replace
+      args: ["(?i)\\bS0*(\\d+)\\b", "{{ if eq .Query.Type \"tvsearch\" }}{{ else }}T$1{{ end }}"]
+    - name: re_replace
+      args: ["(?i)S0?(\\d{1,2})E(\\d{1,2})", "{{ if eq .Query.Type \"tvsearch\" }}{{ else }}$1x$2{{ end }}"]
 
   rows:
     selector: data
@@ -102,14 +98,46 @@ search:
       selector: meta.total
 
   fields:
-    categorydesc:
-      selector: category
+    category:
+      selector: category_id
+    mejorada:
+      selector: types:contains(Mejorada)
+      optional: true
+    corregida:
+      selector: types:contains(Corregida)
+      optional: true
+    audio_editado:
+      selector: types:contains(Audio-Editado)
+      optional: true
+    title_vose:
+      selector: name:contains(VOSE)
+      optional: true
+    title_notvose:
+      selector: name:not(:contains(VOSE))
+      optional: true
+      filters:
+        - name: append
+          args: " SPANISH"
     title:
-      selector: name
+      text: "{{ if .Result.title_vose }}{{ .Result.title_vose }}{{ else }}{{ .Result.title_notvose }}{{ end }}{{ if or .Result.mejorada .Result.corregida .Result.audio_editado }} PROPER{{ else }}{{ end }}"
+      filters:
+        # Replace Spanish season names like T1, MS (MiniSerie), TU (Temporada Unica) for normalized format S1
+        - name: re_replace
+          args: ["(?i)T(\\d{1,2})\\b", "S$1"]
+        - name: re_replace
+          args: ["(\\d{2})[×|x](\\d{2})", "S$1E$2"]
+        - name: re_replace
+          args: ["(\\d{1})[×|x](\\d{2})", "S0$1E$2"]
+        - name: re_replace
+          args: ["(?i)MS\\b", "S1"]
+        - name: re_replace
+          args: ["(?i)TU\\b", "S1"]
     details:
       selector: details_link
     download:
       selector: download_link
+    infohash:
+      selector: info_hash
     poster:
       selector: poster
       filters:
@@ -150,6 +178,10 @@ search:
       case:
         0: 1 # normal
         1: 2 # double
-    minimumratio:
-      text: 1.0
-# json UNIT3D 6.0.4
+# global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
+#    minimumratio:
+#      text: 0.4
+    minimumseedtime:
+      # 7 day (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
+# json UNIT3D 6.1.0 custom

src/Jackett.Common/Definitions/portugas.yml

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

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

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

src/Jackett.Common/Definitions/purovicio.yml

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

src/Jackett.Common/Definitions/putao.yml

@@ -178,17 +178,11 @@ search:
       selector: td:nth-child(8)
     downloadvolumefactor:
       case:
-        tr.free_bg: 0
         img.pro_free: 0
-        tr.2up: 0
         img.pro_2up: 0
-        tr.free2up: 0
         img.pro_free2up: 0
-        tr.halfdown_bg: 0.5
         img.pro_50pctdown: 0.5
-        tr.d30down_bg: 0.3
         img.pro_30pctdown: 0.3
-        tr.d70down_bg: 0.7
         img.pro_70pctdown: 0.7
         "*": 1
     uploadvolumefactor:

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

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

src/Jackett.Common/Definitions/racingforme.yml

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

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

@@ -19,7 +19,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
 
 settings:
@@ -86,46 +86,39 @@ search:
       selector: meta.total
 
   fields:
-    categorydesc:
-      selector: category
+    category:
+      selector: category_id
     title_vose:
       selector: name:contains(VOSE)
       optional: true
       filters:
-        - name: re_replace
-          args: ["(?i)bdfull", "BluRay"] # BDfull  -> BluRay
-        - name: re_replace
-          args: ["(?i)RedBits", ""] # Delete RedBits
         - name: append
           args: " English" # Add english to fix Sonarr/Radarr language
-        - name: re_replace
-          args: ["\\[|\\]", " "]
-        - name: re_replace
-          args: ["  ", " "]
-        - name: re_replace
-          args: ["(?i)T(\\d{1,2})\\b", "S$1"]
     title_notvose:
       selector: name:not(:contains(VOSE))
       optional: true
+      filters:
+        - name: append
+          args: " Spanish" # Add spanish to fix Sonarr/Radarr language
+    title:
+      text: "{{ if .Result.title_vose }}{{ .Result.title_vose }}{{ else }}{{ .Result.title_notvose }}{{ end }}"
       filters:
         - name: re_replace
           args: ["(?i)bdfull", "BluRay"] # BDfull  -> BluRay
         - name: re_replace
           args: ["(?i)RedBits", ""] # Delete RedBits
-        - name: append
-          args: " Spanish" # Add spanish to fix Sonarr/Radarr language
         - name: re_replace
           args: ["\\[|\\]", " "]
         - name: re_replace
           args: ["  ", " "]
         - name: re_replace
           args: ["(?i)T(\\d{1,2})\\b", "S$1"]
-    title:
-      text: "{{ if .Result.title_vose }}{{ .Result.title_vose }}{{ else }}{{ .Result.title_notvose }}{{ end }}"
     details:
       selector: details_link
     download:
       selector: download_link
+    infohash:
+      selector: info_hash
     poster:
       selector: poster
       filters:
@@ -169,4 +162,4 @@ search:
     minimumseedtime:
       # 4 days (as seconds = 4 x 24 x 60 x 60)
       text: 345600
-# json UNIT3D 6.0.0
+# json UNIT3D 6.1.0

src/Jackett.Common/Definitions/redstartorrent.yml

@@ -91,6 +91,7 @@ search:
           args: "{{ .Result.description }}"
     imdbid:
       selector: a[href*="imdb.com/title/tt"]
+      attribute: href
     date:
       selector: td:nth-child(5)
       filters:

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

@@ -16,7 +16,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
     music-search: [q]
     book-search: [q]
@@ -97,6 +97,8 @@ search:
       selector: details_link
     download:
       selector: download_link
+    infohash:
+      selector: info_hash
     poster:
       selector: poster
       filters:
@@ -139,4 +141,4 @@ search:
         1: 2 # double
     minimumratio:
       text: 1.0
-# json UNIT3D 6.0.6
+# json UNIT3D 6.1.0

src/Jackett.Common/Definitions/rutor.yml

@@ -8,10 +8,9 @@ encoding: UTF-8
 links:
   - http://rutor.info/ # site does not support https ERR_CONNECTION_REFUSED
   - http://rutor.is/ # site does not support https ERR_CONNECTION_REFUSED
-  - http://6tor.org/
+  - http://new-rutor.org/ # site does not support https ERR_CONNECTION_REFUSED
 legacylinks:
   - http://live-rutor.org/ # domain expired 9 Feb 2020
-  - http://new-rutor.org/ # ERR_NAME_NOT_RESOLVED
   - https://rutor.black-mirror.xyz/
   - https://rutor.unblocked.casa/
   - https://rutor.proxyportal.fun/
@@ -25,6 +24,7 @@ legacylinks:
   - https://rutor.unblocked.monster/
   - https://rutor.nocensor.space/
   - https://rutor.nocensor.work/
+  - http://6tor.org/
 
 caps:
   # unfortunately RuTor does not display categories anywhere in its search results page :-(
@@ -37,8 +37,8 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
-    movie-search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
     music-search: [q]
 
 settings:
@@ -66,8 +66,10 @@ settings:
 
 search:
   paths:
-    # http://rutor.info/search/0/0/100/0/gotham%2004x01
-    - path: "{{ if .Keywords }}search/0/0/100/{{ .Config.sort }}/{{ .Keywords }}/{{ else }}top/{{ end }}"
+    # http://rutor.info/search/0/0/010/0/tt10288566 # search title and descr for imdb
+    # http://rutor.info/search/0/0/100/0/gotham%2004x01 # search title for query
+    # http://rutor.info/top/ # search keywordless
+    - path: "{{ if .Query.IMDBID }}search/0/0/010/{{ .Config.sort }}/{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if .Keywords }}search/0/0/100/{{ .Config.sort }}/{{ .Keywords }}/{{ else }}{{ end }}{{ if or .Keywords .Query.IMDBID }}{{ else }}top/{{ end }}"
 
   rows:
     selector: tr:has(td:has(a.downgif))

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

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

src/Jackett.Common/Definitions/satclubbing.yml

@@ -0,0 +1,156 @@
+---
+id: satclubbing
+name: SATClubbing
+description: "SATClubbing is a RUSSIAN/ENGLISH Semi-Private Torrent Tracker for ELECTRONIC MUSIC"
+language: en-US
+type: semi-private
+encoding: UTF-8
+links:
+  - https://satclubbing.club/
+
+caps:
+  categorymappings:
+    - {id: 23, cat: Audio, desc: "Albums - Trance"}
+    - {id: 34, cat: Audio, desc: "Singles - Trance"}
+    - {id: 24, cat: Audio, desc: "Livesets - Trance"}
+    - {id: 30, cat: Audio, desc: "Albums - House"}
+    - {id: 25, cat: Audio, desc: "Singles - House"}
+    - {id: 32, cat: Audio, desc: "Livesets - House"}
+    - {id: 18, cat: Audio, desc: "Albums - Techno"}
+    - {id: 29, cat: Audio, desc: "Singles - Techno"}
+    - {id: 21, cat: Audio, desc: "Livesets - Techno"}
+    - {id: 35, cat: Audio, desc: "Albums - Hardstyle"}
+    - {id: 20, cat: Audio, desc: "Singles - Hardstyle"}
+    - {id: 28, cat: Audio, desc: "Livesets - Hardstyle"}
+    - {id: 22, cat: Audio, desc: "Albums - Goa/Psy"}
+    - {id: 33, cat: Audio, desc: "Singles - Goa/Psy"}
+    - {id: 26, cat: Audio, desc: "Livesets - Goa/Psy"}
+    - {id: 31, cat: Audio, desc: "Beat/Breaks"}
+    - {id: 40, cat: Audio, desc: "Electronic"}
+    - {id: 42, cat: Audio, desc: "Albums - Drum and Bass"}
+    - {id: 43, cat: Audio, desc: "Singles - Drum and Bass"}
+    - {id: 44, cat: Audio, desc: "Livesets - Drum and Bass"}
+    - {id: 45, cat: Audio, desc: "Albums - Dance"}
+    - {id: 46, cat: Audio, desc: "Singles - Dance"}
+    - {id: 36, cat: Audio, desc: "Unreleased Tracks"}
+    - {id: 41, cat: Audio, desc: "Bass"}
+    - {id: 39, cat: Audio, desc: "Ambient / Chill"}
+    - {id: 27, cat: Other, desc: "Music Plugins/Apps/Misc"}
+    - {id: 19, cat: Audio/Video, desc: "DVD/Video/Clips"}
+    - {id: 38, cat: Audio, desc: "SCMT Pack"}
+    - {id: 47, cat: Audio, desc: "Albums - Hardcore"}
+    - {id: 48, cat: Audio, desc: "Singles - Hardcore"}
+    - {id: 49, cat: Audio, desc: "Livesets - Hardcore"}
+    - {id: 50, cat: Audio, desc: "Rave"}
+    - {id: 51, cat: Audio, desc: "Acid"}
+
+  modes:
+    search: [q]
+    music-search: [q, artist]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: div.error
+  test:
+    path: /
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    # https://satclubbing.club/browse.php?search=&cat=0&incldead=1&age=0&quality=0&c23=1&c34=1
+    - path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ if .Query.Artist }}{{ .Query.Artist }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 active, 1 incldead, 2 onlydead, 3 freeleech, 4 seedless
+    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
+    # 0 any, 1 fresh, 2 classic, 3 not classic
+    age: 0
+    # 0 any, 320 mp3 cbr, 1000 mp3 vbr, 2000 lossless
+    quality: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+
+  rows:
+    selector: table > tbody > tr > td.index > table.embedded[cellspacing="0"][cellpadding="5"][width="100%"] > tbody > tr:has(a[href^="details.php?id="])
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    date:
+      selector: td:last-child
+      filters:
+        - name: replace
+          args: ["added ", ""]
+        - name: timeago
+    files:
+      selector: a[href$="filelist=1"]
+    size:
+      selector: td:has(a[href$="filelist=1"]) + td + td
+    seeders_optional:
+      selector: a[href$="toseeders=1"]
+      optional: true
+    seeders:
+      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
+    leechers_optional:
+      selector: td:has(a[href$="toseeders=1"])
+      optional: true
+      filters:
+        - name: split
+          args: ["|", 1]
+    leechers:
+      text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
+    downloadvolumefactor:
+      case:
+        img[src$="pic/free_icon.gif"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 0.60
+# engine n/a

src/Jackett.Common/Definitions/seedfile.yml

@@ -1,161 +0,0 @@
----
-id: seedfile
-name: SeedFile
-description: "SeedFile (SF) is a ROMANIAN Private Torrent Tracker for 0DAY / GENERAL"
-language: ro-RO
-type: private
-encoding: UTF-8
-links:
-  - https://www.seedfile.io/
-legacylinks:
-  - https://www.seedfile.ro/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Books/Mags, desc: "Cărți/Reviste"}
-    - {id: 2, cat: Other, desc: "Desene SD"}
-    - {id: 3, cat: Other, desc: "Diverse n/a"}
-    - {id: 5, cat: Movies/BluRay, desc: "Filme Blu-Ray"}
-    - {id: 6, cat: Movies/DVD, desc: "Filme DVD"}
-    - {id: 7, cat: Movies/DVD, desc: "Filme DVD-RO"}
-    - {id: 8, cat: Movies/HD, desc: "Filme HD"}
-    - {id: 9, cat: Movies/HD, desc: "Filme HD-RO"}
-    - {id: 10, cat: Movies/SD, desc: "Filme SD"}
-    - {id: 11, cat: Movies/SD, desc: "Filme SD-RO"}
-    - {id: 12, cat: Other, desc: "Imagini"}
-    - {id: 13, cat: Console, desc: "Jocuri Console"}
-    - {id: 14, cat: PC/Games, desc: "Jocuri PC"}
-    - {id: 15, cat: Audio, desc: "Muzică"}
-    - {id: 16, cat: PC/Mobile-Other, desc: "Mobile"}
-    - {id: 17, cat: PC, desc: "Programe"}
-    - {id: 18, cat: TV/HD, desc: "Seriale HD"}
-    - {id: 19, cat: TV/HD, desc: "Seriale HD-RO"}
-    - {id: 20, cat: TV/SD, desc: "Seriale TV"}
-    - {id: 21, cat: TV/SD, desc: "Seriale TV-RO"}
-    - {id: 22, cat: TV/Sport, desc: "Sport"}
-    - {id: 23, cat: Audio/Video, desc: "Video Clip"}
-    - {id: 24, cat: XXX, desc: "Adult 18+"}
-    - {id: 36, cat: Movies/3D, desc: "Video 3D"}
-    - {id: 37, cat: Movies/HD, desc: "Animație HD"}
-
-  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: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: div.recover-error2
-  test:
-    path: profile.php
-
-download:
-  selectors:
-    - selector: a[href^="download.php/"]
-      attribute: href
-
-search:
-  paths:
-    - path: download-torrents
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    # 0 active, 1 incldead, 2 onlydead, 3 freeleech
-    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
-
-  rows:
-    selector: tr.browse
-
-  fields:
-    category:
-      selector: a[href^="torrents.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: a[href^="details.php?id="]
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    files:
-      selector: td:nth-last-child(7)
-    date:
-      selector: td:nth-last-child(5)
-      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
-        - name: re_replace
-          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
-        - name: re_replace
-          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
-        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
-        - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
-        - name: re_replace
-          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
-        - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
-        - name: re_replace
-          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
-        - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
-        - name: re_replace
-          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
-        - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
-        - name: re_replace
-          args: ["(?i) (ay)", "month"]
-        - name: re_replace
-          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
-        - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
-        - name: re_replace
-          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
-        - name: re_replace
-          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
-        - name: re_replace
-          args: ["(?i) (an)", "year"]
-        - name: re_replace
-          args: ["(?i)(För |und)", ""] # Misc removals
-        - name: timeago
-    size:
-      selector: td:nth-last-child(4)
-    seeders:
-      selector: td:nth-last-child(3)
-    leechers:
-      selector: td:nth-last-child(2)
-    downloadvolumefactor:
-      case:
-        "img[src=\"./pic/freeleech.png\"]": 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
-# engine n/a

src/Jackett.Common/Definitions/shanaproject.yml

@@ -0,0 +1,112 @@
+---
+id: shanaproject
+name: Shana Project
+description: "Shana Project is a Public torrent site for ANIME"
+language: en-US
+type: public
+encoding: UTF-8
+links:
+  - https://www.shanaproject.com/
+
+settings:
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: date
+    options:
+      date: created
+      ep: episode
+      fsize: size
+      title: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: Descending
+    options:
+      Descending: desc
+      Ascending: asc
+  - name: info
+    type: info
+    label: Searching
+    default: This site only supports searching for Titles. Do not add a season or episode number, or a quality to your query.
+
+caps:
+  categorymappings:
+    - {id: Anime, cat: TV/Anime, desc: Anime}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+
+search:
+  paths:
+    - path: search/
+  inputs:
+    title: "{{ .Keywords }}"
+    subber: ""
+    sort: "{{ .Config.sort }}"
+    dir: "{{ .Config.type }}"
+  keywordsfilters:
+    # strip season and ep
+    - name: re_replace
+      args: ["(?i)(?:\\s?[SE]?\\d{1,4}){1,2}$", ""]
+
+  rows:
+    selector: div.grid_12 > div[id^="rel"]
+
+  fields:
+    category:
+      text: Anime
+    title:
+      selector: div.release_leftover > div.release_text_contents
+      filters:
+        - name: re_replace
+          args: ["^(\\[.*\\]) (.*)", "$2 $1"]
+        - name: re_replace
+          args: ["(?i)(.mkv)", ""]
+    details:
+      selector: a
+      attribute: href
+    download:
+      selector: a[href^="/download/"]
+      attribute: href
+    date_full:
+      # May 8, 2022, 6:25 a.m.
+      selector: div.release_20:contains(".m."):contains(":")
+      optional: true
+      filters:
+        - name: re_replace
+          args: ["\\.", ""]
+        - name: dateparse
+          args: "January 2, 2006, 3:04 PM"
+    date_abbr:
+      # May 8, 2022, 6 a.m.
+      selector: div.release_20:contains(".m."):not(:contains(":"))
+      optional: true
+      filters:
+        - name: re_replace
+          args: ["\\.", ""]
+        - name: dateparse
+          args: "January 2, 2006, 3 PM"
+    date_noon:
+      # April 30, 2022, noon
+      selector: div.release_20:contains(", noon")
+      optional: true
+      filters:
+        - name: re_replace
+          args: [" noon", " 12 pm"]
+        - name: dateparse
+          args: "January 2, 2006, 3 PM"
+    date:
+      text: "{{ if or .Result.date_full .Result.date_abbr .Result.date_noon }}{{ or .Result.date_full .Result.date_abbr .Result.date_noon }}{{ else }}now{{ end }}"
+    size:
+      selector: div.release_size
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

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

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

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

@@ -14,7 +14,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
 
 settings:
@@ -93,6 +93,8 @@ search:
       selector: details_link
     download:
       selector: download_link
+    infohash:
+      selector: info_hash
     poster:
       selector: poster
       filters:
@@ -136,4 +138,4 @@ search:
     minimumseedtime:
       # 7 days (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 6.0.6
+# json UNIT3D 6.1.0

src/Jackett.Common/Definitions/skipthetrailers.yml

@@ -14,7 +14,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
     music-search: [q]
     book-search: [q]
@@ -95,6 +95,8 @@ search:
       selector: details_link
     download:
       selector: download_link
+    infohash:
+      selector: info_hash
     poster:
       selector: poster
       filters:
@@ -140,4 +142,4 @@ search:
     minimumseedtime:
       # 7 days (as seconds = 2 x 24 x 60 x 60)
       text: 172800
-# json UNIT3D 6.0.6
+# json UNIT3D 6.0.8

src/Jackett.Common/Definitions/sktorrent.yml

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

src/Jackett.Common/Definitions/spidertk.yml

@@ -6,15 +6,17 @@ language: fr-FR
 type: private
 encoding: UTF-8
 links:
+  - https://spidertk.top/
+legacylinks:
   - https://spidertk.xyz/
 
 caps:
   categorymappings:
-    - {id: 401, cat: Movies/BluRay, desc: "Films / 2160p / BluRay"}
+    - {id: 401, cat: Movies/BluRay, desc: "Films / 2160p / BluRay Full"}
     - {id: 410, cat: Movies/UHD, desc: "Films / 2160p / REMUX"}
     - {id: 411, cat: Movies/UHD, desc: "Films / 2160p / AV1"}
     - {id: 412, cat: Movies/UHD, desc: "Films / 2160p / x265"}
-    - {id: 413, cat: Movies/BluRay, desc: "Films / 1080p / BluRay"}
+    - {id: 413, cat: Movies/BluRay, desc: "Films / 1080p / BluRay Full"}
     - {id: 414, cat: Movies/HD, desc: "Films / 1080p / REMUX"}
     - {id: 415, cat: Movies/HD, desc: "Films / 1080p / AV1"}
     - {id: 416, cat: Movies/HD, desc: "Films / 1080p / x265"}
@@ -34,7 +36,6 @@ caps:
     - {id: 426, cat: Movies, desc: "Films / Animation"}
     - {id: 427, cat: Movies/Other, desc: "Films / Spectacle"}
     - {id: 428, cat: Audio/Video, desc: "Films / Concerts, Clips"}
-    - {id: 429, cat: Movies, desc: "Films / VOSTFR"}
     - {id: 460, cat: Movies, desc: "Films / VO"}
     - {id: 430, cat: TV, desc: "Séries / BluRay"}
     - {id: 431, cat: TV, desc: "Séries / Pack VF"}
@@ -50,7 +51,6 @@ caps:
     - {id: 441, cat: TV/Documentary, desc: "Séries / Documentaire"}
     - {id: 442, cat: TV/Sport, desc: "Séries / Sport"}
     - {id: 443, cat: TV, desc: "Séries / Émission TV"}
-    - {id: 461, cat: TV, desc: "Séries / VO"}
     - {id: 444, cat: Books/EBook, desc: "Livres / Roman"}
     - {id: 445, cat: Audio/Audiobook, desc: "Livres / Audio"}
     - {id: 446, cat: Books/Mags, desc: "Livres / Magazine"}
@@ -63,9 +63,9 @@ caps:
     - {id: 453, cat: PC/0day, desc: "Logiciels / Appli Windows"}
     - {id: 454, cat: PC/Mac, desc: "Logiciels / Appli Mac"}
     - {id: 455, cat: PC, desc: "Logiciels / Appli Linux"}
+    - {id: 459, cat: PC/Mobile-Android, desc: "Logiciels / Android"}
     - {id: 456, cat: Console, desc: "Logiciels / Console"}
     - {id: 457, cat: PC/Mobile-iOS, desc: "Logiciels / iOS"}
-    - {id: 459, cat: PC/Mobile-Android, desc: "Logiciels / Android"}
 
   modes:
     search: [q]
@@ -210,18 +210,18 @@ search:
       selector: td: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
+        img[src="pic/freeleech.png"]: 0
+        img[src="pic/2xupfree.png"]: 0
+        img[src="pic/50pc.png"]: 0.5
+        img[src="pic/2x50pc.png"]: 0.5
+        img[src="pic/30pc.png"]: 0.3
         "*": 1
     uploadvolumefactor:
       case:
-        img.pro_50pctdown2up: 2
-        img.pro_free2up: 2
-        img.pro_2up: 2
+        img[src="pic/2x.png"]: 2
+        img[src="pic/2xupfree.png"]: 2
+        img[src="pic/2x50pc.png"]: 2
         "*": 1
     minimumratio:
       text: 0.81
-# NexusPHP Standard v1.5 Beta 4
+# NexusPHP Custom 1.7.7 2022-04-30