Merge branch 'master' of https://github.com/Jackett/Jackett

match on category changed

.github/ISSUE_TEMPLATE.md

@@ -7,7 +7,7 @@ If you are experiencing an issue with a tracker, then:
 2. If you haven't already, try upgrading to the latest version of Jackett, your issue may have already been resolved.
 3. If it is still not working for you, then a **full enhanced log must be included**. Instructions for obtaining logs are here: https://github.com/Jackett/Jackett#troubleshooting
 
-**Jackett version**:  
-**Mono version** (if not using Windows):  
+(At the bottom of your Jackett Dashboard page) **Jackett version**:  
+(if you installed using Jackett.Binaries.Mono.tar.gz) **Mono version**:
 
 -------------------------------

.github/no_information_provided.md

@@ -5,5 +5,5 @@ You've created an issue, but haven't provided any details to allow the community
 Provide a description of the feature request or bug, the more details the better.
 If you are experiencing an issue with a tracker, a **full enhanced log must be included**. Instructions for obtaining logs are here: https://github.com/Jackett/Jackett#troubleshooting
 
-**Jackett version**:  
-**Mono version** (if not using Windows):
+(At the bottom of your Jackett Dashboard page) **Jackett version**:  
+(if you installed using Jackett.Binaries.Mono.tar.gz) **Mono version**:

README.md

@@ -9,16 +9,16 @@
 
 This project is a new fork and is recruiting development help.  If you are able to help out please contact us.
 
-Jackett works as a proxy server: it translates queries from apps ([Sonarr](https://github.com/Sonarr/Sonarr), [Radarr](https://github.com/Radarr/Radarr), [SickRage](https://sickrage.github.io/), [CouchPotato](https://couchpota.to/), [Mylar](https://github.com/evilhero/mylar), [DuckieTV](https://github.com/SchizoDuckie/DuckieTV), [qBittorrent](https://www.qbittorrent.org/), [Nefarious](https://github.com/lardbit/nefarious) etc) into tracker-site-specific http queries, parses the html response, then sends results back to the requesting software. This allows for getting recent uploads (like RSS) and performing searches. Jackett is a single repository of maintained indexer scraping & translation logic - removing the burden from other apps.
+Jackett works as a proxy server: it translates queries from apps ([Sonarr](https://github.com/Sonarr/Sonarr), [Radarr](https://github.com/Radarr/Radarr), [SickRage](https://sickrage.github.io/), [CouchPotato](https://couchpota.to/), [Mylar](https://github.com/evilhero/mylar), [Lidarr](https://github.com/lidarr/lidarr), [DuckieTV](https://github.com/SchizoDuckie/DuckieTV), [qBittorrent](https://www.qbittorrent.org/), [Nefarious](https://github.com/lardbit/nefarious) etc) into tracker-site-specific http queries, parses the html response, then sends results back to the requesting software. This allows for getting recent uploads (like RSS) and performing searches. Jackett is a single repository of maintained indexer scraping & translation logic - removing the burden from other apps.
 
 Developer note: The software implements the [Torznab](https://github.com/Sonarr/Sonarr/wiki/Implementing-a-Torznab-indexer) (with [nZEDb](https://github.com/nZEDb/nZEDb/blob/dev/docs/newznab_api_specification.txt) category numbering) and [TorrentPotato](https://github.com/RuudBurger/CouchPotatoServer/wiki/Couchpotato-torrent-provider) APIs.
 
 
 
 #### Supported Systems
-* Windows using .NET 4.6.1 or above [Download here](https://www.microsoft.com/net/framework/versions/net461).
-* Linux 
-* macOS using Mono 5.8 or above. [Download here](http://www.mono-project.com/download/).
+* Windows 7SP1 or greater using .NET 4.6.1 or above [Download here](https://www.microsoft.com/net/framework/versions/net461)
+* Linux ([supported operating systems here](https://github.com/dotnet/core/blob/master/release-notes/2.1/2.1-supported-os.md))
+* macOS 10.12 or greater
 
 ### Supported Public Trackers
  * 1337x
@@ -31,6 +31,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * BTDB
  * BTDigg
  * BTKitty
+ * ConCen
  * cpasbien
  * cpasbienClone
  * DIGBT
@@ -44,6 +45,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Il Corsaro Nero <!-- maintained by bonny1992 -->
  * Il Corsaro Blu
  * Isohunt2
+ * iTorrent
  * KATcrs
  * KickAssTorrent (KATcr)
  * KickAssTorrent (thekat.se clone)
@@ -53,10 +55,12 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * MagnetDL
  * MejorTorrent <!-- maintained by ivandelabeldad -->
  * Monova
+ * MovCr
  * Newpct (aka: tvsinpagar, descargas2020, torrentlocura, torrentrapid, tumejortorrent, pctnew, etc)
  * Nyaa.si
  * Nyaa-Pantsu
  * Nyoo
+ * OxTorrent
  * ProStyleX
  * QXR
  * RARBG
@@ -76,17 +80,20 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * TorrentGalaxy.org (TGx)
  * TorrentKitty
  * TorrentProject2
+ * TorrentQuest
  * Torrents.csv
  * Torrent9
  * Torernt9 clone (torrents9.ch)
  * Torrentz2
  * World Wide Torrents
+ * YourBittorrent
  * YTS.ag
  * Zooqle
 
 ### Supported Semi-Private Trackers
  * 7tor
  * Alein
+ * AniDUB
  * ArenaBG
  * CzTorrent
  * Deildu
@@ -94,9 +101,9 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Gay-Torrents.net
  * Gay-Torrents.org
  * GDF76
+ * HamsterStudio
  * Kinozal
  * LostFilm.tv
- * Mega-Bliz
  * Metal Tracker
  * MVGroup Forum
  * MVGroup Main
@@ -107,6 +114,8 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * RuTracker
  * Sharewood
  * SkTorrent
+ * SoundPark
+ * Torrents-Local
  * Union Fansub
  * Vanila
  * XtreMeZone (MYXZ)
@@ -134,6 +143,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Audiobook Torrents (ABT)
  * AudioNews (AN)
  * Awesome-HD (AHD)
+ * AVG (Audio Video Games)
  * Avistaz (AsiaTorrents)
  * B2S-Share
  * Back-ups
@@ -151,7 +161,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * BitMeTV
  * BitsPiracy
  * Bitspyder
- * BitTorrentFiles  [![(invite needed)][inviteneeded]](#)
+ * BitTorrentFiles
  * BitTurk
  * BJ-Share (BJ)
  * BlueBird
@@ -169,7 +179,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * CGPeers
  * CHDBits
  * ChannelX
- * CiNEFiLHD
  * Cinemageddon
  * Cinematik
  * CinemaZ (EuTorrents)
@@ -177,7 +186,9 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * CrnaBerza
  * DanishBits (DB)
  * Dark-Shadow
+ * Das Unerwartete
  * DataScene (DS)
+ * DesiReleasers
  * DesiTorrents
  * Diablo Torrent
  * DigitalCore
@@ -188,6 +199,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Dragonworld Reloaded
  * Dream Team
  * DXDHD
+ * EfectoDoppler
  * EliteHD (HDClub) [![(invite needed)][inviteneeded]](#)
  * Elit Tracker (ET)
  * Elite-Tracker
@@ -197,7 +209,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * FANO.IN
  * FileList (FL)
  * Femdomcult
- * Freedom-HD (Freedom Paradise)
+ * FocusX
  * FreeTorrent
  * FullMixMusic
  * FunFile (FF)
@@ -205,12 +217,12 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Fuzer (FZ)
  * GAYtorrent.ru
  * GazelleGames (GGn)
+ * Generation-Free
  * GFXNews
  * GFXPeers
  * GigaTorrents
  * GimmePeers (formerly ILT) <!-- maintained by jamesb2147 -->
  * GiroTorrent
- * GODS
  * Greek Team
  * HacheDe
  * Hardbay
@@ -228,7 +240,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * HDCity
  * HDHome (HDBigger)
  * HDME
- * HDplus
  * HDSky
  * HDTorrents.it
  * Hebits
@@ -252,12 +263,14 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Magico (Trellas)
  * Majomparádé (TurkDepo)
  * Manicomio Share
+ * Mega-Bliz
  * Mononoké-BT
  * MoreThanTV (MTV)
  * MyAnonamouse (MAM)
  * myAmity
  * MySpleen
  * NCore
+ * NBTorrents
  * Nebulance (NBL) (TransmiTheNet)
  * New Real World
  * Norbits
@@ -269,6 +282,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * P2PBG
  * Passione Torrent <!-- maintained by bonny1992 -->
  * PassThePopcorn (PTP)
+ * Peers.FM
  * PiratBit
  * PirateTheNet (PTN)
  * PiXELHD (PxHD)
@@ -291,8 +305,10 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * RetroFlix
  * RevolutionTT
  * RGU
+ * RocketHD
  * RoDVD (Cinefiles)
  * Romanian Metal Torrent (RMT)
+ * RPTorrents
  * SceneFZ
  * SceneHD
  * SceneReactor
@@ -302,9 +318,9 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Secret Cinema
  * Shareisland
  * ShareSpaceDB
- * Sharingue
  * Shazbat
  * Shellife (SL)
+ * SiamBIT
  * SpaceTorrent
  * Speed-Share
  * SpeedCD
@@ -313,8 +329,10 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * SportsCult
  * SuperBits (SBS)
  * TakeaByte
+ * Tapochek
  * Tasmanit
  * TBPlus
+ * TeamHD
  * TenYardTorrents (TYT)
  * TheEmpire (TE)
  * The Geeks
@@ -326,12 +344,13 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * The Show
  * The-Torrents
  * The Vault
+ * Tigers-dl
  * Torrent Network (TN)
  * Torrent Sector Crew (TSC)
  * Torrent.LT
  * TorrentBD
  * TorrentBytes (TBy)
- * TorrentCCF (TCCF) [![(invite needed)][inviteneeded]](#)
+ * TorrentCCF (TCCF)
  * TorrentDay (TD)
  * Torrentech (TTH)
  * TorrentHeaven
@@ -354,9 +373,11 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * u-torrents (SceneFZ)
  * UHDBits
  * Ultimate Gamer Club (UGC)
+ * UnionGang
  * Vizuk
  * Waffles
  * World-In-HD
+ * World-of-Tomorrow
  * WorldOfP2P (WOP)
  * x-ite.me (XM)
  * xBytesV2
@@ -372,7 +393,7 @@ Trackers marked with  [![(invite needed)][inviteneeded]](#) have no active maint
 
 ### Aggregate indexers
 
-A special "all" indexer is available at `/api/v2.0/indexers/all/results/torznab/api`.
+A special "all" indexer is available at `/api/v2.0/indexers/all/results/torznab`.
 It will query all configured indexers and return the combined results.
 
 If your client supports multiple feeds it's recommended to add each indexer directly instead of using the all indexer.
@@ -385,8 +406,8 @@ Using the all indexer has no advantages (besides reduced management overhead), o
 
 To get all Jackett indexers including their capabilities you can use `t=indexers` on the all indexer. To get only configured/unconfigured indexers you can also add `configured=true/false` as query parameter.
 
-## Installation on Windows
 
+## Installation on Windows
 We recommend you install Jackett as a Windows service using the supplied installer. You may also download the zipped version if you would like to configure everything manually.
 
 To get started with using the installer for Jackett, follow the steps below:
@@ -402,24 +423,36 @@ When installed as a service the tray icon acts as a way to open/start/stop Jacke
 
 Jackett can also be run from the command line if you would like to see log messages (Ensure the server isn't already running from the tray/service). This can be done by using "JackettConsole.exe" (for Command Prompt), found in the Jackett data folder: "%ProgramData%\Jackett".
 
-### Install on Linux (AMDx64)
- 1. Download and extract the latest `Jackett.Binaries.LinuxAMDx64.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases) and run Jackett with the command `./jackett`
- 2. (Optional) To install Jackett as a service, open the Terminal 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`.
 
+## Install on Linux (AMDx64)
 On most operating systems all the required dependencies will already be present. In case they are not, you can refer to this page https://docs.microsoft.com/en-us/dotnet/core/linux-prerequisites?tabs=netcore2x#linux-distribution-dependencies
 
-If you want to run it with a user without a /home directory you need to add `Environment=XDG_CONFIG_HOME=/path/to/folder` to your systemd file, this folder will be used to store your config files.  
+### Install as service
+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 the Terminal 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`.
 
-### Install on Linux (ARMv7 or above)
- 1. Download and extract the latest `Jackett.Binaries.LinuxARM32.tar.gz` or `Jackett.Binaries.LinuxARM64.tar.gz` (32 bit is the most common on ARM) release from the [releases page](https://github.com/Jackett/Jackett/releases) and run Jackett with the command `./jackett`
- 2. (Optional) To install Jackett as a service, open the Terminal 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`.
-
-On most operating systems all the required dependencies will already be present. In case they are not, you can refer to this page https://docs.microsoft.com/en-us/dotnet/core/linux-prerequisites?tabs=netcore2x#linux-distribution-dependencies
+### Run without installing as a service
+Download and extract the latest `Jackett.Binaries.LinuxAMDx64.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases) and run Jackett with the command `./jackett`
 
+### home directory
 If you want to run it with a user without a /home directory you need to add `Environment=XDG_CONFIG_HOME=/path/to/folder` to your systemd file, this folder will be used to store your config files.  
 
 
-### Installation on Linux (ARMv6 or below)
+## Install on Linux (ARMv7 or above)
+On most operating systems all the required dependencies will already be present. In case they are not, you can refer to this page https://docs.microsoft.com/en-us/dotnet/core/linux-prerequisites?tabs=netcore2x#linux-distribution-dependencies
+
+### Install as service
+1. Download and extract the latest `Jackett.Binaries.LinuxARM32.tar.gz` or `Jackett.Binaries.LinuxARM64.tar.gz` (32 bit is the most common on ARM) release from the [releases page](https://github.com/Jackett/Jackett/releases) 
+2. To install Jackett as a service, open the Terminal 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`.
+
+### Run without installing as a service
+Download and extract the latest `Jackett.Binaries.LinuxARM32.tar.gz` or `Jackett.Binaries.LinuxARM64.tar.gz` (32 bit is the most common on ARM) release from the [releases page](https://github.com/Jackett/Jackett/releases) and run Jackett with the command `./jackett`
+
+### home directory
+If you want to run it with a user without a /home directory you need to add `Environment=XDG_CONFIG_HOME=/path/to/folder` to your systemd file, this folder will be used to store your config files.  
+
+
+## Installation on Linux (ARMv6 or below)
  1. Install [Mono 5.8](http://www.mono-project.com/download/#download-lin) or better (using the latest stable release is recommended)
        * Follow the instructions on the mono website and install the `mono-devel` and the `ca-certificates-mono` packages.
        * On Red Hat/CentOS/openSUSE/Fedora the `mono-locale-extras` package is also required.
@@ -434,20 +467,21 @@ If you want to run it with a user without a /home directory you need to add `Env
 
 Mono must be compiled with the Roslyn compiler (default), using MCS will cause "An error has occurred." errors (See https://github.com/Jackett/Jackett/issues/2704).
 
+
 ### Installation on Linux via Ansible
 
 On a RHEL/Centos 7 system: [linuxhq.jackett](https://galaxy.ansible.com/linuxhq/jackett)
 
 On an Ubuntu 16 system: [chrisjohnson00.jackett](https://galaxy.ansible.com/chrisjohnson00/jackett)
 
+
 ## Installation on macOS
 
 ### Prerequisites
-Install [Mono 5.8](http://www.mono-project.com/download/#download-mac) or better (using the latest pkg installer is recommended).
- * Setup ssl support by running `curl -sS https://curl.haxx.se/ca/cacert.pem | cert-sync --user /dev/stdin`
+macOS 10.12 or greater
 
 ### Install as service
-1. Download and extract the latest `Jackett.Binaries.Mono.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases).
+1. Download and extract the latest `Jackett.Binaries.macOS.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases).
 2. Open the extracted folder and double-click on `install_service_macos`.
 3. If the installation was a success, you can close the Terminal window.
 
@@ -455,14 +489,17 @@ The service will start on each logon. You can always stop it by running `launchc
 Logs are stored as usual under `~/.config/Jackett/log.txt`.
 
 ### Run without installing as a service
-Download and extract the latest `Jackett.Binaries.Mono.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases) and run Jackett using mono with the command `mono --debug JackettConsole.exe`.
+Download and extract the latest `Jackett.Binaries.macOS.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases) and run Jackett with the command `./jackett`.
+
 
 ## Installation using Docker
 Detailed instructions are available at [LinuxServer.io Jackett Docker](https://hub.docker.com/r/linuxserver/jackett/). The Jackett Docker is highly recommended, especially if you are having Mono stability issues or having issues running Mono on your system eg. QNAP, Synology. Thanks to [LinuxServer.io](https://linuxserver.io)
 
+
 ## Installation on Synology
 Jackett is available as beta package from [SynoCommunity](https://synocommunity.com/)
 
+
 ## Running Jackett behind a reverse proxy
 When running jackett behind a reverse proxy make sure that the original hostname of the request is passed to Jackett. If HTTPS is used also set the X-Forwarded-Proto header to "https". Don't forget to adjust the "Base Path Override" Jackett option accordingly.
 
@@ -536,7 +573,7 @@ All contributions are welcome just send a pull request.
 ### Windows
 * Install the .NET Core [SDK](https://www.microsoft.com/net/download/windows)
 * Clone Jackett
-* From the `src` directory, run `dotnet restore`
+* Open Powershell and from the `src` directory, run `dotnet restore`
 * Open the Jackett solution in Visual Studio 2017 (version 15.9 or above)
 * Right click on the Jackett solution and click 'Rebuild Solution' to restore nuget packages
 * Select Jackett.Server as startup project
@@ -555,7 +592,7 @@ cd Jackett/src
 
 # dotnet core version
 dotnet publish Jackett.Server -f netcoreapp2.2 --self-contained -r osx-x64 -c Debug # takes care of everything
-./Jackett.Server/bin/Debug/netcoreapp2.2/osx-x64/JackettConsole # run jackett
+./Jackett.Server/bin/Debug/netcoreapp2.2/osx-x64/jackett # run jackett
 ```
 
 ### Linux
@@ -568,14 +605,8 @@ cd Jackett/src
 
 # dotnet core version
 dotnet publish Jackett.Server -f netcoreapp2.2 --self-contained -r linux-x64 -c Debug # takes care of everything
-./Jackett.Server/bin/Debug/netcoreapp2.2/linux-x64/JackettConsole # run jackett
+./Jackett.Server/bin/Debug/netcoreapp2.2/linux-x64/jackett # run jackett
 ```
-<!--
-# mono version (currently broken)
-nuget restore Jackett.sln # prepare dependencies
-msbuild Jackett.Server/Jackett.Server.csproj /t:Build /p:Configuration=Debug # compile
-mono Jackett.Server/bin/Debug/JackettServer.exe # run jackett
--->
 
 ## Screenshots
 

appveyor.yml

@@ -6,6 +6,10 @@ image:
 environment:
   APPVEYOR_YML_DISABLE_PS_LINUX: true
 configuration: Release
+install:
+  #Remove once .NET Core 2.2.5 is deployed to Appveyor
+  - sh: sudo apt-get update
+  - sh: sudo apt-get -y install dotnet-sdk-2.2
 assembly_info:
   patch: true
   file: '**\AssemblyInfo.*'
@@ -21,7 +25,7 @@ dotnet_csproj:
   file_version: '{version}'
   informational_version: '{version}'
 build_script:
-- ps: .\build.ps1 --target=Default 
+- ps: .\build.ps1 --target=Windows-Appveyor 
 - sh: ./build.sh --target=Linux
 test: off
 before_deploy:

build.cake

@@ -126,7 +126,6 @@ Task("Package-Mono-Full-Framework")
 
 		CopyFiles("./src/Jackett.Updater/bin/" + configuration + "/net461" + "/JackettUpdater.*", buildOutputPath);  //builds against multiple frameworks
 
-		CopyFileToDirectory("./install_service_macos", buildOutputPath);
 		CopyFileToDirectory("./install_service_systemd_mono.sh", buildOutputPath);
 		CopyFileToDirectory("./Upstart.config", buildOutputPath);
 
@@ -165,7 +164,7 @@ Task("Package-DotNetCore-macOS")
 
 		CopyFileToDirectory("./install_service_macos", buildOutputPath);
 
-		Gzip($"./BuildOutput/{netCoreFramework}/{runtimeId}", $"./{artifactsDirName}", "Jackett", "Experimental.Jackett.Binaries.macOS.tar.gz");
+		Gzip($"./BuildOutput/{netCoreFramework}/{runtimeId}", $"./{artifactsDirName}", "Jackett", "Jackett.Binaries.macOS.tar.gz");
 	});
 
 Task("Package-DotNetCore-LinuxAMDx64")
@@ -290,13 +289,23 @@ Task("Release-Notes")
 
 	});
 
-Task("Windows-Environment")
+Task("Windows-Environment-Dev")
+	.IsDependentOn("Package-Windows-Full-Framework")
+	.IsDependentOn("Package-Mono-Full-Framework")
+	.IsDependentOn("Package-DotNetCore-macOS")
+	.IsDependentOn("Package-DotNetCore-LinuxAMDx64")
+	.IsDependentOn("Package-DotNetCore-LinuxARM32")
+	.IsDependentOn("Package-DotNetCore-LinuxARM64")
+	.IsDependentOn("Appveyor-Push-Artifacts")
+	.IsDependentOn("Release-Notes")
+	.Does(() =>
+	{
+		Information("Windows-Environment Task Completed");
+	});
+
+Task("Windows-Environment-Appveyor")
 	.IsDependentOn("Package-Windows-Full-Framework")
 	.IsDependentOn("Package-Mono-Full-Framework")
-	//.IsDependentOn("Package-DotNetCore-macOS")
-	//.IsDependentOn("Package-DotNetCore-LinuxAMDx64")
-	//.IsDependentOn("Package-DotNetCore-LinuxARM32")
-	//.IsDependentOn("Package-DotNetCore-LinuxARM64")
 	.IsDependentOn("Appveyor-Push-Artifacts")
 	.IsDependentOn("Release-Notes")
 	.Does(() =>
@@ -429,12 +438,19 @@ private void DotNetCorePublish(string projectPath, string framework, string runt
 //////////////////////////////////////////////////////////////////////
 
 Task("Default")
-	.IsDependentOn("Windows-Environment")
+	.IsDependentOn("Windows-Environment-Dev")
 	.Does(() =>
 	{
 		Information("Default Task Completed");
 	});
 
+Task("Windows-Appveyor")
+	.IsDependentOn("Windows-Environment-Appveyor")
+	.Does(() =>
+	{
+		Information("Windows Appveyor Task Completed");
+	});
+
 Task("Linux")
 	.IsDependentOn("Linux-Environment")
 	.Does(() =>

install_service_macos

@@ -12,16 +12,12 @@ launchctl remove org.user.Jackett
 cd "$(dirname "$0")"
 
 # Check if we're running from Jackett's directory
-if [ ! -f ./JackettConsole.exe ]; then
-echo "${BOLDRED}ERROR${NC}: Couldn't locate JackettConsole.exe. Is the script in the right directory?"
+if [ ! -f ./jackett ]; then
+echo "${BOLDRED}ERROR${NC}: Couldn't locate ./jackett - Is the script in the right directory?"
     exit 1
 fi
 jackettdir="$(pwd)"
 
-# Check if mono is installed
-command -v mono >/dev/null 2>&1 || { echo >&2 "${BOLDRED}ERROR${NC}: Jackett requires Mono but it's not installed. Aborting."; exit 1; }
-monodir="$(dirname $(command -v mono))"
-
 # Check that no other service called Jackett is already running
 if [[ $(launchctl list | grep org.user.Jackett) ]]; then
     echo "${BOLDRED}ERROR${NC}: Jackett already seems to be running as a service. Please stop it before running this script again."
@@ -38,7 +34,7 @@ cat >~/Library/LaunchAgents/org.user.Jackett.plist <<EOL
     <key>EnvironmentVariables</key>
     <dict>
         <key>PATH</key>
-        <string>/usr/bin:/bin:/usr/sbin:/sbin:${monodir}</string>
+        <string>/usr/bin:/bin:/usr/sbin:/sbin</string>
     </dict>
     <key>KeepAlive</key>
     <true/>
@@ -46,9 +42,7 @@ cat >~/Library/LaunchAgents/org.user.Jackett.plist <<EOL
     <string>org.user.Jackett</string>
     <key>ProgramArguments</key>
     <array>
-        <string>${monodir}/mono</string>
-        <string>--debug</string>
-        <string>JackettConsole.exe</string>
+        <string>${jackettdir}/jackett</string>
         <string>--NoRestart</string>
     </array>
     <key>RunAtLoad</key>
@@ -70,7 +64,6 @@ else
     cat << EOL
 ${BOLDRED}ERROR${NC}: Could not launch agent. The installation might have failed.
 Please open an issue on https://github.com/Jackett/Jackett/issues and paste following information:
-Mono directory: \`${monodir}\`
 Jackett directory: \`${jackettdir}\`
 
 EOL

install_service_systemd.sh

@@ -70,7 +70,6 @@ else
     cat << EOL
 ${BOLDRED}ERROR${NC}: Could not launch service. The installation might have failed.
 Please open an issue on https://github.com/Jackett/Jackett/issues and paste following information:
-Mono directory: \`${monodir}\`
 Jackett directory: \`${jackettdir}\`
 Jackett user: \`${jackettuser}\`
 

src/Jackett.Common/Content/custom.css

@@ -270,6 +270,11 @@ table td.fit{
     text-align: right;
     margin-right: 1em;
 }
-input#searchquery{
+
+input#searchquery {
 	width:400px;
 }
+
+#proxy-warning {
+    color: red;
+}

src/Jackett.Common/Content/custom.js

@@ -94,12 +94,17 @@ function loadJackettSettings() {
             $("#logoutBtn").show();
         }
 
+        if (data.can_run_netcore != null && data.can_run_netcore === true) {
+            $("#can-upgrade-from-mono").show();
+        }
+
         $.each(data.notices, function (index, value) {
             console.log(value);
             doNotify(value, "danger", "glyphicon glyphicon-alert", false);
         })
 
         reloadIndexers();
+        proxyWarning(data.proxy_url);
     });
 }
 
@@ -221,12 +226,12 @@ function displayUnconfiguredIndexersList() {
 		                    doNotify("Configuration failed: " + data.error, "danger", "glyphicon glyphicon-alert");
 		                }
 			        }).fail(function (data) {
-			            if(data.responseJSON.error !== undefined) {
-                doNotify("An error occured while configuring this indexer<br /><b>" + data.responseJSON.error + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + indexerId + "] " + data.responseJSON.error + " (Config)\" target=\"_blank\">Click here to open an issue on GitHub for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
-            } else {
-                doNotify("An error occured while configuring this indexer, is Jackett server running ?", "danger", "glyphicon glyphicon-alert");
-            }
-                        
+                if(data.responseJSON.error !== undefined) {
+                  var indexEnd = 2048 - "https://github.com/Jackett/Jackett/issues/new?title=[".length - indexerId.length - "] ".length - " (Config)".length; // keep url <= 2k #5104
+                  doNotify("An error occured while configuring this indexer<br /><b>" + data.responseJSON.error.substring(0, indexEnd) + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + indexerId + "] " + data.responseJSON.error.substring(0, indexEnd) + " (Config)\" target=\"_blank\">Click here to open an issue on GitHub for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
+                } else {
+                  doNotify("An error occured while configuring this indexer, is Jackett server running ?", "danger", "glyphicon glyphicon-alert");
+                }
 			        });
                 });
             });
@@ -443,12 +448,13 @@ function testIndexer(id, notifyResult) {
                 doNotify("Test failed for " + id + ": \n" + data.error, "danger", "glyphicon glyphicon-alert");
         }
     }).fail(function (data) {
-        updateTestState(id, "error", data.error, indexers);
-        if(data.responseJSON.error !== undefined && notifyResult) {
-                doNotify("An error occured while testing this indexer<br /><b>" + data.responseJSON.error + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + id + "] " + data.responseJSON.error + " (Test)\" target=\"_blank\">Click here to open an issue on GitHub for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
-            } else {
-                doNotify("An error occured while testing indexers, please take a look at indexers with failed test for more informations.", "danger", "glyphicon glyphicon-alert");
-            }
+      updateTestState(id, "error", data.error, indexers);
+      if(data.responseJSON.error !== undefined && notifyResult) {
+        var indexEnd = 2048 - "https://github.com/Jackett/Jackett/issues/new?title=[".length - id.length - "] ".length - " (Test)".length; // keep url <= 2k #5104
+        doNotify("An error occured while testing this indexer<br /><b>" + data.responseJSON.error.substring(0, indexEnd) + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + id + "] " + data.responseJSON.error.substring(0, indexEnd) + " (Test)\" target=\"_blank\">Click here to open an issue on GitHub for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
+      } else {
+        doNotify("An error occured while testing indexers, please take a look at indexers with failed test for more informations.", "danger", "glyphicon glyphicon-alert");
+      }
     });
 }
 
@@ -650,11 +656,12 @@ function populateSetupForm(indexerId, name, config, caps, link, alternativesitel
                 doNotify("Configuration failed: " + data.error, "danger", "glyphicon glyphicon-alert");
             }
         }).fail(function (data) {
-            if(data.responseJSON.error !== undefined) {
-                doNotify("An error occured while updating this indexer<br /><b>" + data.responseJSON.error + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + indexerId + "] " + data.responseJSON.error + " (Config)\" target=\"_blank\">Click here to open an issue on GitHub for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
-            } else {
-                doNotify("An error occured while updating this indexer, request to Jackett server failed, is server running ?", "danger", "glyphicon glyphicon-alert");
-            }
+          if(data.responseJSON.error !== undefined) {
+            var indexEnd = 2048 - "https://github.com/Jackett/Jackett/issues/new?title=[".length - indexerId.length - "] ".length - " (Config)".length; // keep url <= 2k #5104
+            doNotify("An error occured while updating this indexer<br /><b>" + data.responseJSON.error.substring(0, indexEnd) + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + indexerId + "] " + data.responseJSON.error.substring(0, indexEnd) + " (Config)\" target=\"_blank\">Click here to open an issue on GitHub for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
+          } else {
+            doNotify("An error occured while updating this indexer, request to Jackett server failed, is server running ?", "danger", "glyphicon glyphicon-alert");
+          }
         }).always(function () {
             $goButton.html(originalBtnText);
             $goButton.prop('disabled', false);
@@ -1221,4 +1228,18 @@ function bindUIButtons() {
             doNotify("Request to Jackett server failed", "danger", "glyphicon glyphicon-alert");
         });
     });
+
+    $('#jackett-proxy-url').on('input', function () {
+        proxyWarning($(this).val());
+    });
+}
+
+function proxyWarning(input) {
+    if (input != null && input.trim() !== "") {
+        $('#proxy-warning').show();
+    }
+    else
+    {
+        $('#proxy-warning').hide();
+    }
 }

src/Jackett.Common/Content/custom_mobile.css

@@ -281,6 +281,10 @@ div#jackett-releases-datatable_wrapper {
     width: 100%;
     overflow-x: scroll;
 }
-input#searchquery{
+input#searchquery {
 	width:50%;
 }
+
+#proxy-warning {
+    color: red;
+}

src/Jackett.Common/Content/index.html

@@ -19,7 +19,7 @@
     <link rel="apple-touch-icon" sizes="180x180" href="../apple-touch-icon-180x180.png" />
     <link rel="mask-icon" href="jackett_medium.png" color="#35c5f4">
     <link rel="icon" type="image/ico" href="../favicon.ico" />
-    <link rel='shortcut icon' type='image/x-icon' href='../favicon.ico' />
+    <link rel='shortcut icon' type='image/x-icon' href='../favicon.ico?' />
     <script type="text/javascript" src="../libs/filesize.min.js?changed=2017083001"></script>
     <script type="text/javascript" src="../libs/jquery.min.js?changed=2017083001"></script>
     <script type="text/javascript" src="../libs/jquery.dataTables.min.js?changed=2017083001" charset="utf8"></script>
@@ -34,8 +34,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="../custom.css?changed=2017083001" media="only screen and (min-device-width: 480px)">
-    <link rel="stylesheet" type="text/css" href="../custom_mobile.css?changed=2017083001" media="only screen and (max-device-width: 480px)">
+    <link rel="stylesheet" type="text/css" href="../custom.css?changed=20190401" media="only screen and (min-device-width: 480px)">
+    <link rel="stylesheet" type="text/css" href="../custom_mobile.css?changed=20190401" 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">
@@ -51,6 +51,14 @@
             <input id="api-key-input" class="form-control input-right" type="text" value="" placeholder="API Key" readonly="">
         </div>
         <hr />
+
+        <div id="can-upgrade-from-mono" hidden class="alert alert-info" role="alert"> 
+            <strong>Standalone version of Jackett is now available - Mono not required</strong> <br>
+            To upgrade to the standalone version of Jackett, <a href="https://github.com/Jackett/Jackett#install-on-linux-amdx64" target="_blank" class="alert-link">click here</a> for install instructions. 
+            Upgrading is straight forward, simply install the standalone version and your indexers/configuration will carry over. 
+            Benefits include: increased performance, improved stability and no dependency on Mono. 
+        </div>
+
         <div class="pull-right">
             <button id="jackett-add-indexer" class="btn btn-success btn-sm">
                 <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add indexer
@@ -87,8 +95,10 @@
             <h4>Adding a Jackett indexer to RSS clients (RSS feed)</h4>
             <ol>
                 <li>Click on the indexers corresponding <button type="button" class="btn btn-xs btn-info">Copy RSS Feed</button> button and paste it into the URL field of the RSS client.</li>
-                <li>You can adjust the <b>q</b> (search string) and <b>cat</b> (categories) arguments accordingly.
-                E.g. <b>...&cat=2030,2040&q=big+buck+bunny</b> will search for "big buck bunny" in the Movies/SD (2030) and Movies/HD (2040) categories (See the indexer configuration for available categories).</li>
+                <li>
+                    You can adjust the <b>q</b> (search string) and <b>cat</b> (categories) arguments accordingly.
+                    E.g. <b>...&cat=2030,2040&q=big+buck+bunny</b> will search for "big buck bunny" in the Movies/SD (2030) and Movies/HD (2040) categories (See the indexer configuration for available categories).
+                </li>
             </ol>
         </div>
         <hr />
@@ -138,6 +148,11 @@
                 <option value="2">socks5</option>
             </select>
         </div>
+        <div id="proxy-warning" hidden>
+            <span>
+                WARNING: The proxy option potentially leaks requests. Recommendation is to use a VPN.
+            </span>
+        </div>
         <div class="input-area">
             <span class="input-header">Proxy url: </span>
             <input id="jackett-proxy-url" class="form-control input-right" type="text" value="" placeholder="Blank to disable">
@@ -663,6 +678,6 @@
     </script>
 
     <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=20180711"></script>
+    <script type="text/javascript" src="../custom.js?changed=20190427"></script>
 </body>
 </html>

src/Jackett.Common/Definitions/Bittorrentfiles.yml

@@ -6,88 +6,99 @@
   type: private
   encoding: UTF-8
   links:
+    - https://bittorrentfiles.me/
+  legacylinks:
     - https://www.Bittorrentfiles.me/
 
   caps:
     categorymappings:
       # Movie
-      - {id: 48, cat: Movies/HD, desc: "1080p"}
-      - {id: 31, cat: Movies/3D, desc: "3D"}
-      - {id: 21, cat: Movies/HD, desc: "720p"}
-      - {id: 28, cat: Movies/SD, desc: "AVI"}
-      - {id: 20, cat: Movies/DVD, desc: "DVD-R"}
-      - {id: 40, cat: Movies/HD, desc: "h264/x264"}
-      - {id: 30, cat: Movies/HD, desc: "HD/BD"}
-      - {id: 49, cat: Movies/Foreign, desc: "International"}
-      - {id: 78, cat: Movies/HD, desc: "UHD"}
+      - {id: 48, cat: Movies/HD, desc: "Movie 1080p"}
+      - {id: 31, cat: Movies/3D, desc: "Movie 3D"}
+      - {id: 21, cat: Movies/HD, desc: "Movie 720p"}
+      - {id: 28, cat: Movies/SD, desc: "Movie AVI"}
+      - {id: 20, cat: Movies/DVD, desc: "Movie DVD-R"}
+      - {id: 40, cat: Movies/HD, desc: Movie "h264/x264"}
+      - {id: 30, cat: Movies/HD, desc: "Movie HD/BD"}
+      - {id: 49, cat: Movies/Foreign, desc: "Movie International"}
+      - {id: 78, cat: Movies/UHD, desc: "Movie UHD"}
+      - {id: 85, cat: Movies/HD, desc: "Movie x265"}
 
       # Serien
       - {id: 79, cat: TV/HD, desc: "Staffeln HD"}
       - {id: 56, cat: TV/SD, desc: "Staffeln SD"}
+      - {id: 88, cat: TV/UHD, desc: "Staffeln UHD"}
+      - {id: 86, cat: TV/HD, desc: "Folgen UHD"}
       - {id: 54, cat: TV/HD, desc: "Folgen HD"}
       - {id: 80, cat: TV/HD, desc: "Folgen HD/BD"}
       - {id: 7, cat: TV/SD, desc: "Folgen SD"}
-      - {id: 55, cat: TV/Foreign, desc: "International"}
+      - {id: 55, cat: TV/Foreign, desc: "Folgen International"}
 
       # Doku
-      - {id: 64, cat: TV/Documentary, desc: "HD"}
-      - {id: 36, cat: TV/Documentary, desc: "SD"}
-      - {id: 81, cat: TV/Documentary, desc: "3D"}
-      - {id: 82, cat: TV/Documentary, desc: "Packs"}
+      - {id: 91, cat: TV/Documentary, desc: "Doku UHD"}
+      - {id: 64, cat: TV/Documentary, desc: "Doku HD"}
+      - {id: 36, cat: TV/Documentary, desc: "Doku SD"}
+      - {id: 81, cat: TV/Documentary, desc: "Doku 3D"}
+      - {id: 82, cat: TV/Documentary, desc: "Doku Packs"}
 
       # Spiele
-      - {id: 4, cat: PC/Games, desc: "Windows"}
-      - {id: 72, cat: Console/XBox360, desc: "XBOX 360"}
-      - {id: 44, cat: Console/XBoxOne, desc: "XBOX One"}
-      - {id: 43, cat: Console/Wii, desc: "Wii"}
-      - {id: 69, cat: Console, desc: "PS2"}
-      - {id: 70, cat: Console/PS3, desc: "PS3"}
-      - {id: 70, cat: Console/PS4, desc: "PS4"}
-      - {id: 70, cat: Console/PSP, desc: "PSP"}
-      - {id: 42, cat: Console/Other, desc: "Misc"}
+      - {id: 4, cat: PC/Games, desc: "Spiele Windows"}
+      - {id: 92, cat: PC/Mac, desc: "Spiele Mac"}
+      - {id: 93, cat: PC, desc: "Spiele Linux"}
+      - {id: 97, cat: Console/XBox, desc: "Spiele XBOX"}
+      - {id: 94, cat: PC/Phone-Other, desc: "Spiele Mobile"}
+      - {id: 95, cat: Console/NDS, desc: "Spiele Nintendo"}
+      - {id: 96, cat: Console/PSP, desc: "Spiele Playstation"}
+      - {id: 42, cat: Console/Other, desc: "Spiele Andere"}
 
       # Musik
-      - {id: 66, cat: Audio, desc: "Alben"}
-      - {id: 75, cat: Audio, desc: "Singles"}
-      - {id: 50, cat: Audio, desc: "Charts"}
-      - {id: 52, cat: Audio, desc: "Packs"}
-      - {id: 53, cat: Audio/Video, desc: "Video"}
-      - {id: 61, cat: Audio/Video, desc: "DVD-R"}
-      - {id: 83, cat: Audio, desc: "Flac"}
-      - {id: 68, cat: Audio, desc: "Live"}
-      - {id: 6, cat: Audio, desc: "Misc"}
-      - {id: 51, cat: Audio, desc: "OST"}
-      - {id: 67, cat: Audio, desc: "Sampler"}
+      - {id: 66, cat: Audio, desc: "Musik Alben"}
+      - {id: 75, cat: Audio, desc: "Musik Singles"}
+      - {id: 50, cat: Audio, desc: "Musik Charts"}
+      - {id: 52, cat: Audio, desc: "Musik Packs"}
+      - {id: 53, cat: Audio/Video, desc: "Musik Video"}
+      - {id: 61, cat: Audio/Video, desc: "Musik DVD-R"}
+      - {id: 83, cat: Audio/Lossless, desc: "Musik Flac"}
+      - {id: 68, cat: Audio, desc: "Musik Live"}
+      - {id: 6, cat: Audio, desc: "Musik Misc"}
+      - {id: 51, cat: Audio, desc: "Musik OST"}
+      - {id: 67, cat: Audio, desc: "Musik Sampler"}
 
       # App
-      - {id: 22, cat: PC/0day, desc: "Windows"}
-      - {id: 62, cat: PC/Mac, desc: "Mac OS"}
-      - {id: 63, cat: PC/0day, desc: "Linux"}
-      - {id: 34, cat: PC, desc: "Andere"}
+      - {id: 98, cat: PC/0day, desc: "App Windows"}
+      - {id: 62, cat: PC/Mac, desc: "App Mac OS"}
+      - {id: 63, cat: PC/0day, desc: "App Linux"}
+      - {id: 34, cat: PC, desc: "App Andere"}
 
       # Sport
-      - {id: 74, cat: TV/Sport, desc: "HD"}
-      - {id: 39, cat: TV/Sport, desc: "SD"}
+      - {id: 74, cat: TV/Sport, desc: "Sport HD"}
+      - {id: 39, cat: TV/Sport, desc: "Sport SD"}
 
       # Sonstiges
-      - {id: 41, cat: Books/Comics, desc: "A-Book"}
-      - {id: 33, cat: TV/Anime, desc: "Anime"}
-      - {id: 35, cat: Books, desc: "e-Book"}
-      - {id: 65, cat: Other, desc: "E-Learning"}
-      - {id: 65, cat: PC, desc: "Mobile"}
-      - {id: 9, cat: Other, desc: "Other"}
+      - {id: 41, cat: Books/Comics, desc: "Sonstiges A-Book"}
+      - {id: 33, cat: TV/Anime, desc: "Sonstiges Anime"}
+      - {id: 35, cat: Books/Ebook, desc: "Sonstiges e-Book-DE"}
+      - {id: 90, cat: Books/Ebook, desc: "Sonstiges e-Book-INT"}
+      - {id: 65, cat: Other, desc: "Sonstiges E-Learning"}
+      - {id: 37, cat: PC, desc: "Sonstiges Mobile"}
+      - {id: 87, cat: Books/Magazines, desc: "Sonstiges E-Paper"}
+      - {id: 38, cat: Other, desc: "Sonstiges Kids"}
+      - {id: 47, cat: Other, desc: "Sonstiges Line"}
+      - {id: 9, cat: Other, desc: "Sonstiges Andere"}
 
       #XXX
-      - {id: 58, cat: Books/Comics, desc: "HD"}
-      - {id: 33, cat: XXX, desc: "Hentai"}
-      - {id: 35, cat: XXX/Other, desc: "Other"}
-      - {id: 65, cat: XXX/Packs, desc: "Pack"}
-      - {id: 65, cat: XXX, desc: "SD"}
+      - {id: 58, cat: Books/Comics, desc: "XXX HD"}
+      - {id: 46, cat: XXX, desc: "XXX Hentai"}
+      - {id: 35, cat: XXX/Other, desc: "XXX Andere"}
+      - {id: 59, cat: XXX/Packs, desc: "XXX Pack"}
+      - {id: 27, cat: XXX, desc: "XXX SD"}
+      - {id: 76, cat: XXX, desc: "XXX Andere"}
 
 
     modes:
-      search: [q]
-      tv-search: [q, season, ep]
+      search: [q, imdbid]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
 
   settings:
     - name: user
@@ -113,8 +124,11 @@
     path: browse.php
     inputs:
       $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
-      incldead: "1"
+      search: "{{if .Query.IMDBID}}{{.Query.IMDBID}}{{else}}{{.Keywords}}{{end}}"
+      # 0=title 1=descr 2=nfo 3=all
+      search_where: "{{if .Query.IMDBID}}3{{else}}0{{end}}"
+      # 0=active 1=all 2=dead 4=upload 5=doubleup 6=halfdown 7=highlight =request
+      status: 1
 
     rows:
       selector: table.tableinborder > tbody > tr:has(a[href^="details.php"])
@@ -134,10 +148,16 @@
       download:
         selector: a[href^="/download.php"]
         attribute: href
-      files:
-        selector: td:nth-child(5)
       grabs:
-        selector: td:nth-child(4)
+        text: 0
+      grabs:
+        selector: a[title="Snatcher"]
+        optional: true
+      files:
+        text: 0
+      files:
+        selector: a[title="Files"]
+        optional: true
       size:
         selector: td:nth-child(6)
         filters:
@@ -146,24 +166,42 @@
           - name: replace
             args: [",", "."]
       seeders:
-        selector: td:nth-child(2) > a
+        text: 0
+      seeders:
+        selector: a[title="Seeder"]
+        optional: true
       leechers:
-        selector: td:nth-child(3)
+        text: 0
+      leechers:
+        selector: a[title="Leecher"]
+        optional: true
+        # 2 flavours of dates
       date:
-        selector: td:nth-child(10)
+        # Heute 13:30:04
+        # Gestern 09:10:10
+        selector: td:nth-child(10):contains("Heute"),  td:nth-child(10):contains("Gestern")
+        optional: true
         filters:
           - name: split
-            args: ["by", 0]
+            args: ["b", 0]
           - name: replace
             args: ["Heute", "Today"]
           - name: replace
             args: ["Gestern", "Yesterday"]
+      date:
+          # 30.02.2018 23:12:50
+        selector: td:nth-child(10):contains("."):contains(":")
+        optional: true
+        filters:
+          - name: split
+            args: ["b", 0]
           - name: dateparse
             args: "02.01.2006 15:04:05"
       downloadvolumefactor:
         case:
           img[alt="OU"]: "0"
           img[alt="D/2"]: "0.5"
+          img[alt="D / 2"]: "0.5"
           "*": "1"
       uploadvolumefactor:
         case:

src/Jackett.Common/Definitions/DasUnerwartete.yml

@@ -0,0 +1,124 @@
+---
+  site: Das-Unerwartete
+  name: Das Unerwartete
+  description: "Das Unerwartete is a Private GERMAN tracker"
+  language: de-de
+  type: private
+  encoding: UTF-8
+  links:
+    - https://dasunerwartete.nl
+
+  caps:
+    categorymappings:
+
+      - {id: 112, cat: Audio/Audiobook, desc: "Hoerbuecher/Hoerspiele"}
+      - {id: 51, cat: Audio, desc: "Musik"}
+      - {id: 124, cat: Audio/Video, desc: "Musikvideo"}
+      - {id: 103, cat: Movies/DVD, desc: "DVD"}
+      - {id: 88, cat: Movies, desc: "Kids Only"}
+      - {id: 43, cat: Movies, desc: "Movie Packs"}
+      - {id: 105, cat: Movies/HD, desc: "Movie/1080 P"}
+      - {id: 107, cat: Movies/HD, desc: "Movie/3D"}
+      - {id: 102, cat: Movies/HD, desc: "Movie/720 P"}
+      - {id: 101, cat: Movies/BluRay, desc: "Movie/Blueray - HD"}
+      - {id: 108, cat: Movies, desc: "Movie/Bollywood"}
+      - {id: 93, cat: TV/Documentary, desc: "Movie/Dokus"}
+      - {id: 125, cat: Movies/Foreign, desc: "Movie/International"}
+      - {id: 91, cat: Movies/SD, desc: "Movie/SD"}
+      - {id: 114, cat: Movies, desc: "Movie/TV-Rip"}
+      - {id: 132, cat: Movies/HD, desc: "Movie/UHD"}
+      - {id: 110, cat: Movies/HD, desc: "x264"}
+      - {id: 106, cat: Console/PS3, desc: "Games/PS3"}
+      - {id: 109, cat: Console/PSP, desc: "Games/PSP"}
+      - {id: 113, cat: Console/Wii, desc: "Games/Wii"}
+      - {id: 86, cat: PC/Games, desc: "Games/Windows"}
+      - {id: 104, cat: Console/XBox360, desc: "Games/Xbox360"}
+      - {id: 104, cat: Console/XBox360, desc: "Games/Xbox360"}
+      - {id: 116, cat: PC/Games, desc: "Linux/Spiele"}
+      - {id: 53, cat: PC/Phone-Android, desc: "Android/Appz/Games/Navi"}
+      - {id: 126, cat: PC, desc: "Win/Mac/linux"}
+      - {id: 129, cat: TV/HD, desc: "Serien/Folgen HD"}
+      - {id: 61, cat: TV/SD, desc: "Serien/Folgen SD"}
+      - {id: 131, cat: TV/HD, desc: "Serien/Staffeln HD"}
+      - {id: 130, cat: TV/SD, desc: "Serien/Staffeln SD"}
+      - {id: 94, cat: Books/Ebook, desc: "Ebooks"}
+      - {id: 96, cat: TV/Anime, desc: "Anime / Hentai"}
+      - {id: 9, cat: Other/Misc, desc: "Sonstiges"}
+      - {id: 115, cat: TV/Sport, desc: "Sport"}
+      - {id: 69, cat: XXX, desc: "XXX"}
+      - {id: 122, cat: Books/Magazines, desc: "Zeitschriften/Zeitungen"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+
+  login:
+    path: login.php
+    method: form
+    form: form
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: .tablea:contains("Benutzername oder Passwort ungültig")
+    test:
+      path: browse.php
+
+  search:
+    path: browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      incldead: "1"
+
+    rows:
+      selector: table.tableinborder > tbody > tr:has(a[href^="download.php"])
+    fields:
+      title:
+        selector: a[href^="details.php"]
+        filters:
+          - name: replace
+            args: [".torrent", ""]
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      details:
+        selector: a[href^="details.php"]
+        attribute: href
+      download:
+        selector: a[href^="download.php"]
+        attribute: href
+      files:
+        selector: .tablea tr:nth-child(2) td:nth-child(1) b:nth-child(2)
+      grabs:
+        selector: .tablea tr:nth-child(2) td:nth-child(3) b
+      size:
+        selector: .tablea tr:nth-child(2) td:nth-child(1) b:nth-child(1)
+        filters:
+          - name: replace
+            args: [".", ""]
+          - name: replace
+            args: [",", "."]
+      seeders:
+        selector: .tablea tr:nth-child(2) td:nth-child(2) b:nth-child(1) font
+      leechers:
+        selector: .tablea tr:nth-child(2) td:nth-child(2) b:nth-child(3) font
+      downloadvolumefactor:
+        case:
+          img[src="pic/oupic.gif"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett.Common/Definitions/amigosshare.yml

@@ -10,6 +10,18 @@
   legacylinks:
     - http://amigos-share.club/
 
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: info_results
+      type: info
+      label: "Search results"
+      default: "Set <b>Exibição De Torrents</b> to <b>Lista</b> in your <b>Minhas Configurações</b>.<br />Using <b>Capas</b> is not supported and will return 0 results."
+
   caps:
     categorymappings:
       - {id: 107, cat: XXX, desc: "Adultos: Gay"}
@@ -48,7 +60,7 @@
       - {id: 2, cat: Movies, desc: "Filmes: Terror"}
       - {id: 1, cat: Movies, desc: "Filmes: Ação"}
       - {id: 80, cat: Movies, desc: "Filmes: Aventura"}
-      - {id: 70, cat: Other, desc: "Fotos: XXX"}
+      - {id: 70, cat: XXX, desc: "Fotos: XXX"}
       - {id: 79, cat: Console/PS4, desc: "Jogos: Ps4"}
       - {id: 47, cat: PC/Games, desc: "Jogos: Pc"}
       - {id: 61, cat: Console, desc: "Jogos: Emuladores e Roms"}
@@ -130,18 +142,18 @@
     error:
       - selector: div.alert-error
     test:
-      path: index.php
+      path: torrents-search.php
       selector: a[href="account-logout.php"]
 
   ratio:
-    path: index.php
+    path: torrents-search.php
     selector: li:contains("Ratio:") a b
 
   search:
     paths:
       # http://amigos-share.club/torrents-search.php?search=&c1=1&c19=1&c36=1&incldead=0&freeleech=0&lang=0sort=id&order=desc&page=1
       - path: torrents-search.php
-      # site displays just 21 results, no profile options found to change this, so we attempt to fetch 5 pages
+      # site displays just 9 results, no profile options found to change this, so we attempt to fetch 5 pages
       - path: torrents-search.php
         inputs:
           page: 1
@@ -157,13 +169,13 @@
     inputs:
       $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
       search: "{{ .Keywords }}"
-      incldead: 0
+      incldead: 1
       freeleech: 0
       lang: 0
       sort: "id"
       order: "desc"
     rows:
-      selector: table.table-striped > tbody > tr:has(a[href^="torrents-details.php?id="])
+      selector: div#fancy-list-group ul.list-group li.list-group-item
     fields:
       title:
         selector: a[href^="torrents-details.php?id="]
@@ -174,7 +186,7 @@
         selector: a[href^="download.php?id="]
         attribute: href
       category:
-        selector: td:first-child img
+        selector: div.list-group-item-addon img
         attribute: src
         case:
         # unfortunately the site does not have category numbers on the results page, just a .png which can apply to both movies and tv.
@@ -195,7 +207,7 @@
          "[src$=\"/E-books.png\"]": "67"
          "[src$=\"/Revista.png\"]": "68"
          "[src$=\"/Aventura.png\"]": "80"
-         "[src$=\"/XXX.png\"]": "70"
+         "[src$=\"/Revistas-XXX.png\"]": "70"
          "[src$=\"/Jogos-Ps4.png\"]": "79"
          "[src$=\"/Jogos-PC.png\"]": "47"
          "[src$=\"/Jogos-EmuladoreseRoms.png\"]": "61"
@@ -281,14 +293,14 @@
       date:
         text: now
       size:
-        selector: td:nth-child(2) span.label-info
+        selector: div.list-group-item-content p.m-0 span.badge-info
       seeders:
-        selector: td:nth-child(4)
+        selector: div.list-group-item-controls a:nth-child(1)
       leechers:
-        selector: td:nth-child(5)
+        selector: div.list-group-item-controls a:nth-child(2)
       downloadvolumefactor:
         case:
-          "span.label-success i:contains(\"FREE\")": "0"
+          "span.badge-success:contains(\"FREE\")": "0"
           "*": "1"
       uploadvolumefactor:
         case:

src/Jackett.Common/Definitions/arenabg.yml

@@ -78,10 +78,10 @@
     - name: downloadlink
       type: select
       label: Download link
-      default: "magnet:"
+      default: "magnet:?xt="
       options:
-        "/download/" : ".torrent"
-        "magnet:": "magnet"
+        "/get/key:" : ".torrent"
+        "magnet:?xt=": "magnet"
 
   login:
     path: /
@@ -100,7 +100,7 @@
       selector: a[href="/users/logout/"]
 
   download:
-    selector: a[href^="{{ .Config.downloadlink }}"]
+    selector: a[href*="{{ .Config.downloadlink }}"]
 
   search:
     paths:

src/Jackett.Common/Definitions/asiancinema.yml

@@ -25,10 +25,22 @@
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
+      remember: 1
     error:
-      - selector: form[action*="/login"] .text-red
+      - selector: div.has-error
     test:
       path: torrents
+      selector: a[href$="/logout"]
+
+  ratio:
+    path: torrents
+    selector: li:has(i.fa-sync-alt)
+    filters:
+      - name: regexp
+        args: "Ratio : (\\d+)"
+
+  download:
+    selector: a[href*="/download/"]
 
   search:
     paths:
@@ -36,42 +48,54 @@
     inputs:
       $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
       search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      description: ""
       uploader: ""
       imdb: "{{ .Query.IMDBIDShort }}"
       tvdb: ""
       tmdb: ""
       mal: ""
-      sorting: created_at
-      direction: desc
+      sort: "created_at"
+      direction: "desc"
       qty: 100
     rows:
       selector: table > tbody > tr
     fields:
       category:
-        selector: a[href*="/category/"]
+        selector: a[href*="/categories/"]
         attribute: href
         filters:
           - name: regexp
-            args: "/category/.*?\\.(\\d+)"
+            args: "/categories/.*?\\.(\\d+)"
       title:
         selector: a.view-torrent
       download:
-        selector: a[href*="/download/"]
+        selector: a[href*="/download_check/"]
         attribute: href
       details:
         selector: a.view-torrent
         attribute: href
+      banner:
+        optional: true
+        selector: div.torrent-poster img
+        attribute: src
+        filters:
+          - name: replace
+            args: ["https://via.placeholder.com/600x900", ""]
       size:
         selector: td:nth-child(5)
       seeders:
-        selector: td:nth-child(7)
-      leechers:
-        selector: td:nth-child(8)
-      grabs:
         selector: td:nth-child(6)
+      leechers:
+        selector: td:nth-child(7)
+      grabs:
+        selector: td:nth-child(8)
         filters:
           - name: regexp
             args: ([\d\.]+)
+      imdb:
+        optional: true
+        selector: a[href*="www.imdb.com/title/tt"]
+        attribute: href
       date:
         selector: time
         filters:
@@ -100,12 +124,17 @@
             args: [" (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
       downloadvolumefactor:
         case:
-          "i[data-original-title=\"100% Free\"]": "0" # Single Torrent Freeleech
+          "i[data-original-title=\"Personal Freeleech\"]": "0" # 24 Hour FreeLeech From BON Store
+          "i[data-original-title=\"Special Freeleech\"]": "0" # Special FreeLeech For Certain User Groups
+          "i[data-original-title=\"Freeleech Token\"]": "0" # Freeleech From Token
           "i[data-original-title=\"Global FreeLeech\"]": "0" # Global Freeleech
+          "i[data-original-title=\"Freeleech\"]": "0" # Freeleech
+          "i[data-original-title=\"Featured\"]": "0" # Featured Torrent
           "*": "1"
       uploadvolumefactor:
         case:
-          "i[data-original-title=\"Double upload\"]": "2" # Single Torrent Double Upload
-          "i[data-original-title=\"Double Upload\"]": "2" # Global Double Upload
+          "i[data-original-title=\"Double Upload\"]": "2" # Single Torrent Double Upload
+          "i[data-original-title=\"Global Double Upload\"]": "2" # Global Double Upload
+          "i[data-original-title=\"Featured\"]": "2" # Featured Torrent
           "*": "1"
-# UNIT3D
+# UNIT3D 1.9.2

src/Jackett.Common/Definitions/avg.yml

@@ -0,0 +1,299 @@
+---
+  site: avg
+  name: AVG
+  description: "Audio Video Games (BestRepack) is a RUSSIAN Private Torrent Tracker for GAMES"
+  language: ru-ru
+  type: private
+  encoding: UTF-8
+  links:
+    - https://avg.club/
+
+  caps:
+    categorymappings:
+      - {id: 110, cat: PC/Games, desc: "Репаки от R.G. Catalyst"}
+      - {id: 146, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst Горячие новинки"}
+      - {id: 112, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst Action"}
+      - {id: 113, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst Fighting"}
+      - {id: 114, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst RPG"}
+      - {id: 118, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst Аркады"}
+      - {id: 120, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst Квесты и приключения"}
+      - {id: 122, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst Стратегии"}
+      - {id: 124, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst Симуляторы"}
+      - {id: 126, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst Гонки"}
+      - {id: 147, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst Горячие новинки"}
+      - {id: 115, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst Action"}
+      - {id: 116, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst Fighting"}
+      - {id: 117, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst RPG"}
+      - {id: 119, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst Аркады"}
+      - {id: 121, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst Квесты и приключения"}
+      - {id: 123, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst Стратегии"}
+      - {id: 125, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst Симуляторы"}
+      - {id: 127, cat: PC/Games, desc: "Игры PC (Репаки) от R.G. Catalyst Гонки"}
+      - {id: 9, cat: PC/Games, desc: "Игры PC (Репаки) Горячие новинки"}
+      - {id: 2, cat: PC/Games, desc: "Игры PC (Репаки) Action"}
+      - {id: 8, cat: PC/Games, desc: "Игры PC (Репаки) Fighting"}
+      - {id: 3, cat: PC/Games, desc: "Игры PC (Репаки) RPG"}
+      - {id: 7, cat: PC/Games, desc: "Игры PC (Репаки) Аркады"}
+      - {id: 6, cat: PC/Games, desc: "Игры PC (Репаки) Квесты и приключения"}
+      - {id: 4, cat: PC/Games, desc: "Игры PC (Репаки) Стратегии"}
+      - {id: 5, cat: PC/Games, desc: "Игры PC (Репаки) Симуляторы"}
+      - {id: 73, cat: PC/Games, desc: "Игры PC (Репаки) Гонки"}
+      - {id: 149, cat: PC/Games, desc: "Игры PC (Репаки) «Стройбат»"}
+      - {id: 148, cat: PC/Games, desc: "Игры PC (Оригиналы) Горячие новинки"}
+      - {id: 129, cat: PC/Games, desc: "Игры PC (Оригиналы) Action"}
+      - {id: 131, cat: PC/Games, desc: "Игры PC (Оригиналы) Fighting"}
+      - {id: 133, cat: PC/Games, desc: "Игры PC (Оригиналы) RPG"}
+      - {id: 135, cat: PC/Games, desc: "Игры PC (Оригиналы) Аркады"}
+      - {id: 137, cat: PC/Games, desc: "Игры PC (Оригиналы) Квесты и приключения"}
+      - {id: 139, cat: PC/Games, desc: "Игры PC (Оригиналы) Стратегии"}
+      - {id: 141, cat: PC/Games, desc: "Игры PC (Оригиналы) Симуляторы"}
+      - {id: 143, cat: PC/Games, desc: "Игры PC (Оригиналы) Гонки"}
+      - {id: 19, cat: PC/Games, desc: "Игры PC (Оригиналы) Релизы с GOG.com (игры без защиты)"}
+      - {id: 130, cat: PC/Games, desc: "Игры PC (Оригиналы) Релизы с GOG.com (игры без защиты) Action"}
+      - {id: 132, cat: PC/Games, desc: "Игры PC (Оригиналы) Релизы с GOG.com (игры без защиты) Fighting"}
+      - {id: 134, cat: PC/Games, desc: "Игры PC (Оригиналы) Релизы с GOG.com (игры без защиты) RPG"}
+      - {id: 136, cat: PC/Games, desc: "Игры PC (Оригиналы) Релизы с GOG.com (игры без защиты) Аркады"}
+      - {id: 138, cat: PC/Games, desc: "Игры PC (Оригиналы) Релизы с GOG.com (игры без защиты) Квесты и приключения"}
+      - {id: 140, cat: PC/Games, desc: "Игры PC (Оригиналы) Релизы с GOG.com (игры без защиты) Стратегии"}
+      - {id: 142, cat: PC/Games, desc: "Игры PC (Оригиналы) Релизы с GOG.com (игры без защиты) Симуляторы"}
+      - {id: 144, cat: PC/Games, desc: "Игры PC (Оригиналы) Релизы с GOG.com (игры без защиты) Гонки"}
+      - {id: 145, cat: PC/Games, desc: "Игры PC (Оригиналы) Релизы с GOG.com (игры без защиты) Linux / MacOS"}
+      - {id: 10, cat: PC/Games, desc: "Игры PC (Оригиналы) Горячие новинки"}
+      - {id: 11, cat: PC/Games, desc: "Игры PC (Оригиналы) Action"}
+      - {id: 12, cat: PC/Games, desc: "Игры PC (Оригиналы) Fighting"}
+      - {id: 13, cat: PC/Games, desc: "Игры PC (Оригиналы) RPG"}
+      - {id: 14, cat: PC/Games, desc: "Игры PC (Оригиналы) Аркады"}
+      - {id: 15, cat: PC/Games, desc: "Игры PC (Оригиналы) Квесты и приключения"}
+      - {id: 16, cat: PC/Games, desc: "Игры PC (Оригиналы) Стратегии"}
+      - {id: 17, cat: PC/Games, desc: "Игры PC (Оригиналы) Симуляторы"}
+      - {id: 74, cat: PC/Games, desc: "Игры PC (Оригиналы) Гонки"}
+      - {id: 98, cat: PC/Games, desc: "Игры PC (Оригиналы) Игры для Linux"}
+      - {id: 99, cat: PC/Games, desc: "Игры PC (Оригиналы) Игры для MacOS"}
+      - {id: 70, cat: Console/Xbox, desc: "Игры для консолей Xbox"}
+      - {id: 71, cat: Console/PSP, desc: "Игры для консолей Playstation"}
+      - {id: 72, cat: Console/Other, desc: "Игры для консолей Другие консоли"}
+      - {id: 34, cat: Movies, desc: "Кинематограф Новинки"}
+      - {id: 109, cat: Movies/HD, desc: "Кинематограф Новинки HD Remux / Blu-Ray Discs"}
+      - {id: 108, cat: Movies/HD, desc: "Кинематограф Новинки HD Rips (720p,1080p)"}
+      - {id: 20, cat: Movies, desc: "Кинематограф Отечественное кино"}
+      - {id: 21, cat: Movies, desc: "Кинематограф Зарубежное кино"}
+      - {id: 28, cat: TV, desc: "Отечественные сериалы"}
+      - {id: 27, cat: TV, desc: "Зарубежные сериалы"}
+      - {id: 29, cat: TV, desc: "Мультфильмы"}
+      - {id: 30, cat: TV, desc: "Мультсериалы"}
+      - {id: 37, cat: TV, desc: "Документальное кино"}
+      - {id: 38, cat: TV, desc: "Концерты и передачи"}
+      - {id: 67, cat: TV/Anime, desc: "Аниме Релизы"}
+      - {id: 45, cat: Audio, desc: "Музыка Тяжелая и альтернативная музыка"}
+      - {id: 85, cat: Audio, desc: "Музыка Эстрадная и поп-музыка"}
+      - {id: 77, cat: Audio, desc: "Музыка Электронная музыка"}
+      - {id: 58, cat: Audio, desc: "Музыка Рэп, хип-хоп, R`n`B"}
+      - {id: 78, cat: Audio, desc: "Музыка Фолк, этническая и народная музыка"}
+      - {id: 42, cat: Audio, desc: "Музыка Классическая и академическая музыка"}
+      - {id: 82, cat: Audio, desc: "Музыка New Age, Chillout, музыка для медитации"}
+      - {id: 79, cat: Audio, desc: "Музыка Джаз, блюз"}
+      - {id: 80, cat: Audio, desc: "Музыка Авторская песня, шансон"}
+      - {id: 49, cat: Audio, desc: "Музыка Саундтреки"}
+      - {id: 50, cat: Audio, desc: "Музыка Саундтреки Саундтреки к фильмам, мультфильмам, сериалам"}
+      - {id: 51, cat: Audio, desc: "Музыка Саундтреки Саундтреки к играм"}
+      - {id: 81, cat: Audio, desc: "Музыка Прочая музыка"}
+      - {id: 83, cat: Audio, desc: "Музыка Прочая музыка Неофициальные сборники"}
+      - {id: 156, cat: PC, desc: "Программное обеспечение Live CD, DVD, USB версии"}
+      - {id: 157, cat: PC, desc: "Программное обеспечение Windows 10 и более поздние"}
+      - {id: 158, cat: PC, desc: "Программное обеспечение Windows 8.1 и более ранние"}
+      - {id: 159, cat: PC, desc: "Программное обеспечение Обновления и языковые пакеты"}
+      - {id: 160, cat: PC, desc: "Программное обеспечение Серверные версии"}
+      - {id: 193, cat: PC/Mac, desc: "Программное обеспечение macOS"}
+      - {id: 194, cat: PC/Mac, desc: "Программное обеспечение macOS Stable (Release)"}
+      - {id: 195, cat: PC/Mac, desc: "Программное обеспечение macOS Dev (Beta)"}
+      - {id: 164, cat: PC/Mac, desc: "Программное обеспечение macOS Дистрибутивы Linux"}
+      - {id: 163, cat: PC/Mac, desc: "Программное обеспечение macOS *nix OS"}
+      - {id: 162, cat: PC/Mac, desc: "Программное обеспечение macOS Программное обеспечение"}
+      - {id: 165, cat: PC, desc: "Программное обеспечение Мультимедиа и графика"}
+      - {id: 172, cat: PC, desc: "Программное обеспечение Мультимедиа и графика Аудио-редакторы"}
+      - {id: 171, cat: PC, desc: "Программное обеспечение Мультимедиа и графика Видео-редакторы"}
+      - {id: 170, cat: PC, desc: "Программное обеспечение Мультимедиа и графика Графические редакторы"}
+      - {id: 169, cat: PC, desc: "Программное обеспечение Мультимедиа и графика Материалы для аудио"}
+      - {id: 168, cat: PC, desc: "Программное обеспечение Мультимедиа и графика Материалы для видео"}
+      - {id: 167, cat: PC, desc: "Программное обеспечение Мультимедиа и графика Материалы для графики"}
+      - {id: 166, cat: PC, desc: "Программное обеспечение Мультимедиа и графика Моделирование, рендеринг, плагины"}
+      - {id: 173, cat: PC, desc: "Программное обеспечение Программирование и веб-разработка"}
+      - {id: 177, cat: PC, desc: "Программное обеспечение Программирование и веб-разработка DDK/SDK"}
+      - {id: 178, cat: PC, desc: "Программное обеспечение Программирование и веб-разработка Веб-редакторы"}
+      - {id: 176, cat: PC, desc: "Программное обеспечение Программирование и веб-разработка Системы управления базами данных (СУБД)"}
+      - {id: 175, cat: PC, desc: "Программное обеспечение Программирование и веб-разработка Компиляторы и среды разработки"}
+      - {id: 174, cat: PC, desc: "Программное обеспечение Программирование и веб-разработка Компоненты и дополнения"}
+      - {id: 179, cat: PC/0day, desc: "Программное обеспечение Windows Software"}
+      - {id: 188, cat: PC/0day, desc: "Программное обеспечение Windows Software Интернет-приложения"}
+      - {id: 187, cat: PC/0day, desc: "Программное обеспечение Windows Software Информационная безопасность"}
+      - {id: 186, cat: PC/0day, desc: "Программное обеспечение Windows Software Офисные приложения и редакторы"}
+      - {id: 185, cat: PC/0day, desc: "Программное обеспечение Windows Software Переводчики и словари"}
+      - {id: 184, cat: PC/0day, desc: "Программное обеспечение Windows Software Проигрыватели и кодеки"}
+      - {id: 183, cat: PC/0day, desc: "Программное обеспечение Windows Software Работа с носителями и медиа"}
+      - {id: 182, cat: PC/0day, desc: "Программное обеспечение Windows Software Системные приложения"}
+      - {id: 181, cat: PC/0day, desc: "Программное обеспечение Windows Software Эмуляторы"}
+      - {id: 180, cat: PC/0day, desc: "Программное обеспечение Windows Software Прочие приложения"}
+      - {id: 197, cat: PC/0day, desc: "Программное обеспечение Windows Software Архиваторы и файловые менеджеры"}
+      - {id: 203, cat: PC/0day, desc: "Программное обеспечение Windows Software Проигрыватели и кодеки"}
+      - {id: 202, cat: PC/0day, desc: "Программное обеспечение Windows Software Офисные приложения и редакторы"}
+      - {id: 201, cat: PC/0day, desc: "Программное обеспечение Windows Software Работа с носителями и медиа"}
+      - {id: 200, cat: PC/0day, desc: "Программное обеспечение Windows Software Информационная безопасность"}
+      - {id: 199, cat: PC/0day, desc: "Программное обеспечение Windows Software Интернет-приложения"}
+      - {id: 198, cat: PC/0day, desc: "Программное обеспечение Windows Software Системные приложения"}
+      - {id: 22, cat: Other, desc: "Прочее Оформление релизов"}
+      - {id: 53, cat: Other, desc: "Прочее Оформление релизов Оформление релизов (игры)"}
+      - {id: 54, cat: Other, desc: "Прочее Оформление релизов Оформление релизов (кино/мультфильмы/аниме)"}
+      - {id: 55, cat: Other, desc: "Прочее Оформление релизов Оформление релизов (музыка)"}
+      - {id: 192, cat: Other, desc: "Прочее Оформление релизов Оформление релизов (софт)"}
+      - {id: 31, cat: Other, desc: "Прочее Обновления/DLC"}
+      - {id: 102, cat: Other, desc: "Прочее Обновления/DLC для MacOS"}
+      - {id: 101, cat: Other, desc: "Прочее Обновления/DLC для Linux"}
+      - {id: 100, cat: Other, desc: "Прочее Обновления/DLC для Windows"}
+      - {id: 76, cat: Other, desc: "Прочее Языковые пакеты"}
+      - {id: 103, cat: Other, desc: "Прочее Языковые пакеты для MacOS"}
+      - {id: 104, cat: Other, desc: "Прочее Языковые пакеты для Linux"}
+      - {id: 105, cat: Other, desc: "Прочее Языковые пакеты для Windows"}
+      - {id: 84, cat: Other, desc: "Прочее Демо-, альфа-, бета-версии"}
+      - {id: 32, cat: Other, desc: "Прочее NoCD/NoDVD"}
+      - {id: 75, cat: Other, desc: "Прочее Моды"}
+      - {id: 106, cat: Other, desc: "Прочее Моды Моды для Titan Quest (+ Immortal Throne)"}
+      - {id: 95, cat: Other, desc: "Прочее Моды Моды для Dungeon Siege"}
+      - {id: 94, cat: Other, desc: "Прочее Моды Моды для Resident Evil 4"}
+      - {id: 93, cat: Other, desc: "Прочее Моды Моды для Doom III"}
+      - {id: 92, cat: Other, desc: "Прочее Моды Плагины для TESV Skyrim"}
+      - {id: 91, cat: Other, desc: "Прочее Моды Плагины для TESIV Oblivion"}
+      - {id: 90, cat: Other, desc: "Прочее Моды Плагины для TESIII Morrowind"}
+      - {id: 97, cat: Other, desc: "Прочее Пиратки"}
+
+    modes:
+      search: [q]
+
+  login:
+    path: login.php
+    method: post
+    inputs:
+      "login_username": "{{ .Config.username }}"
+      "login_password": "{{ .Config.password }}"
+      autologin: 1
+      login: "Log in"
+    error:
+      - selector: table.error tr td div.msg:not(:contains(">>>"))
+    test:
+      path: tracker.php
+      selector: a[href="./login.php?logout=1"]
+
+  search:
+    paths:
+      - path: tracker.php
+        method: post
+    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: 1
+      # 1=asc 2=desc
+      s: 2
+      # 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: ""
+      submit: "  Search  "
+
+    rows:
+      selector: tr[id^="tor_"]
+    fields:
+      title:
+        selector: td a.genmed b
+      details:
+        selector: td a.genmed
+        attribute: href
+      download:
+        selector: td a.tr-dl
+        attribute: href
+      category:
+        selector: td a.gen
+        attribute: href
+        filters:
+          - name: regexp
+            args: "=(\\d+)\\."
+      size:
+        selector: td a.tr-dl
+      seeders:
+        selector: td.seedmed
+      leechers:
+        selector: td.leechmed
+        # Russian and Ukranian and English languages are supported
+      grabs:
+        optional: true
+        selector: td[title^="Ответов"]
+      grabs:
+        optional: true
+        selector: td[title^="Відповідей"]
+      grabs:
+        optional: true
+        selector: td[title^="Replies"]
+        # date for English, Russian, Ukrainian
+      date:
+        selector: td[title="Added"] p:last-of-type, td[title="Добавлен"] p:last-of-type, td[title="Додано"] p:last-of-type
+        filters:
+            # replace month abbreviations
+          - name: re_replace
+            args: ["Янв|Січ", "Jan"]
+          - name: re_replace
+            args: ["Фев|Лют", "Feb"]
+          - name: re_replace
+            args: ["Мар|Бер", "Mar"]
+          - name: re_replace
+            args: ["Апр|Кві", "Apr"]
+          - name: re_replace
+            args: ["Май|Травень", "May"]
+          - name: re_replace
+            args: ["Июн|Чер", "Jun"]
+          - name: re_replace
+            args: ["Июл|Лип", "Jul"]
+          - name: re_replace
+            args: ["Авг|Сер", "Aug"]
+          - name: re_replace
+            args: ["Сен|Вер", "Sep"]
+          - name: re_replace
+            args: ["Окт|Жов", "Oct"]
+          - name: re_replace
+            args: ["Ноя|Лис", "Nov"]
+          - name: re_replace
+            args: ["Дек|Грудень", "Dec"]
+          - name: dateparse
+            args: "2-Jan-06"
+      downloadvolumefactor:
+        case:
+          img[src="styles/images/tor_gold.gif"]: "0"
+          img[src="styles/images/tor_silver.gif"]: "0.5"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett.Common/Definitions/awesomehd.yml

@@ -18,21 +18,18 @@
       tv-search: [q, season, ep]
       movie-search: [q]
 
-  settings:
-    - name: cookie
-      type: text
-      label: Cookie
-    - name: info
-      type: info
-      label: How to get the Cookie
-      default: "<ol><li>Login to this tracker in 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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
-          
   login:
-    method: cookie
+    path: login.php
+    method: form
+    form: form#loginform
     inputs:
-      cookie: "{{ .Config.cookie }}"
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      keeplogged: 1
+    error:
+      - selector: form#loginform .warning
     test:
-      path: index.php
+      path: torrents.php
 
   search:
     paths:

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

@@ -0,0 +1,96 @@
+---
+  site: beyond-hd
+  name: Beyond-HD
+  description: "Without BeyondHD, your HDTV is just a TV"
+  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]
+
+  login:
+    path: login
+    method: form
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      remember: 1
+    error:
+      - selector: div.has-error
+    test:
+      path: torrents
+
+  search:
+    paths:
+      - path: torrents
+    inputs:
+      $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
+      search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      description: ""
+      uploader: ""
+      imdb: "{{ .Query.IMDBIDShort }}"
+      tmdb: ""
+      sorting: created_at
+      direction: desc
+      qty: 100
+    rows:
+      selector: table > tbody > tr
+    fields:
+      category:
+        selector: a[href*="/categories/"]
+        attribute: href
+        filters:
+          - name: regexp
+            args: "/categories/.*?\\.(\\d+)"
+      title:
+        selector: a.torrent-name
+      download:
+        selector: a[href*="/download/"]
+        attribute: href
+      details:
+        selector: a.torrent-name
+        attribute: href
+      banner:
+        optional: true
+        selector: div.torrent-poster img
+        attribute: src
+        filters:
+          - name: replace
+            args: ["https://via.placeholder.com/600x900", ""]
+      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"]
+      imdb:
+        optional: true
+        selector: a[href*="www.imdb.com/title/tt"]
+        attribute: href
+      downloadvolumefactor:
+        case:
+          "i[data-original-title=\"100% Free\"]": "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:
+        case:
+          "*": "1"
+# UNIT3D

src/Jackett.Common/Definitions/bigtower.yml

@@ -140,21 +140,21 @@
       size:
         selector: td:nth-last-child(2)
       date:
-        selector: td:nth-last-child(7)
+        selector: td:nth-last-child(8)
         filters:
           - name: append
             args: " +01:00"
           - name: dateparse
             args: "02/01/2006 -07:00"
       grabs:
-        selector: td:nth-last-child(4)
+        selector: td:nth-last-child(5)
         filters:
           - name: replace
             args: ["---", "0"]
       seeders:
-        selector: td:nth-last-child(6)
+        selector: td:nth-last-child(7)
       leechers:
-        selector: td:nth-last-child(5)
+        selector: td:nth-last-child(6)
       downloadvolumefactor:
         case:
           img[alt="Gold 100% Free"]: "0"

src/Jackett.Common/Definitions/bithumen.yml

@@ -135,13 +135,24 @@
           - name: replace
             args: ["×", ""]
       date:
-        selector: td:nth-child(5)
+        selector: td:nth-child(5):contains('.')
+        optional: true
+        remove: font
+        filters:
+          - name: replace
+            args: [". ", " "]
+          - name: prepend
+            args: "2019."
+          - name: re_replace
+            args: ["([0-9]{4}).([0-9]+).([0-9]+) (.*)", "$2.$3.$1 $4"]
+      date:
+        selector: td:nth-child(5):contains('ma'), td:nth-child(5):contains("tegnap"), td:nth-child(5):contains('-')
+        optional: true
         remove: font
         filters:
           - name: replace
             args: ["ma", "today"]
           - name: replace
             args: ["tegnap", "yesterday"]
-      
       description:
         selector: td:nth-child(2) > div

src/Jackett.Common/Definitions/blutopia.yml

@@ -25,10 +25,14 @@
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
+      remember: 1
     error:
-      - selector: form[action*="/login"] .text-red
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
     test:
       path: torrents
+      selector: a[href$="/logout"]
 
   search:
     paths:
@@ -36,12 +40,13 @@
     inputs:
       $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
       search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      description: ""
       uploader: ""
       imdb: "{{ .Query.IMDBIDShort }}"
       tvdb: ""
       tmdb: ""
       mal: ""
-      sorting: created_at
+      sort: created_at
       direction: desc
       qty: 100
     rows:
@@ -61,20 +66,27 @@
       details:
         selector: a.view-torrent
         attribute: href
+      banner:
+        optional: true
+        selector: div.torrent-poster img
+        attribute: src
+        filters:
+          - name: replace
+            args: ["https://via.placeholder.com/600x900", ""]
       size:
-        selector: td:nth-child(5)
+        selector: td:nth-last-child(4)
       seeders:
-        selector: td:nth-child(6)
+        selector: td:nth-last-child(3)
       leechers:
-        selector: td:nth-child(7)
+        selector: td:nth-last-child(2)
       grabs:
-        selector: td:nth-child(8)
+        selector: td:nth-last-child(1)
         filters:
           - name: regexp
             args: ([\d\.]+)
       imdb:
         optional: true
-        selector: a[href^="https://www.imdb.com/title/"]
+        selector: a[href*="www.imdb.com/title/tt"]
         attribute: href
       date:
         selector: time
@@ -117,4 +129,4 @@
           "i[data-original-title=\"Global Double Upload\"]": "2" # Global Double Upload
           "i[data-original-title=\"Featured\"]": "2" # Featured Torrent
           "*": "1"
-# UNIT3D
+# UNIT3D 1.9.2

src/Jackett.Common/Definitions/btdb.yml

@@ -29,9 +29,10 @@
   search:
     paths:
       - path: "{{if .Keywords}}?search={{ .Keywords}}&sort=time{{else}}recent{{end}}"
-      - path: "{{if .Keywords}}?search={{ .Keywords}}&sort=time&page=2{{else}}{{end}}"
-      - path: "{{if .Keywords}}?search={{ .Keywords}}&sort=time&page=3{{else}}{{end}}"
-      - path: "{{if .Keywords}}?search={{ .Keywords}}&sort=time&page=4{{else}}{{end}}"
+      - path: "{{if .Keywords}}?search={{ .Keywords}}&sort=time&page=2{{else}}recent?page=2{{end}}"
+      - path: "{{if .Keywords}}?search={{ .Keywords}}&sort=time&page=3{{else}}recent?page=3{{end}}"
+      - path: "{{if .Keywords}}?search={{ .Keywords}}&sort=time&page=4{{else}}recent?page=4{{end}}"
+      - path: "{{if .Keywords}}?search={{ .Keywords}}&sort=time&page=5{{else}}recent?page=5{{end}}"
     rows:
       selector: li[class$="item"]
     fields:
@@ -52,6 +53,8 @@
         selector: div[class$="info"] span:nth-of-type(2)
       date:
         selector: div[class$="info"] span:nth-of-type(3)
+        filters:
+          - name: timeago
       grabs:
         selector: div[class$="info"] span:nth-of-type(4)
       seeders:

src/Jackett.Common/Definitions/btgigs.yml

@@ -46,7 +46,7 @@
       password__dupa: "{{ .Config.password }}"
     error:
       - selector: td.embedded:has(h2:contains("failed"))
-      - selector: td.embedded:has(h2:contains("Error"))aD
+      - selector: td.embedded:has(h2:contains("Error"))
     test:
       selector: a[href^="logout.php"]
       path: browse.php

src/Jackett.Common/Definitions/btkitty.yml

@@ -7,15 +7,16 @@
   encoding: UTF-8
   followredirect: true
   links:
-    -  http://btkitty.pet/
+    - https://btkittys.co/
   legacylinks:
-    -  https://cnbtkitty.org/
-    -  http://cnbtkitty.org/
-    -  https://cnbtkitty.com/
-    -  http://cnbtkitty.com/
-    -  https://cnbtkitty.me/
-    -  http://cnbtkitty.me/
-    -  http://cnbtkitty.ws/
+    - https://cnbtkitty.org/
+    - http://cnbtkitty.org/
+    - https://cnbtkitty.com/
+    - http://cnbtkitty.com/
+    - https://cnbtkitty.me/
+    - http://cnbtkitty.me/
+    - http://cnbtkitty.ws/
+    - http://btkitty.pet/
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/cartoonchaos.yml

@@ -18,7 +18,7 @@
     - name: info_results
       type: info
       label: "Search results"
-      default: "For best results, increase the torrents number in your profile to 100.<br />Default is 15."
+      default: "Only the <b>xBtit_Default</b> style is supported with this indexer.<br />For best results, increase the torrents number in your profile to 100.<br />Default is 15."
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/casatorrent.yml

@@ -6,7 +6,10 @@
   type: private
   encoding: UTF-8
   links:
+    - https://teamctgame.xyz/
+  legacylinks:
     - https://teamctgame.co/
+    - http://teamctgame.xyz/
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/casstudiotv.yml

@@ -6,6 +6,8 @@
   type: private
   encoding: UTF-8
   links:
+    - https://casstudio.tk/
+  legacylinks:
     - https://casstudio.tv/
 
   caps:

src/Jackett.Common/Definitions/channelx.yml

@@ -28,7 +28,9 @@
       password: "{{ .Config.password }}"
       remember: 1
     error:
-      - selector: form[action*="/login"] .text-red
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
     test:
       path: torrents
       selector: a[href$="/logout"]
@@ -83,16 +85,16 @@
           - name: replace
             args: ["https://via.placeholder.com/600x900", ""]
       size:
-        selector: td:nth-child(5)
+        selector: td:nth-last-child(4)
+      seeders:
+        selector: td:nth-last-child(3)
+      leechers:
+        selector: td:nth-last-child(2)
       grabs:
-        selector: td:nth-child(6)
+        selector: td:nth-last-child(1)
         filters:
           - name: regexp
             args: ([\d\.]+)
-      seeders:
-        selector: td:nth-child(7)
-      leechers:
-        selector: td:nth-child(8)
       imdb:
         optional: true
         selector: a[href*="www.imdb.com/title/tt"]
@@ -138,4 +140,4 @@
           "i[data-original-title=\"Global Double Upload\"]": "2" # Global Double Upload
           "i[data-original-title=\"Featured\"]": "2" # Featured Torrent
           "*": "1"
-# UNIT3D 1.9.1
+# UNIT3D 1.9.2

src/Jackett.Common/Definitions/cinefilhd.yml

@@ -1,142 +0,0 @@
----
-  site: cinefilhd
-  name: CiNEFiLHD
-  description: "CiNEFiLHD is a Private Torrent Tracker for MOVIES / TV /  MUSIC"
-  language: en-us
-  type: private
-  encoding: UTF-8
-  links:
-    - http://www.cinefilhd.org/
-
-  caps:
-    categorymappings:
-      - {id: 37, cat: Movies/HD, desc: " Internal/HD-1080p"}
-      - {id: 17, cat: Movies/HD, desc: " Internal/HD-720p"}
-      - {id: 30, cat: TV/HD, desc: " Internal/HDTV"}
-      - {id: 15, cat: Movies/HD, desc: " Internal/mHD"}
-      - {id: 40, cat: Movies, desc: " Internal/Mp4"}
-      - {id: 26, cat: Movies, desc: " Internal/Remux"}
-      - {id: 45, cat: Movies/WEBDL, desc: " Internal/WEB-DL"}
-      - {id: 25, cat: Movies/3D, desc: " Movies/3D-Ou"}
-      - {id: 16, cat: Movies/3D, desc: " Movies/3D-SbS"}
-      - {id: 5, cat: Movies/BluRay, desc: " Movies/BluRay"}
-      - {id: 38, cat: Movies/HD, desc: " Movies/HD-1080p"}
-      - {id: 10, cat: Movies/HD, desc: " Movies/HD-720p"}
-      - {id: 29, cat: Movies/HD, desc: " Movies/mHD"}
-      - {id: 41, cat: Movies, desc: " Movies/Mp4"}
-      - {id: 39, cat: Movies, desc: " Movies/Remux"}
-      - {id: 44, cat: Movies/WEBDL, desc: " Movies/WEB-DL"}
-      - {id: 23, cat: Audio/Lossless, desc: " Lossless"}
-      - {id: 14, cat: Audio/MP3, desc: " MP3-Packs"}
-      - {id: 22, cat: Audio/MP3, desc: " Music-MP3"}
-      - {id: 43, cat: Audio/Video, desc: " Music/1080p"}
-      - {id: 42, cat: Audio/Video, desc: " Music/720p"}
-      - {id: 12, cat: TV/HD, desc: " HDTV-Packs"}
-      - {id: 21, cat: TV/HD, desc: " Movies/HDTV"}
-
-    modes:
-      search: [q, imdbid]
-      tv-search: [q, season, ep, imdbid]
-      movie-search: [q, imdbid]
-
-  login:
-    path: takelogin.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      submitme: "LOGIN"
-      returnto: /
-    error:
-      - selector: h2:contains("failed")
-        message:
-          selector: td.colhead2
-    test:
-      path: browse.php
-      selector: :has(a[href^="logout.php?hash_please="])
-
-  ratio:
-    path: browse.php
-    selector: div div font:contains("Ratio:")
-    filters:
-      - name: regexp
-        args: "Ratio:\\s(.*?)\\s"
-
-  search:
-    paths:
-      - path: browse.php
-    inputs:
-      $raw: "{{range .Categories}}cat{{.}}=1&{{end}}"
-      search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-      # title descr genre all
-      searchin: "{{ if .Query.IMDBID }}descr{{else}}title{{end}}"
-      # 0=active 1=incl dead 2=only dead
-      incldead: 1
-      # 0=no 1=yes
-      only_free: 0
-    rows:
-      selector: table.mainouter table > tbody > tr:has(a[href^="details.php?id="]), table.mainouter table > tbody > tr[id^="kdescr"]
-      after: 1
-    fields:
-      title:
-        selector: a[href^="details.php?id="]
-      details:
-        selector: a[href^="details.php?id="]
-        attribute: href
-      category:
-        selector: a[href^="browse.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      download:
-        selector: a[href^="details.php?id="]
-        attribute: href
-        filters:
-          - name: replace
-            args: ["details.php?id=", "download.php?torrent="]
-      banner:
-        selector: a[href^="details.php?id="][onmouseover]
-        attribute: onmouseover
-        filters:
-            #  onmouseover="Tip('<img class=\'pup\' src=\'https://image.tmdb.org/t/p/original/x96AdPlpl4MjUP2DeUhRJifhCMd.jpg\' width=
-          - name: regexp
-            args: src=\\'(.*?)\\'
-      imdb:
-        optional: true
-        selector: a[href*="www.imdb.com/title/tt"]
-      files:
-        selector: td:nth-child(4)
-      # 2 flavours of dates
-      date:
-        # Today<br /> 10:20 AM
-        # Yesterday<br /> 08:03 PM
-        optional: true
-        selector: td:nth-child(6):contains("day")
-      date:
-        # Feb 14 2019<br /> 10:20 AM
-        optional: true
-        selector: td:nth-child(6):not(:contains("day"))
-        filters:
-          - name: dateparse
-            args: "Jan 2 2006 03:04 pm"
-      size:
-        selector: td:nth-child(7)
-      grabs:
-        selector: td:nth-child(8)
-        filters:
-          - name: regexp
-            args: ([\d,]+)
-      seeders:
-        selector: td:nth-child(9)
-      leechers:
-        selector: td:nth-child(10)
-      downloadvolumefactor:
-        case:
-          tr.freeleech_color: "0"
-          tr.highlight: "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
-# U-232 v3

src/Jackett.Common/Definitions/concen.yml

@@ -0,0 +1,62 @@
+---
+  site: concen
+  name: ConCen
+  description: "ConCen (Conspiracy Central) is a Public conspiracy related torrent index"
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    - https://concen.org/
+
+  caps:
+    categories:
+      1: Other
+
+    modes:
+      search: [q]
+
+  settings: []
+
+  search:
+    paths:
+      - path: "torrents/concen.org/content/ufos-extraterrestrials-and-classified-free-energy-pack"
+    inputs:
+      title_op: "allwords"
+      title: "{{.Keywords}}"
+      title_1_op: "not"
+      title_1: ""
+      seeds: "All"
+
+    rows:
+      selector: table  > tbody > tr
+    fields:
+      title:
+        selector: td.views-field-title a
+      category:
+        text: 1
+      details:
+        selector: td.views-field-title a
+        attribute: href
+      download:
+        selector: td.views-field-field-torrent a
+        attribute: href
+      magnet:
+        selector: td.views-field-name a
+        attribute: href
+        filters:
+          - name: prepend
+            args: "magnet:"
+      date:
+        selector: td.views-field-created
+      size:
+        selector: td.views-field-size
+      seeders:
+        selector: td.views-field-seeds
+      leechers:
+        selector: td.views-field-peers 
+      grabs:
+        selector: td.views-field-completed 
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"

src/Jackett.Common/Definitions/cpabien.yml

@@ -67,7 +67,9 @@
         filters:
           # now we put the date at the right place according scene naming rules using .Result.site_date
           - name: replace
-            args: ["FRENCH", "{{ .Result.site_date }} FRENCH"]
+            args: [" FRENCH", " {{ .Result.site_date }} FRENCH"]
+          - name: replace
+            args: ["MULTI", "{{ .Result.site_date }} MULTI"]
           - name: replace
             args: ["TRUEFRENCH", "{{ .Result.site_date }} TRUEFRENCH"]
           - name: replace

src/Jackett.Common/Definitions/cpasbienclone.yml

@@ -16,21 +16,28 @@
     categorymappings:
       - {id: films, cat: Movies, desc: "Movies"}
       - {id: series, cat: TV, desc: "TV"}
+      - {id: musique, cat: Audio, desc: "Music"}
+      - {id: ebook, cat: Books, desc: "Ebook"}
+      - {id: logiciels, cat: PC, desc: "Software"}
+      - {id: jeux-pc, cat: PC/Games, desc: "PC Games"}
+      - {id: jeux-consoles, cat: Console, desc: "Console Games"}
 
     modes:
       search: [q]
       tv-search: [q, season, ep]
+      movie-search: [q]
 
   settings: []
 
   download:
-    selector: div#btn-download a
+    selector: div.btn-download a
     attribute: href
+
   search:
     paths:
       - path: "{{if .Keywords}}recherche/{{.Keywords}}{{else}}{{end}}"
     rows:
-      selector: div#gauche > table > tbody > tr:has(a)
+      selector: table.table-corps > tbody > tr:has(a)
     fields:
       site_date:
         selector: a
@@ -43,7 +50,9 @@
         filters:
           # now we put the date at the right place according scene naming rules using .Result.site_date
           - name: replace
-            args: ["FRENCH", "{{ .Result.site_date }} FRENCH"]
+            args: [" FRENCH", " {{ .Result.site_date }} FRENCH"]
+          - name: replace
+            args: ["MULTI", "{{ .Result.site_date }} MULTI"]
           - name: replace
             args: ["TRUEFRENCH", "{{ .Result.site_date }} TRUEFRENCH"]
           - name: replace
@@ -61,21 +70,21 @@
         selector: div.poid
         filters:
           - name: re_replace
-            args: [ "\\.(\\d) Ko", "$1X00"]
+            args: [ "\\.(\\d)Ko", "$1X00"]
           - name: re_replace
-            args: [ " Ko", "000"]
+            args: [ "Ko", "000"]
           - name: re_replace
-            args: [ "\\.(\\d) Mo", "$1X00000"]
+            args: [ "\\.(\\d)Mo", "$1X00000"]
           - name: re_replace
-            args: [ " Mo", "000000"]
+            args: [ "Mo", "000000"]
           - name: re_replace
-            args: [ "\\.(\\d) Go", "$1X00000000"]
+            args: [ "\\.(\\d)Go", "$1X00000000"]
           - name: re_replace
-            args: [ " Go", "000000000"]
+            args: [ "Go", "000000000"]
           - name: re_replace
-            args: [ "\\.(\\d) To", "$1X00000000000"]
+            args: [ "\\.(\\d)To", "$1X00000000000"]
           - name: re_replace
-            args: [ " To", "000000000000"]
+            args: [ "To", "000000000000"]
           - name: replace
             args: [ "X", "" ]
       date:

src/Jackett.Common/Definitions/cztorrent.yml

@@ -38,19 +38,16 @@
       tv-search: [q, season, ep]
       movie-search: [q]
 
-  settings:
-    - name: cookie
-      type: text
-      label: Cookie
-    - name: info
-      type: info
-      label: How to get the Cookie
-      default: "<ol><li>Login to this tracker in 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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
-          
   login:
-    method: cookie
+    path: login-page
+    method: form
+    form: form[action="/login?url=%2F"]
     inputs:
-      cookie: "{{ .Config.cookie }}"
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      persistent_login: 1
+    error:
+      - selector: div.error
     test:
       path: torrents
 

src/Jackett.Common/Definitions/desireleasers.yml

@@ -1,21 +1,22 @@
 ---
-  site: hdplus
-  name: HDplus
-  description: "HDplus is Private Torrent Tracker for MOVIES / TV / MUSIC"
+  site: desireleasers
+  name: DesiReleasers
+  description: "DesiReleasers is an INDIAN Private Torrent Tracker for INDIAN MOVIES"
   language: en-us
   type: private
   encoding: UTF-8
   links:
-    - https://hdplus.xyz/
+    - https://desireleasers.be/
 
   caps:
     categorymappings:
       - {id: 1, cat: Movies, desc: "Movies"}
       - {id: 2, cat: TV, desc: "TV"}
       - {id: 3, cat: Audio, desc: "Music"}
+      - {id: 4, cat: Audio/Video, desc: "Music Videos"}
 
     modes:
-      search: [q, imdbid]
+      search: [q]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
@@ -26,19 +27,15 @@
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
       remember: 1
-    selectorinputs:
-      _token:
-        selector: meta[name="csrf-token"]
-        attribute: content
     error:
-      - selector: form[action$="/login"] .text-red
+      - selector: form[action$="/login"] span strong
     test:
-      path: /
+      path: torrents
       selector: a[href$="/logout"]
 
   ratio:
-    path: /
-    selector: span:has(i.fa-sync-alt)
+    path: torrents
+    selector: li:has(i.fa-sync-alt)
     filters:
       - name: regexp
         args: "Ratio : (\\d+)"
@@ -49,10 +46,12 @@
     inputs:
       $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
       search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      description: ""
       uploader: ""
       imdb: "{{ .Query.IMDBIDShort }}"
       tvdb: ""
       tmdb: ""
+      mal: ""
       sort: created_at
       direction: desc
       qty: 100
@@ -73,17 +72,25 @@
       details:
         selector: a.view-torrent
         attribute: href
+      banner:
+        optional: true
+        selector: div.torrent-poster img
+        attribute: src
       size:
         selector: td:nth-child(5)
       seeders:
-        selector: td:nth-child(7)
-      leechers:
-        selector: td:nth-child(8)
-      grabs:
         selector: td:nth-child(6)
+      leechers:
+        selector: td:nth-child(7)
+      grabs:
+        selector: td:nth-child(8)
         filters:
           - name: regexp
             args: ([\d\.]+)
+      imdb:
+        optional: true
+        selector: a[href*="www.imdb.com/title/tt"]
+        attribute: href
       date:
         selector: time
         filters:
@@ -112,12 +119,17 @@
             args: [" (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
       downloadvolumefactor:
         case:
-          "i[data-original-title=\"100% Free\"]": "0" # Single Torrent Freeleech
-          "i[data-original-title=\"Global freeleech\"]": "0" # Global Freeleech
+          "i[data-original-title=\"Personal Freeleech\"]": "0" # 24 Hour FreeLeech From BON Store
+          "i[data-original-title=\"Special Freeleech\"]": "0" # Special FreeLeech For Certain User Groups
+          "i[data-original-title=\"Freeleech Token\"]": "0" # Freeleech From Token
+          "i[data-original-title=\"Global FreeLeech\"]": "0" # Global Freeleech
+          "i[data-original-title=\"Freeleech\"]": "0" # Freeleech
+          "i[data-original-title=\"Featured\"]": "0" # Featured Torrent
           "*": "1"
       uploadvolumefactor:
         case:
-          "i[data-original-title=\"Double upload\"]": "2" # Single Torrent Double Upload
-          "i[data-original-title=\"Double Upload\"]": "2" # Global Double Upload
+          "i[data-original-title=\"Double Upload\"]": "2" # Single Torrent Double Upload
+          "i[data-original-title=\"Global Double Upload\"]": "2" # Global Double Upload
+          "i[data-original-title=\"Featured\"]": "2" # Featured Torrent
           "*": "1"
-# UNIT3D
+# UNIT3D 1.9.1

src/Jackett.Common/Definitions/divteam.yml

@@ -56,17 +56,21 @@
       tv-search: [q, season, ep]
       movie-search: [q]
 
+  settings:
+    - name: cookie
+      type: text
+      label: Cookie
+    - name: info
+      type: info
+      label: How to get the Cookie
+      default: "<ol><li>Login to this tracker in 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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
+          
   login:
-    path: index.php?page=login
-    method: post
+    method: cookie
     inputs:
-      uid: "{{ .Config.username }}"
-      pwd: "{{ .Config.password }}"
-    error:
-      - selector: div#login-alert
+      cookie: "{{ .Config.cookie }}"
     test:
       path: index.php
-      selector: a[href="logout.php"]
 
   search:
     paths:

src/Jackett.Common/Definitions/dxdhd.yml

@@ -15,10 +15,11 @@
       - {id: 3, cat: Audio, desc: "Music"}
       - {id: 4, cat: TV/Anime, desc: "Anime"}
       - {id: 5, cat: PC/0day, desc: "Apps"}
-      - {id: 6, cat: Books, desc: "Books"}
+      - {id: 6, cat: Books, desc: "eBooks"}
       - {id: 7, cat: PC/Games, desc: "Games"}
       - {id: 8, cat: TV/Sport, desc: "Sports"}
-      - {id: 9, cat: Other, desc: "Other"}
+      - {id: 9, cat: Other, desc: "Others"}
+      - {id: 10, cat: XXX, desc: "XXX"}
 
     modes:
       search: [q]
@@ -31,10 +32,21 @@
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
+      remember: 1
     error:
-      - selector: table.main:contains("Login Failed!")
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
     test:
       path: torrents
+      selector: a[href$="/logout"]
+
+  ratio:
+    path: torrents
+    selector: li:has(i.fa-sync-alt)
+    filters:
+      - name: regexp
+        args: "Ratio : (\\d+)"
 
   search:
     paths:
@@ -42,13 +54,14 @@
     inputs:
       $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
       search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      description: ""
       uploader: ""
       imdb: "{{ .Query.IMDBIDShort }}"
       tvdb: ""
       tmdb: ""
       mal: ""
-      sorting: created_at
-      direction: desc
+      sort: "created_at"
+      direction: "desc"
       qty: 100
     rows:
       selector: table > tbody > tr
@@ -67,17 +80,28 @@
       details:
         selector: a.view-torrent
         attribute: href
+      banner:
+        optional: true
+        selector: div.torrent-poster img
+        attribute: src
+        filters:
+          - name: replace
+            args: ["https://via.placeholder.com/600x900", ""]
       size:
-        selector: td:nth-child(5)
+        selector: td:nth-last-child(4)
       seeders:
-        selector: td:nth-child(7)
+        selector: td:nth-last-child(3)
       leechers:
-        selector: td:nth-child(8)
+        selector: td:nth-last-child(2)
       grabs:
-        selector: td:nth-child(6)
+        selector: td:nth-last-child(1)
         filters:
           - name: regexp
             args: ([\d\.]+)
+      imdb:
+        optional: true
+        selector: a[href*="www.imdb.com/title/tt"]
+        attribute: href
       date:
         selector: time
         filters:
@@ -106,12 +130,17 @@
             args: [" (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
       downloadvolumefactor:
         case:
-          "i[data-original-title=\"100% Free\"]": "0" # Single Torrent Freeleech
+          "i[data-original-title=\"Personal Freeleech\"]": "0" # 24 Hour FreeLeech From BON Store
+          "i[data-original-title=\"Special Freeleech\"]": "0" # Special FreeLeech For Certain User Groups
+          "i[data-original-title=\"Freeleech Token\"]": "0" # Freeleech From Token
           "i[data-original-title=\"Global FreeLeech\"]": "0" # Global Freeleech
+          "i[data-original-title=\"Freeleech\"]": "0" # Freeleech
+          "i[data-original-title=\"Featured\"]": "0" # Featured Torrent
           "*": "1"
       uploadvolumefactor:
         case:
-          "i[data-original-title=\"Double upload\"]": "2" # Single Torrent Double Upload
-          "i[data-original-title=\"Double Upload\"]": "2" # Global Double Upload
+          "i[data-original-title=\"Double Upload\"]": "2" # Single Torrent Double Upload
+          "i[data-original-title=\"Global Double Upload\"]": "2" # Global Double Upload
+          "i[data-original-title=\"Featured\"]": "2" # Featured Torrent
           "*": "1"
-# UNIT3D
+# UNIT3D 1.9.2

src/Jackett.Common/Definitions/efectodoppler.yml

@@ -0,0 +1,94 @@
+---
+  site: 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:
+    categories:
+      1: Audio
+
+    modes:
+      search: [q]
+      music-search: [q, album, artist, label, year]
+
+  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="]
+
+  ratio:
+    path: index.php
+    selector: li#stats_ratio span.stat span
+
+  search:
+    paths:
+      - path: torrents.php
+    inputs:
+      artistname: "{{if .Query.Artist}}{{ .Query.Artist }}{{else}}{{end}}"
+      groupname: "{{if .Query.Artist}}{{else}}{{ .Keywords }}{{end}}"
+      order_by: time
+      order_way: desc
+    rows:
+      selector: tr.torrent
+    fields:
+      category:
+        text: "1"
+      artist:
+        text: "Varios artistas"
+      artist:
+        selector: a[href^="artist.php?id="]
+        optional: true
+      title:
+        selector: a[href^="torrents.php?id="]
+        filters:
+          - name: prepend
+            args: "{{.Result.artist}} - "
+      details:
+        selector: a[href^="torrents.php?id="]
+        attribute: href
+      banner:
+        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: dateparse
+            args: "Jan 02 2006, 15:04"
+      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"

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

@@ -6,7 +6,10 @@
   type: public
   encoding: UTF-8
   links:
+    - https://www.elitetorrent.one/
+  legacylinks:
     - https://www.elitetorrent.biz/
+    - https://www.elitetorrent.io/
 
   caps:
     categories:

src/Jackett.Common/Definitions/ettv.yml

@@ -6,6 +6,8 @@
   type: public
   encoding: UTF-8
   links:
+    - https://www.ettv.to/
+  legacylinks:
     - https://www.ettv.tv/
 
   caps:

src/Jackett.Common/Definitions/focusx.yml

@@ -0,0 +1,237 @@
+---
+  site: focusx
+  name: FocusX
+  description: "FocusX is a RUSSIAN Public torrent site for MOVIES and TV"
+  language: re-RU
+  type: public
+  encoding: UTF-8
+  links:
+    - https://focu.sx/
+
+  caps:
+    categorymappings:
+      - {id: 111, cat: Movies, desc: "1922"}
+      - {id: 135, cat: Movies, desc: "Анон"}
+      - {id: 168, cat: Movies, desc: "Воспитательница"}
+      - {id: 10, cat: Movies, desc: "Мёд в голове"}
+      - {id: 16, cat: Movies, desc: "Малыш"}
+      - {id: 18, cat: Movies, desc: "Копенгаген"}
+      - {id: 19, cat: Movies, desc: "Заброшенный"}
+      - {id: 38, cat: Movies, desc: "Звёздные войны: Эпизод 7 Пробуждение силы"}
+      - {id: 42, cat: Movies, desc: "В лабиринте молчания"}
+      - {id: 44, cat: Movies, desc: "Женщина в золотом"}
+      - {id: 45, cat: Movies, desc: "Падение Лондона"}
+      - {id: 46, cat: Movies, desc: "Высотка"}
+      - {id: 49, cat: Movies, desc: "Капитан Америка: Гражданская война"}
+      - {id: 50, cat: Movies, desc: "Рыцарь кубков"}
+      - {id: 54, cat: Movies, desc: "Охотник: Война Зимы"}
+      - {id: 57, cat: Movies, desc: "Портниха"}
+      - {id: 60, cat: Movies, desc: "Бэтмен против Супермена: На заре справедливости"}
+      - {id: 61, cat: Movies, desc: "Комета"}
+      - {id: 64, cat: Movies, desc: "Зоотопия"}
+      - {id: 65, cat: Movies, desc: "В твоих глазах"}
+      - {id: 66, cat: Movies, desc: "Люди Икс: Апокалипсис"}
+      - {id: 67, cat: Movies, desc: "Потерянный Валентин"}
+      - {id: 70, cat: Movies, desc: "Припаркованные"}
+      - {id: 71, cat: Movies, desc: "Легенда о Тарзане"}
+      - {id: 72, cat: Movies, desc: "Пока я не исчезну"}
+      - {id: 73, cat: Movies, desc: "Механик: Воскрешение"}
+      - {id: 74, cat: Movies, desc: "Варкрафт"}
+      - {id: 76, cat: Movies, desc: "Гнилые кварталы"}
+      - {id: 80, cat: Movies, desc: "Приятные вибрации"}
+      - {id: 83, cat: Movies, desc: "Возмущение"}
+      - {id: 84, cat: Movies, desc: "Трейнспоттинг (На игле)"}
+      - {id: 85, cat: Movies, desc: "Тысячу раз 'спокойной ночи'"}
+      - {id: 90, cat: Movies, desc: "Дангал"}
+      - {id: 100, cat: TV, desc: "Смертельное оружие"}
+      - {id: 101, cat: TV, desc: "Гавайи 5-0"}
+      - {id: 102, cat: TV, desc: "Черный Список"}
+      - {id: 103, cat: TV, desc: "Нелюди"}
+      - {id: 106, cat: TV, desc: "Одаренные"}
+      - {id: 107, cat: TV, desc: "Теория большого взрыва"}
+      - {id: 108, cat: TV, desc: "Ходячие мертвецы"}
+      - {id: 109, cat: TV, desc: "Хроники Шаннары"}
+      - {id: 110, cat: TV, desc: "Порох"}
+      - {id: 112, cat: TV, desc: "Субура"}
+      - {id: 115, cat: TV, desc: "Безбожники"}
+      - {id: 116, cat: TV, desc: "Секретные Материалы"}
+      - {id: 118, cat: TV, desc: "Охотник за разумом"}
+      - {id: 119, cat: TV, desc: "Алиенист"}
+      - {id: 120, cat: TV, desc: "Ординатор"}
+      - {id: 121, cat: TV, desc: "Уэйко"}
+      - {id: 122, cat: TV, desc: "Американская история преступлений"}
+      - {id: 124, cat: TV, desc: "Бельвью"}
+      - {id: 126, cat: TV, desc: "Видоизменённый углерод"}
+      - {id: 128, cat: TV, desc: "Здесь и Сейчас"}
+      - {id: 129, cat: TV, desc: "Взлет"}
+      - {id: 130, cat: TV, desc: "Инстинкт"}
+      - {id: 131, cat: TV, desc: "Стартап"}
+      - {id: 133, cat: TV, desc: "Террор"}
+      - {id: 136, cat: TV, desc: "Мир Дикого Запада"}
+      - {id: 138, cat: TV, desc: "В пустыне смерти"}
+      - {id: 139, cat: TV, desc: "Дождь"}
+      - {id: 140, cat: TV, desc: "Страйк"}
+      - {id: 141, cat: TV, desc: "Безопасность"}
+      - {id: 143, cat: TV, desc: "Подлый пит"}
+      - {id: 144, cat: TV, desc: "Голиаф"}
+      - {id: 146, cat: TV, desc: "Весьма Английский Скандал"}
+      - {id: 147, cat: TV, desc: "Королева Сахара"}
+      - {id: 155, cat: TV, desc: "Наследники"}
+      - {id: 156, cat: TV, desc: "Джек Райан"}
+      - {id: 158, cat: TV, desc: "Леденящие кровь приключения Сабрины"}
+      - {id: 161, cat: TV, desc: "Частные сыщики"}
+      - {id: 162, cat: TV, desc: "Изнанка дела"}
+      - {id: 163, cat: TV, desc: "Наркос: Мексика"}
+      - {id: 164, cat: TV, desc: "Возвращение домой"}
+      - {id: 165, cat: TV, desc: "Метод Комински"}
+      - {id: 166, cat: TV, desc: "Элита"}
+      - {id: 167, cat: TV, desc: "Грязный Джон"}
+      - {id: 169, cat: TV, desc: "Романовы"}
+      - {id: 170, cat: TV, desc: "Страна приливов"}
+      - {id: 171, cat: TV, desc: "Тюрьма Оз"}
+      - {id: 172, cat: TV, desc: "Смертельный класс"}
+      - {id: 173, cat: TV, desc: "Парфюм"}
+      - {id: 174, cat: TV, desc: "Цветочный дом"}
+      - {id: 175, cat: TV, desc: "Каратель"}
+      - {id: 176, cat: TV, desc: "Матрёшка"}
+      - {id: 177, cat: TV, desc: "Берлинская резидентура"}
+      - {id: 178, cat: TV, desc: "Настоящий Детектив"}
+      - {id: 179, cat: TV, desc: "Половое Просвещение"}
+      - {id: 180, cat: TV, desc: "АКАДЕМИЯ АМБРЕЛЛА"}
+      - {id: 181, cat: TV, desc: "Сорвиголова"}
+      - {id: 182, cat: TV, desc: "Мистер Посредник"}
+      - {id: 9, cat: TV, desc: "Иерихон"}
+      - {id: 11, cat: TV, desc: "11-22-63"}
+      - {id: 12, cat: TV, desc: "Апокалипсис: Первая мировая война"}
+      - {id: 13, cat: TV, desc: "Смерть в раю"}
+      - {id: 14, cat: TV, desc: "Джереми Кларксон: Военные истории"}
+      - {id: 15, cat: TV, desc: "Чёрные паруса"}
+      - {id: 17, cat: TV, desc: "Карточный домик"}
+      - {id: 37, cat: TV, desc: "Джек Айриш"}
+      - {id: 39, cat: TV, desc: "Чужестранка"}
+      - {id: 40, cat: TV, desc: "Девушка по вызову"}
+      - {id: 41, cat: TV, desc: "Джереми Кларксон: Триллер"}
+      - {id: 43, cat: TV, desc: "Игра престолов"}
+      - {id: 47, cat: TV, desc: "Острые козырьки"}
+      - {id: 48, cat: TV, desc: "Странная парочка"}
+      - {id: 51, cat: TV, desc: "Проповедник"}
+      - {id: 52, cat: TV, desc: "Изгой"}
+      - {id: 53, cat: TV, desc: "Рэй Донован"}
+      - {id: 55, cat: TV, desc: "Оранжевый - хит сезона"}
+      - {id: 56, cat: TV, desc: "Бесстыдники"}
+      - {id: 58, cat: TV, desc: "Мистер Робот"}
+      - {id: 59, cat: TV, desc: "Валландер"}
+      - {id: 62, cat: TV, desc: "Штамм"}
+      - {id: 63, cat: TV, desc: "Куорри"}
+      - {id: 68, cat: TV, desc: "Бесстыжие"}
+      - {id: 69, cat: TV, desc: "Нарко"}
+      - {id: 75, cat: TV, desc: "Все схвачено"}
+      - {id: 77, cat: TV, desc: "Граница"}
+      - {id: 79, cat: TV, desc: "Бош"}
+      - {id: 81, cat: TV, desc: "Викинги"}
+      - {id: 82, cat: TV, desc: "Салем"}
+      - {id: 86, cat: TV, desc: "Кровавая Гонка"}
+      - {id: 87, cat: TV, desc: "Сеньор Авила"}
+      - {id: 88, cat: TV, desc: "Стрелок"}
+      - {id: 89, cat: TV, desc: "Миднайт Техас"}
+      - {id: 91, cat: TV, desc: "Утиные Истории"}
+      - {id: 96, cat: TV, desc: "Двойка"}
+      - {id: 97, cat: TV, desc: "Тик-герой"}
+
+    modes:
+      search: [q]
+
+  settings: []
+
+  search:
+    paths:
+    # https://focu.sx/tracker/search?freeleech=0&query=daredevil
+      - path: "{{if .Keywords}}tracker/search?freeleech=0&query={{.Keywords}}{{else}}tracker/{{end}}"
+        followredirect: true
+
+    rows:
+      selector: ol.torrentListItems li.torrentListItem
+    fields:
+      title:
+        selector: div.name div.titleText h3 a
+      details:
+        selector: div.name div.titleText h3 a
+        attribute: href
+        filters:
+          - name: prepend
+            args: "{{ .Config.sitelink }}"
+      category:
+        selector:  div.torrentCategory a
+        attribute: href
+        filters:
+          - name: querystring
+            args: category_id
+      download:
+        selector: div.download a
+        attribute: href
+        filters:
+          - name: prepend
+            args: "{{ .Config.sitelink }}"
+      magnet:
+        selector: div.download a[href^="magnet:?"]
+        attribute: href
+      date:
+        selector: div.name div.titleText div.secondRow div span
+        attribute: title
+        # 7 мар 2019 в 21:06
+        filters:
+          - name: replace
+            args: [" в ", " "]
+          - name: replace
+            args: ["янв", "Jan"]
+          - name: replace
+            args: ["фев", "Feb"]
+          - name: replace
+            args: ["мар", "Mar"]
+          - name: replace
+            args: ["апр", "Apr"]
+          - name: replace
+            args: ["май", "May"]
+          - name: replace
+            args: ["июн", "Jun"]
+          - name: replace
+            args: ["июл", "Jul"]
+          - name: replace
+            args: ["авг", "Aug"]
+          - name: replace
+            args: ["сен", "Sep"]
+          - name: replace
+            args: ["окт", "Oct"]
+          - name: replace
+            args: ["ноя", "Nov"]
+          - name: replace
+            args: ["дек", "Dec"]
+          - name: dateparse
+            args: "2 Jan 2006 15:04"
+      size:
+        selector: div.size
+        filters:
+          - name: replace
+            args: [".", ""] 
+          - name: replace
+            args: [",", "."] 
+          - name: replace
+            args: ["ТБ", "TB"] 
+          - name: replace
+            args: ["ГБ", "GB"]
+          - name: replace
+            args: ["МБ", "MB"]
+          - name: replace
+            args: ["КБ", "KB"]
+      grabs:
+        selector: div.snatched
+      seeders:
+        selector: div.seeders
+      leechers:
+        selector: div.leechers
+      downloadvolumefactor:
+        case:
+          "div.name div.titleText h3 span:contains(\"Золото\")": "0"
+          "*": "1"
+      uploadvolumefactor:
+        text: "1"

src/Jackett.Common/Definitions/freedomhd.yml

@@ -1,160 +0,0 @@
----
-  site: freedomhd
-  name: Freedom-HD
-  description: "Freedom-HD (Freedom Paradise) is a ratioless FRENCH Private Torrent Tracker for HD MOVIES / GENERAL"
-  language: fr-fr
-  type: private
-  encoding: UTF-8
-  links:
-    - http://freedom-paradise.eu/
-
-  download:
-    before:
-      path: list_thanks.php
-      method: "get"
-      inputs:
-        id: "{{ .DownloadUri.Query.id }}"
-        to: "give"
-        torrent: "{{ .DownloadUri.Query.id }}"
-    
-
-  caps:
-    categorymappings:
-      # ANIMES
-      - {id: 105, cat: TV/Anime, desc: "ANIMES 1080p-Bluray"}
-      - {id: 149, cat: TV/Anime, desc: "ANIMES 3D"}
-      - {id: 143, cat: TV/Anime, desc: "ANIMES 4K-2160p"}
-      - {id: 104, cat: TV/Anime, desc: "ANIMES 720p-Bluray"}
-      - {id: 90, cat: TV/Anime, desc: "ANIMES HDrip-720p"}
-      - {id: 93, cat: TV/Anime, desc: "ANIMES HDrip-1080p"}
-      - {id: 131, cat: TV/Anime, desc: "ANIMES SD"}
-      - {id: 120, cat: TV/Anime, desc: "ANIMES X265-1080p"}
-      - {id: 119, cat: TV/Anime, desc: "ANIMES X265-720p"}
-      # DOCUMENTAIRES
-      - {id: 107, cat: TV/Documentary, desc: "DOCS 1080p-Bluray"}
-      - {id: 152, cat: TV/Documentary, desc: "DOCS 2160p-Bluray"}
-      - {id: 106, cat: TV/Documentary, desc: "DOCS 720p-Bluray"}
-      - {id: 94, cat: TV/Documentary, desc: "DOCS HDrip-1080p"}
-      - {id: 91, cat: TV/Documentary, desc: "DOCS HDrip-720p"}
-      - {id: 142, cat: TV/Documentary, desc: "DOCS HDTV"}
-      - {id: 141, cat: TV/Documentary, desc: "DOCS SD"}
-      # EBOOK
-      - {id: 124, cat: Books, desc: "Livres et Magazines"}
-      # FILMS
-      - {id: 97, cat: Movies/HD, desc: "FILMS Bluray-1080p"}
-      - {id: 103, cat: Movies/3D, desc: "FILMS 3D"}
-      - {id: 111, cat: Movies/UHD, desc: "FILMS 4K"}
-      - {id: 96, cat: Movies/HD, desc: "FILMS Bluray-720p"}
-      - {id: 127, cat: Movies/HD, desc: "FILMS BDrip"}
-      - {id: 128, cat: Movies/HD, desc: "FILMS BRrip"}
-      - {id: 140, cat: Movies/HD, desc: "FILMS BSD-Team"}
-      - {id: 126, cat: Movies/SD, desc: "FILMS DVDrip"}
-      - {id: 136, cat: Movies/BluRay, desc: "FILMS Full-Bluray"}
-      - {id: 135, cat: Movies/SD, desc: "FILMS Team Freedom-HD"}
-      - {id: 137, cat: Movies/SD, desc: "FILMS Team ticadow"}
-      - {id: 89, cat: Movies/HD, desc: "FILMS HDrip-720p"}
-      - {id: 92, cat: Movies/HD, desc: "FILMS HDrip-1080p"}
-      - {id: 112, cat: Movies/SD, desc: "FILMS Team-Hush"}
-      - {id: 129, cat: Movies/HD, desc: "FILMS Team-Romkent"}
-      - {id: 125, cat: Movies/Other, desc: "FILMS WEBrip"}
-      - {id: 110, cat: Movies/HD, desc: "FILMS X265-1080p"}
-      - {id: 109, cat: Movies/HD, desc: "FILMS X265-720p"}
-      # GAMES
-      - {id: 134, cat: PC/Games, desc: "jeu PC"}
-      # MUSIQUES
-      - {id: 114, cat: Audio/Lossless, desc: "MUSIQUES Flac"}
-      - {id: 113, cat: Audio/MP3, desc: "MUSIQUES MP3"}
-      - {id: 132, cat: Audio, desc: "MUSIQUES HQ"}
-      - {id: 130, cat: Audio/Video, desc: "MUSIQUES video clip"}
-      # SERIE
-      - {id: 121, cat: TV/SD, desc: "SERIE SD"}
-      - {id: 102, cat: TV/HD, desc: "SERIE 1080p-Bluray"}
-      - {id: 101, cat: TV/HD, desc: "SERIE 720p-Bluray"}
-      - {id: 100, cat: TV/HD, desc: "SERIE HDrip-1080p"}
-      - {id: 99, cat: TV/HD, desc: "SERIE HDrip-720p"}
-      - {id: 151, cat: TV/UHD, desc: "SERIE HDrip-2160p"}
-      # SPECTACLES
-      - {id: 138, cat: TV, desc: "SPECTACLES Bluray-1080p"}
-      - {id: 139, cat: TV, desc: "SPECTACLES Bluray-720p"}
-      - {id: 133, cat: TV, desc: "SPECTACLES DVDrip"}
-      - {id: 118, cat: TV, desc: "SPECTACLES HDrip-1080p"}
-      - {id: 117, cat: TV, desc: "SPECTACLES HDrip-720p"}
-      # SPORT
-      - {id: 146, cat: TV/Sport, desc: "SPORT HDTV-1080p"}
-      - {id: 147, cat: TV/Sport, desc: "SPORT HDTV-720p"}
-      - {id: 148, cat: TV/Sport, desc: "SPORT SD"}
-      - {id: 144, cat: TV/Sport, desc: "SPORT WEB-DL-1080p"}
-      - {id: 145, cat: TV/Sport, desc: "SPORT WEB-DL-720p"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: account-login.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      remember: "yes"
-      returnto: "/"
-    error:
-      - selector: div.myFrame:has(font.error)
-    test:
-      path: torrents-search.php
-      selector: a.logout
-
-  search:
-    paths:
-      - path: torrents-search.php
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
-      incldead: "1"
-
-    rows:
-      selector: table.ttable_headinner > tbody > tr[class^="t-row"]
-      filters:
-        - name: andmatch
-      after: 1
-    fields:
-      download:
-        selector: a[href^="torrents-details.php?id="]
-        attribute: href
-        filters:
-          - name: replace
-            args: ["torrents-details.php", "download.php"]
-      title:
-        selector: a[href^="torrents-details.php?id="]
-        attribute: title
-      category:
-        selector: a[href^="torrents.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      details:
-        selector: a[href^="torrents-details.php?id="]
-        attribute: href
-      description:
-        selector: ul
-      banner:
-        selector: img.rounded-img
-        attribute: src
-      size:
-        selector: td:nth-child(3)
-      grabs:
-        selector: td:nth-child(6)
-      seeders:
-        selector: td:nth-child(4)
-      leechers:
-        selector: td:nth-child(5)
-      date:
-        text: now
-      downloadvolumefactor:
-        case:
-          img[alt="freeleech"]: "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"

src/Jackett.Common/Definitions/freetorrent.yml

@@ -23,6 +23,7 @@
       - {id: 11, cat: PC/Phone-Android, desc: "Android ROMs"}
       - {id: 12, cat: TV/Documentary, desc: "Documentaries"}
       - {id: 13, cat: TV, desc: "Shows"}
+      - {id: 14, cat: Audio/Video, desc: "Music clips"}
 
     modes:
       search: [q]
@@ -36,7 +37,9 @@
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
     error:
-      - selector: form[action*="/login"] .text-red
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
     test:
       path: torrents
 
@@ -46,6 +49,7 @@
     inputs:
       $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
       search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      description: ""
       uploader: ""
       imdb: "{{ .Query.IMDBIDShort }}"
       tvdb: ""
@@ -71,20 +75,27 @@
       details:
         selector: a.view-torrent
         attribute: href
+      banner:
+        optional: true
+        selector: div.torrent-poster img
+        attribute: src
+        filters:
+          - name: replace
+            args: ["https://via.placeholder.com/600x900", ""]
       size:
-        selector: td:nth-child(5)
+        selector: td:nth-last-child(4)
       seeders:
-        selector: td:nth-child(7)
+        selector: td:nth-last-child(3)
       leechers:
-        selector: td:nth-child(8)
+        selector: td:nth-last-child(2)
       grabs:
-        selector: td:nth-child(6)
+        selector: td:nth-last-child(1)
         filters:
           - name: regexp
             args: ([\d\.]+)
       imdb:
         optional: true
-        selector: a[href^="https://www.imdb.com/title/"]
+        selector: a[href*="www.imdb.com/title/tt"]
         attribute: href
       date:
         selector: time
@@ -114,13 +125,17 @@
             args: [" (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
       downloadvolumefactor:
         case:
-          "i[data-original-title=\"100% Free\"]": "0" # Single Torrent Freeleech
+          "i[data-original-title=\"Personal Freeleech\"]": "0" # 24 Hour FreeLeech From BON Store
+          "i[data-original-title=\"Special Freeleech\"]": "0" # Special FreeLeech For Certain User Groups
+          "i[data-original-title=\"Freeleech Token\"]": "0" # Freeleech From Token
           "i[data-original-title=\"Global FreeLeech\"]": "0" # Global Freeleech
           "i[data-original-title=\"Freeleech\"]": "0" # Freeleech
+          "i[data-original-title=\"Featured\"]": "0" # Featured Torrent
           "*": "1"
       uploadvolumefactor:
         case:
-          "i[data-original-title=\"Double upload\"]": "2" # Single Torrent Double Upload
-          "i[data-original-title=\"Double Upload\"]": "2" # Global Double Upload
+          "i[data-original-title=\"Double Upload\"]": "2" # Single Torrent Double Upload
+          "i[data-original-title=\"Global Double Upload\"]": "2" # Global Double Upload
+          "i[data-original-title=\"Featured\"]": "2" # Featured Torrent
           "*": "1"
-# UNIT3D
+# UNIT3D 1.9.2

src/Jackett.Common/Definitions/frozenlayer.yml

@@ -7,8 +7,6 @@
   encoding: UTF-8
   links:
     - https://www.frozen-layer.com/
-  certificates:
-    - 001bc21dd13b54b05106b510a327a7182ec443a4
 
   settings:
     - name: category

src/Jackett.Common/Definitions/fullmixmusic.yml

@@ -16,6 +16,7 @@
 
     modes:
       search: [q]
+      music-search: [q, album, artist, label, year]
 
   login:
     path: login.php
@@ -32,7 +33,7 @@
     paths:
       - path: browse.php
     inputs:
-      search: "{{ .Query.Keywords }}"
+      search: "{{if .Query.Artist}}{{ .Query.Artist }}{{else}}{{ .Keywords }}{{end}}"
       showsearch: "1"
       incldead: "1"
     rows:

src/Jackett.Common/Definitions/funkytorrents.yml

@@ -51,7 +51,7 @@
 
     modes:
       search: [q]
-      tv-search: [q, season, ep]
+      music-search: [q, album, artist, label, year]
 
   login:
     path: takelogin.php
@@ -69,7 +69,7 @@
       - path: browse.php
     inputs:
       #$raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
+      search: "{{if .Query.Artist}}{{ .Query.Artist }}{{else}}{{ .Keywords }}{{end}}"
       incldead: 1
     rows:
       selector: table.mainouter > tbody > tr > td.outer > table > tbody > tr.mouse_out

src/Jackett.Common/Definitions/generationfree.yml

@@ -0,0 +1,208 @@
+---
+  site: 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: 10, cat: TV/HD, desc: "Animation: HD720P"}
+      - {id: 11, cat: TV/HD, desc: "Animation: HD1080P"}
+      - {id: 56, cat: TV/SD, desc: "Animation: DVDRip"}
+      - {id: 13, cat: TV/SD, desc: "Animation: DVD"}
+      - {id: 105, cat: TV/HD, desc: "Animation: Bluray"}
+      - {id: 106, cat: TV/HD, desc: "Animation: HDTV"}
+      - {id: 108, cat: TV/WEB-DL, desc: "Animation: WEBDL"}
+      - {id: 109, cat: TV/WEB-DL, desc: "Animation: WEBRIP"}
+      - {id: 18, cat: PC/0day, desc: "Applications: PC"}
+      - {id: 16, cat: PC/Games, desc: "Applications: Jeux"}
+      - {id: 19, cat: PC/Phone-Android, desc: "Applications: Android"}
+      - {id: 38, cat: PC/Phone-Other, desc: "Applications: Mobile Phone"}
+      - {id: 17, cat: PC/Mac, desc: "Applications: Mac"}
+      - {id: 117, cat: PC, desc: "Applications: Appli-autre"}
+      - {id: 40, cat: PC, desc: "Applications: Linux"}
+      - {id: 67, cat: TV/OTHER, desc: "Autres: Emission TV"}
+      - {id: 118, cat: TV/Documentary, desc: "Documentaires: Sport"}
+      - {id: 15, cat: TV/Documentary, desc: "Documentaires: HD"}
+      - {id: 14, cat: TV/Documentary, desc: "Documentaires: DivX"}
+      - {id: 76, cat: TV/Documentary, desc: "Documentaires: TVRip/HDTV"}
+      - {id: 62, cat: Audio/Audiobook, desc: "E-Books: E-Books Audio"}
+      - {id: 51, cat: Books/Ebook, desc: "E-Books: BD"}
+      - {id: 50, cat: Books/Ebook, desc: "E-Books: Manuel Français"}
+      - {id: 49, cat: Books/Ebook, desc: "E-Books: Manuel Anglais"}
+      - {id: 36, cat: Books/Ebook, desc: "E-Books: Livres Français"}
+      - {id: 53, cat: Books/Ebook, desc: "E-Books: Livre Anglais"}
+      - {id: 52, cat: Books/Ebook, desc: "E-Books: Revue - Journaux"}
+      - {id: 3, cat: Movies/DVD, desc: "Films: DVDRIP"}
+      - {id: 4, cat: Movies/DVD, desc: "Films: DVD5"}
+      - {id: 66, cat: Movies, desc: "Films: VOSTFR"}
+      - {id: 88, cat: Movies/BluRay, desc: "Films: Full BD/BR"}
+      - {id: 89, cat: Movies/BluRay, desc: "Films: BD/BR Rip"}
+      - {id: 5, cat: Movies/DVD, desc: "Films: DVD9"}
+      - {id: 94, cat: Movies/DVD, desc: "Films: DVDscreen"}
+      - {id: 91, cat: Movies, desc: "Films: RemuX"}
+      - {id: 104, cat: Movies/BluRay, desc: "Films: Film-BDRip"}
+      - {id: 110, cat: Movies/WEBDL, desc: "Films: WEBRip"}
+      - {id: 111, cat: Movies/WEBDL, desc: "Films: WEBRip-720p-P"}
+      - {id: 95, cat: Movies/BluRay, desc: "Films: bluray"}
+      - {id: 102, cat: Movies/WEBDL, desc: "Films: WEB-DL 720P"}
+      - {id: 101, cat: Movies/WEBDL, desc: "Films: WEB-DL 1080P"}
+      - {id: 92, cat: Movies/UHD, desc: "Films: 4K"}
+      - {id: 100, cat: Movies/UHD, desc: "Films: 4KLight"}
+      - {id: 71, cat: Movies/WEBDL, desc: "Films: WEB-DL"}
+      - {id: 69, cat: Movies/3D, desc: "Films: Film 3D"}
+      - {id: 65, cat: TV, desc: "Films: VO"}
+      - {id: 72, cat: TV/HD, desc: "Films: TVRip/HDTV"}
+      - {id: 96, cat: Movies/HD, desc: "Films: HDlight"}
+      - {id: 70, cat: Movies/HD, desc: "Films: MHD X265"}
+      - {id: 103, cat: Movies/HD, desc: "Films: Film-HDRIP"}
+      - {id: 57, cat: TV, desc: "Films: TS/CAM"}
+      - {id: 59, cat: TV, desc: "Films: Spectacle"}
+      - {id: 87, cat: XXX, desc: "Films: XXX"}
+      - {id: 55, cat: Movies/HD, desc: "Films: MHD 720P"}
+      - {id: 54, cat: Movies/HD, desc: "Films: MHD 1080P"}
+      - {id: 1, cat: Movies/HD, desc: "Films: HD720P"}
+      - {id: 2, cat: Movies/HD, desc: "Films: HD1080P"}
+      - {id: 90, cat: Movies/HD, desc: "Films: HD X265"}
+      - {id: 112, cat: Movies/WEBDL, desc: "Films: WEBrip-1080-P"}
+      - {id: 77, cat: PC/Phone-Other, desc: "GPS: Cartes"}
+      - {id: 78, cat: PC/Phone-Other, desc: "GPS: Radars"}
+      - {id: 125, cat: TV/Anime, desc: "Mangas: DVDRip"}
+      - {id: 124, cat: TV/Anime, desc: "Mangas: HD720P"}
+      - {id: 97, cat: Audio, desc: "Musique: Podcast"}
+      - {id: 98, cat: Audio, desc: "Musique: karaoké"}
+      - {id: 75, cat: Audio, desc: "Musique: Concert TVRip"}
+      - {id: 24, cat: Audio/Lossless, desc: "Musique: Single Flac"}
+      - {id: 25, cat: Audio/MP3, desc: "Musique: Single MP3"}
+      - {id: 22, cat: Audio/MP3, desc: "Musique: Album MP3"}
+      - {id: 115, cat: Audio/MP3, desc: "Musique: Coffret mp3"}
+      - {id: 23, cat: Audio/Lossless, desc: "Musique: Album Flac"}
+      - {id: 116, cat: Audio/Lossless, desc: "Musique: Coffret flac"}
+      - {id: 64, cat: Audio, desc: "Musique: Mégamix Maison"}
+      - {id: 58, cat: Audio, desc: "Musique: Concert"}
+      - {id: 6, cat: TV, desc: "Serie TV: Saison FR"}
+      - {id: 7, cat: TV, desc: "Serie TV: Episode FR"}
+      - {id: 61, cat: TV, desc: "Serie TV: Episode VOSTFR"}
+      - {id: 93, cat: TV, desc: "Serie TV: Saison VOSTFR"}
+      - {id: 113, cat: TV, desc: "Serie TV: Episode QC"}
+      - {id: 114, cat: TV, desc: "Serie TV: Saison QC"}
+      - {id: 73, cat: TV/WEB-DL, desc: "Serie TV: WEB-DL"}
+      - {id: 74, cat: TV/HD, desc: "Serie TV: TVRip/HDTV"}
+      - {id: 12, cat: TV, desc: "Serie TV: Animation"}
+      - {id: 63, cat: TV, desc: "Serie TV: Episode VO"}
+      - {id: 120, cat: TV/HD, desc: "Serie TV: Episode Bluray 1080p"}
+      - {id: 121, cat: TV/HD, desc: "Serie TV: Saison Bluray 720p"}
+      - {id: 122, cat: TV/HD, desc: "Serie TV: Saison Bluray 1080p"}
+      - {id: 119, cat: TV/HD, desc: "Serie TV: Episode Bluray 720p"}
+
+    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: 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"
+
+  login:
+    path: account-login.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+    - selector: td.tboxhead
+    test:
+      path: torrents-search.php
+      selector: a[href="account-logout.php"]
+
+  download:
+    before:
+      path: "list_thanks.php"
+      method: "get"
+      inputs:
+        id: "{{ .DownloadUri.Query.id }}"
+        to: "give"
+        torrent: "{{ .DownloadUri.Query.id }}"
+    selector: a[href^="download.php?id="]
+
+  search:
+    paths:
+    # 40 results per page
+      - path: torrents-search.php
+      - path: torrents-search.php
+        inputs:
+          page: 1
+    inputs:
+#      multi cats unsupported, defaulting to all
+      cat: 0
+      search: "{{ .Keywords }}"
+      incldead: 1
+      freeleech: 0
+      inclexternal: 0
+      lang: 0
+      sort: id
+      order: desc
+
+    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: ["\\s[Mm][Uu][Ll][Tt][Ii]\\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(4)
+      seeders:
+        selector: td:nth-last-child(3)
+      leechers:
+        selector: td:nth-last-child(2)
+      date:
+        text: now
+      downloadvolumefactor:
+        case:
+          img[src="images/fl.gif"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett.Common/Definitions/gktorrent.yml

@@ -7,7 +7,7 @@
   encoding: UTF-8
   followredirect: true
   links:
-    - https://www.gktorrent.tv/
+    - https://www.gktorrent.biz/
   legacylinks:
     - https://www.gktorrent.com/
     - http://www.gktorrent.com/
@@ -23,8 +23,10 @@
     - https://www.gktorrent.org/
     - https://www.gktorrent.me/
     - https://www.rantop.org/
-    - https://www.gktorrent.net/
     - https://www.gktorrent.cx/
+    - https://www.gktorrent.tv/
+    - https://www.gktorrent.net/
+
   caps:
     categorymappings:
       - {id: movies, cat: Movies, desc: "Movies"}
@@ -62,7 +64,9 @@
         filters:
           # now we put the date at the right place according scene naming rules using .Result.site_date
           - name: replace
-            args: ["FRENCH", "{{ .Result.site_date }} FRENCH"]
+            args: [" FRENCH", " {{ .Result.site_date }} FRENCH"]
+          - name: replace
+            args: ["MULTI", "{{ .Result.site_date }} MULTI"]
           - name: replace
             args: ["TRUEFRENCH", "{{ .Result.site_date }} TRUEFRENCH"]
           - name: replace

src/Jackett.Common/Definitions/gods.yml

@@ -1,165 +0,0 @@
----
-  site: gods
-  name: GODS
-  description: "GODS is a German Private site for TV / MOVIES / GENERAL"
-  language: de-de
-  type: private
-  encoding: windows-1252
-  links:
-    - https://gods.lu/
-
-  caps:
-    categorymappings:
-      # Movie
-      - {id: 132, cat: Movies/BluRay, desc: "BluRay"}
-      - {id: 146, cat: Movies/HD, desc: "Remux"}
-      - {id: 186, cat: Movies/UHD, desc: "UHD"}
-      - {id: 189, cat: Movies/HD, desc: "HD"}
-      - {id: 190, cat: Movies/SD, desc: "SD"}
-      - {id: 20, cat: Movies/DVD, desc: "DVD"}
-      - {id: 131, cat: Movies/3D, desc: "3D"}
-      - {id: 16, cat: Movies, desc: "Packs"}
-
-      # Serien
-      - {id: 187, cat: TV/UHD, desc: "Staffeln UHD"}
-      - {id: 173, cat: TV/HD, desc: "Staffeln HD"}
-      - {id: 133, cat: TV/SD, desc: "Staffeln SD"}
-      - {id: 188, cat: TV/UHD, desc: "Folgen UHD"}
-      - {id: 174, cat: TV/HD, desc: "Folgen HD"}
-      - {id: 7, cat: TV/SD, desc: "Folgen SD"}
-
-      # Doku
-      - {id: 152, cat: TV/Documentary, desc: "HD"}
-      - {id: 153, cat: TV/Documentary, desc: "SD"}
-
-      # Spiele
-      - {id: 4, cat: PC/Games, desc: "Windows"}
-      - {id: 29, cat: Console/XBox360, desc: "XBOX 360"}
-      - {id: 126, cat: Console/Wii, desc: "Wii"}
-      - {id: 183, cat: Console/Wii, desc: "Wii U"}
-      - {id: 128, cat: Console/PS3, desc: "PS3"}
-      - {id: 154, cat: Console/Other, desc: "Andere"}
-
-      # Musik
-      - {id: 6, cat: Audio, desc: "Alben"}
-      - {id: 139, cat: Audio/Lossless, desc: "Lossless"}
-      - {id: 177, cat: Audio, desc: "Singles"}
-      - {id: 157, cat: Audio, desc: "Charts"}
-      - {id: 192, cat: Audio, desc: "Packs"}
-      - {id: 161, cat: Audio/Video, desc: "Video"}
-
-      - {id: 22, cat: PC/0day, desc: "Windows"}
-      - {id: 129, cat: PC/Mac, desc: "Mac OS"}
-      - {id: 164, cat: PC/0day, desc: "Linux"}
-      - {id: 124, cat: PC/Phone-Android, desc: "Android"}
-      - {id: 165, cat: PC/Phone-IOS, desc: "Apple iOS"}
-      - {id: 167, cat: PC/Phone-Other, desc: "Andere"}
-
-      # Sport
-      - {id: 130, cat: TV/Sport, desc: "HD"}
-      - {id: 135, cat: TV/Sport, desc: "SD"}
-
-      #  International
-      - {id: 170, cat: Movies/Foreign, desc: "Filme HD"}
-      - {id: 134, cat: Movies/Foreign, desc: "Filme SD"}
-      - {id: 171, cat: TV/Foreign, desc: "Folgen HD"}
-      - {id: 172, cat: TV/Foreign, desc: "Folgen SD"}
-
-      # Sonstiges
-      - {id: 28, cat: TV/Anime, desc: "Anime"}
-      - {id: 13, cat: Books, desc: "e-Book"}
-      - {id: 11, cat: Audio/Audiobook, desc: "Hören"}
-      - {id: 136, cat: Other, desc: "Bilder"}
-      - {id: 9, cat: Other, desc: "Tutorial"}
-      - {id: 178, cat: Other, desc: "Anderes"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
-
-  settings:
-    - name: pin
-      type: text
-      label: Pin
-    - name: username
-      type: text
-      label: Username
-    - name: password
-      type: password
-      label: Password
-
-  login:
-    path: login/
-    method: form
-    form: form
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      pin: "{{ .Config.pin }}"
-    test:
-      path: browse.php
-
-  search:
-    paths:
-      - path: browse.php
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
-      intitle: "1"
-      incldead: "1"
-      team: "0"
-      orderby: "added"
-      sort: desc
-    rows:
-      selector: table.tableinborder > tbody > tr:has(a[href^="details.php"])
-    fields:
-      title:
-        selector: a[href^="details.php"]
-      banner:
-        selector: a[href^="details.php"] > span > img
-        attribute: src
-      category:
-        selector: a[href^="browse.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      details:
-        selector: a[href^="details.php"]
-        attribute: href
-      comments:
-        selector: a[href*="&tocomm="]
-        attribute: href
-      download:
-        selector: a[href^="download.php"]
-        attribute: href
-      files:
-        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(1) > b:nth-child(2)
-      grabs:
-        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(3) > b:nth-child(1)
-      size:
-        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(1) > b:nth-child(1)
-        filters:
-          - name: replace
-            args: [".", ""]
-          - name: replace
-            args: [",", "."]
-      seeders:
-        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(3) > b:nth-child(1)
-      leechers:
-        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(3) > b:nth-child(3)
-      date:
-        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(6)
-        filters:
-          - name: replace
-            args: ["\xA0", " "]
-          - name: dateparse
-            args: "02.01.2006 15:04:05"
-      downloadvolumefactor:
-        case:
-          img[alt="onlyupload"]: "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"

src/Jackett.Common/Definitions/hachede.yml

@@ -63,22 +63,23 @@
       tv-search: [q, season, ep]
       movie-search: [q]
 
+  settings:
+    - name: cookie
+      type: text
+      label: Cookie
+    - name: info
+      type: info
+      label: How to get the Cookie
+      default: "<ol><li>Login to this tracker in 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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
+
   login:
-    path: ajax/login.php
-    method: post
+    method: cookie
     headers:
       user-agent: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.104 Safari/537.36"
-    form: form
     inputs:
-      loginbox_membername: "{{ .Config.username }}"
-      loginbox_password: "{{ .Config.password }}"
-      action: "login"
-      loginbox_remember: "true"
-    error:
-      - selector: div.error
+      cookie: "{{ .Config.cookie }}"
     test:
       path: ?p=home&pid=1
-      selector: div#member_info_bar
 
   search:
     path: /

src/Jackett.Common/Definitions/hamsterstudio.yml

@@ -0,0 +1,345 @@
+---
+  site: hamsterstudio
+  name: HamsterStudio
+  description: "HamsterStudio is a RUSSIAN Semi-Private Torrent Tracker for TV"
+  language: ru-ru
+  type: private
+  encoding: windows-1251
+  links:
+    - http://hamsterstudio.org/
+
+  caps:
+    categorymappings:
+    - {id: 23, cat: Movies, desc: "Кино"}
+    - {id: 18, cat: TV/WEB-DL, desc: "Веб-сериалы"}
+    - {id: 19, cat: TV/OTHER, desc: "Разные сериалы"}
+    - {id: 10, cat: Audio, desc: "Музыка"}
+    - {id: 29, cat: TV, desc: "Лечение (Пациенты)"}
+    - {id: 37, cat: TV, desc: "Сериалы с ТВ"}
+    - {id: 21, cat: TV, desc: "Полуночный зверь"}
+    - {id: 11, cat: TV, desc: "Милые обманщицы"}
+    - {id: 27, cat: TV, desc: "Девочки"}
+    - {id: 20, cat: TV, desc: "Умерь Свой Пыл"}
+    - {id: 24, cat: TV, desc: "Ийон Тихий, космический пилот"}
+    - {id: 25, cat: TV, desc: "Красный карлик"}
+    - {id: 22, cat: TV, desc: "Тримей"}
+    - {id: 26, cat: TV, desc: "На дне"}
+    - {id: 38, cat: TV, desc: "Галактика: Кровь и Хром"}
+    - {id: 39, cat: TV, desc: "Супертюрьма"}
+    - {id: 40, cat: TV, desc: "Семерка Блэйка"}
+    - {id: 42, cat: TV, desc: "Западное крыло"}
+    - {id: 43, cat: TV, desc: "Убойный Отдел: Уличные Будни"}
+    - {id: 47, cat: TV, desc: "Это Англия"}
+    - {id: 48, cat: TV, desc: "Бенидорм"}
+    - {id: 49, cat: TV, desc: "Сайнфелд"}
+    - {id: 51, cat: TV, desc: "Вице"}
+    - {id: 52, cat: TV, desc: "За кадром о кадре"}
+    - {id: 54, cat: TV, desc: "Хемлок Гроув"}
+    - {id: 56, cat: TV, desc: "Семейное древо"}
+    - {id: 57, cat: TV, desc: "Мэрон"}
+    - {id: 59, cat: TV, desc: "Спецнах"}
+    - {id: 60, cat: TV, desc: "Работа не волк"}
+    - {id: 64, cat: TV, desc: "Дивизион "}
+    - {id: 66, cat: TV, desc: "Кошмары Фредди"}
+    - {id: 67, cat: TV, desc: "Все дома"}
+    - {id: 69, cat: TV, desc: "Бездельницы"}
+    - {id: 70, cat: TV, desc: "Реальные люди"}
+    - {id: 71, cat: TV, desc: "Трофеи Вавилона"}
+    - {id: 72, cat: TV, desc: "Постфактум"}
+    - {id: 73, cat: TV, desc: "Детектив Босх"}
+    - {id: 74, cat: TV, desc: "В девятом номере"}
+    - {id: 75, cat: TV, desc: "Верь"}
+    - {id: 76, cat: TV, desc: "Семь дней"}
+    - {id: 77, cat: TV, desc: "Красная дорога"}
+    - {id: 78, cat: TV, desc: "Борджиа"}
+    - {id: 79, cat: TV, desc: "Вдовец"}
+    - {id: 80, cat: TV, desc: "Безумцы"}
+    - {id: 81, cat: TV, desc: "Убийство первой степени"}
+    - {id: 82, cat: TV, desc: "Мистер Слоун"}
+    - {id: 83, cat: TV, desc: "Путеводитель по семейной жизни"}
+    - {id: 84, cat: TV, desc: "Агенты"}
+    - {id: 85, cat: TV, desc: "Блюз Хилл-Стрит"}
+    - {id: 86, cat: TV, desc: "В погоне за тенями"}
+    - {id: 87, cat: TV, desc: "Константин"}
+    - {id: 88, cat: TV, desc: "Готэм"}
+    - {id: 89, cat: TV, desc: "Клей"}
+    - {id: 90, cat: TV, desc: "Скорострел"}
+    - {id: 91, cat: TV, desc: "Водитель"}
+    - {id: 92, cat: TV, desc: "Очевидное"}
+    - {id: 93, cat: TV, desc: "Красные дубы"}
+    - {id: 94, cat: TV, desc: "Жизнь начинается в 18"}
+    - {id: 95, cat: TV, desc: "Безрассудный"}
+    - {id: 96, cat: TV, desc: "Пропавший без вести"}
+    - {id: 97, cat: TV, desc: "Взгляд в прошлое"}
+    - {id: 98, cat: TV, desc: "Королевская семья"}
+    - {id: 99, cat: TV, desc: "Одиночки с причудами"}
+    - {id: 101, cat: TV, desc: "CSI: Киберпространство"}
+    - {id: 102, cat: TV, desc: "Сорвиголова"}
+    - {id: 103, cat: TV, desc: "Осадок"}
+    - {id: 104, cat: TV, desc: "Призраки Энфилда"}
+    - {id: 105, cat: TV, desc: "Ошибки прошлого"}
+    - {id: 106, cat: TV, desc: "Восьмое чувство"}
+    - {id: 107, cat: TV, desc: "Вызов"}
+    - {id: 108, cat: TV, desc: "Настоящий детектив"}
+    - {id: 109, cat: TV, desc: "Звездный охотник"}
+    - {id: 110, cat: TV, desc: "Это не моя жизнь"}
+    - {id: 111, cat: TV, desc: "Человек в высоком замке"}
+    - {id: 112, cat: TV, desc: "Бойтесь Ходячих мертвецов"}
+    - {id: 113, cat: TV, desc: "Стражи галактики"}
+    - {id: 114, cat: TV, desc: "Герои: Возрождение"}
+    - {id: 115, cat: TV, desc: "Заключенный"}
+    - {id: 116, cat: TV, desc: "Родина"}
+    - {id: 117, cat: TV, desc: "Фарго"}
+    - {id: 118, cat: TV, desc: "Американская история ужасов"}
+    - {id: 119, cat: TV, desc: "Оставленные"}
+    - {id: 121, cat: TV, desc: "Любовники"}
+    - {id: 122, cat: TV, desc: "Агенты Щит"}
+    - {id: 123, cat: TV, desc: "Эш против зловещих мертвецов"}
+    - {id: 124, cat: TV, desc: "Ходячие мертвецы"}
+    - {id: 125, cat: TV, desc: "Демоны Да Винчи"}
+    - {id: 120, cat: TV, desc: "Сонная лощина"}
+    - {id: 126, cat: TV, desc: "Джекил и Хайд"}
+    - {id: 127, cat: TV, desc: "Джессика Джонс"}
+    - {id: 128, cat: TV, desc: "Лондонский шпион"}
+    - {id: 129, cat: TV, desc: "Мост"}
+    - {id: 130, cat: TV, desc: "Хроники Франкенштейна"}
+    - {id: 131, cat: TV, desc: "Пространство"}
+    - {id: 132, cat: TV, desc: "Конец детства"}
+    - {id: 133, cat: TV, desc: "Путь к выздоровлению"}
+    - {id: 134, cat: TV, desc: "Старость не радость"}
+    - {id: 135, cat: TV, desc: "Пьяная история"}
+    - {id: 136, cat: TV, desc: "Хроники Шаннары"}
+    - {id: 137, cat: TV, desc: "Сумеречные охотники"}
+    - {id: 138, cat: TV, desc: "Клоун (Баскетс)"}
+    - {id: 139, cat: TV, desc: "Черные паруса"}
+    - {id: 140, cat: TV, desc: "Секретные материалы"}
+    - {id: 141, cat: TV, desc: "Изгои"}
+    - {id: 143, cat: TV, desc: "Куку"}
+    - {id: 144, cat: TV, desc: "Долл и Эм"}
+    - {id: 145, cat: TV, desc: "Банши "}
+    - {id: 146, cat: TV, desc: " Шоу Джимма Гаффигана"}
+    - {id: 147, cat: TV, desc: "Все кувырком"}
+    - {id: 148, cat: TV, desc: "Сожители"}
+    - {id: 149, cat: TV, desc: "Внутри Эми Шумер"}
+    - {id: 150, cat: TV, desc: "С чистого листа"}
+    - {id: 151, cat: TV, desc: "Хофф в записи"}
+    - {id: 152, cat: TV, desc: "Жевательная резинка"}
+    - {id: 153, cat: TV, desc: "Охотники"}
+    - {id: 154, cat: TV, desc: "Даркнет"}
+    - {id: 155, cat: TV, desc: "Бонг для путешествий во времен"}
+    - {id: 156, cat: TV, desc: "Бульварные ужасы"}
+    - {id: 157, cat: TV, desc: "Флауэрсы"}
+    - {id: 158, cat: TV, desc: "Грейс и Фрэнки "}
+    - {id: 159, cat: TV, desc: "Проповедник"}
+    - {id: 142, cat: TV, desc: "Принц из Беверли Хиллз"}
+    - {id: 160, cat: TV, desc: "Сосны"}
+    - {id: 161, cat: TV, desc: "Истории Нила Геймана"}
+    - {id: 162, cat: TV, desc: "Подчинение"}
+    - {id: 163, cat: TV, desc: "Обвиняемая"}
+    - {id: 164, cat: TV, desc: "Безмозглые"}
+    - {id: 165, cat: TV, desc: "Гастролеры"}
+    - {id: 166, cat: TV, desc: "Завучи"}
+    - {id: 167, cat: TV, desc: "Отжиг"}
+    - {id: 169, cat: TV, desc: "Человек-клещ"}
+    - {id: 168, cat: TV, desc: "Трагедия в Кеттеринге"}
+    - {id: 170, cat: TV, desc: "Я люблю Дика"}
+    - {id: 171, cat: TV, desc: "Жан-Клод Ван Джонсон "}
+    - {id: 173, cat: TV, desc: "Небезопасно для работы"}
+    - {id: 174, cat: TV, desc: "Граница "}
+    - {id: 175, cat: TV, desc: "Дрянь"}
+    - {id: 176, cat: TV, desc: "Сложные люди"}
+    - {id: 177, cat: TV, desc: "Девочки Гилмор"}
+    - {id: 178, cat: TV, desc: "Возвращение  в Миссисипи "}
+    - {id: 179, cat: TV, desc: "В хлам"}
+    - {id: 180, cat: TV, desc: "Бунтарь"}
+    - {id: 182, cat: TV, desc: "Слепое пятно"}
+    - {id: 183, cat: TV, desc: "Королевы крика"}
+    - {id: 184, cat: TV, desc: "Черный список"}
+    - {id: 185, cat: TV, desc: "Однажды в сказке"}
+    - {id: 186, cat: TV, desc: "Звездные войны: повстанцы"}
+    - {id: 187, cat: TV, desc: "Скорпион"}
+    - {id: 188, cat: TV, desc: "Безбашенные"}
+    - {id: 189, cat: TV, desc: "Черное зеркало"}
+    - {id: 190, cat: TV, desc: "Стэн против сил зла"}
+    - {id: 191, cat: TV, desc: "Удалённые"}
+    - {id: 192, cat: TV, desc: "Сирены"}
+    - {id: 193, cat: TV, desc: "По ту сторону"}
+    - {id: 194, cat: TV, desc: "ОА"}
+    - {id: 195, cat: TV, desc: "Табу"}
+    - {id: 196, cat: TV, desc: "Колония"}
+    - {id: 197, cat: TV, desc: "Волшебники"}
+    - {id: 198, cat: TV, desc: "24 часа"}
+    - {id: 199, cat: TV, desc: "Миллиарды"}
+    - {id: 200, cat: TV, desc: "Большая маленькая ложь"}
+    - {id: 201, cat: TV, desc: "Легион"}
+    - {id: 202, cat: TV, desc: "Сан рекордз"}
+    - {id: 203, cat: TV, desc: "Заложница"}
+    - {id: 204, cat: TV, desc: "Убийство на пляже"}
+    - {id: 205, cat: TV, desc: "Подземка"}
+    - {id: 206, cat: TV, desc: "Любовь"}
+    - {id: 207, cat: TV, desc: "Преступление по-американски "}
+    - {id: 208, cat: TV, desc: "Большой куш"}
+    - {id: 209, cat: TV, desc: "Побег"}
+    - {id: 210, cat: TV, desc: "Я Зомби"}
+    - {id: 211, cat: TV, desc: "Лучше звоните Солу"}
+    - {id: 212, cat: TV, desc: "Арчер"}
+    - {id: 213, cat: TV, desc: "Дорогие белые"}
+    - {id: 214, cat: TV, desc: "Американские боги"}
+    - {id: 215, cat: TV, desc: "Брокмайр"}
+    - {id: 216, cat: TV, desc: "Энджи Трайбека"}
+    - {id: 217, cat: TV, desc: "Уэнтуорт "}
+    - {id: 218, cat: TV, desc: "Звери."}
+    - {id: 219, cat: TV, desc: "Упадок и разрушение"}
+    - {id: 220, cat: TV, desc: "Просто парочка"}
+    - {id: 221, cat: TV, desc: "Твин Пикс"}
+    - {id: 222, cat: TV, desc: "Умираю со смеху"}
+    - {id: 223, cat: TV, desc: "По волчьим законам"}
+    - {id: 224, cat: TV, desc: "Карточный домик"}
+    - {id: 225, cat: TV, desc: "Приключения Тедди Ракспина"}
+    - {id: 226, cat: TV, desc: "Темная материя"}
+    - {id: 227, cat: TV, desc: "Вайнона Эрп"}
+    - {id: 228, cat: TV, desc: "Киллджойс"}
+    - {id: 229, cat: TV, desc: "Кровавая гонка"}
+    - {id: 230, cat: TV, desc: "Сшиватели"}
+    - {id: 231, cat: TV, desc: "Ночная смена"}
+    - {id: 232, cat: TV, desc: "Мгла"}
+    - {id: 233, cat: TV, desc: "Зверинец"}
+    - {id: 234, cat: TV, desc: "Снегопад"}
+    - {id: 235, cat: TV, desc: "Спасение"}
+    - {id: 236, cat: TV, desc: "По болезни"}
+    - {id: 237, cat: TV, desc: "Кастлвания"}
+    - {id: 238, cat: TV, desc: "Штамм"}
+    - {id: 239, cat: TV, desc: "Игра престолов"}
+    - {id: 240, cat: TV, desc: "Мстители"}
+    - {id: 241, cat: TV, desc: "Комната 104"}
+    - {id: 242, cat: TV, desc: "Миднайт, Техас"}
+    - {id: 243, cat: TV, desc: "Человек-паук"}
+    - {id: 244, cat: TV, desc: "Рэй Донован"}
+    - {id: 245, cat: TV, desc: "Мистер Мерседес"}
+    - {id: 246, cat: TV, desc: "Эпизоды"}
+    - {id: 247, cat: TV, desc: "Охота на Унабомбера "}
+    - {id: 248, cat: TV, desc: "Защитники"}
+    - {id: 249, cat: TV, desc: "Раскосяченные"}
+    - {id: 250, cat: TV, desc: "Двойка"}
+    - {id: 251, cat: TV, desc: "Нарко"}
+    - {id: 252, cat: TV, desc: "Ты — воплощение порока"}
+    - {id: 253, cat: TV, desc: "Конь БоДжек"}
+    - {id: 254, cat: TV, desc: "Орвилл"}
+    - {id: 256, cat: TV, desc: "Южный парк"}
+    - {id: 257, cat: TV, desc: "Звездный путь: Дискавери"}
+    - {id: 258, cat: TV, desc: "Мик"}
+    - {id: 259, cat: TV, desc: "Морская полиция"}
+    - {id: 260, cat: TV, desc: "Смертельное оружие"}
+    - {id: 261, cat: TV, desc: "Сверхлюди"}
+    - {id: 262, cat: TV, desc: "Одарённые"}
+    - {id: 263, cat: TV, desc: "Полиция Чикаго"}
+    - {id: 264, cat: TV, desc: "Это Мы"}
+    - {id: 265, cat: TV, desc: "Империя"}
+    - {id: 266, cat: TV, desc: "Мыслить как преступник"}
+    - {id: 267, cat: TV, desc: "Экзорцист"}
+    - {id: 268, cat: TV, desc: "Люцифер"}
+    - {id: 269, cat: TV, desc: "Нация Z"}
+    - {id: 270, cat: TV, desc: "Сверхестественое"}
+    - {id: 273, cat: TV, desc: "Доктор Шанс"}
+    - {id: 271, cat: TV, desc: "Мистер Робот"}
+    - {id: 272, cat: TV, desc: "Очень странные дела"}
+    - {id: 274, cat: TV, desc: "Стрела"}
+    - {id: 275, cat: TV, desc: "Флэш"}
+    - {id: 276, cat: TV, desc: "Супердевушка"}
+    - {id: 277, cat: TV, desc: "Легенды завтрашнего дня "}
+    - {id: 278, cat: TV, desc: "Суеверие"}
+    - {id: 279, cat: TV, desc: "Конец ёбанного мира"}
+    - {id: 280, cat: TV, desc: "Спецназ"}
+    - {id: 281, cat: TV, desc: "Бесстыдники "}
+    - {id: 282, cat: TV, desc: "Проклятая нация"}
+    - {id: 283, cat: TV, desc: "Человек будущего"}
+    - {id: 284, cat: TV, desc: "Каратель"}
+    - {id: 285, cat: TV, desc: "Фантастика"}
+    - {id: 286, cat: TV, desc: "Ужасы/триллер"}
+    - {id: 287, cat: TV, desc: "Драма"}
+    - {id: 288, cat: TV, desc: "Комедия"}
+    - {id: 289, cat: TV, desc: "Боевик"}
+    - {id: 290, cat: TV, desc: "Детектив"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: div.error
+    test:
+      path: browse.php
+      selector: a[href="logout.php"]
+
+  search:
+    paths:
+      - path: browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      # 0 active 1 incdead 2 onlydead 3 gold 4 seedfree
+      incldead: "1"
+    rows:
+      selector: table.embedded > tbody > tr:has(a[href^="details.php?id="])
+    fields:
+      title:
+        selector: a[href^="details.php?id="]
+        filters:
+          - name: re_replace
+            args: ["\\b(\\d)\\b", "0$1"]
+          - name: re_replace
+            args: [".+Сезон\\s+(\\d+)(?:.+Серия\\s+(\\d+))*[\\s\\S]*\\/\\s+(.+)\\s+\\(\\d+\\)\\s+(\\S*)\\s*(\\w*\\d*).*", "$3 - S$1E$2 - rus $5 $4 newstudio"]
+          - name: replace
+            args: ["WEBDLRip","WEBDL"]
+          - name: replace
+            args: ["HDTVRip","HDTV"]
+          - name: replace
+            args: ["E -","E01-99 -"]
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      files:
+        selector: td:nth-child(3)
+      size:
+        selector: td:nth-child(5)
+      date:
+        selector: i
+        filters:
+          - name: dateparse
+            args: "2006-01-02 15:04:05"
+      seeders:
+        selector: td:nth-child(6)
+        filters:
+          - name: split
+            args: ["|", 0]
+      leechers:
+        selector: td:nth-child(6)
+        filters:
+          - name: split
+            args: ["|", 1]
+      downloadvolumefactor:
+        case:
+          img[src="pic/diamond.png"]: "0"
+          img[src="pic/freedownload.gif"]: "0"
+          img[src="pic/silver.gif"]: "0.5"
+          img[src="pic/bronze.gif"]: "0.75"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          img[src="pic/diamond.png"]: "2"
+          "*": "1"

src/Jackett.Common/Definitions/hd4free.yml

@@ -14,9 +14,10 @@
       - {id: 2, cat: TV, desc: "TV"}
       - {id: 3, cat: Audio, desc: "Music"}
       - {id: 4, cat: Books, desc: "Books"}
-      - {id: 5, cat: PC/Mac, desc: "Apps"}
+      - {id: 5, cat: PC, desc: "Apps"}
       - {id: 6, cat: Other, desc: "Other"}
       - {id: 7, cat: PC/Games, desc: "Games"}
+      - {id: 8, cat: TV/Sport, desc: "Sports"}
 
 
     modes:
@@ -41,6 +42,7 @@
     inputs:
       $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
       search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      description: ""
       uploader: ""
       imdb: "{{ .Query.IMDBIDShort }}"
       tvdb: ""
@@ -107,9 +109,11 @@
         case:
           "i[data-original-title=\"100% Free\"]": "0"
           "i[data-original-title=\"Global FreeLeech\"]": "0"
+          "i[data-original-title=\"Featured\"]": "0"
           "*": "1"
       uploadvolumefactor:
         case:
+          "i[data-original-title=\"Featured\"]": "2"
           "i[data-original-title=\"Double upload\"]": "2"
           "i[data-original-title=\"Double Upload\"]": "2" # Global Double Upload
           "*": "1"

src/Jackett.Common/Definitions/hdforever.yml

@@ -8,6 +8,18 @@
   links:
     - https://hdf.world/
 
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: usetoken
+      type: checkbox
+      label: Always try to use the FreeLeech Token
+      default: false
+
   caps:
     categories:
       1: Movies
@@ -49,9 +61,17 @@
     rows:
       selector: table#torrent_table > tbody > tr.torrent
     fields:
-      download:
+      download-regular:
         selector: a[href^="torrents.php?action=download&"]
         attribute: href
+      download-usetoken:
+        selector: a[href^="torrents.php?action=download&"]
+        attribute: href
+        filters:
+          - name: append
+            args: "&usetoken=1"
+      download:
+        text: "{{if .Config.usetoken}}{{ .Result.download-usetoken }}{{else}}{{ .Result.download-regular }}{{end}}" 
       title:
         selector: div.group_info
         remove: span:nth-child(1), div.tags
@@ -210,7 +230,7 @@
         selector: td:nth-child(8)
       downloadvolumefactor:
         case:
-          "div.group_info:contains(\"↓Free\")": "0"
+          "div.group_info:contains(\"/ Free\")": "0"
           "div.group_info:contains(\"↓75%\")": "0.75"
           "div.group_info:contains(\"↓50%\")": "0.50"
           "div.group_info:contains(\"↓25%\")": "0.25"

src/Jackett.Common/Definitions/hdspain.yml

@@ -58,13 +58,28 @@
         filters:
           - name: querystring
             args: cat
+      extras:
+        text: ""
+      extras:
+        optional: true
+        selector: td.titulo a[class]
+        filters:
+          - name: prepend
+            args: "["
+          - name: append
+            args: "]"
       title:
         selector: td.titulo a[id]
         filters:
+          - name: prepend
+            args: "{{ .Result.extras }} "
           - name: append
-            args: " [spanish]"
+            args: " [Spanish]"
       details:
-        selector: td.titulo a
+        selector: td.titulo a[id]
+        attribute: href
+      comments:
+        selector: td.foro a
         attribute: href
       size:
         selector: td.tamano
@@ -142,3 +157,10 @@
         filters:
           - name: replace
             args: ["Freeleech X2", "2"]
+      minimumratio:
+        text: "1.0"
+      minimumseedtime:
+        text: "345600"
+      description:
+        optional: true
+        selector: td.titulo a[class]

src/Jackett.Common/Definitions/hush.yml

@@ -28,10 +28,14 @@
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
+      remember: 1
     error:
-      - selector: form[action*="/login"] .text-red
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
     test:
       path: torrents
+      selector: a[href$="/logout"]
 
   search:
     paths:
@@ -39,6 +43,7 @@
     inputs:
       $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
       search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      description: ""
       uploader: ""
       imdb: "{{ .Query.IMDBIDShort }}"
       tvdb: ""
@@ -65,13 +70,13 @@
         selector: a.view-torrent
         attribute: href
       size:
-        selector: td:nth-child(5)
+        selector: td:nth-last-child(4)
       seeders:
-        selector: td:nth-child(7)
+        selector: td:nth-last-child(3)
       leechers:
-        selector: td:nth-child(8)
+        selector: td:nth-last-child(2)
       grabs:
-        selector: td:nth-child(6)
+        selector: td:nth-last-child(1)
         filters:
           - name: regexp
             args: ([\d\.]+)
@@ -103,12 +108,17 @@
             args: [" (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
       downloadvolumefactor:
         case:
-          "i[data-original-title=\"100% Free\"]": "0" # Single Torrent Freeleech
+          "i[data-original-title=\"Personal Freeleech\"]": "0" # 24 Hour FreeLeech From BON Store
+          "i[data-original-title=\"Special Freeleech\"]": "0" # Special FreeLeech For Certain User Groups
+          "i[data-original-title=\"Freeleech Token\"]": "0" # Freeleech From Token
           "i[data-original-title=\"Global FreeLeech\"]": "0" # Global Freeleech
+          "i[data-original-title=\"Freeleech\"]": "0" # Freeleech
+          "i[data-original-title=\"Featured\"]": "0" # Featured Torrent
           "*": "1"
       uploadvolumefactor:
         case:
-          "i[data-original-title=\"Double upload\"]": "2" # Single Torrent Double Upload
-          "i[data-original-title=\"Double Upload\"]": "2" # Global Double Upload          
+          "i[data-original-title=\"Double Upload\"]": "2" # Single Torrent Double Upload
+          "i[data-original-title=\"Global Double Upload\"]": "2" # Global Double Upload
+          "i[data-original-title=\"Featured\"]": "2" # Featured Torrent
           "*": "1"
-# UNIT3D
+# UNIT3D 1.9.2

src/Jackett.Common/Definitions/icetorrent.yml

@@ -79,13 +79,12 @@
       incldead: 1
       search_by: "{{ if .Query.IMDBID }}imdb{{else}}name{{end}}"
     rows:
-      selector: table.table-striped > tbody > tr:has(a[title][href^="details.php?id="])
+      selector: table.table-striped > tbody > tr:has(a[href^="details.php?id="])
     fields:
       title:
-        selector: a[title][href^="details.php?id="]
-        attribute: title
+        selector: a[href^="details.php?id="]
       details:
-        selector: a[title][href^="details.php?id="]
+        selector: a[href^="details.php?id="]
         attribute: href
       category:
         selector: a[href^="?cat="]
@@ -96,7 +95,7 @@
       banner:
         attribute: rel
       imdb:
-        selector: a[href*="https://www.imdb.com/title/"]
+        selector: a[href*="www.imdb.com/title/"]
         optional: true
         attribute: href
       download:

src/Jackett.Common/Definitions/ilcorsaroblu.yml

@@ -10,8 +10,6 @@
   legacylinks:
     - http://ilcorsaroblu.org/
     - https://www.ilcorsaroblu.info/
-  certificates:
-    - e6dd93ef71f96d04559e2bee8cc8e6fd74957730 # incomplete CA chain
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/ilcorsaronero.yml

@@ -13,14 +13,6 @@
     - https://ilcorsaronero.info/
     - https://ilcorsaronero.ch/
     - https://ilcorsaronero.cc/
-  certificates:
-    - 89c12d4a080b5aeec00acbb269dc9b44584b1b3f # incomplete CA chain
-    - aa7c40aa360a1cec8a9687312fd50402b912e618 # incomplete CA chain
-    - 83174ec1f92fa13cdef9d51888ea1dfba2166e17 # incomplete CA chain
-    - c414bf4ad6c69841693c147849f4c314aa200bdf # incomplete CA chain
-    - 3a402766ce22fd1aa24bfc1a4fd47e9309eb8c98 # incomplete CA chain
-    - 160f832730737a70264768ceddf3cd94bc51ffb7 # incomplete CA chain
-    - a60e969b27965d4dc2ff45d50c20e2e872d4e9b9 # incomplete CA chain
 
   caps:
     categorymappings:
@@ -59,16 +51,12 @@
       # - path: "{{if .Keywords}}argh.php?search={{ .Keywords}}
       #      {{else}}/recenti
       #      {{end}}"
-      - path: "{{if .Keywords}}advsearch.php?&category={{range .Categories}}{{.}};{{end}}&search={{ .Keywords}}&order=data&by=DESC&page=0{{else}}/recenti{{end}}"
-      - path: "{{if .Keywords}}advsearch.php?&category={{range .Categories}}{{.}};{{end}}&search={{ .Keywords}}&order=data&by=DESC&page=1{{else}}/recenti{{end}}"
-      - path: "{{if .Keywords}}advsearch.php?&category={{range .Categories}}{{.}};{{end}}&search={{ .Keywords}}&order=data&by=DESC&page=2{{else}}/recenti{{end}}"
-      - path: "{{if .Keywords}}advsearch.php?&category={{range .Categories}}{{.}};{{end}}&search={{ .Keywords}}&order=data&by=DESC&page=3{{else}}/recenti{{end}}"
-      - path: "{{if .Keywords}}advsearch.php?&category={{range .Categories}}{{.}};{{end}}&search={{ .Keywords}}&order=data&by=DESC&page=4{{else}}/recenti{{end}}"
-      - path: "{{if .Keywords}}advsearch.php?&category={{range .Categories}}{{.}};{{end}}&search={{ .Keywords}}&order=data&by=DESC&page=5{{else}}/recenti{{end}}"
-      - path: "{{if .Keywords}}advsearch.php?&category={{range .Categories}}{{.}};{{end}}&search={{ .Keywords}}&order=data&by=DESC&page=6{{else}}/recenti{{end}}"
-      - path: "{{if .Keywords}}advsearch.php?&category={{range .Categories}}{{.}};{{end}}&search={{ .Keywords}}&order=data&by=DESC&page=7{{else}}/recenti{{end}}"
-      - path: "{{if .Keywords}}advsearch.php?&category={{range .Categories}}{{.}};{{end}}&search={{ .Keywords}}&order=data&by=DESC&page=8{{else}}/recenti{{end}}"
-      - path: "{{if .Keywords}}advsearch.php?&category={{range .Categories}}{{.}};{{end}}&search={{ .Keywords}}&order=data&by=DESC&page=9{{else}}/recenti{{end}}"
+      - path: "{{if .Keywords}}advsearch.php?&category={{range .Categories}}{{.}};{{end}}&search={{ .Keywords}}&order=data&by=DESC&page=0{{else}}/browse/0{{end}}"
+      - path: "{{if .Keywords}}advsearch.php?&category={{range .Categories}}{{.}};{{end}}&search={{ .Keywords}}&order=data&by=DESC&page=1{{else}}/browse/1{{end}}"
+      - path: "{{if .Keywords}}advsearch.php?&category={{range .Categories}}{{.}};{{end}}&search={{ .Keywords}}&order=data&by=DESC&page=2{{else}}/browse/2{{end}}"
+      - path: "{{if .Keywords}}advsearch.php?&category={{range .Categories}}{{.}};{{end}}&search={{ .Keywords}}&order=data&by=DESC&page=3{{else}}/browse/3{{end}}"
+      - path: "{{if .Keywords}}advsearch.php?&category={{range .Categories}}{{.}};{{end}}&search={{ .Keywords}}&order=data&by=DESC&page=4{{else}}/browse/4{{end}}"
+      - path: "{{if .Keywords}}advsearch.php?&category={{range .Categories}}{{.}};{{end}}&search={{ .Keywords}}&order=data&by=DESC&page=5{{else}}/browse/5{{end}}"
     keywordsfilters:
       - name: diacritics
         args: replace

src/Jackett.Common/Definitions/insanetracker.yml

@@ -46,14 +46,14 @@
       movie-search: [q, imdbid]
 
   login:
-    path: takelogin.php
+    path: login.php
     method: post
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
       notsecure: "1"
     error:
-      - selector: div.login_error_content
+      - selector: div.login_error_content_text
     test:
       path: browse.php
         
@@ -65,10 +65,10 @@
       search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Query.Keywords }}{{end}}"
       t: "all"
     rows:
-      selector: table.torrentable > tbody > tr:has(td.maintd)
+      selector: table.torrenttable > tbody > tr:has(td.torrentmain)
     fields:
       title:
-        selector: div.tortitle > a
+        selector: td.torrentmain > a.torrentname
         attribute: title
       category:
         selector: a[href^="browse.php?cat="]
@@ -77,10 +77,10 @@
           - name: querystring
             args: cat
       details:
-        selector: div.tortitle > a
+        selector: td.torrentmain > a.torrentname
         attribute: href
       download:
-        selector: a[href^="download.php/"]
+        selector: a[href*="/download.php/"]
         attribute: href
       imdb:
         optional: true
@@ -95,51 +95,49 @@
         selector: a.cover
         attribute: href
       files:
-        selector: td:nth-child(6)
+        selector: div.files > a.button.small
         filters:
           - name: replace
             args: [".", ""]
       size:
-        selector: td:nth-child(8)
+        selector: td.center.size
         filters:
           - name: replace
             args: [".", ""]
           - name: replace
             args: [",", "."]
-      grabs:
-        selector: td:nth-child(9) > div:first-child
-        filters:
-          - name: replace
-            args: [".", ""]
-          - name: regexp
-            args: "^([\\d]+)"
       seeders:
-        selector: td:nth-child(9) > div:first-child
+        selector: td.center.data > a:first-child
         filters:
           - name: replace
             args: [".", ""]
-          - name: regexp
-            args: "\\|\\s*([\\d]+)\\s*\\|"
       leechers:
-        selector: td:nth-child(9) > div:first-child
+        selector: td.center.data > a:nth-child(2)
         filters:
           - name: replace
             args: [".", ""]
-          - name: regexp
-            args: "([\\d]+)$"
-      date:
-        selector: td.date
+      grabs:
+        selector: td.center.data
         filters:
+          - name: replace
+            args: [".", ""]
+        remove: div.uploader, div.moderation, a.leftborder
+
+      date:
+        selector: td.center.date
+        filters:
+          - name: re_replace
+            args: ["(\\-)(\\d{2})(\\d{2})(\\:)", "-$2 $3:"]
           - name: dateparse
-            args: "2006.01.02 15:04:05"
+            args: "2006-01-02 15:04"
       downloadvolumefactor:
         text: "0"
       uploadvolumefactor:
         case:
-          img[src^="pic/4x.gif"]: "4"
-          img[src^="pic/3x.gif"]: "3"
-          img[src^="pic/2x.gif"]: "2"
-          "*": "1"
+          a[href^="?doubleup=four"]: "4"
+          a[href^="?doubleup=three"]: "3"
+          a[href^="?doubleup=two"]: "2"
+          "*" : "1"
       description:
-        selector: td.maintd
-        remove: div.tortitle, div.markcont, div.tablebuttons, div.tablebigbuttons
+        selector: div.contenttext
+        remove: div.contenttitle

src/Jackett.Common/Definitions/itorrent.yml

@@ -0,0 +1,80 @@
+---
+  site: itorrent
+  name: iTorrent
+  description: "iTorrent is a Public HUNGARIAN site"
+  language: hu
+  type: public
+  encoding: UTF-8
+  links:
+    - https://itorrent.ws/
+
+  caps:
+    categories:
+      "Apps": PC
+      "book": Books
+      "Games": PC/Games
+      "Movies": Movies
+      "Music": Audio
+      "XXX": XXX
+      "TV": TV
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings: []
+
+  download:
+    selector: a[href^="/torrentfiles/"]
+
+  search:
+    paths:
+      - path: "torrentek/title/{{ .Keywords}}/"
+    rows:
+      selector: tr.gradeX
+      filters:
+        - name: andmatch
+    fields:
+      category:
+        selector: td:nth-child(1) i
+        attribute: class
+        filters:
+        # patch. books are "fa fa-book" while all the other categories are "ico-list-*"
+          - name: replace
+            args: [" ", "-"]
+          - name: split
+            args: ["-", 2]
+      title:
+        selector: td:nth-child(2) a
+      details:
+        selector: td:nth-child(2) a
+        attribute: href
+      download:
+        selector: td:nth-child(2) a
+        attribute: href
+      date:
+        selector: td:nth-child(4) span
+        optional: true
+        attribute: title
+        filters:
+          - name: dateparse
+            args: "2006.01.02 15:04"
+      date:
+        selector: td:nth-child(4):not(span)
+        optional: true
+        filters:
+          - name: dateparse
+            args: "2006.01.02"
+      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:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"

src/Jackett.Common/Definitions/jpopsuki.yml

@@ -26,6 +26,7 @@
     modes:
       search: [q]
       tv-search: [q, season, ep]
+      music-search: [q, album, artist, label, year]
 
   login:
     path: login.php
@@ -49,7 +50,7 @@
       - path: torrents.php
     inputs:
       $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
-      searchstr: "{{ .Query.Keywords }}"
+      searchstr: "{{if .Query.Artist}}{{ .Query.Artist }}{{else}}{{ .Keywords }}{{end}}"
       order_by: time
       order_way: desc
       action: basic

src/Jackett.Common/Definitions/kikibt.yml

@@ -7,8 +7,11 @@
   encoding: UTF-8
   followredirect: true
   links:
-    -  https://kikibt.cc/
+    -  https://kikibt.pw/
+  legacylinks:
     -  https://kikibt.me/
+    -  http://kikibt.pw/
+    -  https://kikibt.cc/
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/kinozal.yml

@@ -173,6 +173,8 @@
             args: ["Кураж-Бамбей", "kurazh"]
           - name: replace
             args: ["Кубик в Кубе", "Kubik"]
+          - name: replace
+            args: ["Кравец", "Kravec"]
           - name: re_replace
             args: ["\\((\\d+)\\s+[Сс]езон:\\s+(?:(\\d+-*\\d*)\\s+[Сс]ери[ия]\\s+.*\\d+)\\)(.*)\\s([12][0-9]{3})\\s(.*)", "$3 - S$1E$2 - rus $5"]
           - name: re_replace

src/Jackett.Common/Definitions/lesaloon.yml

@@ -86,6 +86,10 @@
     inputs:
       uid: "{{ .Config.username }}"
       pwd: "{{ .Config.password }}"
+    captcha:
+      type: image
+      selector: img[src^="access_code/"]
+      input: private_key
     error:
       - selector: tr td span[style="color:#FF0000;"]
     test:

src/Jackett.Common/Definitions/limetorrents.yml

@@ -41,7 +41,7 @@
 
   search:
     paths:
-      - path: "{{if .Keywords}}search/all/{{ .Keywords}}/{{else}}/index.php?page=latest100{{end}}"
+      - path: "{{if .Keywords}}search/all/{{ .Keywords}}/date/1/{{else}}/index.php?page=latest100{{end}}"
     keywordsfilters:
       - name: re_replace
         args: ["S[0-9]{2}([^E]|$)", ""] #remove season tag without episode

src/Jackett.Common/Definitions/losslessclub.yml

@@ -14,7 +14,7 @@
 
     modes:
       search: [q]
-      tv-search: [q, season, ep]
+      music-search: [q, album, artist, label, year]
 
   login:
     path: takelogin.php
@@ -32,7 +32,7 @@
     paths:
       - path: browse.php
     inputs:
-      search: "{{ .Query.Keywords }}"
+      search: "{{if .Query.Artist}}{{ .Query.Artist }}{{else}}{{ .Keywords }}{{end}}"
       t: "all"
     rows:
       selector: div#releases-table > table > tbody > tr:has(a.browselink)

src/Jackett.Common/Definitions/mactorrents.yml

@@ -29,11 +29,11 @@
       title:
         selector: div.blog-content h3 a
       category:
-        selector: a[href*="/category/"]
+        selector: a[href*="/mac-os-"]
         attribute: href
         filters:
           - name: split
-            args: ["/", 4]
+            args: ["/", 3]
       details:
         selector: div.blog-content h3 a
         attribute: href
@@ -44,7 +44,7 @@
         selector: div.blog-media p a img
         attribute: data-src
       date:
-        selector: div.blog-content div.entry-meta time
+        selector: time
         attribute: datetime
         filters:
           - name: replace

src/Jackett.Common/Definitions/magnetdl.yml

@@ -39,33 +39,34 @@
     paths:
       # return movie results if there are no search parms supplied (for use with the TEST button)
       # http://www.magnetdl.com/m/midnight-texas-s01e10/
-      # using "invalid-cat" in the default case (empty keywords) causes no category limitation
-      - path: "{{if .Keywords}}{{ re_replace .Keywords \"(.).*\" \"$1\" }}/{{ .Keywords }}/{{else}}download/invalid-cat/{{end}}"     
+      - path: "{{if .Keywords}}{{ re_replace .Keywords \"(.).*\" \"$1\" }}/{{ .Keywords }}/{{else}}download/movies/{{end}}"     
     rows:
-      selector: tr:has(td[class="m"])
+      selector: tr:has(td.m)
     fields:
       title:
-        selector: td[class="n"] a
+        selector: td.n a
         attribute: title
       category:
         optional: true
         selector:  td[class^="t"]
       details:
-        selector: td[class="n"] a
+        selector: td.n a
         attribute: href
       magnet:
-        selector: td[class="m"] a
+        selector: td.m a
         attribute: href
       date:
         selector: td:nth-child(3)
         filters:
           - name: timeago
+      files:
+        selector: td:nth-child(5)
       size:
         selector: td:nth-child(6)
       seeders:
-        selector: td[class="s"]
-      files:
-        selector: td[class="l"]
+        selector: td.s
+      leechers:
+        selector: td.l
       downloadvolumefactor:
         text: "0"
       uploadvolumefactor:

src/Jackett.Common/Definitions/megabliz.yml

@@ -1,9 +1,9 @@
 ---
   site: megabliz
   name: Mega-Bliz
-  description: "Mega-Bliz is a Semi-Private site for MOVIES / TV / GENERAL"
+  description: "Mega-Bliz is a Private site for MOVIES / TV / GENERAL"
   language: en-us
-  type: semi-private
+  type: private
   encoding: UTF-8
   links:
     - https://mega-bliz.nl/

src/Jackett.Common/Definitions/monova.yml

@@ -34,9 +34,15 @@
     paths:
       # https://monova.to/search?term=vikings+s05e05
       # https://monova.to/video
-      - path: "{{if .Keywords}}search?term={{.Keywords}}{{else}}video{{end}}"
+      # https://monova.org/video?page=2
+      - path: "{{if .Keywords}}search?term={{.Keywords}}?page=1{{else}}video?page=1{{end}}"
+      - path: "{{if .Keywords}}search?term={{.Keywords}}?page=2{{else}}video?page=2{{end}}"
+      - path: "{{if .Keywords}}search?term={{.Keywords}}?page=3{{else}}video?page=3{{end}}"
+      - path: "{{if .Keywords}}search?term={{.Keywords}}?page=4{{else}}video?page=4{{end}}"
+      - path: "{{if .Keywords}}search?term={{.Keywords}}?page=5{{else}}video?page=5{{end}}"
     rows:
-      selector: tr.desktop:not(tr.success)
+      #selector: tr.desktop:not(tr.success)
+      selector: tr.desktop
       filters:
         - name: andmatch
     fields:
@@ -56,7 +62,11 @@
         selector: td.torrent_name a
         attribute: href
       size:
+        optional: true
         selector: td.center-align
+        filters:
+          - name: replace
+            args: ["N/A","500 MB"]
       seeders:
         text: "1"
       leechers:
@@ -66,9 +76,14 @@
       uploadvolumefactor:
         text: "1"
       date:
+        optional: true
         selector: td.torrent_name
         remove: a
         filters:
           - name: replace
             args: ["added ",""]
+          - name: replace
+            args: [" ago.*$",""]
+          - name: replace
+            args: ["min.","minutes"]
           - name: timeago

src/Jackett.Common/Definitions/movcr.yml

@@ -0,0 +1,69 @@
+---
+  site: movcr
+  name: MovCr
+  description: "MovCr is an Indian Public torrent site"
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    - https://movcr.tv/
+
+  caps:
+    categories:
+      "other": Other
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings: []
+
+  download:
+    selector: a[href^="/torrents/"]
+
+  search:
+    paths:
+      - path: "{{if .Keywords}}search/search.php?q={{ .Keywords}}{{else}}/{{end}}"
+    rows:
+      selector: tr:has(td.name a[href^="/download-"])
+      filters:
+        - name: andmatch
+    fields:
+      category:
+        text: other
+      title:
+        selector: td.name a:nth-child(2)
+      details:
+        selector: td.name a
+        attribute: href
+      download:
+        selector: td.name a
+        attribute: href
+      date:
+        selector: td.seeds:contains("-")
+        optional: true
+        filters:
+          - name: dateparse
+            args: "2006-01-02"
+      date:
+        selector: td.seeds:not(:contains("-"))
+        optional: true
+        filters:
+          - name: timeago
+      size:
+        selector: td.leeches
+      seeders:
+        selector: td:nth-child(2)
+        filters:
+          - name: split
+            args: ["/", 0]
+      leechers:
+        selector: td:nth-child(2)
+        filters:
+          - name: split
+            args: ["/", 1]
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"

src/Jackett.Common/Definitions/nbtorrents.yml

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

src/Jackett.Common/Definitions/nethd.yml

@@ -39,9 +39,8 @@
   search:
     paths:
       - path: torrents.php
-        method: post
     inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      $raw: "{{range .Categories}}cat={{.}}&{{end}}"
       search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
       search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
       search_mode: 0
@@ -54,7 +53,7 @@
         - name: andmatch
     fields:
       title:
-        selector: td.name > div > a.poster-preview[title]
+        selector: td.name > div > a[href*="-torrent-"][title]
         attribute: title
       category:
         selector: td.category > a
@@ -63,35 +62,39 @@
           - name: querystring
             args: cat
       details:
-        selector: td.name > div > a.poster-preview[title]
+        selector: td.name > div > a[href*="-torrent-"][title]
         attribute: href
+      banner:
+        selector: td.name > a.poster-preview img
+        attribute: src
       comments:
         selector: a[href*="#comments"]
         attribute: href
       download:
-        selector: a.bookmark[onclick]
-        attribute: onclick
+        selector: td.name > div > a[href*="-torrent-"][title]
+        attribute: href
         filters:
-          - name: replace
-            args: [",false)", ""]
-          - name: replace
-            args: ["return bookmark(", "download.php?id="]
-      size:
-        selector: td:nth-child(5)
-      seeders:
-        selector: td:nth-child(6)
-      leechers:
-        selector: td:nth-child(7)
-      grabs:
-        selector: td:nth-child(8)
+          - name: regexp
+            args: "-torrent-(\\d+).html"
+          - name: prepend
+            args: "download.php?id="
       date:
-        selector: td:nth-child(4)
+        selector: td:nth-child(5)
         filters:
           - name: timeago
+      size:
+        selector: td:nth-child(6)
+      seeders:
+        selector: td:nth-child(7)
+      leechers:
+        selector: td:nth-child(8)
+      grabs:
+        selector: td:nth-child(9)
       downloadvolumefactor:
         case:
           "span.label:contains(\"Free\")": "0"
           "span.label:contains(\"50%\")": "0.5"
+          "span.label:contains(\"30%\")": "0.7"
           "*": "1"
       uploadvolumefactor:
         case:

src/Jackett.Common/Definitions/nnm-club.yml

@@ -6,12 +6,10 @@
   type: semi-private
   encoding: windows-1251
   links:
-    - https://nnm-club.me/
+    - http://nnmclub.to/
   legacylinks:
     - https://nnm-club.name/
-  certificates:
-    - 7877113458e90f3643dd28424657a29469f5dc55
-    - 0edfdcc8cf9f69dbe5473878145cae92504275b0
+    - https://nnm-club.me/
 
   settings:
     - name: username

src/Jackett.Common/Definitions/nyaasi.yml

@@ -7,8 +7,6 @@
   encoding: UTF-8
   links:
     - https://nyaa.si/
-  certificates:
-    - 3801e330482d4f9baef71ca4e33ba23ede74f59c # incomplete CA chain
     
   settings:
     - name: filter-id

src/Jackett.Common/Definitions/ourbits.yml

@@ -10,23 +10,17 @@
 
   caps:
     categorymappings:
-      - {id: 401, cat: Movies/BluRay, desc: "Movies Blu-ray"}
-      - {id: 402, cat: Movies/HD, desc: "Movies REMUX"}
-      - {id: 419, cat: Movies/HD, desc: "Movies 1080p"}
-      - {id: 404, cat: Movies/HD, desc: "Movies 720p"}
-      - {id: 405, cat: Movies/3D, desc: "Movies 3D"}
-      - {id: 406, cat: Movies/DVD, desc: "Movies DVD"}
-      - {id: 407, cat: Movies/WEBDL, desc: "Movies WEB-DL"}
-      - {id: 408, cat: Movies/SD, desc: "Movies HDTV"}
-      - {id: 409, cat: Movies/Other, desc: "Movies iPad"}
+      - {id: 401, cat: Movies, desc: "Movies"}
+      - {id: 402, cat: Movies/3D, desc: "Movies 3D"}
+      - {id: 405, cat: TV, desc: "TV Packs"}
       - {id: 410, cat: TV/Documentary, desc: "Documentaries"}
       - {id: 411, cat: TV/Anime, desc: "Animations"}
-      - {id: 412, cat: TV, desc: "TV Series"}
+      - {id: 412, cat: TV, desc: "TV Episodes"}
       - {id: 413, cat: TV, desc: "TV Shows"}
       - {id: 414, cat: Audio/Video, desc: "Music Videos"}
       - {id: 415, cat: TV/Sport, desc: "Sports"}
       - {id: 416, cat: Audio, desc: "Music"}
-      - {id: 420, cat: Other, desc: "Other"}
+      - {id: 419, cat: TV, desc: "Concert"}
 
     modes:
       search: [q]
@@ -41,8 +35,20 @@
       password: "{{ .Config.password }}"
     error:
       - selector: td.embedded:has(h2:contains("登录失败"))
+        message:
+          selector: td.text
     test:
       path: torrents.php
+      selector: a[href="logout.php"]
+
+  ratio:
+    path: torrents.php
+    selector: span.medium:has(a[href="logout.php"])
+    filters:
+      - name: replace
+        args: ["分享率：", "Ratio: "] # for simplified chinese language setting
+      - name: regexp
+        args: "Ratio: (\\d+)"
 
   search:
     paths:
@@ -51,8 +57,14 @@
     inputs:
       $raw: "{{range .Categories}}cat{{.}}=1&{{end}}"
       search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-      incldead: "1"
+      # 0=including dead 1=active 2=dead
+      incldead: 0
+      # show promotions: 0=all 1=normal 2=free 3=2x 4=2xFree 5=50% 6=2x50% 7=30%
+      spstate: 0
+      # 0=title 1=descr 3=uploader 4=imdb URL
       search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
+      # 0=AND 1=OR 2=Exact
+      search_mode: 0
     rows:
       selector: table.torrents > tbody > tr:has(table.torrentname)
     fields:
@@ -74,26 +86,22 @@
       download:
         selector: a[href^="download.php?id="]
         attribute: href
-      imdb:
-        optional: true
-        selector: div.imdb_100 > a
-        attribute: href
-      size:
-        selector: td:nth-child(5)
-      grabs:
-        selector: td:nth-child(8)
-      seeders:
-        selector: td:nth-child(6)
-      leechers:
-        selector: td:nth-child(7)
       date:
-        selector: td:nth-child(4) > span[title]
+        selector: td.rowfollow:nth-child(4) > span[title]
         attribute: title
         filters:
           - name: append
             args: " +08:00"
           - name: dateparse
             args: "2006-01-02 15:04:05 -07:00"
+      size:
+        selector: td.rowfollow:nth-child(5)
+      seeders:
+        selector: td.rowfollow:nth-child(6)
+      leechers:
+        selector: td.rowfollow:nth-child(7)
+      grabs:
+        selector: td.rowfollow:nth-child(8)
       downloadvolumefactor:
         case:
           img.pro_free: "0"
@@ -109,5 +117,6 @@
           img.pro_2up: "2"
           "*": "1"
       description:
-        selector: td:nth-child(2)
+        selector: td.rowfollow:nth-child(2)
         remove: a, img
+# NexusPHP Standard v1.5 Beta 4

src/Jackett.Common/Definitions/oxtorrent.yml

@@ -0,0 +1,86 @@
+---
+  site: oxtorrent
+  name: OxTorrent
+  description: "OxTorrent is a French Public site for TV / MOVIES / GENERAL"
+  language: fr-fr
+  type: public
+  encoding: UTF-8
+  followredirect: true
+  links:
+    - https://wwv.oxtorrent.com/
+
+  caps:
+    categorymappings:
+      - {id: movies, cat: Movies, desc: "Movies"}
+      - {id: tvshows, cat: TV, desc: "TV Shows"}
+      - {id: softwares, cat: PC, desc: "Softwares"}
+      - {id: music, cat: Audio, desc: "Music"}
+      - {id: console-games, cat: Console, desc: "Console Games"}
+      - {id: pc-games, cat: PC/Games, desc: "PC Games"}
+      - {id: books, cat: Books, desc: "Books"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings: []
+
+  download:
+    selector: a[href^="/download/"]
+
+  search:
+    paths:
+      - path: "{{if .Keywords}}recherche/{{.Keywords}}{{else}}{{end}}"
+    rows:
+      selector: div.listing-torrent > table > tbody > tr:has(a)
+    fields:
+      site_date:
+        selector: td:nth-child(1) a
+        filters:
+          # date is at the end of the title, so we get it and name it site_date
+          - name: regexp
+            args: "(\\w+)$"
+      title:
+        selector: td:nth-child(1) a
+        filters:
+          # now we put the date at the right place according scene naming rules using .Result.site_date
+          - name: replace
+            args: [" FRENCH", " {{ .Result.site_date }} FRENCH"]
+          - name: replace
+            args: ["MULTI", "{{ .Result.site_date }} MULTI"]
+          - name: replace
+            args: ["TRUEFRENCH", "{{ .Result.site_date }} TRUEFRENCH"]
+          - name: replace
+            args: ["VOSTFR", "{{ .Result.site_date }} VOSTFR"]
+          # and we delete it at the end
+          - name: re_replace
+            args: ["(\\w+)$", ""]
+      details:
+        selector: td:nth-child(1) a
+        attribute: href
+      download:
+        selector: td:nth-child(1) a
+        attribute: href
+      size:
+        selector: td:nth-child(2)
+      seeders:
+        selector: td:nth-child(3)
+      leechers:
+        selector: td:nth-child(4)
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"
+      category:
+        selector: td:nth-child(1) > i
+        case:
+          .Films: "movies"
+          .Séries: "tvshows"
+          .Logiciels: "softwares"
+          .Musique: "music"
+          .Jeux-Consoles: "console-games"
+          .Jeux-PC: "pc-games"
+          .Ebook: "books"
+      date:
+        text: "now"

src/Jackett.Common/Definitions/peersfm.yml

@@ -0,0 +1,126 @@
+---
+  site: peersfm
+  name: Peers.FM
+  description: "Peers.FM is a RUSSIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+  language: ru-ru
+  type: private
+  encoding: windows-1251
+  links:
+    - https://peers.fm/
+
+  caps:
+    categorymappings:
+      - {id: 18, cat: TV/Anime, desc: "Anime"}
+      - {id: 17, cat: PC, desc: "Database"}
+      - {id: 25, cat: TV, desc: "EDU"}
+      - {id: 14, cat: Movies/HD, desc: "HD Видео"}
+      - {id: 7, cat: Other, desc: "Images"}
+      - {id: 15, cat: PC/Mac, desc: "Mac"}
+      - {id: 26, cat: PC/Phone-Other, desc: "Mobile"}
+      - {id: 24, cat: TV, desc: "TV Show"}
+      - {id: 1, cat: PC, desc: "WaReZ"}
+      - {id: 10, cat: XXX, desc: "XXX"}
+      - {id: 9, cat: Audio/Audiobook, desc: "Аудиокниги"}
+      - {id: 3, cat: PC/Games, desc: "Игры/GameZ"}
+      - {id: 2, cat: Audio/Video, desc: "Клипы/Концерты"}
+      - {id: 8, cat: Books/Magazines, desc: "Книги/Журналы"}
+      - {id: 20, cat: Audio/Lossless, desc: "Музыка/Lossless"}
+      - {id: 11, cat: Audio/Mp3, desc: "Музыка/Mp3"}
+      - {id: 13, cat: TV, desc: "Мультфильмы"}
+      - {id: 12, cat: Other, desc: "Разное/Miscellaneous"}
+      - {id: 4, cat: Movies/DVD, desc: "Фильмы DVD"}
+      - {id: 6, cat: Movies, desc: "Фильмы MPEG4"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      SSL: 1
+    error:
+      - selector: table[width="400"] tr td
+    test:
+      path: browse.php
+      selector: a[href="/logout.php"]
+
+  search:
+    paths:
+      - path: browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      # 0=active 1=incl dead 2=only dead 3=FREE
+      incldead: 1
+    rows:
+      selector: table[width="940px"] > tbody > tr:has(a[href^="details.php?id="])
+    fields:
+      title:
+        selector: a[href^="details.php?id="]
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      download:
+        selector: a[href^="download.php/"]
+        attribute: href
+      grabs:
+        selector: a[href^="download.php/"]
+        filters:
+          - name: regexp
+            args: (\d+)
+      size:
+        selector: td:nth-child(6)
+      date:
+        selector: td:nth-child(5)
+        filters:
+            # replace month abbreviations
+          - name: replace
+            args: ["янв", "Jan"]
+          - name: replace
+            args: ["фев", "Feb"]
+          - name: replace
+            args: ["мар", "Mar"]
+          - name: replace
+            args: ["апр", "Apr"]
+          - name: replace
+            args: ["май", "May"]
+          - name: replace
+            args: ["июн", "Jun"]
+          - name: replace
+            args: ["июл", "Jul"]
+          - name: replace
+            args: ["авг", "Aug"]
+          - name: replace
+            args: ["сен", "Sep"]
+          - name: replace
+            args: ["окт", "Oct"]
+          - name: replace
+            args: ["ноя", "Nov"]
+          - name: replace
+            args: ["дек", "Dec"]
+          - name: dateparse
+            args: "15:04:0502 Jan 2006"
+      seeders:
+        selector: td:nth-child(8)
+      leechers:
+        selector: td:nth-child(9)
+      downloadvolumefactor:
+        case:
+          img[src="pic/free_100.png"]: "0"
+          img[src="pic/free_75.png"]: "0.25"
+          img[src="pic/free_50.png"]: "0.5"
+          img[src="pic/free_25.png"]: "0.75"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett.Common/Definitions/pleasuredome.yml

@@ -92,12 +92,12 @@
       selector: table[width="100%"] > tbody tr:has(a[href^="download.php?id="])
     fields:
       title:
-        selector: td:nth-child(2) a
+        selector: a[href^="javascript:popdetails"]
         filters:
           - name: replace
             args: ["[FREE] ", ""]
       details:
-        selector: td:nth-child(2) a
+        selector: a[href^="javascript:popdetails"]
         attribute: href
         filters:
           - name: replace
@@ -105,29 +105,28 @@
           - name: replace
             args: [");'", ""]
       category:
-        selector: td:nth-child(1) a
+        selector: a[href^="torrents.php?category="]
         attribute: href
         filters:
           - name: querystring
             args: category
       download:
-        optional: true
-        selector: td:nth-child(4) a
+        selector: a[href^="download.php?id="]
         attribute: href
       date:
           # 19/01/2019
-        selector: td:nth-child(5)
+        selector: td:nth-last-child(9)
         filters:
           - name: dateparse
             args: "02/01/2006"
       size:
-        selector: td:nth-child(6)
+        selector: td:nth-last-child(8)
       seeders:
-        selector: td:nth-child(8)
+        selector: td:nth-last-child(6)
       leechers:
-        selector: td:nth-child(9) a
+        selector: td:nth-last-child(5)
       grabs:
-        selector: td:nth-child(10)
+        selector: td:nth-last-child(4)
       downloadvolumefactor:
         case:
           "img[src=\"images/fdownload.gif\"]": "0"

src/Jackett.Common/Definitions/proaudiotorrents.yml

@@ -6,6 +6,8 @@
   type: private
   encoding: UTF-8
   links:
+    - https://proaudiotorrents.org/
+  legacylinks:
     - http://proaudiotorrents.org/
 
   caps:
@@ -36,21 +38,18 @@
     modes:
       search: [q]
 
-  settings:
-    - name: cookie
-      type: text
-      label: Cookie
-    - name: info
-      type: info
-      label: How to get the Cookie
-      default: "<p>This site requires you to solve a ReCaptcha. It's no longer possible to solve the captcha in Jackett. Please enter the cookie for the site manually.</p><ol><li>Login to this tracker in 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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
-        
   login:
-    method: cookie
+    path: login.php
+    method: form
+    form: form[action="takelogin.php"]
+    submitpath: takelogin.php
     inputs:
-      cookie: "{{.Config.cookie}}"
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: table tr td.text
     test:
-      path: index.php
+      path: my.php
 
   search:
     paths:

src/Jackett.Common/Definitions/puntotorrent.yml

@@ -12,55 +12,55 @@
     categorymappings:
       - {id: 17, cat: Movies/Other, desc: "VCD/SVCD - SVCD/VCD"}
       - {id: 78, cat: Movies/Other, desc: "VCD/SVCD - Estrenos VCD/SVCD"}
-      - {id: 14, cat: Movies/SD, desc: "XVID - Series"}
-      - {id: 45, cat: Movies/SD, desc: "XVID - Animación"}
-      - {id: 46, cat: Movies/SD, desc: "XVID - Deportes"}
-      - {id: 47, cat: Movies/SD, desc: "XVID - Documentales"}
+      - {id: 14, cat: TV/SD, desc: "XVID - Series"}
+      - {id: 45, cat: TV/Anime, desc: "XVID - Animación"}
+      - {id: 46, cat: TV/Sport, desc: "XVID - Deportes"}
+      - {id: 47, cat: TV/Documentary, desc: "XVID - Documentales"}
       - {id: 33, cat: Movies/SD, desc: "XVID - Estrenos"}
       - {id: 48, cat: Movies/SD, desc: "XVID - Películas"}
       - {id: 114, cat: Movies/SD, desc: "XVID - Estrenos BajaCalidad"}
-      - {id: 12, cat: Movies/SD, desc: "XVID - Adulto (+18)"}
-      - {id: 51, cat: Movies/SD, desc: "XVID - Música"}
-      - {id: 37, cat: Movies/DVD, desc: "DVD - Animación"}
-      - {id: 38, cat: Movies/DVD, desc: "DVD - Deportes"}
-      - {id: 39, cat: Movies/DVD, desc: "DVD - Documentales"}
+      - {id: 12, cat: XXX/XviD, desc: "XVID - Adulto (+18)"}
+      - {id: 51, cat: Audio/Video, desc: "XVID - Música"}
+      - {id: 37, cat: TV/Anime, desc: "DVD - Animación"}
+      - {id: 38, cat: TV/Sport, desc: "DVD - Deportes"}
+      - {id: 39, cat: TV/Documentary, desc: "DVD - Documentales"}
       - {id: 40, cat: Movies/DVD, desc: "DVD - Películas"}
-      - {id: 41, cat: Movies/DVD, desc: "DVD - Series"}
-      - {id: 42, cat: Movies/DVD, desc: "DVD - Adulto (+18)"}
-      - {id: 43, cat: Movies/DVD, desc: "DVD - Música"}
-      - {id: 106, cat: Movies/HD, desc: "HDRip - Animación"}
-      - {id: 107, cat: Movies/HD, desc: "HDRip - Deportes"}
-      - {id: 108, cat: Movies/HD, desc: "HDRip - Documentales"}
+      - {id: 41, cat: TV/SD, desc: "DVD - Series"}
+      - {id: 42, cat: XXX/DVD, desc: "DVD - Adulto (+18)"}
+      - {id: 43, cat: Audio/Video, desc: "DVD - Música"}
+      - {id: 106, cat: TV/Anime, desc: "HDRip - Animación"}
+      - {id: 107, cat: TV/Sport, desc: "HDRip - Deportes"}
+      - {id: 108, cat: TV/Documentary, desc: "HDRip - Documentales"}
       - {id: 109, cat: Movies/HD, desc: "HDRip - Películas"}
-      - {id: 110, cat: Movies/HD, desc: "HDRip - Series"}
-      - {id: 112, cat: Movies/HD, desc: "HDRip - Adulto (+18)"}
-      - {id: 111, cat: Movies/HD, desc: "HDRip - Música"}
-      - {id: 117, cat: Movies/3D, desc: "3D - Animación"}
-      - {id: 118, cat: Movies/3D, desc: "3D - Deportes"}
-      - {id: 119, cat: Movies/3D, desc: "3D - Documentales"}
+      - {id: 110, cat: TV/HD, desc: "HDRip - Series"}
+      - {id: 112, cat: XXX/x264, desc: "HDRip - Adulto (+18)"}
+      - {id: 111, cat: Audio/Video, desc: "HDRip - Música"}
+      - {id: 117, cat: TV/Anime, desc: "3D - Animación"}
+      - {id: 118, cat: TV/Sport, desc: "3D - Deportes"}
+      - {id: 119, cat: TV/Documentary, desc: "3D - Documentales"}
       - {id: 120, cat: Movies/3D, desc: "3D - Películas"}
-      - {id: 121, cat: Movies/3D, desc: "3D - Adulto (+18)"}
-      - {id: 126, cat: Movies/HD, desc: "Micro HD - Animación"}
-      - {id: 127, cat: Movies/HD, desc: "Micro HD - Deportes"}
-      - {id: 128, cat: Movies/HD, desc: "Micro HD - Documentales"}
+      - {id: 121, cat: XXX, desc: "3D - Adulto (+18)"}
+      - {id: 126, cat: TV/Anime, desc: "Micro HD - Animación"}
+      - {id: 127, cat: TV/Sport, desc: "Micro HD - Deportes"}
+      - {id: 128, cat: TV/Documentary, desc: "Micro HD - Documentales"}
       - {id: 57, cat: Movies/HD, desc: "Micro HD - Películas"}
-      - {id: 124, cat: Movies/HD, desc: "Micro HD - Series"}
-      - {id: 129, cat: Movies/HD, desc: "Micro HD - Adulto"}
-      - {id: 130, cat: Movies/HD, desc: "Micro HD - Música"}
-      - {id: 53, cat: Movies/HD, desc: "HD - Animación"}
-      - {id: 54, cat: Movies/HD, desc: "HD - Deportes"}
-      - {id: 55, cat: Movies/HD, desc: "HD - Documentales"}
+      - {id: 124, cat: TV/HD, desc: "Micro HD - Series"}
+      - {id: 129, cat: XXX/x264, desc: "Micro HD - Adulto"}
+      - {id: 130, cat: Audio/Video, desc: "Micro HD - Música"}
+      - {id: 53, cat: TV/Anime, desc: "HD - Animación"}
+      - {id: 54, cat: TV/Sport, desc: "HD - Deportes"}
+      - {id: 55, cat: TV/Documentary, desc: "HD - Documentales"}
       - {id: 56, cat: Movies/HD, desc: "HD - BDrip/BDremux/FullBD"}
       - {id: 58, cat: Movies/HD, desc: "HD - WEB-DL/Line Dubbed"}
-      - {id: 59, cat: Movies/HD, desc: "HD - Series"}
-      - {id: 63, cat: Movies/HD, desc: "HD - Adulto (+18)"}
-      - {id: 61, cat: Movies/HD, desc: "HD - Música"}
-      - {id: 136, cat: Movies/UHD, desc: "UHD - Animación"}
-      - {id: 137, cat: Movies/UHD, desc: "UHD - Deportes"}
-      - {id: 138, cat: Movies/UHD, desc: "UHD - Documentales"}
+      - {id: 59, cat: TV/HD, desc: "HD - Series"}
+      - {id: 63, cat: XXX/x264, desc: "HD - Adulto (+18)"}
+      - {id: 61, cat: Audio/Video, desc: "HD - Música"}
+      - {id: 136, cat: TV/Anime, desc: "UHD - Animación"}
+      - {id: 137, cat: TV/Sport, desc: "UHD - Deportes"}
+      - {id: 138, cat: TV/Documentary, desc: "UHD - Documentales"}
       - {id: 139, cat: Movies/UHD, desc: "UHD - Películas"}
-      - {id: 140, cat: Movies/UHD, desc: "UHD - Series"}
-      - {id: 141, cat: Movies/UHD, desc: "UHD - Adulto (+18)"}
+      - {id: 140, cat: TV/UHD, desc: "UHD - Series"}
+      - {id: 141, cat: XXX/x264, desc: "UHD - Adulto (+18)"}
       - {id: 69, cat: Audio/MP3, desc: "MP3"}
       - {id: 70, cat: Audio/Lossless, desc: "FLAC"}
       - {id: 71, cat: Audio/Other, desc: "Otros Formatos"}

src/Jackett.Common/Definitions/racing4everyone.yml

@@ -41,6 +41,7 @@
 
     modes:
       search: [q]
+      tv-search: [q, season, ep, imdbid]
 
   login:
     path: login
@@ -50,7 +51,9 @@
       password: "{{ .Config.password }}"
       remember: 1
     error:
-      - selector: form[action$="/login"] .text-red
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
     test:
       path: torrents
       selector: a[href$="/logout"]
@@ -67,10 +70,10 @@
       - path: filterTorrents
     inputs:
       $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
-      search: "{{ .Keywords }}"
+      search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
       description: ""
       uploader: ""
-      imdb: ""
+      imdb: "{{ .Query.IMDBIDShort }}"
       tvdb: ""
       tmdb: ""
       sort: created_at
@@ -93,14 +96,21 @@
       details:
         selector: a.view-torrent
         attribute: href
+      banner:
+        optional: true
+        selector: div.torrent-poster img
+        attribute: src
+        filters:
+          - name: replace
+            args: ["https://via.placeholder.com/600x900", ""]
       size:
-        selector: td:nth-child(5)
+        selector: td:nth-last-child(4)
       seeders:
-        selector: td:nth-child(7)
+        selector: td:nth-last-child(3)
       leechers:
-        selector: td:nth-child(8)
+        selector: td:nth-last-child(2)
       grabs:
-        selector: td:nth-child(6)
+        selector: td:nth-last-child(1)
         filters:
           - name: regexp
             args: ([\d\.]+)
@@ -132,12 +142,17 @@
             args: [" (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
       downloadvolumefactor:
         case:
-          "i[data-original-title=\"100% Free\"]": "0" # Single Torrent Freeleech
+          "i[data-original-title=\"Personal Freeleech\"]": "0" # 24 Hour FreeLeech From BON Store
+          "i[data-original-title=\"Special Freeleech\"]": "0" # Special FreeLeech For Certain User Groups
+          "i[data-original-title=\"Freeleech Token\"]": "0" # Freeleech From Token
           "i[data-original-title=\"Global FreeLeech\"]": "0" # Global Freeleech
+          "i[data-original-title=\"Freeleech\"]": "0" # Freeleech
+          "i[data-original-title=\"Featured\"]": "0" # Featured Torrent
           "*": "1"
       uploadvolumefactor:
         case:
-          "i[data-original-title=\"Double upload\"]": "2" # Single Torrent Double Upload
-          "i[data-original-title=\"Double Upload\"]": "2" # Global Double Upload
+          "i[data-original-title=\"Double Upload\"]": "2" # Single Torrent Double Upload
+          "i[data-original-title=\"Global Double Upload\"]": "2" # Global Double Upload
+          "i[data-original-title=\"Featured\"]": "2" # Featured Torrent
           "*": "1"
-# UNIT3D
+# UNIT3D 1.9.2

src/Jackett.Common/Definitions/rockbox.yml

@@ -38,7 +38,7 @@
     inputs:
       search: "{{if .Query.Artist}}{{ .Query.Artist }}{{else}}{{ .Keywords }}{{end}}"
     rows:
-      selector: body:nth-child(2) tbody tr td:nth-child(2) table.lista tbody tr:nth-child(2) table.lista tbody tr:has(a[href^="download.php?id="])
+      selector: table.lista[width="100%"] tbody tr:has(a[href^="download.php?id="])
     fields:
       title:
         selector: td a[href^="details.php?id="]

src/Jackett.Common/Definitions/rockethd.yml

@@ -1,19 +1,18 @@
 ---
-  site: sharingue
-  name: Sharingue
-  description: "Sharingue is a BRAZILIAN Private Tracker for TV / MOVIES / ANIME / MUSIC"
-  language: pt-br
+  site: rockethd
+  name: RocketHD
+  description: "RocketHD is a GERMAN Private Tracker for MOVIES / TV"
+  language: de-de
   type: private
   encoding: UTF-8
   links:
-    - https://www.sharingue.live/
+    - https://rocket-hd.me/
 
   caps:
     categorymappings:
-      - {id: 1, cat: Movies, desc: "Movies (Filmes)"}
-      - {id: 3, cat: Audio, desc: "Music (Músicas)"}
-      - {id: 4, cat: TV, desc: "TV (Séries)"}
-      - {id: 5, cat: TV/Anime, desc: "Anime (Animes)"}
+      - {id: 1, cat: Movies, desc: "Movies"}
+      - {id: 2, cat: TV, desc: "TV"}
+      - {id: 3, cat: Movies, desc: "Collection"}
 
     modes:
       search: [q]
@@ -27,19 +26,17 @@
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
       remember: 1
-    selectorinputs:
-      _token:
-        selector: meta[name="csrf-token"]
-        attribute: content
     error:
-      - selector: form[action$="/login"] .text-red
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
     test:
-      path: /
+      path: torrents
       selector: a[href$="/logout"]
 
   ratio:
-    path: /
-    selector: span:has(i.fa-sync-alt)
+    path: torrents
+    selector: li:has(i.fa-sync-alt)
     filters:
       - name: regexp
         args: "Ratio : (\\d+)"
@@ -50,13 +47,14 @@
     inputs:
       $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
       search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      description: ""
       uploader: ""
       imdb: "{{ .Query.IMDBIDShort }}"
       tvdb: ""
       tmdb: ""
       mal: ""
-      sort: created_at
-      direction: desc
+      sort: "created_at"
+      direction: "desc"
       qty: 100
     rows:
       selector: table > tbody > tr
@@ -75,17 +73,28 @@
       details:
         selector: a.view-torrent
         attribute: href
+      banner:
+        optional: true
+        selector: div.torrent-poster img
+        attribute: src
+        filters:
+          - name: replace
+            args: ["https://via.placeholder.com/600x900", ""]
       size:
-        selector: td:nth-child(5)
+        selector: td:nth-last-child(4)
       seeders:
-        selector: td:nth-child(7)
+        selector: td:nth-last-child(3)
       leechers:
-        selector: td:nth-child(8)
+        selector: td:nth-last-child(2)
       grabs:
-        selector: td:nth-child(6)
+        selector: td:nth-last-child(1)
         filters:
           - name: regexp
             args: ([\d\.]+)
+      imdb:
+        optional: true
+        selector: a[href*="www.imdb.com/title/tt"]
+        attribute: href
       date:
         selector: time
         filters:
@@ -114,12 +123,17 @@
             args: [" (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
       downloadvolumefactor:
         case:
-          "i[data-original-title=\"100% Free\"]": "0" # Single Torrent Freeleech
-          "i[data-original-title=\"Global freeleech\"]": "0" # Global Freeleech
+          "i[data-original-title=\"Personal Freeleech\"]": "0" # 24 Hour FreeLeech From BON Store
+          "i[data-original-title=\"Special Freeleech\"]": "0" # Special FreeLeech For Certain User Groups
+          "i[data-original-title=\"Freeleech Token\"]": "0" # Freeleech From Token
+          "i[data-original-title=\"Global FreeLeech\"]": "0" # Global Freeleech
+          "i[data-original-title=\"Freeleech\"]": "0" # Freeleech
+          "i[data-original-title=\"Featured\"]": "0" # Featured Torrent
           "*": "1"
       uploadvolumefactor:
         case:
-          "i[data-original-title=\"Double upload\"]": "2" # Single Torrent Double Upload
-          "i[data-original-title=\"Double Upload\"]": "2" # Global Double Upload
+          "i[data-original-title=\"Double Upload\"]": "2" # Single Torrent Double Upload
+          "i[data-original-title=\"Global Double Upload\"]": "2" # Global Double Upload
+          "i[data-original-title=\"Featured\"]": "2" # Featured Torrent
           "*": "1"
-# UNIT3D
+# UNIT3D 1.9.3

src/Jackett.Common/Definitions/rptorrents.yml

@@ -0,0 +1,103 @@
+---
+  site: rptorrents
+  name: RPTorrents
+  description: "RPTorrents is a Private tracker for MOVIES / TV / GENERAL"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://rptorrents.com/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: PC/Games, desc: "Games PC"}
+      - {id: 2, cat: PC/0day, desc: "Apps Windows"}
+      - {id: 3, cat: PC/Mac, desc: "Apps  Mac"}
+      - {id: 4, cat: PC, desc: "Apps Linux"}
+      - {id: 34, cat: PC/Phone-Other, desc: "Apps Mobile"}
+      - {id: 6, cat: TV/Anime, desc: "Movie Cartoons"}
+      - {id: 7, cat: Movies/WEBDL, desc: "Movies WEB-DL"}
+      - {id: 32, cat: Movies/UHD, desc: "Movies 4k"}
+      - {id: 9, cat: Movies/HD, desc: "Movies HD"}
+      - {id: 10, cat: Movies/3D, desc: "Movies 3D"}
+      - {id: 11, cat: Movies, desc: "Movies Pack"}
+      - {id: 12, cat: Movies/BluRay, desc: "Movies Bluray"}
+      - {id: 33, cat: Movies/BluRay, desc: "Movies  Bluray - Rips"}
+      - {id: 14, cat: TV/HD, desc: "TV HD"}
+      - {id: 15, cat: TV/WEB-DL, desc: "TV WEB-DL"}
+      - {id: 16, cat: TV/SD, desc: "TV SD"}
+      - {id: 17, cat: TV, desc: "TV Pack"}
+      - {id: 18, cat: TV/Documentary, desc: "TV Documentary"}
+      - {id: 19, cat: Audio/MP3, desc: "Music MP3"}
+      - {id: 20, cat: Audio/Lossless, desc: "Music Flac"}
+      - {id: 23, cat: Audio, desc: "Music Pack"}
+      - {id: 22, cat: Audio/Video, desc: "Music Video"}
+      - {id: 35, cat: PC/Games, desc: "Games Pack"}
+      - {id: 29, cat: XXX, desc: "Movie XXX"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: account-login.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      remember: "yes"
+    error:
+      - selector: div.myFrame-caption:contains("Access Denied")
+        message:
+          selector: div.myFrame-content
+    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 }}"
+      # 0 name & desc 1 name 2 desc 3 genre
+      incldesc: 1
+    rows:
+      selector: tr.t-row
+    fields:
+      category:
+        selector: a[href^="torrents.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: title
+      details:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      size:
+        selector: td:nth-child(4)
+      date:
+        selector: td:nth-child(5)
+        filters:
+          - name: dateparse
+            args: "02.01.200615:04:05"
+      grabs:
+        selector: td:nth-child(7)
+      seeders:
+        selector: td:nth-child(8)
+      leechers:
+        selector: td:nth-child(9)
+      downloadvolumefactor:
+        case:
+          img[src="images/free.gif"]: "0"
+          img[src="images/t_extern.png"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          img[src="images/t_extern.png"]: "0"
+          "*": "1"

src/Jackett.Common/Definitions/shareisland.yml

@@ -17,16 +17,17 @@
        - {id: 21, cat: Movies/DVD, desc: "Movie DVD-9"}
        - {id: 11, cat: Movies/DVD, desc: "Movie DVD-5"}
        - {id: 20, cat: Movies/SD, desc: "Movie DVDRip"}
+       - {id: 45, cat: Movies, desc: "Movie RIP mp4"}
        - {id: 22, cat: Movies/UHD, desc: "Movie 4K-Ultra-HD"}
        - {id: 23, cat: Movies/HD, desc: "Movie H-265"}
        - {id: 24, cat: Movies/HD, desc: "Movie 1080p"}
        - {id: 25, cat: Movies/HD, desc: "Movie 720p"}
        - {id: 26, cat: Movies/3D, desc: "Movie 3D-FullHD"}
-       - {id: 27, cat: Movies/BluRay, desc: "Movie Blu Ray Disk"}
-       - {id: 43, cat: Movies/SD, desc: "BMovie DRip"}
+       - {id: 27, cat: Movies/BluRay, desc: "Movie BluRay"}
+       - {id: 43, cat: Movies/SD, desc: "Movie BDRip"}
        - {id: 29, cat: Movies/SD, desc: "Movie Cine News"}
-       - {id: 30, cat: TV/HD, desc: "Serie Tv HD"}
-       - {id: 31, cat: TV/SD, desc: "Serie Tv SD"}
+       - {id: 30, cat: TV/HD, desc: "Serie TV HD"}
+       - {id: 31, cat: TV/SD, desc: "Serie TV SD"}
        - {id: 35, cat: TV/Other, desc: "Programmi TV"}
        - {id: 42, cat: TV/Documentary, desc: "Documentari"}
       # Music
@@ -46,6 +47,7 @@
        - {id: 17, cat: Books, desc: "Edicola Riviste"}
        - {id: 41, cat: Books, desc: "Edicola Fumetti"}
       # Applicazioni
+       - {id: 4, cat: PC, desc: "IPTV"}
        - {id: 7, cat: PC/0day, desc: "Applicazioni PC"}
        - {id: 8, cat: PC/0day, desc: "Applicazioni Linux"}
        - {id: 9, cat: PC/Mac, desc: "Applicazioni Mac"}
@@ -77,8 +79,19 @@
       path: index.php
       selector: a[href="logout.php"]
 
+  # download:
+  #   before:
+  #     path: thanks.php
+  #     method: "post"
+  #     inputs:
+  #       infohash: "{{ .DownloadUri.Query.id }}"
+  #       thanks: "1"
+  #       rndval: "1487013827343"
+  #   selector: a[href^="download.php?id="]
+
   search:
     paths:
+      # 30 entries per page
       - path: index.php
         inputs:
           pages: 1
@@ -91,24 +104,6 @@
       - path: index.php
         inputs:
           pages: 4
-      - path: index.php
-        inputs:
-          pages: 5
-      - path: index.php
-        inputs:
-          pages: 6
-      - path: index.php
-        inputs:
-          pages: 7
-      - path: index.php
-        inputs:
-          pages: 8
-      - path: index.php
-        inputs:
-          pages: 9
-      - path: index.php
-        inputs:
-          pages: 10
     inputs:
       search: "{{ .Keywords }}"
       category: "{{range .Categories}}{{.}};{{end}}"
@@ -124,41 +119,16 @@
       - name: re_replace # S01E01 to 1 1
         args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "$1 $2"]
     rows:
-      selector: div.b-content > table > tbody > tr > td > table.lista > tbody > tr:has(a[href^="index.php?page=torrents&category="])
+      selector: table.lista > tbody > tr:has(a[href^="index.php?page=torrents&category="])
       filters:
         - name: andmatch
     fields:
       download:
+        # selector: a[href^="index.php?page=downloadcheck&id="]
         selector: a[href^="download.php?id="]
         attribute: href
-      title: # shortened title?
-        selector: td:nth-child(2)
-        filters:
-          - name: re_replace # replace special characters with " " (space)
-            args: ["[^a-zA-Z0-9\\s]|\\.", " "]
-          - name: re_replace # replace multiple spaces
-            args: ["[ ]{2,}", " "]
-          # normalize to SXXEYY format
-          - name: re_replace # S01 E01 to S01E01
-            args: ["(?i)\\bS(\\d+)\\sE(\\d+)\\b", "S$1E$2"]
-          - name: re_replace # 01x01 to S01E01
-            args: ["(?i)(\\d{2})x(\\d+)", "S$1E$2"]
-          - name: re_replace # 1x01 to S01E01
-            args: ["(?i)\\b(\\d{1})x(\\d+)", "S0$1E$2"]
-          - name: re_replace # Stagione X --> S0X
-            args: ["(?i)\\bStagion[ei]\\s?(\\d{1})\\b|\\bSeason'?s?\\s?(\\d{1})\\b", "S0$1$2"]
-          - name: re_replace # Stagione XX --> SXX
-            args: ["(?i)\\bStagion[ei]\\s?(\\d{2,})\\b|\\bSeason'?s?\\s?(\\d{2,})\\b", "S$1$2"]
-          - name: re_replace # Episodio 4 to E4
-            args: ["(?i)\\b(?:[\\/\\|]?Episodio\\s?(\\d+)|Puntata\\s?(\\d+))", "E$1$2"]
-          - name: re_replace # Episodi 4 5 to E04-05
-            args: ["(?i)\\b(?:Puntate\\s*)(\\d+)\\s?(\\d+)", "E0$1-0$2"]
-          - name: re_replace # rimozioni varie
-            args: ["(?i)(Serie completa|Completat?a?|in pausa)", ""]
-      title: # long titles?
-        optional: true
-        selector: td:nth-child(2)
-        attribute: title
+      title:
+        selector: a[href^="index.php?page=torrent-details&id="]
         filters:
           - name: re_replace # replace special characters with " " (space)
             args: ["[^a-zA-Z0-9\\s]|\\.", " "]
@@ -182,7 +152,7 @@
           - name: re_replace # rimozioni varie
             args: ["(?i)(Serie completa|Completat?a?|in pausa)", ""]
       category:
-        selector: td:nth-child(1) a[href^="index.php?page=torrents&category="]
+        selector: a[href^="index.php?page=torrents&category="]
         attribute: href
         filters:
           - name: querystring
@@ -198,21 +168,32 @@
           - name: regexp
             args: "src=(.+?) "
       size:
-        selector: td:nth-last-child(3)
-      date:
-        selector: td[width="85"] # some users have an extra uploader column between the grabs and size column, see #4435
-        filters:
-          - name: dateparse
-            args: "02/01/2006"
-      grabs:
-        selector: td[width="85"] + td + td + td
+        selector: td:has(a[href^="index.php?page=torrent-details&id="]) p:nth-of-type(2)
         filters:
           - name: replace
-            args: ["---", "0"]
+            args: [" \xA0 ", " "]
+          - name: regexp
+            args: "  (.*?)$"
+      date:
+        selector: td:has(a[href^="index.php?page=torrent-details&id="]) p:nth-of-type(3)
+        filters:
+          - name: replace
+            args: ["\xA0 ", " "] 
+          - name: regexp
+            args: " (.*?)$"
+          - name: dateparse
+            args: "15:04:05 02/01/2006"
       seeders:
-        selector: td[width="85"] + td
+        selector: td:has(a[href^="index.php?page=torrent-details&id="]) p:nth-of-type(4) a:nth-of-type(1)
+        filters:
       leechers:
-        selector: td[width="85"] + td + td
+        selector: td:has(a[href^="index.php?page=torrent-details&id="]) p:nth-of-type(4) a:nth-of-type(2)
+        filters:
+      grabs:
+        text: 0
+      grabs:
+        optional: true
+        selector: td:has(a[href^="index.php?page=torrent-details&id="]) p:nth-of-type(4) a:nth-of-type(3)
       downloadvolumefactor:
         case:
           img[alt="Free Leech"]: "0"

src/Jackett.Common/Definitions/sharewood.yml

@@ -53,15 +53,16 @@
       - path: filterTorrents
     inputs:
       search: "{{ .Keywords }}"
+      description: ""
       uploader: ""
-      sort: created_at
+      sorting: created_at
       direction: desc
       qty: 100
     rows:
       selector: div.table-responsive-line
     fields:
       category:
-        selector: i.torrent-icon
+        selector: img.torrent-icon
         attribute: data-original-title
       title:
         selector: a.view-torrent
@@ -80,6 +81,9 @@
         selector: div.bouton-s
       leechers:
         selector: div.bouton-l
+      grabs:
+        selector: div.bouton-c
+        
       date:
         selector: div.col-detail div.row div span
         filters:
@@ -97,8 +101,10 @@
             args: " ago"
       downloadvolumefactor:
         case:
+          "span.badge-extra:contains('Freeleech')" : "0"
           "*": "1"
       uploadvolumefactor:
         case:
+          "span.badge-extra:contains('Double Upload')" : "2"
           "*": "1"
 # UNIT3D

src/Jackett.Common/Definitions/shellife.yml

@@ -14,7 +14,7 @@
 
     modes:
       search: [q]
-      tv-search: [q, season, ep]
+      music-search: [q, album, artist, label, year]
 
   login:
     path: takelogin.php
@@ -31,7 +31,7 @@
     paths:
       - path: browse.php
     inputs:
-      search: "{{ .Query.Keywords }}"
+      search: "{{if .Query.Artist}}{{ .Query.Artist }}{{else}}{{ .Keywords }}{{end}}"
       incldead: 1
     rows:
       selector: table#ct > tbody > tr.torrent_row

src/Jackett.Common/Definitions/siambit.yml

@@ -0,0 +1,171 @@
+---
+  site: siambit
+  name: SiamBIT
+  description: "SiamBIT is a THAI Private Torrent Tracker for GENERAL"
+  language: th-th
+  type: private
+  encoding: tis-620
+  links:
+    - https://www.siambit.me/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Other, desc: "@ King"}
+      - {id: 75, cat: PC/0day, desc: "OS Windows / Office"}
+      - {id: 10, cat: TV, desc: "Cartoons / Animation"}
+      - {id: 9, cat: TV/Sport, desc: "Sports / Football"}
+      - {id: 110, cat: PC/Games, desc: "Mobile games"}
+      - {id: 7, cat: PC/Games, desc: "Games"}
+      - {id: 40, cat: Audio/Video, desc: "clips"}
+      - {id: 16, cat: Audio/Video, desc: "Concert"}
+      - {id: 3, cat: Audio/Other, desc: "Karaoke / MV"}
+      - {id: 70, cat: PC, desc: "software AntiVirus / Antispyware"}
+      - {id: 100, cat: PC/Phone-Other, desc: "software Mobile / Theme / Ringtone / mv"}
+      - {id: 85, cat: PC/Mac, desc: "Mac software"}
+      - {id: 105, cat: PC, desc: "Linux software"}
+      - {id: 8, cat: PC, desc: "software"}
+      - {id: 56, cat: Other, desc: "Dictionary / map"}
+      - {id: 19, cat: TV, desc: "Talk show / comedy / radio"}
+      - {id: 20, cat: TV, desc: "general"}
+      - {id: 55, cat: PC/Phone-IOS, desc: "Tablet / iPhone"}
+      - {id: 21, cat: TV, desc: "Dharma"}
+      - {id: 2, cat: Audio/MP3, desc: "Music"}
+      - {id: 130, cat: Audio/Audiobook, desc: "High quality music (Lossless)"}
+      - {id: 60, cat: Other, desc: "fonts / icons / clip art / templates"}
+      - {id: 90, cat: Movies/UHD, desc: "4K UHD movies"}
+      - {id: 91, cat: Movies/DVD, desc: "DVD movies"}
+      - {id: 92, cat: Movies/HD, desc: "Hi-Def movies"}
+      - {id: 89, cat: Movies/SD, desc: "VCD movies"}
+      - {id: 93, cat: TV, desc: "Mother and child @ / Learning materials for children"}
+      - {id: 4, cat: TV, desc: "TV shows / Variety / Game shows"}
+      - {id: 50, cat: Other, desc: "Images"}
+      - {id: 18, cat: Other, desc: "website"}
+      - {id: 17, cat: TV/Documentary, desc: "Documentary"}
+      - {id: 11, cat: Books/Technical, desc: "Learning materials / Books / Ebook"}
+      - {id: 5, cat: Movies, desc: "Movies / series [Korea]"}
+      - {id: 54, cat: Movies, desc: "Movies / Series [China]"}
+      - {id: 51, cat: Movies, desc: "Movie series / series [Japan]"}
+      - {id: 52, cat: Movies, desc: "Movies / Series [Western]"}
+      - {id: 57, cat: Movies, desc: "Movies / series [other]"}
+      - {id: 53, cat: Movies, desc: "Movie series / series / drama [Thai]"}
+      - {id: 901, cat: XXX, desc: "XXX-Anime"}
+      - {id: 902, cat: XXX, desc: "XXX-Game"}
+      - {id: 903, cat: XXX, desc: "XXX-Japan censored"}
+      - {id: 904, cat: XXX, desc: "XXX-Japan"}
+      - {id: 905, cat: XXX, desc: "XXX-Guava"}
+      - {id: 906, cat: XXX, desc: "XXX-Asia censored"}
+      - {id: 907, cat: XXX, desc: "XXX-Asia"}
+      - {id: 908, cat: XXX, desc: "XXX-Gay"}
+      - {id: 910, cat: XXX, desc: "XXX-clip"}
+      - {id: 911, cat: XXX, desc: "XXX-pictures"}
+      - {id: 912, cat: XXX, desc: "XXX-magazine"}      
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: td.text
+    test:
+      path: nDonated.php
+      selector: a[href="logout.php"]
+
+  download:
+    before:
+      path: ajax.php
+      method: get
+      inputs:
+        _action: "say_thank"
+        id: "{{ .DownloadUri.Query.id }}"
+    selector: a[href^="downloadnew.php?id="]
+
+  search:
+    paths:
+      - path: viewno18.php
+        categorymappings: ["!", 901, 902, 903, 904, 905, 906, 907, 908, 910, 911, 912]
+      - path: viewbr.php
+        categorymappings: [901, 902, 903, 904, 905, 906, 907, 908, 910, 911, 912]
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      searchin: 0
+    rows:
+      selector: table[width="100%"][border="1"][cellspacing="0"][cellpadding="5"] > tbody > tr:has(a[href*="hashinfo="])
+    fields:
+      title:
+        selector: a[href^="details.php?id="]
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      category:
+        selector: a[href^="viewno18.php?cat="], a[href^="viewbr.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      download:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      imdb:
+        optional: true
+        selector: a[href*="www.imdb.com/title/"]
+        attribute: href
+      files:
+        selector: td:nth-child(5)
+      date:
+        selector: td:nth-child(7)
+        filters:
+          - name: dateparse
+            args: "02-01-200615:04:05"
+      size:
+        selector: td:nth-child(8)
+      grabs:
+        selector: td:nth-child(9)
+        filters:
+          - name: regexp
+            args: (\d+)
+      seeders:
+        selector: td:nth-child(10)
+      leechers:
+        selector: td:nth-child(11)
+      downloadvolumefactor:
+        case:
+          "td:nth-child(3):contains(\"100%\")": "0"
+          "td:nth-child(3):contains(\"95%\")": "0.05"
+          "td:nth-child(3):contains(\"90%\")": "0.1"
+          "td:nth-child(3):contains(\"85%\")": "0.15"
+          "td:nth-child(3):contains(\"80%\")": "0.2"
+          "td:nth-child(3):contains(\"75%\")": "0.25"
+          "td:nth-child(3):contains(\"70%\")": "0.3"
+          "td:nth-child(3):contains(\"65%\")": "0.35"
+          "td:nth-child(3):contains(\"60%\")": "0.4"
+          "td:nth-child(3):contains(\"55%\")": "0.45"
+          "td:nth-child(3):contains(\"50%\")": "0.5"
+          "td:nth-child(3):contains(\"45%\")": "0.55"
+          "td:nth-child(3):contains(\"40%\")": "0.6"
+          "td:nth-child(3):contains(\"35%\")": "0.65"
+          "td:nth-child(3):contains(\"30%\")": "0.7"
+          "td:nth-child(3):contains(\"25%\")": "0.75"
+          "td:nth-child(3):contains(\"20%\")": "0.8"
+          "td:nth-child(3):contains(\"15%\")": "0.85"
+          "td:nth-child(3):contains(\"10%\")": "0.9"
+          "td:nth-child(3):contains(\"5%\")": "0.95"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "td:nth-child(4):contains(\"x2\")": "2"
+          "td:nth-child(4):contains(\"x3\")": "3"
+          "td:nth-child(4):contains(\"x4\")": "4"
+          "td:nth-child(4):contains(\"x5\")": "5"
+          "td:nth-child(4):contains(\"x6\")": "6"
+          "td:nth-child(4):contains(\"x7\")": "7"
+          "td:nth-child(4):contains(\"x8\")": "8"
+          "td:nth-child(4):contains(\"x9\")": "9"
+          "*": "1"

src/Jackett.Common/Definitions/skytorrentsclone.yml

@@ -6,9 +6,9 @@
   type: public
   encoding: UTF-8
   links:
-    - https://www.skytorrents.to/
-  legacylinks:
     - https://www.skytorrents.lol/
+  legacylinks:
+    - https://www.skytorrents.to/
 
   caps:
     categories:
@@ -29,23 +29,23 @@
       movie-search: [q]
 
   settings:
-    - name: btdb.eu-links
+    - name: itorrents-links
       type: checkbox
-      label: Add download links via btdb.eu
+      label: Add download links via itorrents.org
       default: true
     - name: info
       type: info
-      label: btdb.eu Note
-      default: Without the btdb.eu option only magnet links will be provided.
+      label: ITorrents Note
+      default: Without the itorrents option only magnet links will be provided.
 
   search:
-    # https://www.skytorrents.lol/?search=mr+mercedes+s02e05&sort=created
+    # https://www.skytorrents.lol/?query=mr+mercedes+s02e05&sort=created
     # https://www.skytorrents.lol/top100
     paths:
-      - path: "{{ if .Keywords }}?search={{ .Keywords }}&sort=created{{else}}top100{{end}}"
-      - path: "{{ if .Keywords }}?search={{ .Keywords }}&sort=created&page=2{{else}}{{end}}"
-      - path: "{{ if .Keywords }}?search={{ .Keywords }}&sort=created&page=3{{else}}{{end}}"
-      - path: "{{ if .Keywords }}?search={{ .Keywords }}&sort=created&page=4{{else}}{{end}}"
+      - path: "{{ if .Keywords }}?query={{ .Keywords }}&sort=created{{else}}top100{{end}}"
+      - path: "{{ if .Keywords }}?query={{ .Keywords }}&sort=created&page=2{{else}}{{end}}"
+      - path: "{{ if .Keywords }}?query={{ .Keywords }}&sort=created&page=3{{else}}{{end}}"
+      - path: "{{ if .Keywords }}?query={{ .Keywords }}&sort=created&page=4{{else}}{{end}}"
     rows:
       selector: tr.result
     fields:
@@ -62,11 +62,11 @@
       details:
         selector: td a
         attribute: href
-      download-btdb.eu:
-        selector: a[href^="//btdb.eu"]
+      download-itorrents:
+        selector: a[href^="//itorrents"]
         attribute: href
       download:
-        text: "{{if .Config.btdb.eu-links}}{{ .Result.download-btdb.eu }}{{else}}{{end}}"
+        text: "{{if .Config.itorrents-links}}{{ .Result.download-itorrents }}{{else}}{{end}}"
       magnet:
         selector: a[href^="magnet:?"]
         attribute: href

src/Jackett.Common/Definitions/solidtorrents.yml

@@ -38,7 +38,8 @@
       selector: div[role="listitem"]:has(a[href^="magnet:?xt="])
     fields:
       title:
-        selector: div[class$="__title"] h3
+        selector: div[class$="__title"] a[title]
+        attribute: title
       details:
         selector: div[class$="__title"] a
         attribute: href
@@ -62,12 +63,13 @@
           - name: regexp
             args: "(\\d+ \\w+ \\w+)"
       seeders:
-        selector: div.v-list__tile__content div:nth-of-type(3) span:nth-child(1)
+        selector: div.v-list__tile__sub-title span.green--text
       leechers:
-        selector: div.v-list__tile__content div:nth-of-type(3) span:nth-child(2)
+        selector: div.v-list__tile__sub-title span.red--text
+      grabs:
+        selector: div.v-list__tile__sub-title span:last-of-type
       size:
-        selector: div.v-list__tile__content div:nth-of-type(3)
-        remove: span
+        selector: div.v-list__tile__sub-title:last-of-type strong
       downloadvolumefactor:
         text: "0"
       uploadvolumefactor:

src/Jackett.Common/Definitions/soundpark.yml

@@ -0,0 +1,130 @@
+---
+  site: soundpark
+  name: SoundPark
+  description: "SoundPark Semi-Private RUSSIAN site dedicated to MUSIC."
+  language: ru-RU
+  type: semi-private
+  encoding: UTF-8
+  links:
+    - https://soundpark-club.com/
+    - https://soundpark-club.casa/
+
+  caps:
+    categories:
+      "Music": Audio
+
+    modes:
+      search: [q]
+      music-search: [q, album, artist, label, year]
+
+  login:
+    path: login
+    method: form
+    form: form[action="/login"]
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      returnto: ""
+    error:
+      - selector: div.stdmsg_text
+    test:
+      path: /
+      selector: a[href="/logout"]
+
+  download:
+    selector: a[href^="/album/download-torrent/"]
+
+  search:
+    paths:
+      - path: "{{if .Keywords}}search{{else}}music{{end}}"
+    inputs:
+      q: "{{if .Query.Artist}}{{ .Query.Artist }}{{else}}{{ .Keywords }}{{end}}"
+      num: 50
+
+    rows:
+    # first selector is for the music page (recent uploads) and the second selector is for the search page
+      selector: div[itemscope] > table.browse_albums, div.div-rellist
+    fields:
+      title:
+        selector: tr:nth-child(1) td:nth-child(1) h2 a, div h3 a
+      details:
+        selector: tr:nth-child(1) td:nth-child(1) h2 a, div h3 a
+        attribute: href
+      category:
+        text: "Music"
+      banner:
+        selector: tr:nth-child(2) td:nth-child(1) a img, div i img
+        attribute: src
+        optional: true
+      download:
+        selector: tr:nth-child(1) td:nth-child(1) h2 a, div h3 a
+        attribute: href
+      # dates come in two flavours:
+      # Russian, Spanish and English supported
+      date:
+      # fix for spanish yesterday, the time is not present
+        text: now
+      date:
+        # Today at 22:28:10
+        # Yesterday at 10:18:40
+        # Вчера в 10:18:40
+        # Hoy a las 07:33:17
+        selector: tr:nth-child(1) > td:nth-child(2) > div.details > span:nth-child(1):contains(":"), div > span.edit:contains(":")
+        optional: true
+        filters:
+          - name: replace
+            args: [" at ", " "]
+          - name: re_replace
+            args: ["Ayer a las|Вчера в", "Yesterday"]
+          - name: re_replace
+            args: ["Hoy a las|Сегодня в", "Today"]
+      date:
+        # 3 april 2019
+        selector: tr:nth-child(1) > td:nth-child(2) > div.details > span:nth-child(1):not(:contains(":")), div > span.edit:not(:contains(":"))
+        optional: true
+        filters:
+          - name: re_replace
+            args: ["enero|января", "January"]
+          - name: re_replace
+            args: ["febrero|февраля", "February"]
+          - name: re_replace
+            args: ["marzo|марта ", "March"]
+          - name: re_replace
+            args: ["abril|апреля", "April"]
+          - name: re_replace
+            args: ["mayo|мая", "May"]
+          - name: re_replace
+            args: ["junio|июня", "June"]
+          - name: re_replace
+            args: ["julio|июля", "July"]
+          - name: re_replace
+            args: ["agosto|августа", "August"]
+          - name: re_replace
+            args: ["septiembre|сентября", "September"]
+          - name: re_replace
+            args: ["octubre|октября", "October"]
+          - name: re_replace
+            args: ["noviembre|ноября", "November"]
+          - name: re_replace
+            args: ["diciembre|декабря", "December"]
+          - name: dateparse
+            args: "2 January 2006"
+      size:
+      # search page does not have size.
+        text: "500 MB"
+      size:
+      # but today's page can, if the content fixed-length string contains a title that is not too long.
+        selector: tr:nth-child(2) td.descr meta
+        attribute: content
+        optional: true
+        filters:
+          - name: regexp
+            args: "Size: (.*?),"
+      seeders:
+        text: 1
+      leechers:
+        text: 1
+      downloadvolumefactor:
+        text: 1
+      uploadvolumefactor:
+        text: 1

src/Jackett.Common/Definitions/spacetorrent.yml

@@ -67,24 +67,16 @@
       date:
         selector: td:nth-child(4)
         filters:
-          - name: replace
-            args: ["heures", "hours"]
           - name: replace
             args: ["heure", "hour"]
-          - name: replace
-            args: ["jours", "days"]
           - name: replace
             args: ["jour", "day"]
-          - name: replace
-            args: ["semaines", "weeks"]
           - name: replace
             args: ["semaine", "week"]
           - name: replace
-            args: ["mois", "months"]
+            args: ["moi", "month"]
           - name: replace
-            args: ["ans", "years"]
-          - name: replace
-            args: ["an", "year"]
+            args: [" an", " year"]
           - name: append
             args: " ago"
       size:

src/Jackett.Common/Definitions/sportscult.yml

@@ -13,11 +13,13 @@
       - {id: 47, cat: TV/Sport, desc: "EPL"}
       - {id: 41, cat: TV/Sport, desc: "American Football"}
       - {id: 17, cat: TV/Sport, desc: "Athletics"}
+      - {id: 51, cat: TV/Sport, desc: "Baseball"}
       - {id: 34, cat: TV/Sport, desc: "Bodybuilding/Fitness"}
+      - {id: 50, cat: TV/Sport, desc: "Golf"}
       - {id: 29, cat: TV/Sport, desc: "Boxing"}
       - {id: 19, cat: TV/Sport, desc: "BrainGames"}
       - {id: 36, cat: TV/Sport, desc: "BreakDance"}
-      - {id: 40, cat: TV/Sport, desc: "Cricet/Golf/Baseball"}
+      - {id: 40, cat: TV/Sport, desc: "Golf"}
       - {id: 23, cat: TV/Sport, desc: "Cycling"}
       - {id: 31, cat: TV/Sport, desc: "Documentary"}
       - {id: 1, cat: TV/Sport, desc: "European Basketball"}
@@ -55,6 +57,7 @@
       - {id: 16, cat: TV/Sport, desc: "WinterSport"}
       - {id: 33, cat: TV/Sport, desc: "Wrestling/Grapling"}
       - {id: 48, cat: TV/Sport, desc: "Uncategorised"}
+      - {id: 53, cat: TV/Sport, desc: "Cricket"}
 
     modes:
       search: [q]
@@ -71,9 +74,6 @@
     test:
       path: index.php
 
-  download:
-    selector: a[href^="download.php?id="]
-        
   search:
     paths:
       - path: index.php
@@ -95,12 +95,18 @@
       title:
         remove: span
         selector: td:nth-child(2)
+        filters:
+          # strip the upright bars in the title
+          - name: re_replace
+            args: ["( \\| )+", " "]
       download:
-        selector: a[href^="index.php?page=torrent-details&id="]
+ # download.php?id=fb27625a0543ed731f7b3505beebf4c8d530f8f9&f=IIHF+2019-05-26+%7C+Gold+Medal+%7C+Canada+vs+Finland+%7C+1080p+EN.torrent
+        selector: a[href^="download.php?id="]
         attribute: href
         filters:
-          - name: replace
-            args: ["index.php?page=torrent-details&id=", "download.php?id="]
+          # strip the upright bars in the title's filename
+          - name: re_replace
+            args: ["(\\+%7C\\+)+", "+"]
       details:
         selector: a[href^="index.php?page=torrent-details&id="]
         attribute: href
@@ -112,11 +118,11 @@
         selector: td:nth-child(7)
       grabs:
         selector: td:nth-child(8)
-      # date:
-      #   selector: td:nth-child(5)
-      #   filters:
-      #     - name: dateparse
-      #       args: "02/05/2017"
+      date:
+        selector: td:nth-child(5)
+        filters:
+          - name: dateparse
+            args: "02/01/2006"
       downloadvolumefactor:
         case:
           "*": "1"

src/Jackett.Common/Definitions/tapochek.yml

@@ -0,0 +1,527 @@
+---
+  site: tapochek
+  name: Tapochek
+  description: "Tapochek is a RUSSIAN Private Torrent Tracker for 0DAY / GENERAL"
+  language: ru-ru
+  type: private
+  encoding: windows-1251
+  links:
+    - https://tapochek.net/
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: striprussian
+      type: checkbox
+      label: Strip Russian Letters
+      default: false
+
+  caps:
+    categorymappings:
+      # PC Games
+      # Игры для PC
+      - {id: 2, cat: PC/Games, desc: "Игры для PC (общее)"}
+      - {id: 14, cat: PC/Games, desc: "Альфа-, Бета- и Демо-версии"}
+      - {id: 314, cat: PC/Games, desc: "NoCD/ NoDVD"}
+      - {id: 13, cat: PC/Games, desc: "Русификаторы"}
+      - {id: 12, cat: PC/Games, desc: "Патчи"}
+      - {id: 11, cat: PC/Games, desc: "Чит-программы и трейнеры"}
+      - {id: 10, cat: PC/Games, desc: "Дополнения для игр"}
+      - {id: 9, cat: PC/Games, desc: "Игровые журналы и приложенные материалы"}
+      - {id: 712, cat: PC/Games, desc: "Гайды, бонусные диски и другие дополнительные материалы"}
+      - {id: 18, cat: PC/Games, desc: "Горячие новинки"}
+      - {id: 808, cat: PC/Games, desc: "Репаки от R.G. Механики"}
+      - {id: 809, cat: PC/Games, desc: "Горячие новинки от R.G. Механики"}
+      - {id: 810, cat: PC/Games, desc: "Аркады от R.G. Механики"}
+      - {id: 811, cat: PC/Games, desc: "Приключения и квесты от R.G. Механики"}
+      - {id: 812, cat: PC/Games, desc: "Стратегии от R.G. Механики"}
+      - {id: 813, cat: PC/Games, desc: "Симуляторы от R.G. Механики"}
+      - {id: 814, cat: PC/Games, desc: "Action от R.G. Механики"}
+      - {id: 815, cat: PC/Games, desc: "RPG от R.G. Механики"}
+      - {id: 903, cat: PC/Games, desc: "jRPG от R.G. Механики"}
+      - {id: 887, cat: PC/Games, desc: "Раздачи от R.G. Игроманы"}
+      - {id: 888, cat: PC/Games, desc: "Аркады от R.G. Игроманы"}
+      - {id: 889, cat: PC/Games, desc: "Приключения и квесты от R.G. Игроманы"}
+      - {id: 890, cat: PC/Games, desc: "Стратегии от R.G. Игроманы"}
+      - {id: 891, cat: PC/Games, desc: "Симуляторы от R.G. Игроманы"}
+      - {id: 892, cat: PC/Games, desc: "Action от R.G. Игроманы"}
+      - {id: 893, cat: PC/Games, desc: "RPG от R.G. Игроманы"}
+      - {id: 913, cat: PC/Games, desc: "Раздачи от R.G. GOGFAN"}
+      - {id: 935, cat: PC/Games, desc: "Ранний доступ от R.G. GOGFAN"}
+      - {id: 914, cat: PC/Games, desc: "Аркады от R.G. GOGFAN"}
+      - {id: 915, cat: PC/Games, desc: "Приключения и квесты от R.G. GOGFAN"}
+      - {id: 931, cat: PC/Games, desc: "Стратегии от R.G. GOGFAN"}
+      - {id: 930, cat: PC/Games, desc: "Симуляторы от R.G. GOGFAN"}
+      - {id: 929, cat: PC/Games, desc: "Action от R.G. GOGFAN"}
+      - {id: 928, cat: PC/Games, desc: "RPG от R.G. GOGFAN"}
+      - {id: 24, cat: PC/Games, desc: "Приключения и квесты"}
+      - {id: 25, cat: PC/Games, desc: "Стратегии"}
+      - {id: 28, cat: PC/Games, desc: "RTS (стратегии в реальном времени)"}
+      - {id: 27, cat: PC/Games, desc: "TBS (пошаговые стратегии)"}
+      - {id: 26, cat: PC/Games, desc: "Wargame"}
+      - {id: 238, cat: PC/Games, desc: "Экономические стратегии"}
+      - {id: 19, cat: PC/Games, desc: "Аркады"}
+      - {id: 23, cat: PC/Games, desc: "Аркады (разное)"}
+      - {id: 22, cat: PC/Games, desc: "Логические аркады"}
+      - {id: 21, cat: PC/Games, desc: "Настольные и карточные аркады"}
+      - {id: 20, cat: PC/Games, desc: "Мини/флеш-игры"}
+      - {id: 29, cat: PC/Games, desc: "Симуляторы"}
+      - {id: 31, cat: PC/Games, desc: "Авиасимуляторы"}
+      - {id: 34, cat: PC/Games, desc: "Спортивные симуляторы"}
+      - {id: 33, cat: PC/Games, desc: "Космические симуляторы"}
+      - {id: 32, cat: PC/Games, desc: "Гоночные симуляторы"}
+      - {id: 30, cat: PC/Games, desc: "Другие симуляторы"}
+      - {id: 35, cat: PC/Games, desc: "Action"}
+      - {id: 39, cat: PC/Games, desc: "FPS (1st Person)"}
+      - {id: 38, cat: PC/Games, desc: "TPS (3rd Person)"}
+      - {id: 37, cat: PC/Games, desc: "Stealth Action"}
+      - {id: 36, cat: PC/Games, desc: "Тактические шутеры"}
+      - {id: 40, cat: PC/Games, desc: "RPG"}
+      - {id: 41, cat: PC/Games, desc: "Эротические игры"}
+      - {id: 43, cat: PC/Games, desc: "Эротические"}
+      - {id: 42, cat: PC/Games, desc: "Хентайные"}
+      - {id: 44, cat: PC/Games, desc: "Многопользовательские игры"}
+      - {id: 45, cat: PC/Games, desc: "MMORPG"}
+      - {id: 46, cat: PC/Games, desc: "Для самых маленьких"}
+      # Games for Consoles
+      # Игры для Консолей
+      - {id: 69, cat: Console/Xbox, desc: "Xbox"}
+      - {id: 86, cat: Console/Xbox 360, desc: "XBox360 | Игры"}
+      - {id: 646, cat: Console/Xbox 360, desc: "XBox360 | JTAG"}
+      - {id: 87, cat: Console/Xbox 360, desc: "XBox360 | 360E"}
+      - {id: 89, cat: Console/Xbox 360, desc: "XBox360 | Demo"}
+      - {id: 612, cat: Console/Xbox 360, desc: "XBox360 | Live"}
+      - {id: 614, cat: Console/Xbox 360, desc: "XBox360 | Soft"}
+      - {id: 88, cat: Console/Xbox, desc: "XBox | Игры"}
+      - {id: 85, cat: Console/Xbox, desc: "Прочее | Архив (XBox)"}
+      - {id: 70, cat: Console/PSP, desc: "PlayStation"}
+      - {id: 910, cat: Console/PS4, desc: "PS4 | Игры"}
+      - {id: 911, cat: Console/PS4, desc: "PS4 | Сцена"}
+      - {id: 689, cat: Console/PS3, desc: "PS3 | Игры"}
+      - {id: 818, cat: Console/PS3, desc: "PS3 | Сцена"}
+      - {id: 696, cat: Console/PSP, desc: "PSN | Игры"}
+      - {id: 853, cat: Console/PS3, desc: "PS3 | Emulation"}
+      - {id: 904, cat: Console/PS Vita, desc: "PS Vita | Игры"}
+      - {id: 102, cat: Console/PSP, desc: "PSP | Игры"}
+      - {id: 103, cat: Console/PS3, desc: "PS2 | Игры"}
+      - {id: 104, cat: Console/PSP, desc: "PSX | Игры"}
+      - {id: 435, cat: Console/PSP, desc: "PSP | Сцена"}
+      - {id: 105, cat: Console/PSP, desc: "PSP | PSX-PSP"}
+      - {id: 690, cat: Console/PS3, desc: "PS3 | Прочее"}
+      - {id: 178, cat: Console/PSP, desc: "PSP | Прочее"}
+      - {id: 101, cat: Console/PSP, desc: "Архив (PS)"}
+      - {id: 78, cat: Console/NDS, desc: "Nintendo"}
+      - {id: 148, cat: Console/NDS, desc: "Архив (Nintendo)"}
+      - {id: 116, cat: Console/NDS, desc: "NDS | Игры"}
+      - {id: 885, cat: Console/3DS, desc: "3DS | Игры"}
+      - {id: 912, cat: Console, desc: "Switch | Игры"}
+      - {id: 115, cat: Console/Wii, desc: "Wii | Игры"}
+      - {id: 899, cat: Console/WiiU, desc: "Wii U | Игры"}
+      - {id: 900, cat: Console/WiiU, desc: "Wii U | Сцена"}
+      - {id: 381, cat: Console/Wiiware/VC, desc: "WiiWare | Игры"}
+      - {id: 382, cat: Console, desc: "GameCube | Игры"}
+      - {id: 349, cat: Console, desc: "Sega"}
+      - {id: 350, cat: Console, desc: "Dreamcast | Игры"}
+      - {id: 351, cat: Console, desc: "Saturn | Игры"}
+      - {id: 352, cat: Console, desc: "Игры для старых консолей"}
+      - {id: 390, cat: Console, desc: "Коллекции (игры для разных платформ)"}
+      # Games for macOS and Linux
+      # Игры для macOS и Linux
+      - {id: 936, cat: PC/Games, desc: "Горячие новинки игр для macOS и Linux"}
+      - {id: 129, cat: PC/Games, desc: "Игры для Linux от R.G. GOGFAN"}
+      - {id: 874, cat: PC/Games, desc: "[Linux] Аркады от R.G. GOGFAN"}
+      - {id: 695, cat: PC/Games, desc: "[Linux] Приключения и квесты от R.G. GOGFAN"}
+      - {id: 873, cat: PC/Games, desc: "[Linux] Стратегии от R.G. GOGFAN"}
+      - {id: 872, cat: PC/Games, desc: "[Linux] Симуляторы от R.G. GOGFAN"}
+      - {id: 871, cat: PC/Games, desc: "[Linux] Action от R.G. GOGFAN"}
+      - {id: 932, cat: PC/Games, desc: "[Linux] RPG от R.G. GOGFAN"}
+      - {id: 861, cat: PC/Games, desc: "Игры для macOS от R.G. GOGFAN"}
+      - {id: 862, cat: PC/Games, desc: "[macOS] Аркады от R.G. GOGFAN"}
+      - {id: 875, cat: PC/Games, desc: "[macOS] Приключения и квесты от R.G. GOGFAN"}
+      - {id: 876, cat: PC/Games, desc: "[macOS] Стратегии от R.G. GOGFAN"}
+      - {id: 877, cat: PC/Games, desc: "[macOS] Симуляторы от R.G. GOGFAN"}
+      - {id: 878, cat: PC/Games, desc: "[macOS] Action от R.G. GOGFAN"}
+      - {id: 933, cat: PC/Games, desc: "[macOS] RPG от R.G. GOGFAN"}
+      # Cinema
+      # Кинематограф
+      - {id: 429, cat: Movies, desc: "Новинки кинематографа"}
+      - {id: 886, cat: Movies/3D, desc: "Новинки (3D)"}
+      - {id: 703, cat: Movies, desc: "Экранки и Low-рипы (CAMRip, TS, WEBRip)"}
+      - {id: 430, cat: Movies, desc: "Новинки 2018-2019 (Rips)"}
+      - {id: 431, cat: Movies/WEBDL, desc: "Новинки 2018-2019 (Web-DL, HD Rips)"}
+      - {id: 934, cat: Movies/BluRay, desc: "Новинки 2018-2019 (Blu-Ray и BDRemux)"}
+      - {id: 908, cat: Movies, desc: "Экранки и Low-рипы с рекламой"}
+      - {id: 909, cat: Movies/HD, desc: "Новинки 2018-2019 (HD и HD Rips) с рекламой"}
+      - {id: 74, cat: Movies/Foreign, desc: "Зарубежное кино"}
+      - {id: 121, cat: Movies/BluRay, desc: "Зарубежное кино | Blu-Ray и BDRemux"}
+      - {id: 122, cat: Movies/HD, desc: "Зарубежное кино | HD Rips"}
+      - {id: 123, cat: Movies/DVD, desc: "Зарубежное кино | DVD"}
+      - {id: 124, cat: Movies/Foreign, desc: "Зарубежное кино | Rips"}
+      - {id: 75, cat: Movies, desc: "Отечественное кино"}
+      - {id: 127, cat: Movies/BluRay, desc: "Отечественное кино | Blu-Ray и BDRemux"}
+      - {id: 128, cat: Movies/HD, desc: "Отечественное кино | HD Rips"}
+      - {id: 130, cat: Movies/DVD, desc: "Российское кино | DVD"}
+      - {id: 131, cat: Movies, desc: "Российское кино | Rips"}
+      - {id: 133, cat: Movies/DVD, desc: "Советское кино | DVD"}
+      - {id: 135, cat: Movies, desc: "Советское кино | Rips"}
+      - {id: 869, cat: Movies/3D, desc: "3D"}
+      - {id: 161, cat: TV/FOREIGN, desc: "Зарубежные сериалы"}
+      - {id: 160, cat: TV, desc: "Отечественные cериалы"}
+      - {id: 320, cat: TV, desc: "Мультфильмы"}
+      - {id: 938, cat: TV/HD, desc: "Мультфильмы | Blu-Ray и BDRemux"}
+      - {id: 324, cat: TV/HD, desc: "Мультфильмы | HD Rips"}
+      - {id: 325, cat: TV/SD, desc: "Мультфильмы | DVD"}
+      - {id: 326, cat: TV, desc: "Отечественные мультфильмы | Rips"}
+      - {id: 327, cat: TV, desc: "Отечественные короткометражные мультфильмы"}
+      - {id: 328, cat: TV, desc: "Зарубежные мультфильмы | Rips"}
+      - {id: 329, cat: TV, desc: "Зарубежные короткометражные мультфильмы"}
+      - {id: 330, cat: TV, desc: "Сборники мультфильмов"}
+      - {id: 321, cat: TV, desc: "Мультсериалы"}
+      - {id: 162, cat: TV/Documentary, desc: "Документальные фильмы и телепередачи"}
+      - {id: 392, cat: TV, desc: "Развлекательные телепередачи и шоу"}
+      # Anime
+      # Аниме
+      - {id: 693, cat: TV/Anime, desc: "Аниме (Основной)"}
+      - {id: 684, cat: TV/Anime, desc: "Аниме (DVD)"}
+      - {id: 677, cat: TV/Anime, desc: "Аниме DVD [Бутлег]"}
+      - {id: 96, cat: TV/Anime, desc: "Аниме DVD [Лицензии]"}
+      - {id: 678, cat: TV/Anime, desc: "Аниме (HD и Blu-ray)"}
+      - {id: 660, cat: TV/Anime, desc: "Аниме Blu-ray и Remux"}
+      - {id: 95, cat: TV/Anime, desc: "Аниме HD Rips"}
+      - {id: 106, cat: TV/Anime, desc: "Аниме Манга и прочий арт"}
+      - {id: 109, cat: TV/Anime, desc: "Аниме Манга"}
+      - {id: 107, cat: TV/Anime, desc: "Аниме Обои, артбуки и др."}
+      - {id: 685, cat: TV/Anime, desc: "Аниме Азиатские мультфильмы"}
+      - {id: 687, cat: TV/Anime, desc: "Аниме DVD"}
+      - {id: 686, cat: TV/Anime, desc: "Аниме Rips"}
+      - {id: 688, cat: TV/Anime, desc: "Аниме HD Rips"}
+      - {id: 680, cat: TV/Anime, desc: "Аниме (Хентай)"}
+      - {id: 681, cat: TV/Anime, desc: "Аниме Censored"}
+      - {id: 682, cat: TV/Anime, desc: "Аниме UnCensored"}
+      - {id: 683, cat: TV/Anime, desc: "Аниме PtCensored"}
+      - {id: 697, cat: TV/Anime, desc: "Аниме Манга, обои, артбуки и др."}
+      # Music and Music Video
+      # Музыка и Музыкальное видео
+      - {id: 451, cat: Audio/Lossless, desc: "Классическая музыка (lossless)"}
+      - {id: 452, cat: Audio/Lossless, desc: "Классическая музыка в современной обработке (lossless)"}
+      - {id: 453, cat: Audio/MP3, desc: "Классическая музыка (mp3)"}
+      - {id: 454, cat: Audio/MP3, desc: "Классическая музыка в современной обработке (mp3)"}
+      - {id: 455, cat: Audio/Video, desc: "Классическая музыка (video)"}
+      - {id: 457, cat: Audio/Lossless, desc: "Зарубежный Jazz, Blues (lossless)"}
+      - {id: 458, cat: Audio/Lossless, desc: "Отечественный Jazz, Blues (lossless)"}
+      - {id: 459, cat: Audio/MP3, desc: "Зарубежный Jazz, Blues (mp3)"}
+      - {id: 460, cat: Audio/MP3, desc: "Отечественный Jazz, Blues (mp3)"}
+      - {id: 461, cat: Audio/Video, desc: "Jazz, Blues (video)"}
+      - {id: 463, cat: Audio/Lossless, desc: "Зарубежный Reggae, Ska, Dub (lossless)"}
+      - {id: 464, cat: Audio/Lossless, desc: "Отечественный Reggae, Ska, Dub (lossless)"}
+      - {id: 465, cat: Audio/MP3, desc: "Зарубежный Reggae, Ska, Dub (mp3)"}
+      - {id: 466, cat: Audio/MP3, desc: "Отечественный Reggae, Ska, Dub (mp3)"}
+      - {id: 467, cat: Audio/Video, desc: "Reggae, Ska, Dub (video)"}
+      - {id: 469, cat: Audio/Lossless, desc: "Rосk (losslеss)"}
+      - {id: 470, cat: Audio/Lossless, desc: "Mеtаl (losslеss)"}
+      - {id: 471, cat: Audio/Lossless, desc: "Аltеrnаtivе, Рunk, Indереndеnt (lоsslеss)"}
+      - {id: 472, cat: Audio/MP3, desc: "Rосk (mр3)"}
+      - {id: 473, cat: Audio/MP3, desc: "Mеtаl (mр3)"}
+      - {id: 474, cat: Audio/MP3, desc: "Аltеrnаtivе, Рunk, Indереndеnt (mр3)"}
+      - {id: 475, cat: Audio/Video, desc: "Зарубежный Rock (video)"}
+      - {id: 477, cat: Audio/Lossless, desc: "Rосk, Punk, Alternative (losslеss)"}
+      - {id: 478, cat: Audio, desc: "Mеtаl (losslеss)"}
+      - {id: 479, cat: Audio/MP3, desc: "Rосk, Punk, Alternative (mр3)"}
+      - {id: 480, cat: Audio/MP3, desc: "Mеtаl (mр3)"}
+      - {id: 481, cat: Audio/Video, desc: "Отечественный Rock (video)"}
+      - {id: 483, cat: Audio/Lossless, desc: "Зарубежная Поп-музыка (lossless)"}
+      - {id: 484, cat: Audio/Lossless, desc: "Отечественная Поп-музыка (lossless)"}
+      - {id: 485, cat: Audio/Lossless, desc: "Eurodance, Technopop, Disco (lossless)"}
+      - {id: 486, cat: Audio/MP3, desc: "Зарубежная Поп-музыка (mp3)"}
+      - {id: 487, cat: Audio/MP3, desc: "Отечественная Поп-музыка (mp3)"}
+      - {id: 488, cat: Audio/MP3, desc: "Eurodance, Technopop, Disco (mp3)"}
+      - {id: 489, cat: Audio/MP3, desc: "Поп-музыка, Eurodance, Disco (официальные сборники) (mp3)"}
+      - {id: 490, cat: Audio/Video, desc: "Поп-музыка, Eurodance, Disco (video)"}
+      - {id: 492, cat: Audio/Lossless, desc: "Фольклор, Народная и Этническая музыка (lossless)"}
+      - {id: 493, cat: Audio/MP3, desc: "Фольклор, Народная и Этническая музыка (mp3)"}
+      - {id: 494, cat: Audio/Video, desc: "Фольклор, Народная и Этническая музыка (video)"}
+      - {id: 496, cat: Audio/Lossless, desc: "NewAge, Meditative (lossless)"}
+      - {id: 497, cat: Audio/Lossless, desc: "Flamenco, Акустическая гитара (lossless)"}
+      - {id: 498, cat: Audio/MP3, desc: "NewAge, Meditative (mp3)"}
+      - {id: 499, cat: Audio/MP3, desc: "Flamenco, Акустическая гитара (mp3)"}
+      - {id: 500, cat: Audio/Video, desc: "New Age, Relax, Meditative & Flamenco (video)"}
+      - {id: 501, cat: Audio, desc: "Звуки природы"}
+      - {id: 502, cat: Audio, desc: "Психоактивныe аудиопрограммы"}
+      - {id: 504, cat: Audio/Lossless, desc: "Зарубежный Rap, Hip-Hop, R'n'B (lossless)"}
+      - {id: 505, cat: Audio/Lossless, desc: "Отечественный Rap, Hip-Hop, R'n'B (lossless)"}
+      - {id: 506, cat: Audio/MP3, desc: "Зарубежный Rap, Hip-Hop, R'n'B (mp3)"}
+      - {id: 507, cat: Audio/MP3, desc: "Отечественный Rap, Hip-Hop, R'n'B (mp3)"}
+      - {id: 508, cat: Audio/Video, desc: "Rap, Hip-Hop, R'n'B (video)"}
+      - {id: 510, cat: Audio/Lossless, desc: "Trance, Goa Trance, Psy-Trance, PsyChill, Ambient Dub (lossl.."}
+      - {id: 511, cat: Audio/Lossless, desc: "House, Techno, Hardcore, Hardstyle, Jumpstyle (lossless)"}
+      - {id: 512, cat: Audio/Lossless, desc: "Drum & Bass, Jungle, Breakbeat, Dubstep, IDM (lossless)"}
+      - {id: 513, cat: Audio/Lossless, desc: "Chillout, Lounge, Downtempo, Trip-Hop (lossless)"}
+      - {id: 514, cat: Audio/Lossless, desc: "Traditional Electronic, Ambient, Experimental (lossless)"}
+      - {id: 515, cat: Audio, desc: "Industrial, Noise, EBM, Dark Electro, Aggrotech, Synthpop, N.."}
+      - {id: 516, cat: Audio/MP3, desc: "Trance, Goa Trance, Psy-Trance, PsyChill, Ambient Dub (mp3)"}
+      - {id: 517, cat: Audio/MP3, desc: "House, Techno, Hardcore, Hardstyle, Jumpstyle (mp3)"}
+      - {id: 518, cat: Audio/MP3, desc: "Drum & Bass, Jungle, Breakbeat, Dubstep, IDM (mp3)"}
+      - {id: 519, cat: Audio/MP3, desc: "Chillout, Lounge, Downtempo, Trip-Hop (mp3)"}
+      - {id: 520, cat: Audio/MP3, desc: "Traditional Electronic, Ambient, Experimental (mp3)"}
+      - {id: 521, cat: Audio, desc: "Industrial, Noise, EBM, Dark Electro, Aggrotech, Synthpop, N.."}
+      - {id: 522, cat: Audio/Video, desc: "Электронная музыка (video)"}
+      - {id: 524, cat: Audio/Lossless, desc: "Зарубежный шансон (lossless)"}
+      - {id: 525, cat: Audio/Lossless, desc: "Отечественный шансон (lossless)"}
+      - {id: 526, cat: Audio/Lossless, desc: "Авторская песня (lossless)"}
+      - {id: 527, cat: Audio/Lossless, desc: "Военная песня (lossless)"}
+      - {id: 528, cat: Audio/MP3, desc: "Зарубежный шансон (mp3)"}
+      - {id: 529, cat: Audio/MP3, desc: "Отечественный шансон (mp3)"}
+      - {id: 530, cat: Audio, desc: "Отечественный шансон (официальные сборники) (mp3)"}
+      - {id: 531, cat: Audio/MP3, desc: "Авторская песня (mp3)"}
+      - {id: 532, cat: Audio/MP3, desc: "Военная песня (mp3)"}
+      - {id: 533, cat: Audio/Video, desc: "Шансон, Авторская и Военная песня (video)"}
+      - {id: 402, cat: Audio/Lossless, desc: "Саундтреки к фильмам и мультфильмам (lossless)"}
+      - {id: 403, cat: Audio/Lossless, desc: "Саундтреки к аниме (lossless)"}
+      - {id: 399, cat: Audio/Lossless, desc: "Саундтреки к играм (lossless)"}
+      - {id: 401, cat: Audio/MP3, desc: "Саундтреки к фильмам и мультфильмам (mp3)"}
+      - {id: 404, cat: Audio/MP3, desc: "Саундтреки к аниме (mp3)"}
+      - {id: 400, cat: Audio/MP3, desc: "Саундтреки к играм (mp3)"}
+      - {id: 535, cat: Audio/Lossless, desc: "Зарубежная музыка других жанров (lossless)"}
+      - {id: 536, cat: Audio/Lossless, desc: "Отечественная музыка других жанров (lossless)"}
+      - {id: 537, cat: Audio/MP3, desc: "Зарубежная музыка других жанров (mp3)"}
+      - {id: 538, cat: Audio/MP3, desc: "Отечественная музыка других жанров (mp3)"}
+      - {id: 539, cat: Audio/Video, desc: "Музыка других жанров (video)"}
+      - {id: 540, cat: Audio, desc: "Караоке и минусовки (фонограммы)"}
+      - {id: 541, cat: Audio, desc: "Сборники песен для детей"}
+      - {id: 542, cat: Audio, desc: "Неофициальные и внежанровые сборники"}
+      - {id: 543, cat: Audio, desc: "Неофициальные кинематографические видео"}
+      - {id: 545, cat: Audio, desc: "Многоканальная музыка"}
+      - {id: 546, cat: Audio, desc: "Собственные оцифровки"}
+      - {id: 547, cat: Audio, desc: "Hi-Res stereo"}
+      # Software
+      # Программное обеспечение
+      - {id: 202, cat: PC/Mac, desc: "Mac OS (для Apple Macintosh)"}
+      - {id: 203, cat: PC/Mac, desc: "Mac OS (для РС-Hackintosh)"}
+      - {id: 204, cat: PC/Mac, desc: "Программы для просмотра и обработки видео Mac OS"}
+      - {id: 205, cat: PC/Mac, desc: "Программы для создания и обработки графики Mac OS"}
+      - {id: 206, cat: PC/Mac, desc: "Аудио редакторы и конверторы для Mac OS"}
+      - {id: 207, cat: PC/Mac, desc: "Системные программы для Mac OS"}
+      - {id: 208, cat: PC/Mac, desc: "Другие программы для Mac OS"}
+      - {id: 215, cat: PC, desc: "Операционные системы (Unix и Unix-подобные)"}
+      - {id: 216, cat: PC, desc: "Программное обеспечение для Unix и Unix-подобных OS"}
+      - {id: 217, cat: PC, desc: "Другие OS и программное обеспечение под них"}
+      - {id: 227, cat: PC, desc: "Настольные OS, выпущенные до 2001 года (Microsoft Windows OS.."}
+      - {id: 228, cat: PC, desc: "Windows XP"}
+      - {id: 229, cat: PC, desc: "Windows Vista"}
+      - {id: 230, cat: PC, desc: "Windows 7"}
+      - {id: 879, cat: PC, desc: "Windows 8"}
+      - {id: 905, cat: PC, desc: "Windows 10"}
+      - {id: 698, cat: PC, desc: "Сборки (Microsoft Windows XP)"}
+      - {id: 701, cat: PC, desc: "Сборки (Microsoft Windows 7)"}
+      - {id: 880, cat: PC, desc: "Сборки (Microsoft Windows 8)"}
+      - {id: 906, cat: PC, desc: "Сборки (Microsoft Windows 10)"}
+      - {id: 231, cat: PC, desc: "Серверные (Microsoft Windows OS)"}
+      - {id: 232, cat: PC, desc: "Разное (Microsoft Windows OS)"}
+      - {id: 236, cat: PC, desc: "Работа с жёстким диском"}
+      - {id: 237, cat: PC, desc: "Резервное копирование"}
+      - {id: 240, cat: PC, desc: "Архиваторы и файловые менеджеры"}
+      - {id: 239, cat: PC, desc: "Программы для настройки и оптимизации ОС"}
+      - {id: 241, cat: PC, desc: "Сервисное обслуживание компьютера"}
+      - {id: 242, cat: PC, desc: "Работа с носителями информации"}
+      - {id: 243, cat: PC, desc: "Информация и диагностика"}
+      - {id: 244, cat: PC, desc: "Программы для интернет и сетей"}
+      - {id: 245, cat: PC, desc: "Антивирусы и Файерволы"}
+      - {id: 246, cat: PC, desc: "Программы для защиты информации"}
+      - {id: 247, cat: PC, desc: "Драйвера"}
+      - {id: 248, cat: PC, desc: "Серверное ПО для Windows"}
+      - {id: 249, cat: PC, desc: "Изменение интерфейса ОС Windows"}
+      - {id: 250, cat: PC, desc: "Скринсейверы"}
+      - {id: 251, cat: PC, desc: "Разное (Системные программы под Windows)"}
+      - {id: 409, cat: PC, desc: "Системы автоматизации проектных работ (САПР)"}
+      - {id: 607, cat: PC, desc: "Программы для архитекторов и дизайнеров интерьеров"}
+      - {id: 593, cat: PC, desc: "Офисные программы и системы"}
+      - {id: 595, cat: PC, desc: "Системы для научной работы"}
+      - {id: 594, cat: PC, desc: "Системы для бизнеса"}
+      - {id: 257, cat: PC, desc: "Каталогизаторы и просмотрщики графики"}
+      - {id: 258, cat: PC, desc: "Аудио- и видео-, CD- проигрыватели и каталогизаторы"}
+      - {id: 259, cat: PC, desc: "Программы для интернет и сетей"}
+      - {id: 260, cat: PC, desc: "Распознавание текста, звука и синтез речи"}
+      - {id: 261, cat: PC, desc: "Словари и переводчики"}
+      - {id: 262, cat: PC, desc: "Программное обеспечение для автолюбителей"}
+      - {id: 263, cat: PC, desc: "Медицинское программное обеспечение"}
+      - {id: 264, cat: PC, desc: "Справочные системы и карты"}
+      - {id: 265, cat: PC, desc: "Разное (Пользовательские программы)"}
+      - {id: 268, cat: PC, desc: "WYSIWYG Редакторы для веб-диза"}
+      - {id: 269, cat: PC, desc: "Текстовые редакторы с подсветкой"}
+      - {id: 270, cat: PC, desc: "Среды программирования, компиляторы и вспомогательные програ.."}
+      - {id: 271, cat: PC, desc: "Компоненты для сред программирования"}
+      - {id: 272, cat: PC, desc: "Системы управления базами данных (СУБД)"}
+      - {id: 273, cat: PC, desc: "Скрипты и шаблоны"}
+      - {id: 274, cat: PC, desc: "Разное (Веб-разработка и программирование)"}
+      - {id: 278, cat: PC, desc: "Программные комплекты"}
+      - {id: 279, cat: PC, desc: "Плагины для программ компании Adobe"}
+      - {id: 280, cat: PC, desc: "Графические редакторы"}
+      - {id: 281, cat: PC, desc: "Программы для верстки, печати и работы со шрифтами"}
+      - {id: 282, cat: PC, desc: "3D моделирование, рендеринг и плагины для них"}
+      - {id: 283, cat: PC, desc: "Анимация"}
+      - {id: 284, cat: PC, desc: "Создание DVD и BD дисков"}
+      - {id: 285, cat: PC, desc: "Редакторы видео"}
+      - {id: 286, cat: PC, desc: "Видео- Аудио- конверторы"}
+      - {id: 287, cat: PC, desc: "Работа со звуком"}
+      - {id: 290, cat: PC, desc: "Разное (Программы для работы с мультимедиа и 3D)"}
+      - {id: 293, cat: PC, desc: "Растровые и Векторные Клипарты"}
+      - {id: 294, cat: PC, desc: "Заготовки, виньетки, рамки"}
+      - {id: 295, cat: PC, desc: "Стили, кисти, формы и узоры для Adobe Photoshop"}
+      - {id: 296, cat: PC, desc: "Текстуры и материалы"}
+      - {id: 297, cat: PC, desc: "3D графика"}
+      - {id: 298, cat: PC, desc: "Футажи"}
+      - {id: 299, cat: PC, desc: "Звуковые эффекты"}
+      - {id: 300, cat: PC, desc: "Библиотеки сэмплов"}
+      - {id: 301, cat: PC, desc: "Шрифты"}
+      - {id: 302, cat: PC, desc: "Photostoсks"}
+      - {id: 303, cat: PC, desc: "Разное (Материалы для мультимедиа и дизайна)"}
+      - {id: 597, cat: PC, desc: "Справочно-правовые Системы"}
+      - {id: 600, cat: PC, desc: "Консультант Плюс"}
+      - {id: 599, cat: PC, desc: "Гарант"}
+      - {id: 601, cat: PC, desc: "Кодекс"}
+      - {id: 623, cat: PC, desc: "Мобильные телефоны"}
+      - {id: 624, cat: PC, desc: "КПК"}
+      - {id: 625, cat: PC, desc: "Навигаторы"}
+      - {id: 626, cat: PC, desc: "Карты для навигаторов"}
+      - {id: 627, cat: PC, desc: "Плееры"}
+      - {id: 628, cat: PC, desc: "Разное (Мобильные устройства и КПК)"}
+      - {id: 622, cat: PC/Phone-IOS, desc: "Apple Mobile Device Software"}
+      - {id: 667, cat: PC/Phone-IOS, desc: "Прошивки (iPhone/iPod Touch/iPad)"}
+      - {id: 668, cat: PC/Phone-IOS, desc: "Программы (iPhone/iPod Touch/iPad)"}
+      - {id: 669, cat: PC/Phone-IOS, desc: "Игры (iPhone/iPod Touch/iPad)"}
+      - {id: 670, cat: PC/Phone-IOS, desc: "Видео (iPhone/iPod Touch/iPad)"}
+      - {id: 672, cat: PC/Phone-IOS, desc: "Разное (iPhone/iPod Touch/iPad)"}
+      - {id: 671, cat: PC/Phone-IOS, desc: "Музыка (iPhone/iPod Touch/iPad)"}
+      - {id: 639, cat: PC, desc: "Обучающие видеоматериалы"}
+      - {id: 640, cat: PC, desc: "Мультимедийные материалы"}
+      - {id: 642, cat: PC, desc: "Разное"}
+      # Library
+      # Библиотека
+      - {id: 717, cat: Books, desc: "Аудиокниги"}
+      - {id: 740, cat: Books, desc: "Проект S.T.A.L.K.E.R."}
+      - {id: 738, cat: Books, desc: "Детектив / боевик"}
+      - {id: 739, cat: Books, desc: "Фантастика / фэнтези / мистика / ужасы"}
+      - {id: 836, cat: Books, desc: "Роман / комедийные произведения / приключения"}
+      - {id: 838, cat: Books, desc: "Классическая литература и современная проза"}
+      - {id: 837, cat: Books, desc: "Образование и Право"}
+      - {id: 843, cat: Books, desc: "Разное"}
+      - {id: 713, cat: Books, desc: "Художественная литература"}
+      - {id: 724, cat: Books, desc: "Детектив / боевик"}
+      - {id: 728, cat: Books, desc: "Фантастика / фэнтези / мистика / ужасы"}
+      - {id: 725, cat: Books, desc: "Роман / приключения / драма"}
+      - {id: 727, cat: Books, desc: "Комедийные произведения"}
+      - {id: 723, cat: Books, desc: "Историческая книга"}
+      - {id: 721, cat: Books, desc: "Классическая литература и современная проза"}
+      - {id: 722, cat: Books, desc: "Поэзия"}
+      - {id: 844, cat: Books, desc: "Разное"}
+      - {id: 718, cat: Books, desc: "Журналы"}
+      - {id: 763, cat: Books, desc: "Эротические журналы"}
+      - {id: 715, cat: Books, desc: "Компьютерная литература"}
+      - {id: 839, cat: Books, desc: "Научная и тех.литература"}
+      - {id: 719, cat: Books, desc: "Образование, Право и Психология"}
+      - {id: 846, cat: Books, desc: "Сексология"}
+      - {id: 840, cat: Books, desc: "Военное дело"}
+      - {id: 842, cat: Books, desc: "Спорт и физическое воспитание"}
+      - {id: 841, cat: Books, desc: "Хобби"}
+      - {id: 716, cat: Books, desc: "Дом и семейный очаг"}
+      - {id: 714, cat: Books, desc: "Книги для малышей и их родителей"}
+      - {id: 845, cat: Books, desc: "Комиксы"}
+      - {id: 741, cat: Books, desc: "Разное"}
+      # Technical assistance
+      # Техническая помощь
+      - {id: 578, cat: Other, desc: "µTorrent и BitTorrent 4.x, 5.x, 6.x"}
+      # Release - groups
+      # Релиз - группы
+      - {id: 378, cat: Other, desc: "Анонсы"}
+      # Miscellanea
+      # Разное
+      - {id: 644, cat: Other, desc: "Разное"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  login:
+    path: login.php
+    method: form
+    form: form[action$="/login.php"]
+    inputs:
+      login_username: "{{ .Config.username }}"
+      login_password: "{{ .Config.password }}"
+      autologin: 1
+      redirect: "index.php"
+    error:
+      - selector: h4:contains("Вы ввели")
+    test:
+      path: index.php
+      selector: a[href="./login.php?logout=1"]
+
+  search:
+    paths:
+      - path: tracker.php
+    inputs:
+      $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{else}}f[]=-1{{end}}"
+      nm: "{{ .Keywords }}"
+      o: 1
+      s: 2
+      tm: -1
+      sns: -1
+
+    rows:
+      selector: tr[id^="tor_"]
+
+    fields:
+      title:
+        selector: a.genmed
+        filters:
+          - name: replace
+            args: [" / ", " "]
+          - name: replace
+            args: ["Кураж-Бамбей", "kurazh"]
+          - name: replace
+            args: ["Кубик в Кубе", "Kubik"]
+          - name: re_replace
+            args: ["((\\([12][0-9]{3}\\))(.+)\\([Сс]езон\\s+(\\d+).+[Сс]ери[ия]\\s+(?:(\\d+-*\\d*).*\\d+)*\\))", " - S$4E$5 - rus $3"]
+          - name: re_replace
+            args: ["(\\([А-Яа-я\\W]+\\))|(^[А-Яа-я\\W\\d]+\\/ )|([а-яА-Я \\-]+,+)|([а-яА-Я]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
+          - name: replace
+            args: ["-Rip", "Rip"]
+          - name: replace
+            args: ["WEB-DL", "WEBDL"]
+          - name: replace
+            args: ["WEBDLRip", "WEBDL"]
+          - name: replace
+            args: ["HDTVRip", "HDTV"]
+      details:
+        selector: a.genmed
+        attribute: href
+      download:
+        optional: true
+        selector: a[href^="./download.php?id="]
+        attribute: href
+      category:
+        selector: td a.gen
+        attribute: href
+        filters:
+          - name: querystring
+            args: f
+      size:
+        selector: td:nth-child(6) > u
+      date:
+        selector: td:last-child > u
+      seeders:
+        selector: td.seedmed > b
+      leechers:
+        selector: td.leechmed > b
+      downloadvolumefactor:
+        case:
+          img[src="images/tor_gold.gif"]: "0"
+          img[src="images/tor_silver.gif"]: "0.5"
+          "*": "1"
+      uploadvolumefactor:
+        text: "1"

src/Jackett.Common/Definitions/teamhd.yml

@@ -0,0 +1,99 @@
+---
+  site: teamhd
+  name: TeamHD
+  description: "TeamHD is a RUSSIAN Private Torrent Tracker for HD MOVIES / TV"
+  language: ru-ru
+  type: private
+  encoding: UTF-8
+  links:
+    - https://teamhd.org/
+
+  caps:
+    categorymappings:
+      - {id: 29, cat: Movies/HD, desc: "Movies Фильмы"}
+      - {id: 25, cat: TV/Anime, desc: "Cartoons Мультфильмы"}
+      - {id: 26, cat: Audio/Lossless, desc: "Hi-Res Audio"}
+      - {id: 27, cat: Other, desc: "Demo Демо"}
+      - {id: 28, cat: TV/Documentary, desc: "Documentary Документальное кино"}
+      - {id: 30, cat: Audio/Video, desc: "Music Video Музыкальное видео"}
+      - {id: 31, cat: TV/Sport, desc: "Sport Спорт"}
+      - {id: 32, cat: TV/HD, desc: "TV Show ТВ Шоу"}
+      - {id: 33, cat: TV/HD, desc: "Soaps Сериалы"}
+      - {id: 34, cat: TV/HD, desc: "Other"}
+      - {id: 35, cat: Movies, desc: "Content w/o subs Контент без перевода"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: div.error
+    test:
+      path: index.php
+      selector: a[href="/logout.php"]
+      
+  search:
+    paths:
+      - path: browse
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      incldead: 0
+      free: 0
+      year: ""
+
+    rows:
+      selector: table.browse > tbody > tr
+    fields:
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      title:
+        selector: a[href^="/details/id"]
+      details:
+        selector: a[href^="/details/id"]
+        attribute: href
+      category:
+        selector: a[href*="/browse/cat"]
+        attribute: href
+        filters:
+          - name: regexp
+            args: (\d+)
+      date:
+        selector: td > div > small
+        filters:
+          - name: dateparse
+            args: "02-01-2006 15:04"
+      seeders:
+        selector: td:nth-child(4)
+        filters:
+          - name: split
+            args: ["|", 0]
+      leechers:
+        selector: td:nth-child(4)
+        filters:
+          - name: split
+            args: ["|", 1]
+      grabs:
+        selector: td:nth-child(5) strong
+        filters:
+          - name: regexp
+            args: (\d+)
+      size:
+        selector: td:nth-child(5)
+        remove: strong
+      downloadvolumefactor:
+        case:
+          a[href^="/details/id"][style="color:#f2b101"]: "0"
+          a[href^="/details/id"][style="color:#828b8b"]: "0.5"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett.Common/Definitions/theshinning.yml

@@ -20,6 +20,7 @@
       - {id: 5, cat: PC, desc: "Apps"}
       - {id: 6, cat: Other, desc: "Misc"}
       - {id: 7, cat: XXX, desc: "XXX"}
+      - {id: 8, cat: Movies, desc: "Kids"}
 
     modes:
       search: [q]
@@ -56,6 +57,7 @@
     inputs:
       $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
       search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      description: ""
       uploader: ""
       imdb: "{{ .Query.IMDBIDShort }}"
       tvdb: ""
@@ -81,17 +83,24 @@
       details:
         selector: a.view-torrent
         attribute: href
+      banner:
+        optional: true
+        selector: div.torrent-poster img
+        attribute: src
+        filters:
+          - name: replace
+            args: ["https://via.placeholder.com/600x900/212121/FFFFFF/?text=NOCOVER", ""]
       size:
-        selector: td:nth-child(5)
-      seeders:
-        selector: td:nth-child(7)
-      leechers:
-        selector: td:nth-child(8)
+        selector: td:nth-last-child(4)
       grabs:
-        selector: td:nth-child(6)
+        selector: td:nth-last-child(3)
         filters:
           - name: regexp
             args: ([\d\.]+)
+      seeders:
+        selector: td:nth-last-child(2)
+      leechers:
+        selector: td:nth-last-child(1)
       date:
         selector: time
         filters:
@@ -120,12 +129,14 @@
             args: [" (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
       downloadvolumefactor:
         case:
-          "i[data-original-title=\"100% Free\"]": "0" # Single Torrent Freeleech
+          "i[data-original-title=\"Freeleech\"]": "0" # Freeleech
           "i[data-original-title=\"Global freeleech\"]": "0" # Global Freeleech
+          "i[data-original-title=\"Featured\"]": "0" # Featured
           "*": "1"
       uploadvolumefactor:
         case:
           "i[data-original-title=\"Double upload\"]": "2" # Single Torrent Double Upload
           "i[data-original-title=\"Double Upload\"]": "2" # Global Double Upload
+          "i[data-original-title=\"Featured\"]": "2" # Featured
           "*": "1"
 # UNIT3D

src/Jackett.Common/Definitions/tigers-dl.yml

@@ -0,0 +1,201 @@
+---
+  site: tigers-dl
+  name: Tigers-dl
+  description: "Tigers-dl is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
+  language: fr-fr
+  type: private
+  encoding: UTF-8
+  links:
+    - https://www.tigers-dl.net/
+
+  caps:
+    categorymappings:
+      # Cam et Screener
+      - {id: 81, cat: Movies, desc: "Cam ts / tc / Fr"}
+      - {id: 82, cat: Movies, desc: "Cam ts / tc / US"}
+      # Movies
+      - {id: 11, cat: Movies, desc: "Action"}
+      - {id: 13, cat: Movies, desc: "Animation"}
+      - {id: 14, cat: Movies, desc: "Arts Martiaux"}
+      - {id: 15, cat: Movies, desc: "Aventure"}
+      - {id: 16, cat: Movies, desc: "Biographies"}
+      - {id: 17, cat: Movies, desc: "Comedie dramatique"}
+      - {id: 18, cat: Movies, desc: "Comedie musicale"}
+      - {id: 19, cat: Movies, desc: "Comedie"}
+      - {id: 20, cat: Movies, desc: "Divers"}
+      - {id: 21, cat: Movies, desc: "Documentaires"}
+      - {id: 22, cat: Movies, desc: "Drame"}
+      - {id: 23, cat: Movies, desc: "Epouvante-horreur"}
+      - {id: 24, cat: Movies, desc: "Espionnage"}
+      - {id: 25, cat: Movies, desc: "Famille"}
+      - {id: 26, cat: Movies, desc: "Fantastique"}
+      - {id: 27, cat: Movies, desc: "Guerre"}
+      - {id: 28, cat: Movies, desc: "Historique"}
+      - {id: 29, cat: Movies, desc: "Musical"}
+      - {id: 30, cat: Movies, desc: "Peplum"}
+      - {id: 31, cat: Movies, desc: "Policier"}
+      - {id: 32, cat: Movies, desc: "Romance"}
+      - {id: 33, cat: Movies, desc: "Science fiction"}
+      - {id: 34, cat: Movies, desc: "Thriller"}
+      - {id: 35, cat: Movies, desc: "Western"}
+      - {id: 42, cat: Movies, desc: "Coffret"}
+      - {id: 43, cat: Movies, desc: "Trilogie"}
+      - {id: 71, cat: Movies, desc: "Anciens Films"}
+      # Music / Concert
+      - {id: 37, cat: Audio/MP3, desc: "Music Mp3"}
+      - {id: 38, cat: Audio, desc: "Concerts"}
+      - {id: 39, cat: Audio, desc: "Megamix"}
+      - {id: 40, cat: Audio, desc: "Compilation"}
+      - {id: 41, cat: Audio, desc: "Spectacles"}
+      # Animation
+      - {id: 45, cat: TV, desc: "wall disney"}
+      - {id: 46, cat: TV, desc: "Dessins animé"}
+      - {id: 47, cat: TV/Anime, desc: "Manga"}
+      # Apps
+      - {id: 7, cat: PC/0day, desc: "Apps Win"}
+      - {id: 8, cat: PC, desc: "Apps Linux"}
+      - {id: 9, cat: PC/Mac, desc: "Apps Mac"}
+      - {id: 77, cat: PC/Phone-Other, desc: "Mobile"}
+      # Games
+      - {id: 49, cat: PC/Games, desc: "Jeux PC"}
+      - {id: 50, cat: Console/PSP, desc: "PSP"}
+      - {id: 51, cat: Console/Wii, desc: "wii"}
+      - {id: 52, cat: Console/PS3, desc: "PS3"}
+      - {id: 53, cat: Console/PS4, desc: "PS4"}
+      - {id: 61, cat: Console/Xbox, desc: "Xbox 360"}
+      # E-BOOKS
+      - {id: 55, cat: Books, desc: "Livres français"}
+      - {id: 56, cat: Books, desc: "BD"}
+      - {id: 57, cat: Books, desc: "Journaux"}
+      - {id: 58, cat: Books, desc: "Magazines"}
+      - {id: 59, cat: Books, desc: "Cuisine"}
+      - {id: 60, cat: Books, desc: "Science"}
+      - {id: 76, cat: Books, desc: "Informatiques"}
+      # Series TV
+      - {id: 63, cat: TV/SD, desc: "Séries VF"}
+      - {id: 64, cat: TV/HD, desc: "Séries VF 720p"}
+      - {id: 65, cat: TV/HD, desc: "Séries VF 1080p"}
+      - {id: 66, cat: TV/SD, desc: "Séries VOSTFR"}
+      - {id: 67, cat: TV/HD, desc: "Séries VOSTFR 720p"}
+      - {id: 68, cat: TV/HD, desc: "Séries VOSTFR 1080p"}
+      - {id: 69, cat: TV/SD, desc: "Séries VO"}
+      - {id: 70, cat: TV, desc: "Anciennes Séries !!!"}
+      # Movies Porno
+      - {id: 73, cat: XXX, desc: "Films porno - V.I.P"}
+      - {id: 74, cat: XXX, desc: "BD porno"}
+      - {id: 75, cat: XXX, desc: "Manga"}
+
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+
+  login:
+    path: index.php?page=login
+    method: form
+    form: form[action="index.php?page=login"]
+    inputs:
+      uid: "{{ .Config.username }}"
+      pwd: "{{ .Config.password }}"
+    error:
+      - selector: td.lista span[style="color:#FF0000;"]
+    test:
+      path: index.php
+      selector: :has(a[href="logout.php"])
+
+  search:
+    paths:
+      # https://www.tigers-dl.net/index.php?page=torrents&search=venom&category=0&active=0&order=3&by=2
+      - path: index.php
+    inputs:
+      page: "torrents"
+      category: "{{range .Categories}}{{.}};{{end}}"
+      search: "{{.Keywords}}"
+      # 0=all 1=active only 2=dead only
+      active: 0
+      # 1=cat. 2=name 3=age 4=size 5=seed 6=leech 7=comm
+      order: 3
+      # 1=desc 2=asc
+      by: 2
+
+    rows:
+      selector: table.lista tr:has(a[href^="index.php?page=torrent-details"])
+    fields:
+      title:
+        selector: td a[href*="torrent-details"]
+      details:
+        selector: td a[href*="torrent-details"]
+        attribute: href
+      category:
+        selector: td a[href*="category="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: category
+      download:
+        selector: td a[href*="torrent-details"]
+        attribute: href
+        filters:
+          - name: querystring
+            args: id
+          - name: prepend
+            args: "download.php?id="
+          - name: append
+            args: "&f={{.Result.title}}.torrent"
+      banner:
+        selector: td a[href*="id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "src=(.+?) width="
+      size:
+        selector: td:nth-child(4)
+      seeders:
+        selector: td:nth-child(5)
+      leechers:
+        selector: td:nth-child(6)
+      grabs:
+        selector: td:nth-child(7)
+        filters:
+          - name: replace
+            args: ["---", "0"]
+      date:
+        selector: td:nth-child(8)
+        filters:
+        filters:
+            # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portoguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch
+          - name: re_replace
+            args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut)", "minute"]
+          - name: re_replace
+            args: ["(?i)(dakika|minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
+          - name: re_replace
+            args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur)", "hour"]
+          - name: re_replace
+            args: ["(?i)(saat|tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
+          - 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)(gün|päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
+          - name: re_replace
+            args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица)", "week"]
+          - name: re_replace
+            args: ["(?i)(hafta|nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
+          - name: re_replace
+            args: ["(?i) (ay|kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|mois|Monat|месец|maand)", "month"]
+          - name: re_replace
+            args: ["(?i) (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
+          - name: append
+            args: " ago"
+      downloadvolumefactor:
+        text: "1"
+      uploadvolumefactor:
+        text: "1"

src/Jackett.Common/Definitions/tntvillage.yml

@@ -31,6 +31,8 @@
     paths:
       - path: src/releaselist.php
         method: post
+    headers:
+      Referer: ["{{.Config.sitelink}}?releaselist"]
     inputs:
       cat: 0
       page: 1

src/Jackett.Common/Definitions/torrent9.yml

@@ -7,7 +7,7 @@
   encoding: UTF-8
   followredirect: true
   links:
-    - https://wvw.t9.pe/
+    - https://www.torrent9.cat/
 
   legacylinks:
     - http://www.torrent9.ec/
@@ -26,6 +26,7 @@
     - https://www.torrent9.uno/
     - https://wvw.torrent9.uno/
     - https://ww1.torrent9.uno/
+    - https://wvw.t9.pe/
 
   caps:
     categorymappings:
@@ -44,7 +45,7 @@
   settings: []
 
   download:
-    selector: a[href^="/downloading/"]
+    selector: a.download:contains("le Torrent")
       
   search:
     paths:
@@ -63,7 +64,9 @@
         filters:
           # now we put the date at the right place according scene naming rules using .Result.site_date
           - name: replace
-            args: ["FRENCH", "{{ .Result.site_date }} FRENCH"]
+            args: [" FRENCH", " {{ .Result.site_date }} FRENCH"]
+          - name: replace
+            args: ["MULTI", "{{ .Result.site_date }} MULTI"]
           - name: replace
             args: ["TRUEFRENCH", "{{ .Result.site_date }} TRUEFRENCH"]
           - name: replace