turktorrent: refresh cats

This reverts commit 8fc965a5c1.

.github/workflows/codeql-analysis.yml

@@ -35,7 +35,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: windows-latest
+    runs-on: windows-2019
     permissions:
       actions: read
       contents: read

Installer.iss

@@ -19,9 +19,6 @@ AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
-CloseApplications=yes
-CloseApplicationsFilter=*.chm
-RestartApplications=no
 DefaultDirName={commonappdata}\{#MyAppName}
 DefaultGroupName={#MyAppName}
 DisableProgramGroupPage=yes
@@ -42,8 +39,11 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "windowsService"; Description: "Install as a Windows Service"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
+[Dirs]  
+Name: "{commonappdata}\Jackett"; Permissions: everyone-modify 
+
 [Files]
-Source: "{#MySourceFolder}\*"; DestDir: "{commonappdata}\Jackett"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#MySourceFolder}\*"; DestDir: "{commonappdata}\Jackett"; Flags: ignoreversion recursesubdirs createallsubdirs; Permissions: everyone-modify
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
@@ -52,11 +52,13 @@ Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
 Name: "{commondesktop}\{#MyAppName}"; Filename: "{commonappdata}\Jackett\{#MyAppExeName}"; Tasks: desktopicon
 
 [Code]
-Procedure RegisterExtraCloseApplicationsResources();
-Begin
-  RegisterExtraCloseApplicationsResource(False, ExpandConstant('{app}\JackettService.exe'));
-  RegisterExtraCloseApplicationsResource(False, ExpandConstant('{app}\{#MyAppExeName}'));
-End;
+function PrepareToInstall(var NeedsRestart: Boolean): String;
+var
+ErrorCode: Integer;
+begin
+  ShellExec('open', 'taskkill.exe', '/f /im {#MyAppExeName}', '', SW_HIDE, ewNoWait, ErrorCode);
+  ShellExec('open', 'taskkill.exe', '/f /im JackettConsole.exe', '', SW_HIDE, ewNoWait, ErrorCode);
+end;
 
 [Run]
 Filename: "{commonappdata}\Jackett\JackettConsole.exe"; Parameters: "--Uninstall"; Flags: waituntilterminated runhidden;

README.md

@@ -28,7 +28,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ØMagnet
  * 1337x
  * 24rolika
- * 7torrents
  * ACG.RIP
  * ACGsou (36DM)
  * Anidex
@@ -53,6 +52,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ConCen
  * cpasbien
  * cpasbienClone
+ * CrackingPatching
  * Demonoid
  * DivxTotal
  * dmhy
@@ -60,8 +60,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * E-Hentai
  * elitetorrent
  * EpubLibre
- * Erai-Raws
- * ETTV
  * EXT Torrents
  * ExtraTorrent.st
  * EZTV
@@ -69,11 +67,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * FireBit
  * freshMeat
  * Frozen Layer
+ * FTUApps
  * GamesTorrents
  * GkTorrent
  * GloDLS
  * GTorrent.pro
- * HDhouse (HDReactor)
  * IBit
  * Idope
  * Il CorSaRo Blu
@@ -81,9 +79,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Internet Archive (archive.org)
  * Isohunt2
  * iTorrent
+ * JAV-Torrent
  * kickasstorrents.ws
  * kickasstorrents.to
- * KissSub
  * Legit Torrents
  * LePorno.info
  * LimeTorrents
@@ -93,11 +91,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * MegaPeer
  * MejorTorrent
  * Mikan
+ * MioBT
  * MixTapeTorrent
  * MoviesDVDR
  * MovieTorrent
  * MyPornClub
- * NewPCT (aka: tvsinpagar, descargas2020, torrentlocura, torrentrapid, tumejortorrent, pctnew, etc)
  * NewPCT.me
  * Newstudio
  * Nipponsei
@@ -111,7 +109,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ParnuXi
  * PC-torrent
  * PiratBit
- * Pirateiro
  * Pornforall
  * PornLeech
  * PornoLive
@@ -121,6 +118,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Portugas
  * ProPorn
  * ProStyleX
+ * PS4-Torrent
  * Rapidzona
  * RARBG
  * RinTor
@@ -128,8 +126,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Rus-media
  * RuTor
  * RuTracker.RU
+ * Seedoff
  * seleZen
- * Sexxi
  * Sexy-Pics
  * ShizaProject
  * ShowRSS
@@ -141,10 +139,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Tokyo Tosho
  * Torlock
  * Torlook
- * TOROS
  * Torrent Downloads (TD)
  * Torrent Oyun indir
- * Torrent Paradise (ML)
  * torrent.by
  * torrent-pirat
  * Torrent9
@@ -153,8 +149,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TorrentFunk
  * TorrentGalaxy (TGx)
  * TorrentKitty
- * TorrentMafya
- * TorrentMax (토렌트맥스)
  * TorrentParadise
  * TorrentProject2
  * TorrentQQ (토렌트큐큐)
@@ -169,6 +163,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * UnionDHT
  * VSTHouse
  * VST Torrents
+ * xBiT
  * xxxAdultTorrent
  * xxxtor
  * xxxtorrents
@@ -185,7 +180,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Anime-Free
  * AnimeLayer
  * ArenaBG
- * BaibaKo
  * BookTracker
  * BootyTape
  * Catorrent
@@ -194,13 +188,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
@@ -220,6 +218,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * RGFootball
  * RiperAM
  * RockBox
+ * RUDUB (ex-BaibaKoTV)
  * RuTracker
  * Rustorka
  * Sharewood
@@ -258,26 +257,27 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * AmigosShareClub
  * anasch.cc
  * AnimeBytes (AB)
+ * AnimeItalia
  * AnimeTorrents (AnT) [![(invite needed)][inviteneeded]](#)
  * AnimeWorld [![(invite needed)][inviteneeded]](#)
  * Anthelion
  * Araba Fenice (Phoenix) [![(invite needed)][inviteneeded]](#)
  * ArabP2P
  * AsianCinema
+ * Audiences
  * AudioNews (AN)
  * Aussierul.es [![(invite needed)][inviteneeded]](#)
  * AvistaZ (AsiaTorrents)
  * Back-ups [![(invite needed)][inviteneeded]](#)
- * bB [![(invite needed)][inviteneeded]](#)
  * BakaBT
  * BeiTai
  * Best-Core
  * BeyondHD (BHD)
  * Bibliotik
  * Bit-Bázis
- * Bit-City Reloaded [![(invite needed)][inviteneeded]](#)
+ * Bit-City Reloaded
  * BIT-HDTV
- * BiT-TiTAN
+ * BitBR
  * Bitded
  * Bithorlo (BHO)
  * BitHUmen [![(invite needed)][inviteneeded]](#)
@@ -303,7 +303,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Carp-Hunter
  * Carpathians
  * CartoonChaos (CC)
- * CasaTorrent [![(invite needed)][inviteneeded]](#)
  * Cathode-Ray.Tube (CRT)
  * CCFBits [![(invite needed)][inviteneeded]](#)
  * CeskeForum
@@ -325,7 +324,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * DANISH BYTES
  * Darius Tracker
  * Dark-Shadow
- * Dark Tracker
  * DataScene (DS)
  * DataTalli
  * DesiTorrents
@@ -335,6 +333,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]](#)
@@ -346,7 +345,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Falkon Vision Team
  * FANO.IN [![(invite needed)][inviteneeded]](#)
  * Fantastic Heaven [![(invite needed)][inviteneeded]](#)
- * Fantastiko [![(invite needed)][inviteneeded]](#)
+ * Fantastiko
  * Femdomcult
  * FileList (FL)
  * Film-Paleis
@@ -358,7 +357,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Gay-Torrents.org
  * GAYtorrent.ru
  * GazelleGames (GGn) [![(invite needed)][inviteneeded]](#)
- * Generation-Free [![(invite needed)][inviteneeded]](#)
+ * Generation-Free
  * GFXPeers
  * GigaTorrents
  * GimmePeers (formerly ILT) [![(invite needed)][inviteneeded]](#)
@@ -368,7 +367,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HaiDan
  * Haitang
  * HappyFappy
- * Hawke-uno
+ * Hawke-uno [![(invite needed)][inviteneeded]](#)
  * HD Dolby
  * HD-Bits.com [![(invite needed)][inviteneeded]](#)
  * HD-Forever (HDF)
@@ -398,6 +397,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDZone
  * Hebits
  * HellasTZ
+ * Hidden-Palace
+ * House of Devil
  * HQSource (HQS)
  * Il Corsaro Verde
  * Indietorrents [![(invite needed)][inviteneeded]](#)
@@ -406,11 +407,14 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Immortuos [![(invite needed)][inviteneeded]](#)
  * Insane Tracker
  * IPTorrents (IPT)
+ * JME-REUNIT3D
  * JPopsuki [![(invite needed)][inviteneeded]](#)
  * JPTV
  * Karagarga
  * Keep Friends [![(invite needed)][inviteneeded]](#)
+ * Korsar
  * KrazyZone
+ * Kufirc
  * LastFiles
  * Lat-Team [![(invite needed)][inviteneeded]](#)
  * Le Saloon
@@ -443,7 +447,6 @@ 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]](#)
  * NCore
  * Nebulance (NBL) (TransmiTheNet)
  * NetCosmo
@@ -451,7 +454,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * NorBits
  * oMg[WtF]trackr
  * OpenCD [![(invite needed)][inviteneeded]](#)
- * Oppaitime [![(invite needed)][inviteneeded]](#)
+ * Oppaitime
  * Orpheus
  * OshenPT
  * Ourbits (HDPter) [![(invite needed)][inviteneeded]](#)
@@ -502,13 +505,14 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * SceneRush
  * SceneTime
  * SDBits [![(invite needed)][inviteneeded]](#)
- * Seals
+ * GreatPosterWall (GPW)
  * Secret Cinema
  * SeedFile (SF)
  * Shareisland
  * Shazbat [![(invite needed)][inviteneeded]](#)
  * SiamBIT
  * SkipTheCommercials
+ * SkipTheTrailers
  * slosoul
  * SnowPT (SSPT)
  * SoulVoice
@@ -526,12 +530,14 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Swarmazon
  * Tapochek
  * Tasmanit [![(invite needed)][inviteneeded]](#)
+ * Team CT Game (TCTG)
  * TeamHD
  * TeamOS
  * TEKNO3D [![(invite needed)][inviteneeded]](#)
  * TellyTorrent
  * teracod (Movie Zone)
- * The-Devils-Lounge
+ * The-Crazy-Ones
+ * The-New-Fun
  * The Falling Angels (TFA) [![(invite needed)][inviteneeded]](#)
  * The Geeks
  * The Horror Charnel (THC)
@@ -547,6 +553,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TheScenePlace (TSP)
  * TJUPT
  * TLFBits [![(invite needed)][inviteneeded]](#)
+ * TmGHuB
  * ToTheGlory (TTG) [![(invite needed)][inviteneeded]](#)
  * Torrent Network (TN)
  * Torrent Sector Crew (TSC)
@@ -569,11 +576,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TorrentLeech.pl
  * TorrentMasters
  * TorrentSeeds (TS)
- * Trackeros
  * TranceTraffic [![(invite needed)][inviteneeded]](#)
  * Trezzor [![(invite needed)][inviteneeded]](#)
  * TurkSeed
  * TurkTorrent (TT)
+ * turktracker
  * TV Chaos UK (TVCUK)
  * TvRoad
  * TVstore
@@ -666,6 +673,12 @@ Jackett can also be run from the command line if you would like to see log messa
 On most operating systems all the required dependencies will already be present. In case they are not, you can refer to this page https://github.com/dotnet/core/blob/master/Documentation/linux-prereqs.md
 
 ### Install as service
+A) Command to download and install latest package and run the Jackett service:
+
+`cd /opt && f=Jackett.Binaries.LinuxAMDx64.tar.gz && release=$(wget -q https://github.com/Jackett/Jackett/releases/latest -O - | grep "title>Release" | cut -d " " -f 4) && sudo wget -Nc https://github.com/Jackett/Jackett/releases/download/$release/"$f" && sudo tar -xzf "$f" && sudo rm -f "$f" && cd Jackett* && sudo ./install_service_systemd.sh && systemctl status jackett.service && cd - && echo -e "\nVisit http://127.0.0.1:9117"`
+
+B) Or manually:
+
 1. Download and extract the latest `Jackett.Binaries.LinuxAMDx64.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases)
 2. To install Jackett as a service, open a Terminal, cd to the jackett folder and run `sudo ./install_service_systemd.sh` You need root permissions to install the service. The service will start on each logon. You can always stop it by running `systemctl stop jackett.service` from Terminal. You can start it again it using `systemctl start jackett.service`. Logs are stored as usual under `~/.config/Jackett/log.txt` and also in `journalctl -u jackett.service`.
 

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;
+}
+
+.tooltip {
+    pointer-events: none;
+}
+
 .tooltip-inner {
     max-width: 500px !important;
 }

src/Jackett.Common/Content/custom.js

@@ -1,4 +1,5 @@
 var basePath = '';
+var baseUrl = '';
 
 var indexers = [];
 var configuredIndexers = [];
@@ -114,10 +115,17 @@ function loadJackettSettings() {
             basePath = '';
         }
 
+        $("#jackett-baseurloverride").val(data.baseurloverride);
+        baseUrl = data.baseurloverride;
+        if (baseUrl === null || baseUrl === undefined) {
+            baseUrl = '';
+        }
+
         api.key = data.api_key;
 
         $("#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);
@@ -163,9 +171,9 @@ function reloadIndexers() {
         availableFilters = [];
         for (var i = 0; i < data.length; i++) {
             var item = data[i];
-            item.rss_host = resolveUrl(basePath + "/api/v2.0/indexers/" + item.id + "/results/torznab/api?apikey=" + api.key + "&t=search&cat=&q=");
-            item.torznab_host = resolveUrl(basePath + "/api/v2.0/indexers/" + item.id + "/results/torznab/");
-            item.potato_host = resolveUrl(basePath + "/api/v2.0/indexers/" + item.id + "/results/potato/");
+            item.rss_host = resolveUrl(baseUrl, basePath + "/api/v2.0/indexers/" + item.id + "/results/torznab/api?apikey=" + api.key + "&t=search&cat=&q=");
+            item.torznab_host = resolveUrl(baseUrl, basePath + "/api/v2.0/indexers/" + item.id + "/results/torznab/");
+            item.potato_host = resolveUrl(baseUrl, basePath + "/api/v2.0/indexers/" + item.id + "/results/potato/");
 
             if (item.last_error)
                 item.state = "error";
@@ -560,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");
         });
     });
 }
@@ -729,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");
     });
 }
 
@@ -904,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);
@@ -922,13 +899,44 @@ function populateSetupForm(indexerId, name, config, caps, link, alternativesitel
     configForm.modal("show");
 }
 
-function resolveUrl(url) {
-    var a = document.createElement('a');
-    a.href = url;
-    url = a.href;
+function resolveUrl(baseUrl, url) {
+    if (baseUrl != '') {
+        url = baseUrl + url;
+    }else{
+        var a = document.createElement('a');
+        a.href = url;
+        url = a.href;
+    }
     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 frecuent 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;
@@ -963,10 +971,13 @@ 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 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)
@@ -978,17 +989,27 @@ function updateReleasesRow(row) {
         TitleLink.data("toggle", "tooltip");
         TitleLink.tooltip({
             title: TitleTooltip,
-            html: true
+            html: true,
+            placement: "auto"
         });
     }
 
     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 (!isNaN(DownloadVolumeFactor)) {
         if (DownloadVolumeFactor == 0) {
             labels.append('\n<span class="label label-success">FREELEECH</span>');
@@ -1366,6 +1387,13 @@ function bindUIButtons() {
         return false;
     });
 
+    $('#api-key-copy-button').click(function () {
+        var apiKey = api.key;
+        if (apiKey !== null || apiKey !== undefined) {
+            copyToClipboard(apiKey);
+        }
+    });
+
     $('#jackett-add-indexer').click(function () {
         $("#modals").empty();
         displayUnconfiguredIndexersList();
@@ -1506,7 +1534,9 @@ function bindUIButtons() {
     $("#change-jackett-port").click(function () {
         var jackett_port = Number($("#jackett-port").val());
         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');
@@ -1527,11 +1557,13 @@ function bindUIButtons() {
         var jsonObject = {
             port: jackett_port,
             external: jackett_external,
+            cors: jackett_cors,
             updatedisabled: jackett_update,
             prerelease: jackett_prerelease,
             blackholedir: $("#jackett-savedir").val(),
             logging: jackett_logging,
             basepathoverride: jackett_basepathoverride,
+            baseurloverride: jackett_baseurloverride,
             logging: jackett_logging,
             cache_enabled: jackett_cache_enabled,
             cache_ttl: jackett_cache_ttl,

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;
+}
+
+.tooltip {
+    pointer-events: none;
+}
+
 .tooltip-inner {
     max-width: 500px !important;
 }

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=PR12772" media="only screen and (min-device-width: 480px)">
-    <link rel="stylesheet" type="text/css" href="../custom_mobile.css?changed=PR12772" media="only screen and (max-device-width: 480px)">
+    <link rel="stylesheet" type="text/css" href="../custom.css?changed=202204251" media="only screen and (min-device-width: 480px)">
+    <link rel="stylesheet" type="text/css" href="../custom_mobile.css?changed=202204251" media="only screen and (max-device-width: 480px)">
     <link rel="stylesheet" type="text/css" href="../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">
@@ -43,6 +43,9 @@
         <div class="pull-right jackett-apikey">
             <span class="input-header">API Key: </span>
             <input id="api-key-input" class="form-control input-right" type="text" value="" placeholder="API Key" readonly="">
+            <button id="api-key-copy-button" title="Copy API Key to clipboard" class="btn btn-primary btn-xs">
+                <span class="glyphicon glyphicon-copy" aria-hidden="true"></span>
+            </button>
         </div>
         <hr />
 
@@ -127,6 +130,10 @@
             <span class="input-header">Base path override: </span>
             <input id="jackett-basepathoverride" class="form-control input-right" type="text" value="" placeholder="/jackett">
         </div>
+        <div class="input-area">
+            <span class="input-header">Base URL override: </span>
+            <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>
             <input id="jackett-port" class="form-control input-right" type="text" value="" placeholder="9117">
@@ -171,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" />
@@ -199,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>
@@ -230,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">
@@ -284,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">
@@ -447,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-poster="{{Poster}}" data-description="{{Description}}">
                                     <td class="fit">{{PublishDate}}</td>
                                     <td class="fit">{{FirstSeen}}</td>
                                     <td class="fit">{{jacketTimespan PublishDate}}</td>
@@ -457,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>
@@ -575,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-poster="{{Poster}}" data-description="{{Description}}">
                     <td>{{PublishDate}}</td>
                     <td>{{jacketTimespan PublishDate}}</td>
                     <td>{{Tracker}}</td>
@@ -583,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>
@@ -743,6 +754,6 @@
     </script>
 
     <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=2022011001"></script>
+    <script type="text/javascript" src="../custom.js?changed=20220426"></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=PR12083" rel="stylesheet">
+    <link href="../custom.css?changed=202204251" rel="stylesheet">
 
     <title>Jackett</title>
 </head>

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

@@ -8,17 +8,13 @@ encoding: UTF-8
 followredirect: true
 links:
   - https://1337x.to/
-  - https://1337x.gd/
   - https://1337x.st/
   - https://x1337x.ws/
   - https://x1337x.eu/
   - https://x1337x.se/
-  - https://1337x.unblockit.how/
-  - https://1337x.nocensor.biz/
+  - https://1337x.unblockit.llc/
+  - https://1337x.nocensor.sbs/
 legacylinks:
-  - https://1337x.unblockit.app/
-  - https://1337.root.yt/
-  - https://1337x.unblocked.rest/
   - https://1337x.unblockit.dev/
   - https://1337x.unblockit.ltd/
   - https://1337x.unblockit.link/
@@ -36,6 +32,11 @@ legacylinks:
   - https://1337x.unblockit.kim/
   - https://1337x.unblockit.bz/
   - https://1337x.unblockit.tv/
+  - https://1337x.unblockit.how/
+  - https://1337x.unblockit.cam/
+  - https://1337x.nocensor.biz/
+  - https://1337x.gd/
+  - https://1337x.unblockit.day/
 
 caps:
   categorymappings:
@@ -128,6 +129,10 @@ caps:
     book-search: [q]
 
 settings:
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
   - 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/7torrents.yml

@@ -1,85 +0,0 @@
----
-id: 7torrents
-name: 7torrents
-description: "7torrents is a Public BitTorrent DHT search engine."
-language: en-US
-type: public
-encoding: UTF-8
-links:
-  - https://www.7torrents.cc/
-
-caps:
-  categories:
-    Other: Other
-
-  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: created
-    options:
-      created: created
-      length: size
-      seeders: seeders
-  - 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.
-  - name: info_8000
-    type: info
-    label: About 7torrents Categories
-    default: 7torrents does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
-
-search:
-  # https://www.7torrents.cc/search?query=2020&sort=created
-  paths:
-    - path: search
-  inputs:
-    query: "{{ if .Keywords }}{{ .Keywords }}{{ else }} {{ end }}"
-    sort: "{{ .Config.sort }}"
-
-  rows:
-    selector: div.media
-
-  fields:
-    category:
-      text: Other
-    title:
-      selector: div.media
-      attribute: data-name
-    details:
-      selector: div.media h5 a
-      attribute: href
-# #7966
-#    download:
-#      selector: div.media-right a[href*="/torrent/"]
-#      attribute: href
-    magnet:
-      selector: a[href^="magnet:?xt="]
-      attribute: href
-    date:
-      selector: div.media
-      attribute: data-added
-      filters:
-        - name: timeago
-    size:
-      selector: div.media
-      attribute: data-size
-    seeders:
-      selector: div.media
-      attribute: data-seeders
-    leechers:
-      selector: div.media
-      attribute: data-leechers
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/abtorrents.yml

@@ -10,14 +10,14 @@ links:
 
 caps:
   categorymappings:
-    - {id: 10, cat: Audio/Audiobook, desc: "Adventure"}
-    - {id: 20, cat: Audio/Audiobook, desc: "Biographies & Memoirs"}
+    - {id: 10, cat: Audio/Audiobook, desc: "Action/Adventure"}
+    - {id: 20, cat: Audio/Audiobook, desc: "Biography/Memoirs"}
     - {id: 30, cat: Audio/Audiobook, desc: "Business "}
     - {id: 40, cat: Audio/Audiobook, desc: "Childrens"}
-    - {id: 50, cat: Audio/Audiobook, desc: "Comedy"}
+    - {id: 50, cat: Audio/Audiobook, desc: "Humor (Comedy)"}
     - {id: 60, cat: Audio/Audiobook, desc: "Comics"}
     - {id: 70, cat: Audio/Audiobook, desc: "Computers "}
-    - {id: 80, cat: Audio/Audiobook, desc: "Erotica"}
+    - {id: 80, cat: Audio/Audiobook, desc: "Adult/Erotica"}
     - {id: 90, cat: Audio/Audiobook, desc: "Fantasy-General"}
     - {id: 100, cat: Audio/Audiobook, desc: "Fantasy-Youth"}
     - {id: 110, cat: Audio/Audiobook, desc: "Files"}
@@ -26,7 +26,8 @@ caps:
     - {id: 140, cat: Audio/Audiobook, desc: "Historical Fiction"}
     - {id: 150, cat: Audio/Audiobook, desc: "History"}
     - {id: 160, cat: Audio/Audiobook, desc: "Horror"}
-    - {id: 170, cat: Audio/Audiobook, desc: "Literature "}
+    - {id: 170, cat: Audio/Audiobook, desc: "Literature"}
+    - {id: 175, cat: Audio/Audiobook, desc: "LitRPG"}
     - {id: 180, cat: Audio/Audiobook, desc: "Mystery "}
     - {id: 190, cat: Audio/Audiobook, desc: "Non-Fiction"}
     - {id: 200, cat: Audio/Audiobook, desc: "Radio Drama"}
@@ -37,12 +38,12 @@ caps:
     - {id: 250, cat: Audio/Audiobook, desc: "Self Improvement"}
     - {id: 270, cat: Audio/Audiobook, desc: "Suspense"}
     - {id: 280, cat: Audio/Audiobook, desc: "Talk Radio"}
-    - {id: 260, cat: Audio/Audiobook, desc: "Thriller and Suspense"}
+    - {id: 260, cat: Audio/Audiobook, desc: "Crime/Thriller/Mystery"}
     - {id: 290, cat: Audio/Audiobook, desc: "Urban Fantasy"}
     - {id: 300, cat: Audio/Audiobook, desc: "Western"}
     - {id: 400, cat: Books/EBook, desc: "[E] Action/Adventure"}
     - {id: 410, cat: Books/EBook, desc: "[E] Adult / Erotica"}
-    - {id: 420, cat: Books/EBook, desc: "[E] Arts & Crafts (Hobbies)"}
+    - {id: 420, cat: Books/EBook, desc: "[E] Arts & Crafts (Hobbies)"}
     - {id: 430, cat: Books/EBook, desc: "[E] Biography/Memoirs"}
     - {id: 730, cat: Books/EBook, desc: "[E] Collections"}
     - {id: 440, cat: Books/EBook, desc: "[E] Comic Books"}
@@ -55,11 +56,13 @@ caps:
     - {id: 510, cat: Books/EBook, desc: "[E] Historical Fiction"}
     - {id: 520, cat: Books/EBook, desc: "[E] History/Documentary"}
     - {id: 530, cat: Books/EBook, desc: "[E] Horror"}
-    - {id: 540, cat: Books/EBook, desc: "[E] Humor ( Comedy)"}
+    - {id: 540, cat: Books/EBook, desc: "[E] Humor (Comedy)"}
     - {id: 550, cat: Books/EBook, desc: "[E] LGBT"}
     - {id: 560, cat: Books/EBook, desc: "[E] Literary Fiction"}
+    - {id: 565, cat: Books/EBook, desc: "[E] LitRPG"}
     - {id: 570, cat: Books/EBook, desc: "[E] Magazines - all"}
     - {id: 580, cat: Books/EBook, desc: "[E] Non-Fiction"}
+    - {id: 585, cat: Books/EBook, desc: "[E] Other Languages"}
     - {id: 590, cat: Books/EBook, desc: "[E] Paranormal Romance"}
     - {id: 600, cat: Books/EBook, desc: "[E] Reference/Educational"}
     - {id: 610, cat: Books/EBook, desc: "[E] Religion and Spirituality"}

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

@@ -71,19 +71,33 @@ 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
-        attribute: attributes
+
+  inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    api_token: "{{ .Config.apikey }}"
+    name: "{{ .Keywords }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
 
   rows:
     selector: data
+    attribute: attributes
     count:
       selector: meta.total
 
   fields:
-    categorydesc:
-      selector: category
+    category:
+      selector: category_id
     title:
       selector: name
     details:
@@ -95,8 +109,6 @@ search:
       filters:
         - name: replace
           args: ["https://via.placeholder.com/90x135", ""]
-        - name: replace
-          args: ["https://via.placeholder.com/400x600", ""]
     imdbid:
       selector: imdb_id
     tmdbid:
@@ -117,21 +129,25 @@ 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
       case:
         0: 1 # normal
         1: 2 # double
-# global MR is 0.4 but torrents must be seeded for 3 days regardless of ratio
+# global MR is 0.4 but torrents must be seeded for 5 days regardless of ratio
 #    minimumratio:
 #      text: 0.4
     minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
-# json UNIT3D 5.3.0
+      # 5 days (as seconds = 3 x 24 x 60 x 60)
+      text: 432000
+# json UNIT3D 6.0.7

src/Jackett.Common/Definitions/anilibria.yml

@@ -24,8 +24,6 @@ search:
     - path: "https://api.anilibria.tv/v2/{{ if .Keywords }}searchTitles?filter=names,poster.url,code,torrents.list,season.year&limit=100&search={{ .Keywords }}{{ else }}getUpdates?filter=names,poster.url,code,torrents.list,season.year&limit=100{{ end }}"
       response:
         type: json
-        attribute: torrents.list
-        multiple: true
 
   keywordsfilters:
     # strip season and ep
@@ -34,6 +32,8 @@ search:
 
   rows:
     selector: $
+    attribute: torrents.list
+    multiple: true
 
   fields:
     category:

src/Jackett.Common/Definitions/animeclipse.yml

@@ -45,7 +45,7 @@ search:
     category: 0
     # 0 all, 1 active, 2 dead
     active: 0
-    tor_page: 100
+    tor_page: 50
     order: "{{ .Config.sort }}"
     by: "{{ .Config.type }}"
 

src/Jackett.Common/Definitions/animeitalia.yml

@@ -0,0 +1,155 @@
+---
+id: animeitalia
+name: AnimeItalia
+description: "AnimeItalia is an ITALIAN Private Torrent Tracker for ANIME"
+language: it-IT
+type: private
+encoding: UTF-8
+links:
+  - https://animeitalia.org/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Film ITA"}
+    - {id: 2, cat: TV, desc: "Serie TV"}
+    - {id: 3, cat: Audio, desc: "Musica"}
+    - {id: 4, cat: Console, desc: "Giochi"}
+    - {id: 5, cat: PC, desc: "Programmi"}
+    - {id: 6, cat: TV/Anime, desc: "Anime SUB-ITA"}
+    - {id: 7, cat: TV/Anime, desc: "Anime ITA"}
+    - {id: 8, cat: Movies/Other, desc: "Film Anime SUB-ITA"}
+    - {id: 9, cat: Movies/Other, desc: "Film Anime ITA"}
+    - {id: 10, cat: Books/Comics, desc: "Manga ITA"}
+    - {id: 11, cat: Books/Comics, desc: "Manga ENG"}
+    - {id: 12, cat: Audio, desc: "Anime Music"}
+    - {id: 13, cat: Other, desc: "Foto Anime"}
+    - {id: 14, cat: XXX/Other, desc: "Hentai SUB-ITA"}
+    - {id: 15, cat: XXX/Other, desc: "Hentai ITA"}
+    - {id: 16, cat: XXX/ImageSet, desc: "Foto Hentai"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid]
+    movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://animeitalia.org/\" target =_blank>AnimeItalia</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: created_at
+    options:
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: /api/torrents
+  method: get
+  inputs:
+    api_token: "{{ .Config.apikey }}"
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
+search:
+  paths:
+    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    - path: "/api/torrents/filter"
+      response:
+        type: json
+
+  inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    api_token: "{{ .Config.apikey }}"
+    name: "{{ .Keywords }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
+  rows:
+    selector: data
+    attribute: attributes
+    count:
+      selector: meta.total
+
+  fields:
+    categorydesc:
+      selector: category
+    title:
+      selector: name
+    details:
+      selector: details_link
+    download:
+      selector: download_link
+    poster:
+      selector: poster
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/90x135", ""]
+    imdbid:
+      selector: imdb_id
+    tmdbid:
+      selector: tmdb_id
+    tvdbid:
+      selector: tvdb_id
+    files:
+      selector: num_file
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    date:
+      # 2021-10-18T00:34:50.000000Z"
+      selector: created_at
+    size:
+      selector: size
+    downloadvolumefactor:
+      # api returns 0%, 25%, 50%, 75%, 100%
+      selector: freeleech
+      case:
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
+    uploadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: double_upload
+      case:
+        0: 1 # normal
+        1: 2 # double
+    minimumratio:
+      text: 1.0
+# json UNIT3D 6.0.4

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

@@ -76,13 +76,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
-        attribute: attributes
+
+  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
 
   rows:
     selector: data
+    attribute: attributes
     count:
       selector: meta.total
 
@@ -100,8 +110,6 @@ search:
       filters:
         - name: replace
           args: ["https://via.placeholder.com/90x135", ""]
-        - name: replace
-          args: ["https://via.placeholder.com/400x600", ""]
     imdbid:
       selector: imdb_id
     tmdbid:
@@ -122,11 +130,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
@@ -136,4 +148,4 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 5.3.0
+# json UNIT3D 6.0.0

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

@@ -47,6 +47,7 @@ caps:
     - {id: 52, cat: TV, desc: "مسرحيات (Plays)"}
     - {id: 71, cat: TV, desc: "مسلسلات مدبلجه عربي (Arabic Dubbed Series)"}
     - {id: 90, cat: TV, desc: "برامج ومسابقات (Shows)"}
+    - {id: 111, cat: TV, desc: "2022 رمضان (2022 Ramadan)"}
     # المرئيات الاجنبية Foreign Movies
     - {id: 92, cat: TV/Foreign, desc: "تعليمي (Educational)"}
     - {id: 93, cat: TV/Documentary, desc: "وثائقي (Documentary)"}

src/Jackett.Common/Definitions/audiences.yml

@@ -0,0 +1,163 @@
+---
+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
+    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

@@ -6,13 +6,12 @@ language: en-US
 type: public
 encoding: UTF-8
 links:
-  - http://audiobookbay.nl/ # site forces http, does not support https
-  - http://audiobookbay.ws/
+  - http://audiobookbay.fi/ # site forces http, does not support https
+  - http://audiobookbay.se/
   - http://audiobookbayabb.com/
-  - https://audiobookbay.unblockit.how/
+  - https://audiobookbay.unblockit.llc/
 legacylinks:
   - https://audiobookbay.la/
-  - https://audiobookbay.unblockit.lat/
   - https://audiobookbay.unblockit.app/
   - https://audiobookbay.unblockit.dev/
   - https://audiobookbay.unblockit.ltd/
@@ -28,6 +27,11 @@ legacylinks:
   - https://audiobookbay.unblockit.kim/
   - https://audiobookbay.unblockit.bz/
   - https://audiobookbay.unblockit.tv/
+  - http://audiobookbay.nl/
+  - http://audiobookbay.ws/
+  - https://audiobookbay.unblockit.how/
+  - https://audiobookbay.unblockit.cam/
+  - https://audiobookbay.unblockit.day/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/badasstorrents.yml

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

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

@@ -1,115 +0,0 @@
----
-id: beyond-hd-oneurl
-name: Beyond-HD (OneURL)
-description: "This is BeyondHD using OneURL (for those that have enabled 2FA)"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://beyond-hd.me/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
-    - {id: 2, cat: TV, desc: "TV"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid, tmdbid]
-
-settings:
-  - name: oneurl
-    type: text
-    label: OneURL
-  - name: info_oid
-    type: info
-    label: "About One-URL"
-    default: "<li>OneURL is found by accessing your Beyond-HD web site,</li><li>hovering over the <b>user icon</b></li><li>and going to <b>My Security</b></li><li>then going to the <b>One URL (OID)</b> tab,</li><li>and if it's not already active, you need to hit <b>Reset One URL</b> to activate it.</li><li>Then use that link here.</li>"
-  - 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:
-  method: oneurl
-  inputs:
-    oneurl: "{{ .Config.oneurl }}"
-  test:
-    path: torrents
-
-search:
-  paths:
-    - path: torrents
-  inputs:
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
-    uploader: ""
-    imdb: "{{ .Query.IMDBIDShort }}"
-    tmdb: "{{ .Query.TMDBID }}"
-    sorting: "{{ .Config.sort }}"
-    direction: "{{ .Config.type }}"
-    qty: 100
-
-  rows:
-    selector: div.table-torrents > table > tbody > tr[id^="torrentposter"]
-
-  fields:
-    category_optional:
-      selector: a[href*="/categories/"]
-      optional: true
-      attribute: href
-      filters:
-        - name: regexp
-          args: "/categories/.*?\\.(\\d+)"
-    category:
-      text: "{{ if .Result.category_optional }}{{ .Result.category_optional }}{{ else }}1{{ end }}"
-    title:
-      selector: a.torrent-name
-    details:
-      selector: a.torrent-name
-      attribute: href
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-    date:
-      selector: td:not(a[href$="/history"]) span.text-orange
-      filters:
-        - name: timeago
-    size:
-      selector: td span.text-blue
-    seeders:
-      selector: a[href$="/peers"] span.text-green
-    leechers:
-      selector: a[href$="/peers"] span.text-red
-    grabs:
-      selector: a[href$="/history"]
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    tmdbid:
-      selector: a[href*="themoviedb.org/movie/"]
-      attribute: href
-    downloadvolumefactor:
-      case:
-        i[data-original-title="100% Free"]: 0
-        i[data-original-title="100% Free (Limited UL)"]: 0
-        i[data-original-title="25% Promo"]: 0.75
-        i[data-original-title="50% Promo"]: 0.5
-        i[data-original-title="75% Promo"]: 0.25
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-# UNIT3D (custom)

src/Jackett.Common/Definitions/bit-titan.yml

@@ -1,184 +0,0 @@
----
-id: bit-titan
-name: BiT-TiTAN
-description: "BiT-TiTAN is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: de-DE
-type: private
-encoding: UTF-8
-links:
-  - https://bit-titan.net/
-
-caps:
-  categorymappings:
-    - {id: 1010, cat: Movies/UHD, desc: "Movies 2160p"}
-    - {id: 1020, cat: Movies/HD, desc: "Movies 1080p"}
-    - {id: 1030, cat: Movies/HD, desc: "Movies 720p"}
-    - {id: 1040, cat: Movies/HD, desc: "Movies x264"}
-    - {id: 1050, cat: Movies/HD, desc: "Movies x265"}
-    - {id: 1060, cat: Movies/SD, desc: "Movies XviD"}
-    - {id: 1070, cat: Movies/3D, desc: "Movies 3D"}
-    - {id: 1080, cat: Movies/DVD, desc: "Movies DVD"}
-    - {id: 1090, cat: Movies/BluRay, desc: "Movies BluRay"}
-    - {id: 1100, cat: Movies/DVD, desc: "Movies HD2DVD"}
-    - {id: 1110, cat: Movies/Foreign, desc: "Movies International"}
-    - {id: 1120, cat: Movies/HD, desc: "Movies HD Packs"}
-    - {id: 1130, cat: Movies/SD, desc: "Movies SD Packs"}
-    - {id: 2010, cat: TV/UHD, desc: "TV 2160p"}
-    - {id: 2020, cat: TV/HD, desc: "TV 1080p"}
-    - {id: 2030, cat: TV/HD, desc: "TV 720p"}
-    - {id: 2040, cat: TV/HD, desc: "TV x264"}
-    - {id: 2050, cat: TV/HD, desc: "TV x265"}
-    - {id: 2060, cat: TV/SD, desc: "TV XviD"}
-    - {id: 2070, cat: TV/HD, desc: "TV HD Packs"}
-    - {id: 2080, cat: TV/SD, desc: "TV SD Packs"}
-    - {id: 2090, cat: TV/Foreign, desc: "TV International"}
-    - {id: 3010, cat: TV/Documentary, desc: "Docu 2160p"}
-    - {id: 3020, cat: TV/Documentary, desc: "Docu 1080p"}
-    - {id: 3030, cat: TV/Documentary, desc: "Docu 720p"}
-    - {id: 3040, cat: TV/Documentary, desc: "Docu x264"}
-    - {id: 3050, cat: TV/Documentary, desc: "Docu x265"}
-    - {id: 3060, cat: TV/Documentary, desc: "Docu XviD"}
-    - {id: 3070, cat: TV/Documentary, desc: "Docu HD Packs"}
-    - {id: 3080, cat: TV/Documentary, desc: "Docu SD Packs"}
-    - {id: 3090, cat: TV/Documentary, desc: "Docu International"}
-    - {id: 4010, cat: TV/Sport, desc: "Sport 2160p"}
-    - {id: 4020, cat: TV/Sport, desc: "Sport 1080p"}
-    - {id: 4030, cat: TV/Sport, desc: "Sport 720p"}
-    - {id: 4040, cat: TV/Sport, desc: "Sport SD Sport"}
-    - {id: 4050, cat: TV/Sport, desc: "Sport HD Packs"}
-    - {id: 4060, cat: TV/Sport, desc: "Sport SD Packs"}
-    - {id: 5010, cat: XXX, desc: "XXX 2160p"}
-    - {id: 5020, cat: XXX, desc: "XXX 1080p"}
-    - {id: 5030, cat: XXX, desc: "XXX 720p"}
-    - {id: 5040, cat: XXX, desc: "XXX x264"}
-    - {id: 5050, cat: XXX, desc: "XXX x265"}
-    - {id: 5060, cat: XXX, desc: "XXX XviD"}
-    - {id: 5070, cat: XXX, desc: "XXX HD Packs"}
-    - {id: 5080, cat: XXX, desc: "XXX SD Packs"}
-    - {id: 5090, cat: XXX, desc: "XXX Sonstiges"}
-    - {id: 6010, cat: PC/Games, desc: "Games Windows"}
-    - {id: 6020, cat: Console, desc: "Games Linux"}
-    - {id: 6030, cat: PC/Mac, desc: "Games MacOS"}
-    - {id: 6040, cat: PC/Mobile-Android, desc: "Games Android"}
-    - {id: 6050, cat: Console/XBox, desc: "Games Xbox"}
-    - {id: 6060, cat: Console/PSP, desc: "Games PlayStation"}
-    - {id: 6070, cat: Console/NDS, desc: "Games Nintendo"}
-    - {id: 6080, cat: Console, desc: "Games Sonstige"}
-    - {id: 7010, cat: PC/0day, desc: "Software Windows"}
-    - {id: 7020, cat: PC, desc: "Software Linux"}
-    - {id: 7030, cat: PC/Mac, desc: "Software MacOS"}
-    - {id: 7040, cat: PC/Mobile-Android, desc: "Software Android"}
-    - {id: 8010, cat: Audio/MP3, desc: "Music MP3-Album"}
-    - {id: 8020, cat: Audio/MP3, desc: "Music MP3-Charts"}
-    - {id: 8030, cat: Audio/MP3, desc: "Music MP3-Sampler"}
-    - {id: 8040, cat: Audio/MP3, desc: "Music MP3-Single"}
-    - {id: 8050, cat: Audio/Lossless, desc: "Music FLAC-Album"}
-    - {id: 8060, cat: Audio/Lossless, desc: "Music FLAC-Charts"}
-    - {id: 8070, cat: Audio/Lossless, desc: "Music FLAC-Sampler"}
-    - {id: 8080, cat: Audio/Lossless, desc: "Music FLAC-Single"}
-    - {id: 8090, cat: Audio/Video, desc: "Music Video"}
-    - {id: 9010, cat: Audio/Audiobook, desc: "Books A-Book"}
-    - {id: 9020, cat: Books/EBook, desc: "Books E-Book"}
-    - {id: 9030, cat: Books, desc: "Books E-Paper"}
-    - {id: 9040, cat: Books, desc: "Books E-Learning"}
-    - {id: 9060, cat: TV/Anime, desc: "Anime HD"}
-    - {id: 9070, cat: TV/Anime, desc: "Anime SD"}
-    - {id: 9080, cat: TV/Anime, desc: "Anime Pack"}
-    - {id: 9999, cat: Other, desc: "unsort"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: apikey
-    type: text
-    label: APIKey
-  - name: info_key
-    type: info
-    label: About your API key
-    default: "Find or Generate a new key <a href=\"https://bit-titan.net/api_cp.php\" target =_blank>here</a>."
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 1
-    options:
-      1: created
-      2: seeders
-      5: size
-      9: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: DESC
-    options:
-      DESC: desc
-      ASC: asc
-
-search:
-  paths:
-    - path: api.php
-      response:
-        type: json
-
-  inputs:
-    apiKey: "{{ .Config.apikey }}"
-    categories: "{{ if .Categories }}{{ join .Categories \",\" }}{{ else }}0{{ end }}"
-    search: "{{ .Keywords }}"
-    # searchIn: 0 all, 1 active, 2 dead, 3 highlights, 4 own uploads, 5 uploads bots, 6 onlyupload, 7 multiplier, 8 %download, 9 freeleech
-    searchIn: "{{ if .Config.freeleech }}9{{ else }}0{{ end }}"
-    # 1 25, 2 50, 3 75, 4 100
-    # api only responds with results if limit=1 is used !?! (as at 22-Nov-2021)
-    limit: 1
-    downloadLink: 1
-    # 1 = Sat, 28 Nov 2020 23:29:38 +0100 (DEFAULT VALUE) , 2 = 1606606178 (UNIX TIMESTAMP) , 3 = 28.11.2020 23:29.38 (German Timestamp) ,  4 = 2020-11-28 23:29:38 (Default Datetime)
-    timeFormat: 2
-    orderBy: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
-
-  rows:
-    selector: results
-    count:
-      selector: filesFound
-
-  fields:
-    id:
-      selector: id
-    category:
-      selector: category
-    title:
-      selector: name
-    details:
-      text: "details.php?id={{ .Result.id }}"
-    download:
-      selector: download
-    poster:
-      selector: poster
-    seeders:
-      selector: seeds
-    leechers:
-      selector: leechers
-    grabs:
-      selector: snatchers
-    date:
-      # unix
-      selector: added
-    size:
-      selector: size
-    downloadvolumefactor:
-      selector: downloadFactor
-    uploadvolumefactor:
-      selector: uploadFactor
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 2 day (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# json engine v.2.011.021

src/Jackett.Common/Definitions/bitbazis.yml

@@ -4,47 +4,51 @@ name: Bit-Bázis
 description: "Bit-Bázis is a HUNGARIAN Private Tracker for MOVIES / TV"
 language: hu-HU
 type: private
-# encoding: ISO-8859-2
 encoding: UTF-8
 links:
   - https://bitbazis.net/
 
 caps:
   categorymappings:
+    - {id: 85, cat: Movies/SD, desc: "Film/Cam/Hun"}
+    - {id: 86, cat: Movies/SD, desc: "Film/Cam/Eng"}
     - {id: 15, cat: Movies/SD, desc: "Film/XviD/Hun"}
-    - {id: 34, cat: Movies/HD, desc: "Film/x264/Hun"}
-    - {id: 83, cat: Movies/HD, desc: "Film/HD/Hun"}
-    - {id: 64, cat: Movies, desc: "Film/Pack"}
     - {id: 16, cat: Movies/SD, desc: "Film/XviD/Eng"}
-    - {id: 17, cat: Movies/DVD, desc: "Film/DVD-R/Hun"}
-    - {id: 19, cat: Movies/DVD, desc: "Film/DVD-R/Eng"}
+    - {id: 34, cat: Movies/HD, desc: "Film/x264/Hun"}
     - {id: 48, cat: Movies/HD, desc: "Film/x264/Eng"}
+    - {id: 83, cat: Movies/HD, desc: "Film/HD/Hun"}
     - {id: 82, cat: Movies/HD, desc: "Film/HD/Eng"}
-    - {id: 85, cat: Movies/SD, desc: "Film/Cam/XviD/Hun"}
-    - {id: 86, cat: Movies/SD, desc: "Film/Cam/XviD/Eng"}
+    - {id: 94, cat: Movies/HD, desc: "Film/FHD/Hun"}
+    - {id: 95, cat: Movies/HD, desc: "Film/FHD/Eng"}
+    - {id: 92, cat: Movies/UHD, desc: "Film/UHD/Hun"}
+    - {id: 93, cat: Movies/UHD, desc: "Film/UHD/Eng"}
     - {id: 22, cat: TV, desc: "Sorozat/Hun"}
-    - {id: 69, cat: TV/Anime, desc: "Mese/XviD"}
     - {id: 58, cat: TV, desc: "Sorozat/Eng"}
+    - {id: 69, cat: TV/Anime, desc: "Mese/SD"}
     - {id: 68, cat: TV/Anime, desc: "Mese/DVD"}
     - {id: 91, cat: TV/Anime, desc: "Mese/HD"}
     - {id: 25, cat: Audio/MP3, desc: "Mp3/Hun"}
     - {id: 26, cat: Audio/MP3, desc: "Mp3/Eng"}
-    - {id: 71, cat: Audio/Lossless, desc: "Lossless/Eng"}
     - {id: 84, cat: Audio/Lossless, desc: "Lossless/Hun"}
+    - {id: 71, cat: Audio/Lossless, desc: "Lossless/Eng"}
     - {id: 31, cat: PC/Games, desc: "Játék/PC"}
-    - {id: 81, cat: PC/0day, desc: "Program/PC"}
-    - {id: 14, cat: PC, desc: "Program/Egyéb"}
-    - {id: 49, cat: PC/0day, desc: "Program/Rip"}
     - {id: 54, cat: Console, desc: "Játék/Konzol"}
+    - {id: 81, cat: PC/0day, desc: "Program/PC"}
+    - {id: 49, cat: PC/0day, desc: "Program/Rip"}
+    - {id: 14, cat: PC, desc: "Program/Egyéb"}
+    - {id: 64, cat: Movies, desc: "Film/Pack"}
+    - {id: 70, cat: Audio/Audiobook, desc: "Hangoskönyv"}
+    - {id: 27, cat: Books/EBook, desc: "Könyv/Hun"}
+    - {id: 50, cat: Books/EBook, desc: "Könyv/Eng"}
+    - {id: 65, cat: Other, desc: "Egyéb"}
+    # the following are no longer in the cat list in the search page, but are still in the profile cat list
     - {id: 67, cat: PC/Mobile-Android, desc: "Program/Android"}
+    - {id: 17, cat: Movies/DVD, desc: "Film/DVD/Hun"}
+    - {id: 19, cat: Movies/DVD, desc: "Film/DVD/Eng"}
+    - {id: 24, cat: Audio/Video, desc: "Videóklipp"}
     - {id: 33, cat: XXX/SD, desc: "Film/SD/XXX"}
     - {id: 89, cat: XXX/x264, desc: "Film/HD/XXX"}
     - {id: 66, cat: XXX/ImageSet, desc: "Képek/XXX"}
-    - {id: 27, cat: Books/EBook, desc: "Könyv/Hun"}
-    - {id: 50, cat: Books/EBook, desc: "Könyv/Eng"}
-    - {id: 70, cat: Audio/Audiobook, desc: "Hangoskönyv"}
-    - {id: 24, cat: Audio/Video, desc: "Videóklipp"}
-    - {id: 65, cat: Other, desc: "Egyéb"}
 
   modes:
     search: [q]
@@ -102,7 +106,7 @@ search:
     # site does not support imdbid searching or appear to have freeleech
 
   rows:
-    selector: table[width="900px"]:last-child tbody tr:has(a[href^="userdetails.php?id="])
+    selector: table[width="100%"]:last-child tbody tr:has(a[href^="userdetails.php?id="]):has(a[href^="download.php?torrent="])
 
   fields:
     category:
@@ -112,7 +116,8 @@ search:
         - name: querystring
           args: cat
     title:
-      selector: a[href^="details.php?id="]
+      selector: div.tooltip
+      remove: span
     details:
       selector: a[href^="details.php?id="]
       attribute: href
@@ -120,41 +125,35 @@ search:
       selector: a.preview
       attribute: href
     download:
-      selector: a[href^="details.php?id="]
+      selector: a[href^="download.php?torrent="]
       attribute: href
-      filters:
-        - name: replace
-          args: ["details.php?id=", "download.php?torrent="]
     size:
-      selector: td:nth-last-child(2)
+      selector: td:nth-child(6)
     date:
-      # 2021-11-09 16:51:24
-      selector: td:last-child
+      # 2022<br>03/15.
+      selector: td:nth-child(7)
       filters:
         - name: append
           args: " +01:00" # CET
         - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
+          args: "200601/02. -07:00"
     grabs:
-      selector: td:nth-child(6)
-      filters:
-        - name: regexp
-          args: "D:(\\d+)"
-    seeders:
-      selector: td:nth-child(4)
-      filters:
-        - name: regexp
-          args: "S:(\\d+)"
-    leechers:
       selector: td:nth-child(5)
-      filters:
-        - name: regexp
-          args: "L:(\\d+)"
+    seeders:
+      selector: td:nth-child(3)
+    leechers:
+      selector: td:nth-child(4)
     downloadvolumefactor:
-      text: 1
+      case:
+        "i:contains(\"(Free)\")": 0
+        "*": 1
     uploadvolumefactor:
-      text: 1
+      case:
+        "i:contains(\"(2x)\")": 2
+        "i:contains(\"(3x)\")": 3
+        "i:contains(\"(4x)\")": 4
+        "*": 1
     minimumseedtime:
-      # 3 day (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
+      # 1 day (as seconds = 1 x 24 x 60 x 60)
+      text: 86400
 # engine n/a

src/Jackett.Common/Definitions/bitbr.yml

@@ -0,0 +1,189 @@
+---
+id: bitbr
+name: BitBR
+description: "BitBR is a BRAZILIAN Private Torrent Tracker for HD MOVIES / TV"
+language: pt-BR
+type: private
+encoding: UTF-8
+links:
+  - https://bitbr.cc/
+
+caps:
+  categorymappings:
+    - {id: 405, cat: TV/Anime, desc: "Anime"}
+    - {id: 414, cat: PC/Mobile-Other, desc: "App"}
+    - {id: 413, cat: Audio/Audiobook, desc: "Audiobooks"}
+    - {id: 409, cat: XXX, desc: "Adulto XxX"}
+    - {id: 410, cat: Other, desc: "Desenhos"}
+    - {id: 404, cat: TV/Documentary, desc: "Documentários"}
+    - {id: 407, cat: TV/Sport, desc: "Esportes"}
+    - {id: 401, cat: Movies, desc: "Filmes"}
+    - {id: 416, cat: Books/Comics, desc: "HQ/Mangá"}
+    - {id: 418, cat: Books/EBook, desc: "eBooks"}
+    - {id: 408, cat: PC/Games, desc: "Jogos"}
+    - {id: 417, cat: Audio, desc: "Músicas"}
+    - {id: 412, cat: Other, desc: "Scripts Android/iOS"}
+    - {id: 411, cat: Other, desc: "Scripts PHP"}
+    - {id: 402, cat: TV, desc: "Séries"}
+    - {id: 406, cat: PC, desc: "Softwares"}
+    - {id: 415, cat: PC/0day, desc: "istema Operacional"}
+    - {id: 403, cat: TV, desc: "TV"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: 2facode
+    type: text
+    label: 2FA code
+  - name: info_2fa
+    type: info
+    label: "About 2FA code"
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the BitBR Web Site. Otherwise just leave it empty."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents por página:</b> setting to <b>100</b> on your account profile <b>Configurações do Tracker</b>.
+
+login:
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
+  inputs:
+    secret: ""
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    two_step_code: "{{ .Config.2facode }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
+  error:
+    - selector: td.embedded:has(h2:contains("Falha")) # code or username or password incorrect
+    - selector: td.embedded:has(h2:contains("Negada")) # you are already logged on
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
+    incldead: 0
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    # does not return imdb link in results
+
+  rows:
+    selector: table.torrents > tbody > tr:has(table.torrentname)
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_default:
+      selector: a[href^="details.php?id="]
+    title_optional:
+      optional: true
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+    title:
+      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    date_elapsed:
+      # time type: time elapsed (default)
+      selector: td:nth-child(4) > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " -03:00" # BRT
+        - 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: " -03:00" # BRT
+        - name: dateparse
+          args: "2006-01-0215:04:05 -07:00"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td:nth-child(5)
+    seeders:
+      selector: td:nth-child(6)
+    leechers:
+      selector: td:nth-child(7)
+    grabs:
+      selector: td:nth-child(8)
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    minimumratio:
+      text: 0.8
+# NexusPHP Standard v1.5 Beta 4 (custom)

src/Jackett.Common/Definitions/bitcityreloaded.yml

@@ -0,0 +1,161 @@
+---
+id: bitcityreloaded
+name: Bit-City Reloaded
+description: "Bit-City Reloaded is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: de-DE
+type: private
+encoding: ISO-8859-1
+links:
+  - https://bc-reloaded.net/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Other, desc: "Anderes"}
+    - {id: 34, cat: PC, desc: "Appz/Linux"}
+    - {id: 35, cat: PC/Mac, desc: "Appz/Mac"}
+    - {id: 36, cat: PC, desc: "Appz/Other"}
+    - {id: 20, cat: PC/0day, desc: "Appz/Win"}
+    - {id: 4, cat: Books/EBook, desc: "EBooks"}
+    - {id: 10, cat: PC/Games, desc: "Games/PC"}
+    - {id: 15, cat: PC/Mobile-Android, desc: "Handy & PDA"}
+    - {id: 16, cat: Audio/Audiobook, desc: "Hörspiel/Hörbuch"}
+    - {id: 30, cat: Movies/Foreign, desc: "International"}
+    - {id: 43, cat: Movies/3D, desc: "Movie/3D"}
+    - {id: 6, cat: Movies/HD, desc: "Movie/HD 1080p"}
+    - {id: 7, cat: Movies/HD, desc: "Movie/HD 720p"}
+    - {id: 17, cat: Movies/Other, desc: "Movie/MegaPack"}
+    - {id: 9, cat: Movies/SD, desc: "Movie/SD"}
+    - {id: 26, cat: XXX, desc: "Movie/XXX"}
+    - {id: 41, cat: XXX/Other, desc: "Movie/XXX/Other"}
+    - {id: 42, cat: XXX/Pack, desc: "Movie/XXX/Pack"}
+    - {id: 45, cat: Movies/UHD, desc: "Movies/4K"}
+    - {id: 33, cat: Movies/BluRay, desc: "Movies/BluRay"}
+    - {id: 19, cat: Audio/Video, desc: "Musik Videos"}
+    - {id: 18, cat: Audio, desc: "Musik/MP3/Flac"}
+    - {id: 13, cat: Console/WiiU, desc: "Nintendo"}
+    - {id: 12, cat: Console/PS4, desc: "Playstation"}
+    - {id: 22, cat: TV/HD, desc: "Serie/HD"}
+    - {id: 38, cat: TV, desc: "Serie/Pack"}
+    - {id: 23, cat: TV/SD, desc: "Serie/SD"}
+    - {id: 25, cat: TV/Sport, desc: "Sport"}
+
+  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: 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>Anzahl der Torrents beim Durchsuchen</b> setting to <b>100</b> on your account profile.
+
+login:
+  path: login/index.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: div#login_error
+  test:
+    path: /
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    # https://bc-reloaded.net/uebersicht.php?c7=1&c17=1&showsearch=1&search=2021+720p&blah=0&incldead=1&orderby=added&sort=desc
+    - path: uebersicht.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    showsearch: 1
+    search: "{{ .Keywords }}"
+    # 0 name, 1 descr, 2 both, 3 noDVDRip
+    blah: 0
+    # 0 active, 1 incldead, 2 onlydead
+    incldead: 1
+    orderby: "{{ .Config.sort }}"
+    sort: "{{ .Config.type }}"
+    # site does not support imdbid searching or display imdb links in results.
+
+  rows:
+    selector: "table.tableinborder[cellpadding=0] > tbody > tr{{ if .Config.freeleech }}:has(img[src$=\"torrent_ou.gif\"]){{ else }}{{ end }}"
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      selector: a[href^="uebersicht.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php"]
+      attribute: href
+    date:
+      selector: table tbody tr:nth-of-type(2) td:nth-of-type(5)
+      filters:
+        - name: re_replace
+          args: ["\u00a0", " "]
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "02.01.2006 15:04:05 -07:00"
+    size:
+      selector: table tbody tr:nth-of-type(2) > td > b
+    files:
+      selector: td:has(a[href*="&filelist=1"])> b:nth-child(2)
+    grabs:
+      selector: td:has(a[href*="&tosnatchers=1"])> b:nth-child(1)
+    seeders:
+      selector: table tbody tr:nth-of-type(2) td:nth-of-type(2) b:nth-of-type(1) font
+    leechers:
+      selector: table tbody tr:nth-of-type(2) td:nth-of-type(2) b:nth-of-type(2) font
+    downloadvolumefactor:
+      case:
+        img[src$="torrent_ou.gif"]: 0
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img[src$="torrent_2u.gif"]: 2
+        "*": 1
+    minimumratio:
+      text: 0.7
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# engine n/a

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

src/Jackett.Common/Definitions/bitsearch.yml

@@ -7,10 +7,13 @@ type: public
 encoding: UTF-8
 links:
   - https://bitsearch.to/
+  - https://bitsearch.nocensor.sbs/
+legacylinks:
   - https://bitsearch.nocensor.biz/
 
 caps:
   categories:
+    AudioBook: Audio/Audiobook
     eBook: Books/EBook
     "Ebook/Course": Books/EBook
     Games: PC/Games
@@ -72,8 +75,12 @@ search:
     sort: "{{ .Config.sort }}"
     order: "{{ .Config.type }}"
 
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
   rows:
-    selector: div.search-result
+    selector: div.search-result:has(a.dl-torrent), li.search-result:has(a.dl-torrent)
 
   fields:
     category:
@@ -84,7 +91,7 @@ search:
       selector: h5 a
       attribute: href
     download:
-      selector: a[class="dl-torrent"]
+      selector: a.dl-torrent
       attribute: href
     infohash:
       selector: a[href^="magnet:?xt"]

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

@@ -162,9 +162,9 @@ search:
       selector: a[href*="?p=torrents&pid=10&action=download"]
       attribute: href
     date_year:
-      optional: true
       # Uploaded 30-01-2019 15:02 by
-      selector: td.torrent_name:not(:contains(" at "))
+      selector: td.torrent_name:not(:contains(" at ")):not(:has(abbr[data-time]))
+      optional: true
       filters:
         - name: regexp
           args: "Uploaded (.+?) by"
@@ -173,20 +173,22 @@ search:
         - name: dateparse
           args: "02-01-2006 15:04 -07:00"
     date_day:
-      optional: true
       # Uploaded Friday at 05:11 by
       # Uploaded Today at 00:48 by
       # Uploaded Yesterday at 23:57 by
-      selector: td.torrent_name:contains(" at ")
+      selector: td.torrent_name:contains(" at "):not(:has(abbr[data-time]))
+      optional: true
       filters:
         - name: regexp
           args: "Uploaded (.+?) by"
-        - name: replace
-          args: [" at ", " "]
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
+        - 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_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+      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:

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

@@ -63,10 +63,19 @@ 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
-        attribute: attributes
+
+  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
@@ -74,12 +83,13 @@ search:
 
   rows:
     selector: data
+    attribute: attributes
     count:
       selector: meta.total
 
   fields:
-    categorydesc:
-      selector: category
+    category:
+      selector: category_id
     title:
       selector: name
     details:
@@ -91,8 +101,6 @@ search:
       filters:
         - name: replace
           args: ["https://via.placeholder.com/90x135", ""]
-        - name: replace
-          args: ["https://via.placeholder.com/400x600", ""]
     imdbid:
       selector: imdb_id
     tmdbid:
@@ -134,4 +142,4 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 5.3.1b
+# json UNIT3D 6.0.6 beta

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

@@ -10,11 +10,12 @@ links:
 
 caps:
   categorymappings:
-    - {id: 1, cat: TV, desc: "Cursos (courses)"}
+    - {id: 1, cat: TV, desc: "Cursos"}
     - {id: 2, cat: Books/EBook, desc: "eBooks"}
-    - {id: 5, cat: Books/Mags, desc: "Revistas (Magazines)"}
+    - {id: 5, cat: Books/Mags, desc: "Revistas"}
     - {id: 3, cat: Audio/Audiobook, desc: "Audiobooks"}
-    - {id: 4, cat: Other, desc: "Arquivos de Auxilio (Help Files)"}
+    - {id: 4, cat: Other, desc: "Arquivos de Auxilio"}
+    - {id: 6, cat: Other, desc: "Graduação"}
 
   modes:
     search: [q]
@@ -67,10 +68,10 @@ search:
     - 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 }}"
       response:
         type: json
-        attribute: attributes
 
   rows:
     selector: data
+    attribute: attributes
     count:
       selector: meta.total
 

src/Jackett.Common/Definitions/btnext.yml

@@ -256,9 +256,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.itemtop_games
       attribute: href
 
 search:
@@ -287,7 +282,7 @@ search:
     resorder: desc
 
   rows:
-    selector: div.short_search:has(div.shor_subtitles span:nth-child(2):contains("Б"))
+    selector: div.short_search
 
   fields:
     category:
@@ -312,13 +307,22 @@ 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)
+      text: 0B
+    size:
+      selector: div.shor_subtitles span:nth-child(2):contains("Б")
+      optional: true
       filters:
         - name: replace
           args: ["ТБ", "TB"]

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

@@ -100,7 +100,7 @@ search:
     by: "{{ .Config.type }}"
 
   rows:
-    selector: "table.lista tr td table.lista tr:has(a[href^=\"index.php?page=torrent-details\"]){{ if .Config.freeleech }}:has(img[src=\"gold/gold.gif\"]){{ else }}{{ end }}"
+    selector: "table.lista tr td table.lista tr:has(a[href^=\"index.php?page=torrent-details\"]):not(:has(a[href=\"index.php?page=torrents&category=0\"])){{ if .Config.freeleech }}:has(img[src=\"gold/gold.gif\"]){{ else }}{{ end }}"
 
   fields:
     category:

src/Jackett.Common/Definitions/casatorrent.yml

@@ -1,213 +0,0 @@
----
-id: casatorrent
-name: Casa-Torrent
-description: "Casa-Torrent is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: fr-FR
-type: private
-encoding: UTF-8
-links:
-  - https://tctg.in/
-legacylinks:
-  - https://teamctgame.co/
-  - http://teamctgame.xyz/
-  - https://teamctgame.xyz/
-
-caps:
-  categorymappings:
-    - {id: 65, cat: Movies/HD, desc: "BD: BD"}
-    - {id: 68, cat: Books/Mags, desc: "Ebooks:  Presse"}
-    - {id: 90, cat: Audio/Audiobook, desc: "Ebooks: Audio books"}
-    - {id: 56, cat: Books/EBook, desc: "Ebooks: Ebooks"}
-    - {id: 95, cat: Books/Comics, desc: "Ebooks: Mangas"}
-    - {id: 84, cat: XXX, desc: "Ebooks: XXX"}
-    - {id: 54, cat: Movies/3D, desc: "Films: 3D"}
-    - {id: 53, cat: Movies/HD, desc: "Films: 4K"}
-    - {id: 77, cat: Movies/UHD, desc: "Films: 4K-HDR"}
-    - {id: 82, cat: Movies/UHD, desc: "Films: 4K-light"}
-    - {id: 50, cat: Movies/UHD, desc: "Films: 4K-Remux"}
-    - {id: 61, cat: Movies, desc: "Films: Animation"}
-    - {id: 48, cat: Movies/BluRay, desc: "Films: BDRip / BRRip"}
-    - {id: 78, cat: Movies/DVD, desc: "Films: DVD-R"}
-    - {id: 47, cat: Movies/DVD, desc: "Films: DVDRip"}
-    - {id: 71, cat: Movies/BluRay, desc: "Films: Full Bluray"}
-    - {id: 63, cat: Movies/HD, desc: "Films: HD TV"}
-    - {id: 52, cat: Movies/HD, desc: "Films: HD.1080p"}
-    - {id: 51, cat: Movies/HD, desc: "Films: HD.720p"}
-    - {id: 80, cat: Movies/HD, desc: "Films: HDLiGHT / M-HD"}
-    - {id: 87, cat: Movies/HD, desc: "Films: HDRiP"}
-    - {id: 60, cat: Movies, desc: "Films: Pack"}
-    - {id: 96, cat: Movies, desc: "Films: Remux"}
-    - {id: 75, cat: TV, desc: "Films: TVRiP"}
-    - {id: 98, cat: Movies, desc: "Films: VFSTFR"}
-    - {id: 89, cat: Movies, desc: "Films: VO"}
-    - {id: 55, cat: Movies, desc: "Films: VOSTFR"}
-    - {id: 58, cat: Movies/WEB-DL, desc: "Films: Web - DL"}
-    - {id: 57, cat: Movies/WEB-DL, desc: "Films: WebRip"}
-    - {id: 72, cat: Movies/HD, desc: "Films: x265"}
-    - {id: 1, cat: XXX, desc: "Films: XXX"}
-    - {id: 97, cat: Console, desc: "Jeux : Android"}
-    - {id: 81, cat: Console, desc: "Jeux : Consoles"}
-    - {id: 66, cat: PC/Games, desc: "Jeux: PC"}
-    - {id: 62, cat: PC/0day, desc: "Logiciels:  Windows"}
-    - {id: 99, cat: Other, desc: "Logiciels: Graph / Wallpaper"}
-    - {id: 94, cat: TV/HD, desc: "Series: 4K HDR"}
-    - {id: 93, cat: TV/Anime, desc: "Series: Animés"}
-    - {id: 86, cat: TV/HD, desc: "Series: Episode HD"}
-    - {id: 101, cat: TV/HD, desc: "Series: Episode HD Vostfr"}
-    - {id: 85, cat: TV/SD, desc: "Series: Episode SD"}
-    - {id: 102, cat: TV/SD, desc: "Series: Episode SD Vostfr"}
-    - {id: 100, cat: TV/HD, desc: "Series: Tv - Pack HD"}
-    - {id: 103, cat: TV/HD, desc: "Series: Tv - Pack HD Vostfr"}
-    - {id: 59, cat: TV/SD, desc: "Series: Tv - Pack SD"}
-    - {id: 104, cat: TV/SD, desc: "Series: Tv - Pack SD Vostfr"}
-    - {id: 88, cat: TV, desc: "Spectacles: Tous"}
-    - {id: 83, cat: TV, desc: "TV:  Emissions"}
-    - {id: 73, cat: TV/Documentary, desc: "TV: Documentaires"}
-    - {id: 74, cat: TV/Sport, desc: "TV: Sports"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: multilang
-    type: checkbox
-    label: Replace MULTI by another language in release name
-    default: false
-  - name: multilanguage
-    type: select
-    label: Replace MULTI by this language
-    default: FRENCH
-    options:
-      FRENCH: FRENCH
-      MULTI.FRENCH: MULTI.FRENCH
-      ENGLISH: ENGLISH
-      MULTI.ENGLISH: MULTI.ENGLISH
-      VOSTFR: VOSTFR
-      MULTI.VOSTFR: MULTI.VOSTFR
-  - name: vostfr
-    type: checkbox
-    label: Replace VOSTFR with ENGLISH
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: id
-    options:
-      id: 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: account-login.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: p#msgError
-  test:
-    path: torrents-search.php
-    selector: a[href="account-logout.php"]
-
-search:
-  paths:
-    - path: torrents-search.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    incldead: 1
-    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    lang: 0
-    sort: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
-  keywordsfilters:
-    - name: re_replace
-      args: ["(\\w+)", " +$1"] # prepend + to each word
-
-  rows:
-    selector: table.ttable_headinner > tbody > tr.t-row
-
-  fields:
-    category:
-      selector: a[href^="torrents.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title_phase1:
-      selector: a[href^="torrents-details.php?id="] b
-    title_multilang:
-      text: "{{ .Result.title_phase1 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)(\\smulti\\s)", " {{ .Config.multilanguage }} "]
-    title_phase2:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
-    title_vostfr:
-      text: "{{ .Result.title_phase2 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)(\\svostfr\\s)", " ENGLISH "]
-        - name: re_replace
-          args: ["(?i)(\\ssubfrench\\s)", " ENGLISH "]
-    title:
-      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
-    details:
-      selector: a[href^="torrents-details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    poster:
-      selector: img[src*="/uploads/images/"]
-      attribute: src
-    grabs:
-      selector: a[onmouseover][href^="torrents-details.php?id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "Snatched: </b>(\\d+)<br"
-    size:
-      selector: td:nth-last-child(5)
-    seeders:
-      selector: td:nth-last-child(4)
-    leechers:
-      selector: td:nth-last-child(3)
-    date:
-      selector: a[onmouseover][href^="torrents-details.php?id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "le: </b>(.*?)<br"
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "02-01-2006 -07:00"
-    downloadvolumefactor:
-      case:
-        img[src="images/free.gif"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/cinematik.yml

@@ -49,6 +49,10 @@ settings:
       0: Active
       1: "Active and Inactive"
       2: Inactive
+  - name: dropbumped
+    type: checkbox
+    label: Ignore Bumped Torrents
+    default: false
   - name: info_results
     type: info
     label: Results Per Page
@@ -77,7 +81,7 @@ search:
     srchdtls: "{{ if .Query.IMDBID }}1{{ else }}0{{ end }}"
 
   rows:
-    selector: table[border="1"] tr:not(:first-child)
+    selector: "table[border=\"1\"] tr:not(:first-child){{ if .Config.dropbumped }}:not(:has(span.bumped)){{ else }}{{ end }}"
 
   fields:
     category:

src/Jackett.Common/Definitions/coastalcrew.yml

@@ -10,54 +10,40 @@ 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, desc: "EBook"}
+    - {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 +59,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

@@ -7,7 +7,7 @@ type: semi-private
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www.cpasbien-fr.nz/
+  - https://vwwvwvwvvw.cpasbien-fr.nz/
 legacylinks:
   - http://www.cpasbiens.cc/
   - http://www.cpabien.cm/
@@ -42,6 +42,7 @@ legacylinks:
   - https://wvw.cpasbien-fr.fr/
   - https://wwwv.cpasbien-fr.fr/
   - https://www2.cpasbien-fr.fr/
+  - https://www.cpasbien-fr.nz/
 
 caps:
   categories:
@@ -63,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://cpasbien.to/
+  - https://www.cpasbien.gg/
 legacylinks:
   - https://www1.cpasbiens.ws/
   - https://www2.cpasbiens.ws/
@@ -19,6 +19,7 @@ legacylinks:
   - https://cpasbiens.proxyportal.fun/
   - https://cpasbiens.uk-unblock.xyz/
   - https://cpasbiens.ind-unblock.xyz/
+  - https://cpasbien.to/
 
 caps:
   categories:

src/Jackett.Common/Definitions/crackingpatching.yml

@@ -0,0 +1,101 @@
+---
+id: crackingpatching
+name: CrackingPatching
+description: "CrackingPatching is a Public tracker for Software and Apps"
+language: en-US
+type: public
+encoding: UTF-8
+links:
+  - https://crackingpatching.com/
+
+caps:
+  categorymappings:
+    - {id: "adobe-software", cat: PC, desc: "Adobe Software"}
+    - {id: "adobe-tools", cat: PC, desc: "Adobe Tools"}
+    - {id: "android", cat: PC/Mobile-Android, desc: "Android"}
+    - {id: "animations-3d-graphics", cat: PC, desc: "Animations/ 3D Graphics"}
+    - {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: "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: "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]
+
+settings: []
+
+download:
+  selectors:
+    - selector: a[href^="magnet:?xt="]
+      attribute: href
+
+search:
+  paths:
+    - path: "?s={{ .Keywords }}&"
+
+  rows:
+    selector: article.post-entry
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      text: other
+    category|noappend:
+      selector: article.post-entry
+      attribute: class
+      optional: true
+      filters:
+        - name: regexp
+          args: "category-(.+?) "
+    title:
+      selector: h2 > a
+    details:
+      selector: h2 > a
+      attribute: href
+    download:
+      selector: h2 > a
+      attribute: href
+    poster:
+      selector: img
+      attribute: src
+    date:
+      text: now
+    size:
+      text: "512 MB"
+    description:
+      selector: p
+      remove: a
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# WordPress 5.9.1

src/Jackett.Common/Definitions/crazyspirits.yml

@@ -7,6 +7,8 @@ type: private
 encoding: UTF-8
 links:
   - https://www.crazyspirits.com/
+certificates:
+  - cb68471b631304b3b4cec6315cfbad5a6780eb84 # self-signed 13 Mar 2022
 
 caps:
   categorymappings:
@@ -280,8 +282,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

@@ -0,0 +1,136 @@
+---
+id: danishbytes-api
+name: DanishBytes (API)
+description: "DanishBytes is a Private Danish Tracker"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://danishbytes.club/
+  - https://danishbytes2.org/
+  - https://dbytes.org/
+  - https://danishbytes.art/
+legacylinks:
+  - https://danishbytes.org/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 2, cat: TV, desc: "TV"}
+    - {id: 3, cat: Audio, desc: "Sound"}
+    - {id: 4, cat: PC/Games, desc: "Games"}
+    - {id: 5, cat: PC/0day, desc: "Appz"}
+    - {id: 8, cat: Books, desc: "Bookz"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid]
+    movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_apikey
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://danishbytes.club/\" target =_blank>DanishBytes</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+  - name: rsskey
+    type: text
+    label: RSSKey
+  - name: info_rsskey
+    type: info
+    label: About your RSS key
+    default: "Find or Generate a new RSS key by accessing your <a href=\"https://danishbytes.club/\" target =_blank>DanishBytes</a> account <i>My Security</i> page and clicking on the <b>RSS Key (RID)</b> tab."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: created_at
+    options:
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: /api/torrents
+  method: get
+  inputs:
+    api_token: "{{ .Config.apikey }}"
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
+search:
+  paths:
+    - path: "/api/torrents/v2/filter?api_token={{ .Config.apikey }}&search={{ .Keywords }}{{ if .Query.IMDBIDShort }}&imdb={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdb={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdb={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&freeleech=1{{ else }}{{ end }}&sorting={{ .Config.sort }}&direction={{ .Config.type }}&qty=100&page=1"
+      response:
+        type: json
+
+  rows:
+    selector: torrents
+    count:
+      selector: $.resultsCount
+
+  fields:
+    id:
+      selector: .id
+    category:
+      selector: category_id
+    title:
+      selector: name
+    details:
+      text: "{{ .Config.sitelink }}torrents/{{ .Result.id }}"
+    download:
+      text: "{{ .Config.sitelink }}torrent/download/{{ .Result.id }}.{{ .Config.rsskey }}"
+    poster:
+      selector: poster_image
+    imdbid:
+      selector: imdb
+    tmdbid:
+      selector: tmdb
+    tvdbid:
+      selector: tvdb
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    date:
+      # 2022-02-28T19:09:44.000000Z
+      selector: created_at
+    size:
+      selector: size
+    downloadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: free
+      case:
+        0: 1 # not free
+        1: 0 # freeleech
+    uploadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: doubleup
+      case:
+        0: 1 # normal
+        1: 2 # double
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 2 day (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# json DBy v0.96

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

@@ -12,33 +12,30 @@ legacylinks:
 
 caps:
   categorymappings:
-    # Dont forget to update the category case block on the search section below.
     # Movie
-    - {id: 119, cat: Movies/DVD, desc: "Movie DVD"}
-    - {id: 114, cat: Movies/UHD, desc: "Movie 4K /2160p"}
-    - {id: 28, cat: Movies/SD, desc: "Movie XviD/x264"}
-    - {id: 32, cat: Movies/HD, desc: "Movie 720p/1080p"}
-    - {id: 26, cat: Movies/3D, desc: "Movie 3D"}
-    - {id: 138, cat: Movies, desc: "Movie Packs"}
+    - {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: 138, cat: Movies, desc: "Filme Pack`s"}
     # Serien
-    - {id: 57, cat: TV/HD, desc: "Serien HD"}
-    - {id: 59, cat: TV, desc: "Serien Pack"}
     - {id: 60, cat: TV/SD, desc: "Serien SD"}
-    - {id: 122, cat: TV, desc: "Serien Show"}
-    - {id: 123, cat: TV/Documentary, desc: "Serien Doku"}
+    - {id: 57, cat: TV/HD, desc: "Serien HD"}
+    - {id: 139, cat: TV/UHD, desc: "Serien UHD"}
+    - {id: 59, cat: TV, desc: "Serien Pack`s"}
     # Audio
-    - {id: 120, cat: Audio/Video, desc: "Audio Videos"}
+    - {id: 110, cat: Audio/MP3, desc: "Audio MP3"}
     - {id: 48, cat: Audio/Lossless, desc: "Audio Flac"}
     - {id: 52, cat: Audio, desc: "Audio Pack"}
-    - {id: 110, cat: Audio/MP3, desc: "Audio MP3"}
-    - {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"}
     - {id: 11, cat: PC/Mobile-Other, desc: "App Mobil"}
     - {id: 125, cat: PC/Mac, desc: "App macOS"}
     # Doku
-    - {id: 14, cat: TV/Documentary, desc: "Doku HD"}
     - {id: 15, cat: TV/Documentary, desc: "Doku SD"}
+    - {id: 14, cat: TV/Documentary, desc: "Doku HD"}
+    - {id: 123, cat: TV/Documentary, desc: "Doku Reihe"}
     # Spiel
     - {id: 126, cat: Console/Other, desc: "Spiel Mobil"}
     - {id: 17, cat: PC/Games, desc: "Spiel PC"}
@@ -48,19 +45,18 @@ caps:
     - {id: 61, cat: TV/Sport, desc: "Sport HD"}
     - {id: 62, cat: TV/Sport, desc: "Sport SD"}
     # Paper
-    - {id: 96, cat: Books/Mags, desc: "Paper Zeitungen"}
-    - {id: 136, cat: Books/EBook, desc: "Paper E-Book"}
-    - {id: 137, cat: Books/Comics, desc: "Paper Comics"}
+    - {id: 96, cat: Books/Mags, desc: "ePaper Zeitungen"}
+    - {id: 136, cat: Books/EBook, desc: "ePaper E-Book"}
+    - {id: 137, cat: Books/Comics, desc: "ePaper Comics"}
     # XXX
+    - {id: 76, cat: XXX/XviD, desc: "XXX SD"}
     - {id: 73, cat: XXX/x264, desc: "XXX HD"}
     - {id: 75, cat: XXX/Pack, desc: "XXX Pack"}
-    - {id: 76, cat: XXX/XviD, desc: "XXX SD"}
-    - {id: 124, cat: XXX/Other, desc: "XXX Clips"}
     #  Internal
-    - {id: 128, cat: Movies/HD, desc: "Internal Film HD"}
     - {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 Serie SD"}
     - {id: 130, cat: TV/HD, desc: "Internal Serien HD"}
-    - {id: 131, cat: TV/SD, desc: "Internal Serien SD"}
     - {id: 132, cat: Other, desc: "Internal Sonstiges"}
 
   modes:
@@ -150,58 +146,12 @@ search:
       - name: andmatch
 
   fields:
-    category:
-      selector: div.kat_cat_pic
-      case:
-        # Movie
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"DVD\"))": 119
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"2160p\"))": 114
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"x264\"))": 28
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"1080p\"))": 32
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"3D\"))": 26
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"Packs\"))": 138
-        # Serien
-        ":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\"))": 59
-        ":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(\"Show\"))": 122
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Doku\"))": 123
-        # Audio
-        ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Videos\"))": 120
-        ":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(\"MP3\"))": 110
-        ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Hörbuch\"))": 63
-        # 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(\"HD\"))": 14
-        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 15
-        # 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(\"Paper\")):has(div.kat_cat_pic_name_b:contains(\"Zeitungen\"))": 96
-        ":has(div.kat_cat_pic_name:contains(\"Paper\")):has(div.kat_cat_pic_name_b:contains(\"E-Book\"))": 136
-        ":has(div.kat_cat_pic_name:contains(\"Paper\")):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(\"HD\"))": 73
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": 75
-        ":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(\"Clips\"))": 124
-        # Internal
-        ":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(\"Film SD\"))": 129
-        ":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(\"Serien SD\"))": 131
-        ":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:
@@ -268,4 +218,4 @@ search:
     minimumseedtime:
       # 2 days (as seconds = 2 x 24 x 60 x 60)
       text: 172800
-# Engine n/a
+# engine n/a

src/Jackett.Common/Definitions/darktracker.yml

@@ -1,800 +0,0 @@
----
-id: darktracker
-name: Dark Tracker
-description: "Dark Tracker is a RUSSIAN Semi-Private Torrent Tracker for 0DAY / GENERAL"
-language: ru-RU
-type: semi-private
-encoding: UTF-8
-links:
-  - https://darkos.club/
-  - https://dark-os.com/
-
-caps:
-  categorymappings:
-    - {id: 511, cat: Movies/HD, desc: "Форум HD Video/RIP"}
-    # 3D
-    - {id: 801, cat: Movies/3D, desc: " | Фильмы в формате 3D"}
-    - {id: 802, cat: Movies/3D, desc: " | Мультфильмы в формате 3D"}
-    - {id: 803, cat: Movies/3D, desc: " | Музыкальные клипы и концерты в формате 3D"}
-    - {id: 800, cat: Movies/3D, desc: "Релизы Blu-ray disc 3D (iso)"}
-    - {id: 815, cat: Movies/3D, desc: " | Фильмы в формате 3D (iso)"}
-    - {id: 814, cat: Movies/3D, desc: " | Мультфильмы в формате 3D (iso)"}
-    - {id: 813, cat: Movies/3D, desc: " | Музыкальные клипы и концерты в формате 3D (iso)"}
-    - {id: 1046, cat: Movies/3D, desc: "Архив"}
-    # Кино, Видео и ТВ
-    # Cinema, Video and TV
-    - {id: 1055, cat: Movies, desc: "Новинки проката"}
-    - {id: 1058, cat: Movies, desc: " | Портал для новинок"}
-    - {id: 1056, cat: Movies/SD, desc: " | Новинки (CamRip|TS)"}
-    - {id: 1057, cat: Movies/WEB-DL, desc: " | Новинки (HD|DVD|BD|WEB|TV|SAT|PDTV|-Rip)"}
-    - {id: 1059, cat: Movies, desc: " | Новинки (BD|HDTV|DVD)"}
-    - {id: 57, cat: Movies, desc: "Зарубежные фильмы"}
-    - {id: 1021, cat: Movies, desc: " | Фильмы 2011-2020"}
-    - {id: 63, cat: Movies, desc: " | Фильмы 2001-2010"}
-    - {id: 60, cat: Movies, desc: " | Фильмы до 2000 года"}
-    - {id: 1114, cat: Movies/HD, desc: " | Зарубежное кино (HD Video)"}
-    - {id: 65, cat: Movies, desc: " | Антология зарубежного кино"}
-    - {id: 515, cat: Movies, desc: " | Зарубежные Фильмы для детей"}
-    - {id: 85, cat: Movies, desc: "Отечественные фильмы"}
-    - {id: 90, cat: Movies, desc: " | Фильмы 2011-2020"}
-    - {id: 89, cat: Movies, desc: " | Фильмы 2001-2010"}
-    - {id: 88, cat: Movies, desc: " | Фильмы до 2000 года"}
-    - {id: 1115, cat: Movies/HD, desc: " | Отечественное кино (HD Video)"}
-    - {id: 516, cat: Movies, desc: " | Отечественные Фильмы для детей"}
-    - {id: 378, cat: TV, desc: "Сериалы"}
-    - {id: 281, cat: TV, desc: " | Отечественные cериалы"}
-    - {id: 277, cat: TV, desc: " | Зарубежные сериалы"}
-    - {id: 377, cat: TV, desc: "Мультфильмы"}
-    - {id: 106, cat: TV, desc: " | Отечественные мультфильмы"}
-    - {id: 108, cat: TV, desc: " | Иностранные мультфильмы"}
-    - {id: 280, cat: TV, desc: " | Мультсериалы"}
-    - {id: 92, cat: TV, desc: "DVD и HD Video"}
-    - {id: 99, cat: Movies, desc: " | Зарубежное кино"}
-    - {id: 97, cat: Movies, desc: " | Наше кино"}
-    - {id: 100, cat: TV, desc: " | Мультфильмы"}
-    - {id: 98, cat: Audio/Video, desc: " | Музыкальные клипы и концерты"}
-    - {id: 95, cat: TV, desc: " | Антология"}
-    - {id: 788, cat: TV/Documentary, desc: "Документальные фильмы и телепередачи"}
-    - {id: 1024, cat: TV/Documentary, desc: " | National Geographic"}
-    - {id: 1023, cat: TV/Documentary, desc: " | Discovery"}
-    - {id: 1022, cat: TV/Documentary, desc: " | Animal Planet"}
-    - {id: 790, cat: TV/Documentary, desc: " | BBC"}
-    - {id: 789, cat: TV/Documentary, desc: " | Среда Обитания"}
-    - {id: 70, cat: TV, desc: "Развлекательные телепередачи, юмор"}
-    - {id: 742, cat: TV, desc: " | Развлекательные телепередачи и шоу, приколы и юмор"}
-    - {id: 475, cat: TV/Anime, desc: "Аниме"}
-    - {id: 485, cat: TV/Anime, desc: " | Правила и FAQ"}
-    - {id: 484, cat: TV/Anime, desc: " | Аниме основной подраздел"}
-    - {id: 477, cat: TV/Anime, desc: " | Dorama и live-action"}
-    - {id: 483, cat: TV/Anime, desc: " | OST"}
-    - {id: 482, cat: TV/Anime, desc: " | Манга"}
-    - {id: 481, cat: TV/Anime, desc: " | Клипы"}
-    - {id: 480, cat: TV/Anime, desc: " | Фэндом"}
-    - {id: 478, cat: TV/Anime, desc: " | Полнометражные"}
-    - {id: 479, cat: TV/Anime, desc: " | Онгоинги"}
-    - {id: 827, cat: Other, desc: "Обучающее видео"}
-    - {id: 456, cat: Other, desc: "Мобильное видео"}
-    - {id: 101, cat: Other, desc: "Дополнительные материалы к фильмам"}
-    - {id: 1017, cat: Other, desc: " | Трейлеры"}
-    - {id: 270, cat: Other, desc: "Архив"}
-    # Игры для PC
-    # PC Games
-    - {id: 25, cat: PC/Games, desc: "Горячие новинки"}
-    - {id: 829, cat: PC/Games, desc: " | Пиратки"}
-    - {id: 707, cat: PC/Games, desc: " | Лицензии"}
-    - {id: 706, cat: PC/Games, desc: " | RePack"}
-    - {id: 708, cat: PC/Games, desc: "Demo/Beta версии Игр"}
-    - {id: 709, cat: PC/Games, desc: "Аркады"}
-    - {id: 711, cat: PC/Games, desc: " | Аркады (разное)"}
-    - {id: 710, cat: PC/Games, desc: " | Настольные и карточные аркады"}
-    - {id: 712, cat: PC/Games, desc: "Приключения и квесты"}
-    - {id: 713, cat: PC/Games, desc: "Стратегии"}
-    - {id: 716, cat: PC/Games, desc: " | TBS (пошаговые стратегии)"}
-    - {id: 715, cat: PC/Games, desc: " | RTS (стратегии в реальном времени)"}
-    - {id: 714, cat: PC/Games, desc: " | Экономические стратегии"}
-    - {id: 717, cat: PC/Games, desc: "Симуляторы"}
-    - {id: 721, cat: PC/Games, desc: " | Спортивные симуляторы"}
-    - {id: 720, cat: PC/Games, desc: " | Космические и Авиа симуляторы"}
-    - {id: 719, cat: PC/Games, desc: " | Гоночные симуляторы"}
-    - {id: 718, cat: PC/Games, desc: " | Прочие симуляторы"}
-    - {id: 722, cat: PC/Games, desc: "Action"}
-    - {id: 724, cat: PC/Games, desc: " | FPS (1st Person)"}
-    - {id: 723, cat: PC/Games, desc: " | TPS (3rd Person)"}
-    - {id: 725, cat: PC/Games, desc: "RPG"}
-    - {id: 726, cat: PC/Games, desc: "Эротические игры"}
-    - {id: 727, cat: PC/Games, desc: "Многопользовательские игры"}
-    - {id: 728, cat: PC/Games, desc: " | MMORPG"}
-    - {id: 729, cat: PC/Games, desc: "Для самых маленьких"}
-    - {id: 793, cat: PC/Games, desc: "Аниме-игры"}
-    - {id: 730, cat: PC/Games, desc: "Старые игры для PC"}
-    - {id: 458, cat: PC/Games, desc: "Игры для Apple"}
-    - {id: 508, cat: PC/Games, desc: "Игры для Linux"}
-    - {id: 731, cat: PC/Games, desc: "Прочее"}
-    - {id: 830, cat: PC/Games, desc: " | Дополнения"}
-    - {id: 737, cat: PC/Games, desc: " | Таблетки"}
-    - {id: 736, cat: PC/Games, desc: " | Моды"}
-    - {id: 735, cat: PC/Games, desc: " | Русификаторы"}
-    - {id: 734, cat: PC/Games, desc: " | Патчи"}
-    - {id: 733, cat: PC/Games, desc: " | Бонусные диски / Комплекты предзаказов"}
-    - {id: 738, cat: PC/Games, desc: "Игровое видео"}
-    - {id: 740, cat: PC/Games, desc: " | Трейлеры/Геймплей видео"}
-    - {id: 739, cat: PC/Games, desc: " | Видео прохождения игр"}
-    - {id: 269, cat: PC/Games, desc: "Архив"}
-    # Консоли
-    # Console
-    - {id: 679, cat: Console/XBox, desc: "XBox"}
-    - {id: 684, cat: Console/XBox, desc: " | XBox360 | Игры"}
-    - {id: 683, cat: Console/XBox, desc: " | XBox360 | Демоверсии"}
-    - {id: 682, cat: Console/XBox, desc: " | Xbox360 | Live"}
-    - {id: 681, cat: Console/XBox, desc: " | XBox360 | Программы / Прошивки"}
-    - {id: 680, cat: Console/XBox, desc: " | XBox | Игры"}
-    - {id: 685, cat: Console/PS3, desc: "PlayStation"}
-    - {id: 694, cat: Console/PS3, desc: " | Playstation 3 | Игры"}
-    - {id: 693, cat: Console/PS3, desc: " | Playstation 3 | PSN Игры"}
-    - {id: 692, cat: Console/PS3, desc: " | Playstation 3 | Разное"}
-    - {id: 691, cat: Console/PS3, desc: " | PlayStation 2 | Игры"}
-    - {id: 690, cat: Console/PS3, desc: " | PlayStation 2 | Разное"}
-    - {id: 689, cat: Console/PS3, desc: " | PlayStation 1 | Игры"}
-    - {id: 688, cat: Console/PSP, desc: " | PSP | Игры"}
-    - {id: 687, cat: Console/PSP, desc: " | PSP | Программы / Прошивки"}
-    - {id: 686, cat: Console/PSP, desc: " | PSX-PSP"}
-    - {id: 695, cat: Console/NDS, desc: "Nintendo"}
-    - {id: 699, cat: Console/NDS, desc: " | Nintendo DS | Игры"}
-    - {id: 698, cat: Console, desc: " | GameCube | Игры"}
-    - {id: 697, cat: Console/Wii, desc: " | Wii | Игры"}
-    - {id: 696, cat: Console, desc: " | Nintendo | Разное"}
-    - {id: 700, cat: Console, desc: "Sega"}
-    - {id: 792, cat: Console, desc: "Архив"}
-    # Музыка
-    # Music
-    - {id: 537, cat: Audio/MP3, desc: "Russian (MP3)"}
-    - {id: 538, cat: Audio/MP3, desc: " | Pop"}
-    - {id: 539, cat: Audio/MP3, desc: " | Rock"}
-    - {id: 540, cat: Audio/MP3, desc: " | Metal"}
-    - {id: 545, cat: Audio/MP3, desc: " | Rap, Hip-Hop, R'n'B"}
-    - {id: 544, cat: Audio/MP3, desc: " | Electronic"}
-    - {id: 543, cat: Audio/MP3, desc: " | Шансон"}
-    - {id: 542, cat: Audio/MP3, desc: " | Авторская песня"}
-    - {id: 541, cat: Audio/MP3, desc: " | Музыка других жанров"}
-    - {id: 546, cat: Audio/MP3, desc: "World Pop (MP3)"}
-    - {id: 547, cat: Audio/MP3, desc: " | World Pop"}
-    - {id: 551, cat: Audio/MP3, desc: " | Latin Pop"}
-    - {id: 550, cat: Audio/MP3, desc: " | Dance"}
-    - {id: 549, cat: Audio/MP3, desc: " | Asian Pop"}
-    - {id: 548, cat: Audio/MP3, desc: " | 50 / 50"}
-    - {id: 552, cat: Audio/MP3, desc: "Rock (MP3)"}
-    - {id: 557, cat: Audio/MP3, desc: " | Rock"}
-    - {id: 556, cat: Audio/MP3, desc: " | Metal"}
-    - {id: 555, cat: Audio/MP3, desc: " | Alternative"}
-    - {id: 554, cat: Audio/MP3, desc: " | Punk Rock"}
-    - {id: 553, cat: Audio/MP3, desc: " | Rock 'n' Rol"}
-    - {id: 558, cat: Audio/MP3, desc: "Hip-Hop (MP3)"}
-    - {id: 561, cat: Audio/MP3, desc: " | Rap"}
-    - {id: 560, cat: Audio/MP3, desc: " | R&B"}
-    - {id: 559, cat: Audio/MP3, desc: " | Funk, Soul"}
-    - {id: 562, cat: Audio/MP3, desc: "Electronic (MP3)"}
-    - {id: 570, cat: Audio/MP3, desc: " | Trance, Goa Trance, Psy-Trance, PsyChill, Ambient Dub"}
-    - {id: 569, cat: Audio/MP3, desc: " | Drum & Bass, Jungle, Breakbeat, Dubstep, IDM"}
-    - {id: 568, cat: Audio/MP3, desc: " | House, Techno/MP3, Hardcore, Hardstyle, Jumpstyle"}
-    - {id: 567, cat: Audio/MP3, desc: " | Lo-Fi, Chillout, Lounge, Downtempo/MP3, Trip-Hop, Nu Jazz"}
-    - {id: 566, cat: Audio/MP3, desc: " | Radioshows, Podcasts, Live Sets, Mixes"}
-    - {id: 565, cat: Audio/MP3, desc: " | Traditional Electronic, Ambient, Experimental"}
-    - {id: 564, cat: Audio/MP3, desc: " | Industrial, Noise, EBM, Dark Electro/MP3, New Wave,..."}
-    - {id: 563, cat: Audio/MP3, desc: " | Newage, Relax"}
-    - {id: 571, cat: Audio/MP3, desc: "Classical (MP3)"}
-    - {id: 574, cat: Audio/MP3, desc: " | Instrumental"}
-    - {id: 573, cat: Audio/MP3, desc: " | Orchestral"}
-    - {id: 572, cat: Audio/MP3, desc: " | Vocal"}
-    - {id: 575, cat: Audio/MP3, desc: "Jazz & Blues & Country (MP3)"}
-    - {id: 577, cat: Audio/MP3, desc: " | Blues"}
-    - {id: 578, cat: Audio/MP3, desc: " | Jazz"}
-    - {id: 579, cat: Audio/MP3, desc: " | Swing"}
-    - {id: 580, cat: Audio/MP3, desc: "Reggae, Latin, Ethnik (MP3)"}
-    - {id: 581, cat: Audio/MP3, desc: " | Reggae"}
-    - {id: 576, cat: Audio/MP3, desc: " | Country"}
-    - {id: 582, cat: Audio/MP3, desc: " | Latin"}
-    - {id: 583, cat: Audio/MP3, desc: " | Ethnic"}
-    - {id: 584, cat: Audio/MP3, desc: "Soundtracks (MP3)"}
-    - {id: 587, cat: Audio/MP3, desc: " | Games"}
-    - {id: 586, cat: Audio/MP3, desc: " | Anime"}
-    - {id: 585, cat: Audio/MP3, desc: " | Movies"}
-    - {id: 588, cat: Audio/MP3, desc: "Discographies (MP3)"}
-    - {id: 598, cat: Audio/MP3, desc: " | Russian Pop"}
-    - {id: 597, cat: Audio/MP3, desc: " | World Pop"}
-    - {id: 596, cat: Audio/MP3, desc: " | Rock"}
-    - {id: 595, cat: Audio/MP3, desc: " | Russian Rock"}
-    - {id: 594, cat: Audio/MP3, desc: " | Russian Metal"}
-    - {id: 593, cat: Audio/MP3, desc: " | Metal"}
-    - {id: 591, cat: Audio/MP3, desc: " | Electronic"}
-    - {id: 592, cat: Audio/MP3, desc: " | Rap, Hip-Hop, R'n'B"}
-    - {id: 590, cat: Audio/MP3, desc: " | World Music from other genres"}
-    - {id: 589, cat: Audio/MP3, desc: " | Музыка других жанров"}
-    - {id: 599, cat: Audio/Lossless, desc: "Russian (LOSSLESS)"}
-    - {id: 607, cat: Audio/Lossless, desc: " | Pop"}
-    - {id: 606, cat: Audio/Lossless, desc: " | Rock"}
-    - {id: 605, cat: Audio/Lossless, desc: " | Metal"}
-    - {id: 604, cat: Audio/Lossless, desc: " | Rap, Hip-Hop, R'n'B"}
-    - {id: 603, cat: Audio/Lossless, desc: " | Electronic"}
-    - {id: 602, cat: Audio/Lossless, desc: " | Шансон"}
-    - {id: 601, cat: Audio/Lossless, desc: " | Авторская песня"}
-    - {id: 600, cat: Audio/Lossless, desc: " | Музыка других жанров"}
-    - {id: 608, cat: Audio/Lossless, desc: "World Pop (LOSSLESS)"}
-    - {id: 613, cat: Audio/Lossless, desc: " | World Pop"}
-    - {id: 612, cat: Audio/Lossless, desc: " | Latin Pop"}
-    - {id: 611, cat: Audio/Lossless, desc: " | Dance"}
-    - {id: 610, cat: Audio/Lossless, desc: " | Asian Pop"}
-    - {id: 609, cat: Audio/Lossless, desc: " | 50 / 50"}
-    - {id: 614, cat: Audio/Lossless, desc: "Rock (LOSSLESS)"}
-    - {id: 619, cat: Audio/Lossless, desc: " | Rock"}
-    - {id: 618, cat: Audio/Lossless, desc: " | Metal"}
-    - {id: 617, cat: Audio/Lossless, desc: " | Alternative"}
-    - {id: 616, cat: Audio/Lossless, desc: " | Punk Rock"}
-    - {id: 615, cat: Audio/Lossless, desc: " | Rock 'n' Rol"}
-    - {id: 620, cat: Audio/Lossless, desc: "Hip-Hop (LOSSLESS)"}
-    - {id: 623, cat: Audio/Lossless, desc: " | Rap"}
-    - {id: 622, cat: Audio/Lossless, desc: " | R&B"}
-    - {id: 621, cat: Audio/Lossless, desc: " | Funk, Soul"}
-    - {id: 624, cat: Audio/Lossless, desc: "Electronic (LOSSLESS)"}
-    - {id: 632, cat: Audio/Lossless, desc: " | Trance, Goa Trance, Psy-Trance, PsyChill, Ambient Dub"}
-    - {id: 631, cat: Audio/Lossless, desc: " | Drum & Bass, Jungle, Breakbeat, Dubstep, IDM"}
-    - {id: 630, cat: Audio/Lossless, desc: " | House, Techno/Lossless, Hardcore, Hardstyle, Jumpstyle"}
-    - {id: 629, cat: Audio/Lossless, desc: " | Lo-Fi, Chillout, Lounge, Downtempo/Lossless, Trip-Hop, Nu Jazz"}
-    - {id: 628, cat: Audio/Lossless, desc: " | Radioshows, Podcasts, Live Sets, Mixes"}
-    - {id: 627, cat: Audio/Lossless, desc: " | Traditional Electronic, Ambient, Experimental"}
-    - {id: 626, cat: Audio/Lossless, desc: " | Industrial, Noise, EBM, Dark Electro/Lossless, Aggrotech,..."}
-    - {id: 625, cat: Audio/Lossless, desc: " | Newage, Relax"}
-    - {id: 633, cat: Audio/Lossless, desc: "Classical (LOSSLESS)"}
-    - {id: 636, cat: Audio/Lossless, desc: " | Instrumental"}
-    - {id: 635, cat: Audio/Lossless, desc: " | Orchestral"}
-    - {id: 634, cat: Audio/Lossless, desc: " | Vocal"}
-    - {id: 637, cat: Audio/Lossless, desc: "Jazz & Blues & Country (LOSSLESS)"}
-    - {id: 641, cat: Audio/Lossless, desc: " | Swing"}
-    - {id: 640, cat: Audio/Lossless, desc: " | Jazz"}
-    - {id: 639, cat: Audio/Lossless, desc: " | Blues"}
-    - {id: 638, cat: Audio/Lossless, desc: " | Country"}
-    - {id: 642, cat: Audio/Lossless, desc: "Reggae, Latin, Ethnik (LOSSLESS)"}
-    - {id: 645, cat: Audio/Lossless, desc: " | Ethnic"}
-    - {id: 644, cat: Audio/Lossless, desc: " | Latin"}
-    - {id: 643, cat: Audio/Lossless, desc: " | Reggae"}
-    - {id: 646, cat: Audio/Lossless, desc: "Soundtracks (LOSSLESS)"}
-    - {id: 649, cat: Audio/Lossless, desc: " | Games"}
-    - {id: 648, cat: Audio/Lossless, desc: " | Anime"}
-    - {id: 647, cat: Audio/Lossless, desc: " | Movies"}
-    - {id: 650, cat: Audio/Lossless, desc: "Discographies (LOSSLESS)"}
-    - {id: 660, cat: Audio/Lossless, desc: " | Russian Pop"}
-    - {id: 659, cat: Audio/Lossless, desc: " | World Pop"}
-    - {id: 658, cat: Audio/Lossless, desc: " | Rock"}
-    - {id: 656, cat: Audio/Lossless, desc: " | Russian Metal"}
-    - {id: 655, cat: Audio/Lossless, desc: " | Metal"}
-    - {id: 657, cat: Audio/Lossless, desc: " | Russian Rock"}
-    - {id: 654, cat: Audio/Lossless, desc: " | Rap, Hip-Hop, R'n'B"}
-    - {id: 653, cat: Audio/Lossless, desc: " | Electronic"}
-    - {id: 652, cat: Audio/Lossless, desc: " | World Music from other genres"}
-    - {id: 651, cat: Audio/Lossless, desc: " | Музыка других жанров"}
-    - {id: 826, cat: Audio/Lossless, desc: "Music from other genres (LOSSLESS)"}
-    - {id: 447, cat: Audio/Lossless, desc: "Multichannel Music"}
-    - {id: 663, cat: Audio, desc: " | DVD-Audio, SACD, Audio-DVD"}
-    - {id: 662, cat: Audio, desc: " | DTS"}
-    - {id: 661, cat: Audio, desc: " | Vinyl-Rip и Hand-Made"}
-    - {id: 449, cat: Audio, desc: " | Зарубежная"}
-    - {id: 448, cat: Audio, desc: " | Отечественная"}
-    - {id: 445, cat: Audio, desc: "Concert Recording & Musical films (Documentary)"}
-    - {id: 674, cat: Audio, desc: " | New Concert Recording"}
-    - {id: 673, cat: Audio, desc: " | Rock"}
-    - {id: 672, cat: Audio, desc: " | Metal"}
-    - {id: 671, cat: Audio, desc: " | World Pop"}
-    - {id: 670, cat: Audio, desc: " | Музыка других жанров"}
-    - {id: 664, cat: Audio/Video, desc: "Clips"}
-    - {id: 669, cat: Audio/Video, desc: " | New Clips"}
-    - {id: 668, cat: Audio/Video, desc: " | Rock"}
-    - {id: 667, cat: Audio/Video, desc: " | Metal"}
-    - {id: 666, cat: Audio/Video, desc: " | World Pop"}
-    - {id: 665, cat: Audio/Video, desc: " | Музыка других жанров"}
-    - {id: 455, cat: Audio, desc: "Apple Lossless"}
-    - {id: 446, cat: Audio, desc: "Karaoke"}
-    - {id: 272, cat: Audio, desc: "Архив"}
-    # Спорт
-    # Sport
-    - {id: 495, cat: TV/Sport, desc: "Футбол"}
-    - {id: 755, cat: TV/Sport, desc: " | Чемпионат России"}
-    - {id: 754, cat: TV/Sport, desc: " | Чемпионат Украины"}
-    - {id: 753, cat: TV/Sport, desc: " | Чемпионат Испании"}
-    - {id: 752, cat: TV/Sport, desc: " | Чемпионат Англии"}
-    - {id: 751, cat: TV/Sport, desc: " | Чемпионат Италии"}
-    - {id: 750, cat: TV/Sport, desc: " | Чемпионат Германии"}
-    - {id: 749, cat: TV/Sport, desc: " | Чемпионат Франции"}
-    - {id: 748, cat: TV/Sport, desc: " | Другие чемпионаты"}
-    - {id: 505, cat: TV/Sport, desc: " | Лига Чемпионов"}
-    - {id: 747, cat: TV/Sport, desc: " | Лига Европы"}
-    - {id: 497, cat: TV/Sport, desc: " | Чемпионат мира"}
-    - {id: 498, cat: TV/Sport, desc: " | Чемпионат Европы"}
-    - {id: 496, cat: TV/Sport, desc: " | Международные матчи"}
-    - {id: 513, cat: TV/Sport, desc: " | Товарищеские матчи"}
-    - {id: 746, cat: TV/Sport, desc: " | Пляжный футбол"}
-    - {id: 745, cat: TV/Sport, desc: " | Мини-футбол"}
-    - {id: 499, cat: TV/Sport, desc: " | Обзорные и аналитические передачи"}
-    - {id: 744, cat: TV/Sport, desc: " | Футбольное видео, прочее о футболе"}
-    - {id: 500, cat: TV/Sport, desc: "Хоккей"}
-    - {id: 760, cat: TV/Sport, desc: " | КХЛ"}
-    - {id: 759, cat: TV/Sport, desc: " | NHL"}
-    - {id: 758, cat: TV/Sport, desc: " | Европейские клубные чемпионаты"}
-    - {id: 757, cat: TV/Sport, desc: " | Чемпионат Мира"}
-    - {id: 756, cat: TV/Sport, desc: " | Международные турниры"}
-    - {id: 501, cat: TV/Sport, desc: "Баскетбол"}
-    - {id: 763, cat: TV/Sport, desc: " | NBA"}
-    - {id: 762, cat: TV/Sport, desc: " | Европейский клубный баскетбол"}
-    - {id: 761, cat: TV/Sport, desc: " | Международные турниры"}
-    - {id: 502, cat: TV/Sport, desc: "Теннис"}
-    - {id: 768, cat: TV/Sport, desc: " | ATP World Tour"}
-    - {id: 767, cat: TV/Sport, desc: " | WTA Tour"}
-    - {id: 766, cat: TV/Sport, desc: " | ATP World Tour Masters 1000"}
-    - {id: 765, cat: TV/Sport, desc: " | Grand Slam tournaments"}
-    - {id: 764, cat: TV/Sport, desc: " | Team"}
-    - {id: 503, cat: TV/Sport, desc: "Авто и мото спорт"}
-    - {id: 769, cat: TV/Sport, desc: "Боевые единоборства"}
-    - {id: 773, cat: TV/Sport, desc: " | Бокс"}
-    - {id: 772, cat: TV/Sport, desc: " | Рестлинг"}
-    - {id: 771, cat: TV/Sport, desc: " | Ultimate Fighting Championship"}
-    - {id: 770, cat: TV/Sport, desc: " | Mixed Martial Arts"}
-    - {id: 504, cat: TV/Sport, desc: "Другие виды спорта"}
-    - {id: 786, cat: TV/Sport, desc: " | Биатлон"}
-    - {id: 785, cat: TV/Sport, desc: " | Волейбол"}
-    - {id: 784, cat: TV/Sport, desc: " | Гандбол"}
-    - {id: 783, cat: TV/Sport, desc: " | Бильярд"}
-    - {id: 782, cat: TV/Sport, desc: " | Бейсбол"}
-    - {id: 781, cat: TV/Sport, desc: " | Американский футбол"}
-    - {id: 780, cat: TV/Sport, desc: " | Покер"}
-    - {id: 779, cat: TV/Sport, desc: " | Легкая атлетика"}
-    - {id: 778, cat: TV/Sport, desc: " | Тяжелая атлетика"}
-    - {id: 777, cat: TV/Sport, desc: " | Велоспорт"}
-    - {id: 776, cat: TV/Sport, desc: " | Гимнастика"}
-    - {id: 775, cat: TV/Sport, desc: " | Летние виды спорта"}
-    - {id: 774, cat: TV/Sport, desc: " | Зимние виды спорта"}
-    - {id: 787, cat: TV/Sport, desc: "Архив"}
-    # Аудиокниги
-    # Audiobooks
-    - {id: 942, cat: Audio/Audiobook, desc: "Произведения отечественных авторов"}
-    - {id: 943, cat: Audio/Audiobook, desc: " | Фантастика, фэнтези, ужасы, мистика"}
-    - {id: 944, cat: Audio/Audiobook, desc: " | Приключения, детектив, боевик, триллер"}
-    - {id: 945, cat: Audio/Audiobook, desc: " | Художественная литература"}
-    - {id: 947, cat: Audio/Audiobook, desc: " | Современная проза, классика, поэзия"}
-    - {id: 946, cat: Audio/Audiobook, desc: " | Историческая литература"}
-    - {id: 949, cat: Audio/Audiobook, desc: " | Книги для IPhone, IPod, Apple"}
-    - {id: 951, cat: Audio/Audiobook, desc: " | Детская литература"}
-    - {id: 952, cat: Audio/Audiobook, desc: " | Сатира, Юмор"}
-    - {id: 955, cat: Audio/Audiobook, desc: "Произведения зарубежных авторов"}
-    - {id: 967, cat: Audio/Audiobook, desc: " | Фантастика, фэнтези, ужасы, мистика"}
-    - {id: 966, cat: Audio/Audiobook, desc: " | Приключения, детектив, боевик, триллер"}
-    - {id: 965, cat: Audio/Audiobook, desc: " | Художественная литература"}
-    - {id: 962, cat: Audio/Audiobook, desc: " | Современная проза, классика, поэзия"}
-    - {id: 963, cat: Audio/Audiobook, desc: " | Историческая литература"}
-    - {id: 960, cat: Audio/Audiobook, desc: " | Книги для IPhone, IPod, Apple"}
-    - {id: 959, cat: Audio/Audiobook, desc: " | Детская литература"}
-    - {id: 958, cat: Audio/Audiobook, desc: " | Сатира, Юмор"}
-    - {id: 968, cat: Audio/Audiobook, desc: "Прочая литература"}
-    - {id: 1025, cat: Audio/Audiobook, desc: " | Аудиоспектакли и литературные чтения"}
-    - {id: 1026, cat: Audio/Audiobook, desc: " | ЖЗЛ, мемуары, биографии"}
-    - {id: 1089, cat: Audio/Audiobook, desc: " | Для детей, родителей и учителей"}
-    - {id: 1019, cat: Audio/Audiobook, desc: " | Разножанровые, многоавторские сборники"}
-    - {id: 970, cat: Audio/Audiobook, desc: " | Обучающая и научно-популярная литература"}
-    - {id: 971, cat: Audio/Audiobook, desc: " | Аудиокниги на иностранных языках"}
-    - {id: 972, cat: Audio/Audiobook, desc: " | Психология, Тренинг, Саморазвитие"}
-    - {id: 973, cat: Audio/Audiobook, desc: " | Философия и религия"}
-    - {id: 969, cat: Audio/Audiobook, desc: " | Разное"}
-    - {id: 1047, cat: Audio/Audiobook, desc: "Архив"}
-    # Книги и журналы
-    # Books and Magazines
-    - {id: 336, cat: Books, desc: "Книги отечественных авторов"}
-    - {id: 341, cat: Books, desc: " | Фантастика, фэнтези, ужасы, мистика"}
-    - {id: 974, cat: Books, desc: " | Приключения, детектив, боевик, триллер"}
-    - {id: 975, cat: Books, desc: " | Художественная литература"}
-    - {id: 976, cat: Books, desc: " | Историческая литература"}
-    - {id: 977, cat: Books, desc: " | Современная проза, классика, поэзия"}
-    - {id: 979, cat: Books, desc: " | Детская литература"}
-    - {id: 980, cat: Books, desc: " | Сатира, Юмор"}
-    - {id: 982, cat: Books, desc: "Книги зарубежных авторов"}
-    - {id: 991, cat: Books, desc: " | Фантастика, фэнтези, ужасы, мистика"}
-    - {id: 990, cat: Books, desc: " | Приключения, детектив, боевик, триллер"}
-    - {id: 989, cat: Books, desc: " | Художественная литература"}
-    - {id: 988, cat: Books, desc: " | Историческая литература"}
-    - {id: 987, cat: Books, desc: " | Современная проза, классика, поэзия"}
-    - {id: 986, cat: Books, desc: " | Детская литература"}
-    - {id: 985, cat: Books, desc: " | Сатира, Юмор"}
-    - {id: 992, cat: Books, desc: "Прочая литература"}
-    - {id: 1028, cat: Books, desc: " | ЖЗЛ. Биографии. Мемуары. Историография."}
-    - {id: 1004, cat: Books, desc: " | Философия, Религия, Эзотерика"}
-    - {id: 1050, cat: Books, desc: " | Публицистика, Социология и Политология"}
-    - {id: 1005, cat: Books, desc: " | Художественная литература на ин языках"}
-    - {id: 1018, cat: Books, desc: " | Для детей, родителей и учителей"}
-    - {id: 1003, cat: Books, desc: " | Психология, Тренинг, Саморазвитие"}
-    - {id: 1002, cat: Books, desc: " | Техническая и научно-популярная литература"}
-    - {id: 1001, cat: Books, desc: " | Строительство, Дизайн и Ремонт"}
-    - {id: 1067, cat: Books, desc: " | Домоводство, Сад, Огород, Хобби"}
-    - {id: 1000, cat: Books, desc: " | Кулинария"}
-    - {id: 999, cat: Books, desc: " | Медицина и Здоровье"}
-    - {id: 998, cat: Books, desc: " | Бизнес, Право, Экономика, Финансы"}
-    - {id: 997, cat: Books, desc: " | Разножанровые коллекции книг и библиотеки"}
-    - {id: 996, cat: Books, desc: " | Компьютерная литература"}
-    - {id: 1094, cat: Books, desc: " | Компьютерная литература на иностранных языках"}
-    - {id: 995, cat: Books, desc: " | Справочники, энциклопедии и словари"}
-    - {id: 1090, cat: Books, desc: " | Обучающая и развивающая литература, учебники"}
-    - {id: 994, cat: Books, desc: " | Разное"}
-    - {id: 292, cat: Books, desc: "Журналы"}
-    - {id: 1015, cat: Books, desc: " | Мужские"}
-    - {id: 1014, cat: Books, desc: " | Женские (мода, шитьё)"}
-    - {id: 1068, cat: Books, desc: " | Кулинария"}
-    - {id: 1013, cat: Books, desc: " | Игровые и Компьютерные журналы"}
-    - {id: 1012, cat: Books, desc: " | Мультимедийные приложения"}
-    - {id: 1011, cat: Books, desc: " | Научно-популярные, техника, авто"}
-    - {id: 1101, cat: Books, desc: " | Журналы по электротехнике и радиоэлектронике"}
-    - {id: 1010, cat: Books, desc: " | Домоводство, Хобби, Бизнес"}
-    - {id: 1091, cat: Books, desc: " | Строительство, Дизайн и Ремонт"}
-    - {id: 464, cat: Books, desc: " | Комиксы, Графика, Wallpapers, Арт"}
-    - {id: 1008, cat: Books, desc: " | Подшивки журналов и газет"}
-    - {id: 1016, cat: Books, desc: " | Журналы и газеты (общий раздел)"}
-    - {id: 1093, cat: Books, desc: " | Журналы и газеты на иностранных языках"}
-    - {id: 295, cat: Books, desc: "Книги и журналы для самых маленьких и их родителей"}
-    - {id: 468, cat: Books, desc: "Архив"}
-    # Операционные системы и программное обеспечение
-    # Software
-    - {id: 834, cat: PC/0day, desc: "Операционные системы от Microsoft"}
-    - {id: 844, cat: PC/0day, desc: " | Оригинальные образы восстановления ОС ноутбуков (нетбуков)"}
-    - {id: 1116, cat: PC/0day, desc: " | Windows 11 (оригинальные образы)"}
-    - {id: 1083, cat: PC/0day, desc: " | Windows 10 (оригинальные образы)"}
-    - {id: 1084, cat: PC/0day, desc: " | Windows 8 / 8.1 (оригинальные образы)"}
-    - {id: 1085, cat: PC/0day, desc: " | Windows 7 (оригинальные образы)"}
-    - {id: 1086, cat: PC/0day, desc: " | Windows Vista (оригинальные образы)"}
-    - {id: 1087, cat: PC/0day, desc: " | Windows XP (оригинальные образы)"}
-    - {id: 1088, cat: PC/0day, desc: " | Windows OS, выпущенные до 2001 года (оригинальные образы)"}
-    - {id: 1117, cat: PC/0day, desc: " | Сборки Windows 11"}
-    - {id: 1035, cat: PC/0day, desc: " | Сборки Windows 10"}
-    - {id: 843, cat: PC/0day, desc: " | Сборки Windows 8 / 8.1"}
-    - {id: 842, cat: PC/0day, desc: " | Сборки Windows 7"}
-    - {id: 841, cat: PC/0day, desc: " | Сборки Windows Vista"}
-    - {id: 840, cat: PC/0day, desc: " | Сборки Windows XP"}
-    - {id: 1051, cat: PC/0day, desc: " | Сборки Windows - "все в одном""}
-    - {id: 839, cat: PC/0day, desc: " | Серверные ОС"}
-    - {id: 838, cat: PC/0day, desc: " | Патчи, RC, Beta, Service Packs и дополнения для ОС от..."}
-    - {id: 837, cat: PC/0day, desc: " | Изменение интерфейса"}
-    - {id: 1096, cat: PC/0day, desc: " | Обои и Скринсейверы"}
-    - {id: 836, cat: PC/0day, desc: " | Разное (Windows)"}
-    - {id: 1029, cat: PC/0day, desc: " | Активация ОС Windows и ПО Microsoft"}
-    - {id: 1071, cat: PC/0day, desc: " | Архив"}
-    - {id: 845, cat: PC/Mac, desc: "Операционные системы и ПО для Apple Macintosh"}
-    - {id: 852, cat: PC/Mac, desc: " | Mac OS"}
-    - {id: 851, cat: PC/Mac, desc: " | Mac OS (для РС-Хакинтош)"}
-    - {id: 850, cat: PC/Mac, desc: " | Системные программы для Mac OS"}
-    - {id: 849, cat: PC/Mac, desc: " | Программы для просмотра и обработки видео"}
-    - {id: 848, cat: PC/Mac, desc: " | Mac OS Программы для просмотра и обработки графики"}
-    - {id: 847, cat: PC/Mac, desc: " | Mac OS Аудио редакторы и конверторы для Mac OS"}
-    - {id: 846, cat: PC/Mac, desc: " | Другие программы для Mac OS"}
-    - {id: 1072, cat: PC/Mac, desc: " | Архив"}
-    - {id: 853, cat: PC, desc: "Операционные системы и ПО для Linux, Unix и других ОС"}
-    - {id: 856, cat: PC, desc: " | Операционные системы"}
-    - {id: 855, cat: PC, desc: " | Программное обеспечение"}
-    - {id: 854, cat: PC, desc: " | Разное"}
-    - {id: 1073, cat: PC, desc: " | Архив"}
-    - {id: 857, cat: PC, desc: "Веб-разработка и Программирование"}
-    - {id: 864, cat: PC, desc: " | Среды программирования, компиляторы и вспомогател..."}
-    - {id: 863, cat: PC, desc: " | Компоненты для сред программирования"}
-    - {id: 862, cat: PC, desc: " | Системы управления базами данных"}
-    - {id: 861, cat: PC, desc: " | Текстовые редакторы"}
-    - {id: 860, cat: PC, desc: " | Скрипты и шаблоны"}
-    - {id: 859, cat: PC, desc: " | Веб-разработка"}
-    - {id: 858, cat: PC, desc: " | Разное"}
-    - {id: 1074, cat: PC, desc: " | Архив"}
-    - {id: 865, cat: PC, desc: "Системные программы"}
-    - {id: 918, cat: PC, desc: " | Live /PE/ Boot CD (DVD, USB)"}
-    - {id: 875, cat: PC, desc: " | Настройка и оптимизация ОС (software)"}
-    - {id: 874, cat: PC, desc: " | Резервное копирование и восстановление данных"}
-    - {id: 1092, cat: PC, desc: " | Архиваторы и файловые менеджеры"}
-    - {id: 873, cat: PC, desc: " | Диагностика и обслуживание (hardware)"}
-    - {id: 872, cat: PC, desc: " | Сборники программ"}
-    - {id: 871, cat: PC, desc: " | Работа с носителями информации (SSD, HDD, USB, DVD, CD)"}
-    - {id: 1098, cat: PC, desc: " | Программы для работы с ПК со смартфонами (планшетами) н..."}
-    - {id: 870, cat: PC, desc: " | Программы для интернет и сетей"}
-    - {id: 869, cat: PC, desc: " | Безопасность"}
-    - {id: 868, cat: PC, desc: " | Серверное ПО"}
-    - {id: 867, cat: PC, desc: " | Драйверы"}
-    - {id: 866, cat: PC, desc: " | Разное"}
-    - {id: 1075, cat: PC, desc: " | Архив"}
-    - {id: 876, cat: PC, desc: "Системы для бизнеса, офиса, научной и проектной работы"}
-    - {id: 884, cat: PC, desc: " | Офисные системы"}
-    - {id: 1102, cat: PC, desc: " | Дополнения (надстройки и т.д.) для офисных систем"}
-    - {id: 4, cat: PC, desc: " | Системы для бизнеса"}
-    - {id: 881, cat: PC, desc: " | Системы для научной работы"}
-    - {id: 892, cat: PC, desc: " | Программы для архитекторов и дизайнеров интерьеров"}
-    - {id: 889, cat: PC, desc: " | Программы для верстки, сканирования, печати и работы ..."}
-    - {id: 890, cat: PC, desc: " | Работа с PDF и DjVu"}
-    - {id: 882, cat: PC, desc: " | Медицинский софт"}
-    - {id: 879, cat: PC, desc: " | Софт для специалистов"}
-    - {id: 880, cat: PC, desc: " | Словари, переводчики"}
-    - {id: 878, cat: PC, desc: " | САПР"}
-    - {id: 877, cat: PC, desc: " | Разное"}
-    - {id: 1077, cat: PC, desc: " | Архив"}
-    - {id: 913, cat: PC, desc: "Справочно-правовые системы"}
-    - {id: 917, cat: PC, desc: " | Консультант Плюс"}
-    - {id: 1070, cat: PC, desc: " | КонсультантБухгалтер: Версия Проф"}
-    - {id: 1036, cat: PC, desc: " | Архив Консультант Плюс"}
-    - {id: 916, cat: PC, desc: " | Другие справочно-правовые системы"}
-    - {id: 914, cat: PC, desc: " | Справочные системы"}
-    - {id: 915, cat: PC, desc: " | Общий архив раздела "Справочно-правовые системы""}
-    - {id: 908, cat: PC, desc: "Системы навигации и карты, ГИС"}
-    - {id: 1107, cat: PC/Mobile-iOS, desc: " | iOS"}
-    - {id: 1106, cat: PC/Mobile-Android, desc: " | Android"}
-    - {id: 1105, cat: PC, desc: " | Garmin"}
-    - {id: 1104, cat: PC/0day, desc: " | Windows XP/Vista/7/8/8.1/10"}
-    - {id: 1103, cat: PC/0day, desc: " | Windows CE"}
-    - {id: 1108, cat: PC, desc: " | Разное (Системы навигации и карты, ГИС)"}
-    - {id: 1097, cat: PC, desc: " | Архив (Системы навигации и карты, ГИС)"}
-    - {id: 885, cat: PC, desc: "Программы для работы с мультимедиа и 3D"}
-    - {id: 896, cat: PC, desc: " | 3D моделирование, рендеринг и плагины для них"}
-    - {id: 895, cat: PC, desc: " | Анимация"}
-    - {id: 894, cat: PC, desc: " | Аудио, видео  конвертеры"}
-    - {id: 893, cat: PC, desc: " | Редакторы и конвертеры графики"}
-    - {id: 891, cat: PC, desc: " | Работа со звуком, Редакторы видео"}
-    - {id: 888, cat: PC, desc: " | Аудио и видео  плееры, рекордеры и кодеки"}
-    - {id: 887, cat: PC, desc: " | Каталогизаторы и просмотр графики"}
-    - {id: 886, cat: PC, desc: " | Разное"}
-    - {id: 1076, cat: PC, desc: " | Архив"}
-    - {id: 897, cat: PC, desc: "Материалы для мультимедиа и дизайна"}
-    - {id: 907, cat: PC, desc: " | Текстуры, материалы и проекты"}
-    - {id: 906, cat: PC, desc: " | 3D модели и сцены Photostoсks"}
-    - {id: 905, cat: PC, desc: " | Заготовки, виньетки, костюмы, шаблоны и рамки"}
-    - {id: 904, cat: PC, desc: " | Стили, кисти, формы и узоры"}
-    - {id: 903, cat: PC, desc: " | Футажи"}
-    - {id: 902, cat: PC, desc: " | Шрифты"}
-    - {id: 901, cat: PC, desc: " | Библиотеки сэмплов и Звуковые эффекты"}
-    - {id: 900, cat: PC, desc: " | Векторные клипарты"}
-    - {id: 899, cat: PC, desc: " | Растровые клипарты"}
-    - {id: 898, cat: PC, desc: " | Разное"}
-    - {id: 1078, cat: PC, desc: " | Архив"}
-    - {id: 909, cat: PC, desc: "Разное"}
-    # Смартфоны и Планшеты
-    # mobiles
-    - {id: 921, cat: PC/Mobile-Other, desc: "Windows Phone 7"}
-    - {id: 936, cat: PC/Mobile-Other, desc: " | Прошивки"}
-    - {id: 935, cat: PC/Mobile-Other, desc: " | Игры"}
-    - {id: 934, cat: PC/Mobile-Other, desc: " | Программы"}
-    - {id: 1079, cat: PC/Mobile-Other, desc: " | Архив"}
-    - {id: 922, cat: PC/Mobile-Other, desc: "Windows Mobile 5.x - 6.x"}
-    - {id: 927, cat: PC/Mobile-Other, desc: " | Прошивки"}
-    - {id: 926, cat: PC/Mobile-Other, desc: " | Игры"}
-    - {id: 925, cat: PC/Mobile-Other, desc: " | Программы"}
-    - {id: 1080, cat: PC/Mobile-Other, desc: " | Архив"}
-    - {id: 923, cat: PC/Mobile-Android, desc: "Android"}
-    - {id: 930, cat: PC/Mobile-Android, desc: " | Игры"}
-    - {id: 929, cat: PC/Mobile-Android, desc: " | Программы"}
-    - {id: 928, cat: PC/Mobile-Android, desc: " | Прошивки"}
-    - {id: 1081, cat: PC/Mobile-Android, desc: " | Архив"}
-    - {id: 924, cat: PC/Mobile-Other, desc: "Symbian"}
-    - {id: 933, cat: PC/Mobile-Other, desc: " | Игры"}
-    - {id: 932, cat: PC/Mobile-Other, desc: " | Программы"}
-    - {id: 931, cat: PC/Mobile-Other, desc: " | Прошивки"}
-    - {id: 1082, cat: PC/Mobile-Other, desc: " | Архив"}
-    - {id: 1048, cat: PC/Mobile-Other, desc: "Архив"}
-    # Авто и Мото
-    # Auto and Bikes
-    - {id: 1095, cat: TV/Sport, desc: "Книги по ремонту/обслуживанию/эксплуатации ТС"}
-    - {id: 1110, cat: TV/Sport, desc: "Программы для прошивки и диагностики авто, прошивки"}
-    - {id: 1111, cat: TV/Sport, desc: "Мото техника"}
-    - {id: 1112, cat: TV/Sport, desc: "Водный транспорт"}
-    - {id: 1113, cat: TV/Sport, desc: "Видео по ремонту и тюнингу ТС"}
-    # Песочница
-    # sandbox
-    - {id: 507, cat: Other, desc: "Песочница"}
-    # Pron
-    # xxx
-    - {id: 1037, cat: XXX, desc: "Русское порно"}
-    - {id: 1038, cat: XXX, desc: " | Фильмы"}
-    - {id: 1039, cat: XXX, desc: " | Ролики, сайт рипы"}
-    - {id: 1040, cat: XXX, desc: " | Любительское видео"}
-    - {id: 368, cat: XXX, desc: "Зарубежное порно"}
-    - {id: 1062, cat: XXX, desc: " | Фильмы 2020 года"}
-    - {id: 1061, cat: XXX, desc: " | Фильмы 2001-2019 года"}
-    - {id: 1043, cat: XXX, desc: " | Фильмы до 2000 года"}
-    - {id: 1042, cat: XXX, desc: " | Зарубежные фильмы с переводом"}
-    - {id: 1069, cat: XXX, desc: " | Порно Пародии"}
-    - {id: 1065, cat: XXX, desc: " | Нетрадиционное порно"}
-    - {id: 821, cat: XXX, desc: " | Ролики, сайт рипы"}
-    - {id: 1041, cat: XXX, desc: " | Японское порно без цензуры"}
-    - {id: 820, cat: XXX, desc: " | Мульты"}
-    - {id: 819, cat: XXX, desc: " | Фото"}
-    - {id: 818, cat: XXX, desc: " | Разное"}
-    - {id: 816, cat: XXX, desc: "3D Pron"}
-    - {id: 825, cat: XXX, desc: " | Фильмы"}
-    - {id: 824, cat: XXX, desc: " | Ролики, сайт рипы"}
-    - {id: 823, cat: XXX, desc: " | Мульты"}
-    - {id: 822, cat: XXX, desc: " | Разное"}
-    - {id: 271, cat: XXX, 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: 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 }}"
-    redirect: /
-    autologin: 1
-  error:
-    - selector: table.error
-  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
-    prev_tor_type: 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
-    # group releases -1=not selected
-    srg: -1
-    nm: "{{ .Keywords }}"
-    # find a username
-    pn: ""
-    # search by partial word
-    allw: 0
-
-  rows:
-    selector: tr[id^="tor_"]:has(a[href^="./download.php?id="])
-
-  fields:
-    category:
-      selector: a[href^="viewforum.php?f="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: f
-    descr_cat:
-      selector: a[href^="viewforum.php?f="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: f
-    description:
-      selector: a[href^="viewforum.php?f="]
-      filters:
-        - name: prepend
-          args: "cat={{ .Result.descr_cat }} "
-    title:
-      selector: a[href^="viewtopic.php?t="]
-      filters:
-        # hell no, i'm not unravelling this pile of spaghetti. Someone else can spend their life sorting this mess out.
-        # Stand Up (16.​02.​2020) WEB-​DLRip (сезон 7, выпуск 13)
-        # Прощаться не будем (2018) WEBDL [H.​264/​1080p-​LQ] (серии 1-​4 из 4) [Расширенная версия]
-        # Поцелуй Сократа (2011) WEBDL (сезон 1, серии 1-​12 из 12)
-        # Барри /​ Barry (2018-​2019) WEB-​DLRip (сезон 1-​2, серии 1-​16 из 16) Amedia
-        # 	Стрела /​ Arrow /​ Сезон: 8 /​ Серии: 1-​10 из 10 (Дэвид Баррет, Дэвид Наттер) [2019, фантастика, боевик, драма, детектив, приключения, WEB-​DLRip] [MVO] [LostFilm]
-        # Викинги /​ Vikings /​ 6 сезон /​ 1-​10 из 20 /​ (Стив Сэйнт Лигер) [2019, боевик, драма, мелодрама, военный, история, WEB-​DLRip] [MVO] [AlexFilm]
-        # Рикошет (Денис Карышев, Вячеслав Кириллов) (16 серий из 16) [2019/​2020, боевик, WEBDL, HDTV] 50%DL
-        # to show but a few variations!
-        # normalize to SXXEYY format
-        - name: re_replace
-          args: ["[\\,\\:\\-\\/\\|\\[\\]–]", " "]
-#          - name: re_replace
-#            args: ["[\\.\\,\\:\\-\\/\\|\\[\\]\\(\\)–]", " "]
-#          - name: re_replace
-#            args: ["(.*)[CСcс]езон\\s*(\\d+)\\s*[CСcс]ери[ияй]\\s*(\\d+)\\s*(\\d+)\\s*из\\s*\\d+(.*)", "$1 S$2E$3-$4 rus $5"]
-#          - name: re_replace
-#            args: ["(.*)[CСcс]езон\\s*(\\d+)\\s*(\\d+)\\s*(\\d+)\\s*[CСcс]ери[ияй]\\s*из\\s*\\d+(.*)", "$1 S$2E$3-$4 rus $5"]
-#          - name: re_replace
-#            args: ["(.*)(\\d+)\\s*[CСcс]езон\\s*(\\d+)\\s*(\\d+)\\s*[CСcс]ери[ияй]\\s*из\\s*\\d+(.*)", "$1 S$2E$3-$4 rus $5"]
-#          - name: re_replace
-#            args: ["(.*)[CСcс]езон\\s*(\\d+)\\s*[CСcс]ери[ияй]\\s*(\\d+)\\s*(\\d+)\\s*(.*)", "$1 S$2E$3-$4 rus $5"]
-#          - name: re_replace
-#            args: ["(.*)[CСcс]езон\\s*(\\d+)\\s*[CСcс]ери[ияй]\\s*(\\d+)\\s*из\\s*\\d+(.*)", "$1 S$2E$3 rus $4"]
-#          - name: re_replace
-#            args: ["(.*)[CСcс]езон\\s*(\\d+)(.*)", "$1 S$2 rus $3"]
-#          - name: re_replace
-#            args: ["(.*)[CСcс]]ери[ия]\\s*(\\d+)(.*)", "$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"]
-    details:
-      selector: a[href^="viewtopic.php?t="]
-      attribute: href
-    download:
-      selector: a[href^="./download.php?id="]
-      attribute: href
-    magnet:
-      selector: a[href^="magnet:?xt="]
-      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
-        img[src="images/tor_silver.gif"]: 0.5
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-# TorrentPier II

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

@@ -75,10 +75,10 @@ search:
     - 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 }}"
       response:
         type: json
-        attribute: attributes
 
   rows:
     selector: data
+    attribute: attributes
     count:
       selector: meta.total
 
@@ -96,8 +96,6 @@ search:
       filters:
         - name: replace
           args: ["https://via.placeholder.com/90x135", ""]
-        - name: replace
-          args: ["https://via.placeholder.com/400x600", ""]
     imdbid:
       selector: imdb_id
     tmdbid:

src/Jackett.Common/Definitions/demonoid.yml

@@ -11,13 +11,10 @@ links:
   - https://www.dnoid.to/
   - https://www.dnoid.pw/
   - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.ly/
-  - https://demonoid.unblockit.how/
+  - https://demonoid.unblockit.llc/
   - https://demonoid.torrentbay.to/
-  - https://demonoid.nocensor.biz/
+  - https://demonoid.nocensor.sbs/
 legacylinks:
-  - https://demonoid.unblockit.id/
-  - https://demonoid.unblockit.win/
-  - https://demonoid.unblockit.top/
   - https://demonoid.unblockit.lat/
   - https://demonoid.unblockit.app/
   - https://demonoid.unblockit.dev/
@@ -35,13 +32,17 @@ legacylinks:
   - https://demonoid.unblockit.kim/
   - https://demonoid.unblockit.bz/
   - https://demonoid.unblockit.tv/
+  - https://demonoid.unblockit.how/
+  - https://demonoid.unblockit.cam/
+  - https://demonoid.nocensor.biz/
+  - https://demonoid.unblockit.day/
 
 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 +148,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 +156,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

@@ -67,7 +67,6 @@ search:
     - 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 }}"
       response:
         type: json
-        attribute: attributes
 
   keywordsfilters:
     - name: re_replace
@@ -75,6 +74,7 @@ search:
 
   rows:
     selector: data
+    attribute: attributes
     count:
       selector: meta.total
 
@@ -92,8 +92,6 @@ search:
       filters:
         - name: replace
           args: ["https://via.placeholder.com/90x135", ""]
-        - name: replace
-          args: ["https://via.placeholder.com/400x600", ""]
     imdbid:
       selector: imdb_id
     tmdbid:

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

@@ -15,6 +15,7 @@ caps:
     - {id: 64, cat: Books/EBook, desc: "Books"}
     - {id: 66, cat: Books, desc: "Business"}
     - {id: 68, cat: Books/Comics, desc: "Comics"}
+    - {id: 80, cat: Books, desc: "Coooking"}
     - {id: 59, cat: TV/Documentary, desc: "Docs/Movies"}
     - {id: 60, cat: TV/Documentary, desc: "Docs/TV"}
     - {id: 79, cat: TV, desc: "Educational"}

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
+# engine n/a

src/Jackett.Common/Definitions/dreamtracker.yml

@@ -0,0 +1,214 @@
+---
+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: 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

@@ -44,13 +44,16 @@ caps:
     book-search: [q]
 
 settings:
-  - name: cookie
+  - name: username
     type: text
-    label: Cookie
-  - name: info_cookie
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: flaresolverr
     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: FlareSolverr
+    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
@@ -64,9 +67,15 @@ settings:
     default: This site requires you to leave a Thank You comment before you can download. Enter your personalised comment above.
 
 login:
-  method: cookie
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
   inputs:
-    cookie: "{{ .Config.cookie }}"
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    returnto: "/"
+  error:
+    - selector: td.embedded:contains("fout")
   test:
     path: /
     selector: a[href="logout.php"]

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

@@ -6,8 +6,8 @@ language: es-ES
 type: public
 encoding: UTF-8
 links:
-  - https://elitetorrent.app/
-  - https://elitetorrent.nocensor.biz/
+  - https://www.elitetorrent.dev/
+  - https://elitetorrent.nocensor.sbs/
 legacylinks:
   - https://www.elitetorrent.biz/
   - https://www.elitetorrent.io/
@@ -27,6 +27,10 @@ legacylinks:
   - https://elitetorrent.si/
   - https://elitetorrent.nocensor.work/
   - https://elitetorrent.com/
+  - https://elitetorrent.app/
+  - https://elitetorrent.nocensor.biz/
+  - https://elitetorrent.la/
+  - https://www.elitetorrent.wtf/
 
 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/eniahd.yml

@@ -6,9 +6,9 @@ language: ru-RU
 type: semi-private
 encoding: UTF-8
 links:
-  - https://eniatv.com/
-legacylinks:
   - https://eniahd.com/
+legacylinks:
+  - https://eniatv.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/ettv.yml

@@ -1,181 +0,0 @@
----
-id: ettv
-name: ETTV
-description: "ETTV is a Public torrent site for TV / MOVIES, home of the  ETTV, ETHD and DTOne groups."
-language: en-US
-type: public
-encoding: UTF-8
-followredirect: true
-links:
-  - https://www.ettvcentral.com/
-  - https://ettv.unblockninja.com/
-  - https://ettv.unblockit.how/
-  - https://ettv.nocensor.biz/
-legacylinks:
-  - https://www.ettv.tv/
-  - https://www.ettv.to/
-  - https://www.ettvdl.com/
-  - https://www.ettv.be/
-  - https://ettv.unblockit.dev/
-  - https://ettv.unblockit.ltd/
-  - https://ettv.unblockit.link/
-  - https://ettv.unblockit.buzz/
-  - https://ettv.unblocked.monster/
-  - https://ettv.unblockit.club/
-  - https://ettv.unblockit.onl/
-  - https://ettv.unblockit.li/
-  - https://ettv.unblockit.uno/
-  - https://ettv.unblockit.ch/
-  - https://ettv.nocensor.space/
-  - https://ettv.unblockit.ws/
-  - https://ettv.nocensor.work/
-  - https://ettv.unblockit.kim/
-  - https://ettv.unblockit.bz/
-  - https://ettv.unblockit.tv/
-
-caps:
-  categorymappings:
-    - {id: 88, cat: XXX, desc: "Adult - Books"}
-    - {id: 84, cat: XXX, desc: "Adult - Games"}
-    - {id: 82, cat: XXX, desc: "Adult - HD-Movies"}
-    - {id: 83, cat: XXX, desc: "Adult - Hentai"}
-    - {id: 86, cat: XXX, desc: "Adult - Magazines"}
-    - {id: 81, cat: XXX, desc: "Adult - Movies"}
-    - {id: 87, cat: XXX, desc: "Adult - Other"}
-    - {id: 85, cat: XXX, desc: "Adult - Pictures"}
-    - {id: 74, cat: TV/Anime, desc: "Anime - Dubbed/Subbed"}
-    - {id: 73, cat: TV/Anime, desc: "Anime - Movies"}
-    - {id: 75, cat: TV/Anime, desc: "Anime - Others"}
-    - {id: 56, cat: Audio/Audiobook, desc: "Books - Audio"}
-    - {id: 55, cat: Books/Comics, desc: "Books - Comics"}
-    - {id: 53, cat: Books/EBook, desc: "Books - Ebooks"}
-    - {id: 54, cat: Books/Mags, desc: "Books - Magazines"}
-    - {id: 68, cat: Books/Other, desc: "Books - Others"}
-    - {id: 90, cat: Books/Other, desc: "Books - Others"}
-    - {id: 58, cat: PC/Games, desc: "Games - Android"}
-    - {id: 71, cat: PC/Games, desc: "Games - Others"}
-    - {id: 57, cat: PC/Games, desc: "Games - Windows"}
-    - {id: 49, cat: Movies/3D, desc: "Movies - 3D"}
-    - {id: 66, cat: Movies/BluRay, desc: "Movies - BluRay Disc/Remux"}
-    - {id: 91, cat: Movies, desc: "Movies - Bollywood"}
-    - {id: 65, cat: Movies/SD, desc: "Movies - CAM/TS"}
-    - {id: 80, cat: TV/Documentary, desc: "Documentary"}
-    - {id: 51, cat: Movies, desc: "Movies - Dubs/Dual Audio"}
-    - {id: 67, cat: Movies/DVD, desc: "Movies - DVDR"}
-    - {id: 1, cat: Movies/HD, desc: "Movies - HD 1080p"}
-    - {id: 2, cat: Movies/HD, desc: "Movies - HD 720p"}
-    - {id: 76, cat: Movies/HD, desc: "Movies - HEVC/x265"}
-    - {id: 47, cat: Movies/HD, desc: "Movies - X264/H264"}
-    - {id: 3, cat: Movies/UHD, desc: "Movies - UltraHD/4K"}
-    - {id: 42, cat: Movies/SD, desc: "Movies - XviD"}
-    - {id: 60, cat: Audio/Lossless, desc: "Music - FLAC"}
-    - {id: 59, cat: Audio/MP3, desc: "Music - MP3"}
-    - {id: 61, cat: Audio/Video, desc: "Music - Music Videos"}
-    - {id: 69, cat: Audio/Other, desc: "Music - Others"}
-    - {id: 95, cat: Other/Misc, desc: "Others - Misc"}
-    - {id: 78, cat: Other, desc: "Others - Unsorted"}
-    - {id: 63, cat: PC/Mobile-Android, desc: "Software - Android"}
-    - {id: 64, cat: PC/Mac, desc: "Software - Mac"}
-    - {id: 70, cat: PC, desc: "Software - Others"}
-    - {id: 62, cat: PC/0day, desc: "Software - Windows"}
-    - {id: 94, cat: Books, desc: "Tutorials - Tutorials"}
-    - {id: 79, cat: TV/Documentary, desc: "Documentary"}
-    - {id: 41, cat: TV/HD, desc: "TV - HD/X264/H264"}
-    - {id: 77, cat: TV/HD, desc: "TV - HEVC/x265"}
-    - {id: 5, cat: TV/SD, desc: "TV - SD/X264/H264"}
-    - {id: 50, cat: TV/SD, desc: "TV - SD/XVID"}
-    - {id: 72, cat: TV/Sport, desc: "TV - Sport"}
-    - {id: 7, cat: TV, desc: "TV - TV Packs"}
-    - {id: 89, cat: TV/UHD, desc: "TV - UltraHD/4K"}
-
-  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: id
-    options:
-      id: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-download:
-  selectors:
-    - selector: a[href^="magnet:?xt="]
-      attribute: href
-
-search:
-  path: "{{ if .Keywords }}torrents-search.php{{ else }}torrents.php{{ end }}"
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    sort: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
-    incldead: 1
-  keywordsfilters:
-    - name: replace
-      args: ["-", " "] # remove special search character (negative search)
-    - name: replace
-      args: ["+", " "] # remove special search character (positive search)
-    - name: re_replace
-      args: ["(\\w+)", " +$1"] # prepend + to each word
-    - name: re_replace
-      args: ["\\s+", " "] # clean up whitespaces (multiple consecutive spaces confuses the search engine)
-
-  rows:
-    selector: div.myFrame-content > div > table > tbody > tr[class]
-    filters:
-      - name: andmatch # they ignore keywords <= characters, so we still andmatch it, see https://www.ettv.tv/forum/view/topic/and-search-operator-broken--70
-
-  fields:
-    download:
-      selector: a[href^="/torrent/"]
-      attribute: href
-    title:
-      selector: a[href^="/torrent/"][title]
-      attribute: title
-      filters:
-        - name: re_replace
-          args: ["( torrent)$", ""]
-    category:
-      text: 78 # issue #7110
-    category|noappend:
-      optional: true
-      selector: a[href^="/torrents.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    details:
-      selector: a[href^="/torrent/"]
-      attribute: href
-    date:
-      selector: td:nth-child(3)
-    size:
-      selector: td:nth-child(4)
-      filters:
-        - name: replace
-          args: ["N/A", "0 B"]
-    seeders:
-      selector: td:nth-child(6)
-    leechers:
-      selector: td:nth-child(7)
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

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

@@ -7,13 +7,17 @@ type: public
 encoding: UTF-8
 links:
   - https://extratorrent.st/
-  - https://extratorrent.unblockit.how/
-  - https://extratorrent.nocensor.biz/
+  - https://extratorrent.unblockit.llc/
+  - https://extratorrent.nocensor.sbs/
 legacylinks:
   - https://extratorrent.nocensor.work/
   - https://extratorrent.unblockit.kim/
   - https://extratorrent.unblockit.bz/
   - https://extratorrent.unblockit.tv/
+  - https://extratorrent.unblockit.how/
+  - https://extratorrent.unblockit.cam/
+  - https://extratorrent.nocensor.biz/
+  - https://extratorrent.unblockit.day/
 
 caps:
   categorymappings:
@@ -36,6 +40,7 @@ caps:
     - {id: Other Music, cat: Audio/Other, desc: Music Other}
     - {id: Radio Shows, cat: Audio/Other, desc: Music Radio}
     - {id: Video, cat: XXX, desc: Adult / Porn}
+    - {id: "Adult / Porn", cat: XXX, desc: Adult / Porn}
     - {id: Pictures, cat: XXX/ImageSet, desc: Adult Pictures}
     - {id: Magazines, cat: XXX/Other, desc: Adult Magazines}
     - {id: Games, cat: XXX/Other, desc: Adult Games}

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

@@ -12,16 +12,13 @@ links:
   - https://eztv.tf/
   - https://eztv.yt/
   - https://eztv.unblockninja.com/
-  - https://eztv.unblockit.how/
-  - https://eztv.nocensor.biz/
+  - https://eztv.unblockit.llc/
+  - https://eztv.nocensor.sbs/
 legacylinks:
   - https://eztv.ag/ # redirects to .re
   - https://eztv.it/ # redirects to .re
   - https://eztv.ch/ # redirects to .re
   - https://eztv.io/
-  - https://eztv.unblockit.dev/
-  - https://eztv.unblockit.ltd/
-  - https://eztv.unblockit.link/
   - https://eztv.unblockit.buzz/
   - https://eztv.unblocked.monster/
   - https://eztv.unblockit.club/
@@ -35,6 +32,10 @@ legacylinks:
   - https://eztv.unblockit.kim/
   - https://eztv.unblockit.bz/
   - https://eztv.unblockit.tv/
+  - https://eztv.unblockit.how/
+  - https://eztv.unblockit.cam/
+  - https://eztv.nocensor.biz/
+  - https://eztv.unblockit.day/
 
 caps:
   categories:
@@ -48,14 +49,18 @@ settings: []
 
 search:
   paths:
-    - path: "{{ if .Keywords }}search/{{ .Keywords }}{{ else }}/{{ end }}"
+    - path: "{{ if .Keywords }}search/{{ .Keywords }}{{ else }}{{ end }}"
 
   keywordsfilters:
     - name: re_replace
       args: ["S[0-9]{2}([^E]|$)", ""] # remove season tag without episode (search doesn't support it)
 
+  headers:
+    cookie: ["sort_no=100"] # show 100 results for keywordless search
+
   rows:
-    selector: "table.forum_header_border tr[name='hover'].forum_header_border:has(a.magnet)" # some torrents don't have any download links, skip them
+    # only use latest added torrents table for keywordless search to avoid duplicates, some torrents don't have any download links so skip them
+    selector: "table.forum_header_border:contains('Latest') tr[name='hover'].forum_header_border:has(a.magnet), table.forum_header_border:contains('Releases') tr[name='hover'].forum_header_border:has(a.magnet)"
     filters:
       - name: andmatch
 

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/fenyarnyek-tracker.yml

@@ -0,0 +1,181 @@
+---
+id: fenyarnyek-tracker
+name: Fenyarnyek-Tracker
+description: "Fenyarnyek-Tracker is a HUNGARIAN semi private site for TV / MOVIES / GENERAL"
+language: hu-HU
+type: semi-private
+encoding: UTF-8
+links:
+  - http://tracker.fenyarnyek.com/
+legacylinks:
+  - https://tracker.fenyarnyek.com/  # site is forcing http
+
+caps:
+  categorymappings:
+    - {id: 13, cat: PC/ISO, desc: "Program/Iso"}
+    - {id: 14, cat: PC/0day, desc: "Program/Rip"}
+    - {id: 15, cat: TV, desc: "Sorozat/Eng"}
+    - {id: 16, cat: TV, desc: "Sorozat/Hun"}
+    - {id: 17, cat: Audio, desc: "Zene/Eng"}
+    - {id: 18, cat: Audio, desc: "Zene/Hun"}
+    - {id: 19, cat: PC/Games, desc: "Game/Rip"}
+    - {id: 20, cat: PC/Games, desc: "Game/Iso"}
+    - {id: 21, cat: Movies/SD, desc: "Xvid/Eng"}
+    - {id: 22, cat: Movies/SD, desc: "Xvid/hun"}
+    - {id: 23, cat: Other, desc: "Képek"}
+    - {id: 24, cat: Movies/SD, desc: "Cam/Hun"}
+    - {id: 25, cat: Movies/SD, desc: "Cam/Eng"}
+    - {id: 26, cat: TV/Anime, desc: "Animació"}
+    - {id: 27, cat: Books, desc: "E-book/Hun"}
+    - {id: 28, cat: Books, desc: "E-book/Eng"}
+    - {id: 29, cat: Movies/DVD, desc: "DVD/Hun"}
+    - {id: 31, cat: Movies/DVD, desc: "DVD/Eng"}
+    - {id: 32, cat: Movies/HD, desc: "Hd/Hun"}
+    - {id: 33, cat: Movies/HD, desc: "Hd/Eng"}
+    - {id: 34, cat: PC/Mobile-Other, desc: "Mobil"}
+    - {id: 35, cat: XXX, desc: "XXX/Film"}
+    - {id: 36, cat: XXX/ImageSet, desc: "XXX/Kep"}
+    - {id: 38, cat: Movies/SD, desc: "SD/Eng"}
+    - {id: 39, cat: Movies/SD, desc: "SD/Hun"}
+    - {id: 37, cat: Other, desc: "Egyéb"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - 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:
+  method: post
+  path: index.php?page=login
+  inputs:
+    uid: "{{ .Config.username }}"
+    pwd: "{{ .Config.password }}"
+  error:
+    - selector: td.lista 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:
+    # http://tracker.fenyarnyek.com/index.php?page=torrents&search=&category=0&uploader=0&options=0&active=0&gold=0
+    - path: index.php
+  inputs:
+    page: torrents
+    search: "{{ .Keywords }}"
+    category: "{{ if .Categories }}{{ range .Categories }}{{.}};{{end}}{{ else }}0{{ end }}"
+    uploader: 0
+    # 0 filename, 1 file & desc, 2 description
+    options: 0
+    # 0 all, 1 active only, 2 dead only
+    active: 0
+    # 0 all, 1 classic, 2 silver, 3 gold, 4 silver & gold
+    gold: "{{ if .Config.freeleech }}3{{ else }}0{{ end }}"
+    order: "{{ .Config.sort }}"
+    by: "{{ .Config.type }}"
+
+  rows:
+    selector: td#mcol table.lista > tbody > tr:has(a[href*=bookmark])
+
+  fields:
+    category:
+      selector: a[href*="category="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: category
+    title:
+      selector: a[href^="index.php?page=torrent-details"]
+    details:
+      selector: a[href^="index.php?page=torrent-details"]
+      attribute: href
+    download:
+      selector: a[href^="index.php?page=torrent-details"]
+      attribute: href
+    poster:
+      selector: a[href^="index.php?page=torrent-details"]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "src=(.+?) "
+    date:
+      selector: td:nth-last-child(11)
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "02/01/2006 -07:00"
+    size:
+      selector: td:nth-last-child(5)
+    seeders:
+      selector: td:nth-last-child(9)
+    leechers:
+      selector: td:nth-last-child(8)
+    downloadvolumefactor:
+      case:
+        img[src$="freeleech.gif"]: 0
+        img[src$="gold.gif"]: 0
+        img[src$="silver.gif"]: 0.5
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img[src$="2x.gif"]: 2
+        img[src$="3x.gif"]: 3
+        img[src$="4x.gif"]: 4
+        img[src$="5x.gif"]: 5
+        img[src$="6x.gif"]: 6
+        img[src$="7x.gif"]: 7
+        img[src$="8x.gif"]: 8
+        img[src$="9x.gif"]: 9
+        img[src$="10x.gif"]: 10
+        "*": 1
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# xbtit

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

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

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

@@ -42,13 +42,16 @@ caps:
     book-search: [q]
 
 settings:
-  - name: cookie
+  - name: username
     type: text
-    label: Cookie
-  - name: info_cookie
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: flaresolverr
     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: FlareSolverr
+    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
@@ -58,9 +61,15 @@ settings:
     default: This site requires you to leave a Thank You comment before you can download. Enter your personalised comment above. Minimum of at least 10 characters.
 
 login:
-  method: cookie
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
   inputs:
-    cookie: "{{ .Config.cookie }}"
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    returnto: "/"
+  error:
+    - selector: td.embedded:contains("fout")
   test:
     path: /
     selector: a[href="logout.php"]

src/Jackett.Common/Definitions/finelite.yml

@@ -38,7 +38,7 @@ settings:
 
 caps:
   categorymappings:
-    - {id: 8, cat: PC/0day, desc: "0day/Apps"}
+    - {id: 33, cat: Audio/Audiobook, desc: "Audiobooks"}
     - {id: 29, cat: TV/Documentary, desc: "Documentary"}
     - {id: 24, cat: Books/EBook, desc: "Ebooks"}
     - {id: 28, cat: Movies, desc: "FE-INT"}

src/Jackett.Common/Definitions/finvip.yml

@@ -13,35 +13,33 @@ caps:
   categorymappings:
     - {id: 5, cat: TV/Anime, desc: "Anime"}
     - {id: 25, cat: TV/Documentary, desc: "Dokumentit (docs)"}
-    - {id: 6, cat: Books/EBook, desc: "eBooks"}
-    - {id: 26, cat: TV, desc: "Kannet/Tekstit (subs)"}
+    - {id: 6, cat: Books/EBook, desc: "e-Kirjat (ebooks)"}
+    - {id: 49, cat: Audio/Audiobook, desc: "Äänikirjat (audiobook)"}
     - {id: 20, cat: TV/SD, desc: "Lasten DVD (kids)"}
-    - {id: 33, cat: TV/SD, desc: "Lasten XviD (kids)"}
+    - {id: 33, cat: TV/SD, desc: "Lasten SD (kids)"}
+    - {id: 50, cat: TV/HD, desc: "Lasten HD (kids)"}
+    - {id: 51, cat: TV/UHD, desc: "Lasten 4K (kids)"}
     - {id: 11, cat: Movies/DVD, desc: "Leffat DVD (movies)"}
-    - {id: 13, cat: Movies/SD, desc: "Leffat XviD  (movies)"}
-    - {id: 21, cat: Movies/HD, desc: "Leffat HD  (movies)"}
-    - {id: 32, cat: Movies/DVD, desc: "Custom DVD  (movies)"}
-    - {id: 42, cat: Movies, desc: "FVC"}
-    - {id: 15, cat: Audio, desc: "Musiikki (music)"}
+    - {id: 13, cat: Movies/SD, desc: "Leffat SD (movies)"}
+    - {id: 21, cat: Movies/HD, desc: "Leffat HD (movies)"}
+    - {id: 48, cat: Movies/UHD, desc: "Leffat 4K (movies)"}
+    - {id: 15, cat: Audio/MP3, desc: "Musiikki (music)"}
+    - {id: 53, cat: Audio/Lossless, desc: "Musiikki Flac (music)"}
     - {id: 12, cat: Audio/Video, desc: "Musavideot (clips)"}
-    - {id: 7, cat: PC/0day, desc: "Ohjelmat Windows (apps)"}
-    - {id: 8, cat: PC, desc: "Ohjelmat Linux (apps)"}
-    - {id: 9, cat: PC/Mac, desc: "Ohjelmat Mac (apps)"}
+    - {id: 7, cat: PC/0day, desc: "Ohjelmat (apps)"}
     - {id: 17, cat: PC/Games, desc: "Pelit PC (games)"}
-    - {id: 18, cat: Console/PSP, desc: "Pelit PlayStation (games)"}
-    - {id: 19, cat: Console/XBox, desc: "Pelit Xbox (games)"}
-    - {id: 35, cat: Console/Wii, desc: "Pelit Wii (games)"}
-    - {id: 22, cat: XXX, desc: "Pr0n DVD (xxx)"}
-    - {id: 23, cat: XXX, desc: "Pr0n XviD (xxx)"}
-    - {id: 36, cat: XXX, desc: "Pr0n Muut (xxx)"}
-    - {id: 47, cat: XXX, desc: "Pr0n HD (xxx)"}
-    - {id: 24, cat: PC/Mobile-Other, desc: "Puhelimeen (phone)"}
-    - {id: 1, cat: TV/SD, desc: "Sarjat DVD (series)"}
-    - {id: 30, cat: TV, desc: "Sarjat (series)"}
+    - {id: 18, cat: Console, desc: "Pelit Konsoli (console)"}
+    - {id: 23, cat: XXX/SD, desc: "Porn SD"}
+    - {id: 36, cat: XXX/Other, desc: "Porn Muut"}
+    - {id: 47, cat: XXX/x264, desc: "Porn HD"}
+    - {id: 54, cat: XXX/UHD, desc: "Porn 4K"}
+    - {id: 1, cat: TV/SD, desc: "Sarjat Boxset (series)"}
+    - {id: 30, cat: TV/SD, desc: "Sarjat SD (series)"}
     - {id: 41, cat: TV/HD, desc: "Sarjat HD (series)"}
-    - {id: 43, cat: TV, desc: "Salkkarit (Soap Opera)"}
+    - {id: 52, cat: TV/UHD, desc: "Sarjat 4K (series)"}
     - {id: 40, cat: TV/Sport, desc: "Urheilu (sport)"}
     - {id: 31, cat: Other, desc: "Muut (other)"}
+    - {id: 43, cat: TV, desc: "Salkkarit (drama)"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/fouducinema.yml

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

src/Jackett.Common/Definitions/ftuapps.yml

@@ -0,0 +1,73 @@
+---
+id: ftuapps
+name: FTUApps
+description: "FTUApps is a Public tracker for Software and Apps"
+language: en-US
+type: public
+encoding: UTF-8
+links:
+  - https://ftuapps.dev/
+
+caps:
+  categorymappings:
+    - {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}
+    - {id: 331, cat: PC, desc: "Delphi", default: true}
+    - {id: 4120, cat: PC, desc: "DriverPack Solution Offline", default: true}
+    - {id: 2142, cat: PC/Mac, desc: "MacOS", default: true}
+    - {id: 2431, cat: PC, desc: "Operating Systems", default: true}
+    - {id: 2172, cat: PC, desc: "Portable Apps", default: true}
+    - {id: 2435, cat: PC, desc: "PreActivated Apps", default: true}
+    - {id: 3, cat: PC/0day, desc: "Software", default: true}
+    - {id: 165, cat: Other, desc: "Web & Script", default: true}
+
+  modes:
+    search: [q]
+
+settings: []
+
+download:
+  selectors:
+    - selector: a[href$=".torrent"]
+      attribute: href
+
+search:
+  paths:
+    - path: "?s={{ .Keywords }}&asl_active=1&p_asid=1&p_asl_data=1&qtranslate_lang=0&asl_gen[]=title&customset[]=post&customset[]=page{{ range .Categories }}&categoryset[]={{.}}{{end}}"
+
+  rows:
+    selector: article[id^="post-"]:has(a[href*="/category/"])
+    filters:
+      - name: andmatch
+
+  fields:
+    categorydesc:
+      selector: a[href*="/category/"]
+    title:
+      selector: a
+      attribute: title
+    details:
+      selector: a
+      attribute: href
+    download:
+      selector: a
+      attribute: href
+    poster:
+      selector: img
+      attribute: src
+    date:
+      selector: time.published
+      attribute: datetime
+    size:
+      text: "512 MB"
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# WordPress 5.9

src/Jackett.Common/Definitions/gamestorrents.yml

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

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

@@ -6,6 +6,8 @@ language: en-US
 type: private
 encoding: UTF-8
 links:
+  - https://www.gaytor.rent/
+legacylinks:
   - https://www.gaytorrent.ru/
 
 settings:

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

@@ -0,0 +1,187 @@
+---
+id: generationfree-api
+name: Generation-Free (API)
+description: "Generation-Free (GF-Free) is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: fr-FR
+type: private
+encoding: UTF-8
+links:
+  - https://generation-free.org/
+legacylinks:
+  - https://generation-free.biz/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Film"}
+    - {id: 2, cat: TV, desc: "Série"}
+    - {id: 3, cat: Audio, desc: "Musique"}
+    - {id: 4, cat: Console, desc: "Jeux"}
+    - {id: 5, cat: PC, desc: "Logiciel"}
+    - {id: 6, cat: Books, desc: "Ebook"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid]
+    movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://generation-free.org/\" target =_blank>Generation-Free</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: vfq
+    type: checkbox
+    label: Replace VFQ with FRENCH in release name
+    default: false
+  - name: multilang
+    type: checkbox
+    label: Replace MULTI by another language in release name
+    default: false
+  - name: multilanguage
+    type: select
+    label: Replace MULTI by this language
+    default: VOSTFR
+    options:
+      FRENCH: FRENCH
+      "MULTI FRENCH": "MULTI FRENCH"
+      ENGLISH: ENGLISH
+      "MULTI ENGLISH": "MULTI ENGLISH"
+      VOSTFR: VOSTFR
+      "MULTI VOSTFR": "MULTI VOSTFR"
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: created_at
+    options:
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: /api/torrents
+  method: get
+  inputs:
+    api_token: "{{ .Config.apikey }}"
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
+search:
+  paths:
+    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    - path: "/api/torrents/filter"
+      response:
+        type: json
+
+  inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    api_token: "{{ .Config.apikey }}"
+    name: "{{ .Keywords }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
+  rows:
+    selector: data
+    attribute: attributes
+    count:
+      selector: meta.total
+
+  fields:
+    categorydesc:
+      selector: category
+    title_original:
+      selector: name
+      filters:
+        - name: replace
+          args: [".", " "]
+    title_vfq:
+      text: "{{ .Result.title_original }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)(\\sVFQ\\s)", " FRENCH "]
+    title_step2:
+      text: "{{ if .Config.vfq }}{{ .Result.title_vfq }}{{ else }}{{ .Result.title_original }}{{ end }}"
+    title_multilang:
+      text: "{{ .Result.title_step2 }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)(\\sMULTI\\s)", " {{ .Config.multilanguage }} "]
+    title:
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_step2 }}{{ end }}"
+    details:
+      selector: details_link
+    download:
+      selector: download_link
+    magnet:
+      selector: magnet_link
+      optional: true
+    poster:
+      selector: poster
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/90x135", ""]
+    imdbid:
+      selector: imdb_id
+    tmdbid:
+      selector: tmdb_id
+    tvdbid:
+      selector: tvdb_id
+    files:
+      selector: num_file
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    date:
+      # 2021-10-18T00:34:50.000000Z"
+      selector: created_at
+    size:
+      selector: size
+    downloadvolumefactor:
+      # api returns 0%, 25%, 50%, 75%, 100%
+      selector: freeleech
+      case:
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
+    uploadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: double_upload
+      case:
+        0: 1 # normal
+        1: 2 # double
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# json UNIT3D 6.0.5

src/Jackett.Common/Definitions/generationfree.yml

@@ -1,211 +0,0 @@
----
-id: generationfree
-name: Generation-Free
-description: "Generation-Free is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: fr-FR
-type: private
-encoding: UTF-8
-links:
-  - https://generation-free.biz/
-
-caps:
-  categorymappings:
-    - {id: 106, cat: TV/Anime, desc: "Animation: FR"}
-    - {id: 13, cat: TV/Anime, desc: "Animation: VO"}
-    - {id: 140, cat: PC, desc: "Applications: Noel"}
-    - {id: 16, cat: PC/Games, desc: "Applications: Jeux"}
-    - {id: 17, cat: PC/Mac, desc: "Applications: Mac"}
-    - {id: 18, cat: PC/0day, desc: "Applications: PC"}
-    - {id: 40, cat: PC, desc: "Applications: Linux"}
-    - {id: 117, cat: PC, desc: "Applications: Appli-autre"}
-    - {id: 38, cat: PC/Mobile-Other, desc: "Applications: Mobile Phone"}
-    - {id: 19, cat: PC/Mobile-Android, desc: "Applications: Android"}
-    - {id: 67, cat: TV/Other, desc: "Autres: Emission TV"}
-    - {id: 142, cat: TV/Sport, desc: "Autres: Emission sport"}
-    - {id: 141, cat: TV/Other, desc: "Autres: Noel"}
-    - {id: 90, cat: Books/EBook, desc: "BD: Bande Dessinée"}
-    - {id: 76, cat: TV/Documentary, desc: "Documentaires: FR"}
-    - {id: 139, cat: TV/Documentary, desc: "Documentaires: Noel"}
-    - {id: 134, cat: TV/Documentary, desc: "Documentaires: VO"}
-    - {id: 138, cat: Books/EBook, desc: "E-Books: Noel"}
-    - {id: 62, cat: Audio/Audiobook, desc: "E-Books: E-Books Audio"}
-    - {id: 36, cat: Books/EBook, desc: "E-Books: Livres Français"}
-    - {id: 49, cat: Books/EBook, desc: "E-Books: Manuel Anglais"}
-    - {id: 53, cat: Books/EBook, desc: "E-Books: Livre Anglais"}
-    - {id: 52, cat: Books/EBook, desc: "E-Books: Revue - Journaux"}
-    - {id: 50, cat: Books/EBook, desc: "E-Books: Manuel Français"}
-    - {id: 66, cat: Movies, desc: "Films: VOSTFR"}
-    - {id: 65, cat: Movies, desc: "Films: VO"}
-    - {id: 54, cat: Movies/HD, desc: "Films: MHD HDlight"}
-    - {id: 55, cat: Movies/HD, desc: "Films: MHD x265"}
-    - {id: 69, cat: Movies/3D, desc: "Films: 3D"}
-    - {id: 2, cat: Movies/HD, desc: "Films: HD"}
-    - {id: 110, cat: Movies/WEB-DL, desc: "Films: WEB"}
-    - {id: 154, cat: Movies/UHD, desc: "Films: AV1-2160p"}
-    - {id: 89, cat: Movies/SD, desc: "Films: SD"}
-    - {id: 153, cat: Movies/HD, desc: "Films: AV1-1080p"}
-    - {id: 59, cat: Movies, desc: "Films: Spectacle"}
-    - {id: 70, cat: Movies/HD, desc: "Films: X265"}
-    - {id: 135, cat: Movies, desc: "Films: Noel"}
-    - {id: 155, cat: Movies/UHD, desc: "films: 4K X265"}
-    - {id: 87, cat: XXX, desc: "Films: XXX"}
-    - {id: 4, cat: Movies, desc: "Films: ISO"}
-    - {id: 151, cat: TV, desc: "Films: .Série animation"}
-    - {id: 150, cat: TV, desc: "Films: .Film série"}
-    - {id: 77, cat: PC/Mobile-Other, desc: "GPS: Cartes"}
-    - {id: 78, cat: PC/Mobile-Other, desc: "GPS: Radars"}
-    - {id: 97, cat: Audio, desc: "Musique: Podcast"}
-    - {id: 137, cat: Audio, desc: "Musique: Noel"}
-    - {id: 25, cat: Audio/MP3, desc: "Musique: Single MP3"}
-    - {id: 22, cat: Audio/MP3, desc: "Musique: Album MP3"}
-    - {id: 143, cat: Audio/MP3, desc: "Musique: Wav"}
-    - {id: 98, cat: Audio, desc: "Musique: karaoké"}
-    - {id: 58, cat: Audio, desc: "Musique: Concert"}
-    - {id: 24, cat: Audio/Lossless, desc: "Musique: Single Flac"}
-    - {id: 23, cat: Audio/Lossless, desc: "Musique: Album Flac"}
-    - {id: 64, cat: Audio, desc: "Musique: Mégamix Maison"}
-    - {id: 6, cat: TV, desc: "Serie TV: Saison FR"}
-    - {id: 7, cat: TV, desc: "Serie TV: Episode FR"}
-    - {id: 63, cat: TV, desc: "Serie TV: Saison VO"}
-    - {id: 152, cat: TV, desc: "Serie TV: Episode VO"}
-    - {id: 93, cat: TV, desc: "Serie TV: Saison VOSTFR"}
-    - {id: 61, cat: TV, desc: "Serie TV: Episode VOSTFR"}
-    - {id: 12, cat: TV, desc: "Serie TV: Animation"}
-    - {id: 136, cat: TV, desc: "Serie TV: Noel"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: multilang
-    type: checkbox
-    label: Replace MULTI by another language in release name
-    default: false
-  - name: multilanguage
-    type: select
-    label: Replace MULTI by this language
-    default: VOSTFR
-    options:
-      FRENCH: FRENCH
-      "MULTI FRENCH": "MULTI FRENCH"
-      ENGLISH: ENGLISH
-      "MULTI ENGLISH": "MULTI ENGLISH"
-      VOSTFR: VOSTFR
-      "MULTI VOSTFR": "MULTI VOSTFR"
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: id
-    options:
-      id: 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: account-login.php
-  method: post
-  inputs:
-    login_name: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: td#msgError
-  test:
-    path: index.php
-    selector: a[href="account-logout.php"]
-
-download:
-  before:
-    path: list_thanks.php
-    inputs:
-      id: "{{ .DownloadUri.Query.id }}"
-      to: give
-      torrent: "{{ .DownloadUri.Query.id }}"
-  selectors:
-    - selector: a[href^="download.php?id="]
-      attribute: href
-
-search:
-  paths:
-    # 40 results per page, but only fetching one page due to issue #8702
-    - path: torrents-search.php
-  inputs:
-    # multi cats unsupported, defaulting to all
-    cat: 0
-    search: "{{ .Keywords }}"
-    # 0 active 1 incldead 2 onlydead
-    incldead: 1
-    # 0 all 1 notfree 2 freeonly
-    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 all 1 French 2 English 3 etc
-    lang: 0
-    sort: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
-    # does not support imdbid search and does not return imdb link in results
-
-  rows:
-    selector: table.ttable_headinner > tbody > tr.t-row
-
-  fields:
-    title_original:
-      selector: a[href^="torrents-details.php?id="] b
-    title_multilang:
-      text: "{{ .Result.title_original }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)(\\sMULTI\\s)", " {{ .Config.multilanguage }} "]
-    title:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_original }}{{ end }}"
-    category:
-      selector: a[href^="torrents.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    details:
-      selector: a[href^="torrents-details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="torrents-details.php?id="]
-      attribute: href
-    size:
-      selector: td:nth-last-child(5)
-    seeders:
-      selector: td:nth-last-child(4)
-    leechers:
-      selector: td:nth-last-child(3)
-    grabs:
-      selector: td:nth-last-child(2)
-    date:
-      text: now
-    downloadvolumefactor:
-      case:
-        img[src="images/fl.gif"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# engine n/a

src/Jackett.Common/Definitions/gktorrent.yml

@@ -7,17 +7,9 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www.gktorrents.net/
-  - https://gktorrent.nocensor.biz/
+  - https://www.gktorrents.org/
+  - https://gktorrent.nocensor.sbs/
 legacylinks:
-  - https://www.gktorrent.com/
-  - http://www.gktorrent.com/
-  - http://ww1.gktorrent.com/
-  - http://ww2.gktorrent.com/
-  - https://ww2.gktorrent.com/
-  - https://ww3.gktorrent.com/
-  - http://www.gktorrent.net/
-  - https://ww4.gktorrent.com/
   - http://www.gktorrent.co/
   - https://www.gktorrent.co/
   - https://www.gktorrent.ws/
@@ -36,17 +28,18 @@ legacylinks:
   - https://gktorrent.nocensor.space/
   - https://www.gktorrents.com/
   - https://gktorrent.nocensor.work/
+  - https://www.gktorrents.net/
+  - https://gktorrent.nocensor.biz/
 
 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]
@@ -78,6 +71,8 @@ settings:
 
 download:
   selectors:
+    - selector: a[href^="magnet:?"]
+      attribute: href
     - selector: script:contains("magnet:?")
       filters:
         - name: regexp
@@ -98,15 +93,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

@@ -8,15 +8,13 @@ encoding: UTF-8
 followredirect: true
 links:
   - https://glodls.to/
+  - https://gtdb.cc/
   - https://www.gtdb.to/
-  - https://glotorrents.unblockit.how/
-  - https://glotorrents.nocensor.biz/
+  - https://glotorrents.unblockit.llc/
+  - https://glotorrents.nocensor.sbs/
 legacylinks:
   - https://glodls.rocks/
   - https://gtdb.to/
-  - https://glotorrents.unblockit.app/
-  - https://glodls.unblocked.rest/
-  - https://glotorrents.unblockit.dev/
   - https://glotorrents.unblockit.ltd/
   - https://glotorrents.unblockit.link/
   - https://glotorrents.unblockit.buzz/
@@ -32,6 +30,10 @@ legacylinks:
   - https://glotorrents.unblockit.kim/
   - https://glotorrents.unblockit.bz/
   - https://glotorrents.unblockit.tv/
+  - https://glotorrents.unblockit.how/
+  - https://glotorrents.unblockit.cam/
+  - https://glotorrents.nocensor.biz/
+  - https://glotorrents.unblockit.day/
 
 caps:
   categorymappings:

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

@@ -64,10 +64,10 @@ search:
     - 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 }}"
       response:
         type: json
-        attribute: attributes
 
   rows:
     selector: data
+    attribute: attributes
     count:
       selector: meta.total
 
@@ -82,11 +82,11 @@ search:
       selector: download_link
     poster:
       selector: poster
-    imdbid:
-      selector: imdb_id
       filters:
         - name: replace
           args: ["https://via.placeholder.com/90x135", ""]
+    imdbid:
+      selector: imdb_id
     tmdbid:
       selector: tmdb_id
     tvdbid:

src/Jackett.Common/Definitions/hdcity.yml

@@ -5,6 +5,8 @@ description: "HDCity is a SPANISH site for HD content"
 language: es-ES
 type: private
 encoding: ISO-8859-1
+certificates:
+  - a10f2f7a863cd3fba9663185b0943cde01698451 # expired  ‎25 ‎October ‎2021
 links:
   - https://hdcity.li/
 

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,194 @@
+---
+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: a[href^="browse.php?cat="]
+      attribute: href
+      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"]
+    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/hdhouse.yml

@@ -1,156 +0,0 @@
----
-id: hdhouse
-name: HDhouse
-description: "HDhouse (HDReactor) is a RUSSIAN Public Torrent Tracker for MOVIES / TV"
-language: ru-RU
-type: public
-encoding: windows-1251
-links:
-  - https://hdreactor.club/
-  - https://hdreactor.net/
-legacylinks:
-  - https://hdreactor.guru/
-  - https://hdreactor.su/
-  - https://hdhouse.club/
-
-caps:
-  categorymappings:
-    - {id: 2001, cat: Movies/HD, desc: "Кино HD"}
-    - {id: 5006, cat: Movies/UHD, desc: "Кино UHD"}
-    - {id: 2007, cat: TV/Anime, desc: "Мультфильмы"}
-    - {id: 2006, cat: TV/HD, desc: "Сериалы HD"}
-    - {id: 2004, cat: Audio/Lossless, desc: "Музыка A"}
-    - {id: 5007, cat: Audio/Video, desc: "Музыка V"}
-    - {id: 2003, cat: XXX, desc: "18+ HD"}
-    - {id: 2005, cat: PC/Games, desc: "Игры"}
-    - {id: 5005, cat: TV/Sport, desc: "Спорт HD"} # not shown in list
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-
-settings:
-  - name: striprussian
-    type: checkbox
-    label: Strip Russian Letters
-    default: false
-  - 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^="magnet:?xt="]
-      attribute: href
-
-search:
-  # https://hdreactor.net/index.php?do=search&subaction=search&showposts=1&story=2020&catlist[]=2001&catlist[]=2006
-  paths:
-    - path: index.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: "{{ range .Categories }}catlist[]={{.}}&{{end}}"
-    do: search
-    subaction: search
-    showposts: 1
-    # 0 in article, 1 in comments ,2 in static pages, 3 in article titles
-    titleonly: 3
-    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
-    sortby: "{{ .Config.sort }}"
-    resorder: "{{ .Config.type }}"
-
-  headers:
-    # site presents hcaptcha challenge for Jackett's User-Agent, so slightly alter it here (e.g. Safari/537.36 > Safari/537.35)
-    User-Agent: ["Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.35"]
-
-  rows:
-    selector: div.movie-item
-
-  fields:
-    category:
-      selector: div.movie-item__meta > span > a
-      case:
-        a[href$="/1/"]: 2001
-        a[href$="/4k_uhd/"]: 5006
-        a[href$="/7/"]: 2007
-        a[href$="/6/"]: 2006
-        a[href$="/4/"]: 2004
-        a[href$="/9/"]: 5007
-        a[href$="/3/"]: 2003
-        a[href$="/5/"]: 2005
-        a[href$="/sport-hd/"]: 5005 # not shown in list
-    title:
-      selector: span.movie-item__title
-      filters:
-        # normalize to SXXEYY format
-        - name: re_replace
-          args: ["[\\.\\,\\:\\-\\/\\|\\[\\]]", " "]
-        - name: re_replace
-          args: ["(.*)[CСcс]езон\\s*(\\d+)\\s*[CСcс]ери[ия]\\s*(\\d+)\\s*(\\d+)\\s*из\\s*\\d+(.*)", "$1 S$2E$3-$4 rus $5"]
-        - name: re_replace
-          args: ["(.*)[CСcс]езон\\s*(\\d+)\\s*[CСcс]ери[ия]\\s*(\\d+)\\s*(\\d+)\\s*(.*)", "$1 S$2E$3-$4 rus $5"]
-        - name: re_replace
-          args: ["(.*)[CСcс]езон\\s*(\\d+)\\s*[CСcс]ери[ия]\\s*(\\d+)\\s*из\\s*\\d+(.*)", "$1 S$2E$3 rus $4"]
-        - name: re_replace
-          args: ["(.*)[CСcс]езон\\s*(\\d+)(.*)", "$1 S$2 rus $3"]
-        - name: re_replace
-          args: ["(.*)[CСcс]]ери[ия]\\s*(\\d+)(.*)", "$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"]
-    details:
-      selector: div.movie-item__desc > a
-      attribute: href
-    download:
-      selector: div.movie-item__desc > a
-      attribute: href
-    poster:
-      selector: img
-      attribute: src
-    size:
-      text: "512 MB"
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    date:
-      selector: div.movie-item__meta > span:nth-child(2)
-      filters:
-        # 5-03-2021, 21:59
-        - name: replace
-          args: [",", ""]
-        - name: append
-          args: " +03:00" # MSK
-        - name: dateparse
-          args: "2-01-2006 15:04 -07:00"
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# DataLife

src/Jackett.Common/Definitions/hdme.yml

@@ -5,6 +5,8 @@ description: "HDME is a Private Torrent Tracker for HD MOVIES / TV / GENERAL"
 language: en-US
 type: private
 encoding: windows-1252
+certificates:
+  - 07872b2e93e50d8abeea094e5621b4c637c61652 # self signed
 links:
   - https://hdme.eu/
 

src/Jackett.Common/Definitions/hdmonkey.yml

@@ -132,13 +132,13 @@ search:
     size:
       selector: td:nth-child(4)
     date:
-      # 19.Jul<br>2021<br>06:57
+      # 15.11.21<br>07:47
       selector: td:nth-child(5)
       filters:
         - name: append
           args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "2.Jan200615:04 -07:00"
+          args: "2.01.0615:04 -07:00"
     grabs:
       selector: td:nth-child(7)
     seeders:

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

@@ -68,10 +68,10 @@ search:
     - 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 }}"
       response:
         type: json
-        attribute: attributes
 
   rows:
     selector: data
+    attribute: attributes
     count:
       selector: meta.total
 
@@ -101,6 +101,8 @@ search:
           args: ["[ -](?i)spa[ -]", " SPANiSH "]
         - name: re_replace
           args: ["[ -](?i)esp[ -]", " SPANiSH "]
+        - name: re_replace
+          args: [" ES ", " SPANiSH "]
         - name: re_replace
           args: ["[ -](?i)ingl[eé]s[ -]", " English "]
         - name: re_replace
@@ -120,22 +122,28 @@ search:
         - name: re_replace
           args: ["[ -](?i)ger[ -]", " German "]
         - name: re_replace
-          args: ["(?i)(triaudio)", "MULTi/SPANiSH/English"]
+          args: ["(?i)(triaudio)", "MULTi SPANiSH English"]
         - name: re_replace
-          args: ["(?i)(dual)", " MULTi/SPANiSH "]
+          args: ["(?i)(dual)", " MULTi SPANiSH "]
+        - name: re_replace
+          args: ["(?i)(es-en)", " MULTi SPANiSH "]
+        - name: re_replace
+          args: ["(?i)(en-es)", " MULTi SPANiSH "]
         - name: re_replace
           args: ["\\.+", "."] # More than 1 dot -> .
         - name: re_replace
           args: ["^\\.", ""] # Delete first dot
         - name: re_replace
           args: ["\\s+", " "] # More than 1 space to 1 space
-
     details:
       selector: details_link
     download:
       selector: download_link
     poster:
       selector: poster
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/90x135", ""]
     imdbid:
       selector: imdb_id
     tmdbid:

src/Jackett.Common/Definitions/hdonly.yml

@@ -16,7 +16,7 @@ caps:
     - {id: 5, cat: TV, desc: "Série"}
     - {id: 6, cat: TV/Anime, desc: "Série anim"}
     - {id: 7, cat: Movies/Other, desc: "Film d'animation"}
-    - {id: 7, cat: Audio/Video, desc: "Concert"}
+    - {id: 9, cat: Audio/Video, desc: "Concert"}
     - {id: 11, cat: TV/Documentary, desc: "Documentaire"}
     - {id: 13, cat: Movies/Other, desc: "Court-métrage"}
     - {id: 14, cat: Movies/Other, desc: "Clip"}

src/Jackett.Common/Definitions/hdspain.yml

@@ -23,7 +23,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
+    tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
 
@@ -79,6 +79,12 @@ search:
           args: "["
         - name: append
           args: "]"
+        - name: re_replace
+          args: ["(?i)(MEGAPACK)", "REPACK"]
+        - name: re_replace
+          args: ["(?i)(AUDIOEDITADO)", "PROPER"]
+        - name: re_replace
+          args: ["(?i)(VERSIÓN MEJORADA)", "PROPER"]
     title_vose:
       selector: td.titulo a[id]:contains("VOSE")
       optional: true

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

@@ -15,25 +15,27 @@ caps:
   categorymappings:
     - {id: 11, cat: Movies, desc: "Movies Αποκλειστικά του HTz (HTz only)"}
     - {id: 54, cat: Movies/BluRay, desc: "Movies Blu-Ray 720p-1080p"}
-    - {id: 232, cat: Movies/UHD, desc: "Movies Full-HD - 4K"}
-    - {id: 234, cat: Movies/HD, desc: "Movies BDRip-BRRip-HDRip"}
-    - {id: 233, cat: Movies/DVD, desc: "Movies DvdRip Full"}
     - {id: 213, cat: Movies, desc: "Movies Ελληνικές Ταινιίες (Greek)"}
-    - {id: 236, cat: Movies/SD, desc: "Movies Cam - HDcam-HDts"}
+    - {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: 240, cat: PC/Mobile-Other, desc: "Android - Linux"}
+    - {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: 221, cat: Console, desc: "Παιχνίδια (Games)"}
-    - {id: 228, cat: TV/Anime, desc: "Animation"}
-    - {id: 223, cat: Books/EBook, desc: "Βιβλία (Books)"}
-    - {id: 100, cat: Books/Comics, desc: "Comics &Περιοδικά"}
-    - {id: 227, cat: PC, desc: "Pc Software"}
-    - {id: 225, cat: TV/Documentary, desc: "Ντοκιμαντερ (Documentaries)"}
+    - {id: 240, cat: PC/Mobile-Other, desc: "Android - Linux"}
     - {id: 241, cat: Audio/Audiobook, desc: "Audio Books"}
 
   modes:

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

@@ -0,0 +1,144 @@
+---
+id: hidden-palace
+name: Hidden-Palace
+description: "Hidden-Palace is a Private torrent site for MOVIES / TV"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://hidden-palace.net/
+legacylinks:
+  - https://hidden-palace.xyz/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Movie"}
+    - {id: 2, cat: TV, desc: "TV"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid]
+    movie-search: [q, imdbid, tmdbid]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://hidden-palace.net/\" target =_blank>Hidden-Palace</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: created_at
+    options:
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: /api/torrents
+  method: get
+  inputs:
+    api_token: "{{ .Config.apikey }}"
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
+search:
+  paths:
+    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    - path: "/api/torrents/filter"
+      response:
+        type: json
+
+  inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    api_token: "{{ .Config.apikey }}"
+    name: "{{ .Keywords }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
+  rows:
+    selector: data
+    attribute: attributes
+    count:
+      selector: meta.total
+
+  fields:
+    categorydesc:
+      selector: category
+    title:
+      selector: name
+    details:
+      selector: details_link
+    download:
+      selector: download_link
+    poster:
+      selector: poster
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/90x135", ""]
+    imdbid:
+      selector: imdb_id
+    tmdbid:
+      selector: tmdb_id
+    tvdbid:
+      selector: tvdb_id
+    files:
+      selector: num_file
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    date:
+      # 2021-10-18T00:34:50.000000Z"
+      selector: created_at
+    size:
+      selector: size
+    downloadvolumefactor:
+      # api returns 0%, 25%, 50%, 75%, 100%
+      selector: freeleech
+      case:
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
+    uploadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: double_upload
+      case:
+        0: 1 # normal
+        1: 2 # double
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 1 day (as seconds = 1 x 24 x 60 x 60)
+      text: 86400
+# json UNIT3D 6.0.5

src/Jackett.Common/Definitions/houseofdevil.yml

@@ -0,0 +1,176 @@
+---
+id: houseofdevil
+name: House of Devil
+description: "House of Devil is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: de-DE
+type: private
+encoding: UTF-8
+links:
+  - https://h-o-d.org/
+
+caps:
+  categorymappings:
+    - {id: 117, cat: TV, desc: "Allgemein - Serien"}
+    - {id: 119, cat: Other, desc: "Bilder"}
+    - {id: 120, cat: Books, desc: "EBook"}
+    - {id: 138, cat: Movies/3D, desc: "Filme - 3D"}
+    - {id: 101, cat: TV/Anime, desc: "Filme - Animie"}
+    - {id: 102, cat: Movies/BluRay, desc: "Filme - Bluray"}
+    - {id: 131, cat: Movies/Other, desc: "Filme - Bollywood"}
+    - {id: 103, cat: Movies/DVD, desc: "Filme - DVD"}
+    - {id: 104, cat: Movies/DVD, desc: "Filme - DVD-R"}
+    - {id: 135, cat: Movies/HD, desc: "Filme - HD"}
+    - {id: 132, cat: Movies/DVD, desc: "Filme - HD2DVD"}
+    - {id: 130, cat: Movies, desc: "Filme - Klassiker"}
+    - {id: 134, cat: Movies/SD, desc: "Filme - SD"}
+    - {id: 136, cat: Movies/UHD, desc: "Filme - UHD"}
+    - {id: 105, cat: Movies/HD, desc: "Filme - x264"}
+    - {id: 106, cat: Movies/SD, desc: "Filme - XviD / DivX"}
+    - {id: 127, cat: Movies, desc: "Fuer Unsere Kleinsten"}
+    - {id: 121, cat: PC/Mobile-Other, desc: "Handy-Stuff"}
+    - {id: 124, cat: Audio, desc: "Musik - Alben"}
+    - {id: 140, cat: Audio, desc: "Musik - Diskografie"}
+    - {id: 122, cat: Audio/Audiobook, desc: "Musik - Hoerbuch"}
+    - {id: 123, cat: Audio, desc: "Musik - Mixe"}
+    - {id: 133, cat: Audio/MP3, desc: "Musik - MP3"}
+    - {id: 125, cat: Audio/Video, desc: "Musik - Video"}
+    - {id: 113, cat: PC, desc: "Programme - Linux"}
+    - {id: 114, cat: PC/Mac, desc: "Programme - Mac"}
+    - {id: 115, cat: PC/0day, desc: "Programme - Windows"}
+    - {id: 116, cat: TV/Documentary, desc: "Serien - Dokus"}
+    - {id: 118, cat: TV/Sport, desc: "Serien - Sport"}
+    - {id: 129, cat: Other, desc: "Sonstiges"}
+    - {id: 109, cat: PC/Mobile-Other, desc: "Spiele - Handy"}
+    - {id: 112, cat: Console, desc: "Spiele - Konsolen"}
+    - {id: 111, cat: PC/Games, desc: "Spiele - Mac / Linux"}
+    - {id: 110, cat: PC/Games, desc: "Spiele - PC"}
+    - {id: 137, cat: Console/Other, desc: "Wimmelspiele"}
+    - {id: 69, cat: XXX, desc: "XXX"}
+
+  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: pin
+    type: text
+    label: Pin
+  - name: onlyupload
+    type: checkbox
+    label: Filter OnlyUpload only
+    default: false
+  - name: info_free
+    type: info
+    label: About OnlyUpload at H-O-D
+    default: <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: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    pin: "{{ .Config.pin }}"
+  error:
+    - selector: .tablea:contains("Fehler")
+  test:
+    path: /
+    selector: a[href="logout.php"]
+
+search:
+  # https://h-o-d.org/browse.php?showsearch=1&c117=1&c116=1&c118=1&search=&incldead=1&orderby=added&sort=desc
+  path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    showsearch: 1
+    search: "{{ .Keywords }}"
+    # 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: "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/free.gif\"]){{ else }}{{ end }}"
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php"]
+    details:
+      selector: a[href^="details.php"]
+      attribute: href
+    download:
+      selector: a[href^="download.php"]
+      attribute: href
+    poster:
+      selector: a[href^="details.php"]
+      attribute: onMouseOver
+      filters:
+        - name: regexp
+          args: "src=(.*?) width"
+    size:
+      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: td.tablea table tbody tr:nth-child(2) td:nth-child(2) b:nth-child(1)
+    leechers:
+      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: append
+          args: " +01:00" # CET
+        - name: replace
+          args: ["\xA0", " "]
+        - name: dateparse
+          args: "02.01.2006 15:04:05 -07:00"
+    downloadvolumefactor:
+      case:
+        img[src="/pic/free.gif"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 0.8
+    minimumseedtime:
+      # 5 days (as seconds = 5 x 24 x 60 x 60)
+      text: 432000
+# engine n/a

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

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: