Rename kisssub.yml to miobt.yml

also add flaresolverr info

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -51,6 +51,7 @@ body:
     description: |
       Place any relevant error messages you noticed from the logs here.
       Make sure you attach the full logs with your personal information removed in case we need more information.
+    render: text
   validations:
     required: true
 - type: textarea

.github/ISSUE_TEMPLATE/indexer-request.yml

@@ -32,11 +32,11 @@ body:
       - Minimum Seeding Time and Minimum Ratio (if Private): MST 24hrs, MR 1.0
       - Additional Comments: IMDB search has to be enabled in account settings, often has hcaptcha at login
     value: |
-      - Name:
-      - URL:
-      - Description:
-      - Minimum Seeding Time and Minimum Ratio (if Private):
-      - Additional Comments:
+      - Name: 
+      - URL: 
+      - Description: 
+      - Minimum Seeding Time and Minimum Ratio (if Private): 
+      - Additional Comments: 
     render: markdown
   validations:
     required: true

.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

CONTRIBUTING.md

@@ -104,24 +104,31 @@ We've developed the guide below to make sure we're all on the same page because
 The following guide assumes you've never worked with a Visual Studio project with GitHub before.
 This will give you the minimum necessary tools to get started. There are plenty of optional tools that may help you, but we won't cover those here.
 
-- The guide is currently only geared towards developing on Windows using Visual Studio Community 2019.
+- The guide is currently only geared towards developing on Windows using Visual Studio Community 2022.
 If you use something else, please add it here for others.
 
 <details open=true> <summary> Windows </summary>
 
-<details open=true> <summary> Visual Studio 2019 </summary>
+<details open=true> <summary> Visual Studio 2022 </summary>
 
-- Install [Visual Studio Community 2019](http://visualstudio.com) for free.
+- Install [Visual Studio Community 2022](https://visualstudio.microsoft.com/vs/) for free.
   - About 2GB download. 8GB installed.
-  -  Make sure it includes the following Workloads/Components:
-     -  .Net Desktop Development
-     -  .Net Core Cross-Platform Development
-     -  GitHub extension for Visual Studio
-- [Connect and synchronize your forked repository to Visual Studio](https://doc.fireflymigration.com/working-with-github-fork-in-visual-studio.html)
-- Open  `Tools -> NuGet Package Manager -> Package Manager Console`
-- From the PMC, run `dotnet tool install -g dotnet-format` and `dotnet restore`
-- Run `Build -> Rebuild Solution` to restore NuGet packages
-- Ensure `Jackett.Server` is the Startup Project (instead of `Jackett.Service`), and the Run Target (instead of `IIS Express`)
+  -  Make sure it includes the following Workload and Individual Components:
+     -  .NET desktop development
+     -  .Net Framework 4.6.1 SDK
+     -  .Net Framework 4.6.1 targeting pack
+- From the `Get Started` screen:
+  - `Clone a repository -> Browse a repository -> GitHub -> Sign in -> clone your forked repository`
+- Double-click `Jackett.sln` in `Solution Explorer` to load your project
+- Ensure `Jackett.Server` is the Startup Project (instead of `Jackett.Service`) and the Run Target (instead of `IIS Express`)
+- Open `Tools -> NuGet Package Manager -> Package Manager Console`
+- From the PMC, with `Jackett.Service` as the default project, run:
+  - `dotnet tool install -g dotnet-format`
+  - `dotnet msbuild /restore`
+  - `dotnet restore`
+  - `dotnet build`
+- [For more information on working with your forked GitHub repository in Visual Studio](https://doc.fireflymigration.com/working-with-github-fork-in-visual-studio.html)
+  - UPDATE: changes are now made in `Git Changes` and `Git Repository` (instead of `Team Explorer`)
 
 </details>
 

Installer.iss

@@ -30,6 +30,7 @@ UninstallDisplayName={#MyAppName}
 Compression=lzma
 SolidCompression=yes
 DisableDirPage=yes
+WizardStyle=modern
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
@@ -38,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]
@@ -47,6 +51,15 @@ Name: "{group}\{#MyAppName}"; Filename: "{commonappdata}\Jackett\{#MyAppExeName}
 Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
 Name: "{commondesktop}\{#MyAppName}"; Filename: "{commonappdata}\Jackett\{#MyAppExeName}"; Tasks: desktopicon
 
+[Code]
+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;
 Filename: "{commonappdata}\Jackett\JackettConsole.exe"; Parameters: "--ReserveUrls"; 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,14 +52,15 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ConCen
  * cpasbien
  * cpasbienClone
+ * CrackingPatching
  * Demonoid
  * DivxTotal
  * dmhy
+ * DonTorrent
  * E-Hentai
  * elitetorrent
  * EpubLibre
  * Erai-Raws
- * ETTV
  * EXT Torrents
  * ExtraTorrent.st
  * EZTV
@@ -68,11 +68,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
@@ -80,9 +80,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
@@ -92,11 +92,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
@@ -104,18 +104,15 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * NNTT
  * NoNaMe Club (NNM-Club)
  * Nyaa.si
- * OnceSearch
  * OneJAV
  * OpenSharing
  * OxTorrent
  * ParnuXi
  * PC-torrent
  * PiratBit
- * Pirateiro
  * Pornforall
  * PornLeech
  * PornoLive
- * PornoRip
  * PornosLab
  * PornoTor
  * PornoTorrent
@@ -130,7 +127,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * RuTor
  * RuTracker.RU
  * seleZen
- * Sexxi
  * Sexy-Pics
  * ShizaProject
  * ShowRSS
@@ -142,10 +138,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
@@ -155,7 +149,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TorrentGalaxy (TGx)
  * TorrentKitty
  * TorrentMafya
- * TorrentMax (토렌트맥스)
  * TorrentParadise
  * TorrentProject2
  * TorrentQQ (토렌트큐큐)
@@ -170,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
@@ -181,11 +175,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 
 <details> <summary> <b> Supported Semi-Private Trackers </b> </summary>
 
+ * 720pier
  * AniDUB
  * Anime-Free
  * AnimeLayer
  * ArenaBG
- * BaibaKo
  * BookTracker
  * BootyTape
  * Catorrent
@@ -196,6 +190,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * EniaHD
  * ExKinoRay
  * ExtremlymTorrents
+ * Fenyarnyek-Tracker
  * Fou-Du-Cinema
  * Gay-Torrents.net
  * Genesis-Movement
@@ -220,6 +215,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
@@ -246,7 +242,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * 3D Torrents (3DT) [![(invite needed)][inviteneeded]](#)
  * 4thD (4th Dimension)
  * 52PT
- * 720pier
  * Abnormal
  * ABtorrents (ABT + RNS)
  * Acid Lounge (A-L)
@@ -259,13 +254,13 @@ 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
- * AsianDVDClub
  * AudioNews (AN)
  * Aussierul.es [![(invite needed)][inviteneeded]](#)
  * AvistaZ (AsiaTorrents)
@@ -277,9 +272,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * 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]](#)
@@ -305,7 +300,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
@@ -327,7 +321,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
@@ -339,7 +332,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Dragonworld Reloaded [![(invite needed)][inviteneeded]](#)
  * EbookParadijs
  * Ebooks-Shares
- * EfectoDoppler
  * Empornium (EMP) [![(invite needed)][inviteneeded]](#)
  * eShareNet
  * eStone (XiDER, BeLoad, BigTorrent)
@@ -349,7 +341,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
@@ -361,7 +353,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]](#)
@@ -371,6 +363,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HaiDan
  * Haitang
  * HappyFappy
+ * Hawke-uno [![(invite needed)][inviteneeded]](#)
  * HD Dolby
  * HD-Bits.com [![(invite needed)][inviteneeded]](#)
  * HD-Forever (HDF)
@@ -400,18 +393,22 @@ 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]](#)
  * IPTorrents (IPT)
- * ImmortalSeed (iS) [![(invite needed)][inviteneeded]](#)
+ * ImmortalSeed (iS)
  * Immortuos [![(invite needed)][inviteneeded]](#)
  * Insane Tracker
  * IPTorrents (IPT)
+ * JME-REUNIT3D
  * JPopsuki [![(invite needed)][inviteneeded]](#)
  * JPTV
  * Karagarga
  * Keep Friends [![(invite needed)][inviteneeded]](#)
+ * Korsar
  * KrazyZone
  * LastFiles
  * Lat-Team [![(invite needed)][inviteneeded]](#)
@@ -430,6 +427,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * magic-heaven
  * Magico (Trellas) [![(invite needed)][inviteneeded]](#)
  * Majomparádé (TurkDepo)
+ * MediaMaatjes
  * MegamixTracker
  * MeseVilág (Fairytale World)
  * MicroBit (µBit)
@@ -445,7 +443,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * MyAnonamouse (MAM)
  * MySpleen [![(invite needed)][inviteneeded]](#)
  * NBTorrents [![(invite needed)][inviteneeded]](#)
- * Nbytez
  * NCore
  * Nebulance (NBL) (TransmiTheNet)
  * NetCosmo
@@ -453,7 +450,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]](#)
@@ -493,8 +490,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * RacingForMe (RFM)
  * RedBits
  * Red Star Torrent (RST) [![(invite needed)][inviteneeded]](#)
- * Redacted (PassTheHeadphones) [![(invite needed)][inviteneeded]](#)
- * Renegade
+ * Redacted (PassTheHeadphones)
  * Resurrect The Net
  * RetroFlix
  * RevolutionTT
@@ -505,13 +501,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
@@ -519,6 +516,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * SpeedCD
  * Speedmaster HD [![(invite needed)][inviteneeded]](#)
  * SpeedTorrent Reloaded [![(invite needed)][inviteneeded]](#)
+ * SpiderTK
  * Spirit of Revolution [![(invite needed)][inviteneeded]](#)
  * SportHD [![(invite needed)][inviteneeded]](#)
  * SportsCult
@@ -528,12 +526,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)
@@ -576,7 +576,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Trezzor [![(invite needed)][inviteneeded]](#)
  * TurkSeed
  * TurkTorrent (TT)
+ * turktracker
  * TV Chaos UK (TVCUK)
+ * TvRoad
  * TVstore
  * Twilight Torrents
  * Twilights Zoom
@@ -667,6 +669,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`.
 
@@ -736,7 +744,7 @@ Detailed instructions are available at [LinuxServer.io Jackett Docker](https://h
 
 
 ## Installation on Synology
-Jackett is available as a beta package from [SynoCommunity](https://synocommunity.com/)
+Jackett is available as a [beta package](https://synocommunity.com/package/jackett) from [SynoCommunity](https://synocommunity.com/)
 
 
 ## Running Jackett behind a reverse proxy
@@ -780,6 +788,7 @@ For these cases, [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr) ha
 Setting up this service is optional, most indexers don't need it.
 * Install FlareSolverr service (following their instructions)
 * Configure **FlareSolverr API URL** in Jackett. For example: http://172.17.0.2:8191
+* It is recommended to keep the default value in **FlareSolverr Max Timeout (ms)**
 
 ## Configuring OMDb
 This feature is used as a fallback (when using the aggregate Indexer) to get the movie/series title if only the IMDB ID is provided in the request.

src/Jackett.Common/Content/custom.css

@@ -247,7 +247,7 @@ pre {
     white-space: nowrap;
 }
 
-.dataTables_length select, .dataTables_filter input, .dataTable.compact tfoot td select {
+.dataTables_filter input, select {
     display: inline-block;
     height: 26px;
     padding: 0 8px;
@@ -301,6 +301,10 @@ table td.fit{
     background-color: #d0ab44;
 }
 
+.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,6 +115,12 @@ 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);
@@ -130,6 +137,7 @@ function loadJackettSettings() {
         }
 
         $("#jackett-flaresolverrurl").val(data.flaresolverrurl);
+        $("#jackett-flaresolverr-maxtimeout").val(data.flaresolverr_maxtimeout);
         $("#jackett-omdbkey").val(data.omdbkey);
         $("#jackett-omdburl").val(data.omdburl);
         var password = data.password;
@@ -162,9 +170,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";
@@ -287,6 +295,12 @@ function displayConfiguredIndexersList(indexers) {
                 "visible": true,
                 "searchable": true,
                 "orderable": true
+            },
+            {
+                "targets": 2,
+                "visible": false,
+                "searchable": true,
+                "orderable": false
             }
         ]
     });
@@ -429,6 +443,13 @@ function displayUnconfiguredIndexersList() {
                 "visible": true,
                 "searchable": false,
                 "orderable": false
+            },
+            {
+                "name": "url",
+                "targets": 7,
+                "visible": false,
+                "searchable": true,
+                "orderable": false
             }
         ]
     });
@@ -908,10 +929,14 @@ 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;
 }
 
@@ -964,7 +989,8 @@ function updateReleasesRow(row) {
         TitleLink.data("toggle", "tooltip");
         TitleLink.tooltip({
             title: TitleTooltip,
-            html: true
+            html: true,
+            placement: "auto"
         });
     }
 
@@ -1352,6 +1378,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();
@@ -1492,6 +1525,7 @@ 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_update = $("#jackett-allowupdate").is(':checked');
         var jackett_prerelease = $("#jackett-prerelease").is(':checked');
@@ -1500,6 +1534,7 @@ function bindUIButtons() {
         var jackett_cache_ttl = $("#jackett-cache-ttl").val();
         var jackett_cache_max_results_per_indexer = $("#jackett-cache-max-results-per-indexer").val();
         var jackett_flaresolverr_url = $("#jackett-flaresolverrurl").val();
+        var jackett_flaresolverr_maxtimeout = $("#jackett-flaresolverr-maxtimeout").val();
         var jackett_omdb_key = $("#jackett-omdbkey").val();
         var jackett_omdb_url = $("#jackett-omdburl").val();
 
@@ -1517,11 +1552,13 @@ function bindUIButtons() {
             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,
             cache_max_results_per_indexer: jackett_cache_max_results_per_indexer,
             flaresolverrurl: jackett_flaresolverr_url,
+            flaresolverr_maxtimeout: jackett_flaresolverr_maxtimeout,
             omdbkey: jackett_omdb_key,
             omdburl: jackett_omdb_url,
             proxy_type: jackett_proxy_type,

src/Jackett.Common/Content/custom_mobile.css

@@ -231,7 +231,7 @@ pre {
     white-space: nowrap;
 }
 
-.dataTables_length select, .dataTables_filter input, .dataTable.compact tfoot td select {
+.dataTables_filter input, select {
     display: inline-block;
     height: 26px;
     padding: 0 8px;
@@ -284,6 +284,10 @@ table td.fit{
     background-color: #d0ab44;
 }
 
+.tooltip {
+    pointer-events: none;
+}
+
 .tooltip-inner {
     max-width: 500px !important;
 }

src/Jackett.Common/Content/index.html

@@ -28,8 +28,8 @@
     <link rel="stylesheet" type="text/css" href="../bootstrap/bootstrap.min.css?changed=2017083001">
     <link rel="stylesheet" type="text/css" href="../animate.css?changed=2017083001">
     <link rel="stylesheet" type="text/css" href="../css/tagify.css?changed=11662">
-    <link rel="stylesheet" type="text/css" href="../custom.css?changed=PR12083" media="only screen and (min-device-width: 480px)">
-    <link rel="stylesheet" type="text/css" href="../custom_mobile.css?changed=11662" media="only screen and (max-device-width: 480px)">
+    <link rel="stylesheet" type="text/css" href="../custom.css?changed=20220123" media="only screen and (min-device-width: 480px)">
+    <link rel="stylesheet" type="text/css" href="../custom_mobile.css?changed=20220123" media="only screen and (max-device-width: 480px)">
     <link rel="stylesheet" type="text/css" href="../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="text" 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">
@@ -191,16 +198,20 @@
         </div>
         <div class="input-area">
             <span class="input-header">Cache TTL (seconds): </span>
-            <input id="jackett-cache-ttl" class="form-control input-right" type="text" value="" placeholder="">
+            <input id="jackett-cache-ttl" class="form-control input-right" type="text" value="" placeholder="2100">
         </div>
         <div class="input-area">
             <span class="input-header">Cache max results per indexer: </span>
-            <input id="jackett-cache-max-results-per-indexer" class="form-control input-right" type="text" value="" placeholder="">
+            <input id="jackett-cache-max-results-per-indexer" class="form-control input-right" type="text" value="" placeholder="1000">
         </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">
         </div>
+        <div class="input-area">
+          <span class="input-header">FlareSolverr Max Timeout (ms): </span>
+          <input id="jackett-flaresolverr-maxtimeout" class="form-control input-right" type="text" value="" placeholder="55000">
+        </div>
         <div class="input-area">
             <span class="input-header">OMDB API key: </span>
             <input id="jackett-omdbkey" class="form-control input-right" type="text" value="" placeholder="">
@@ -302,11 +313,12 @@
 
     <script id="configured-indexer-table" type="text/x-handlebars-template">
         <div class="tab-content configured-indexer-div">
-            <table id="configured-indexer-datatable" class="indexer-table dataTable compact cell-border hover stripe table table-responsive">
+            <table id="configured-indexer-datatable" class="indexer-table dataTable compact cell-border hover stripe table table-responsive" style="width: 100%">
                 <thead>
                     <tr>
                         <th>Indexer</th>
                         <th>Actions</th>
+                        <th data-type="hiddendata">URL</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -334,12 +346,15 @@
                                 </button>
                             </div>
                         </td>
+                        <td data-type="hiddendata">{{site_link}}</td>
                     </tr>
                     {{/each}}
                 </tbody>
                 <tfoot>
                     <tr>
-                        <td colspan="2"></td>
+                      <th></th>
+                      <th></th>
+                      <th data-type="hiddendata"></th>
                     </tr>
                 </tfoot>
             </table>
@@ -348,7 +363,7 @@
 
     <script id="unconfigured-indexer-table" type="text/x-handlebars-template">
         <div class="unconfigured-indexer-div">
-            <table id="unconfigured-indexer-datatable" class="indexer-table dataTable compact cell-border hover stripe table table-responsive">
+            <table id="unconfigured-indexer-datatable" class="indexer-table dataTable compact cell-border hover stripe table table-responsive" style="width: 100%">
                 <thead>
                     <tr>
                         <th></th>
@@ -358,6 +373,7 @@
                         <th data-type="hiddendata">Type string</th>
                         <th>Language</th>
                         <th></th>
+                        <th data-type="hiddendata">URL</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -385,6 +401,7 @@
                                 {{/if_eq}}
                             </div>
                         </td>
+                        <td data-type="hiddendata">{{site_link}}</td>
                     </tr>
                     {{/each}}
                 </tbody>
@@ -397,6 +414,7 @@
                         <th data-type="hiddendata">Type string</th>
                         <th>Language</th>
                         <th></th>
+                        <th data-type="hiddendata">URL</th>
                     </tr>
                 </tfoot>
             </table>
@@ -732,6 +750,6 @@
     </script>
 
     <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=2021103101"></script>
+    <script type="text/javascript" src="../custom.js?changed=2022012602"></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=20220123" rel="stylesheet">
 
     <title>Jackett</title>
 </head>

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

@@ -8,35 +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.tv/
-  - https://1337x.nocensor.biz/
+  - https://1337x.unblockit.day/
+  - https://1337x.nocensor.sbs/
 legacylinks:
-  - https://1337x.unblocked.earth/
-  - https://1337x.unblockit.pro/
-  - https://1337x.unblockit.one/
-  - https://1337x.black-mirror.xyz/
-  - https://1337x.unblocked.casa/
-  - https://1337x.proxyportal.fun/
-  - https://1337x.uk-unblock.xyz/
-  - https://1337x.ind-unblock.xyz/
-  - https://1337x.unblockninja.com/ # 403 Forbidden
-  - https://1337x.unblockit.me/
-  - https://1337x.unblockit.pw/
-  - https://1337x.unblockit.id/
-  - https://1337x.unblockit.win/
-  - https://1337x.unblocked.bar/
-  - https://1337x.proxyportal.pw/
-  - https://1337x.uk-unblock.pro/
-  - https://1337x.unblockit.top/
-  - https://1337x.unblockit.lat/
-  - https://1337x.unblockit.app/
-  - https://1337.root.yt/
-  - https://1337x.unblocked.rest/
   - https://1337x.unblockit.dev/
   - https://1337x.unblockit.ltd/
   - https://1337x.unblockit.link/
@@ -53,6 +31,11 @@ legacylinks:
   - https://1337x.nocensor.work/
   - 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/
 
 caps:
   categorymappings:
@@ -145,6 +128,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">FlareSolver</a> to access it.
   - name: downloadlink
     type: select
     label: Download link

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/aither-api.yml

@@ -9,7 +9,6 @@ links:
   - https://aither.cc/
 
 caps:
-  # dont forget to update the case block in the search fields category
   categorymappings:
     - {id: 1, cat: Movies, desc: "Movie"}
     - {id: 9, cat: TV/Sport, desc: "Sport"}
@@ -58,34 +57,47 @@ settings:
       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?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:
-    category:
+    categorydesc:
       selector: category
-      case:
-        "Movie": 1
-        "Sport": 9
-        "TV": 2
-        "Music": 3
-        "Games": 4
-        "Software & Apps": 10
-        "Ebooks & Magazines": 11
-        "Audiobooks": 14
-        "Education": 15
-        "XXX": 6
     title:
       selector: name
     details:
@@ -97,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:
@@ -119,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.5

src/Jackett.Common/Definitions/aither.yml

@@ -1,196 +0,0 @@
----
-id: aither
-name: Aither
-description: "Aither is a Private Torrent Tracker for HD MOVIES / TV"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://aither.cc/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Movie"}
-    - {id: 9, cat: TV/Sport, desc: "Sport"}
-    - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: Audio, desc: "Music"}
-    - {id: 4, cat: Console, desc: "Games"}
-    - {id: 10, cat: PC, desc: "Software & Apps"}
-    - {id: 11, cat: Books, desc: "Ebooks & Magazines"}
-    - {id: 14, cat: Audio/Audiobook, desc: "Audiobooks"}
-    - {id: 15, cat: Other, desc: "Education"}
-    - {id: 6, cat: XXX, desc: "XXX"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
-    movie-search: [q, imdbid, tmdbid]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: created_at
-    options:
-      created_at: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: login
-  method: form
-  form: form[action$="/login"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    remember: on
-  selectorinputs:
-    _token:
-      selector: input[name="_token"]
-      attribute: value
-  error:
-    - selector: div#ERROR_COPY
-#    test:
-#      path: /
-#      selector: a[href$="/logout"]
-
-search:
-  paths:
-    - path: torrents
-  inputs:
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    name: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
-    description: ""
-    mediainfo: ""
-    keywords: ""
-    uploader: ""
-    tmdbId: "{{ .Query.TMDBID }}"
-    imdbId: "{{ .Query.IMDBIDShort }}"
-    tvdbId: "{{ .Query.TVDBID }}"
-    malId: ""
-    startYear: ""
-    endYear: ""
-    playlistId: ""
-    collectionId: ""
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 100
-    page: 1
-    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-
-  rows:
-    selector: table > tbody > tr
-
-  fields:
-    category:
-      selector: a[href*="/categories/"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: "/categories/(\\d+)"
-    title:
-      selector: a.view-torrent
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-    details:
-      selector: a.view-torrent
-      attribute: href
-    poster:
-      selector: div.torrent-poster img
-      attribute: src
-      filters:
-        - name: replace
-          args: ["https://via.placeholder.com/90x135", ""]
-        - name: replace
-          args: ["https://via.placeholder.com/400x600", ""]
-    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:
-      selector: td:nth-last-child(1)
-      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
-        - name: re_replace
-          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
-        - name: re_replace
-          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
-        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
-        - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
-        - name: re_replace
-          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
-        - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
-        - name: re_replace
-          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
-        - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
-        - name: re_replace
-          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
-        - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
-        - name: re_replace
-          args: ["(?i) (ay)", "month"]
-        - name: re_replace
-          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
-        - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
-        - name: re_replace
-          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
-        - name: re_replace
-          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
-        - name: re_replace
-          args: ["(?i) (an)", "year"]
-        - name: re_replace
-          args: ["(?i)(För |und)", ""] # Misc removals
-        - name: timeago
-    downloadvolumefactor:
-      case:
-        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
-        i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
-        i[class*="fa-star text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-globe text-blue"]: 0 # Global Freeleech
-        i[class*="fa-star text-gold"]: 0 # Freeleech
-        i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
-        "*": 1
-    uploadvolumefactor:
-      case:
-        i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
-        i[class*="fa-globe text-green"]: 2 # Global Double Upload
-        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
-        "*": 1
-# global MR is 0.4 but torrents must be seeded for 3 days regardless of ratio
-#    minimumratio:
-#      text: 0.4
-    minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
-# UNIT3D 5.3.0

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/anime-free.yml

@@ -6,6 +6,8 @@ language: ru-RU
 type: semi-private
 encoding: windows-1251
 testlinktorrent: false
+certificates:
+  - 2b49b401259cb893f37de9eff343f7d356b1c2f2 # expired 8 ‎January ‎2022
 links:
   - https://anime-free.biz/
 legacylinks:

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

@@ -9,20 +9,22 @@ links:
   - https://animeworld.cx/
 
 caps:
-  # dont forget to update the case block in the search fields category
   categorymappings:
-    - {id: 1, cat: Movies/Other, desc: "Anime Movie"}
-    - {id: 2, cat: TV/Anime, desc: "Anime Serie"}
-    - {id: 3, cat: Audio, desc: "Anime Musik/OST"}
+    - {id: 1, cat: Movies/Other, desc: "Anime Filme"}
+    - {id: 2, cat: TV/Anime, desc: "Anime Serien"}
+    - {id: 3, cat: Audio, desc: "Anime Musik / OSTs"}
     - {id: 4, cat: PC/Games, desc: "Anime Spiele"}
-    - {id: 5, cat: XXX, desc: "Hentai"}
-    - {id: 6, cat: PC, desc: "Spiele Linux"}
+    - {id: 5, cat: XXX, desc: "Anime Hentai"}
+    - {id: 6, cat: PC, desc: "Software"}
     - {id: 7, cat: Other, desc: "Sonstiges"}
     - {id: 8, cat: Movies, desc: "Filme"}
     - {id: 9, cat: TV, desc: "Serien"}
     - {id: 10, cat: PC/Games, desc: "Spiele"}
     - {id: 11, cat: Audio, desc: "Musik"}
-    - {id: 12, cat: Books, desc: "Mangas"}
+    - {id: 12, cat: Books, desc: "Manga"}
+    - {id: 13, cat: Movies, desc: "Cartoon Filme"}
+    - {id: 14, cat: TV, desc: "Cartoon Serie"}
+    - {id: 15, cat: XXX, desc: "H-Manga / Doujinshi"}
 
   modes:
     search: [q]
@@ -60,36 +62,43 @@ settings:
       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?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
 
   fields:
-    category:
+    categorydesc:
       selector: category
-      case:
-        "Anime Movie": 1
-        "Anime Serie": 2
-        "Anime Musik/OST": 3
-        "Anime Spiele": 4
-        "Hentai": 5
-        "Spiele Linux": 6
-        "Sonstiges": 7
-        "Filme": 8
-        "Serien": 9
-        "Spiele": 10
-        "Musik": 11
-        "Mangas": 12
     title:
       selector: name
     details:
@@ -101,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:
@@ -123,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
@@ -137,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/animeworld.yml

@@ -1,193 +0,0 @@
----
-id: animeworld
-name: AnimeWorld
-description: "AnimeWorld (AW) is a GERMAN Private site for ANIME / MANGA / HENTAI"
-language: de-DE
-type: private
-encoding: UTF-8
-links:
-  - https://animeworld.cx/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies/Other, desc: "Anime Movie"}
-    - {id: 2, cat: TV/Anime, desc: "Anime Serie"}
-    - {id: 3, cat: Audio, desc: "Anime Musik/OST"}
-    - {id: 4, cat: PC/Games, desc: "Anime Spiele"}
-    - {id: 5, cat: XXX, desc: "Hentai"}
-    - {id: 6, cat: PC, desc: "Spiele Linux"}
-    - {id: 7, cat: Other, desc: "Sonstiges"}
-    - {id: 8, cat: Movies, desc: "Filme"}
-    - {id: 9, cat: TV, desc: "Serien"}
-    - {id: 10, cat: PC/Games, desc: "Spiele"}
-    - {id: 11, cat: Audio, desc: "Musik"}
-    - {id: 12, cat: Books, desc: "Mangas"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
-    movie-search: [q, imdbid, tmdbid]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: created_at
-    options:
-      created_at: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: login
-  method: form
-  form: form[action$="/login"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    remember: on
-  selectorinputs:
-    _token:
-      selector: input[name="_token"]
-      attribute: value
-  error:
-    - selector: div#ERROR_COPY
-#    test:
-#      path: /
-#      selector: a[href$="/logout"]
-
-search:
-  paths:
-    - path: torrents
-  inputs:
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    name: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
-    description: ""
-    mediainfo: ""
-    keywords: ""
-    uploader: ""
-    tmdbId: "{{ .Query.TMDBID }}"
-    imdbId: "{{ .Query.IMDBIDShort }}"
-    tvdbId: "{{ .Query.TVDBID }}"
-    malId: ""
-    startYear: ""
-    endYear: ""
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 100
-    page: 1
-    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-
-  rows:
-    selector: table > tbody > tr
-
-  fields:
-    category:
-      selector: a[href*="/categories/"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: "/categories/(\\d+)"
-    title:
-      selector: a.view-torrent
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-    details:
-      selector: a.view-torrent
-      attribute: href
-    poster:
-      selector: div.torrent-poster img
-      attribute: src
-      filters:
-        - name: replace
-          args: ["https://via.placeholder.com/90x135", ""]
-        - name: replace
-          args: ["https://via.placeholder.com/400x600", ""]
-    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:
-      selector: td:nth-last-child(1)
-      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
-        - name: re_replace
-          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
-        - name: re_replace
-          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
-        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
-        - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
-        - name: re_replace
-          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
-        - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
-        - name: re_replace
-          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
-        - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
-        - name: re_replace
-          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
-        - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
-        - name: re_replace
-          args: ["(?i) (ay)", "month"]
-        - name: re_replace
-          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
-        - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
-        - name: re_replace
-          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
-        - name: re_replace
-          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
-        - name: re_replace
-          args: ["(?i) (an)", "year"]
-        - name: re_replace
-          args: ["(?i)(För |und)", ""] # Misc removals
-        - name: timeago
-    downloadvolumefactor:
-      case:
-        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
-        i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
-        i[class*="fa-star text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-globe text-blue"]: 0 # Global Freeleech
-        i[class*="fa-star text-gold"]: 0 # Freeleech
-        i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
-        "*": 1
-    uploadvolumefactor:
-      case:
-        i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
-        i[class*="fa-globe text-green"]: 2 # Global Double Upload
-        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
-        "*": 1
-    minimumseedtime:
-      # 7 day (as seconds = 7 x 24 x 60 x 60)
-      text: 604800
-# UNIT3D 5.3.0

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)"}
@@ -126,6 +127,8 @@ search:
 
   rows:
     selector: table.torrent tr.torrent
+    filters:
+      - name: andmatch
 
   fields:
     category:

src/Jackett.Common/Definitions/asiandvdclub.yml

@@ -1,125 +0,0 @@
----
-id: asiandvdclub
-name: AsianDVDClub
-description: "AsianDVDClub (ADC) is a Private Torrent Tracker for Asian DVD and BluRay"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://asiandvdclub.org/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: TV/Anime, desc: "Anime"}
-    - {id: 3, cat: Movies, desc: "Japan"}
-    - {id: 5, cat: Movies, desc: "China"}
-    - {id: 4, cat: Movies, desc: "Korea"}
-    - {id: 2, cat: Movies, desc: "Hong Kong"}
-    - {id: 6, cat: Movies, desc: "Philippines"}
-    - {id: 7, cat: Movies, desc: "Taiwan"}
-    - {id: 8, cat: Movies, desc: "Thailand"}
-    - {id: 9, cat: Movies, desc: "Vietnam"}
-    - {id: 10, cat: Movies, desc: "Malaysia"}
-    - {id: 11, cat: Movies, desc: "Other Asian"}
-    - {id: 12, cat: Other, desc: "Miscellaneous"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
-
-login:
-  path: login
-  method: post
-  inputs:
-    apple: evil
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: p:contains("Error")
-  test:
-    path: index
-    selector: a[href="/logout"]
-
-search:
-  paths:
-    - path: torrents/
-  inputs:
-    $raw: "{{ range .Categories }}countries[]={{.}}&{{end}}"
-    searchbox: "{{ .Keywords }}"
-    search: Search
-    golden: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-
-  rows:
-    selector: table.torrenttable_helper > tbody > tr:has(img)
-
-  fields:
-    category:
-      selector: img[class^="cat-"]
-      attribute: class
-      case:
-        img.cat-anime: 1
-        img.cat-hk: 2
-        img.cat-japan: 3
-        img.cat-korea: 4
-        img.cat-china: 5
-        img.cat-phil: 6
-        img.cat-taiwan: 7
-        img.cat-thai: 8
-        img.cat-viet: 9
-        img.cat-malaysia: 10
-        img.cat-rest: 11
-        img.cat-misc: 12 # unconfirmed as there are currently no torrents for cat[12]
-    title:
-      selector: a[href^="/torrent/"]
-    details:
-      selector: a[href^="/torrent/"]
-      attribute: href
-    download:
-      selector: a[href^="/torrent/"]
-      attribute: href
-      filters:
-        - name: replace
-          args: ["torrent", "download"]
-    size:
-      selector: td:nth-last-child(6)
-    seeders:
-      selector: td:nth-last-child(5)
-    leechers:
-      selector: td:nth-last-child(4)
-    date:
-      selector: td:nth-last-child(3)
-      remove: p
-      filters:
-        - name: timeago
-    grabs:
-      selector: td:nth-last-child(2)
-    downloadvolumefactor:
-      case:
-        img[src="../images/golden.gif"]: 0
-        img[src="../images/silver.gif"]: 0.5 # unconfirmed as there are currently no silver torrents
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.5
-    minimumseedtime:
-      # 45 days (as seconds = 45 x 24 x 60 x 60)
-      text: 3888000
-# Engine n/a

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.tv/
+  - https://audiobookbay.unblockit.day/
 legacylinks:
   - https://audiobookbay.la/
-  - https://audiobookbay.unblockit.lat/
   - https://audiobookbay.unblockit.app/
   - https://audiobookbay.unblockit.dev/
   - https://audiobookbay.unblockit.ltd/
@@ -27,6 +26,11 @@ legacylinks:
   - http://audiobookbay.net/
   - 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/
 
 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/bigfangroup.yml

@@ -101,6 +101,8 @@ search:
 
   rows:
     selector: table > tbody#highlighted > tr:has(a[href^="browse.php?cat="])
+    filters:
+      - name: andmatch
 
   fields:
     category:

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,46 +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]
@@ -53,12 +58,13 @@ caps:
     music-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: sort
     type: select
     label: Sort requested from site
@@ -67,7 +73,6 @@ settings:
       1: title
       4: added
       5: size
-      7: seeders
   - name: type
     type: select
     label: Order requested from site
@@ -81,13 +86,9 @@ settings:
     default: For best results, change the <b>Torrentek száma egy oldalon:</b> setting to <b>100</b> on your account profile.
 
 login:
-  path: login.php
-  method: post
+  method: cookie
   inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: table[width="920"]:contains("Hiba")
+    cookie: "{{ .Config.cookie }}"
   test:
     path: index.php
     selector: a[href^="logout.php?k="]
@@ -105,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="])
 
   fields:
     category:
@@ -115,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
@@ -123,43 +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:last-child
+      selector: td:nth-child(6)
     date:
-      # 2021-11-09 16:51:24
-      selector: td:nth-last-child(2)
+      # 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"
-    files:
-      selector: td:nth-last-child(4)
+          args: "200601/02. -07:00"
     grabs:
-      selector: td:nth-child(2)
-      filters:
-        - name: regexp
-          args: "D:(\\d+)x"
+      selector: td:nth-child(5)
     seeders:
-      selector: td:nth-child(2)
-      filters:
-        - name: regexp
-          args: "S:(\\d+)"
+      selector: td:nth-child(3)
     leechers:
-      selector: td:nth-child(2)
-      filters:
-        - name: regexp
-          args: "L:(\\d+)"
+      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/bitsearch.yml

@@ -7,6 +7,8 @@ type: public
 encoding: UTF-8
 links:
   - https://bitsearch.to/
+  - https://bitsearch.nocensor.sbs/
+legacylinks:
   - https://bitsearch.nocensor.biz/
 
 caps:
@@ -72,8 +74,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 +90,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

@@ -119,8 +119,14 @@ search:
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
 
+  keywordsfilters:
+    - name: re_replace
+      args: ["(\\w+)", " +$1"] # prepend + to each word
+
   rows:
     selector: div.torrentrow:has(a[href^="download.php?torrent="])
+    filters:
+      - name: andmatch
 
   fields:
     category:

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,24 @@ 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/bluesbrothers.yml

@@ -119,6 +119,8 @@ search:
 
   rows:
     selector: table.table-bordered tr:has(a[href^="download.php?torrent="])
+    filters:
+      - name: andmatch
 
   fields:
     category:

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

@@ -9,7 +9,6 @@ links:
   - https://blutopia.xyz/
 
 caps:
-  # dont forget to update the case block in the search fields category
   categorymappings:
     - {id: 1, cat: Movies, desc: "Movie"}
     - {id: 2, cat: TV, desc: "TV Show"}
@@ -50,14 +49,33 @@ settings:
       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?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
@@ -65,17 +83,13 @@ search:
 
   rows:
     selector: data
+    attribute: attributes
     count:
       selector: meta.total
 
   fields:
     category:
-      selector: category
-      case:
-        Movie: 1
-        TV Show: 2
-        FANRES: 3
-        Trailer: 5
+      selector: category_id
     title:
       selector: name
     details:
@@ -87,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:
@@ -130,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/blutopia.yml

@@ -1,195 +0,0 @@
----
-id: blutopia
-name: Blutopia
-description: "Blutopia (BLU) is a Private Torrent Tracker for HD MOVIES / TV"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://blutopia.xyz/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Movie"}
-    - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: Movies/Other, desc: "FANRES"}
-    - {id: 5, cat: Movies/Other, desc: "Trailer"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
-    movie-search: [q, imdbid, tmdbid]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: created_at
-    options:
-      created_at: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: login
-  method: form
-  form: form[action$="/login"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    remember: on
-  selectorinputs:
-    _token:
-      selector: input[name="_token"]
-      attribute: value
-  error:
-    - selector: div#ERROR_COPY
-#    test:
-#      path: /
-#      selector: a[href$="/logout"]
-
-search:
-  paths:
-    - path: torrents
-  inputs:
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    name: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
-    description: ""
-    mediainfo: ""
-    keywords: ""
-    uploader: ""
-    tmdbId: "{{ .Query.TMDBID }}"
-    imdbId: "{{ .Query.IMDBIDShort }}"
-    tvdbId: "{{ .Query.TVDBID }}"
-    malId: ""
-    startYear: ""
-    endYear: ""
-    playlistId: ""
-    collectionId: ""
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 100
-    page: 1
-    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-
-  keywordsfilters:
-    - name: re_replace
-      args: ["\\.", " "]
-
-  rows:
-    selector: table > tbody > tr
-
-  fields:
-    category:
-      selector: a[href*="/categories/"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: "/categories/(\\d+)"
-    title:
-      selector: a.view-torrent
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-    details:
-      selector: a.view-torrent
-      attribute: href
-    poster:
-      selector: div.torrent-poster img
-      attribute: src
-      filters:
-        - name: replace
-          args: ["https://via.placeholder.com/90x135", ""]
-        - name: replace
-          args: ["https://via.placeholder.com/400x600", ""]
-    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:
-      selector: td:nth-last-child(1)
-      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
-        - name: re_replace
-          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
-        - name: re_replace
-          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
-        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
-        - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
-        - name: re_replace
-          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
-        - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
-        - name: re_replace
-          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
-        - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
-        - name: re_replace
-          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
-        - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
-        - name: re_replace
-          args: ["(?i) (ay)", "month"]
-        - name: re_replace
-          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
-        - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
-        - name: re_replace
-          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
-        - name: re_replace
-          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
-        - name: re_replace
-          args: ["(?i) (an)", "year"]
-        - name: re_replace
-          args: ["(?i)(För |und)", ""] # Misc removals
-        - name: timeago
-    downloadvolumefactor:
-      case:
-        span.torrent-listings-global-freeleech: 0
-        span.torrent-listings-personal-freeleech: 0
-        span.torrent-listings-freeleech-token: 0
-        span.torrent-listings-featured: 0
-        span.torrent-listings-freeleech[data-original-title*="25%"]: 0.75
-        span.torrent-listings-freeleech[data-original-title*="50%"]: 0.5
-        span.torrent-listings-freeleech[data-original-title*="75%"]: 0.25
-        span.torrent-listings-freeleech[data-original-title*="100%"]: 0
-        span.torrent-listings-special-freeleech: 0
-        "*": 1
-    uploadvolumefactor:
-      case:
-        span.torrent-listings-global-double-upload: 2
-        span.torrent-listings-double-upload: 2
-        span.torrent-listings-featured: 2
-        span.torrent-listings-special-double-upload: 2
-        "*": 1
-# global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
-#    minimumratio:
-#      text: 0.4
-    minimumseedtime:
-      # 7 day (as seconds = 7 x 24 x 60 x 60)
-      text: 604800
-# UNIT3D 5.3.1b

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

@@ -9,13 +9,13 @@ links:
   - https://brsociety.club/
 
 caps:
-  # dont forget to update the case block in the search fields category
   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]
@@ -51,6 +51,16 @@ settings:
       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
@@ -58,22 +68,16 @@ 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
 
   fields:
-    category:
+    categorydesc:
       selector: category
-      case:
-        "Cursos": 1
-        "eBooks": 2
-        "Revistas": 5
-        "Audiobooks": 3
-        "Arquivos de Auxilio": 4
     title:
       selector: name
     details:

src/Jackett.Common/Definitions/brsociety.yml

@@ -1,183 +0,0 @@
----
-id: brsociety
-name: BrSociety
-description: "BrSociety (SemeandoCC) is a BRAZILIAN Private Torrent Tracker for E-LEARNING"
-language: pt-BR
-type: private
-encoding: UTF-8
-links:
-  - https://brsociety.club/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: TV, desc: "Cursos (courses)"}
-    - {id: 2, cat: Books/EBook, desc: "eBooks"}
-    - {id: 5, cat: Books/Mags, desc: "Revistas (Magazines)"}
-    - {id: 3, cat: Audio/Audiobook, desc: "Audiobooks"}
-    - {id: 4, cat: Other, desc: "Arquivos de Auxilio (Help Files)"}
-
-  modes:
-    search: [q]
-    tv-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: created_at
-    options:
-      created_at: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: login
-  method: form
-  form: form[action$="/login"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    remember: on
-  selectorinputs:
-    _token:
-      selector: input[name="_token"]
-      attribute: value
-  error:
-    - selector: div#ERROR_COPY
-#    test:
-#      path: /
-#      selector: a[href$="/logout"]
-
-search:
-  paths:
-    - path: torrents
-  inputs:
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    name: "{{ .Keywords }}"
-    description: ""
-    mediainfo: ""
-    keywords: ""
-    uploader: ""
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 100
-    page: 1
-    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-
-  rows:
-    selector: table > tbody > tr
-
-  fields:
-    category:
-      selector: a[href*="/categories/"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: "/categories/(\\d+)"
-    title:
-      selector: a.view-torrent
-    download:
-      selector: a[href*="/download_check/"]
-      attribute: href
-      filters:
-        - name: replace
-          args: ["download_check", "download"]
-    details:
-      selector: a.view-torrent
-      attribute: href
-    poster:
-      selector: div.torrent-poster img
-      attribute: src
-      filters:
-        - name: replace
-          args: ["https://via.placeholder.com/90x135", ""]
-        - name: replace
-          args: ["https://via.placeholder.com/400x600", ""]
-    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:
-      selector: td:nth-last-child(1)
-      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
-        - name: re_replace
-          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
-        - name: re_replace
-          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
-        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
-        - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
-        - name: re_replace
-          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
-        - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
-        - name: re_replace
-          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
-        - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
-        - name: re_replace
-          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
-        - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
-        - name: re_replace
-          args: ["(?i) (ay)", "month"]
-        - name: re_replace
-          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
-        - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
-        - name: re_replace
-          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
-        - name: re_replace
-          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
-        - name: re_replace
-          args: ["(?i) (an)", "year"]
-        - name: re_replace
-          args: ["(?i)(För |und)", ""] # Misc removals
-        - name: timeago
-    downloadvolumefactor:
-      case:
-        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
-        i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
-        i[class*="fa-star text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-globe text-blue"]: 0 # Global Freeleech
-        i[class*="fa-star text-gold"]: 0 # Freeleech
-        i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
-        "*": 1
-    uploadvolumefactor:
-      case:
-        i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
-        i[class*="fa-globe text-green"]: 2 # Global Double Upload
-        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
-        "*": 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 5 days (as seconds = 5 x 24 x 60 x 60)
-      text: 432000
-# UNIT3D 5.3.0

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

@@ -193,4 +193,10 @@ search:
         i[class*="fa-globe text-green"]: 2 # Global Double Upload
         i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
         "*": 1
+# global MR is 0.5 but torrents must be seeded for 7 days regardless of ratio
+#    minimumratio:
+#      text: 0.5
+    minimumseedtime:
+      # 7 day (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
 # UNIT3D 1.9.3

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/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:

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:
@@ -55,17 +56,17 @@ settings:
     default: false
   - name: sort
     type: select
-    label: Sort requested from site (Only works for searches with Keywords)
-    default: ?trie-date-d
+    label: Sort requested from site (Works only for searches with Keywords)
+    default: trie-date-d
     options:
-      ?trie-date-d: created desc
-      ?trie-date-a: created asc
-      ?trie-seeds-d: seeders desc
-      ?trie-seeds-a: seeders asc
-      ?trie-poid-d: size desc
-      ?trie-poid-a: size asc
-      ?trie-nom-d: title desc
-      ?trie-nom-a: title asc
+      trie-date-d: created desc
+      trie-date-a: created asc
+      trie-seeds-d: seeders desc
+      trie-seeds-a: seeders asc
+      trie-poid-d: size desc
+      trie-poid-a: size asc
+      trie-nom-d: title desc
+      trie-nom-a: title asc
 
 download:
   selectors:
@@ -74,7 +75,7 @@ download:
 
 search:
   paths:
-    - path: "{{ if .Keywords }}search_torrent/{{ .Keywords }}{{ .Config.sort }}{{ else }}home/{{ end }}"
+    - path: "{{ if .Keywords }}search_torrent/{{ .Keywords }}.html,{{ .Config.sort }}{{ else }}home/{{ end }}"
 
   rows:
     selector: table.table-corps > tbody > tr:has(a)

src/Jackett.Common/Definitions/crackingpatching.yml

@@ -0,0 +1,98 @@
+---
+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: "crack-serials", cat: PC, desc: "Crack &Serials"}
+    - {id: "downloader", cat: PC, desc: "Downloader"}
+    - {id: "drivers-update", cat: PC, desc: "Drivers Update"}
+    - {id: "idm", cat: PC, desc: "IDM Crack | Patch"}
+    - {id: "home", cat: PC, desc: "Home"}
+    - {id: "other", cat: Other, desc: "Other"}
+    - {id: "recovery-software", cat: PC, desc: "Recovery Software"}
+    - {id: "screen-recorders", cat: PC, desc: "Screen Recorders"}
+    - {id: "security", cat: PC, desc: "Security"}
+    - {id: "system-optimizers", cat: PC, desc: "System Optimizers"}
+    - {id: "vpn", cat: PC, desc: "VPN"}
+    - {id: "windows-app", cat: PC, desc: "Windows App"}
+    - {id: "converters", cat: PC, desc: "Converters"}
+    - {id: "games", cat: PC/Games, desc: "Games"}
+    - {id: "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: "pdf-tools", cat: PC, desc: "PDF Tools"}
+    - {id: "photo-editing-tools", cat: PC, desc: "Photo Editing Tools"}
+    - {id: "request-crack-patch", cat: PC, desc: "Request Crack/ Patch"}
+    - {id: "uncategorized", cat: Other, desc: "Uncategorized"}
+    - {id: "windows", cat: PC, desc: "Windows"}
+
+  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:
+      selector: article.post-entry
+      attribute: class
+      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:

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

@@ -14,31 +14,29 @@ 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: 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 +46,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: 130, cat: TV/HD, desc: "Internal Serien HD"}
+    - {id: 128, cat: Movies/HD, desc: "Internal Film HD"}
     - {id: 131, cat: TV/SD, desc: "Internal Serien SD"}
+    - {id: 130, cat: TV/HD, desc: "Internal Serien HD"}
     - {id: 132, cat: Other, desc: "Internal Sonstiges"}
 
   modes:
@@ -154,31 +151,29 @@ search:
       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
+        ":has(div.kat_cat_pic_name:contains(\"Filme\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 28
+        ":has(div.kat_cat_pic_name:contains(\"Filme\")):has(div.kat_cat_pic_name_b:contains(\"UHD\"))": 114
+        ":has(div.kat_cat_pic_name:contains(\"Filme\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 32
+        ":has(div.kat_cat_pic_name:contains(\"Filme\")):has(div.kat_cat_pic_name_b:contains(\"Pack`s\"))": 138
         # Serien
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"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
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"UHD\"))": 139
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 57
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack`s\"))": 59
         # Audio
-        ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Videos\"))": 120
+        ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"MP3\"))": 110
         ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Flac\"))": 48
         ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": 52
-        ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"MP3\"))": 110
         ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Hörbuch\"))": 63
+        ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Videos\"))": 120
         # App
         ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": 12
         ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Mobil\"))": 11
         ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"macOS\"))": 125
         # Doku
-        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 14
         ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 15
+        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 14
+        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"Reihe\"))": 123
         # Spiel
         ":has(div.kat_cat_pic_name:contains(\"Spiel\")):has(div.kat_cat_pic_name_b:contains(\"Mobil\"))": 126
         ":has(div.kat_cat_pic_name:contains(\"Spiel\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": 17
@@ -188,19 +183,18 @@ search:
         ":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
+        ":has(div.kat_cat_pic_name:contains(\"ePaper\")):has(div.kat_cat_pic_name_b:contains(\"Zeitungen\"))": 96
+        ":has(div.kat_cat_pic_name:contains(\"ePaper\")):has(div.kat_cat_pic_name_b:contains(\"E-Book\"))": 136
+        ":has(div.kat_cat_pic_name:contains(\"ePaper\")):has(div.kat_cat_pic_name_b:contains(\"Comics\"))": 137
         # XXX
+        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 76
         ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 73
         ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": 75
-        ":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(\"Film HD\"))": 128
         ":has(div.kat_cat_pic_name:contains(\"Internal\")):has(div.kat_cat_pic_name_b:contains(\"Serien SD\"))": 131
+        ":has(div.kat_cat_pic_name:contains(\"Internal\")):has(div.kat_cat_pic_name_b:contains(\"Serien HD\"))": 130
         ":has(div.kat_cat_pic_name:contains(\"Internal\")):has(div.kat_cat_pic_name_b:contains(\"Sonstiges\"))": 132
     title:
       selector: a.selection_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

@@ -12,9 +12,8 @@ legacylinks:
   - https://datascene.net/
 
 caps:
-  # dont forget to update the case block in the search fields category
   categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 1, cat: Movies, desc: "Movie"}
     - {id: 2, cat: TV, desc: "TV"}
     - {id: 3, cat: Audio, desc: "Music"}
     - {id: 4, cat: PC/Games, desc: "Game"}
@@ -59,6 +58,16 @@ settings:
       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
@@ -66,25 +75,16 @@ 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
 
   fields:
-    category:
+    categorydesc:
       selector: category
-      case:
-        "Movie": 1
-        "TV": 2
-        "Music": 3
-        "Game": 4
-        "Application": 5
-        "XXX": 6
-        "Mobile": 7
-        "E-Book": 8
     title:
       selector: name
     details:
@@ -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/datascene.yml

@@ -1,197 +0,0 @@
----
-id: datascene
-name: DataScene
-description: "DataScene (DS) is a ROMANIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://datascene.xyz/
-legacylinks:
-  - http://datascene.net/
-  - https://datascene.net/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
-    - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: Audio, desc: "Music"}
-    - {id: 4, cat: PC/Games, desc: "Game"}
-    - {id: 5, cat: PC/0day, desc: "Application"}
-    - {id: 6, cat: XXX, desc: "XXX"}
-    - {id: 7, cat: PC/Mobile-Other, desc: "Mobile"}
-    - {id: 8, cat: Books/EBook, desc: "E-Book"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
-    movie-search: [q, imdbid, tmdbid]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: created_at
-    options:
-      created_at: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: login
-  method: form
-  form: form[action$="/login"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    remember: on
-  selectorinputs:
-    _token:
-      selector: input[name="_token"]
-      attribute: value
-  error:
-    - selector: div#ERROR_COPY
-#    test:
-#      path: /
-#      selector: a[href$="/logout"]
-
-search:
-  paths:
-    - path: torrents
-  inputs:
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    name: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
-    description: ""
-    mediainfo: ""
-    keywords: ""
-    uploader: ""
-    tmdbId: "{{ .Query.TMDBID }}"
-    imdbId: "{{ .Query.IMDBIDShort }}"
-    tvdbId: "{{ .Query.TVDBID }}"
-    malId: ""
-    startYear: ""
-    endYear: ""
-    playlistId: ""
-    collectionId: ""
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 100
-    page: 1
-    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-
-  rows:
-    selector: table > tbody > tr
-
-  fields:
-    category:
-      selector: a[href*="/categories/"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: "/categories/(\\d+)"
-    title:
-      selector: a.view-torrent
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-    details:
-      selector: a.view-torrent
-      attribute: href
-    poster:
-      selector: div.torrent-poster img
-      attribute: src
-      filters:
-        - name: replace
-          args: ["https://via.placeholder.com/90x135", ""]
-        - name: replace
-          args: ["https://via.placeholder.com/400x600", ""]
-    size:
-      selector: td:nth-last-child(4)
-    seeders:
-      selector: td:nth-last-child(3)
-    leechers:
-      selector: td:nth-last-child(2)
-    grabs:
-      selector: td:nth-last-child(1)
-    date:
-      selector: td:has(a.view-torrent) spam:last-child span:last-child
-      remove: a
-      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
-        - name: re_replace
-          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
-        - name: re_replace
-          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
-        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
-        - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
-        - name: re_replace
-          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
-        - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
-        - name: re_replace
-          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
-        - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
-        - name: re_replace
-          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
-        - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
-        - name: re_replace
-          args: ["(?i) (ay)", "month"]
-        - name: re_replace
-          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
-        - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
-        - name: re_replace
-          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
-        - name: re_replace
-          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
-        - name: re_replace
-          args: ["(?i) (an)", "year"]
-        - name: re_replace
-          args: ["(?i)(För |und)", ""] # Misc removals
-        - name: timeago
-    downloadvolumefactor:
-      case:
-#        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
-#        i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
-#        i[class*="fa-star text-bold"]: 0 # Freeleech From Token
-#        i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-trophy  data-toggle"]: 0 # Global Freeleech
-#        i[class*="fa-star text-gold"]: 0 # Freeleech
-#        i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
-        "*": 1
-    uploadvolumefactor:
-      case:
-        i[class*="fa-angle-double-up"]: 2 # Single Torrent Double Upload
-#        i[class*="fa-globe text-green"]: 2 # Global Double Upload
-#        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
-        "*": 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
-# UNIT3D 5.3.0 (custom)

src/Jackett.Common/Definitions/demonoid.yml

@@ -1,7 +1,7 @@
 ---
 id: demonoid
 name: Demonoid
-description: "Demonoid is a Public torrent site for MOVIES / TV / GENERAL"
+description: "Demonoid is a Semi-Private torrent site for MOVIES / TV / GENERAL"
 language: en-US
 type: semi-private
 encoding: UTF-8
@@ -11,22 +11,10 @@ links:
   - https://www.dnoid.to/
   - https://www.dnoid.pw/
   - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.ly/
-  - https://demonoid.unblockit.tv/
+  - https://demonoid.unblockit.day/
   - https://demonoid.torrentbay.to/
-  - https://demonoid.nocensor.biz/
+  - https://demonoid.nocensor.sbs/
 legacylinks:
-  - https://demonoid.unblockit.pro/
-  - https://demonoid.unblockit.one/
-  - https://demonoid.unblockit.me/
-  - https://dnoid.black-mirror.xyz/
-  - https://dnoid.unblocked.casa/
-  - https://dnoid.proxyportal.fun/
-  - https://dnoid.uk-unblock.xyz/
-  - https://dnoid.ind-unblock.xyz/
-  - https://demonoid.unblockit.pw/
-  - https://demonoid.unblockit.id/
-  - https://demonoid.unblockit.win/
-  - https://demonoid.unblockit.top/
   - https://demonoid.unblockit.lat/
   - https://demonoid.unblockit.app/
   - https://demonoid.unblockit.dev/
@@ -43,6 +31,10 @@ legacylinks:
   - https://demonoid.nocensor.work/
   - https://demonoid.unblockit.kim/
   - https://demonoid.unblockit.bz/
+  - https://demonoid.unblockit.tv/
+  - https://demonoid.unblockit.how/
+  - https://demonoid.unblockit.cam/
+  - https://demonoid.nocensor.biz/
 
 caps:
   categorymappings:
@@ -357,10 +349,10 @@ search:
 
   rows:
     # only the default theme "Demonoid - v5" is supported
-    selector: table.table:has(td.torrent__table-today) > tbody > tr:has(td[class^="tone_"])
+    selector: table.table tbody tr.table__row:has(td[class*="tone_"])
     after: 1
     dateheaders:
-      selector: tr td.torrent__table-today:not(:contains("Sponsored links"))
+      selector: tr td.table__separator:not(:contains("Sponsored links"))
       filters:
         - name: replace
           args: ["Added ", ""]
@@ -368,27 +360,30 @@ search:
           args: ["on ", ""]
 
   fields:
-    title_default:
-      selector: a[href^="/files/details/"]
-    title_optional:
-      selector: a[href^="/files/details/"]
-      optional: true
-      attribute: title
-    title:
-      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
     category:
-      selector: span.torrent__table-info > a:nth-child(2)
+      selector: span.table__column__subtext > a:nth-child(2)
       attribute: href
       optional: true
       filters:
         - name: querystring
           args: subcategory
+    title:
+      selector: a[href^="/files/details/"]
     details:
       selector: a[href^="/files/details/"]
       attribute: href
     download:
       selector: a[href^="/files/details/"]
       attribute: href
+    poster:
+      selector: div[title]
+      attribute: data-bs-content
+      filters:
+        - name: regexp
+          args: src='(.+?)'
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
     description:
       selector: td:nth-last-child(7)
     size:

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

@@ -10,7 +10,6 @@ links:
   - https://desitorrents.rocks/
 
 caps:
-  # dont forget to update the case block in the search fields category
   categorymappings:
     - {id: 1, cat: Movies, desc: "Movies"}
     - {id: 2, cat: TV, desc: "TV"}
@@ -51,6 +50,16 @@ settings:
       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
@@ -58,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
@@ -66,16 +74,13 @@ search:
 
   rows:
     selector: data
+    attribute: attributes
     count:
       selector: meta.total
 
   fields:
-    category:
+    categorydesc:
       selector: category
-      case:
-        Movies: 1
-        TV: 2
-        Music: 3
     title:
       selector: name
     details:
@@ -87,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/desitorrents.yml

@@ -1,187 +0,0 @@
----
-id: desitorrents
-name: DesiTorrents
-description: "Desitorrents is a Private Torrent Tracker for BOLLYWOOD / TOLLYWOOD / MUSIC"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://desitorrents.tv/
-  - https://desitorrents.rocks/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
-    - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: Audio, desc: "Music"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
-    movie-search: [q, imdbid, tmdbid]
-    music-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: created_at
-    options:
-      created_at: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: login
-  method: form
-  form: form[action$="/login"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    remember: on
-  selectorinputs:
-    _token:
-      selector: input[name="_token"]
-      attribute: value
-  error:
-    - selector: div#ERROR_COPY
-#    test:
-#      path: /
-#      selector: a[href$="/logout"]
-
-search:
-  paths:
-    - path: torrents
-  inputs:
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    name: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
-    description: ""
-    mediainfo: ""
-    keywords: ""
-    uploader: ""
-    tmdbId: "{{ .Query.TMDBID }}"
-    imdbId: "{{ .Query.IMDBIDShort }}"
-    tvdbId: "{{ .Query.TVDBID }}"
-    malId: ""
-    startYear: ""
-    endYear: ""
-    playlistId: ""
-    collectionId: ""
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 100
-    page: 1
-    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-
-  rows:
-    selector: table > tbody > tr:has(a[href*="/download/"])
-
-  fields:
-    category:
-      selector: a[href*="/categories/"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: "/categories/(\\d+)"
-    title:
-      selector: td div a
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-    details:
-      selector: td div a
-      attribute: href
-    poster:
-      selector: div img
-      attribute: src
-      filters:
-        - name: replace
-          args: ["https://via.placeholder.com/90x135", ""]
-        - name: replace
-          args: ["https://via.placeholder.com/400x600", ""]
-    size:
-      selector: td:nth-last-child(6)
-    seeders:
-      selector: td:nth-last-child(5)
-    leechers:
-      selector: td:nth-last-child(4)
-    grabs:
-      selector: td:nth-last-child(3)
-    date:
-      selector: td:nth-last-child(2)
-      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
-        - name: re_replace
-          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
-        - name: re_replace
-          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
-        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
-        - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
-        - name: re_replace
-          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
-        - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
-        - name: re_replace
-          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
-        - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
-        - name: re_replace
-          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
-        - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
-        - name: re_replace
-          args: ["(?i) (ay)", "month"]
-        - name: re_replace
-          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
-        - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
-        - name: re_replace
-          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
-        - name: re_replace
-          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
-        - name: re_replace
-          args: ["(?i) (an)", "year"]
-        - name: re_replace
-          args: ["(?i)(För |und)", ""] # Misc removals
-        - name: timeago
-    downloadvolumefactor:
-      case:
-        i[class*="fa-id-badge"]: 0 # 24 Hour FreeLeech From BON Store
-        i[class*="fa-trophy"]: 0 # Special FreeLeech For Certain User Groups
-        i[class*="fa-coins"]: 0 # Freeleech From Token
-        i[class*="fa-globe"]: 0 # Global Freeleech
-        i[class*="fa-star"]: 0 # Freeleech
-        i[class*="fa-certificate"]: 0 # Featured Torrent
-        "*": 1
-    uploadvolumefactor:
-      case:
-        i[class*="fa-gem"]: 2 # Single Torrent Double Upload
-        i[class*="fa-globe"]: 2 # Global Double Upload
-        i[class*="fa-certificate"]: 2 # Featured Torrent
-        "*": 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 7 day (as seconds = 7 x 24 x 60 x 60)
-      text: 604800
-# UNIT3D 5.3.0 (custom)

src/Jackett.Common/Definitions/digitalcore.yml

@@ -14,6 +14,7 @@ caps:
     - {id: 2, cat: Movies/SD, desc: Movies/SD}
     - {id: 3, cat: Movies/BluRay, desc: Movies/BluRay}
     - {id: 4, cat: Movies/UHD, desc: Movies/4K}
+    - {id: 38, cat: Movies/UHD, desc: Movies/UHD}
     - {id: 5, cat: Movies/HD, desc: Movies/720p}
     - {id: 6, cat: Movies/HD, desc: Movies/1080p}
     - {id: 7, cat: Movies/HD, desc: Movies/PACKS}
@@ -33,6 +34,8 @@ caps:
     - {id: 23, cat: Audio/Lossless, desc: Music/FLAC}
     - {id: 24, cat: Audio/Video, desc: Music/MTV}
     - {id: 29, cat: Audio, desc: Music/PACKS}
+    - {id: 39, cat: Audio/Video, desc: Music/DVD}
+    - {id: 40, cat: Audio/Video, desc: Music/Bluray}
     - {id: 25, cat: PC/Games, desc: Games/PC}
     - {id: 26, cat: Console, desc: Games/NSW}
     - {id: 27, cat: PC/Mac, desc: Games/Mac}
@@ -44,6 +47,7 @@ caps:
     - {id: 36, cat: XXX, desc: XXX/Movies/HD}
     - {id: 37, cat: XXX/UHD, desc: XXX/Movies/4K}
     - {id: 34, cat: XXX/ImageSet, desc: XXX/Imagesets}
+    - {id: 41, cat: XXX, desc: XXX/PACKS}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/docspedia.yml

@@ -10,24 +10,25 @@ links:
 
 caps:
   categorymappings:
+    - {id: 77, cat: PC, desc: "3D Models"}
     - {id: 65, cat: Audio, desc: "Audio"}
     - {id: 64, cat: Books/EBook, desc: "Books"}
-    - {id: 66, cat: TV, desc: "Business"}
+    - {id: 66, cat: Books, desc: "Business"}
     - {id: 68, cat: Books/Comics, desc: "Comics"}
-    - {id: 67, cat: TV, desc: "Development"}
-    - {id: 60, cat: TV/Documentary, desc: "Documentaries"}
+    - {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"}
     - {id: 71, cat: Other, desc: "Fonts"}
-    - {id: 62, cat: Other, desc: "Graphic"}
     - {id: 72, cat: Books, desc: "IT Books"}
     - {id: 57, cat: Books/Mags, desc: "Magazine"}
-    - {id: 58, cat: TV, desc: "Medicine"}
+    - {id: 58, cat: Books, desc: "Medicine"}
     - {id: 70, cat: Books/EBook, desc: "Occult"}
     - {id: 74, cat: Audio, desc: "Podcasts"}
     - {id: 69, cat: Other, desc: "PS Resources"}
     - {id: 76, cat: Books, desc: "Self-Help"}
     - {id: 56, cat: TV/Sport, desc: "Sports"}
-    - {id: 59, cat: TV, desc: "Video"}
-    - {id: 61, cat: TV, desc: "Video tutorials"}
+    - {id: 61, cat: Other, desc: "Tutorials"}
 
   modes:
     search: [q]

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">FlareSolver</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/ebooks-shares.yml

@@ -242,8 +242,8 @@ caps:
     - {id: 307, cat: Books/Other, desc: "VIP: Thriller"}
     - {id: 306, cat: Books/Other, desc: "VIP: Mystery"}
     - {id: 308, cat: Books/Other, desc: "VIP: Crime"}
-    - {id: 309, cat: Books/Other, desc: "VIP: Fantasy "}
-    - {id: 204, cat: Books/Other, desc: "VIP: Collections "}
+    - {id: 309, cat: Books/Other, desc: "VIP: Fantasy"}
+    - {id: 204, cat: Books/Other, desc: "VIP: Collections"}
     - {id: 205, cat: Books/Other, desc: "VIP: Audiobooks"}
     - {id: 206, cat: Books/Other, desc: "VIP: Comics"}
     - {id: 207, cat: Books/Other, desc: "VIP: Computers"}
@@ -274,6 +274,10 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
+  - name: vip
+    type: checkbox
+    label: Include VIP results
+    default: true
   - name: sort
     type: select
     label: Sort requested from site
@@ -316,10 +320,9 @@ search:
   paths:
     - path: torrents-search.php
   inputs:
-    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
     search: "{{ if .Keywords }}\"{{ .Keywords }}\"{{ else }}{{ end }}"
     # 0 only active 1 incl dead 2 only dead
-    incldead: 0
+    incldead: 1
     # 0 all 1 not freeleech 2 only freeleech
     freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
     # 0 all 1 english 2 french 3 german 4 italian 5 japanese 6 spanish 7 russian 8 other
@@ -328,7 +331,7 @@ search:
     order: "{{ .Config.type }}"
 
   rows:
-    selector: tr.t-row
+    selector: "tr.t-row{{ if .Config.vip }}{{ else }}:not(:has(a[href^=\"torrents.php?cat=\"]):contains(\"VIP\")){{ end }}"
 
   fields:
     category:

src/Jackett.Common/Definitions/efectodoppler.yml

@@ -1,146 +0,0 @@
----
-id: efectodoppler
-name: Efecto Doppler
-description: "Efecto Doppler is a SPANISH Private Torrent Tracker for MUSIC"
-language: es-ES
-type: private
-encoding: UTF-8
-links:
-  - https://efectodoppler.pw/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Audio, desc: "Música"}
-    - {id: 2, cat: PC, desc: "Aplicaciones"}
-    - {id: 3, cat: Books/EBook, desc: "Libros Electrónicos"}
-    - {id: 4, cat: Audio/Audiobook, desc: "Audiolibros"}
-    - {id: 5, cat: Audio/Video, desc: "Vídeos de aprendizaje"}
-    - {id: 6, cat: Books/Comics, desc: "Comedia"}
-    - {id: 7, cat: Books/Mags, desc: "Revistas"}
-
-  modes:
-    search: [q]
-    music-search: [q, album, artist]
-    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: time
-    options:
-      time: created
-      seeders: seeders
-      size: size
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: login.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    keeplogged: 1
-  error:
-    - selector: form > span.warning
-  test:
-    path: index.php
-    selector: a[href^="logout.php?auth="]
-
-search:
-  paths:
-    - path: torrents.php
-  inputs:
-    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
-    searchstr: "{{ .Keywords }}"
-    artistname: "{{ .Query.Artist }}"
-    groupname: "{{ .Query.Album }}"
-    order_by: "{{ .Config.sort }}"
-    order_way: "{{ .Config.type }}"
-    # 1 gold, 2 neutral, 3 other, 0 normal
-    freetorrent: "{{ if .Config.freeleech }}3{{ else }}{{ end }}"
-
-  rows:
-    selector: tr.torrent
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: div.tooltip
-      case:
-        div.cats_música: 1
-        div.cats_aplicaciones: 2
-        div.cats_libroselectrónicos: 3
-        div.cats_audiolibros: 4
-        div.cats_vídeosdeaprendizaje: 5
-        div.cats_comedia: 6
-        div.cats_revistas: 7
-    artist:
-      selector: a[href^="artist.php?id="]
-      optional: true
-    title:
-      selector: a[href^="torrents.php?id="]
-      filters:
-        - name: prepend
-          args: "{{ if .Result.artist }}{{ .Result.artist }}{{ else }}Varios artistas{{ end }} - "
-    details:
-      selector: a[href^="torrents.php?id="]
-      attribute: href
-    poster:
-      selector: div.group_image img
-      attribute: src
-    download:
-      selector: a[href^="torrents.php?action=download&id="]
-      attribute: href
-    description:
-      selector: div.torrent_info
-    files:
-      selector: td:nth-child(3)
-    date:
-      selector: td:nth-child(4) span
-      attribute: title
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "Jan 02 2006, 15:04 -07:00"
-    size:
-      selector: td:nth-child(5)
-    grabs:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
-    downloadvolumefactor:
-      case:
-        strong.torrent_label[title*="Neutral"]: 0
-        strong.torrent_label[title*="Oro"]: 0
-        "*": 1
-    uploadvolumefactor:
-      case:
-        strong.torrent_label[title*="Neutral"]: 0
-        "*": 1
-    minimumratio:
-      text: 0.6
-    minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
-# engine n/a

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://elitetorrent.la/
+  - https://elitetorrent.nocensor.sbs/
 legacylinks:
   - https://www.elitetorrent.biz/
   - https://www.elitetorrent.io/
@@ -27,6 +27,8 @@ legacylinks:
   - https://elitetorrent.si/
   - https://elitetorrent.nocensor.work/
   - https://elitetorrent.com/
+  - https://elitetorrent.app/
+  - https://elitetorrent.nocensor.biz/
 
 caps:
   categories:

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:
@@ -155,6 +155,8 @@ search:
 
   rows:
     selector: tr[id^="tor_"]:has(a[href^="./dl.php?id="])
+    filters:
+      - name: andmatch
 
   fields:
     title:

src/Jackett.Common/Definitions/ettv.yml

@@ -1,199 +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.tv/
-  - https://ettv.nocensor.biz/
-legacylinks:
-  - https://www.ettv.tv/
-  - https://www.ettv.to/
-  - https://ettv.unblockit.pro/
-  - https://ettv.unblockit.one/
-  - https://ettv.black-mirror.xyz/
-  - https://ettv.unblocked.casa/
-  - https://ettv.proxyportal.fun/
-  - https://ettv.uk-unblock.xyz/
-  - https://ettv.ind-unblock.xyz/
-  - https://ettv.unblockit.me/
-  - https://ettv.unblockit.pw/
-  - https://ettv.unblockit.id/
-  - https://ettv.unblockit.win/
-  - https://www.ettvdl.com/
-  - https://ettv.unblocked.bar/
-  - https://ettv.proxyportal.pw/
-  - https://ettv.uk-unblock.pro/
-  - https://ettv.root.yt/
-  - https://www.ettv.be/
-  - https://ettv.unblockit.top/
-  - https://ettv.unblockit.lat/
-  - https://ettv.unblockit.app/
-  - https://ettv.unblocked.rest/
-  - 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/
-
-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,12 +7,16 @@ type: public
 encoding: UTF-8
 links:
   - https://extratorrent.st/
-  - https://extratorrent.unblockit.tv/
-  - https://extratorrent.nocensor.biz/
+  - https://extratorrent.unblockit.day/
+  - 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/
 
 caps:
   categorymappings:
@@ -35,6 +39,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/extremetorrents.yml

@@ -80,6 +80,8 @@ download:
   selectors:
     - selector: a[href^="downloadv1.php?id="]
       attribute: href
+    - selector: a[href^="download.php?id="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/eztv.yml

@@ -12,35 +12,13 @@ links:
   - https://eztv.tf/
   - https://eztv.yt/
   - https://eztv.unblockninja.com/
-  - https://eztv.unblockit.tv/
-  - https://eztv.nocensor.biz/
+  - https://eztv.unblockit.day/
+  - 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.unblockit.pro/
-  - https://eztv.unblockit.one/
-  - https://eztv.black-mirror.xyz/
-  - https://eztv.unblocked.casa/
-  - https://eztv.proxyportal.fun/
-  - https://eztv.uk-unblock.xyz/
-  - https://eztv.ind-unblock.xyz/
-  - https://eztv.unblockit.me/
-  - https://eztv.unblockit.pw/
-  - https://eztv.unblockit.id/
-  - https://eztv.unblockit.win/
-  - https://eztv.unblocked.bar/
-  - https://eztv.proxyportal.pw/
-  - https://eztv.uk-unblock.pro/
-  - https://eztv.unblockit.top/
-  - https://eztv.unblockit.lat/
   - https://eztv.io/
-  - https://eztv.unblockit.app/
-  - https://eztv.root.yt/
-  - https://eztv.unblocked.rest/
-  - https://eztv.unblockit.dev/
-  - https://eztv.unblockit.ltd/
-  - https://eztv.unblockit.link/
   - https://eztv.unblockit.buzz/
   - https://eztv.unblocked.monster/
   - https://eztv.unblockit.club/
@@ -53,6 +31,10 @@ legacylinks:
   - https://eztv.nocensor.work/
   - https://eztv.unblockit.kim/
   - https://eztv.unblockit.bz/
+  - https://eztv.unblockit.tv/
+  - https://eztv.unblockit.how/
+  - https://eztv.unblockit.cam/
+  - https://eztv.nocensor.biz/
 
 caps:
   categories:
@@ -66,14 +48,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

@@ -143,4 +143,10 @@ search:
         "*": 1
     uploadvolumefactor:
       text: 1
+    minimumratio:
+      text: 0.5
+    # MR is reduced but not removed if MST is met
+    # minimumseedtime:
+    #   # 3 days (as seconds = 3 x 24 x 60 x 60)
+    #   text: 259200
 # luminance

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/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">FlareSolver</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"}
@@ -98,6 +98,8 @@ search:
 
   rows:
     selector: table.main > tbody >  tr:has(a[href^="/lataa.php/"])
+    filters:
+      - name: andmatch
 
   fields:
     category:

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,9 +1,9 @@
 ---
 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/

src/Jackett.Common/Definitions/freshmeat.yml

@@ -5,6 +5,8 @@ description: "freshMeat is a Public torrent meta-search engine"
 language: en-US
 type: public
 encoding: UTF-8
+certificates:
+  - 9aa995b06d86a22074c90faf5a9836e8a0fe6327 # expired 03/Jan/2022
 links:
   - https://freshmeat.io/
 

src/Jackett.Common/Definitions/ftuapps.yml

@@ -0,0 +1,87 @@
+---
+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:
+    category:
+      selector: a[href*="/category/"]
+      case:
+        ":contains(\"Net\")": 52
+        ":contains(\"Android\")": 3648
+        ":contains(\"Application\")": 55
+        ":contains(\"Database\")": 46
+        ":contains(\"Delphi\")": 331
+        ":contains(\"DriverPack\")": 4120
+        ":contains(\"MacOS\")": 2142
+        ":contains(\"Operating\")": 2431
+        ":contains(\"Other\")": 56
+        ":contains(\"Portable\")": 2172
+        ":contains(\"PreActivated\")": 2435
+        ":contains(\"Software\")": 3
+        ":contains(\"Script\")": 165
+    title:
+      selector: a
+      attribute: title
+    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/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,6 +28,8 @@ legacylinks:
   - https://gktorrent.nocensor.space/
   - https://www.gktorrents.com/
   - https://gktorrent.nocensor.work/
+  - https://www.gktorrents.net/
+  - https://gktorrent.nocensor.biz/
 
 caps:
   categorymappings:
@@ -78,6 +72,8 @@ settings:
 
 download:
   selectors:
+    - selector: a[href^="magnet:?"]
+      attribute: href
     - selector: script:contains("magnet:?")
       filters:
         - name: regexp

src/Jackett.Common/Definitions/glodls.yml

@@ -8,31 +8,13 @@ encoding: UTF-8
 followredirect: true
 links:
   - https://glodls.to/
+  - https://gtdb.cc/
   - https://www.gtdb.to/
-  - https://glotorrents.unblockit.tv/
-  - https://glotorrents.nocensor.biz/
+  - https://glotorrents.unblockit.day/
+  - https://glotorrents.nocensor.sbs/
 legacylinks:
   - https://glodls.rocks/
-  - https://glotorrents.unblockit.pro/
-  - https://glotorrents.unblockit.one/
-  - https://glodls.black-mirror.xyz/
-  - https://glodls.unblocked.casa/
-  - https://glodls.proxyportal.fun/
-  - https://glodls.uk-unblock.xyz/
-  - https://glodls.ind-unblock.xyz/
-  - https://glotorrents.unblockit.me/
-  - https://glotorrents.unblockit.pw/
-  - https://glotorrents.unblockit.id/
-  - https://glotorrents.unblockit.win/
-  - https://glodls.unblocked.bar/
-  - https://glodls.proxyportal.pw/
-  - https://glodls.uk-unblock.pro/
   - https://gtdb.to/
-  - https://glotorrents.unblockit.top/
-  - https://glotorrents.unblockit.lat/
-  - https://glotorrents.unblockit.app/
-  - https://glodls.unblocked.rest/
-  - https://glotorrents.unblockit.dev/
   - https://glotorrents.unblockit.ltd/
   - https://glotorrents.unblockit.link/
   - https://glotorrents.unblockit.buzz/
@@ -47,6 +29,10 @@ legacylinks:
   - https://glotorrents.nocensor.work/
   - https://glotorrents.unblockit.kim/
   - https://glotorrents.unblockit.bz/
+  - https://glotorrents.unblockit.tv/
+  - https://glotorrents.unblockit.how/
+  - https://glotorrents.unblockit.cam/
+  - https://glotorrents.nocensor.biz/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/hawke-uno.yml

@@ -0,0 +1,124 @@
+---
+id: hawke-uno
+name: hawke-uno
+description: "hawke-uno is a Private Torrent Tracker for (X265 / HEVC) MOVIES / TV"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://www.hawke.uno/
+
+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://www.hawke.uno/\" target =_blank>hawke-uno</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?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
+
+  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=false, 1=true
+      selector: freeleech
+      case:
+        0: 1 # not free
+        1: 0 # freeleech
+    uploadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: double_upload
+      case:
+        0: 1 # normal
+        1: 2 # double
+#    minimumratio:
+#      text: 0.4
+#    minimumseedtime:
+      # 5 days (as seconds = 5 x 24 x 60 x 60)
+#      text: 432000
+# json UNIT3D 5.3.0

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/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

@@ -0,0 +1,181 @@
+---
+id: hdolimpo-api
+name: HD-Olimpo (API)
+description: "HD-Olimpo is a SPANISH site for HD content"
+language: es-ES
+type: private
+encoding: UTF-8
+links:
+  - https://hd-olimpo.club/
+legacylinks:
+  - https://hdolimpo.co/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Películas"}
+    - {id: 2, cat: TV, desc: "Series"}
+    - {id: 3, cat: Audio, desc: "Música"}
+    - {id: 4, cat: TV/Documentary, desc: "Documentales"}
+
+  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 account <i>My configuration / Mi configuración => Secutiy / Seguridad</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"]
+
+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 }}"
+      response:
+        type: json
+
+  rows:
+    selector: data
+    attribute: attributes
+    count:
+      selector: meta.total
+
+  fields:
+    categorydesc:
+      selector: category
+    title:
+      selector: name
+      filters:
+        - name: re_replace
+          args: ["\\[", " "]
+        - name: re_replace
+          args: ["\\]", " "]
+        - name: re_replace
+          args: ["(?i)(full(bluray)?)", "BRDISK"] # FULL(BR/UHD) -> BRDISK
+        - name: replace
+          args: ["HDOlimpo", ""] # Delete HDOlimpo
+        - name: replace
+          args: ["HD-Olimpo", ""] # Delete HD-Olimpo
+        - name: replace
+          args: ["E-AC-3", "EAC3"]
+        - name: re_replace
+          args: ["[ -](?i)español[ -]", " SPANiSH "]
+        - name: re_replace
+          args: ["[ -](?i)castellano[ -]", " SPANiSH "]
+        - name: re_replace
+          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
+          args: ["[ -](?i)[ei]ng[ -]", " English "]
+        - name: re_replace
+          args: ["[ -](?i)cat[ -]", " Catalan "]
+        - name: re_replace
+          args: ["[ -](?i)vas[ -]", " Basque "]
+        - name: re_replace
+          args: ["[ -](?i)fr[ae][ -]", " French "]
+        - name: re_replace
+          args: ["[ -](?i)jap[ -]", " Japanese "]
+        - name: re_replace
+          args: ["[ -](?i)ita[ -]", " Italian "]
+        - name: re_replace
+          args: ["[ -](?i)rus[ -]", " Russian "]
+        - name: re_replace
+          args: ["[ -](?i)ger[ -]", " German "]
+        - name: re_replace
+          args: ["(?i)(triaudio)", "MULTi SPANiSH English"]
+        - name: re_replace
+          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:
+      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=false, 1=true
+      selector: freeleech
+      case:
+        0: 1 # not free
+        1: 0 # freeleech
+    uploadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: double_upload
+      case:
+        0: 1 # normal
+        1: 2 # double
+    minimumseedtime:
+      # 4 days (as seconds = 4 x 24 x 60 x 60)
+      text: 345600
+# json UNIT3D ???

src/Jackett.Common/Definitions/hdolimpo.yml

@@ -1,244 +0,0 @@
----
-id: hdolimpo
-name: HD-Olimpo
-description: "HD-Olimpo is a SPANISH site for HD content"
-language: es-ES
-type: private
-encoding: UTF-8
-links:
-  - https://hd-olimpo.club/
-legacylinks:
-  - https://hdolimpo.co/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
-    - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: Audio, desc: "Music"}
-    - {id: 4, cat: TV/Documentary, desc: "Documentaries"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
-    movie-search: [q, imdbid, tmdbid]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: created_at
-    options:
-      created_at: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: login
-  method: form
-  form: form[action$="/login"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    remember: on
-  selectorinputs:
-    _token:
-      selector: input[name="_token"]
-      attribute: value
-  error:
-    - selector: div#ERROR_COPY
-#    test:
-#      path: /
-#      selector: a[href$="/logout"]
-
-search:
-  paths:
-    - path: torrents/filter
-  inputs:
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
-    description: ""
-    keywords: ""
-    uploader: ""
-    imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: "{{ .Query.TVDBID }}"
-    tmdb: "{{ .Query.TMDBID }}"
-    mal: ""
-    igdb: ""
-    sorting: "{{ .Config.sort }}"
-    direction: "{{ .Config.type }}"
-    qty: 100
-    page: 0
-    view: list
-    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-
-  rows:
-    selector: table > tbody > tr
-
-  fields:
-    category:
-      selector: a[href*="/categories/"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: "/categories/(\\d+)"
-
-    title:
-      selector: a.view-torrent
-      filters:
-        - name: re_replace
-          args: ["\\[", " "]
-        - name: re_replace
-          args: ["\\]", " "]
-        - name: re_replace
-          args: ["(?i)(full(bluray)?)", "BRDISK"] # FULL(BR/UHD) -> BRDISK
-        - name: replace
-          args: ["HDOlimpo", ""] # Delete HDOlimpo
-        - name: replace
-          args: ["HD-Olimpo", ""] # Delete HD-Olimpo
-        - name: replace
-          args: ["E-AC-3", "EAC3"]
-        - name: re_replace
-          args: ["[ -](?i)español[ -]", " SPANiSH "]
-        - name: re_replace
-          args: ["[ -](?i)castellano[ -]", " SPANiSH "]
-        - name: re_replace
-          args: ["[ -](?i)spa[ -]", " SPANiSH "]
-        - name: re_replace
-          args: ["[ -](?i)esp[ -]", " SPANiSH "]
-        - name: re_replace
-          args: ["[ -](?i)ingl[eé]s[ -]", " English "]
-        - name: re_replace
-          args: ["[ -](?i)[ei]ng[ -]", " English "]
-        - name: re_replace
-          args: ["[ -](?i)cat[ -]", " Catalan "]
-        - name: re_replace
-          args: ["[ -](?i)vas[ -]", " Basque "]
-        - name: re_replace
-          args: ["[ -](?i)fr[ae][ -]", " French "]
-        - name: re_replace
-          args: ["[ -](?i)jap[ -]", " Japanese "]
-        - name: re_replace
-          args: ["[ -](?i)ita[ -]", " Italian "]
-        - name: re_replace
-          args: ["[ -](?i)rus[ -]", " Russian "]
-        - name: re_replace
-          args: ["[ -](?i)ger[ -]", " German "]
-        - name: re_replace
-          args: ["(?i)(triaudio)", "MULTi/SPANiSH/English"]
-        - name: re_replace
-          args: ["(?i)(dual)", " 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
-
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-    details:
-      selector: a.view-torrent
-      attribute: href
-    poster:
-      selector: div.torrent-poster img
-      attribute: src
-      filters:
-        - name: prepend
-          args: "https://images.weserv.nl/?url=" # for display on dashboard
-        - name: append
-          args: "&w=180&h=270" # for display on dashboard
-        - name: replace
-          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
-    size:
-      selector: td:nth-last-child(4)
-    seeders:
-      selector: td:nth-last-child(3)
-    leechers:
-      selector: td:nth-last-child(2)
-    grabs:
-      selector: td:nth-last-child(1)
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    tmdbid:
-      selector: a[href*="themoviedb.org/movie/"]
-      attribute: href
-    date:
-      selector: time
-      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
-        - name: re_replace
-          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
-        - name: re_replace
-          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
-        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
-        - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
-        - name: re_replace
-          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
-        - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
-        - name: re_replace
-          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
-        - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
-        - name: re_replace
-          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
-        - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
-        - name: re_replace
-          args: ["(?i) (ay)", "month"]
-        - name: re_replace
-          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
-        - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
-        - name: re_replace
-          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
-        - name: re_replace
-          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
-        - name: re_replace
-          args: ["(?i) (an)", "year"]
-        - name: re_replace
-          args: ["(?i)(För |und)", ""] # Misc removals
-        - name: timeago
-    downloadvolumefactor:
-      case:
-        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
-        i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
-        i[class*="fa-star text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-globe text-blue"]: 0 # Global Freeleech
-        i[class*="fas fa-star text-gold"]: 0 # Freeleech
-        i[class*="fal fa-star text-gold"]: 0.5 # 50% Freeleech
-        i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
-        "*": 1
-    uploadvolumefactor:
-      case:
-        i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
-        i[class*="fa-globe text-green"]: 2 # Global Double Upload
-        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
-        "*": 1
-    minimumseedtime:
-      # 4 days (as seconds = 4 x 24 x 60 x 60)
-      text: 345600
-# UNIT3D 2.4.0

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

@@ -25,18 +25,21 @@ caps:
     - {id: 16, cat: TV, desc: "TV Yerli"}
     - {id: 19, cat: TV/HD, desc: "TV Yerli HD"}
     - {id: 170, cat: Movies/HD, desc: "Movies HD"}
+    - {id: 175, cat: Movies/HD, desc: "Movies 1080p Remux DUAL"}
+    - {id: 226, cat: Movies/HD, desc: "Movies 1080p Remux TR"}
+    - {id: 183, cat: Movies/HD, desc: "Movies 1080p Remux Yabancı"}
     - {id: 174, cat: Movies/3D, desc: "Movies 3D DUAL"}
     - {id: 180, cat: Movies/3D, desc: "Movies 3D TR"}
     - {id: 181, cat: Movies/3D, desc: "Movies 3D Yabancı"}
     - {id: 217, cat: Movies/UHD, desc: "Movies 4K DUAL"}
+    - {id: 224, cat: Movies/UHD, desc: "Movies 4K Remux DUAL"}
+    - {id: 225, cat: Movies/UHD, desc: "Movies 4K Remux Yabanci"}
     - {id: 218, cat: Movies/UHD, desc: "Movies 4K TR"}
     - {id: 216, cat: Movies/UHD, desc: "Movies 4K Yabancı"}
     - {id: 205, cat: Movies/DVD, desc: "Movies DVD DUAL"}
     - {id: 206, cat: Movies/DVD, desc: "Movies DVD TR/Yerli"}
     - {id: 219, cat: Movies/DVD, desc: "Movies DVD Yabancı"}
     - {id: 173, cat: Movies/BluRay, desc: "Movies Full BD"}
-    - {id: 175, cat: Movies/HD, desc: "Movies Remux DUAL"}
-    - {id: 183, cat: Movies/HD, desc: "Movies Remux Yabancı"}
     - {id: 171, cat: Movies/HD, desc: "Movies x264 DUAL"}
     - {id: 176, cat: Movies/HD, desc: "Movies x264 TR"}
     - {id: 177, cat: Movies/HD, desc: "Movies x264 Yabancı"}
@@ -73,6 +76,7 @@ caps:
     - {id: 221, cat: Other, desc: "VIP"}
     - {id: 85, cat: XXX, desc: "XXX"}
     - {id: 92, cat: XXX/Other, desc: "XXX E-Magazin"}
+    - {id: 220, cat: XXX/Other, desc: "XXX Hentai"}
     - {id: 93, cat: XXX, desc: "XXX Movie"}
     - {id: 95, cat: XXX/Pack, desc: "XXX Packs"}
     - {id: 96, cat: XXX/ImageSet, desc: "XXX Pics"}

src/Jackett.Common/Definitions/hdu.yml

@@ -9,6 +9,8 @@ links:
   - https://pt.upxin.net/
 legacylinks:
   - http://pt.upxin.net/
+certificates:
+  - d52ca3e97d730541d8f81452185e4481225f3a2d # expired 06/Jan/2022
 
 caps:
   categorymappings:

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

@@ -68,7 +68,8 @@ search:
     search: "{{ .Keywords }}"
     incldead: 1
     polish: 0
-    blah: 0
+    # 0 both, 1 name, 2 desc
+    blah: 1
 
   rows:
     selector: table#line > tbody > tr:has(a[href^="details.php?id="])

src/Jackett.Common/Definitions/ilcorsaronero.yml

@@ -11,7 +11,7 @@ links:
   - https://ilcorsaronero.fun/
   - https://ilcorsaronero.pro/
   - https://ilcorsaronero.torrentbay.to/
-  - https://ilcorsaronero.nocensor.biz/
+  - https://ilcorsaronero.nocensor.sbs/
 legacylinks:
   - https://ilcorsaronero.live/
   - https://ilcorsaronero.vip/
@@ -27,6 +27,7 @@ legacylinks:
   - https://ilcorsaronero.unblockit.pw/
   - https://ilcorsaronero.nocensor.space/
   - https://ilcorsaronero.nocensor.work/
+  - https://ilcorsaronero.nocensor.biz/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/ilcorsaroverde.yml

@@ -12,25 +12,25 @@ caps:
   # commented out categories are discussion-only forums
   categorymappings:
     # CIURMA
-#    - {id: "150", cat: Other, desc: "Regole per Postare"}
+    # - {id: "150", cat: Other, desc: "Regole per Postare"}
     - {id: "140", cat: Other/Misc, desc: "Bozze - Sezione fruibile a tutti i nuovi Releaser", default: true}
     # INFORMAZIONI E REGOLE DEL FORUM
-#    - {id: "108", cat: Other, desc: "Manifesto Generale"}
-#    - {id: "30", cat: Other, desc: "Disclaimer"}
-#    - {id: "76", cat: Other, desc: "Statuto"}
-#    - {id: "31", cat: Other, desc: "Comunicazioni dello STAFF"}
-#    - {id: "32", cat: Other, desc: "Guide sull'uso del Forum"}
-#    - {id: "124", cat: Other, desc: "iCV Community"}
+    # - {id: "108", cat: Other, desc: "Manifesto Generale"}
+    # - {id: "30", cat: Other, desc: "Disclaimer"}
+    # - {id: "76", cat: Other, desc: "Statuto"}
+    # - {id: "31", cat: Other, desc: "Comunicazioni dello STAFF"}
+    # - {id: "32", cat: Other, desc: "Guide sull'uso del Forum"}
+    # - {id: "124", cat: Other, desc: "iCV Community"}
     # PROGETTI
-#    - {id: "172", cat: Audio, desc: "Progetto - Discografie"}
-#    - {id: "109", cat: Movies, desc: "Progetto - Filmografie"}
-#    - {id: "110", cat: Books, desc: "Progetto - Biblico"}
-#    - {id: "137", cat: Other, desc: "Progetto - Releaser/Crew"}
-#    - {id: "126", cat: Movies, desc: "Progetto - Cine Vintage "}
+    # - {id: "172", cat: Audio, desc: "Progetto - Discografie"}
+    # - {id: "109", cat: Movies, desc: "Progetto - Filmografie"}
+    # - {id: "110", cat: Books, desc: "Progetto - Biblico"}
+    # - {id: "137", cat: Other, desc: "Progetto - Releaser/Crew"}
+    # - {id: "126", cat: Movies, desc: "Progetto - Cine Vintage "}
     # MUSICA
     - {id: "19", cat: Audio, desc: "Musica Audio - Tutti i formati", default: true}
     - {id: "20", cat: Audio/Video, desc: "Musica Video - Standard Definition - High Definition", default: true}
-#    - {id: "135", cat: Audio, desc: "Richieste Titoli Musica"}
+    # - {id: "135", cat: Audio, desc: "Richieste Titoli Musica"}
     # VIDEO
     - {id: "6", cat: Movies/SD, desc: "Video - Screener", default: true}
     - {id: "7", cat: Movies/SD, desc: "Video - Standard Definition", default: true}
@@ -41,66 +41,66 @@ caps:
     - {id: "95", cat: Movies, desc: "Video - Dispositivi Mobili (Portable)", default: true}
     - {id: "79", cat: Movies, desc: "Video - TVRip - Standard Definition - High Definition", default: true}
     - {id: "14", cat: TV/Other, desc: "Video - Documentari - Sportivi - Spettacoli - Lirica - Standard Definition - High Definition", default: true}
-#    - {id: "134", cat: Movies, desc: "Richieste Titoli Video"}
+    # - {id: "134", cat: Movies, desc: "Richieste Titoli Video"}
     # SERIE TV
     - {id: "12", cat: TV/SD, desc: "Serie TV - Standard Definition", default: true}
     - {id: "102", cat: TV/HD, desc: "Serie TV - High definition H.264", default: true}
     - {id: "161", cat: TV/HD, desc: "Serie TV - High definition HEVC/H.265", default: true}
-#    - {id: "103", cat: TV, desc: "L'angolo di Giuseppe-iCV & littlelinx"}
-#    - {id: "160", cat: TV, desc: "L'angolo di Pir8"}
-#    - {id: "169", cat: TV, desc: "L'angolo di TV-P2P"}
-#    - {id: "133", cat: TV, desc: "Richieste Titoli Serie TV"}
+    # - {id: "103", cat: TV, desc: "L'angolo di Giuseppe-iCV & littlelinx"}
+    # - {id: "160", cat: TV, desc: "L'angolo di Pir8"}
+    # - {id: "169", cat: TV, desc: "L'angolo di TV-P2P"}
+    # - {id: "133", cat: TV, desc: "Richieste Titoli Serie TV"}
     # CARTONI ANIMATI - ANIME
     - {id: "17", cat: Movies/SD, desc: "Cartoni Animati - Standard Definition - High Definition", default: true}
     - {id: "18", cat: TV/HD, desc: "Cartoni Animati - Serie TV Standard Definition - High Definition", default: true}
     - {id: "15", cat: TV/Anime, desc: "Anime - Standard Definition - High Definition", default: true}
     - {id: "16", cat: TV/Anime, desc: "Anime - Serie TV Standard Definition - High Definition", default: true}
     - {id: "89", cat: Movies/HD, desc: "Cartoni Animati - Anime - Serie Tv e Non - High Definition - HEVC/H.265", default: true}
-#    - {id: "132", cat: TV/Anime, desc: "Richieste Titoli Cartoni Animati - Anime"}
+    # - {id: "132", cat: TV/Anime, desc: "Richieste Titoli Cartoni Animati - Anime"}
     # EBOOK - FUMETTI - RIVISTE - QUOTIDIANI
     - {id: "25", cat: Books/EBook, desc: "Ebook", default: true}
     - {id: "26", cat: Audio/Audiobook, desc: "Ebook Audio", default: true}
     - {id: "170", cat: Books/Comics, desc: "Fumetti", default: true}
     - {id: "28", cat: Books/Mags, desc: "Riviste - Quotidiani", default: true}
     - {id: "47", cat: Other, desc: "Wallpapers - Poster - Calendari", default: true}
-#    - {id: "131", cat: Movies, desc: "Richieste Titoli Ebook - Fumetti - Riviste"}
+    # - {id: "131", cat: Movies, desc: "Richieste Titoli Ebook - Fumetti - Riviste"}
     # SOFTWARE
     - {id: "21", cat: PC/0day, desc: "Windows Software", default: true}
-#    - {id: "22", cat: PC, desc: "Windows Guide e altre in generale"}
-#    - {id: "92", cat: PC, desc: "Windows Supporto "}
+    # - {id: "22", cat: PC, desc: "Windows Guide e altre in generale"}
+    # - {id: "92", cat: PC, desc: "Windows Supporto "}
     - {id: "138", cat: PC/Mac, desc: "macOS Software", default: true}
-#    - {id: "162", cat: PC/Mac, desc: "macOS Guide"}
-#    - {id: "163", cat: PC/Mac, desc: "macOS Supporto"}
-#    - {id: "164", cat: PC/Mac, desc: "Hackintosh Guide"}
-#    - {id: "165", cat: PC/Mac, desc: "Hackintosh Supporto"}
+    # - {id: "162", cat: PC/Mac, desc: "macOS Guide"}
+    # - {id: "163", cat: PC/Mac, desc: "macOS Supporto"}
+    # - {id: "164", cat: PC/Mac, desc: "Hackintosh Guide"}
+    # - {id: "165", cat: PC/Mac, desc: "Hackintosh Supporto"}
     - {id: "23", cat: PC, desc: "Linux Software", default: true}
-#    - {id: "168", cat: PC, desc: "Linux Guide"}
-#    - {id: "93", cat: PC, desc: "Linux Supporto"}
+    # - {id: "168", cat: PC, desc: "Linux Guide"}
+    # - {id: "93", cat: PC, desc: "Linux Supporto"}
     - {id: "24", cat: PC, desc: "Guide & Tutorial Video", default: true}
-#    - {id: "129", cat: PC, desc: "Richieste Titoli Software"}
+    # - {id: "129", cat: PC, desc: "Richieste Titoli Software"}
     # GAMES
     - {id: "36", cat: PC/Games, desc: "Games - Pc Windows", default: true}
     - {id: "158", cat: PC/Mac, desc: "Games - macOS", default: true}
     - {id: "37", cat: Console/XBox 360, desc: "Games - Console Microsoft Xbox 360", default: true}
     - {id: "38", cat: Console/PS3, desc: "Games - Console Sony PS3", default: true}
     - {id: "152", cat: Console/PS4, desc: "Games - Console Sony PS4", default: true}
-#    - {id: "99", cat: PC/Games, desc: "Games - Supporto"}
-#    - {id: "123", cat: PC/Games, desc: "Games - Guide"}
-#    - {id: "130", cat: PC/Games, desc: "Richieste Titoli Games"}
+    # - {id: "99", cat: PC/Games, desc: "Games - Supporto"}
+    # - {id: "123", cat: PC/Games, desc: "Games - Guide"}
+    # - {id: "130", cat: PC/Games, desc: "Richieste Titoli Games"}
     # ANDROID
     - {id: "58", cat: PC/Mobile-Android, desc: "Android Apps", default: true}
-#    - {id: "144", cat: PC/Mobile-Android, desc: "Android Guide"}
-#    - {id: "128", cat: PC/Mobile-Android, desc: "Richieste Titoli Android"}
+    # - {id: "144", cat: PC/Mobile-Android, desc: "Android Guide"}
+    # - {id: "128", cat: PC/Mobile-Android, desc: "Richieste Titoli Android"}
     # TEAM GRAFICO
-#    - {id: "88", cat: Other, desc: "Vetrina Grafica"}
-#    - {id: "100", cat: Other, desc: "Tutorial Photoshop CC"}
+    # - {id: "88", cat: Other, desc: "Vetrina Grafica"}
+    # - {id: "100", cat: Other, desc: "Tutorial Photoshop CC"}
     # TAVERNA DEI CORSARI
-#    - {id: "39", cat: Other, desc: "Presentati alla Community"}
-#    - {id: "112", cat: Other, desc: "Assistenza Forum"}
-#    - {id: "33", cat: Other, desc: "Chiacchiere in generale"}
-#    - {id: "83", cat: Other, desc: "Commenti Titoli "}
-#    - {id: "136", cat: Other, desc: "Sondaggi"}
-#    - {id: "145", cat: Other, desc: "il CorSaRo VeRde App"}
+    # - {id: "39", cat: Other, desc: "Presentati alla Community"}
+    # - {id: "112", cat: Other, desc: "Assistenza Forum"}
+    # - {id: "33", cat: Other, desc: "Chiacchiere in generale"}
+    # - {id: "83", cat: Other, desc: "Commenti Titoli "}
+    # - {id: "136", cat: Other, desc: "Sondaggi"}
+    # - {id: "145", cat: Other, desc: "il CorSaRo VeRde App"}
     # ARCHIVIO FORUM
     - {id: "171", cat: PC/0day, desc: "Windows Software obsoleto", default: true}
 

src/Jackett.Common/Definitions/insanetracker.yml

@@ -12,32 +12,34 @@ caps:
   categorymappings:
     - {id: 8, cat: TV/SD, desc: "Sorozat/Hun"}
     - {id: 40, cat: TV/HD, desc: "Sorozat/Hun/HD"}
-    - {id: 41, cat: Movies/SD, desc: "Film/Hun/SD"}
-    - {id: 15, cat: Movies/DVD, desc: "Film/Hun/DVD-R"}
-    - {id: 27, cat: Movies/HD, desc: "Film/Hun/HD"}
-    - {id: 44, cat: Movies/UHD, desc: "Film/Hun/UHD"}
-    - {id: 2, cat: Books, desc: "eBook/Hun"}
+    - {id: 47, cat: TV/UHD, desc: "Sorozat/Hun/UHD"}
     - {id: 7, cat: TV/SD, desc: "Sorozat/Eng"}
     - {id: 39, cat: TV/HD, desc: "Sorozat/Eng/HD"}
+    - {id: 46, cat: TV/UHD, desc: "Sorozat/Eng/UHD"}
+    - {id: 41, cat: Movies/SD, desc: "Film/Hun/SD"}
+    - {id: 27, cat: Movies/HD, desc: "Film/Hun/HD"}
+    - {id: 44, cat: Movies/UHD, desc: "Film/Hun/UHD"}
+    - {id: 15, cat: Movies/DVD, desc: "Film/Hun/DVD-R"}
     - {id: 42, cat: Movies/SD, desc: "Film/Eng/SD"}
-    - {id: 14, cat: Movies/DVD, desc: "Film/Eng/DVD-R"}
     - {id: 25, cat: Movies/HD, desc: "Film/Eng/HD"}
     - {id: 45, cat: Movies/UHD, desc: "Film/Eng/UHD"}
+    - {id: 14, cat: Movies/DVD, desc: "Film/Eng/DVD-R"}
+    - {id: 2, cat: Books, desc: "eBook/Hun"}
     - {id: 1, cat: Books, desc: "eBook/Eng"}
     - {id: 38, cat: Audio/Audiobook, desc: "Hangoskönyv"}
-    - {id: 21, cat: XXX, desc: "XXX"}
-    - {id: 4, cat: PC/ISO, desc: "Program/ISO"}
     - {id: 19, cat: Audio/MP3, desc: "Zene/Hun"}
     - {id: 37, cat: Audio/Lossless, desc: "Lossless/Hun"}
-    - {id: 9, cat: PC/Games, desc: "Játék/ISO"}
-    - {id: 43, cat: Console, desc: "Játék/Konzol"}
-    - {id: 29, cat: Other, desc: "Képek"}
-    - {id: 28, cat: XXX/ImageSet, desc: "XXX Képek"}
-    - {id: 3, cat: PC/0day, desc: "Program/Egyéb"}
     - {id: 18, cat: Audio/MP3, desc: "Zene/Eng"}
     - {id: 26, cat: Audio/Lossless, desc: "Lossless/Eng"}
+    - {id: 4, cat: PC/ISO, desc: "Program/ISO"}
+    - {id: 3, cat: PC/0day, desc: "Program/Egyéb"}
     - {id: 11, cat: PC/Games, desc: "Játék/Rip"}
+    - {id: 9, cat: PC/Games, desc: "Játék/ISO"}
+    - {id: 43, cat: Console, desc: "Játék/Konzol"}
     - {id: 13, cat: PC/Mobile-Other, desc: "Mobil"}
+    - {id: 21, cat: XXX, desc: "XXX"}
+    - {id: 28, cat: XXX/ImageSet, desc: "XXX Képek"}
+    - {id: 29, cat: Other, desc: "Képek"}
 
 
   modes: