tellytorrent: restore. resolves #5635 (#13310)

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

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

.github/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
@@ -60,7 +61,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * E-Hentai
  * elitetorrent
  * EpubLibre
- * Erai-Raws
  * EXT Torrents
  * ExtraTorrent.st
  * EZTV
@@ -81,9 +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
- * KissSub
+ * kickasstorrents.ws
+ * Knaben
  * Legit Torrents
  * LePorno.info
  * LimeTorrents
@@ -91,8 +91,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * LinuxTracker
  * Mac Torrents Download
  * MegaPeer
- * MejorTorrent
  * Mikan
+ * MioBT
  * MixTapeTorrent
  * MoviesDVDR
  * MovieTorrent
@@ -104,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
@@ -119,6 +120,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Portugas
  * ProPorn
  * ProStyleX
+ * PS4-Torrent
  * Rapidzona
  * RARBG
  * RinTor
@@ -126,8 +128,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Rus-media
  * RuTor
  * RuTracker.RU
+ * Seedoff
  * seleZen
  * Sexy-Pics
+ * Shana Project
  * ShizaProject
  * ShowRSS
  * Solid Torrents
@@ -148,7 +152,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TorrentFunk
  * TorrentGalaxy (TGx)
  * TorrentKitty
- * TorrentMafya
  * TorrentParadise
  * TorrentProject2
  * TorrentQQ (토렌트큐큐)
@@ -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>
@@ -188,14 +190,17 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * DimeADozen (EzTorrent)
  * DXP (Deaf Experts)
  * EniaHD
+ * Erai-Raws
  * ExKinoRay
  * ExtremlymTorrents
  * Fenyarnyek-Tracker
+ * File-Tracker
  * Fou-Du-Cinema
  * Gay-Torrents.net
  * Genesis-Movement
  * HamsterStudio
  * HD-CzTorrent
+ * HDGalaKtik
  * HunTorrent
  * IV-Torrents
  * KinoNaVse100
@@ -203,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
@@ -216,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
@@ -249,23 +255,22 @@ 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)
  * Aussierul.es [![(invite needed)][inviteneeded]](#)
  * AvistaZ (AsiaTorrents)
  * Back-ups [![(invite needed)][inviteneeded]](#)
- * bB [![(invite needed)][inviteneeded]](#)
  * BakaBT
  * BeiTai
  * Best-Core
@@ -307,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
@@ -330,6 +335,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * DivTeam
  * DocsPedia
  * Dragonworld Reloaded [![(invite needed)][inviteneeded]](#)
+ * Dream Tracker
  * EbookParadijs
  * Ebooks-Shares
  * Empornium (EMP) [![(invite needed)][inviteneeded]](#)
@@ -358,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)
@@ -392,24 +399,22 @@ 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]](#)
  * Korsar
  * KrazyZone
+ * Kufirc
  * LastFiles
  * Lat-Team [![(invite needed)][inviteneeded]](#)
  * Le Saloon
@@ -442,7 +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 [![(invite needed)][inviteneeded]](#)
+ * NBTorrents
  * NCore
  * Nebulance (NBL) (TransmiTheNet)
  * NetCosmo
@@ -463,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)
@@ -488,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
@@ -501,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
@@ -532,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)
@@ -543,13 +545,15 @@ 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)
  * TheScenePlace (TSP)
  * TJUPT
  * TLFBits [![(invite needed)][inviteneeded]](#)
- * ToTheGlory (TTG) [![(invite needed)][inviteneeded]](#)
+ * TmGHuB
  * Torrent Network (TN)
  * Torrent Sector Crew (TSC)
  * Torrent Surf
@@ -564,14 +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)
- * Trackeros
+ * TotallyKids (TK)
+ * ToTheGlory (TTG) [![(invite needed)][inviteneeded]](#)
  * TranceTraffic [![(invite needed)][inviteneeded]](#)
  * Trezzor [![(invite needed)][inviteneeded]](#)
  * TurkSeed
@@ -594,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
@@ -623,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

@@ -177,7 +177,7 @@ hr {
     text-align: center;
 }
 
-#jackett-allowext, #jackett-allowupdate, #jackett-logging, #jackett-prerelease, #jackett-cache-enabled {
+#jackett-allowext, #jackett-allowcors, #jackett-allowupdate, #jackett-logging, #jackett-prerelease, #jackett-cache-enabled {
     width: 25px;
 }
 
@@ -301,6 +301,18 @@ table td.fit{
     background-color: #d0ab44;
 }
 
+.label-tmdb {
+    background-color: #7dbfd4;
+}
+
+.label-tvdb {
+    background-color: #86cca8;
+}
+
+.label-douban {
+    background-color: #86cc10;
+}
+
 .tooltip {
     pointer-events: none;
 }

src/Jackett.Common/Content/custom.js

@@ -125,6 +125,7 @@ function loadJackettSettings() {
 
         $("#jackett-savedir").val(data.blackholedir);
         $("#jackett-allowext").attr('checked', data.external);
+        $("#jackett-allowcors").attr('checked', data.cors);
         $("#jackett-allowupdate").attr('checked', data.updatedisabled);
         $("#jackett-prerelease").attr('checked', data.prerelease);
         $("#jackett-logging").attr('checked', data.logging);
@@ -567,20 +568,7 @@ function addIndexer(indexerId, displayNotification) {
                 doNotify("Configuration failed: " + data.error, "danger", "glyphicon glyphicon-alert");
             }
         }).fail(function (data) {
-                var indexEnd = 2048 - "https://github.com/Jackett/Jackett/issues/new?template=bug_report.yml&title=[".length - indexerId.length - "] ".length - " (Config)".length; // keep url <= 2k #5104
-            if (data.responseJSON.error !== undefined) {
-                var githubrepo = "Jackett/Jackett";
-                var githubtext = "this indexer";
-                var githubtemplate = "?template=bug_report.yml&"
-                if (data.responseJSON.error.includes("check FlareSolverr logs") || data.responseJSON.error.includes("cookies provided by FlareSolverr are not valid")) {
-                    githubrepo = "FlareSolverr/FlareSolverr";
-                    githubtext = "FlareSolverr";
-                    githubtemplate = "?"
-                }
-                doNotify("An error occurred while configuring this indexer<br /><b>" + data.responseJSON.error.substring(0, indexEnd) + "</b><br /><i><a href=\"https://github.com/" + githubrepo + "/issues/new" + githubtemplate + "title=[" + indexerId + "] " + data.responseJSON.error.substring(0, indexEnd) + " (Config)\" target=\"_blank\">Click here to open an issue on GitHub for " + githubtext + ".</a><i>", "danger", "glyphicon glyphicon-alert", false);
-            } else {
-                doNotify("An error occurred while configuring this indexer, is Jackett server running ?", "danger", "glyphicon glyphicon-alert");
-            }
+            doErrorNotify(indexerId, data.responseJSON.error, "configuring");
         });
     });
 }
@@ -736,20 +724,7 @@ function testIndexer(id, notifyResult) {
         }
     }).fail(function (data) {
         updateTestState(id, "error", data.error, indexers);
-        if (data.responseJSON.error !== undefined && notifyResult) {
-            var indexEnd = 2048 - "https://github.com/Jackett/Jackett/issues/new?template=bug_report.yml&title=[".length - id.length - "] ".length - " (Test)".length; // keep url <= 2k #5104
-            var githubrepo = "Jackett/Jackett";
-            var githubtext = "this indexer";
-            var githubtemplate = "?template=bug_report.yml&"
-            if (data.responseJSON.error.includes("check FlareSolverr logs") || data.responseJSON.error.includes("cookies provided by FlareSolverr are not valid")) {
-                githubrepo = "FlareSolverr/FlareSolverr";
-                githubtext = "FlareSolverr";
-                githubtemplate = "?"
-            }
-            doNotify("An error occurred while testing this indexer<br /><b>" + data.responseJSON.error.substring(0, indexEnd) + "</b><br /><i><a href=\"https://github.com/" + githubrepo + "/issues/new" + githubtemplate + "title=[" + id + "] " + data.responseJSON.error.substring(0, indexEnd) + " (Test)\" target=\"_blank\">Click here to open an issue on GitHub for " + githubtext + ".</a><i>", "danger", "glyphicon glyphicon-alert", false);
-        } else {
-            doNotify("An error occurred while testing indexers, please take a look at indexers with failed test for more informations.", "danger", "glyphicon glyphicon-alert");
-        }
+        doErrorNotify(id, data.responseJSON.error, "testing");
     });
 }
 
@@ -911,12 +886,7 @@ function populateSetupForm(indexerId, name, config, caps, link, alternativesitel
                 doNotify("Configuration failed: " + data.error, "danger", "glyphicon glyphicon-alert");
             }
         }).fail(function (data) {
-            if (data.responseJSON.error !== undefined) {
-                var indexEnd = 2048 - "https://github.com/Jackett/Jackett/issues/new?template=bug_report.yml&title=[".length - indexerId.length - "] ".length - " (Config)".length; // keep url <= 2k #5104
-                doNotify("An error occurred while updating this indexer<br /><b>" + data.responseJSON.error.substring(0, indexEnd) + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?template=bug_report.yml&title=[" + indexerId + "] " + data.responseJSON.error.substring(0, indexEnd) + " (Config)\" target=\"_blank\">Click here to open an issue on GitHub for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
-            } else {
-                doNotify("An error occurred while updating this indexer, request to Jackett server failed, is server running ?", "danger", "glyphicon glyphicon-alert");
-            }
+            doErrorNotify(indexerId, data.responseJSON.error, "updating");
         }).always(function () {
             $goButton.html(originalBtnText);
             $goButton.prop('disabled', false);
@@ -940,6 +910,33 @@ function resolveUrl(baseUrl, url) {
     return url;
 }
 
+function doErrorNotify(indexerId, errorMessage, errorEvent) {
+  if (errorMessage !== undefined) {
+    var githubRepo = "Jackett/Jackett";
+    var githubText = "this indexer";
+    var githubTemplate = "?template=bug_report.yml&"
+    if (errorMessage.includes("FlareSolverr")) {
+      githubRepo = "FlareSolverr/FlareSolverr";
+      githubText = "FlareSolverr";
+      githubTemplate = "?"
+    }
+    var githubUrl = "https://github.com/" + githubRepo + "/issues/new" + githubTemplate + "title=[" + indexerId + "] (" + errorEvent + ")";
+    var indexEnd = 2000 - githubUrl.length; // keep url <= 2k #5104
+    var htmlEscapedError = $("<div>").text(errorMessage.substring(0, indexEnd)).html();
+    var urlEscapedError = encodeURIComponent(errorMessage.substring(0, indexEnd));
+    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 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);
+  } else {
+    doNotify("An error occurred while " + errorEvent + " indexers, please take a look at indexers with failed test for more information.",
+      "danger", "glyphicon glyphicon-alert");
+  }
+}
+
 function doNotify(message, type, icon, autoHide) {
     if (typeof autoHide === "undefined" || autoHide === null)
         autoHide = true;
@@ -974,10 +971,14 @@ function updateReleasesRow(row) {
     var labels = $(row).find("span.release-labels");
     var TitleLink = $(row).find("td.Title > a");
     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());
     var UploadVolumeFactor = parseFloat($(row).find("td.UploadVolumeFactor").html());
+    var Cat = $(row).find("td.Cat").html();
 
     var TitleTooltip = "";
     if (Poster)
@@ -996,11 +997,24 @@ function updateReleasesRow(row) {
 
     labels.empty();
 
-  if (IMDBId) {
-    var imdbLen = (IMDBId.toString().length > 7) ? 8 : 7;
+    if (IMDBId) {
+        var imdbLen = (IMDBId.toString().length > 7) ? 8 : 7;
         labels.append('\n<a href="https://www.imdb.com/title/tt' + ("00000000" + IMDBId).slice(-imdbLen) + '/" target="_blank" class="label label-imdb" alt="IMDB" title="IMDB">IMDB</a>');
     }
 
+    if (TMDBId && TMDBId > 0) {
+      var TMdbType = (Cat.includes("Movies")) ? "movie" :  "tv";
+      labels.append('\n<a href="https://www.themoviedb.org/' + TMdbType + '/' + TMDBId + '" target="_blank" class="label label-tmdb" alt="TMDB" title="TMDB">TMDB</a>');
+    }
+
+    if (TVDBId && TVDBId > 0) {
+      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>');
@@ -1527,6 +1541,7 @@ function bindUIButtons() {
         var jackett_basepathoverride = $("#jackett-basepathoverride").val();
         var jackett_baseurloverride = $("#jackett-baseurloverride").val();
         var jackett_external = $("#jackett-allowext").is(':checked');
+        var jackett_cors = $("#jackett-allowcors").is(':checked');
         var jackett_update = $("#jackett-allowupdate").is(':checked');
         var jackett_prerelease = $("#jackett-prerelease").is(':checked');
         var jackett_logging = $("#jackett-logging").is(':checked');
@@ -1547,6 +1562,7 @@ function bindUIButtons() {
         var jsonObject = {
             port: jackett_port,
             external: jackett_external,
+            cors: jackett_cors,
             updatedisabled: jackett_update,
             prerelease: jackett_prerelease,
             blackholedir: $("#jackett-savedir").val(),

src/Jackett.Common/Content/custom_mobile.css

@@ -161,7 +161,7 @@ hr {
     text-align: center;
 }
 
-#jackett-allowext, #jackett-allowupdate, #jackett-logging, #jackett-prerelease, #jackett-cache-enabled {
+#jackett-allowext, #jackett-allowcors, #jackett-allowupdate, #jackett-logging, #jackett-prerelease, #jackett-cache-enabled {
     width: 25px;
 }
 
@@ -284,6 +284,18 @@ table td.fit{
     background-color: #d0ab44;
 }
 
+.label-tmdb {
+    background-color: #7dbfd4;
+}
+
+.label-tvdb {
+    background-color: #86cca8;
+}
+
+.label-douban {
+    background-color: #86cc10;
+}
+
 .tooltip {
     pointer-events: none;
 }

src/Jackett.Common/Content/index.html

@@ -13,7 +13,7 @@
     <link rel="icon" type="image/ico" href="../favicon.ico" />
     <link rel='shortcut icon' type='image/x-icon' href='../favicon.ico' />
     <script type="text/javascript" src="../libs/filesize.min.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../libs/jquery.min.js?changed=2017083001"></script>
+    <script type="text/javascript" src="../libs/jquery.min.js?changed=13019"></script>
     <script type="text/javascript" src="../libs/jquery.dataTables.min.js?changed=2017083001" charset="utf8"></script>
     <script type="text/javascript" src="../libs/handlebars.min.js?changed=2017083001"></script>
     <script type="text/javascript" src="../libs/moment.min.js?changed=2017083001"></script>
@@ -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=20220123" media="only screen and (min-device-width: 480px)">
-    <link rel="stylesheet" type="text/css" href="../custom_mobile.css?changed=20220123" 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">
@@ -132,7 +132,7 @@
         </div>
         <div class="input-area">
             <span class="input-header">Base URL override: </span>
-            <input id="jackett-baseurloverride" class="form-control input-right" type="text" value="" placeholder="http://jackett:9117">
+            <input id="jackett-baseurloverride" class="form-control input-right" type="url" value="" placeholder="http://jackett:9117">
         </div>
         <div class="input-area">
             <span class="input-header">Server port: </span>
@@ -178,6 +178,10 @@
             <span class="input-header">External access: </span>
             <input id="jackett-allowext" class="form-control input-right" type="checkbox" />
         </div>
+        <div class="input-area">
+            <span class="input-header">Allow CORS: </span>
+            <input id="jackett-allowcors" class="form-control input-right" type="checkbox" />
+        </div>
         <div class="input-area">
             <span class="input-header">Disable auto update: </span>
             <input id="jackett-allowupdate" class="form-control input-right" type="checkbox" />
@@ -206,7 +210,7 @@
         </div>
         <div class="input-area">
           <span class="input-header">FlareSolverr API URL: </span>
-          <input id="jackett-flaresolverrurl" class="form-control input-right" type="text" value="" placeholder="Blank for default">
+          <input id="jackett-flaresolverrurl" class="form-control input-right" type="url" value="" placeholder="Blank for default">
         </div>
         <div class="input-area">
           <span class="input-header">FlareSolverr Max Timeout (ms): </span>
@@ -237,15 +241,15 @@
     <script id="setup-item-inputstring" type="text/x-handlebars-template">
         <div class="setup-item-inputstring">
             {{#if ispassword}}
-            <input class="form-control" type="password" value="{{{value}}}" />
+            <input class="form-control" type="password" value="{{value}}" />
             {{else}}
-            <input class="form-control" type="text" value="{{{value}}}" />
+            <input class="form-control" type="text" value="{{value}}" />
             {{/if}}
         </div>
     </script>
     <script id="setup-item-password" type="text/x-handlebars-template">
         <div class="setup-item-password">
-            <input class="form-control" type="password" value="{{{value}}}" />
+            <input class="form-control" type="password" value="{{value}}" />
         </div>
     </script>
     <script id="setup-item-inputbool" type="text/x-handlebars-template">
@@ -291,7 +295,7 @@
     </script>
     <script id="setup-item-hiddendata" type="text/x-handlebars-template">
         <div class="setup-item-hiddendata">
-            <input class="form-control" type="text" value="{{{value}}}" />
+            <input class="form-control" type="text" value="{{value}}" />
         </div>
     </script>
     <script id="setup-item-alternativesitelinks" type="text/x-handlebars-template">
@@ -454,7 +458,7 @@
                             </thead>
                             <tbody>
                                 {{#each releases}}
-                                <tr class="jackett-releases-row" data-imdb="{{Imdb}}" 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>
@@ -464,7 +468,7 @@
                                     <td class="fit">{{Size}}</td>
                                     <td class="fit">{{jacketSize Size}}</td>
                                     <td class="fit">{{Files}}</td>
-                                    <td class="fit">{{CategoryDesc}}</td>
+                                    <td class="fit Cat">{{CategoryDesc}}</td>
                                     <td class="fit">{{Grabs}}</td>
                                     <td class="fit">{{Seeders}}</td>
                                     <td class="fit">{{Peers}}</td>
@@ -582,7 +586,7 @@
             </thead>
             <tbody>
                 {{#each Results}}
-                <tr class="jackett-search-results-row" data-imdb="{{Imdb}}" 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>
@@ -590,7 +594,7 @@
                     <td>{{Size}}</td>
                     <td class="fit">{{jacketSize Size}}</td>
                     <td>{{Files}}</td>
-                    <td>{{CategoryDesc}}</td>
+                    <td class="Cat">{{CategoryDesc}}</td>
                     <td>{{Grabs}}</td>
                     <td>{{Seeders}}</td>
                     <td>{{Peers}}</td>
@@ -750,6 +754,6 @@
     </script>
 
     <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=2022012602"></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=20220123" 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.day/
+  - 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/
@@ -36,6 +34,9 @@ legacylinks:
   - https://1337x.unblockit.cam/
   - https://1337x.nocensor.biz/
   - https://1337x.gd/
+  - https://1337x.unblockit.day/
+  - https://1337x.unblockit.llc/
+  - https://1337x.unblockit.blue/
 
 caps:
   categorymappings:
@@ -131,7 +132,7 @@ 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">FlareSolver</a> to access it.
+    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.
   - name: downloadlink
     type: select
     label: Download link

src/Jackett.Common/Definitions/1ptbar.yml

@@ -115,7 +115,7 @@ search:
       attribute: href
     date_elapsed:
       # time type: time elapsed (default)
-      selector: td.rowfollow:nth-last-of-type(7) > span[title]
+      selector: td.rowfollow:nth-last-of-type(6) > span[title]
       attribute: title
       optional: true
       filters:
@@ -125,7 +125,7 @@ search:
           args: "2006-01-02 15:04:05 -07:00"
     date_added:
       # time added
-      selector: td.rowfollow:nth-last-of-type(7):not(:has(span))
+      selector: td.rowfollow:nth-last-of-type(6):not(:has(span))
       optional: true
       filters:
         - name: append
@@ -135,13 +135,13 @@ search:
     date:
       text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
     size:
-      selector: td.rowfollow:nth-last-of-type(6)
-    seeders:
       selector: td.rowfollow:nth-last-of-type(5)
-    leechers:
+    seeders:
       selector: td.rowfollow:nth-last-of-type(4)
-    grabs:
+    leechers:
       selector: td.rowfollow:nth-last-of-type(3)
+    grabs:
+      selector: td.rowfollow:nth-last-of-type(2)
     downloadvolumefactor:
       case:
         img.pro_free: 0

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

@@ -91,21 +91,11 @@ search:
     selector: table.ttable_headinner tr.t-row:has(a[href^="download.php?id="])
 
   fields:
-    category:
+    categorydesc:
       selector: a.category-link
-      case:
-        ":contains(\"DVDISO\")": 1
-        ":contains(\"DVD-RIP\")": 2
-        ":contains(\"TV\")": 3
-        ":contains(\"Perf\")": 4
-        ":contains(\"PV\")": 5
-        ":contains(\"Webstream\")": 6
-        ":contains(\"Image\")": 7
-        ":contains(\"Audio\")": 8
-        ":contains(\"Album\")": 9
-        ":contains(\"Single\")": 10
-        ":contains(\"Radio\")": 11
-        ":contains(\"Misc\")": 12
+      filters:
+        - name: split
+          args: [" ", 1]
     title:
       selector: a[href^="torrents-details.php?id="]
       attribute: title

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]
@@ -96,14 +96,16 @@ search:
       selector: meta.total
 
   fields:
-    categorydesc:
-      selector: category
+    category:
+      selector: category_id
     title:
       selector: name
     details:
       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.5
+# 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/anirena.yml

@@ -12,7 +12,7 @@ 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">FlareSolver</a> to access it.
+    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.
 
 caps:
   categorymappings:

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

@@ -0,0 +1,166 @@
+---
+id: audiences
+name: Audiences
+description: "Audiences is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - https://audiences.me/
+
+caps:
+  categorymappings:
+    - {id: 401, cat: Movies, desc: "电影/Movies"}
+    - {id: 402, cat: TV, desc: "剧集/TV-Series"}
+    - {id: 403, cat: TV, desc: "综艺/TV-Show"}
+    - {id: 406, cat: TV/Documentary, desc: "纪录片/Documentary"}
+    - {id: 408, cat: Audio, desc: "音乐/Music"}
+    - {id: 404, cat: Audio/Audiobook, desc: "有声书/Audiobook"}
+    - {id: 405, cat: Books, desc: "电子书/Ebook"}
+    - {id: 407, cat: TV/Sport, desc: "体育/Sports"}
+    - {id: 410, cat: PC/Games, desc: "游戏/Game"}
+    - {id: 411, cat: PC/0day, desc: "软件/Software"}
+    - {id: 410, cat: TV, desc: "学习/Study"}
+    - {id: 409, cat: Other, desc: "其他/Other"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    music-search: [q]
+
+settings:
+  - name: cookie
+    type: text
+    label: Cookie
+  - name: info
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - 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:
+  method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 justdead
+    incldead: 0
+    # promotion: 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x 50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdb
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+
+  rows:
+    selector: table.torrents > tbody > tr:has(table.torrentname)
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+    details:
+      selector: a[title][href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    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]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
+    date_added:
+      # time added
+      selector: td:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "2006-01-0215:04:05 -07:00"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td.rowfollow:nth-child(5)
+    seeders:
+      selector: td.rowfollow:nth-child(6)
+    leechers:
+      selector: td.rowfollow:nth-child(7)
+    grabs:
+      selector: td.rowfollow:nth-child(8)
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+    description:
+      selector: td:nth-child(2)
+      remove: a, img
+# NexusPHP Standard v1.5 Beta 4

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.day/
+  - 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,6 +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="])
+    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

@@ -25,12 +25,20 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
+    tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
     book-search: [q]
 
 settings:
+  - name: striprussian
+    type: checkbox
+    label: Strip Russian Letters
+    default: false
+  - name: addrussian
+    type: checkbox
+    label: Add RUSSIAN to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
+    default: false
   - name: adverts
     type: checkbox
     label: Include Advertising
@@ -51,6 +59,9 @@ search:
     s: "{{ .Keywords }}"
     sort: "{{ re_replace .Config.sort \"_\" \"\" }}"
     $raw: "{{ if .Config.adverts }}{{ else }}&rek=no{{ end}}"
+  keywordsfilters:
+    - name: re_replace # S01 or S01E01 to 1 сезон
+      args: ["(?i)\\bS0*(\\d+)(?:E0*(\\d+))?\\b", "$1 сезон"]
 
   rows:
     selector: table.browse-list > tbody > tr
@@ -64,6 +75,29 @@ search:
           args: tmp
     title:
       selector: a[href^="details.php?id="]
+      filters:
+        - name: replace
+          args: ["селезень", "selezen"]
+        - name: re_replace
+          args: ["(?:(\\d+-*\\d*)\\s+[Сс]езоны?:?)\\s+\\((\\d+-*\\d*).*[?\\d]+\\)(.*)(\\((?:[12][0-9]{3}-?){1,}\\))(.*)", "$3 - S$1E$2 - $4 $5"]
+        - name: re_replace
+          args: ["\\((\\d+-*\\d*).*[?\\d]+\\)(.*)(\\((?:[12][0-9]{3}-?){1,}\\))(.*)", "$2 - E$1 - $3 $4"]
+        - name: re_replace
+          args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$0{{ end }}"]
+        - name: re_replace
+          args: ["[!?.,:|\\[\\]\\/]", " "]
+        - name: re_replace
+          args: ["^\\s+-\\s+", " "]
+        - name: append
+          args: "{{ if .Config.addrussian }} - RUSSIAN{{ else }}{{ end }}"
+        - name: replace
+          args: ["-Rip", "Rip"]
+        - name: replace
+          args: ["WEB-DL", "WEBDL"]
+        - name: replace
+          args: ["WEBDLRip", "WEBDL"]
+        - name: replace
+          args: ["HDTVRip", "HDTV"]
     details:
       selector: a[href^="details.php?id="]
       attribute: href
@@ -74,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/bitsearch.yml

@@ -13,6 +13,7 @@ legacylinks:
 
 caps:
   categories:
+    AudioBook: Audio/Audiobook
     eBook: Books/EBook
     "Ebook/Course": Books/EBook
     Games: PC/Games

src/Jackett.Common/Definitions/bitsexy.yml

@@ -1,7 +1,7 @@
 ---
 id: bitsexy
 name: BitSexy
-description: "BitSexy is a Private Torrent Tracker for 3x"
+description: "BitSexy is a Private Torrent Tracker for 3X"
 language: en-US
 type: private
 encoding: UTF-8

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"}
@@ -181,8 +189,6 @@ search:
       filters:
         - name: regexp
           args: "Uploaded (.+?) by"
-        - name: replace
-          args: [" at ", " "]
         - name: fuzzytime
     date_unix:
       # within the hour (unix)

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
@@ -256,9 +253,7 @@ search:
         - name: replace
           args: [" by", ""]
         - name: replace
-          args: ["às ", ""] # at
-        - name: replace
-          args: ["at ", ""]
+          args: ["às ", "at "]
         - name: replace
           args: ["Hoje", "Today"]
         - name: replace

src/Jackett.Common/Definitions/btschool.yml

@@ -43,7 +43,7 @@ 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">FlareSolver</a> to access it.
+    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.
   - name: info_tpp
     type: info
     label: Results Per Page

src/Jackett.Common/Definitions/btsow.yml

@@ -6,7 +6,7 @@ language: en-US
 type: public
 encoding: UTF-8
 links:
-  - https://btsow.rest/
+  - https://btsow.bar/
 legacylinks:
   - https://btos.pw/
   - https://btio.pw/
@@ -29,6 +29,7 @@ legacylinks:
   - https://btsow.shop/
   - https://btsow.us/
   - https://btsow.one/
+  - https://btsow.rest/
 
 caps:
   categories:

src/Jackett.Common/Definitions/byrutor.yml

@@ -28,15 +28,15 @@ caps:
     - {id: 14, cat: PC/Games, desc: "Хорроры"}
     - {id: 15, cat: PC/Games, desc: "Открытый мир"}
     - {id: 16, cat: PC/Games, desc: "Аниме"}
+    - {id: 248, cat: PC/Games, desc: "Repack от Chovka"}
     - {id: 17, cat: PC/Games, desc: "Repack от Механики"}
-    - {id: 18, cat: PC/Games, desc: "Repack от Xatab"}
-    - {id: 19, cat: PC/Games, desc: "Repack от Catalyst"}
     - {id: 20, cat: PC/Games, desc: "RePack от FitGirl"}
-    - {id: 21, cat: PC/Games, desc: "RePack от qoob"}
+    - {id: 18, cat: PC/Games, desc: "Repack от Xatab"}
     - {id: 232, cat: PC/Games, desc: "RePack от SpaceX"}
     - {id: 233, cat: PC/Games, desc: "RePack от Pioneer"}
+    - {id: 19, cat: PC/Games, desc: "Repack от Catalyst"}
+    - {id: 249, cat: PC/Games, desc: "GOG игры"}
     - {id: 22, cat: PC/Games, desc: "Русская озвучка"}
-    - {id: 24, cat: PC/Games, desc: "Новинки игр"}
     - {id: 25, cat: PC/Games, desc: "Старые игры"}
     - {id: 26, cat: PC/Games, desc: "Игры с геймпадом"}
     - {id: 27, cat: PC/Games, desc: "Мультиплеер"}
@@ -199,17 +199,15 @@ caps:
     - {id: 185, cat: PC/Games, desc: "Расследование"}
     - {id: 186, cat: PC/Games, desc: "Мифология"}
     - {id: 187, cat: PC/Games, desc: "VR"}
-    - {id: 190, cat: PC/Games, desc: "Dungeon Crawler"}
     - {id: 191, cat: PC/Games, desc: "Психологическая"}
     - {id: 192, cat: PC/Games, desc: "Нелинейная"}
     - {id: 193, cat: PC/Games, desc: "Подземелье"}
-    - {id: 194, cat: PC/Games, desc: "Игры по сети"}
     - {id: 195, cat: PC/Games, desc: "Для нескольких игроков"}
     - {id: 196, cat: PC/Games, desc: "Шедевр"}
     - {id: 197, cat: PC/Games, desc: "Ретро"}
     - {id: 198, cat: PC/Games, desc: "Олдскул"}
-    - {id: 237, cat: PC/Games, desc: "Игры 2023 года"}
     - {id: 238, cat: PC/Games, desc: "Игры 2024 года"}
+    - {id: 237, cat: PC/Games, desc: "Игры 2023 года"}
     - {id: 236, cat: PC/Games, desc: "Игры 2022 года"}
     - {id: 235, cat: PC/Games, desc: "Игры 2021 года"}
     - {id: 199, cat: PC/Games, desc: "Игры 2020 года"}
@@ -243,16 +241,13 @@ caps:
     - {id: 227, cat: PC/Games, desc: "Игры 1992 года"}
     - {id: 228, cat: PC/Games, desc: "Игры 1991 года"}
     - {id: 229, cat: PC/Games, desc: "Игры 1990 года"}
-    - {id: 230, cat: PC/Games, desc: "Все Топ игры"}
     - {id: 231, cat: PC/Games, desc: "Дополнения"}
+    - {id: 250, cat: PC/Games, desc: "Модификации"}
     - {id: 23, cat: PC/Games, desc: "Ранний Доступ"}
-    - {id: 239, cat: PC/Games, desc: "Ubisoft"}
-    - {id: 240, cat: PC/Games, desc: "Bethesda"}
-    - {id: 241, cat: PC/Games, desc: "2K"}
-    - {id: 242, cat: PC/Games, desc: "CD Projekt RED"}
-    - {id: 243, cat: PC/Games, desc: "Telltale Games"}
-    - {id: 244, cat: PC/Games, desc: "Capcom"}
-    - {id: 245, cat: PC/Games, desc: "Square Enix"}
+    - {id: 246, cat: PC/Games, desc: "Обновление"}
+    - {id: 230, cat: PC/Games, desc: "Все Топ игры"}
+    - {id: 24, cat: PC/Games, desc: "Новинка"}
+    - {id: 194, cat: PC/Games, desc: "Игры по сети"}
 
   modes:
     search: [q]
@@ -261,7 +256,7 @@ settings: []
 
 download:
   selectors:
-    - selector: a.itemtop_game
+    - selector: a.itemdown_games
       attribute: href
 
 search:
@@ -287,7 +282,8 @@ search:
     resorder: desc
 
   rows:
-    selector: div.short_search:has(div.shor_subtitles span:nth-child(2):contains("Б"))
+    # results without sizes are just pre-release announcements
+    selector: div.short_search:has(div.shor_subtitles span:nth-child(2):contains(" "))
 
   fields:
     category:
@@ -312,13 +308,20 @@ search:
       selector: img
       attribute: src
     date:
-      text: now
+      selector: img
+      attribute: src
+      filters:
+        - name: regexp
+          args: ".*/(\\d{4}-\\d{2})/.*"
+        - name: dateparse
+          args: "2006-01"
     seeders:
       text: 1
     leechers:
       text: 1
-    size:
-      selector: div.shor_subtitles span:nth-child(2)
+    size_rus:
+      selector: div.shor_subtitles span:nth-child(2):contains("Б")
+      optional: true
       filters:
         - name: replace
           args: ["ТБ", "TB"]
@@ -328,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/carphunter.yml

@@ -81,7 +81,6 @@ login:
   method: cookie
   inputs:
     cookie: "{{ .Config.cookie }}"
-  test:
   test:
     path: index.php
     selector: a[href^="logout.php"]

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,54 +10,41 @@ links:
 
 caps:
   categorymappings:
-    # Movie
-    - {id: 28, cat: Movies/SD, desc: "Movie - SD"}
-    - {id: 155, cat: Movies/DVD, desc: "Movie - DVD"}
-    - {id: 130, cat: Movies/SD, desc: "Movie - SD-Pack"}
-    # Movie-HD
-    - {id: 32, cat: Movies/HD, desc: "Movie-HD - HD"}
-    - {id: 154, cat: Movies/UHD, desc: "Movie-HD - UHD/4K"}
-    - {id: 162, cat: Movies/HD, desc: "Movie-HD - HD-Pack"}
-    # Serien
-    - {id: 60, cat: TV/SD, desc: "Serien - Xvid/x264"}
-    - {id: 157, cat: TV/HD, desc: "Serien - 720p/1080p"}
-    - {id: 158, cat: TV/UHD, desc: "Serien - UHD/4K"}
-    # S-Packs
-    - {id: 57, cat: TV/SD, desc: "S-Packs - SD"}
-    - {id: 59, cat: TV/HD, desc: "S-Packs - 720p"}
-    - {id: 156, cat: TV/HD, desc: "S-Packs - 1080p"}
-    # Doku
-    - {id: 160, cat: TV/Documentary, desc: "Doku - HD"}
-    - {id: 15, cat: TV/Documentary, desc: "Doku - SD"}
-    # App
-    - {id: 12, cat: PC/0day, desc: "App - Win"}
-    - {id: 11, cat: PC, desc: "App - Other"}
-    - {id: 10, cat: PC/Mac, desc: "App - Mac"}
-    - {id: 9, cat: PC/Mobile-Android, desc: "App - Linux/Android"}
-    # Game
-    - {id: 131, cat: Console, desc: "Game - Nintendo"}
-    - {id: 17, cat: PC/Games, desc: "Game - PC"}
-    - {id: 18, cat: Console, desc: "Game - PS"}
-    - {id: 24, cat: Console/Other, desc: "Game - Wimmelbild"}
-    # Audio
-    - {id: 159, cat: Audio/Audiobook, desc: "Audio - Hörbuch"}
-    - {id: 48, cat: Audio/MP3, desc: "Audio - mp3"}
-    - {id: 53, cat: Audio/Lossless, desc: "Audio - Flac"}
-    - {id: 52, cat: Audio, desc: "Audio - Pack"}
-    - {id: 109, cat: Audio/Video, desc: "Audio - Video-HD/SD"}
-    # Sport
-    - {id: 62, cat: TV/Sport, desc: "Sport - SD"}
-    - {id: 161, cat: TV/Sport, desc: "Sport - HD"}
-    # Paper
-    - {id: 163, cat: Books/Mags, desc: "Paper - Zeitungen"}
-    - {id: 63, cat: Books/Comics, desc: "Paper - Comic"}
-    - {id: 96, cat: Books/EBook, desc: "Paper - E-Book"}
-    # XXX
-    - {id: 113, cat: XXX/DVD, desc: "XXX - DVD"}
-    - {id: 76, cat: XXX, desc: "XXX - HD-SD"}
-    - {id: 75, cat: XXX/Pack, desc: "XXX - Pack"}
-    # Request
-    - {id: 151, cat: Other, desc: "Request - spritti01"}
+    - {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"}
+    - {id: 32, cat: Movies/DVD, desc: "Filme - DVD"}
+    - {id: 33, cat: Movies/HD, desc: "Filme - HD"}
+    - {id: 34, cat: Movies, desc: "Filme - Klassiker"}
+    - {id: 35, cat: Movies, desc: "Filme - Pack"}
+    - {id: 36, cat: Movies/SD, desc: "Filme - SD"}
+    - {id: 37, cat: Movies/UHD, desc: "Filme - UHD"}
+    - {id: 38, cat: Movies/HD, desc: "Filme - x264"}
+    - {id: 63, cat: Movies, desc: "Fuer Unsere Kleinsten"}
+    - {id: 64, cat: PC/Mobile-Other, desc: "Handy-Stuff"}
+    - {id: 39, cat: Audio, desc: "Musik - Alben"}
+    - {id: 40, cat: Audio, desc: "Musik - Diskografie"}
+    - {id: 41, cat: Audio/Audiobook, desc: "Musik - Hoerbuch"}
+    - {id: 42, cat: Audio, desc: "Musik - Mixe"}
+    - {id: 43, cat: Audio/MP3, desc: "Musik - MP3"}
+    - {id: 66, cat: Audio, desc: "Musik - Pack"}
+    - {id: 44, cat: Audio/Video, desc: "Musik - Video"}
+    - {id: 45, cat: PC, desc: "Programme - Linux"}
+    - {id: 48, cat: PC/Mac, desc: "Programme - Mac"}
+    - {id: 49, cat: PC/0day, desc: "Programme - Windows"}
+    - {id: 65, cat: TV, desc: "Serien - Allgemein"}
+    - {id: 50, cat: TV/Documentary, desc: "Serien - Dokus"}
+    - {id: 51, cat: TV, desc: "Serien - Klassiker"}
+    - {id: 52, cat: TV, desc: "Serien - Pack"}
+    - {id: 53, cat: TV/Sport, desc: "Serien - Sport"}
+    - {id: 60, cat: Other, desc: "Sonstiges"}
+    - {id: 54, cat: PC/Mobile-Other, desc: "Spiele - Handy"}
+    - {id: 55, cat: Console, desc: "Spiele - Konsolen"}
+    - {id: 57, cat: PC/Games, desc: "Spiele - Mac / Linux / PC"}
+    - {id: 58, cat: Console/Other, desc: "Spiele - Wimmel"}
+    - {id: 59, cat: XXX, desc: "XXX"}
 
   modes:
     search: [q]
@@ -73,148 +60,110 @@ settings:
   - name: password
     type: password
     label: Password
-  - name: pin
-    type: text
-    label: Pin
+  - name: freeleech
+    type: checkbox
+    label: Filter FreeLeech only
+    default: false
+  - name: onlyupload
+    type: checkbox
+    label: Filter OnlyUpload only
+    default: false
+  - name: info_free
+    type: info
+    label: About Freeleech and OnlyUpload at Coastal Crew
+    default: <li>FreeLeech are torrents where neither the download or upload is counted. (On the Jackett dashboard search results these are tagged as NoUpload).</li><li>OnlyUpload are torrents where download is not counted but upload is. Good for building your Ratio up. (On the Jackett dashboard search results these are tagged as Freeleech).</li>
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: added
+    options:
+      added: created
+      seeds: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents pro Seite:</b> setting to <b>100</b> on your Control Panel. The default is <i>15</i>.
 
 login:
-  path: login.php
-  method: form
-  form: form[action="/login.php"]
-  cookies: ["JAVA=OK"] # avoid jscheck redirect
+  path: takelogin.php
+  method: post
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
-    pin: "{{ .Config.pin }}"
-    loggiin: einloggen
   error:
-    - selector: div#login_error
+    - selector: .tablea:contains("Fehler")
   test:
-    path: selection.php
-
-download:
-  before:
-    path: ajax_det_poll.php
-    method: post
-    inputs:
-      set_thanks: thanks
-      det_id: "{{ .DownloadUri.Query.torrent }}"
-      ajax: yes
+    path: index.php
+    selector: a[href="logout.php"]
 
 search:
-  paths:
-    - path: selection.php
+  # https://coastal-crew.bounceme.net/browse.php?showsearch=1&c62=1&c33=1&search=&incldead=1&orderby=added&sort=desc
+  path: browse.php
   inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    showsearch: 1
     search: "{{ .Keywords }}"
-    blah: 0
-    orderby: added
-    sort: desc
+    # 0 active, 1 all, 2 dead
+    incldead: 1
+    orderby: "{{ .Config.sort }}"
+    sort: "{{ .Config.type }}"
+    # site does not support imdbid search from the browse.php page or return imdb links in results
+
   rows:
-    selector: div.selection_wrap
+    selector: "table.tableinborder[cellspacing=\"1\"][cellpadding=\"0\"]:not(:has(a[href=\"index.php\"])) > tbody > tr:has(a[href^=\"download.php\"]){{ if .Config.onlyupload }}:has(img[src=\"pic/oupic.gif\"]){{ else }}{{ end }}"
+
   fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
     title:
-      selector: a.selection_a
+      selector: a[href^="details.php"]
     details:
-      selector: a.selection_a
+      selector: a[href^="details.php"]
       attribute: href
     download:
-      selector: a.selection_a
+      selector: a[href^="download.php"]
       attribute: href
-      filters:
-        - name: replace
-          args: ["details.php?id=", "download.php?torrent="]
-    category:
-      selector: div.kat_cat_pic
-      case:
-        # Movie-HD
-        ":has(div.kat_cat_pic_name:contains(\"Movie-HD\")):has(div.kat_cat_pic_name_b:contains(\"UHD/4K\"))": 154
-        ":has(div.kat_cat_pic_name:contains(\"Movie-HD\")):has(div.kat_cat_pic_name_b:contains(\"HD-Pack\"))": 162
-        ":has(div.kat_cat_pic_name:contains(\"Movie-HD\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 32
-        # Movie
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"DVD\"))": 155
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"SD-Pack\"))": 130
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 28
-        # Serien
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Xvid/x264\"))": 60
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"720p/1080p\"))": 157
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"UHD/4K\"))": 158
-        # S-Packs
-        ":has(div.kat_cat_pic_name:contains(\"S-Packs\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 57
-        ":has(div.kat_cat_pic_name:contains(\"S-Packs\")):has(div.kat_cat_pic_name_b:contains(\"720p\"))": 59
-        ":has(div.kat_cat_pic_name:contains(\"S-Packs\")):has(div.kat_cat_pic_name_b:contains(\"1080p\"))": 156
-        # Doku
-        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 160
-        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 15
-        # App
-        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Win\"))": 12
-        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Other\"))": 11
-        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Mac\"))": 10
-        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Linux/Android\"))": 9
-        # Game
-        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Nintendo\"))": 131
-        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": 17
-        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"PS\"))": 18
-        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Wimmelbild\"))": 24
-        # Audio
-        ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Hörbuch\"))": 159
-        ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"mp3\"))": 48
-        ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Flac\"))": 53
-        ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": 52
-        ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Video-HD/SD\"))": 109
-        # Sport
-        ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 62
-        ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 161
-        # Paper
-        ":has(div.kat_cat_pic_name:contains(\"Paper\")):has(div.kat_cat_pic_name_b:contains(\"Zeitungen\"))": 163
-        ":has(div.kat_cat_pic_name:contains(\"Paper\")):has(div.kat_cat_pic_name_b:contains(\"Comic\"))": 63
-        ":has(div.kat_cat_pic_name:contains(\"Paper\")):has(div.kat_cat_pic_name_b:contains(\"E-Book\"))": 96
-        # XXX
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"DVD\"))": 113
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"HD-SD\"))": 76
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": 75
-        # Request
-        ":has(div.kat_cat_pic_name:contains(\"Request\")):has(div.kat_cat_pic_name_b:contains(\"spritti01\"))": 151
     poster:
-      selector: div[id^="details"] img
+      selector: img[id="img-1"]
       attribute: src
     size:
-      selector: div.selection_unter_ag
+      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(1) b:nth-child(1)
+    files:
+      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(1) b:nth-child(2)
     seeders:
-      selector: div.selection_unter_aa
+      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(2) b:nth-child(1)
     leechers:
-      selector: div.selection_unter_aaa
-    date_day:
-      # Heute 13:30:04
-      # Gestern 09:10:10
-      selector: div.selection_unter_ab:not(:contains("."))
-      optional: true
+      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(2) > b:nth-of-type(2)
+    grabs:
+      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(3) b:nth-child(1)
+    date:
+      selector: td.tablea table tbody tr:nth-child(2) td:nth-child(5)
       filters:
-        - name: replace
-          args: ["Heute", "Today"]
-        - name: replace
-          args: ["Gestern", "Yesterday"]
-    date_year:
-      # 30.02.2018 um 23:12:50
-      selector: div.selection_unter_ab:contains(".")
-      optional: true
-      filters:
-        - name: replace
-          args: [" um", ""]
         - name: append
           args: " +01:00" # CET
+        - name: replace
+          args: ["\xA0", " "]
         - 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 }}"
-    description:
-      selector: selection_unter_af
     downloadvolumefactor:
-      text: 1
+      case:
+        img[src="pic/oupic.gif"]: 0
+        "*": 1
     uploadvolumefactor:
       text: 1
     minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
-# engine tbd
+      text: 0.7
+# engine n/a

src/Jackett.Common/Definitions/cpabien.yml

@@ -64,7 +64,7 @@ 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">FlareSolver</a> to access it.
+    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.
   - name: info_8000
     type: info
     label: About cpasbien Categories

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

@@ -17,31 +17,31 @@ caps:
     - {id: "antivirus", cat: PC, desc: "Antivirus"}
     - {id: "cd-dvd-burners", cat: PC, desc: "CD/ DVD Burners"}
     - {id: "compression-tools", cat: PC, desc: "Compression Tools"}
-    - {id: "crack-serials", cat: PC, desc: "Crack &Serials"}
+    - {id: "converters", cat: PC, desc: "Converters"}
+    - {id: "crack-serials", cat: PC, desc: "Crack & Serials"}
     - {id: "downloader", cat: PC, desc: "Downloader"}
     - {id: "drivers-update", cat: PC, desc: "Drivers Update"}
-    - {id: "idm", cat: PC, desc: "IDM Crack | Patch"}
-    - {id: "home", cat: PC, desc: "Home"}
-    - {id: "other", cat: Other, desc: "Other"}
-    - {id: "recovery-software", cat: PC, desc: "Recovery Software"}
-    - {id: "screen-recorders", cat: PC, desc: "Screen Recorders"}
-    - {id: "security", cat: PC, desc: "Security"}
-    - {id: "system-optimizers", cat: PC, desc: "System Optimizers"}
-    - {id: "vpn", cat: PC, desc: "VPN"}
-    - {id: "windows-app", cat: PC, desc: "Windows App"}
-    - {id: "converters", cat: PC, desc: "Converters"}
     - {id: "games", cat: PC/Games, desc: "Games"}
+    - {id: "home", cat: PC, desc: "Home"}
+    - {id: "idm", cat: PC, desc: "IDM"}
     - {id: "idm-crack-patch", cat: PC, desc: "IDM Crack/ Patch"}
     - {id: "ios-mac-os-x-2", cat: PC/Mac, desc: "iOS/ MAC OS X"}
     - {id: "keygen-loader", cat: PC, desc: "Keygen / Loader"}
     - {id: "keygen-serial", cat: PC, desc: "KeyGen / Serial"}
     - {id: "microsoft-office", cat: PC, desc: "Microsoft Office"}
     - {id: "multimedia", cat: PC, desc: "Multimedia"}
+    - {id: "other", cat: Other, desc: "Other"}
     - {id: "pdf-tools", cat: PC, desc: "PDF Tools"}
     - {id: "photo-editing-tools", cat: PC, desc: "Photo Editing Tools"}
+    - {id: "recovery-software", cat: PC, desc: "Recovery Software"}
     - {id: "request-crack-patch", cat: PC, desc: "Request Crack/ Patch"}
+    - {id: "screen-recorders", cat: PC, desc: "Screen Recorders"}
+    - {id: "security", cat: PC, desc: "Security"}
+    - {id: "system-optimizers", cat: PC, desc: "System Optimizers"}
     - {id: "uncategorized", cat: Other, desc: "Uncategorized"}
+    - {id: "vpn", cat: PC, desc: "VPN"}
     - {id: "windows", cat: PC, desc: "Windows"}
+    - {id: "windows-app", cat: PC, desc: "Windows App"}
 
   modes:
     search: [q]
@@ -64,8 +64,11 @@ search:
 
   fields:
     category:
+      text: other
+    category|noappend:
       selector: article.post-entry
       attribute: class
+      optional: true
       filters:
         - name: regexp
           args: "category-(.+?) "

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"}
@@ -282,8 +285,5 @@ search:
     uploadvolumefactor:
       text: 1
     minimumratio:
-      text: 0.5
-    minimumseedtime:
-      # 2 day (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# TT3.0
+      text: 1.0
+# TT3.1

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

@@ -12,11 +12,11 @@ legacylinks:
 
 caps:
   categorymappings:
-    # Dont forget to update the category case block on the search section below.
     # Movie
     - {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"}
@@ -27,7 +27,7 @@ caps:
     - {id: 110, cat: Audio/MP3, desc: "Audio MP3"}
     - {id: 48, cat: Audio/Lossless, desc: "Audio Flac"}
     - {id: 52, cat: Audio, desc: "Audio Pack"}
-    - {id: 63, cat: Audio/Audiobook, desc: "Hörbuch"}
+    - {id: 63, cat: Audio/Audiobook, desc: "Audio Hörbuch"}
     - {id: 120, cat: Audio/Video, desc: "Audio Videos"}
     # App
     - {id: 12, cat: PC/0day, desc: "App PC"}
@@ -56,7 +56,7 @@ caps:
     #  Internal
     - {id: 129, cat: Movies/SD, desc: "Internal Film SD"}
     - {id: 128, cat: Movies/HD, desc: "Internal Film HD"}
-    - {id: 131, cat: TV/SD, desc: "Internal Serien SD"}
+    - {id: 131, cat: TV/SD, desc: "Internal Serie SD"}
     - {id: 130, cat: TV/HD, desc: "Internal Serien HD"}
     - {id: 132, cat: Other, desc: "Internal Sonstiges"}
 
@@ -147,55 +147,12 @@ search:
       - name: andmatch
 
   fields:
-    category:
-      selector: div.kat_cat_pic
-      case:
-        # Movie
-        ":has(div.kat_cat_pic_name:contains(\"Filme\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 28
-        ":has(div.kat_cat_pic_name:contains(\"Filme\")):has(div.kat_cat_pic_name_b:contains(\"UHD\"))": 114
-        ":has(div.kat_cat_pic_name:contains(\"Filme\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 32
-        ":has(div.kat_cat_pic_name:contains(\"Filme\")):has(div.kat_cat_pic_name_b:contains(\"Pack`s\"))": 138
-        # Serien
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 60
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"UHD\"))": 139
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 57
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack`s\"))": 59
-        # Audio
-        ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"MP3\"))": 110
-        ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Flac\"))": 48
-        ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": 52
-        ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Hörbuch\"))": 63
-        ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Videos\"))": 120
-        # App
-        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": 12
-        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Mobil\"))": 11
-        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"macOS\"))": 125
-        # Doku
-        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 15
-        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 14
-        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"Reihe\"))": 123
-        # Spiel
-        ":has(div.kat_cat_pic_name:contains(\"Spiel\")):has(div.kat_cat_pic_name_b:contains(\"Mobil\"))": 126
-        ":has(div.kat_cat_pic_name:contains(\"Spiel\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": 17
-        ":has(div.kat_cat_pic_name:contains(\"Spiel\")):has(div.kat_cat_pic_name_b:contains(\"Konsole\"))": 24
-        ":has(div.kat_cat_pic_name:contains(\"Spiel\")):has(div.kat_cat_pic_name_b:contains(\"Wimmelbild\"))": 121
-        # Sport
-        ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 61
-        ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 62
-        # Paper
-        ":has(div.kat_cat_pic_name:contains(\"ePaper\")):has(div.kat_cat_pic_name_b:contains(\"Zeitungen\"))": 96
-        ":has(div.kat_cat_pic_name:contains(\"ePaper\")):has(div.kat_cat_pic_name_b:contains(\"E-Book\"))": 136
-        ":has(div.kat_cat_pic_name:contains(\"ePaper\")):has(div.kat_cat_pic_name_b:contains(\"Comics\"))": 137
-        # XXX
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 76
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 73
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": 75
-        # Internal
-        ":has(div.kat_cat_pic_name:contains(\"Internal\")):has(div.kat_cat_pic_name_b:contains(\"Film SD\"))": 129
-        ":has(div.kat_cat_pic_name:contains(\"Internal\")):has(div.kat_cat_pic_name_b:contains(\"Film HD\"))": 128
-        ":has(div.kat_cat_pic_name:contains(\"Internal\")):has(div.kat_cat_pic_name_b:contains(\"Serien SD\"))": 131
-        ":has(div.kat_cat_pic_name:contains(\"Internal\")):has(div.kat_cat_pic_name_b:contains(\"Serien HD\"))": 130
-        ":has(div.kat_cat_pic_name:contains(\"Internal\")):has(div.kat_cat_pic_name_b:contains(\"Sonstiges\"))": 132
+    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:
       selector: a.selection_a
       filters:
@@ -262,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.day/
+  - 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/
@@ -35,13 +30,16 @@ legacylinks:
   - https://demonoid.unblockit.how/
   - https://demonoid.unblockit.cam/
   - https://demonoid.nocensor.biz/
+  - https://demonoid.unblockit.day/
+  - https://demonoid.unblockit.llc/
+  - https://demonoid.unblockit.blue/
 
 caps:
   categorymappings:
     # fetch these from https://www.demonoid.is/cached/torrent_categories_script.js?v5
     # Applications
     - {id: 1, cat: PC/Mobile-Android, desc: "Applications Android"}
-    - {id: 2, cat: PC/Mobile-iOS, desc: "Applications Iphone / Ipod touch"}
+    - {id: 2, cat: PC/Mobile-iOS, desc: "Applications phone / Ipod touch"}
     - {id: 3, cat: PC, desc: "Applications Linux"}
     - {id: 4, cat: PC/Mac, desc: "Applications Mac"}
     - {id: 5, cat: PC/Mobile-Other, desc: "Applications Mobile phone"}
@@ -147,7 +145,6 @@ caps:
     - {id: 101, cat: PC/Games, desc: "Games Windows"}
     - {id: 102, cat: Console/XBox, desc: "Games XBox"}
     # Anime
-    - {id: 158, cat: TV/Anime, desc: "Anime Sci-Fi"}
     - {id: 103, cat: TV/Anime, desc: "Anime Action"}
     - {id: 104, cat: TV/Anime, desc: "Anime Adventure"}
     - {id: 105, cat: TV/Anime, desc: "Anime Comedy"}
@@ -156,6 +153,7 @@ caps:
     - {id: 108, cat: TV/Anime, desc: "Anime Horror"}
     - {id: 109, cat: TV/Anime, desc: "Anime Other"}
     - {id: 157, cat: TV/Anime, desc: "Anime Romance"}
+    - {id: 158, cat: TV/Anime, desc: "Anime Sci-Fi"}
     # Movies
     - {id: 151, cat: Movies, desc: "Movies Action"}
     - {id: 110, cat: Movies, desc: "Movies Adventure"}

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

@@ -45,7 +45,7 @@ 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">FlareSolver</a> to access it.
+    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.
 
 search:
   paths:

src/Jackett.Common/Definitions/dragonworldreloaded.yml

@@ -10,7 +10,6 @@ links:
 
 caps:
   categorymappings:
-    # dont forget to amend the category case block in the search fields section below.
     # Kino
     - {id: 118, cat: Movies/HD, desc: "Kino - HD"}
     - {id: 141, cat: Movies/UHD, desc: "Kino - UHD"}
@@ -79,6 +78,26 @@ settings:
   - name: pin
     type: text
     label: Pin
+  - name: freeleech
+    type: checkbox
+    label: Filter freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: added
+    options:
+      added: created
+      seeds: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
 
 login:
   path: login.php
@@ -112,68 +131,23 @@ search:
   paths:
     - path: selection.php
   inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
+    # 0 name, 1 descr, 2 both
     blah: 0
-    orderby: added
-    sort: desc
+    orderby: "{{ .Config.sort }}"
+    sort: "{{ .Config.type }}"
 
   rows:
-    selector: div.selection_wrap
+    selector: "div.selection_wrap{{ if .Config.freeleech }}:root:has(div.onlyup){{ else }}{{ end }}"
 
   fields:
-    category:
-      selector: div.kat_cat_pic
-      case:
-        # Kino
-        ":has(div.kat_cat_pic_name:contains(\"Kino\")):has(div.kat_cat_pic_name_b:contains(\"UHD\"))": 141
-        ":has(div.kat_cat_pic_name:contains(\"Kino\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 118
-        ":has(div.kat_cat_pic_name:contains(\"Kino\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 4
-        # Movies
-        ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": 2
-        ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"UHD\"))": 26
-        ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 19
-        ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 18
-        ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"3D\"))": 139
-        # Serien
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"UHD\"))": 143
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack HD\"))": 80
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack SD\"))": 42
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 41
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 40
-        # Musik
-        ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Album\"))": 119
-        ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Charts\"))": 148
-        ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Sampler\"))": 5
-        ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Discography\"))": 92
-        ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Mixe\"))": 146
-        ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Flac\"))": 142
-        ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Videos\"))": 136
-        # Doku
-        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": 144
-        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 38
-        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 37
-    # Empfohlene
-        ":has(div.kat_cat_pic_name:contains(\"Empfohlene\")):has(div.kat_cat_pic_name_b:contains(\"Torrents\"))": 150
-        # Games
-        ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": 16
-        ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"Wimmelbild\"))": 14
-        ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"Konsole\"))": 140
-        ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"Sonstige\"))": 145
-        # Appz
-        ":has(div.kat_cat_pic_name:contains(\"Appz\")):has(div.kat_cat_pic_name_b:contains(\"Windows\"))": 30
-        ":has(div.kat_cat_pic_name:contains(\"Appz\")):has(div.kat_cat_pic_name_b:contains(\"Android\"))": 106
-        ":has(div.kat_cat_pic_name:contains(\"Appz\")):has(div.kat_cat_pic_name_b:contains(\"Sonstige\"))": 138
-        # Sport
-        ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 50
-        ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 43
-        # Sonstiges
-        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Anime\"))": 137
-        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"E-Books\"))": 34
-        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Audiobook\"))": 35
-        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Sonstige\"))": 147
-        # XXX
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 47
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Sonstiges\"))": 49
+    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:
       selector: a.selection_a
     details:
@@ -232,4 +206,4 @@ search:
     minimumseedtime:
       # 12 hours (as seconds = 12 x 60 x 60)
       text: 43200
-# engine tbd
+# 3xT

src/Jackett.Common/Definitions/dreamtracker.yml

@@ -0,0 +1,215 @@
+---
+id: dreamtracker
+name: Dream Tracker
+description: "Dream Tracker is a GREEK Private tracker for TV / MOVIES / GENERAL"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://dream-tracker.net/
+
+caps:
+  categorymappings:
+    # Anime
+    - {id: 113, cat: TV/Anime, desc: "Anime"}
+    - {id: 114, cat: TV/Anime, desc: "Anime Series"}
+    - {id: 115, cat: Movies/Other, desc: "Anime Movies"}
+    # Kids Stuff
+    - {id: 1, cat: Movies/Other, desc: "Kids Stuff"}
+    - {id: 14, cat: Movies/Other, desc: "Cartoon No Subs"}
+    - {id: 16, cat: Movies/Other, desc: "Cartoon Sub. No Embed."}
+    - {id: 17, cat: Movies/Other, desc: "Cartoon Sub. Embed."}
+    - {id: 31, cat: Movies/Other, desc: "Cartoon in Greek "}
+    - {id: 107, cat: Movies/Other, desc: "Kids in Greek"}
+    - {id: 88, cat: Audio/Other, desc: "Music Kids"}
+    # Movies Subs No Embed.
+    - {id: 38, cat: Movies, desc: "Movies Subs No Embed."}
+    - {id: 40, cat: Movies/SD, desc: "DVDscr - PPVRiP - WebRip -Web-DL- TVRiP"}
+    - {id: 41, cat: Movies/SD, desc: "DVDRrip/R6/R5 Xvid/x264"}
+    - {id: 42, cat: Movies/SD, desc: "BDRip/BRRip/HDRip/480p"}
+    - {id: 43, cat: Movies/HD, desc: "HD - 720p"}
+    - {id: 44, cat: Movies/HD, desc: "HD - 1080p"}
+    - {id: 104, cat: Movies/HD, desc: "Micro"}
+    # Movies Subs Embed.
+    - {id: 45, cat: Movies, desc: "Movies Subs Embed."}
+    - {id: 47, cat: Movies/SD, desc: "DVDscr - PPVRiP - WebRip - Web-DL-TVRiP"}
+    - {id: 48, cat: Movies/SD, desc: "DVDRrip/R6/R5 Xvid/x264"}
+    - {id: 49, cat: Movies/SD, desc: "BDRip/BRRip/HDRip/480p"}
+    - {id: 50, cat: Movies/HD, desc: "HD - 720p"}
+    - {id: 51, cat: Movies/HD, desc: "HD - 1080p"}
+    - {id: 105, cat: Movies/HD, desc: "Micro"}
+    # Movie Packs
+    - {id: 90, cat: Movies, desc: "Movie Packs"}
+    - {id: 91, cat: Movies, desc: "Movie Packs Greek"}
+    - {id: 106, cat: Movies/Foreign, desc: "Movie Packs Foreign"}
+    # Movies in Greek
+    - {id: 56, cat: Movies, desc: "Movies in Greek"}
+    - {id: 57, cat: Movies, desc: "Movies in Greek"}
+    - {id: 58, cat: Movies, desc: "Movies Greek All Time Classics"}
+    - {id: 98, cat: Movies, desc: "Greek Filmographies"}
+    - {id: 99, cat: Movies/HD, desc: "HD 1080p"}
+    - {id: 100, cat: Movies/HD, desc: "HD 720p"}
+    # Movies 3D + 4K
+    - {id: 97, cat: Movies, desc: "Movies 3D + 4K"}
+    - {id: 111, cat: Movies/UHD, desc: "Movies 4K"}
+    - {id: 112, cat: Movies/3D, desc: "Movies 3D"}
+    # Tv Shows & Series
+    - {id: 59, cat: TV, desc: "Tv Shows & Series"}
+    - {id: 62, cat: TV/Foreign, desc: "Tv Shows Foreign"}
+    - {id: 63, cat: TV, desc: "Tv Shows Greek"}
+    - {id: 64, cat: TV/Foreign, desc: "Series Foreign"}
+    - {id: 65, cat: TV, desc: "Series Greek"}
+    - {id: 92, cat: TV/Foreign, desc: "Series Foreign Packs"}
+    - {id: 93, cat: TV, desc: "Series Greek Packs"}
+    # Sports
+    - {id: 66, cat: TV/Sport, desc: "Sports"}
+    - {id: 67, cat: TV/Sport, desc: "Sports"}
+    # Documentary
+    - {id: 68, cat: TV/Documentary, desc: "Documentary"}
+    - {id: 69, cat: TV/Documentary, desc: "Documentary"}
+    # Applications
+    - {id: 6, cat: PC/0day, desc: "Applications"}
+    - {id: 74, cat: PC/0day, desc: "Windows"}
+    - {id: 73, cat: PC/Mobile-Android, desc: "Applications Mobile"}
+    # eBooks & Images
+    - {id: 87, cat: Books/EBook, desc: "eBooks & Images"}
+    - {id: 83, cat: Books/EBook, desc: "Ebooks"}
+    - {id: 110, cat: Books/Mags, desc: "EMagazines"}
+    - {id: 82, cat: Other, desc: "Pics & Images"}
+    # Games
+    - {id: 2, cat: PC/Games, desc: "Games"}
+    - {id: 27, cat: PC/Games, desc: "PC"}
+    # Music
+    - {id: 7, cat: Audio, desc: "Music"}
+    - {id: 75, cat: Audio/MP3, desc: "Music Greek"}
+    - {id: 76, cat: Audio/MP3, desc: "Music Greek Discographies"}
+    - {id: 116, cat: Audio/Lossless, desc: "Greek Flac"}
+    - {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:
+    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: info
+    type: info
+    label: Layout
+    default: "<ol><li>Only the English Classic profile is supported.<li>Make sure to set the <b>Torrent Listing</b> option in your profile to <b>Classic</b><li>And set the <b>Language</b> to <b>English</b><li>Using the <i>Modern</i> theme will prevent results, and using <i>Greek</i> will prevent upload dates.</ol>"
+
+login:
+  path: ?p=home&pid=1
+  method: form
+  form: form#sls_form
+  submitpath: ajax/login.php
+  inputs:
+    action: login
+    loginbox_membername: "{{ .Config.username }}"
+    loginbox_password: "{{ .Config.password }}"
+    loginbox_remember: 1
+  selectorinputs:
+    securitytoken:
+      selector: "script:contains(\"stKey: \")"
+      filters:
+        - name: regexp
+          args: "stKey: \"(.+?)\","
+  error:
+    - selector: ":contains(\"-ERROR-\")"
+  test:
+    path: ?p=home&pid=1
+    selector: a[href*="/?p=logout&"]
+
+search:
+  paths:
+    - path: /
+  inputs:
+    p: torrents
+    pid: 10
+    $raw: "{{ range .Categories }}cid[]={{.}}&{{end}}"
+    keywords: "{{ .Keywords }}"
+    # name, description, both, uploader
+    search_type: name
+
+  rows:
+    selector: "table#torrents_table_classic tr:has(td.torrent_name){{ if .Config.freeleech }}:has(img[src$=\"/torrent_free.png\"]){{ else }}{{ end }}"
+
+  fields:
+    title:
+      selector: a[href*="?p=torrents&pid=10&action=details"]
+    category:
+      selector: div.category_image > a
+      attribute: href
+      filters:
+        - name: querystring
+          args: cid
+    details:
+      selector: a[href*="?p=torrents&pid=10&action=details"]
+      attribute: href
+    download:
+      selector: a[href*="?p=torrents&pid=10&action=download"]
+      attribute: href
+    date_year:
+      # Uploaded 30-01-2019 15:02 by
+      selector: td.torrent_name:not(:contains(" at ")):not(:has(abbr[data-time]))
+      optional: true
+      filters:
+        - name: regexp
+          args: "Uploaded (.+?) by"
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "02-01-2006 15:04 -07:00"
+    date_day:
+      # Uploaded Friday at 05:11 by
+      # Uploaded Today at 00:48 by
+      # Uploaded Yesterday at 23:57 by
+      selector: td.torrent_name:contains(" at "):not(:has(abbr[data-time]))
+      optional: true
+      filters:
+        - name: regexp
+          args: "Uploaded (.+?) by"
+        - name: fuzzytime
+    date_unix:
+      # within the hour (unix)
+      selector: abbr[data-time]
+      attribute: data-time
+      optional: true
+    date:
+      text: "{{ if or .Result.date_year .Result.date_unix .Result.date_day }}{{ or .Result.date_year .Result.date_unix .Result.date_day }}{{ else }}now{{ end }}"
+    size:
+      selector: a[rel="torrent_size"]
+    seeders:
+      selector: a[rel="torrent_seeders"]
+    leechers:
+      selector: a[rel="torrent_leechers"]
+    grabs:
+      selector: a[rel="times_completed"]
+    poster:
+      selector: a[rel="fancybox"]
+      attribute: href
+    downloadvolumefactor:
+      case:
+        "img[src$=\"/silver.gif\"]": 0.5
+        "img[src$=\"/torrent_free.png\"]": 0
+        "*": 1
+    uploadvolumefactor:
+      case:
+        "img[src$=\"/torrent_multiple_upload.png\"]": 2
+        "*": 1
+# TSUE 2.2

src/Jackett.Common/Definitions/ebookparadijs.yml

@@ -53,7 +53,7 @@ settings:
   - name: flaresolverr
     type: info
     label: FlareSolverr
-    default: This site may use DDoS-Guard Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
+    default: This site may use DDoS-Guard Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
   - name: freeleech
     type: checkbox
     label: Filter freeleech only

src/Jackett.Common/Definitions/elitetorrent-biz.yml

@@ -6,7 +6,7 @@ language: es-ES
 type: public
 encoding: UTF-8
 links:
-  - https://elitetorrent.la/
+  - https://www.elitetorrent.com/
   - https://elitetorrent.nocensor.sbs/
 legacylinks:
   - https://www.elitetorrent.biz/
@@ -23,12 +23,14 @@ 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/
   - https://elitetorrent.app/
   - https://elitetorrent.nocensor.biz/
+  - https://elitetorrent.la/
+  - https://www.elitetorrent.wtf/
+  - https://www.elitetorrent.dev/
 
 caps:
   categories:

src/Jackett.Common/Definitions/empornium.yml

@@ -1,7 +1,7 @@
 ---
 id: empornium
 name: Empornium
-description: "Empornium (EMP) is a Private Torrent Tracker for XXX"
+description: "Empornium (EMP) is a Private Torrent Tracker for 3X"
 language: en-US
 type: private
 encoding: UTF-8
@@ -64,8 +64,6 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
-    movie-search: [q]
 
 settings:
   - name: username

src/Jackett.Common/Definitions/empornium2fa.yml

@@ -64,8 +64,6 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
-    movie-search: [q]
 
 settings:
   - name: cookie

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.day/
+  - https://extratorrent.unblockit.name/
   - https://extratorrent.nocensor.sbs/
 legacylinks:
   - https://extratorrent.nocensor.work/
@@ -17,6 +17,9 @@ legacylinks:
   - https://extratorrent.unblockit.how/
   - 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/exttorrents.yml

@@ -94,7 +94,7 @@ 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">FlareSolver</a> to access it.
+    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/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.day/
+  - https://eztv.unblockit.name/
   - https://eztv.nocensor.sbs/
 legacylinks:
   - https://eztv.ag/ # redirects to .re
@@ -35,6 +36,9 @@ legacylinks:
   - https://eztv.unblockit.how/
   - 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/femdomcult.yml

@@ -4,7 +4,7 @@
 ---
 id: femdomcult
 name: Femdomcult
-description: "Femdomcult is a Private Torrent Tracker for FETISH XXX"
+description: "Femdomcult is a Private Torrent Tracker for FETISH 3X"
 language: en-US
 type: private
 encoding: UTF-8
@@ -36,8 +36,6 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
-    movie-search: [q]
 
 settings:
   - name: username

src/Jackett.Common/Definitions/file-tracker.yml

@@ -0,0 +1,674 @@
+---
+id: file-tracker
+name: File-Tracker
+description: "File Tracker is a RUSSIAN Semi-Private Torrent Tracker for MOVIES / GENERAL"
+language: ru-RU
+type: semi-private
+encoding: windows-1251
+links:
+  - https://file-tracker.net/
+
+caps:
+  categorymappings:
+    # Эксклюзив
+    # Exclusive
+    - {id: 697, cat: Other, desc: " |- Правила, FAQ, стол заказов, общение"}
+    - {id: 387, cat: Movies/DVD, desc: " |- Отечественные фильмы DVD Master's"}
+    - {id: 386, cat: Movies/DVD, desc: " |- Зарубежные фильмы DVD Master's"}
+    - {id: 390, cat: TV/SD, desc: " |- Сериалы DVD Master's"}
+    - {id: 388, cat: Movies/DVD, desc: " |- Мультфильмы DVD Master's"}
+    - {id: 601, cat: TV/Anime, desc: " |- Мультсериалы DVD Master's"}
+    # Кино, видео, мультипликация и ТВ
+    # Film, video, animation and TV
+    - {id: 995, cat: Movies, desc: " |- Экранки с рекламой (фильмы, мультфильмы)"}
+    - {id: 994, cat: Movies, desc: " |- Новинки с рекламой (фильмы, мультфильмы)"}
+    - {id: 385, cat: Movies, desc: " |- Экранки (фильмы , мультфильмы)"}
+    - {id: 987, cat: Movies, desc: " |- Зарубежное кино"}
+    - {id: 988, cat: Movies, desc: " |- Кино России и СНГ"}
+    - {id: 337, cat: Movies, desc: " |- Мультфильмы"}
+    - {id: 72, cat: Movies, desc: " |- DVD, HD Видео (фильмы , мультфильмы)"}
+    - {id: 999, cat: Movies, desc: " |- Фильмы (2021-2022)"}
+    - {id: 996, cat: Movies, desc: " |- Фильмы (2019-2020)"}
+    - {id: 921, cat: Movies, desc: " |- Фильмы (2016-2018)"}
+    - {id: 382, cat: Movies, desc: " |- Фильмы (2012-2015)"}
+    - {id: 381, cat: Movies, desc: " |- Фильмы (2009-2011)"}
+    - {id: 734, cat: Movies, desc: " |- Фильмы (2006-2008)"}
+    - {id: 380, cat: Movies, desc: " |- Фильмы (2001-2005)"}
+    - {id: 379, cat: Movies, desc: " |- Фильмы до 2000 года"}
+    - {id: 613, cat: Movies, desc: " |- Кино для детей"}
+    - {id: 638, cat: Movies, desc: " |- Азиатское кино/Япония"}
+    - {id: 136, cat: Movies, desc: " |- Индийское кино"}
+    - {id: 443, cat: Movies, desc: " |- Антология зарубежного кино"}
+    - {id: 1000, cat: Movies, desc: " |- Наше кино (2021 - 2022)"}
+    - {id: 997, cat: Movies, desc: " |- Наше кино (2019 - 2020)"}
+    - {id: 922, cat: Movies, desc: " |- Наше кино (2016 - 2018)"}
+    - {id: 229, cat: Movies, desc: " |- Наше кино (2012 - 2015)"}
+    - {id: 733, cat: Movies, desc: " |- Наше кино (2008 - 2011)"}
+    - {id: 334, cat: Movies, desc: " |- Наше кино (2001 - 2007)"}
+    - {id: 333, cat: Movies, desc: " |- Наше кино (1990 - 2000)"}
+    - {id: 250, cat: Movies, desc: " |- Советское кино (классика)"}
+    - {id: 62, cat: Movies, desc: " |- Кино для детей"}
+    - {id: 962, cat: Movies, desc: " |- Антология отечественного кино"}
+    - {id: 990, cat: Movies, desc: " |- Зарубежные фильмы , мультфильмы и сериалы на языках ближнего.."}
+    - {id: 993, cat: Movies, desc: " |- Фильмы , мультфильмы и сериалы ближнего зарубежья и СНГ в ор.."}
+    - {id: 991, cat: Movies, desc: " |- Зарубежные фильмы , мультфильмы и сериалы в оригинале"}
+    - {id: 74, cat: Movies, desc: " |- Зарубежные мультфильмы"}
+    - {id: 73, cat: Movies, desc: " |- Отечественные мультфильмы"}
+    - {id: 599, cat: TV, desc: " |- Сказки русских писателей"}
+    - {id: 575, cat: TV, desc: " |- Интерны"}
+    - {id: 271, cat: TV, desc: " |- Реальные пацаны"}
+    - {id: 377, cat: TV, desc: " |- МарГоша"}
+    - {id: 612, cat: TV, desc: " |- Воронины"}
+    - {id: 731, cat: TV, desc: " |- Сваты"}
+    - {id: 968, cat: TV, desc: " |- Разные сериалы"}
+    - {id: 639, cat: TV, desc: " |- Теория большого взрыва"}
+    - {id: 89, cat: TV, desc: " |- Друзья"}
+    - {id: 92, cat: TV, desc: " |- Тайны Смолвиля"}
+    - {id: 95, cat: TV, desc: " |- Секретные материалы"}
+    - {id: 383, cat: TV, desc: " |- Альф"}
+    - {id: 384, cat: TV, desc: " |- Доктор Хаус"}
+    - {id: 632, cat: TV, desc: " |- Дневники Вампира"}
+    - {id: 969, cat: TV, desc: " |- Разные сериалы"}
+    - {id: 600, cat: TV, desc: " |- Том и Джерри"}
+    - {id: 609, cat: TV, desc: " |- Разное (иностранные мультсериалы)"}
+    - {id: 701, cat: TV, desc: " |- Маша и Медведь"}
+    - {id: 594, cat: TV, desc: " |- Ну, погоди!"}
+    - {id: 598, cat: TV, desc: " |- Смешарики"}
+    - {id: 610, cat: TV, desc: " |- Сборники мультфильмов"}
+    - {id: 870, cat: TV, desc: " |- Разные (отечественные мультсериалы)"}
+    - {id: 741, cat: Movies/3D, desc: " |- 3D | Кинофильмы"}
+    - {id: 742, cat: Movies/3D, desc: " |- 3D | Мультфильмы"}
+    - {id: 981, cat: Movies/3D, desc: " |- 3D | Blu-ray и BD Remux"}
+    - {id: 743, cat: Movies/3D, desc: " |- 3D | Документальные фильмы"}
+    - {id: 744, cat: Movies/3D, desc: " |- 3D | Спорт"}
+    - {id: 335, cat: Movies/DVD, desc: " |- Наше кино (DVD)"}
+    - {id: 336, cat: Movies/HD, desc: " |- Наше кино (HD Video)"}
+    - {id: 747, cat: Movies/BluRay, desc: " |- Наше кино (Blu-ray и BD Remux)"}
+    - {id: 985, cat: Movies/UHD, desc: " |- Наше кино (Ultra HD)"}
+    - {id: 69, cat: Movies/DVD, desc: " |- Зарубежное кино (DVD)"}
+    - {id: 70, cat: Movies/HD, desc: " |- Зарубежное кино (HD Video)"}
+    - {id: 748, cat: Movies/BluRay, desc: " |- Зарубежное кино (Blu-ray и BD Remux)"}
+    - {id: 984, cat: Movies/UHD, desc: " |- Зарубежное кино (Ultra HD)"}
+    - {id: 907, cat: Movies, desc: " |- Кино для детей (DVD, HD Video, Blu-ray, BD Remux, Ultra HD)"}
+    - {id: 339, cat: Movies, desc: " |- Мультфильмы (DVD, HD Video и Blu-ray)"}
+    - {id: 602, cat: TV/Anime, desc: " |- Мультсериалы (DVD, HD Video и Blu-ray)"}
+    - {id: 906, cat: Movies, desc: " |- Азиатское кино/Япония (DVD, HD Video, Blu-ray, BD Remux, Ult.."}
+    - {id: 442, cat: Movies, desc: " |- Антология (DVD, HD Video, Blu-ray, BD Remux)"}
+    - {id: 898, cat: TV, desc: " |- Отечественные сериалы (DVD, HD Video, Blu-ray, BD Remux)"}
+    - {id: 970, cat: TV, desc: " |- Иностранные сериалы (DVD, HD Video, Blu-ray, BD Remux)"}
+    - {id: 71, cat: Movies, desc: " |- Арт-хаус и авторское кино (DVD, HD Video, Blu-ray, BD Remux)"}
+    - {id: 180, cat: Audio/Video, desc: " |- Музыкальное (DVD, HD Video, Blu-ray, BD Remux)"}
+    - {id: 681, cat: TV, desc: " |- Осторожно Модерн!"}
+    - {id: 341, cat: TV, desc: " |- Ералаш"}
+    - {id: 332, cat: TV, desc: " |- Прожекторпэрисхилтон"}
+    - {id: 330, cat: TV, desc: " |- Маски-шоу"}
+    - {id: 279, cat: TV, desc: " |- Юмористы"}
+    - {id: 65, cat: TV, desc: " |- КВН / Пост КВН"}
+    - {id: 66, cat: TV, desc: " |- Вечерний Квартал"}
+    - {id: 64, cat: TV, desc: " |- Даешь,молодежь!"}
+    - {id: 10, cat: TV, desc: " |- Наша Russia"}
+    - {id: 879, cat: TV, desc: " |- Другие телепередачи"}
+    - {id: 614, cat: TV, desc: " |- Строительство и дизайн"}
+    - {id: 252, cat: TV, desc: " |- BBC"}
+    - {id: 81, cat: TV, desc: " |- Discovery"}
+    - {id: 80, cat: TV, desc: " |- Фильмы National Geographic"}
+    - {id: 910, cat: TV, desc: " |- Флора и Фауна"}
+    - {id: 573, cat: TV, desc: " |- Секретные файлы"}
+    - {id: 359, cat: TV, desc: " |- Запретные темы истории"}
+    - {id: 358, cat: TV, desc: " |- Секретные материалы"}
+    - {id: 357, cat: TV, desc: " |- Русские сенсации"}
+    - {id: 356, cat: TV, desc: " |- Среда обитания"}
+    - {id: 355, cat: TV, desc: " |- Медицина и здоровье"}
+    - {id: 354, cat: TV, desc: " |- Тайны века"}
+    - {id: 351, cat: TV, desc: " |- Апокалипсис"}
+    - {id: 350, cat: TV, desc: " |- Профессия репортёр"}
+    - {id: 349, cat: TV, desc: " |- Криминальная Россия"}
+    - {id: 251, cat: TV, desc: " |- Военное видео и вооружение"}
+    - {id: 82, cat: TV, desc: " |- Все о Охоте и Рыбалке"}
+    - {id: 79, cat: TV, desc: " |- Непознанное и сверхъестественное"}
+    - {id: 474, cat: TV, desc: " |- Одиссея Жака Кусто"}
+    - {id: 268, cat: TV, desc: " |- Разное"}
+    - {id: 365, cat: TV/Sport, desc: " |- Олимпийские игры"}
+    - {id: 364, cat: TV/Sport, desc: " |- Фигурное катание"}
+    - {id: 363, cat: TV/Sport, desc: " |- Бодибилдинг/Силовые виды спорта"}
+    - {id: 362, cat: TV/Sport, desc: " |- Бильярд"}
+    - {id: 361, cat: TV/Sport, desc: " |- Волейбол/Гандбол"}
+    - {id: 360, cat: TV/Sport, desc: " |- Формула 1"}
+    - {id: 272, cat: TV/Sport, desc: " |- Футбол"}
+    - {id: 249, cat: TV/Sport, desc: " |- Рестлинг"}
+    - {id: 248, cat: TV/Sport, desc: " |- Скейтборд / Сноуборд / Паркур"}
+    - {id: 220, cat: TV/Sport, desc: " |- Авто/Мото"}
+    - {id: 219, cat: TV/Sport, desc: " |- Хоккей"}
+    - {id: 218, cat: TV/Sport, desc: " |- Баскетбол"}
+    - {id: 217, cat: TV/Sport, desc: " |- Бокс"}
+    - {id: 216, cat: TV/Sport, desc: " |- Теннис"}
+    - {id: 215, cat: TV/Sport, desc: " |- Экстрим"}
+    - {id: 214, cat: TV/Sport, desc: " |- Бои без правил"}
+    - {id: 468, cat: TV/Sport, desc: " |- Игровое видео"}
+    - {id: 545, cat: TV, desc: " |- Видеоуроки по программному обеспечению"}
+    - {id: 673, cat: TV, desc: " |- Видеоуроки по медицине (обучение, лечение, профилактика)"}
+    - {id: 463, cat: TV, desc: " |- Видеообучение ин. языкам"}
+    - {id: 735, cat: TV, desc: " |- Для родителей"}
+    - {id: 702, cat: TV, desc: " |- Для студентов"}
+    - {id: 678, cat: TV, desc: " |- Для школьного возраста"}
+    - {id: 677, cat: TV, desc: " |- Для самых маленьких"}
+    - {id: 200, cat: TV, desc: " |- Русский стиль и рукопашный бой"}
+    - {id: 199, cat: TV, desc: " |- Джиу-джитсу"}
+    - {id: 198, cat: TV, desc: " |- Айкидо и айки-дзюцу"}
+    - {id: 277, cat: TV, desc: "Разное (Видеоуроки, обучающее видео)"}
+    - {id: 657, cat: TV, desc: " |- Школа || Сёнэн || Сёдзё"}
+    - {id: 656, cat: TV, desc: " |- Боевые искусства"}
+    - {id: 655, cat: TV, desc: " |- Ужасы || Мистика || Вампиры"}
+    - {id: 654, cat: TV, desc: " |- Фэнтези || Апокалиптика || Постапокалиптика"}
+    - {id: 653, cat: TV, desc: " |- Меха"}
+    - {id: 658, cat: TV, desc: " |- Романтика"}
+    - {id: 659, cat: TV, desc: " |- Комедия"}
+    - {id: 660, cat: TV, desc: " |- Для детей"}
+    - {id: 661, cat: TV, desc: " |- Разное"}
+    - {id: 620, cat: TV, desc: " |- Призрак в доспехах"}
+    - {id: 635, cat: TV, desc: " |- Хеллсинг"}
+    - {id: 619, cat: TV, desc: " |- Мобильный воин ГАНДАМ"}
+    - {id: 618, cat: TV, desc: " |- Наруто"}
+    - {id: 617, cat: TV, desc: " |- Блич"}
+    - {id: 308, cat: TV/Anime, desc: " |- Аниме (озвучка/SD и DVD)"}
+    - {id: 307, cat: TV/Anime, desc: " |- Аниме (RAW/DVD)"}
+    - {id: 306, cat: TV/Anime, desc: " |- Аниме (RAW/SD)"}
+    - {id: 715, cat: TV/Anime, desc: " |- Аниме (DVD)"}
+    - {id: 317, cat: TV/Anime, desc: " |- 720p и 1080p (озвучка)"}
+    - {id: 316, cat: TV/Anime, desc: " |- 1080p (RAW)"}
+    - {id: 315, cat: TV/Anime, desc: " |- 720p (RAW)"}
+    - {id: 304, cat: TV/Anime, desc: " |- Аниме (озвучка)"}
+    - {id: 303, cat: TV/Anime, desc: " |- Аниме (RAW)"}
+    # Игры
+    # Games
+    - {id: 471, cat: Console, desc: " |- Раздачи игр от R.G. FTN Gaming RePack"}
+    - {id: 19, cat: Console, desc: " |- Новинки игр"}
+    - {id: 99, cat: Console, desc: " |- Demo, Alpha, Beta версии"}
+    - {id: 16, cat: Console, desc: " |- Action FPS (1st Person)"}
+    - {id: 885, cat: Console, desc: " |- Action TPS (3rd Person)"}
+    - {id: 17, cat: Console, desc: " |- RPG"}
+    - {id: 104, cat: Console, desc: " |- Авто/мото симуляторы"}
+    - {id: 105, cat: Console, desc: " |- Авиасимуляторы"}
+    - {id: 923, cat: Console, desc: " |- Спортивные симуляторы"}
+    - {id: 258, cat: Console, desc: " |- Другие симуляторы"}
+    - {id: 102, cat: Console, desc: " |- Аркады, Файтинги"}
+    - {id: 103, cat: Console, desc: " |- Приключения и Квесты"}
+    - {id: 101, cat: Console, desc: " |- Стратегии / Логические игры"}
+    - {id: 108, cat: Console, desc: " |- Мини игры"}
+    - {id: 20, cat: Console, desc: " |- Online-игры"}
+    - {id: 107, cat: Console, desc: " |- Детские и обучающие игры"}
+    - {id: 109, cat: Console, desc: " |- Аниме-игры"}
+    - {id: 722, cat: Console, desc: " |- Action (старые игры)"}
+    - {id: 721, cat: Console, desc: " |- RPG (старые игры)"}
+    - {id: 720, cat: Console, desc: " |- Симуляторы (старые игры)"}
+    - {id: 719, cat: Console, desc: " |- Аркады (старые игры)"}
+    - {id: 718, cat: Console, desc: " |- Приключения и Квесты (старые игры)"}
+    - {id: 717, cat: Console, desc: " |- Стратегии (старые игры)"}
+    - {id: 989, cat: Console, desc: " |- Модифицированные версии игр"}
+    - {id: 18, cat: Console, desc: " |- Моды, русификаторы, патчи, дополнения и обновления для игр"}
+    - {id: 724, cat: Console, desc: " |- Игровой софт"}
+    - {id: 450, cat: Console, desc: " |- S.T.A.L.K.E.R."}
+    - {id: 920, cat: Console, desc: " |- Игры для Mac OS"}
+    - {id: 695, cat: Console, desc: " |- PlayStation 1/2/3"}
+    - {id: 113, cat: Console, desc: " |- Xbox (Xbox 360)"}
+    - {id: 112, cat: Console, desc: " |- PSX-PSP"}
+    - {id: 111, cat: Console, desc: " |- Dreamcast"}
+    - {id: 679, cat: Console, desc: " |- Видео для PSP"}
+    - {id: 662, cat: Console, desc: " |- Софт для консолей"}
+    - {id: 116, cat: Console, desc: " |- Портативные и Консольные (Игры)"}
+    # ПО для Windows
+    # Software for Windows
+    - {id: 529, cat: PC/0day, desc: " |- Информация и диагностика"}
+    - {id: 518, cat: PC/0day, desc: " |- Системные утилиты"}
+    - {id: 516, cat: PC/0day, desc: " |- Безопасность: Защита информации. Антивирусы/файерволы"}
+    - {id: 515, cat: PC/0day, desc: " |- Архиваторы и файловые менеджеры"}
+    - {id: 514, cat: PC/0day, desc: " |- Сервисное обслуживание ПК"}
+    - {id: 513, cat: PC/0day, desc: " |- Настройка и оптимизация ОС"}
+    - {id: 530, cat: PC/0day, desc: " |- Сборники смешанного ПО"}
+    - {id: 437, cat: PC/0day, desc: " |- Активаторы (лоадеры) OS Windows / Office, SP и оф патчи"}
+    - {id: 520, cat: PC/0day, desc: " |- Офис"}
+    - {id: 528, cat: PC/0day, desc: " |- Работа с PDF и DjVu"}
+    - {id: 522, cat: PC/0day, desc: " |- Программы для бизнеса и делопроизводства"}
+    - {id: 521, cat: PC/0day, desc: " |- Словари, Переводчики"}
+    - {id: 527, cat: PC/0day, desc: " |- Распознавание текста, звука и синтез речи"}
+    - {id: 508, cat: PC/0day, desc: " |- Консультант+"}
+    - {id: 509, cat: PC/0day, desc: " |- Гарант"}
+    - {id: 510, cat: PC/0day, desc: " |- Другие справочно-правовые системы и обучающее ПО"}
+    - {id: 511, cat: PC/0day, desc: " |- Справочное ПО: справочники, каталоги"}
+    - {id: 543, cat: PC/0day, desc: " |- Запись CD, DVD"}
+    - {id: 526, cat: PC/0day, desc: " |- Графика / Просмотрщики графики"}
+    - {id: 525, cat: PC/0day, desc: " |- Для работы с аудио"}
+    - {id: 524, cat: PC/0day, desc: " |- Для работы с видео"}
+    - {id: 887, cat: PC/0day, desc: " |- Интернет TV &Radio"}
+    - {id: 561, cat: PC/0day, desc: " |- Удаленный доступ и ПО для свободного доступа в интернет"}
+    - {id: 555, cat: PC/0day, desc: " |- 3G USB-модем и Webcam"}
+    - {id: 537, cat: PC/0day, desc: " |- Утилиты для удаления всплывающих окон и баннерной рекламы"}
+    - {id: 536, cat: PC/0day, desc: " |- Программы общения"}
+    - {id: 535, cat: PC/0day, desc: " |- Почта и файлообмен"}
+    - {id: 533, cat: PC/0day, desc: " |- Браузеры и дополнения к ним"}
+    - {id: 534, cat: PC/0day, desc: " |- Разное"}
+    - {id: 542, cat: PC/0day, desc: " |- Сборники драйверов и ПО для обновления драйверов"}
+    - {id: 541, cat: PC/0day, desc: " |- Звуковые карты"}
+    - {id: 540, cat: PC/0day, desc: " |- Видеокарты"}
+    - {id: 539, cat: PC/0day, desc: " |- Материнские платы"}
+    - {id: 554, cat: PC/0day, desc: " |- Темы, скринсейверы ..."}
+    - {id: 551, cat: PC/0day, desc: " |- Обои"}
+    - {id: 553, cat: PC/0day, desc: " |- Гаджеты рабочего стола"}
+    - {id: 739, cat: PC/0day, desc: " |- Аватары, Иконки, Смайлы"}
+    - {id: 607, cat: PC/0day, desc: " |- САПР"}
+    - {id: 344, cat: PC/0day, desc: " |- ГИС (Геоинформационные системы)"}
+    - {id: 965, cat: PC/0day, desc: " |- Программирование и разработка ПО"}
+    - {id: 345, cat: PC/0day, desc: " |- Карты, снабженные программной оболочкой"}
+    - {id: 348, cat: PC/0day, desc: " |- Разное - системы навигации и карты"}
+    - {id: 680, cat: PC/0day, desc: " |- ПО по диагностике и ремонту автомобилей"}
+    - {id: 675, cat: PC/0day, desc: " |- Программное обеспечение по медицине"}
+    - {id: 560, cat: PC/0day, desc: " |- Photostoсks"}
+    - {id: 559, cat: PC/0day, desc: " |- Футажи"}
+    - {id: 558, cat: PC/0day, desc: " |- Заготовки, виньетки, рамки"}
+    - {id: 557, cat: PC/0day, desc: " |- Растровые и Векторные Клипарты"}
+    - {id: 960, cat: PC/0day, desc: " |- Вспомогательный софт для релизера"}
+    - {id: 961, cat: PC/0day, desc: " |- Разное"}
+    # Операционные системы и программирование
+    # Operating systems and programming
+    - {id: 972, cat: PC, desc: " |- Windows 10 / 11 (Оригинальные версии)"}
+    - {id: 909, cat: PC, desc: " |- Windows 8 / 8.1 (Оригинальные версии)"}
+    - {id: 822, cat: PC, desc: " |- Windows 7 (Оригинальные версии)"}
+    - {id: 823, cat: PC, desc: " |- Windows Vista (Оригинальные версии)"}
+    - {id: 824, cat: PC, desc: " |- Windows XP (Оригинальные версии)"}
+    - {id: 434, cat: PC, desc: " |- Windows OS, выпущенные до 2001 года (Оригинальные версии)"}
+    - {id: 973, cat: PC, desc: " |- Windows 10 / 11 (сборки)"}
+    - {id: 883, cat: PC, desc: " |- Windows 8 / 8.1 (сборки)"}
+    - {id: 264, cat: PC, desc: " |- Windows 7 (сборки)"}
+    - {id: 166, cat: PC, desc: " |- Windows Vista (сборки)"}
+    - {id: 165, cat: PC, desc: " |- Windows XP (сборки)"}
+    - {id: 167, cat: PC, desc: " |- Серверные OS Windows"}
+    - {id: 998, cat: PC, desc: " |- Insider Preview, RC, Beta версии, Service Packs"}
+    - {id: 265, cat: PC, desc: " |- Cборники разных операционных систем"}
+    - {id: 281, cat: PC, desc: " |- Помощь/Опросы/Общение"}
+    - {id: 168, cat: PC, desc: " |- Операционные системы"}
+    - {id: 280, cat: PC, desc: " |- Программное обеспечение"}
+    - {id: 169, cat: PC, desc: " |- Другие ОС и ПО под них"}
+    - {id: 732, cat: PC, desc: " |- Игры для Linux"}
+    - {id: 328, cat: PC, desc: " |- Видеоуроки по Linux"}
+    - {id: 286, cat: PC, desc: " |- Общение"}
+    - {id: 285, cat: PC/Mac, desc: " |- Аудио редакторы и конверторы для Mac OS"}
+    - {id: 284, cat: PC/Mac, desc: " |- Программы для создания и обработки графики Mac OS"}
+    - {id: 283, cat: PC/Mac, desc: " |- Программы для просмотра и обработки видео Mac OS"}
+    - {id: 282, cat: PC/Mac, desc: " |- Mac OS"}
+    - {id: 171, cat: PC/Mac, desc: " |- Системные программы для Mac OS"}
+    - {id: 170, cat: PC/Mac, desc: " |- Mac OS (для Macintosh)"}
+    - {id: 436, cat: Other, desc: " |- WYSIWYG Редакторы для веб-дизайна"}
+    - {id: 435, cat: Other, desc: " |- Обмен исходниками"}
+    - {id: 376, cat: Other, desc: " |- Среды программирования, компиляторы и вспомогательные програ.."}
+    - {id: 370, cat: Other, desc: " |- Системы управления базами данных"}
+    - {id: 369, cat: Other, desc: " |- Скрипты и шаблоны"}
+    - {id: 368, cat: Other, desc: " |- Компоненты для сред программирования"}
+    - {id: 367, cat: Other, desc: " |- Ищу и предлагаю (Веб-разработка и программирование)"}
+    # iPhone, iPod, iPod Touch, iPad, мобильные телефоны . Android и КПК
+    # iPhone, iPod, iPod Touch, iPad, mobile phones.
+    - {id: 430, cat: PC/Mobile-iOS, desc: " |- База знаний"}
+    - {id: 967, cat: PC/Mobile-iOS, desc: " |- Прошивки и ОС"}
+    - {id: 426, cat: PC/Mobile-iOS, desc: " |- Программы"}
+    - {id: 429, cat: PC/Mobile-iOS, desc: " |- Игры"}
+    - {id: 428, cat: PC/Mobile-iOS, desc: " |- Видео"}
+    - {id: 913, cat: PC/Mobile-iOS, desc: " |- Видео"}
+    - {id: 175, cat: PC/Mobile-iOS, desc: " |- Приложения"}
+    - {id: 174, cat: PC/Mobile-iOS, desc: " |- Игры"}
+    # Музыка
+    # Music
+    - {id: 939, cat: Audio/Lossless, desc: " |- Дискографии в Lossless"}
+    - {id: 948, cat: Audio/MP3, desc: " |- Дискографии в MP3"}
+    - {id: 129, cat: Audio, desc: " |- Многоканальная музыка (Электронная музыка)"}
+    - {id: 825, cat: Audio/Lossless, desc: " |- Lossless (Электронная Музыка)"}
+    - {id: 829, cat: Audio/MP3, desc: " |- Techno / Hardcore / Acid (mp3)"}
+    - {id: 828, cat: Audio/MP3, desc: " |- Radioshows, Podcasts, Live Sets, Mixes (mp3)"}
+    - {id: 827, cat: Audio/MP3, desc: " |- D'n'B / Jungle / Breaks (mp3)"}
+    - {id: 826, cat: Audio/MP3, desc: " |- Ambient / ChillOut (mp3)"}
+    - {id: 288, cat: Audio/MP3, desc: " |- Drum and Bass (mp3)"}
+    - {id: 128, cat: Audio/MP3, desc: " |- Garage (mp3)"}
+    - {id: 127, cat: Audio/MP3, desc: " |- Mixadance (mp3)"}
+    - {id: 126, cat: Audio/MP3, desc: " |- House / Electro / Dance / Synthpop (mp3)"}
+    - {id: 125, cat: Audio/MP3, desc: " |- Trance / ProgressiveTranсе / HardStyle (mp3)"}
+    - {id: 124, cat: Audio/MP3, desc: " |- Электронная музыка других жанров (mp3)"}
+    - {id: 929, cat: Audio/MP3, desc: " |- Сборники разных исполнителей (mp3)"}
+    - {id: 940, cat: Audio/Lossless, desc: " |- Дискографии в Lossless"}
+    - {id: 951, cat: Audio/MP3, desc: " |- Дискографии в MP3"}
+    - {id: 130, cat: Audio, desc: " |- Многоканальная музыка (Рэп, Хип-Хоп, R.n.B)"}
+    - {id: 830, cat: Audio/Lossless, desc: " |- Lossless (Рэп, Хип-Хоп, R.n.B)"}
+    - {id: 134, cat: Audio/MP3, desc: " |- Отечественный Рэп, Хип-Хоп (mp3)"}
+    - {id: 133, cat: Audio/MP3, desc: " |- Зарубежный Рэп, Хип-Хоп (mp3)"}
+    - {id: 132, cat: Audio/MP3, desc: " |- Отечественный R.n.B (mp3)"}
+    - {id: 131, cat: Audio/MP3, desc: " |- Зарубежный R.n.B (mp3)"}
+    - {id: 930, cat: Audio/MP3, desc: " |- Сборники разных исполнителей (mp3)"}
+    - {id: 941, cat: Audio/Lossless, desc: " |- Дискографии в Lossless"}
+    - {id: 952, cat: Audio/MP3, desc: " |- Дискографии в MP3"}
+    - {id: 831, cat: Audio, desc: " |- Многоканальная музыка (Зарубежный рок)"}
+    - {id: 454, cat: Audio/Lossless, desc: " |- Lossless (Зарубежный рок)"}
+    - {id: 149, cat: Audio/MP3, desc: " |- Аltеrnаtivе, Hard, Indереndеnt (mp3)"}
+    - {id: 839, cat: Audio/MP3, desc: " |- Reggae, Ska, Dub (mp3)"}
+    - {id: 148, cat: Audio/MP3, desc: " |- Punk, Hardcore, Emo (mp3)"}
+    - {id: 147, cat: Audio/MP3, desc: " |- Nu Metal, Metalcore, Metal (mp3)"}
+    - {id: 150, cat: Audio/MP3, desc: " |- Post-Rock (mp3)"}
+    - {id: 931, cat: Audio/MP3, desc: " |- Сборники разных исполнителей (mp3)"}
+    - {id: 942, cat: Audio/Lossless, desc: " |- Дискографии в Lossless"}
+    - {id: 954, cat: Audio/MP3, desc: " |- Дискографии в MP3"}
+    - {id: 832, cat: Audio, desc: " |- Многоканальная музыка (Отечественный рок)"}
+    - {id: 455, cat: Audio/Lossless, desc: " |- Lossless (Отечественный рок)"}
+    - {id: 834, cat: Audio/MP3, desc: " |- Nu Metal, Metalcore, Metal (mp3)"}
+    - {id: 833, cat: Audio/MP3, desc: " |- Аltеrnаtivе, Hard, Indереndеnt (mp3)"}
+    - {id: 152, cat: Audio/MP3, desc: " |- Punk, Hardcore, Emo (mp3)"}
+    - {id: 151, cat: Audio/MP3, desc: " |- Reggae, Ska, Dub (mp3)"}
+    - {id: 932, cat: Audio/MP3, desc: " |- Сборники разных исполнителей (mp3)"}
+    - {id: 943, cat: Audio/Lossless, desc: " |- Дискографии в Lossless"}
+    - {id: 956, cat: Audio/MP3, desc: " |- Дискографии в MP3"}
+    - {id: 845, cat: Audio, desc: " |- Многоканальная музыка (Industrial)"}
+    - {id: 844, cat: Audio/Lossless, desc: " |- Lossless (Industrial)"}
+    - {id: 843, cat: Audio/MP3, desc: " |- Отечественный Industrial (mp3)"}
+    - {id: 842, cat: Audio/MP3, desc: " |- Зарубежный Industrial (mp3)"}
+    - {id: 936, cat: Audio/MP3, desc: " |- Сборники разных исполнителей (mp3)"}
+    - {id: 944, cat: Audio/Lossless, desc: " |- Дискографии в Lossless"}
+    - {id: 955, cat: Audio/MP3, desc: " |- Дискографии в MP3"}
+    - {id: 853, cat: Audio, desc: " |- Многоканальная музыка (Folk, NewAge, Flamenco)"}
+    - {id: 852, cat: Audio/Lossless, desc: " |- Lossless (Folk, NewAge, Flamenco)"}
+    - {id: 851, cat: Audio/MP3, desc: " |- Flamenco и акустическая гитара (mp3)"}
+    - {id: 850, cat: Audio/MP3, desc: " |- Этническая музыка Африки и Азии (mp3)"}
+    - {id: 849, cat: Audio/MP3, desc: " |- Country, Bluegrass (mp3)"}
+    - {id: 848, cat: Audio/MP3, desc: " |- Этническая музыка Кавказа и Закавказья (mp3)"}
+    - {id: 847, cat: Audio/MP3, desc: " |- NewAge &Meditative (mp3)"}
+    - {id: 846, cat: Audio/MP3, desc: " |- Folk и neo-folk, celtic, medieval (mp3)"}
+    - {id: 935, cat: Audio/MP3, desc: " |- Сборники разных исполнителей (mp3)"}
+    - {id: 945, cat: Audio/Lossless, desc: " |- Дискографии в Lossless"}
+    - {id: 953, cat: Audio/MP3, desc: " |- Дискографии в MP3"}
+    - {id: 222, cat: Audio, desc: " |- Многоканальная музыка (Поп-музыка)"}
+    - {id: 221, cat: Audio/Lossless, desc: " |- Lossless (Поп-музыка)"}
+    - {id: 326, cat: Audio/MP3, desc: " |- Отечественная Eurodance, Technopop, Disco (mp3)"}
+    - {id: 223, cat: Audio/MP3, desc: " |- Зарубежная Eurodance, Technopop, Disco (mp3)"}
+    - {id: 156, cat: Audio/MP3, desc: " |- Отечественная Поп музыка (mp3)"}
+    - {id: 157, cat: Audio/MP3, desc: " |- Зарубежная Поп музыка (mp3)"}
+    - {id: 158, cat: Audio/MP3, desc: " |- Сборники отечественной Поп-музыки (mp3)"}
+    - {id: 224, cat: Audio/MP3, desc: " |- Сборники зарубежной Поп-музыки (mp3)"}
+    - {id: 924, cat: Audio/MP3, desc: " |- Сборники разных исполнителей (mp3)"}
+    - {id: 946, cat: Audio/Lossless, desc: " |- Дискографии в Lossless"}
+    - {id: 950, cat: Audio/MP3, desc: " |- Дискографии в MP3"}
+    - {id: 840, cat: Audio, desc: " |- Многоканальная музыка (Классическая музыка)"}
+    - {id: 841, cat: Audio/Lossless, desc: " |- Lossless (Классическая музыка)"}
+    - {id: 153, cat: Audio/MP3, desc: " |- Классическая музыка (mp3)"}
+    - {id: 933, cat: Audio/MP3, desc: " |- Сборники разных исполнителей (mp3)"}
+    - {id: 947, cat: Audio/Lossless, desc: " |- Дискографии в Lossless"}
+    - {id: 949, cat: Audio/MP3, desc: " |- Дискографии в MP3"}
+    - {id: 928, cat: Audio, desc: " |- Многоканальная музыка"}
+    - {id: 938, cat: Audio/Lossless, desc: " |- Lossless (Музыка других жанров)"}
+    - {id: 572, cat: Audio/MP3, desc: " |- Blues, Lounge,Cillout, Bossa Nova (mp3)"}
+    - {id: 155, cat: Audio/MP3, desc: " |- Джаз (mp3)"}
+    - {id: 871, cat: Audio/MP3, desc: " |- Военная и Патриотическая песня (mp3)"}
+    - {id: 259, cat: Audio/MP3, desc: " |- Шансон и Бардовская песня (mp3)"}
+    - {id: 448, cat: Audio/MP3, desc: " |- Музыка для детей (mp3)"}
+    - {id: 934, cat: Audio/MP3, desc: " |- Сборники разных исполнителей (mp3)"}
+    - {id: 867, cat: Audio, desc: " |- Рок-музыка (муз видео)"}
+    - {id: 866, cat: Audio, desc: " |- Электронная музыка (муз видео)"}
+    - {id: 865, cat: Audio, desc: " |- Поп-музыка ( муз видео)"}
+    - {id: 864, cat: Audio, desc: " |- Народная музыка (Folk) (муз видео)"}
+    - {id: 863, cat: Audio, desc: " |- Джаз (муз видео)"}
+    - {id: 862, cat: Audio, desc: " |- Блюз (муз видео)"}
+    - {id: 861, cat: Audio, desc: " |- Классика (муз видео)"}
+    - {id: 860, cat: Audio, desc: " |- Рэп, Хип-Хоп, R.n.B (муз видео)"}
+    - {id: 859, cat: Audio, desc: " |- Русский шансон (муз видео)"}
+    - {id: 858, cat: Audio, desc: " |- Детское муз видео"}
+    - {id: 289, cat: Audio, desc: " |- К играм"}
+    - {id: 290, cat: Audio, desc: " |- К фильмам"}
+    - {id: 291, cat: Audio, desc: " |- К сериалам"}
+    # Литература и обучение
+    # Literature and learning
+    - {id: 61, cat: Books, desc: " |- Художественная литература"}
+    - {id: 664, cat: Books, desc: " |- Художественная литература для детей"}
+    - {id: 467, cat: Books, desc: " |- Художественная литература на иностранных языках"}
+    - {id: 703, cat: Books, desc: "Программы и библиотеки для электронных книг"}
+    - {id: 966, cat: Books, desc: " |- Кулинария"}
+    - {id: 666, cat: Books, desc: " |- Обучающая литература для родителей"}
+    - {id: 665, cat: Books, desc: " |- Обучающая литература для детей"}
+    - {id: 182, cat: Books, desc: " |- Учебники, справочники, энциклопедии"}
+    - {id: 466, cat: Books, desc: " |- Книги, учебники и справочная литература по обучению ин. язык.."}
+    - {id: 185, cat: Books, desc: " |- Философия и религия"}
+    - {id: 184, cat: Books, desc: " |- Психология"}
+    - {id: 183, cat: Books, desc: " |- Хобби (увлечения и досуг)"}
+    - {id: 181, cat: Books, desc: " |- Литература по компьютерам и ПО"}
+    - {id: 782, cat: Books, desc: " |- Радиоэлектроника"}
+    - {id: 585, cat: Books, desc: " |- Литература по авто и мото транспорту"}
+    - {id: 584, cat: Books, desc: " |- Руководства по ремонту/обслуживанию/эксплуатации авто"}
+    - {id: 586, cat: Books, desc: " |- Авто - Тюнинг, чиптюнинг, настройка, отделка и укращения"}
+    - {id: 672, cat: Books, desc: " |- Литература по медицине"}
+    - {id: 793, cat: Books, desc: "Журналы научно-прикладные и познавательно-образовательные"}
+    - {id: 708, cat: PC, desc: "Интерактивный и компьтерный материал"}
+    - {id: 875, cat: PC, desc: " |- Интерактивные компьютерные диски для хобби"}
+    - {id: 583, cat: PC, desc: " |- Интерактивные справочники и каталоги для авто/мото транспорт.."}
+    - {id: 465, cat: PC, desc: " |- Интерактивные и компьютерные диски для обучения ин. языкам"}
+    - {id: 674, cat: PC, desc: " |- Интерактивные и компьютерные диски по медицине"}
+    - {id: 710, cat: PC, desc: " |- Прочие материалы для детей и родителей"}
+    - {id: 888, cat: Books, desc: "Литература разных направлений"}
+    - {id: 897, cat: Books, desc: " |- Прочее"}
+    - {id: 896, cat: Books, desc: " |- Автомобили"}
+    - {id: 895, cat: Books, desc: " |- Домашним мастерам"}
+    - {id: 894, cat: Books, desc: " |- Для женщин"}
+    - {id: 893, cat: Books, desc: " |- Для мужчин"}
+    - {id: 892, cat: Books, desc: " |- Научно-популярное"}
+    - {id: 891, cat: Books, desc: " |- Мир техники"}
+    - {id: 890, cat: Books, desc: " |- Игры"}
+    - {id: 889, cat: Books, desc: " |- История"}
+    - {id: 21, cat: Audio/Audiobook, desc: "Аудиокниги"}
+    - {id: 736, cat: Audio/Audiobook, desc: " |- S.T.A.L.K.E.R."}
+    - {id: 693, cat: Audio/Audiobook, desc: " |- Романы"}
+    - {id: 464, cat: Audio/Audiobook, desc: " |- Аудиообучение ин. языкам"}
+    - {id: 686, cat: Audio/Audiobook, desc: " |- Обучающие и познавательные аудиокниги"}
+    - {id: 685, cat: Audio/Audiobook, desc: " |- Аудиокниги на иностранных языках"}
+    - {id: 684, cat: Audio/Audiobook, desc: " |- Детективы"}
+    - {id: 441, cat: Audio/Audiobook, desc: " |- Фантастика"}
+    - {id: 192, cat: Audio/Audiobook, desc: " |- Классика"}
+    - {id: 816, cat: Audio/Audiobook, desc: " |- Современная литература"}
+    - {id: 190, cat: Audio/Audiobook, desc: " |- Аудио книги для детей"}
+    - {id: 191, cat: Audio/Audiobook, desc: " |- Обучающие аудиокниги и аудиоупражнения для детей"}
+    - {id: 749, cat: Audio, desc: "Аудио концерты, спектакли, пьесы"}
+    - {id: 687, cat: Audio, desc: " |- Аудиоспектакли и литературные чтения"}
+    - {id: 751, cat: Audio, desc: " |- Аудио юмористические концерты (выступления)"}
+    # Эротика
+    # Erotica
+    - {id: 483, cat: Other, desc: "Правила, FAQ и Предложения по улучшению раздела "Эротик.."}
+    - {id: 484, cat: Other, desc: " |- Правила и FAQ"}
+    - {id: 485, cat: Other, desc: " |- Предложения по улучшению раздела "Эротика"и форум.."}
+    - {id: 688, cat: Other, desc: " |- Ищу / Предлагаю"}
+    - {id: 963, cat: XXX, desc: "Эротические художественные фильмы"}
+    - {id: 964, cat: XXX, desc: "Эротические документальные фильмы"}
+    - {id: 178, cat: XXX, desc: "Русская эротика"}
+    - {id: 179, cat: XXX, desc: "Иностранная эротика"}
+    - {id: 176, cat: XXX, desc: "Фото, ролики"}
+    - {id: 577, cat: XXX, desc: "Нетрадиционная эротика"}
+    - {id: 571, cat: XXX, desc: "Мультипликационные фильмы для взрослых"}
+    - {id: 177, cat: XXX, desc: "Хентай"}
+    - {id: 812, cat: XXX, desc: "3D | Стерео эротика"}
+    - {id: 882, cat: XXX, desc: " |- 3D | мульт"}
+    - {id: 817, cat: XXX, desc: " |- 3D | Хентай"}
+    - {id: 815, cat: XXX, desc: " |- 3D | Видеоролики"}
+    - {id: 814, cat: XXX, desc: " |- 3D | Русская эротика"}
+    - {id: 813, cat: XXX, desc: " |- 3D | Иностранная эротика"}
+    - {id: 820, cat: XXX, desc: "Литература"}
+    # Служебный раздел
+    # Service section
+    - {id: 604, cat: Other, desc: "Открытый"}
+    - {id: 912, cat: Other, desc: "Нарушение правил оформления"}
+    - {id: 57, cat: Other, desc: "Временный склад (TEMP)"}
+    - {id: 433, cat: Other, desc: "Архив раздач"}
+    - {id: 378, cat: Other, desc: "Корзина"}
+
+  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: striprussian
+    type: checkbox
+    label: Strip Russian Letters
+    default: false
+  - name: addrussian
+    type: checkbox
+    label: Add RUSSIAN to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 1
+    options:
+      1: created
+      10: seeders
+      7: size
+      2: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: 2
+    options:
+      2: desc
+      1: asc
+
+login:
+  path: login.php
+  method: form
+  form: form[action$="/login.php"]
+  inputs:
+    login_username: "{{ .Config.username }}"
+    login_password: "{{ .Config.password }}"
+    autologin: 1
+  selectorinputs:
+    cookie_test:
+      selector: input[name="cookie_test"]
+      attribute: value
+  error:
+    - selector: h4.warnColor1
+  test:
+    path: index.php
+    selector: a[href="/login.php?logout=1"]
+
+search:
+  paths:
+    - path: tracker.php
+  keywordsfilters:
+    - name: diacritics
+      args: replace
+    - name: re_replace # S01 to сезон 1
+      args: ["(?i)\\bS0*(\\d+)\\b", "сезон $1"]
+    - name: re_replace # S01E01 to сезон 1 серии 1
+      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "сезон $1 серии $2"]
+  inputs:
+    $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{ else }}f[]=-1{{ end }}"
+    prev_allw: 1
+    prev_a: 0
+    prev_dla: 0
+    prev_dlc: 0
+    prev_dld: 0
+    prev_dlw: 0
+    prev_my: 0
+    prev_new: 0
+    prev_sd: 0
+    prev_da: 1
+    prev_dc: 0
+    prev_df: 1
+    prev_ds: 0
+    # sort by 1=registered 2=topicTitle 4=completed 10=seed 11=leech 12=up 13=down 5=replies 6=views 7=size 8=lastPost 9=seedLastSeen
+    o: "{{ .Config.sort }}"
+    # 1=asc 2=desc
+    s: "{{ .Config.type }}"
+    # show category
+    dc: 0
+    # show forum
+    df: 1
+    # show author
+    da: 1
+    # show speed
+    ds: 0
+    # -1=all time
+    tm: -1
+    # seed not seen -1=disregard
+    sns: -1
+    nm: "{{ .Keywords }}"
+    # find a username
+    pn: ""
+    # search all words
+    allw: 1
+
+  rows:
+    selector: tr[id^="tor_"]:has(a[href^="/download.php?id="])
+
+  fields:
+    category:
+      selector: a.gen
+      attribute: href
+      filters:
+        - name: querystring
+          args: f
+    title:
+      selector: a.genmed
+      filters:
+        - name: replace
+          args: ["Кураж-Бамбей", "kurazh"]
+        - name: replace
+          args: ["Кубик в Кубе", "Kubik"]
+        - name: replace
+          args: ["Кравец", "Kravec"]
+        - name: replace
+          args: ["Пифагор", "Pifagor"]
+        - name: replace
+          args: ["Невафильм", "Nevafilm"]
+        - name: replace
+          args: ["Лицензия", "Lic"]
+        - name: replace
+          args: ["селезень", "selezen"]
+        # normalize to SXXEYY format
+        - name: re_replace
+          args: ["([CСcс]езоны?:?\\s+((?:\\d+)(?:-\\d+)?).*[CСcс]ери[ия]:?\\s+((?:\\d+)(?:-\\d+)?).*?\\d+\\)?)", " S$2E$3 "]
+        - name: re_replace
+          args: ["([CСcс]ери[ия]:?\\s+((?:\\d+)(?:-\\d+)?).*?[?\\d]+\\)?)", " E$2 "]
+        - name: re_replace
+          args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$0{{ end }}"]
+        - name: re_replace
+          args: ["[«»()=.,:|\\[\\]\\/]", " "]
+        - name: append
+          args: "{{ if .Config.addrussian }} - RUSSIAN{{ else }}{{ end }}"
+        - name: replace
+          args: ["-Rip", "Rip"]
+        - name: replace
+          args: ["WEB-DL", "WEBDL"]
+        - name: replace
+          args: ["WEBDLRip", "WEBDL"]
+        - name: replace
+          args: ["HDTVRip", "HDTV"]
+    details:
+      selector: a.genmed
+      attribute: href
+    download:
+      selector: a[href^="/download.php?id="]
+      attribute: href
+    size:
+      selector: td:nth-child(6) > u
+    seeders:
+      selector: td.seedmed > b
+    leechers:
+      selector: td.leechmed > b
+    grabs:
+      selector: td:nth-child(9)
+    date:
+      # unix
+      selector: td:last-child > u
+    downloadvolumefactor:
+      case:
+        img[src="images/tor_gold.gif"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+# TorrentPier

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

@@ -51,7 +51,7 @@ settings:
   - name: flaresolverr
     type: info
     label: FlareSolverr
-    default: This site may use DDoS-Guard Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
+    default: This site may use DDoS-Guard Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
   - name: thankyou
     type: text
     label: Thank You Comment

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,73 +6,56 @@ language: fr-FR
 type: private
 encoding: UTF-8
 links:
+  - https://fou-du-cinema.ca/
+legacylinks:
   - https://fou-du-cinema.net/
 
 caps:
   categorymappings:
-    # when refreshing categories dont forget to update the category case block
-    - {id: 2, cat: Movies/DVD, desc: "Film DVDRip"}
-    - {id: 99, cat: Movies/HD, desc: "Film Hdrip"}
-    - {id: 98, cat: Movies/WEB-DL, desc: "Film Webrip"}
-    - {id: 86, cat: Movies/UHD, desc: "Film UHD"}
-    - {id: 87, cat: Movies/HD, desc: "Film REMUX"}
-    - {id: 70, cat: Movies/BluRay, desc: "Film BRRiP - BDRiP"}
-    - {id: 69, cat: Movies/DVD, desc: "Film DVD-r"}
-    - {id: 67, cat: Movies/3D, desc: "Film 3D Bluray"}
-    - {id: 59, cat: Movies/Other, desc: "Film Divers"}
-    - {id: 19, cat: Movies/HD, desc: "Film 720P"}
-    - {id: 17, cat: Movies/Other, desc: "Film Iso"}
-    - {id: 15, cat: Movies/BluRay, desc: "Film Bluray Full"}
-    - {id: 4, cat: Movies/HD, desc: "Film 1080P"}
-    - {id: 102, cat: Movies/UHD, desc: "Film HDR"}
-    - {id: 46, cat: TV/HD, desc: "Serie 1080P"}
-    - {id: 48, cat: TV/HD, desc: "Serie Bluray"}
-    - {id: 60, cat: TV/Other, desc: "Serie Divers"}
-    - {id: 72, cat: TV/HD, desc: "Serie BRRiP - BDRiP"}
-    - {id: 101, cat: TV/UHD, desc: "Serie HDR"}
-    - {id: 12, cat: TV/Other, desc: "Serie DVDRip"}
-    - {id: 30, cat: TV/HD, desc: "Serie 720P"}
-    - {id: 23, cat: TV/WEB-DL, desc: "Serie Web"}
-    - {id: 44, cat: TV/HD, desc: "Pack_Series 1080P"}
-    - {id: 38, cat: TV/Other, desc: "Pack_Series intégrale"}
-    - {id: 41, cat: TV/WEB-DL, desc: "Pack_Series Web"}
-    - {id: 45, cat: TV/HD, desc: "Pack_Series 720P"}
-    - {id: 63, cat: TV/Other, desc: "Pack_Series Divers"}
-    - {id: 71, cat: TV/HD, desc: "Pack_Series BRRiP - BDRiP"}
-    - {id: 82, cat: TV/Anime, desc: "Pack_Series Animation"}
-    - {id: 112, cat: TV/HD, desc: "Pack_Series HDTV"}
-    - {id: 105, cat: Books/Mags, desc: "Livres Magazine"}
-    - {id: 116, cat: Books, desc: "Livres Cuisine"}
-    - {id: 123, cat: Books, desc: "Livres Roman"}
-    - {id: 113, cat: Books/EBook, desc: "Livres Ebook"}
-    - {id: 106, cat: Books, desc: "Livres Presse"}
-    - {id: 108, cat: Books/Comics, desc: "Livres Manga"}
-    - {id: 110, cat: Audio/Audiobook, desc: "Livres Audio"}
-    - {id: 109, cat: Books/Comics, desc: "Livres Bd"}
-    - {id: 125, cat: XXX/Other, desc: "livres XXX"}
-    - {id: 65, cat: TV/Documentary, desc: "Documentaires Divers"}
-    - {id: 13, cat: PC/0day, desc: "Apps Win"}
-    - {id: 14, cat: PC/Mac, desc: "Apps Mac"}
-    - {id: 52, cat: PC/Mobile-iOS, desc: "Apps Iphone"}
-    - {id: 53, cat: PC/Mobile-Android, desc: "Apps android"}
-    - {id: 81, cat: TV/Anime, desc: "Animation Séries"}
-    - {id: 79, cat: Movies/HD, desc: "Animation Film"}
-    - {id: 5, cat: Audio/MP3, desc: "Music Mp3"}
-    - {id: 6, cat: Audio/Lossless, desc: "Music FLAC"}
-    - {id: 97, cat: TV/Sport, desc: "Sport Divers"}
-    - {id: 96, cat: TV/Sport, desc: "Sport Sport"}
-    - {id: 7, cat: PC/Games, desc: "Jeux Win"}
-    - {id: 8, cat: Console/PS3, desc: "Jeux PS3"}
-    - {id: 54, cat: PC/Games, desc: "Jeux Pc"}
-    - {id: 55, cat: Console/PS4, desc: "Jeux PS4"}
-    - {id: 56, cat: Console/XBox 360, desc: "Jeux XBOX 360"}
-    - {id: 57, cat: Console/Other, desc: "Jeux androïd"}
-    - {id: 10, cat: XXX, desc: "XxX 18 Film"}
+    - {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:
@@ -161,67 +144,12 @@ search:
     selector: div.content_wrap > div.selection_wrap:has(a[href^="details.php?id="])
 
   fields:
-    category:
-      selector: div.kat_cat_pic
-      filters:
-      case:
-        ":contains(\"Film\"):contains(\"DVDRip\")": 2
-        ":contains(\"Film\"):contains(\"Hdrip\")": 99
-        ":contains(\"Film\"):contains(\"Webrip\")": 98
-        ":contains(\"Film\"):contains(\"UHD\")": 86
-        ":contains(\"Film\"):contains(\"REMUX\")": 87
-        ":contains(\"Film\"):contains(\"BRRiP - BDRiP\")": 70
-        ":contains(\"Film\"):contains(\"DVD-r\")": 69
-        ":contains(\"Film\"):contains(\"3D\")": 67
-        ":contains(\"Film\"):contains(\"Divers\")": 59
-        ":contains(\"Film\"):contains(\"720P\")": 19
-        ":contains(\"Film\"):contains(\"Iso\")": 17
-        ":contains(\"Film\"):contains(\"Full\")": 15
-        ":contains(\"Film\"):contains(\"1080P\")": 4
-        ":contains(\"Film\"):contains(\"HDR\")": 102
-        ":contains(\"Serie\"):contains(\"1080P\")": 46
-        ":contains(\"Serie\"):contains(\"Bluray\")": 48
-        ":contains(\"Serie\"):contains(\"Divers\")": 60
-        ":contains(\"Serie\"):contains(\"BRRiP - BDRiP\")": 72
-        ":contains(\"Serie\"):contains(\"HDR\")": 101
-        ":contains(\"Serie\"):contains(\"DVDRip\")": 12
-        ":contains(\"Serie\"):contains(\"720P\")": 30
-        ":contains(\"Serie\"):contains(\"Web\")": 23
-        ":contains(\"Pack_Series\"):contains(\"1080P\")": 44
-        ":contains(\"Pack_Series\"):contains(\"intégrale\")": 38
-        ":contains(\"Pack_Series\"):contains(\"Web\")": 41
-        ":contains(\"Pack_Series\"):contains(\"720P\")": 45
-        ":contains(\"Pack_Series\"):contains(\"Divers\")": 63
-        ":contains(\"Pack_Series\"):contains(\"BRRiP - BDRiP\")": 71
-        ":contains(\"Pack_Series\"):contains(\"Animation\")": 82
-        ":contains(\"Pack_Series\"):contains(\"HDTV\")": 112
-        ":contains(\"Livres\"):contains(\"Magazine\")": 105
-        ":contains(\"Livres\"):contains(\"Cuisine\")": 116
-        ":contains(\"Livres\"):contains(\"Roman\")": 123
-        ":contains(\"Livres\"):contains(\"Ebook\")": 113
-        ":contains(\"Livres\"):contains(\"Presse\")": 106
-        ":contains(\"Livres\"):contains(\"Manga\")": 108
-        ":contains(\"Livres\"):contains(\"Audio\")": 110
-        ":contains(\"Livres\"):contains(\"Bd\")": 109
-        ":contains(\"Livres\"):contains(\"XXX\")": 125
-        ":contains(\"Documentaires\"):contains(\"Divers\")": 65
-        ":contains(\"Apps\"):contains(\"Win\")": 13
-        ":contains(\"Apps\"):contains(\"Mac\")": 14
-        ":contains(\"Apps\"):contains(\"Iphone\")": 52
-        ":contains(\"Apps\"):contains(\"android\")": 53
-        ":contains(\"Animation\"):contains(\"Séries\")": 81
-        ":contains(\"Animation\"):contains(\"Film\")": 79
-        ":contains(\"Music\"):contains(\"Mp3\")": 5
-        ":contains(\"Music\"):contains(\"FLAC\")": 6
-        ":contains(\"Sport\"):contains(\"Divers\")": 97
-        ":contains(\"Sport\"):contains(\"Sport\")": 96
-        ":contains(\"Jeux\"):contains(\"Win\")": 7
-        ":contains(\"Jeux\"):contains(\"PS3\")": 8
-        ":contains(\"Jeux\"):contains(\"Pc\")": 54
-        ":contains(\"Jeux\"):contains(\"PS4\")": 55
-        ":contains(\"Jeux\"):contains(\"XBOX 360\")": 56
-        ":contains(\"Jeux\"):contains(\"androïd\")": 57
-        ":contains(\"XxX\"):contains(\"Film\")": 10
+    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^="details.php?id="]
     title_multilang:
@@ -288,16 +216,11 @@ search:
       selector: div.selection_unter_ad
     grabs:
       selector: div.selection_unter_ae
-      filters:
-        - name: replace
-          args: [" x", ""]
     downloadvolumefactor:
       text: 1
     uploadvolumefactor:
       text: 1
-    minimumratio:
-      text: 0.5
     minimumseedtime:
-      # 2.5days (as seconds =  2.5 x 24 x 60 x 60)
+      # 2.5 days (as seconds =  2.5 x 24 x 60 x 60)
       text: 216000
 # 3xT

src/Jackett.Common/Definitions/ftuapps.yml

@@ -10,7 +10,7 @@ links:
 
 caps:
   categorymappings:
-    - {id: 52, cat: PC, desc: "Net", default: true}
+    - {id: 52, cat: PC, desc: ".Net", default: true}
     - {id: 3648, cat: PC/Mobile-Android, desc: "Android Applications", default: true}
     - {id: 55, cat: PC/Mobile-Other, desc: "Application", default: true}
     - {id: 46, cat: PC, desc: "Database", default: true}
@@ -43,22 +43,8 @@ search:
       - name: andmatch
 
   fields:
-    category:
+    categorydesc:
       selector: a[href*="/category/"]
-      case:
-        ":contains(\"Net\")": 52
-        ":contains(\"Android\")": 3648
-        ":contains(\"Application\")": 55
-        ":contains(\"Database\")": 46
-        ":contains(\"Delphi\")": 331
-        ":contains(\"DriverPack\")": 4120
-        ":contains(\"MacOS\")": 2142
-        ":contains(\"Operating\")": 2431
-        ":contains(\"Other\")": 56
-        ":contains(\"Portable\")": 2172
-        ":contains(\"PreActivated\")": 2435
-        ":contains(\"Software\")": 3
-        ":contains(\"Script\")": 165
     title:
       selector: a
       attribute: title

src/Jackett.Common/Definitions/gay-torrents.yml

@@ -1,7 +1,7 @@
 ---
 id: gay-torrents
 name: Gay-Torrents.net
-description: "Gay-Torrents.net is a Private Torrent Tracker for GAY XXX"
+description: "Gay-Torrents.net is a Private Torrent Tracker for GAY 3X"
 language: en-US
 type: semi-private
 encoding: UTF-8

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,17 +31,17 @@ legacylinks:
   - https://gktorrent.nocensor.work/
   - https://www.gktorrents.net/
   - https://gktorrent.nocensor.biz/
+  - https://www.gktorrents.org/
 
 caps:
   categorymappings:
-    - {id: movies, cat: Movies, desc: "Movies"}
-    - {id: tvshows, cat: TV, desc: "TV Shows"}
-    - {id: softwares, cat: PC, desc: "Softwares"}
-    - {id: music, cat: Audio, desc: "Music"}
-    - {id: console-games, cat: Console, desc: "Console Games"}
-    - {id: pc-games, cat: PC/Games, desc: "PC Games"}
-    - {id: books, cat: Books, desc: "Books"}
-    - {id: xxx, cat: XXX, desc: "XXX"}
+    - {id: Films, cat: Movies, desc: "Movies"}
+    - {id: Séries, cat: TV, desc: "TV"}
+    - {id: Musiques, cat: Audio, desc: "Music"}
+    - {id: Ebooks, cat: Books, desc: "Books"}
+    - {id: Logiciels, cat: PC, desc: "Software"}
+    - {id: Jeux-PC, cat: PC/Games, desc: "PC Games"}
+    - {id: Jeux-Consoles, cat: Console/XBox 360, desc: "Console Games"}
 
   modes:
     search: [q]
@@ -94,15 +95,7 @@ search:
   fields:
     category:
       selector: td:nth-child(1) > i
-      case:
-        .Films: movies
-        .Séries: tvshows
-        .Logiciels: softwares
-        .Musique: music
-        .Jeux-Consoles: console-games
-        .Jeux-PC: pc-games
-        .Ebook: books
-        .Porno: xxx
+      attribute: class
     site_date:
       selector: td:nth-child(1) a
       filters:

src/Jackett.Common/Definitions/glodls.yml

@@ -10,13 +10,12 @@ links:
   - https://glodls.to/
   - https://gtdb.cc/
   - https://www.gtdb.to/
-  - https://glotorrents.unblockit.day/
+  - 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/
@@ -33,6 +32,9 @@ legacylinks:
   - https://glotorrents.unblockit.how/
   - 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/happyfappy.yml

@@ -14,8 +14,6 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
-    movie-search: [q]
 
 settings:
   - name: username

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

@@ -50,7 +50,7 @@ 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">FlareSolver</a> to access it.
+    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.
   - name: info_tpp
     type: info
     label: Results Per Page

src/Jackett.Common/Definitions/hdgalaktik.yml

@@ -0,0 +1,207 @@
+---
+id: hdgalaktik
+name: HDGalaKtik
+description: "HDGalaKtik is a RUSSIAN Semi-Private tracker for TV / MOVIES / GENERAL"
+language: ru-RU
+type: semi-private
+encoding: UTF-8
+links:
+  - https://hdgalaktik.com/
+
+caps:
+  categorymappings:
+    - {id: 13, cat: Movies, desc: "Фильмы (Movies)"}
+    - {id: 6, cat: TV, desc: "Мультфильмы (Cartoons)"}
+    - {id: 10, cat: Audio, desc: "Музыка (Music)"}
+    - {id: 26, cat: PC, desc: "Программы (Programs)"}
+    - {id: 5, cat: Console, desc: "Игры (Games)"}
+    - {id: 25, cat: Other, desc: "Картинки (Pictures)"}
+    - {id: 11, cat: TV, desc: "Сериалы (TV Series)"}
+    - {id: 12, cat: TV/Anime, desc: "Аниме (Anime)"}
+    - {id: 16, cat: Books, desc: "Книги (Books)"}
+    - {id: 18, cat: Audio/Video, desc: "Клипы / Ролики (Clips / Trailers)"}
+    - {id: 22, cat: TV, desc: "ТВ / Передачи (TV)"}
+    - {id: 27, cat: PC/Mobile-Other, desc: "Игры - Мобила / КПК (Mobile)"}
+    - {id: 1, cat: PC/ISO, desc: "Образы (ISO)"}
+    - {id: 4, cat: Other, desc: "Другое (Other)"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: cookie
+    type: text
+    label: Cookie
+  - name: info
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: striprussian
+    type: checkbox
+    label: Strip Russian Letters
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      1: title
+      5: size
+      8: seeders
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+
+login:
+  method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
+  test:
+    path: /
+    selector: a[href="mybonus.php"]
+
+search:
+  # https://hdgalaktik.com/browse.php?search=&stype=0&s=0&cat=0&gr=0&kp=0&im=0&incldead=1&sort=0&type=desc
+  paths:
+    - path: browse.php
+  keywordsfilters:
+    - name: re_replace # S01E01 to [1 сезон 1 сери]
+      args: ["(?i)S0*(\\d+)E0*(\\d+)", "[$1 сезон $2 сери]"]
+    - name: re_replace # S01 to [1 сезон]
+      args: ["(?i)S0*(\\d+)", "[$1 сезон]"]
+    - name: re_replace # E01 to [1 сери]
+      args: ["(?i)E0*(\\d+)", "[$1 сери]"]
+    - name: re_replace # replace special characters with "%" (wildcard)
+      args: ["[^a-zA-Z0-9]+", "%"]
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # 0 title, 1 descr, 2 filename, 4 infohash
+    stype: 0
+    # 0 AND 1 OR
+    s: 0
+    # release group
+    gr: 0
+    # ratings
+    kp: 0
+    # 1 active, 2 dead, 3 gold, 4 sticky, lots of others
+    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
+    sort: "{{ .Config.sort }}"
+    ascdesc: "{{ .Config.type }}"
+
+  rows:
+    selector: table.embedded > tbody > tr.torcontduo
+
+  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
+    title:
+      selector: a.alink
+      attribute: title
+      filters:
+        # normalize to SXXEYY format
+        - name: re_replace
+          args: ["[\\.\\,\\:\\/\\|\\[\\]]", " "]
+        - name: re_replace
+          args: ["(.*) от .*$", "$1"]
+        - name: re_replace
+          args: ["(.*)(\\d+\\-\\d+)\\s*[CСcс]езон\\s*(\\d+\\-\\d+)\\s*[CСcс]ери[ия]\\s*из\\s*\\d+(.*)", "$1 S$2E$3 rus $4"]
+        - name: re_replace
+          args: ["(.*)(\\d+)\\-(\\d+)\\s*[CСcс]езон\\s*(\\d+)\\-(\\d+)\\s*[CСcс]ери[ия](.*)", "$1 S$2E$3 rus $4"]
+        - name: re_replace
+          args: ["(.*)(\\d+)\\s*[CСcс]езон\\s*(\\d+\\-\\d+)\\s*[CСcс]ери[ия]\\s*из\\s*\\d+(.*)", "$1 S$2E$3 rus $4"]
+        - name: re_replace
+          args: ["(.*)(\\d+)\\s*[CСcс]езон\\s*(\\d+\\-\\d+)\\s*[CСcс]ери[ия](.*)", "$1 S$2E$3 rus $4"]
+        - name: re_replace
+          args: ["(.*)(\\d+\\-\\d+)\\s*[CСcс]езон\\s*(.*)", "$1 S$2 rus $3"]
+        - name: re_replace
+          args: ["(.*)(\\d+)\\s*[CСcс]езон\\s*(.*)", "$1 S$2 rus $3"]
+        - name: re_replace
+          args: ["(.*)(\\d+\\-\\d+)\\s*[CСcс]ери[ия]\\s*из\\s*\\d+(.*)", "$1 E$2 rus $3"]
+        - name: re_replace
+          args: ["(.*)(\\d+)\\s*[CСcс]ери[ия]\\s*из\\s*\\d+(.*)", "$1 E$2 rus $3"]
+        - name: re_replace
+          args: ["(.*)(\\d+\\-\\d+)\\s*[CСcс]ери[ия](.*)", "$1 E$2 rus $3"]
+        - name: re_replace
+          args: ["(.*)(\\d+)\\s*[CСcс]ери[ия](.*)", "$1 E$2 rus $3"]
+        - name: re_replace
+          args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
+        - name: replace
+          args: ["WEBRip", "WEBDL"]
+        - name: replace
+          args: ["WEB-DL", "WEBDL"]
+        - name: replace
+          args: ["WEBDLRip", "WEBDL"]
+        - name: replace
+          args: ["HDTVRip", "HDTV"]
+        - name: replace
+          args: ["SATRip", "TV"]
+    details:
+      selector: a.alink
+      attribute: href
+    download:
+      selector: a.alink
+      attribute: href
+      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:
+      selector: td:nth-child(6)
+      filters:
+        - name: split
+          args: ["|", 0]
+    leechers:
+      selector: td:nth-child(6)
+      filters:
+        - name: split
+          args: ["|", 0]
+    date:
+      # 1 day ago
+      selector: a[href^="browse.php?date="]
+      filters:
+        - name: timeago
+    downloadvolumefactor:
+      case:
+        img[src="/pic/freedownload.gif"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+# engine n/a

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

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

src/Jackett.Common/Definitions/hdtime.yml

@@ -121,7 +121,8 @@ search:
       selector: a[href^="download.php?id="]
       attribute: href
     imdbid:
-      selector: div.imdb_100 > a
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
     date_elapsed:
       # time type: time elapsed (default)
@@ -171,4 +172,4 @@ search:
     description:
       selector: td:nth-child(2)
       remove: a, img
-# customised NexusPHP Standard v0.1
+# NexusPHP v1.7.4

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

@@ -47,12 +47,20 @@ caps:
     book-search: [q]
 
 settings:
-  - name: username
+  - name: cookie
     type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
+    label: Cookie
+  - name: info
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+  - name: useragent
+    type: text
+    label: User-Agent
+  - name: info_useragent
+    type: info
+    label: How to get the User-Agent
+    default: "<ol><li>From the same place you fetched the cookie,<li>Find <b>'user-agent:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole user-agent string <i>(everything after 'user-agent: ')</i> and <b>Paste</b> here.</ol>"
   - name: sort
     type: select
     label: Sort requested from site
@@ -75,19 +83,16 @@ settings:
     default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
 
 login:
-  path: login.php
-  method: form
-  form: form#loginForm
+  method: cookie
   inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    login: yes
-  # error: using some kind of JS popup that can not be trapped :-(
+    cookie: "{{ .Config.cookie }}"
   test:
     path: browse.php
     selector: a[href^="logout.php?k="]
 
 search:
+  headers:
+    User-Agent: ["{{ .Config.useragent }}"]
   paths:
     # https://huntorrent.net/browse.php?time=1616615308&korhatar=0&incldead=1&xyz=yes&c28=1&c27=1&c6=1&c5=1&sort=4&type=desc
     - path: browse.php
@@ -137,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/idope.yml

@@ -62,7 +62,7 @@ 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">FlareSolver</a> to access it.
+    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.
 
 search:
   paths:

src/Jackett.Common/Definitions/ilcorsaroblu.yml

@@ -89,7 +89,7 @@ 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">FlareSolver</a> to access it.
+    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.
   - name: sort
     type: select
     label: Sort requested from site

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

@@ -1,24 +1,33 @@
 ---
-id: hidden-palace
-name: Hidden-Palace
-description: "Hidden-Palace is a Private torrent site for MOVIES / TV"
+id: jme-reunit3d-api
+name: JME-REUNIT3D (API)
+description: "JME-REUNIT3D is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: en-US
 type: private
 encoding: UTF-8
 links:
-  - https://hidden-palace.net/
+  - https://jme-reunit3d.de/
 legacylinks:
-  - https://hidden-palace.xyz/
+  - https://jme-reunit3d.eu/
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies, desc: "Movie"}
+    - {id: 1, cat: Movies, desc: "Movies"}
     - {id: 2, cat: TV, desc: "TV"}
+    - {id: 3, cat: Audio, desc: "Music"}
+    - {id: 4, cat: Console, desc: "Game"}
+    - {id: 5, cat: PC, desc: "Application"}
+    - {id: 6, cat: XXX, desc: "XXX"}
+    - {id: 7, cat: TV/Sport, desc: "Sport"}
+    - {id: 8, cat: Books, desc: "E-Books"}
+    - {id: 9, cat: Audio/Audiobook, desc: "Audio-Books"}
 
   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
@@ -27,7 +36,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://hidden-palace.net/\" target =_blank>Hidden-Palace</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://jme-reunit3d.de/\" target =_blank>JME-REUNIT3D</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -136,9 +145,7 @@ search:
       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
+      # 5 days (as seconds = 5 x 24 x 60 x 60)
+      text: 432000
+# json UNIT3D 6.0.4

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

@@ -1,161 +0,0 @@
----
-id: jme-reunit3d
-name: JME-REUNIT3D
-description: "JME-REUNIT3D is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://jme-reunit3d.eu/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
-    - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: Audio, desc: "Music-Audio"}
-    - {id: 4, cat: Console, desc: "Game"}
-    - {id: 5, cat: PC, desc: "Application"}
-    - {id: 7, cat: TV/Sport, desc: "Sport"}
-    - {id: 8, cat: XXX, desc: "XXX"}
-    - {id: 9, cat: Books, desc: "E-Books"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
-    movie-search: [q, imdbid, tmdbid]
-    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
-  - 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: login
-  method: form
-  form: form[action$="/login"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    remember: on
-  selectorinputs:
-    _token:
-      selector: input[name="_token"]
-      attribute: value
-  error:
-    - selector: div#ERROR_COPY
-#    test:
-#      path: /
-#      selector: a[href$="/logout"]
-
-search:
-  paths:
-    - path: torrents/filter
-  inputs:
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
-    description: ""
-    uploader: ""
-    imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: "{{ .Query.TVDBID }}"
-    tmdb: "{{ .Query.TMDBID }}"
-    mal: ""
-    igdb: ""
-    start_year: ""
-    end_year: ""
-    sorting: "{{ .Config.sort }}"
-    direction: "{{ .Config.type }}"
-    qty: 100
-    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-
-  rows:
-    selector: table > tbody > tr
-
-  fields:
-    category:
-      selector: a[href*="/categories/"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: "/categories/(\\d+)"
-    title:
-      selector: a.view-torrent
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-    details:
-      selector: a.view-torrent
-      attribute: href
-    poster:
-      selector: div.torrent-poster img
-      attribute: src
-      filters:
-        - name: prepend
-          args: "https://images.weserv.nl/?url=" # for display on dashboard
-        - name: append
-          args: "&w=180&h=270" # for display on dashboard
-        - name: replace
-          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
-    size:
-      selector: td:nth-last-child(4)
-    seeders:
-      selector: td:nth-last-child(3)
-    leechers:
-      selector: td:nth-last-child(2)
-    grabs:
-      selector: td:nth-last-child(1)
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    tmdbid:
-      selector: a[href*="themoviedb.org/movie/"]
-      attribute: href
-    date:
-      selector: time
-      filters:
-        - name: append
-          args: " ago"
-    downloadvolumefactor:
-      case:
-        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
-        i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
-        i[class*="fa-star text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-globe text-blue"]: 0 # Global Freeleech
-        i[class*="fa-star text-gold"]: 0 # Freeleech
-        i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
-        "*": 1
-    uploadvolumefactor:
-      case:
-        i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
-        i[class*="fa-globe text-green"]: 2 # Global Double Upload
-        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
-        "*": 1
-    minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
-# UNIT3D 3.0.0

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

@@ -52,8 +52,6 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
-    movie-search: [q]
 
 settings:
   - name: username

src/Jackett.Common/Definitions/kinozal.yml

@@ -80,6 +80,10 @@ settings:
     type: checkbox
     label: Strip Russian Letters
     default: true
+  - name: addrussian
+    type: checkbox
+    label: Add RUSSIAN to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
+    default: true
   - name: sort
     type: select
     label: Sort requested from site
@@ -162,20 +166,50 @@ search:
       selector: td.nam a[href^="/details.php?id="]
       filters:
         # normalize to SXXEYY format
-        - name: replace
-          args: [" / ", " "]
         - name: replace
           args: ["Кураж-Бамбей", "kurazh"]
         - name: replace
           args: ["Кубик в Кубе", "Kubik"]
         - name: replace
           args: ["Кравец", "Kravec"]
+        - name: replace
+          args: ["Пифагор", "Pifagor"]
+        - name: replace
+          args: ["Невафильм", "Nevafilm"]
+        - name: replace
+          args: ["АП", "AVO"]
+        - name: replace
+          args: ["ЛО", "VO"]
+        - name: replace
+          args: ["ЛД", "DVO"]
+        - name: replace
+          args: ["ЛМ", "MVO"]
+        - name: replace
+          args: ["ПО", "VO"]
+        - name: replace
+          args: ["ПД", "DVO"]
+        - name: replace
+          args: ["ПМ", "MVO"]
+        - name: replace
+          args: ["ДБ", "DUB"]
+        - name: replace
+          args: ["СТ", "Sub"]
         - name: re_replace
-          args: ["\\((\\d+)\\s+[Сс]езон:\\s+(?:(\\d+-*\\d*)\\s+[Сс]ери[ия]\\s+.*\\d+)\\)(.*)\\s([12][0-9]{3})\\s(.*)", "$3 - S$1E$2 - rus $5"]
+          args: ["\\((\\d+-*\\d*)\\s+[Сс]езоны?:?\\s+(?:(\\d+-*\\d*)\\s+(?:[Сс]ери[ийя]|выпуски?(?:ов)?)(?:.*\\d+)?)?\\)(.*)\\s+((?:[12][0-9]{3}-?){1,})(.*)", "$3 - S$1E$2 - $4 $5"]
         - name: re_replace
-          args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
+          args: ["\\((?:(\\d+-*\\d*)\\s+(?:[Сс]ери[ийя]|выпуски?(?:ов)?)(?:.*\\d+)?)?\\)(.*)\\s+((?:[12][0-9]{3}-?){1,})(.*)", "$2 - E$1 - $3 $4"]
         - name: re_replace
-          args: ["\\((\\d+p)\\)", "$1"]
+          args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ ((?:[12][0-9]{3}-?){1,}))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}$3{{ else }}$0{{ end }}"]
+        - name: replace
+          args: [" / ", " "]
+        - name: re_replace
+          args: ["^-\\s+", " "]
+        - name: re_replace
+          args: ["\\((\\d+[pi])\\)", "$1"]
+        - name: re_replace
+          args: ["(.*)(Blu-Ray\\s*(?:Disc|EUR|CEE)?)\\s*(\\d+[pi])", "$1 BR-DISK $3"]
+        - name: append
+          args: "{{ if .Config.addrussian }} - RUSSIAN{{ else }}{{ end }}"
         - name: replace
           args: ["-Rip", "Rip"]
         - name: replace

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

@@ -242,6 +242,6 @@ search:
     minimumratio:
       text: 0.5
     minimumseedtime:
-      # 12 hours (as seconds = 12 x 60 x 60)
-      text: 43200
+      # 24 hours (as seconds = 24 x 60 x 60)
+      text: 86400
 # TS Special Edition v.7.4

src/Jackett.Common/Definitions/kufirc.yml

@@ -0,0 +1,190 @@
+---
+id: kufirc
+name: Kufirc
+description: "Kufirc is a HUNGARIAN Private tracker for 3X"
+language: hu-HU
+type: private
+encoding: UTF-8
+links:
+  - https://kufirc.com/
+
+caps:
+  categorymappings:
+    - {id: 30, cat: XXX, desc: "Amateur"}
+    - {id: 29, cat: XXX, desc: "Anal"}
+    - {id: 5, cat: XXX, desc: "Animal"}
+    - {id: 27, cat: XXX, desc: "Asian"}
+    - {id: 26, cat: XXX, desc: "BBW"}
+    - {id: 44, cat: XXX, desc: "BDSM"}
+    - {id: 25, cat: XXX, desc: "Big Ass"}
+    - {id: 24, cat: XXX, desc: "Big Tits"}
+    - {id: 34, cat: XXX, desc: "Black"}
+    - {id: 35, cat: XXX, desc: "Busty"}
+    - {id: 23, cat: XXX, desc: "Classic"}
+    - {id: 33, cat: XXX, desc: "Creampie"}
+    - {id: 22, cat: XXX, desc: "Cumshot"}
+    - {id: 36, cat: XXX, desc: "Feature"}
+    - {id: 21, cat: XXX, desc: "Fetish"}
+    - {id: 31, cat: XXX, desc: "Film/Cam/Hun"}
+    - {id: 46, cat: XXX/XviD, desc: "Film/Xvid/hun"}
+    - {id: 37, cat: XXX, desc: "Foreign"}
+    - {id: 19, cat: XXX, desc: "Gay / Bi"}
+    - {id: 18, cat: XXX, desc: "Hardcore"}
+    - {id: 32, cat: XXX, desc: "HD porn"}
+    - {id: 28, cat: XXX, desc: "Hentai / 3D"}
+    - {id: 17, cat: XXX, desc: "Homemade"}
+    - {id: 38, cat: XXX, desc: "Interracial"}
+    - {id: 11, cat: XXX, desc: "Kép"}
+    - {id: 48, cat: XXX, desc: "Latina"}
+    - {id: 16, cat: XXX, desc: "Lesbian"}
+    - {id: 6, cat: XXX, desc: "Magyar"}
+    - {id: 15, cat: XXX, desc: "Masturbation"}
+    - {id: 14, cat: XXX, desc: "Mature"}
+    - {id: 13, cat: XXX/Pack, desc: "Megapack"}
+    - {id: 55, cat: XXX, desc: "Milf"}
+    - {id: 49, cat: XXX, desc: "Natural Tits"}
+    - {id: 39, cat: XXX, desc: "Old + Young"}
+    - {id: 12, cat: XXX, desc: "Oral"}
+    - {id: 20, cat: XXX, desc: "Orgia / Gang Bang"}
+    - {id: 42, cat: XXX/Other, desc: "Other"}
+    - {id: 50, cat: XXX, desc: "Parody"}
+    - {id: 41, cat: XXX, desc: "Paysite"}
+    - {id: 40, cat: XXX, desc: "Piss"}
+    - {id: 43, cat: XXX, desc: "Porn Music Videos"}
+    - {id: 54, cat: XXX, desc: "Pov"}
+    - {id: 45, cat: XXX, desc: "Pregnant / Preggo"}
+    - {id: 10, cat: XXX, desc: "Shemale / TS"}
+    - {id: 51, cat: XXX, desc: "Siterip"}
+    - {id: 52, cat: XXX, desc: "Softcore"}
+    - {id: 53, cat: XXX, desc: "Squirt"}
+    - {id: 9, cat: XXX, desc: "Straight"}
+    - {id: 8, cat: XXX, desc: "Tini"}
+    - {id: 47, cat: XXX, desc: "VR"}
+    - {id: 7, cat: PC/Games, desc: "XXX játék / program"}
+
+  modes:
+    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: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrentek oldalanként:</b> setting to <b>100</b> on your account profile.
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: time
+    options:
+      time: created
+      seeders: seeders
+      size: size
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: login
+  method: form
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    cinfo: "1920|1080|24|-60"
+    iplocked: 0
+    keeploggedin: 1
+  error:
+    - selector: div.error
+  test:
+    path: /
+    selector: "#nav_userinfo"
+
+search:
+  paths:
+    # https://kufirc.com/torrents.php?filter_cat[30]=1&filter_cat[29]=1&order_by=time&order_way=desc&searchtext=&action=advanced&title=720p+2022&sizeall=&sizetype=&sizerange=&filelist=&taglist=&autocomplete_toggle=
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
+    searchtext: ""
+    title: "{{ .Keywords }}"
+    order_by: "{{ .Config.sort }}"
+    order_way: "{{ .Config.type }}"
+    action: advanced
+    filter_freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    sizeall: ""
+    sizetype: ""
+    sizerange: ""
+    filelist: ""
+    taglist: ""
+    autocomplete_toggle: ""
+
+  rows:
+    selector: table#torrent_table > tbody > tr[class^="torrent row"]
+
+  fields:
+    category:
+      selector: a[href*="filter_cat"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: "(\\d+)]=1"
+    title:
+      selector: a[href^="/torrents.php?id="]
+    details:
+      selector: a[href^="/torrents.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="torrents.php?action=download&id="]
+      attribute: href
+    description:
+      optional: true
+      selector: div.tags
+    poster:
+      selector: td:nth-child(2) > script
+      filters:
+        - name: regexp
+          args: "src=\\\\\"(.*?)\\\\\""
+        - name: re_replace
+          args: ["\\\\(.)", "$1"]
+        - name: replace
+          args: ["/static/common/noartwork/noimage.png", ""]
+    files:
+      selector: td:nth-child(3)
+    date:
+      selector: td:nth-child(5) > span
+      attribute: title
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "Jan 02 2006, 15:04 -07:00"
+    size:
+      selector: td:nth-child(6)
+    grabs:
+      selector: td:nth-child(7)
+    seeders:
+      selector: td:nth-child(8)
+    leechers:
+      selector: td:nth-child(9)
+    downloadvolumefactor:
+      case:
+        span.icon[title*="Freeleech"]: 0
+        "img[alt=\"Freeleech\"]": 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 0.5
+# Luminance

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
@@ -82,7 +81,7 @@ 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">FlareSolver</a> to access it.
+    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.
   - name: sort
     type: select
     label: Sort requested from site
@@ -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]
@@ -79,10 +79,23 @@ 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?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ 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 }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    - path: "/api/torrents/filter"
       response:
         type: json
+
+  inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    api_token: "{{ .Config.apikey }}"
+    name: "{{ .Keywords }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
+
   keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
     - name: re_replace
       args: ["(?i)\\bS(\\d+)", "T$1"]
 
@@ -93,8 +106,8 @@ search:
       selector: meta.total
 
   fields:
-    categorydesc:
-      selector: category
+    category:
+      selector: category_id
     title_vose:
       selector: name:contains(VOSE)
       optional: true
@@ -125,6 +138,8 @@ search:
       selector: details_link
     download:
       selector: download_link
+    infohash:
+      selector: info_hash
     poster:
       selector: poster
       filters:
@@ -150,11 +165,15 @@ search:
     size:
       selector: size
     downloadvolumefactor:
-      # api returns 0=false, 1=true
+      # api returns 0%, 25%, 50%, 75%, 100%
       selector: freeleech
       case:
-        0: 1 # not free
-        1: 0 # freeleech
+        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
@@ -166,4 +185,4 @@ search:
     minimumseedtime:
       # 4 days (as seconds = 4 x 24 x 60 x 60)
       text: 345600
-# json UNIT3D 5.3.0
+# json UNIT3D 6.0.8

src/Jackett.Common/Definitions/lepornoinfo.yml

@@ -32,8 +32,6 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
-    movie-search: [q]
 
 settings:
   - name: sort