losslessclub: add music-search

like a yo yo

.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
@@ -27,8 +27,9 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Anime Tosho
  * AniRena
  * AudioBook Bay (ABB)
- * BTstor.net
  * btbit
+ * BTDB
+ * BTDigg
  * BTKitty
  * cpasbien
  * cpasbienClone
@@ -46,7 +47,9 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * KATcrs
  * KickAssTorrent (KATcr)
  * KickAssTorrent (thekat.se clone)
+ * KikiBT
  * LimeTorrents
+ * MacTorrents
  * MagnetDL
  * MejorTorrent <!-- maintained by ivandelabeldad -->
  * Monova
@@ -77,7 +80,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Torrent9
  * Torernt9 clone (torrents9.ch)
  * Torrentz2
- * Torrof (Torrentoff)
  * World Wide Torrents
  * YTS.ag
  * Zooqle
@@ -103,7 +105,10 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * NoName Club (NNM-Club)
  * RockBox
  * RuTracker
+ * Sharewood
  * SkTorrent
+ * SoundPark
+ * Torrents-Local
  * Union Fansub
  * Vanila
  * XtreMeZone (MYXZ)
@@ -114,10 +119,10 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * 2 Fast 4 You
  * 3D Torrents (3DT) 
  * 3evils
- * 420files
  * 720pier
  * Abnormal
  * Acid Lounge (A-L)
+ * Aftershock
  * AlphaRatio (AR)
  * AmigosShareClub
  * AnimeBytes (AB)
@@ -125,13 +130,13 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Anthelion
  * AOX (Chippu)
  * Araba Fenice (Phoenix)
- * ArcheTorrent
  * AsianCinema
  * AsianDVDClub
  * AST4u
  * Audiobook Torrents (ABT)
  * AudioNews (AN)
  * Awesome-HD (AHD)
+ * AVG (Audio Video Games)
  * Avistaz (AsiaTorrents)
  * B2S-Share
  * Back-ups
@@ -142,13 +147,14 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * BigTower
  * Bit-City Reloaded
  * BIT-HDTV
+ * BiT-TiTAN
  * Bithorlo (BHO)
  * BitHUmen
  * BitMe
  * BitMeTV
  * BitsPiracy
  * Bitspyder
- * BitTorrentFiles  [![(invite needed)][inviteneeded]](#)
+ * BitTorrentFiles
  * BitTurk
  * BJ-Share (BJ)
  * BlueBird
@@ -158,20 +164,25 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * BrokenStones
  * BTGigs (TG)
  * BTNext (BTNT)
- * BTXpress (BTX)
  * Carpathians
  * CartoonChaos (CC)
+ * CasaTorrent
  * CasStudioTV
  * CCFBits
  * CGPeers
  * CHDBits
+ * ChannelX
+ * CiNEFiLHD
  * Cinemageddon
  * Cinematik
  * CinemaZ (EuTorrents)
  * Classix
  * CrnaBerza
  * DanishBits (DB)
+ * Dark-Shadow
+ * Das Unerwartete
  * DataScene (DS)
+ * DesiReleasers
  * DesiTorrents
  * Diablo Torrent
  * DigitalCore
@@ -191,7 +202,9 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * FANO.IN
  * FileList (FL)
  * Femdomcult
+ * FocusX
  * Freedom-HD (Freedom Paradise)
+ * FreeTorrent
  * FullMixMusic
  * FunFile (FF)
  * FunkyTorrents (FT)
@@ -258,11 +271,14 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * notwhat.cd
  * Orpheus
  * Ourbits (HDPter)
+ * P2PBG
  * Passione Torrent <!-- maintained by bonny1992 -->
  * PassThePopcorn (PTP)
+ * Peers.FM
  * PiratBit
  * PirateTheNet (PTN)
  * PiXELHD (PxHD)
+ * Pleasuredome
  * PolishSource (PS)
  * PolishTracker
  * Pretome
@@ -278,7 +294,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * RacingForMe (RFM)
  * Redacted (PassTheHeadphones)
  * Red Star Torrent (RST)
- * Redtopia (RED)
  * RetroFlix
  * RevolutionTT
  * RGU
@@ -317,12 +332,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
@@ -348,10 +364,12 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Vizuk
  * Waffles
  * World-In-HD
+ * World-of-Tomorrow
  * WorldOfP2P (WOP)
  * x-ite.me (XM)
  * xBytesV2
  * XSpeeds (XS)
+ * XKTorrent
  * XWTorrents (XWT)
  * Xthor
  * ExoticaZ (YourExotic)
@@ -375,8 +393,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:
@@ -392,24 +410,34 @@ 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
+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
+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.
@@ -424,20 +452,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.
 
@@ -445,14 +474,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.
 
@@ -545,7 +577,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
@@ -558,14 +590,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

@@ -21,7 +21,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,7 @@ 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_macos_mono", buildOutputPath);
 		CopyFileToDirectory("./install_service_systemd_mono.sh", buildOutputPath);
 		CopyFileToDirectory("./Upstart.config", buildOutputPath);
 
@@ -165,7 +165,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 +290,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(() =>
@@ -395,6 +405,19 @@ private void Gzip(string sourceFolder, string outputDirectory, string tarCdirect
 		RunLinuxCommand("find",  MakeAbsolute(Directory(sourceFolder)) + @" -type f -exec chmod 644 {} \;");
 		RunLinuxCommand("chmod", $"755 {MakeAbsolute(Directory(sourceFolder))}/Jackett/jackett");
 		RunLinuxCommand("chmod", $"755 {MakeAbsolute(Directory(sourceFolder))}/Jackett/JackettUpdater");
+
+		string systemdScript = MakeAbsolute(Directory(sourceFolder)) + "/Jackett/install_service_systemd.sh";
+		if (FileExists(systemdScript))
+		{
+			RunLinuxCommand("chmod", $"755 {systemdScript}");
+		}
+
+		string macOsServiceScript = MakeAbsolute(Directory(sourceFolder)) + "/Jackett/install_service_macos";
+		if (FileExists(macOsServiceScript))
+		{
+			RunLinuxCommand("chmod", $"755 {macOsServiceScript}");
+		}
+
 		RunLinuxCommand("tar",  $"-C {sourceFolder} -zcvf {outputDirectory}/{tarFileName}.gz {tarCdirectoryOption}");
 	}	
 }
@@ -416,12 +439,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_macos_mono

@@ -0,0 +1,77 @@
+#!/bin/bash
+
+#Setting up colors
+BOLDRED="$(printf '\033[1;31m')"
+BOLDGREEN="$(printf '\033[1;32m')"
+NC="$(printf '\033[0m')" # No Color
+
+# Stop and unload the service if it's running
+launchctl remove org.user.Jackett
+
+# Move working directory to Jackett's
+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?"
+    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."
+    exit 1
+fi
+
+# Write the plist to LaunchAgents
+mkdir -p ~/Library/LaunchAgents/
+cat >~/Library/LaunchAgents/org.user.Jackett.plist <<EOL
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>EnvironmentVariables</key>
+    <dict>
+        <key>PATH</key>
+        <string>/usr/bin:/bin:/usr/sbin:/sbin:${monodir}</string>
+    </dict>
+    <key>KeepAlive</key>
+    <true/>
+    <key>Label</key>
+    <string>org.user.Jackett</string>
+    <key>ProgramArguments</key>
+    <array>
+        <string>${monodir}/mono</string>
+        <string>--debug</string>
+        <string>JackettConsole.exe</string>
+        <string>--NoRestart</string>
+    </array>
+    <key>RunAtLoad</key>
+    <true/>
+    <key>WorkingDirectory</key>
+    <string>${jackettdir}</string>
+</dict>
+</plist>
+
+EOL
+
+# Run the agent
+launchctl load ~/Library/LaunchAgents/org.user.Jackett.plist
+
+# Check that it's running
+if [[ $(launchctl list | grep org.user.Jackett) ]]; then
+echo "${BOLDGREEN}Agent successfully installed and launched!${NC}"
+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
+fi

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

@@ -100,6 +100,7 @@ function loadJackettSettings() {
         })
 
         reloadIndexers();
+        proxyWarning(data.proxy_url);
     });
 }
 
@@ -1221,4 +1222,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

@@ -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">
@@ -87,8 +87,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 +140,12 @@
                 <option value="2">socks5</option>
             </select>
         </div>
+        <div id="proxy-warning" hidden>
+            <span>
+                WARNING: The proxy option is unstable and potentially leaks requests. If no fix from the community is forthcoming 
+                in the next few months, the proxy option will be removed from Jackett. 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 +671,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=20190401"></script>
 </body>
 </html>

src/Jackett.Common/Definitions/3evils.yml

@@ -58,6 +58,7 @@
     inputs:
       $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
       search: "{{.Keywords}}"
+      searchin: "title"
       incldead: 1
     rows:
       selector: table.table-bordered tr:has(a[href^="browse.php?cat="])
@@ -89,8 +90,19 @@
         filters:
           - name: replace
             args: ["details.php?id=", "download.php?torrent="]
+      banner:
+        selector: a[href^="details.php?id="][onmouseover]
+        attribute: onmouseover
+        filters:
+            #  onmouseover="Tip('<b>blahblah /><img src=\'/imdb/images/0090293.jpg\' blahblah />');"
+          - name: regexp
+            args: "/imdb/(.*?).jpg"
+          - name: prepend
+            args: "/imdb/"
+          - name: append
+            args: ".jpg"
       size:
-        selector: td:nth-last-child(6)
+        selector: td:nth-last-child(4)
       files:
         selector: a[href^="filelist.php?id="]
       grabs:
@@ -103,11 +115,11 @@
         # Today<br /> 10:20 AM
         # Yesterday<br /> 08:03 PM
         optional: true
-        selector: td:nth-last-child(7):contains("day")
+        selector: td:nth-last-child(5):contains("day")
       date:
         # Feb 14 2019<br /> 10:20 AM
         optional: true
-        selector: td:nth-last-child(7):not(:contains("day"))
+        selector: td:nth-last-child(5):not(:contains("day"))
         filters:
           - name: dateparse
             args: "Jan 2 2006 03:04 pm"

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

@@ -0,0 +1,142 @@
+---
+  site: aftershock
+  name: Aftershock
+  description: "Aftershock is a HUNGARIAN Private Torrent Tracker for MOVIES / GENERAL"
+  language: hu-hu
+  type: private
+  encoding: iso-8859-1
+  links:
+    - https://aftershock-tracker.eu/
+
+  caps:
+    categorymappings:
+      - {id: 7, cat: Movies/SD, desc: "XvidEng"}
+      - {id: 2, cat: Movies, desc: "AfterShock Release"}
+      - {id: 190, cat: Movies/DVD, desc: "DVD-9Eng"}
+      - {id: 191, cat: Movies/DVD, desc: "DVD-9Hun"}
+      - {id: 1, cat: Movies/DVD, desc: "DVDEng"}
+      - {id: 4, cat: Movies/DVD, desc: "DVDHun"}
+      - {id: 23, cat: Books/Ebook, desc: "E-Book"}
+      - {id: 3, cat: Movies, desc: "Film Pack"}
+      - {id: 185, cat: Audio/Lossless, desc: "FLACeng"}
+      - {id: 188, cat: Audio/Lossless, desc: "FLAChu"}
+      - {id: 173, cat: Audio/Audiobook, desc: "Hangoskönyv"}
+      - {id: 34, cat: Movies/HD, desc: "HDEng"}
+      - {id: 33, cat: Movies/HD, desc: "HDHun"}
+      - {id: 182, cat: XXX/x264, desc: "HDXXX"}
+      - {id: 12, cat: PC/Games, desc: "JátékIso"}
+      - {id: 130, cat: Console, desc: "JátékKonzol"}
+      - {id: 38, cat: Console/PSP, desc: "JátékPS2"}
+      - {id: 44, cat: Console, desc: "Jatekrip"}
+      - {id: 131, cat: Console/Xbox, desc: "JátékX-box"}
+      - {id: 140, cat: Other, desc: "Képek"}
+      - {id: 141, cat: Other, desc: "Klipek"}
+      - {id: 154, cat: Other, desc: "MeseEng"}
+      - {id: 155, cat: Other, desc: "MeseHun"}
+      - {id: 176, cat: Other, desc: "Mikro HDEng"}
+      - {id: 174, cat: Other, desc: "Mikro HDHun"}
+      - {id: 37, cat: PC/Phone-Other, desc: "MobilPDA"}
+      - {id: 35, cat: PC, desc: "ProgramEgyéb"}
+      - {id: 170, cat: PC/ISO, desc: "ProgramIso"}
+      - {id: 24, cat: TV, desc: "Sorozat Eng"}
+      - {id: 25, cat: TV, desc: "Sorozat Hun"}
+      - {id: 167, cat: Movies/SD, desc: "Xvid CamEng"}
+      - {id: 166, cat: Movies/SD, desc: "Xvid CamHun"}
+      - {id: 9, cat: Movies/SD, desc: "XvidHun"}
+      - {id: 169, cat: XXX/Imageset, desc: "XXX Képek"}
+      - {id: 39, cat: XXX, desc: "XXXFilm"}
+      - {id: 28, cat: Audio, desc: "ZeneEng"}
+      - {id: 29, cat: Audio, desc: "ZeneHun"}
+
+    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:contains("Hiba")
+        message:
+          selector: td.text
+    test:
+      path: /
+      selector: a[href="/logout.php"]
+
+  ratio:
+    path: /
+    selector: p.sajatadatok font
+    filters:
+      - name: replace
+        args: [",", ""]
+
+  search:
+    paths:
+      - path: browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      incldead: 1
+    rows:
+      selector: table tbody#torrent_background tr:has(a.index)
+    fields:
+      title:
+        selector: a.index
+        attribute: href
+        filters:
+          - name: querystring
+            args: name
+          - name: urldecode
+      category:
+        selector: td a[href^="/browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      details:
+        selector: a.index
+        attribute: href
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+        filters:
+          - name: urldecode
+      banner:
+        selector: a[onmouseover]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "src=(.*?) width="
+      imdb:
+        optional: true
+        selector: a[href^="https://www.imdb.com/title"]
+        attribute: href
+      files:
+        selector: td:nth-last-child(6)
+      size:
+        selector: td:nth-last-child(5)
+      seeders:
+        selector: td:nth-last-child(4)
+      leechers:
+        selector: td:nth-last-child(3)
+      grabs:
+        selector: td:nth-last-child(2)
+      date:
+        selector: td font
+        filters:
+          - name: re_replace
+            args: ["\\s", " "]
+          - name: dateparse
+            args: "2006-01-02 15:04:05"
+      downloadvolumefactor:
+        case:
+          span.icon_gift: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          span.icon_upload: "2"
+          "*": "1"

src/Jackett.Common/Definitions/amigosshare.yml

@@ -10,8 +10,22 @@
   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"}
+      - {id: 108, cat: XXX, desc: "Adultos: Transex/Female"}
       - {id: 74, cat: XXX, desc: "Adultos: XXX"}
       - {id: 75, cat: XXX, desc: "Adultos: Hentai"}
       - {id: 69, cat: TV/Anime, desc: "Anime: Anime"}
@@ -46,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"}
@@ -59,6 +73,8 @@
       - {id: 56, cat: Console/Xbox, desc: "Jogos: Xbox"}
       - {id: 55, cat: Console/Wii, desc: "Jogos: Wii"}
       - {id: 58, cat: Console/NDS, desc: "Jogos: Nintendo DS"}
+      - {id: 111, cat: Console, desc: "Jogos: Nintendo Swich"}
+      - {id: 110, cat: Console, desc: "Jogos: Nintendo Switch"}
       - {id: 57, cat: Console, desc: "Jogos: Android"}
       - {id: 82, cat: Console/PSP, desc: "Jogos: PSP"}
       - {id: 78, cat: Console/Xbox One, desc: "Jogos: Xbox One"}
@@ -126,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
@@ -153,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: table > tbody > tr:has(a[href^="torrents-details.php?id="])
     fields:
       title:
         selector: a[href^="torrents-details.php?id="]
@@ -169,6 +185,12 @@
       download:
         selector: a[href^="download.php?id="]
         attribute: href
+      banner:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: title
+        filters:
+          - name: regexp
+            args: "src=\"(.*?)\""
       category:
         selector: td:first-child img
         attribute: src
@@ -191,7 +213,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"
@@ -277,14 +299,14 @@
       date:
         text: now
       size:
-        selector: td:nth-child(2) span.label-info
+        selector: td:nth-child(2) span.badge-info
       seeders:
         selector: td:nth-child(4)
       leechers:
         selector: td:nth-child(5)
       downloadvolumefactor:
         case:
-          "span.label-success i:contains(\"FREE\")": "0"
+          "span.badge-success:contains(\"FREE\")": "0"
           "*": "1"
       uploadvolumefactor:
         case:

src/Jackett.Common/Definitions/anidex.yml

@@ -31,20 +31,18 @@
       tv-search: [q, season, ep]
 
   settings:
-    - name: cat-id
-      type: text
-      label: Category Id
-    - name: info
-      type: info
-      label: Category Id Note
-      default: "You can filter your searches by using any of the following category numbers (comma delimited):<br>1 :Anime - Sub<br>2 :Anime - Raw<br>3 :Anime - Dub<br>4 :LA - Sub<br>5 :LA - Raw<br>6 :Light Novel<br>7 :Manga - TLed<br>8 :Manga - Raw<br>9 :♫ - Lossy<br>10 :♫ - Lossless<br>11 :♫ - Video<br>12 :Games<br>13 :Applications<br>14 :Pictures<br>15 :Adult Video<br>16 :Other"
     - name: lang-id
       type: text
-      label: Language Id
+      label: Language ID
+    - name: info
+      type: info
+      label: Language ID Note
+      default: "You can filter your searches using any of the following language ID (comma delimited):<br>19 :Arabic<br>22 :Bengali<br>14 :Bulgarian<br>21 :Chinese (Simplified)<br>24 :Czech<br>20 :Danish<br>5 :Dutch<br>1 :English<br>11 :Finnish<br>10 :French<br>8 :German<br>13 :Greek<br>9 :Hungarian<br>27 :Indonesian<br>6 :Italian<br>2 :Japanese<br>28 :Korean<br>31 :Malaysian<br>25 :Mongolian<br>30 :Persian<br>3 :Polish<br>16 :Portuguese (Brazil)<br>17 :Portuguese (Portugal)<br>23 :Romanian<br>7 :Russian<br>4 :Serbo-Croatian<br>29 :Spanish (LATAM)<br>15 :Spanish (Spain)<br>18 :Swedish<br>26 :Turkish<br>12 :Vietnamese"
 
   search:
     paths:
-      - path: "?{{if .Config.cat-id}}id={{.Config.cat-id }}&{{else}}{{end}}{{if .Config.lang-id}}lang_id={{.Config.lang-id}}&{{else}}{{end}}q={{if .Keywords}}{{.Keywords}}{{else}}{{end}}"
+    # https://anidex.info/?page=search&id=1,2,3&lang_id=5,1,10&group_id=0&q=rinshi
+      - path: "?page=search&id={{if .Categories}}{{range .Categories}}{{.}},{{end}}{{else}}0{{end}}{{if .Config.lang-id}}&lang_id={{.Config.lang-id}}{{else}}{{end}}&group_id=0&q={{if .Keywords}}{{.Keywords}}{{else}}{{end}}"
     rows:
       selector: div.table-responsive > table > tbody > tr
     fields:

src/Jackett.Common/Definitions/archetorrent.yml

@@ -1,206 +0,0 @@
----
-  site: archetorrent
-  name: ArcheTorrent
-  description: "ArcheTorrent is a FRENCH Private Torrent Tracker"
-  language: fr-fr
-  type: private
-  encoding: UTF-8
-  links:
-    - https://archetorrent.com/
-    
-  settings:
-    - name: username
-      type: text
-      label: Username
-    - name: password
-      type: password
-      label: Password
-    - name: filter_title
-      type: checkbox
-      label: Try to normalize releases names by moving year after the title
-      default: false
-    - name: multilang
-      type: checkbox
-      label: Replace MULTI by another language in release name
-      default:  false
-    - name: multilanguage
-      type: select
-      label: Replace MULTI by this language
-      default: FRENCH
-      options:
-        FRENCH : "FRENCH"
-        MULTI.FRENCH: "MULTI.FRENCH"
-        ENGLISH: "ENGLISH"
-        MULTI.ENGLISH: "MULTI.ENGLISH"
-        VOSTFR: "VOSTFR"
-        MULTI.VOSTFR: "MULTI.VOSTFR"
-    - name: vostfr
-      type: checkbox
-      label: Replace VOSTFR with ENGLISH
-      default:  false
-        
-  caps:
-    categorymappings:
-      - {id: 18, cat: PC, desc: "Applications: PC"}
-      - {id: 19, cat: PC/Mac, desc: "Applications: Mac"}
-      - {id: 54, cat: PC, desc: "Applications: linux"}
-      - {id: 56, cat: XXX/Other, desc: "Autres: ebook xxx"}
-      - {id: 36, cat: Books, desc: "Autres: E-Books"}
-      - {id: 37, cat: Other, desc: "Autres: Images"}
-      - {id: 38, cat: PC/Phone-Other, desc: "Autres: Telephone-mobile"}
-      - {id: 47, cat: Movies, desc: "Films: Animé"}
-      - {id: 1, cat: Movies/DVD, desc: "Films: DVD"}
-      - {id: 2, cat: Movies/SD, desc: "Films: Dvdrip"}
-      - {id: 68, cat: Movies, desc: "Films: TAT Releases"}
-      - {id: 70, cat: Movies/HD, desc: "Films: UHD 4K"}
-      - {id: 69, cat: Movies, desc: "Films: Retro"}
-      - {id: 3, cat: Movies/HD, desc: "Films: HD1080"}
-      - {id: 42, cat: Movies/HD, desc: "Films: HD720"}
-      - {id: 4, cat: Movies, desc: "Films: Cam/Ts"}
-      - {id: 22, cat: Movies/BluRay, desc: "Films: bluray"}
-      - {id: 23, cat: Movies/3D, desc: "Films: 3D"}
-      - {id: 24, cat: Movies/Foreign, desc: "Films: VOSTFR"}
-      - {id: 25, cat: XXX, desc: "Films: Adulte"}
-      - {id: 48, cat: TV/Documentary, desc: "Films: Documentaire"}
-      - {id: 49, cat: Movies/Other, desc: "Films: Spectacle"}
-      - {id: 51, cat: Movies/SD, desc: "Films: R5"}
-      - {id: 52, cat: Movies/SD, desc: "Films: bdrip"}
-      - {id: 53, cat: Movies/SD, desc: "Films: brrip"}
-      - {id: 55, cat: Movies/DVD, desc: "Films: dvd-pack"}
-      - {id: 57, cat: Movies, desc: "Films: manga"}
-      - {id: 59, cat: Movies/WEBDL, desc: "Films: Webrip"}
-      - {id: 63, cat: Movies/SD, desc: "Films: M-HD"}
-      - {id: 10, cat: PC/Games, desc: "Jeux: PC"}
-      - {id: 11, cat: Console/Other, desc: "Jeux: PS2"}
-      - {id: 43, cat: Console/PS3, desc: "Jeux: PS3"}
-      - {id: 12, cat: Console/PSP, desc: "Jeux: PSP"}
-      - {id: 14, cat: Console/Xbox 360, desc: "Jeux: Xbox360"}
-      - {id: 44, cat: Console/Wii, desc: "Jeux: Wii"}
-      - {id: 45, cat: Console/NDS, desc: "Jeux: DS"}
-      - {id: 27, cat: Audio/Video, desc: "Musique: Clip Video"}
-      - {id: 62, cat: TV/SD, desc: "Serie tv: TV BDRip"}
-      - {id: 5, cat: TV/SD, desc: "Serie tv: Dvdrip"}
-      - {id: 41, cat: TV/HD, desc: "Serie tv: Hd"}
-      - {id: 60, cat: TV/SD, desc: "Serie tv: pack série tv"}
-      - {id: 64, cat: TV/FOREIGN, desc: "Serie tv: vostfr"}
-      - {id: 65, cat: TV/HD, desc: "Serie tv: Série tv 720P"}
-      - {id: 66, cat: TV/HD, desc: "Serie tv: Série tv 1080P"}
-      - {id: 67, cat: TV/HD, desc: "Serie tv: Série tv PackHD"}
-      - {id: 73, cat: TV/Anime, desc: "Serie tv: Anime "}
-      - {id: 72, cat: TV/Sport, desc: "Sport: sport"}
-      - {id: 61, cat: TV/SD, desc: "Tv: DVDRip"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: account-login.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: form:contains("Erreur")
-        message:
-          selector: form
-          remove: table
-    test:
-      path: torrents-search.php
-
-  search:
-    keywordsfilters:
-      - name: replace
-        args: ["-", " "] # remove special search character (negative search)
-      - name: replace
-        args: ["+", " "] # remove special search character (positive search)
-      - name: re_replace
-        args: ["(\\w+)", " +$1"] # prepend + to each word
-    paths:
-      - path: torrents-search.php
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Keywords }}"
-      incldead: "1"
-
-    rows:
-      selector: table.ttable_headinner > tbody > tr[class^="t-row"]
-    fields:
-      download:
-        selector: a[href^="torrents-details.php?id="]
-        attribute: href
-        filters:
-          - name: replace
-            args: ["torrents-details.php", "download.php"]
-      date:
-        selector: td:nth-child(3) a
-        attribute: onmouseover
-        filters:
-          - name: regexp
-            args: "Poster le: </b>(.*?)<br />"
-          - name: dateparse
-            args: "02-01-2006"
-            
-      title_normal:
-        selector: a[href^="torrents-details.php?id="]
-        filters:
-          - name: replace
-            args: [" - (Nouveau!)", ""]
-      title_filtered:
-        selector: a[href^="torrents-details.php?id="]
-        filters:
-          - name: replace
-            args: [" - (Nouveau!)", ""]
-          - name: re_replace
-            args: ["(?i)^(?:(.+?)((?:[\\.\\-\\s_\\[]+(?:imax|(?:dvd|bd|tv)(?:rip|scr)|bluray(?:\\-?rip)?|720\\s*p?|1080\\s*p?|vof?|vost(?:fr)?|multi|vf(?:f|q)?[1-3]?|(?:true)?french|eng?)[\\.\\-\\s_\\]]*)*)([\\(\\[]?(?:20|1[7-9])\\d{2}[\\)\\]]?)(.*)$|(.*))$", "$1 $3 $2 $4 $5"]
-          - name: replace
-            args: [".", " "]
-          - name: trim
-          - name: re_replace
-            args: ["(?i)\\s(mkv|avi|divx|xvid|mp4)$", ""]
-          - name: re_replace
-            args: ["(\\s{2,5})", " "]
-          - name: trim
-      title_phase1:
-        text: "{{if .Config.filter_title }}{{ .Result.title_filtered }}{{else}}{{ .Result.title_normal }}{{end}}"
-      title_multilang:
-        text: "{{ .Result.title_phase1 }}"
-        filters:
-          - name: re_replace
-            args: ["[\\.\\s\\[\\-][Mm][Uu][Ll][Tt][Ii][\\.\\s\\]\\-]", ".{{ .Config.multilanguage }}."]
-      title_phase2:
-        text: "{{if .Config.multilang }}{{ .Result.title_multilang }}{{else}}{{ .Result.title_phase1 }}{{end}}"
-      title_vostfr:
-        text: "{{ .Result.title_phase2 }}"
-        filters:
-          - name: re_replace
-            args: ["[\\.\\s\\[\\-][Vv][Oo][Ss][Tt][Ff][Rr][\\.\\s\\]\\-]", ".ENGLISH."]
-      title:
-        text: "{{if .Config.vostfr }}{{ .Result.title_vostfr }}{{else}}{{ .Result.title_phase2 }}{{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
-      banner:
-        selector: img.rounded-img
-        attribute: src
-      size:
-        selector: td:nth-child(6)
-      grabs:
-        selector: td:nth-child(9) font b
-      seeders:
-        selector: td:nth-child(7) font b
-      leechers:
-        selector: td:nth-child(8) font b
-      downloadvolumefactor:
-        case:
-          img[title="freeleech"]: "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"

src/Jackett.Common/Definitions/arenabg.yml

@@ -68,6 +68,21 @@
       tv-search: [q, season, ep]
       movie-search: [q]
 
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: downloadlink
+      type: select
+      label: Download link
+      default: "magnet:?xt="
+      options:
+        "/get/key:" : ".torrent"
+        "magnet:?xt=": "magnet"
+
   login:
     path: /
     method: form
@@ -85,7 +100,7 @@
       selector: a[href="/users/logout/"]
 
   download:
-    selector: a[href^="magnet:?"]
+    selector: a[href*="{{ .Config.downloadlink }}"]
 
   search:
     paths:
@@ -122,14 +137,14 @@
         selector: td:nth-child(4)
       date:
           # 08:49:09
-        selector: td:nth-child(3):has(":")
+        selector: td:nth-child(3):contains(":")
         optional: true
         filters:
           - name: dateparse
             args: "15:04:05"
       date:
           # 2018-10-19
-        selector: td:nth-child(3):has("-")
+        selector: td:nth-child(3):contains("-")
         optional: true
         filters:
           - name: dateparse

src/Jackett.Common/Definitions/asiancinema.yml

@@ -25,10 +25,19 @@
     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+)"
 
   search:
     paths:
@@ -36,23 +45,24 @@
     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:
@@ -61,17 +71,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)
       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,11 +121,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 1.9.2

src/Jackett.Common/Definitions/audiobookbay.yml

@@ -11,61 +11,64 @@
 
   caps:
     categorymappings:
-      - {id: Children, cat: Audio/Audiobook, desc: "Children"}
-      - {id: Teen, cat: Audio/Audiobook, desc: "Teen & Young Adult"}
-      - {id: Adults, cat: Audio/Audiobook, desc: "Adults"}
-      - {id: The, cat: Audio/Audiobook, desc: "The Undead"}
+      - {id: "(Post)apocalyptic", cat: Audio/Audiobook, desc: "(Post)apocalyptic"}
+      - {id: "True", cat: Audio/Audiobook, desc: "True Crime"}
       - {id: Action, cat: Audio/Audiobook, desc: "Action"}
+      - {id: Adults, cat: Audio/Audiobook, desc: "Adults"}
       - {id: Adventure, cat: Audio/Audiobook, desc: "Adventure"}
+      - {id: Anthology, cat: Audio/Audiobook, desc: "Anthology"}
       - {id: Art, cat: Audio/Audiobook, desc: "Art"}
       - {id: Autobiography, cat: Audio/Audiobook, desc: "Autobiography & Biographies"}
+      - {id: Bestsellers, cat: Audio/Audiobook, desc: "Bestsellers"}
       - {id: Business, cat: Audio/Audiobook, desc: "Business"}
+      - {id: Children, cat: Audio/Audiobook, desc: "Children"}
+      - {id: Classic, cat: Audio/Audiobook, desc: "Classic"}
       - {id: Computer, cat: Audio/Audiobook, desc: "Computer"}
       - {id: Contemporary, cat: Audio/Audiobook, desc: "Contemporary"}
       - {id: Crime, cat: Audio/Audiobook, desc: "Crime"}
       - {id: Detective, cat: Audio/Audiobook, desc: "Detective"}
       - {id: Doctor, cat: Audio/Audiobook, desc: "Doctor Who"}
+      - {id: Documentary, cat: Audio/Audiobook, desc: "Documentary"}
       - {id: Education, cat: Audio/Audiobook, desc: "Education"}
       - {id: Fantasy, cat: Audio/Audiobook, desc: "Fantasy"}
+      - {id: Full, cat: Audio/Audiobook, desc: "Full Cast"}
+      - {id: Gay, cat: Audio/Audiobook, desc: "Gay"}
       - {id: General, cat: Audio/Audiobook, desc: "General Fiction"}
       - {id: Historical, cat: Audio/Audiobook, desc: "Historical Fiction"}
       - {id: History, cat: Audio/Audiobook, desc: "History"}
       - {id: Horror, cat: Audio/Audiobook, desc: "Horror"}
       - {id: Humor, cat: Audio/Audiobook, desc: "Humor"}
-      - {id: Lecture, cat: Audio/Audiobook, desc: "Lecture"}
       - {id: LGBT, cat: Audio/Audiobook, desc: "LGBT"}
-      - {id: Literature, cat: Audio/Audiobook, desc: "Literature"}
+      - {id: Lecture, cat: Audio/Audiobook, desc: "Lecture"}
+      - {id: Lesbian, cat: Audio/Audiobook, desc: "Lesbian"}
+      - {id: Libertarian, cat: Audio/Audiobook, desc: "Libertarian"}
       - {id: LitRPG, cat: Audio/Audiobook, desc: "LitRPG"}
+      - {id: Literature, cat: Audio/Audiobook, desc: "Literature"}
+      - {id: Military, cat: Audio/Audiobook, desc: "Military"}
       - {id: Misc., cat: Audio/Audiobook, desc: "Misc. Non-fiction"}
       - {id: Mystery, cat: Audio/Audiobook, desc: "Mystery"}
-      - {id: Myth, cat: Audio/Audiobook, desc: "Myth Hunting"}
+      - {id: Novel, cat: Audio/Audiobook, desc: "Novel"}
+      - {id: Other, cat: Audio/Audiobook, desc: "Other"}
       - {id: Paranormal, cat: Audio/Audiobook, desc: "Paranormal"}
       - {id: Plays, cat: Audio/Audiobook, desc: "Plays & Theater"}
       - {id: Poetry, cat: Audio/Audiobook, desc: "Poetry"}
       - {id: Political, cat: Audio/Audiobook, desc: "Political"}
-      - {id: Postapocalyptic, cat: Audio/Audiobook, desc: "Postapocalyptic"}
       - {id: Radio, cat: Audio/Audiobook, desc: "Radio Productions"}
       - {id: Romance, cat: Audio/Audiobook, desc: "Romance"}
       - {id: Sci-Fi, cat: Audio/Audiobook, desc: "Sci-Fi"}
       - {id: Science, cat: Audio/Audiobook, desc: "Science"}
       - {id: Self-help, cat: Audio/Audiobook, desc: "Self-help"}
-      - {id: SHTF, cat: Audio/Audiobook, desc: "SHTF"}
+      - {id: Sex, cat: Audio/Audiobook, desc: "Sex Scenes"}
+      - {id: Short, cat: Audio/Audiobook, desc: "Short Story"}
       - {id: Spiritual, cat: Audio/Audiobook, desc: "Spiritual & Religious"}
       - {id: Sports, cat: Audio/Audiobook, desc: "Sports"}
       - {id: Suspense, cat: Audio/Audiobook, desc: "Suspense"}
+      - {id: Teen, cat: Audio/Audiobook, desc: "Teen & Young Adult"}
+      - {id: The, cat: Audio/Audiobook, desc: "The Undead"}
       - {id: Thriller, cat: Audio/Audiobook, desc: "Thriller"}
-      - {id: "True", cat: Audio/Audiobook, desc: "True Crime"}
       - {id: Tutorial, cat: Audio/Audiobook, desc: "Tutorial"}
+      - {id: Violence, cat: Audio/Audiobook, desc: "Violence"}
       - {id: Westerns, cat: Audio/Audiobook, desc: "Westerns"}
-      - {id: Anthology, cat: Audio/Audiobook, desc: "Anthology"}
-      - {id: Bestsellers, cat: Audio/Audiobook, desc: "Bestsellers"}
-      - {id: Classic, cat: Audio/Audiobook, desc: "Classic"}
-      - {id: Documentary, cat: Audio/Audiobook, desc: "Documentary"}
-      - {id: Full, cat: Audio/Audiobook, desc: "Full Cast"}
-      - {id: Libertarian, cat: Audio/Audiobook, desc: "Libertarian"}
-      - {id: Military, cat: Audio/Audiobook, desc: "Military"}
-      - {id: Novel, cat: Audio/Audiobook, desc: "Novel"}
-      - {id: Short, cat: Audio/Audiobook, desc: "Short Story"}
 
     modes:
       search: [q]
@@ -130,3 +133,11 @@
         filters:
           - name: regexp
             args: "File Size: (.+?)s"
+      seeders:
+        text: 1
+      leechers:
+        text: 1
+      downloadvolumefactor:
+        text: 0
+      uploadvolumefactor:
+        text: 1

src/Jackett.Common/Definitions/audiobooktorrents.yml

@@ -43,8 +43,6 @@
 
     modes:
       search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
 
   login:
     path: takelogin.php

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/bit-titan.yml

@@ -0,0 +1,172 @@
+---
+  site: bit-titan
+  name: BiT-TiTAN
+  description: "BiT-TiTAN is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+  language: de-de
+  type: private
+  encoding: iso-8859-1
+  links:
+    - https://bit-titan.net/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: TV/Documentary, desc: "Doku HD"}
+      - {id: 2, cat: TV/Documentary, desc: "Doku Packs"}
+      - {id: 3, cat: TV/Documentary, desc: "Doku SD"}
+      - {id: 4, cat: Movies/FOREIGN, desc: "International"}
+      - {id: 5, cat: Movies/HD, desc: "Movies 1080p"}
+      - {id: 6, cat: Movies/3D, desc: "Movies 3D"}
+      - {id: 7, cat: Movies/HD, desc: "Movies 720p"}
+      - {id: 36, cat: Movies/BluRay, desc: "Movies BluRay"}
+      - {id: 8, cat: Movies/DVD, desc: "Movies DVD / HDVD"}
+      - {id: 37, cat: Movies/HD, desc: "Movies HD Pack"}
+      - {id: 9, cat: Movies/SD, desc: "Movies SD"}
+      - {id: 38, cat: Movies/SD, desc: "Movies SD Pack"}
+      - {id: 10, cat: Movies/UHD, desc: "Movies UHD"}
+      - {id: 11, cat: TV/HD, desc: "Serien HD"}
+      - {id: 12, cat: TV/OTHER, desc: "Serien Packs"}
+      - {id: 13, cat: TV/SD, desc: "Serien SD"}
+      - {id: 14, cat: TV/Sport, desc: "Sport"}
+      - {id: 15, cat: XXX/x264, desc: "XXX HD"}
+      - {id: 16, cat: XXX/XviD, desc: "XXX SD"}
+      - {id: 17, cat: Audio/Lossless, desc: "Musik FLAC"}
+      - {id: 18, cat: Audio/MP3, desc: "Musik MP3"}
+      - {id: 19, cat: Audio/Other, desc: "Musik Sonstiges"}
+      - {id: 20, cat: Audio/Video, desc: "Musik Videos"}
+      - {id: 23, cat: Console, desc: "Spiele Handy"}
+      - {id: 24, cat: Console, desc: "Spiele Linux"}
+      - {id: 21, cat: Console/NDS, desc: "Spiele Nintendo"}
+      - {id: 22, cat: Console/PSP, desc: "Spiele PlayStation"}
+      - {id: 25, cat: Console, desc: "Spiele Sonstige"}
+      - {id: 40, cat: Console, desc: "Spiele Wimmelbild"}
+      - {id: 26, cat: PC/Games, desc: "Spiele Windows"}
+      - {id: 27, cat: Console, desc: "XBOX 360/ONE"}
+      - {id: 28, cat: PC, desc: "Software Handy"}
+      - {id: 29, cat: PC, desc: "Software Linux"}
+      - {id: 30, cat: PC/Mac, desc: "Software Mac Os"}
+      - {id: 31, cat: PC, desc: "Software Sonstige"}
+      - {id: 32, cat: PC/0day, desc: "Software Windows"}
+      - {id: 33, cat: TV/Anime, desc: "Anime"}
+      - {id: 39, cat: Books/Ebook, desc: "eBook"}
+      - {id: 34, cat: Audio/Audiobook, desc: "Hörbücher/ -spiele"}
+      - {id: 35, cat: XXX/Other, desc: "XXX Sonstiges"}
+
+    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[action="takelogin.php"]
+    cookies: ["JAVA=OK"] # avoid jscheck redirect
+    captcha:
+      type: image
+      selector: img[src^="cap/captcha_math.php"]
+      input: stringCaptcha
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: div#login_error
+    test:
+      path: browse.php
+      selector: a[href="logout.php"]
+
+  ratio:
+    path: browse.php
+    selector: div#tom-b-t8
+    filters:
+      - name: replace
+        args: [".", ""]
+      - name: replace
+        args: [",", "."]
+
+  search:
+    paths:
+      - path: browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      # seachin 0=name 1=descr 2=both
+      blah: 0
+      # include dead 0=active 1=all 2=dead
+      incldead: 1
+      orderby: "added"
+      sort: "desc"
+      showsearch: 0
+    rows:
+      selector: table.tableinborder[border="0"][cellspacing="0"][cellpadding="0"] tr
+    fields:
+      category:
+        selector: td.tableb a
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        selector: div a.tor-name
+      details:
+        selector: div a.tor-name
+        attribute: href
+      download:
+        selector: div a.tor-name
+        attribute: href
+        filters:
+          - name: replace
+            args: ["details.php?id=", "download.php?torrent="]
+      banner:
+        selector: div[id^="details-"] img
+        attribute: src
+      seeders:
+        selector: div.tor-sl b
+      leechers:
+        selector: div.tor-sl b:last-of-type
+        # 2 flavours of dates
+      date:
+        # Heute 13:30:04
+        # Gestern 09:10:10
+        selector: div.tor-date:not(:contains("."))
+        optional: true
+        filters:
+          - name: replace
+            args: ["Heute", "Today"]
+          - name: replace
+            args: ["Gestern", "Yesterday"]
+      date:
+          # 30.02.2018 23:12:50
+        selector: div.tor-date:contains(".")
+        optional: true
+        filters:
+          - name: replace
+            args: ["\u00a0", " "]
+          - name: dateparse
+            args: "02.01.2006 15:04:05"
+      size:
+        selector: div.tor-size
+        filters:
+          - name: replace
+            args: [".", ""]
+          - name: replace
+            args: [",", "."]
+      grabs:
+        selector: div.tor-take
+        filters:
+          - name: regexp
+            args: "(\\d+)"
+      downloadvolumefactor:
+        case:
+          img[src="pic/ou_new.png"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

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,8 +25,9 @@
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
+      remember: 1
     error:
-      - selector: form[action*="/login"] .text-red
+      - selector: div.has-error
     test:
       path: torrents
 
@@ -36,12 +37,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,17 +63,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)
       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,11 +113,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 1.9.2

src/Jackett.Common/Definitions/btdb.yml

@@ -0,0 +1,64 @@
+---
+  site: btdb
+  name: BTDB
+  description: "BTDB is a Public BitTorrent DHT search engine."
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    -  https://btdb.eu/
+  legacylinks:
+    -  https://btdb.to/
+    -  https://btdb.unblocked.app/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Other, desc: "Other"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings:
+    - name: info
+      type: info
+      label: Category for Sonarr and Radarr
+      default: BTDB does not use categories. In your Sonarr or Radarr Torznab Indexer settings, set the category to 100001.
+
+  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}}"
+    rows:
+      selector: li[class$="item"]
+    fields:
+      title:
+        selector: h2[class$="title"] a[href*="/torrent/"]
+        attribute: title
+      category:
+        text: "1"
+      details:
+        selector: h2[class$="title"] a[href*="/torrent/"]
+        attribute: href
+      magnet:
+        selector: div[class$="info"] a[href^="magnet:?xt="]
+        attribute: href
+      size:
+        selector: div[class$="info"] span:nth-of-type(1)
+      files:
+        selector: div[class$="info"] span:nth-of-type(2)
+      date:
+        selector: div[class$="info"] span:nth-of-type(3)
+      grabs:
+        selector: div[class$="info"] span:nth-of-type(4)
+      seeders:
+        text: 1
+      leechers:
+        text: 1
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"

src/Jackett.Common/Definitions/btdigg.yml

@@ -0,0 +1,80 @@
+---
+  site: btdigg
+  name: BTDigg
+  description: "BTDigg is a Public BitTorrent DHT search engine."
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    -  https://btdig.com/
+
+  caps:
+    categories:
+      1: Other
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings:
+    - name: info
+      type: info
+      default: BTDigg does not use categories. In your software Indexer settings, set the category to 100001.
+
+  search:
+    # https://btdig.com/search?q=test&order=2
+    # only 10 results per page
+    # https://btdig.com/search?q=test&p=1&order=2
+    paths:
+      - path: search
+      - path: search
+        inputs:
+            p: 1
+      - path: search
+        inputs:
+            p: 2
+      - path: search
+        inputs:
+            p: 3
+      - path: search
+        inputs:
+            p: 4
+    inputs:
+      q: "{{if .Keywords }}{{.Keywords}}{{else}}test{{end}}"
+      order: 2
+    rows:
+      selector: div.one_result
+      filters:
+        - name: andmatch
+    fields:
+      title:
+        selector: div.torrent_name a
+      category:
+        text: 1
+      details:
+        selector: div.torrent_name a
+        attribute: href
+      download:
+        selector: a[href^="magnet:?xt="]
+        attribute: href
+      date:
+        selector: span.torrent_age
+        filters:
+          - name: replace
+            args: ["found ", ""]
+      files:
+        text: 1
+      files:
+        selector: span.torrent_files
+        optional: true
+      size:
+        selector: span.torrent_size
+      seeders:
+        text: 1
+      leechers:
+        text: 1
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"

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

@@ -1,78 +0,0 @@
----
-  site: btstornet
-  name: BTstor.net
-  description: "BTstor.net is a Public BT-Scene clone for MOVIES / TV / GENERAL"
-  language: us-en
-  type: public
-  encoding: UTF-8
-  links:
-    - https://btstor.net/
-
-  caps:
-    categories:
-      "anime": TV/Anime
-      "books": Books
-      "games": PC/Games
-      "movies": Movies
-      "music": Audio
-      "other": Other
-      "shows": TV
-      "software": PC
-      "video": Movies
-      "xxx": XXX
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
-
-  settings: []
-
-  download:
-    selector: "#dlt_"
-  
-  search:
-      # https://btstor.net/
-      # https://btstor.net/q/midnight+texas+s01e10/date/
-    keywordsfilters:
-      # replace space between keywords with + 
-      - name: re_replace
-        args: [" ", "+"]
-    paths:
-      - path: "q/{{ if .Keywords }}{{ .Keywords }}{{else}}test{{end}}/date/"
-    rows:
-      selector: table.tor > tbody > tr[class$="_tr"]
-      filters:
-        - name: andmatch
-    fields:
-      title:
-        selector: td.tname_index > a
-      details:
-        selector: td.tname_index > a
-        attribute: href
-      category:
-        # src="https://btstor.net/templates/btscene/images/shows.png"
-        selector: td.tname_index > img
-        attribute: src
-        filters:
-          - name: replace
-            args: [".png", ""]
-          - name: split
-            args: ["/", 6]
-      download:
-        selector: td.tname_index > a
-        attribute: href
-      size:
-        selector: td.tsize_index
-      seeders:
-        selector: td.tseeds_index
-      leechers:
-        selector: td.tpeers_index
-      date:
-        selector: td.tupd_index
-        filters:
-          - name: timeago
-      downloadvolumefactor:
-        text: "0"
-      uploadvolumefactor:
-        text: "1"

src/Jackett.Common/Definitions/cartoonchaos.yml

@@ -40,9 +40,9 @@
       - {id: 45, cat: TV/Documentary, desc: "Documentaries"}
 
     modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
+      search: [q, imdbid]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
 
   login:
     path: index.php?page=login
@@ -63,9 +63,10 @@
       - path: index.php
     inputs:
       page: torrents
-      search: "{{ if .Keywords }}{{ .Keywords }}{{else}}{{end}}"
+      search: "{{if .Query.IMDBID}}{{.Query.IMDBID}}{{else}}{{.Keywords}}{{end}}"
       category: "{{if .Categories}}{{range .Categories}}{{.}};{{end}}{{else}}0{{end}}"
-      options: 0
+      # options: 0=title, 1=title&descr, 2=descr
+      options: "{{if .Query.IMDBID}}1{{else}}0{{end}}"
       active: 0
 
     rows:

src/Jackett.Common/Definitions/casatorrent.yml

@@ -0,0 +1,141 @@
+---
+  site: casatorrent
+  name: Casa-Torrent
+  description: "Casa-Torrent is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
+  language: fr-fr
+  type: private
+  encoding: UTF-8
+  links:
+    - https://teamctgame.co/
+
+  caps:
+    categorymappings:
+      - {id: 65, cat: Movies/HD, desc: "BD: BD"}
+      - {id: 68, cat: Books/Magazines, desc: "Ebooks:  Presse"}
+      - {id: 56, cat: Books/Ebook, desc: "Ebooks: Ebooks"}
+      - {id: 90, cat: Audio/Audiobook, desc: "Ebooks: Audio books"}
+      - {id: 84, cat: XXX, desc: "Ebooks: XXX"}
+      - {id: 95, cat: Books/Comics, desc: "Ebooks: Mangas"}
+      - {id: 53, cat: Movies/HD, desc: "Films: 4K"}
+      - {id: 50, cat: Movies/UHD, desc: "Films: 4K-Remux"}
+      - {id: 72, cat: Movies/HD, desc: "Films: x265"}
+      - {id: 54, cat: Movies/3D, desc: "Films: 3D"}
+      - {id: 71, cat: Movies/BluRay, desc: "Films: Full Bluray"}
+      - {id: 96, cat: Movies, desc: "Films: Remux"}
+      - {id: 78, cat: Movies/DVD, desc: "Films: DVD-R"}
+      - {id: 52, cat: Movies/HD, desc: "Films: HD.1080p"}
+      - {id: 51, cat: Movies/HD, desc: "Films: HD.720p"}
+      - {id: 87, cat: Movies/HD, desc: "Films: HDRiP"}
+      - {id: 60, cat: Movies, desc: "Films: Pack"}
+      - {id: 47, cat: Movies/DVD, desc: "Films: DVDRip"}
+      - {id: 48, cat: Movies/BluRay, desc: "Films: BDRip / BRRip"}
+      - {id: 80, cat: Movies/HD, desc: "Films: HDLiGHT / M-HD"}
+      - {id: 63, cat: Movies/HD, desc: "Films: HD TV"}
+      - {id: 58, cat: Movies/WEBDL, desc: "Films: Web - DL"}
+      - {id: 75, cat: TV, desc: "Films: TVRiP"}
+      - {id: 61, cat: Movies, desc: "Films: Animation"}
+      - {id: 82, cat: TV/Anime, desc: "Films: Mangas"}
+      - {id: 55, cat: Movies, desc: "Films: VOSTFR"}
+      - {id: 89, cat: Movies, desc: "Films: VO"}
+      - {id: 57, cat: Movies/WEBDL, desc: "Films: WebRip"}
+      - {id: 98, cat: Movies, desc: "Films: VFSTFR"}
+      - {id: 1, cat: XXX, desc: "Films: XXX"}
+      - {id: 66, cat: PC/Games, desc: "Jeux: PC"}
+      - {id: 97, cat: Console/PSP, desc: "Jeux : Jeux PS"}
+      - {id: 81, cat: Console/Xbox, desc: "Jeux : XboX"}
+      - {id: 62, cat: PC/0day, desc: "Logiciels:  Windows"}
+      - {id: 99, cat: Other, desc: "Logiciels: Graph / Wallpaper"}
+      - {id: 77, cat: PC/Phone-Android, desc: "Logiciels: Android"}
+      - {id: 94, cat: PC/Mac, desc: "Logiciels: MAC"}
+      - {id: 93, cat: TV/Anime, desc: "Mangas: Animés"}
+      - {id: 86, cat: TV/HD, desc: "Series: Episode HD"}
+      - {id: 85, cat: TV/SD, desc: "Series: Episode SD"}
+      - {id: 59, cat: TV/SD, desc: "Series: Tv - Pack SD"}
+      - {id: 100, cat: TV/HD, desc: "Series: Tv - Pack HD"}
+      - {id: 101, cat: TV/HD, desc: "Series: Episode HD Vostfr"}
+      - {id: 102, cat: TV/SD, desc: "Series: Episode SD Vostfr"}
+      - {id: 103, cat: TV/HD, desc: "Series: Tv - Pack HD Vostfr"}
+      - {id: 104, cat: TV/SD, desc: "Series: Tv - Pack SD Vostfr"}
+      - {id: 88, cat: TV, desc: "Spectacles: Tous"}
+      - {id: 73, cat: TV/Documentary, desc: "TV: Documentaires"}
+      - {id: 83, cat: TV, desc: "TV:  Emissions"}
+      - {id: 74, cat: TV/Sport, desc: "TV: Sports"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  login:
+    path: account-login.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+    - selector: p#msgError
+    test:
+      path: torrents-search.php
+      selector: a[href="account-logout.php"]
+
+  ratio:
+    path: torrents-search.php
+    selector: div#infobar b
+
+  search:
+    paths:
+      - path: torrents-search.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      incldead: 1
+      freeleech: 0
+      lang: 0
+
+    rows:
+      selector: table.ttable_headinner > tbody > tr.t-row
+    fields:
+      title:
+        selector: a[href^="torrents-details.php?id="] b
+      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^="download.php?id="]
+        attribute: href
+      banner:
+        selector: img[src*="/uploads/images/"]
+        attribute: src
+      grabs:
+        selector: a[onmouseover][href^="torrents-details.php?id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "Snatched: </b>(\\d+)<br"
+      size:
+        selector: td:nth-last-child(5)
+      seeders:
+        selector: td:nth-last-child(4)
+      leechers:
+        selector: td:nth-last-child(3)
+      date:
+        selector: a[onmouseover][href^="torrents-details.php?id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "le: </b>(.*?)<br" 
+          - name: dateparse
+            args: "02-01-2006"
+      downloadvolumefactor:
+        case:
+          img[src="images/free.gif"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

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

@@ -1,17 +1,19 @@
 ---
-  site: btxpress
-  name: BTXpress
-  description: "HD Tracker Movies/TV"
+  site: Channelx
+  name: ChannelX
+  description: "ChannelX is a Private Torrent Tracker for High Quality Optimized HD MOVIES / TV"
   language: en-us
   type: private
   encoding: UTF-8
   links:
-    - https://btxpress.org/
+    - https://channelx.online/
 
   caps:
     categorymappings:
       - {id: 1, cat: Movies, desc: "Movies"}
       - {id: 2, cat: TV, desc: "TV"}
+      - {id: 3, cat: Audio, desc: "Audiotracks"}
+      - {id: 4, cat: TV/Sport, desc: "Sports"}
 
     modes:
       search: [q]
@@ -24,10 +26,22 @@
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
+      remember: 1
     error:
-      - selector: table.main:contains("Login Failed!")
+      - 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:
@@ -35,12 +49,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:
@@ -55,22 +70,33 @@
       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(4)
+        selector: td:nth-child(5)
       seeders:
         selector: td:nth-child(6)
       leechers:
         selector: td:nth-child(7)
       grabs:
-        selector: td:nth-child(5)
+        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:
@@ -99,11 +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 1.9.2

src/Jackett.Common/Definitions/cinefilhd.yml

@@ -0,0 +1,142 @@
+---
+  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/cpabien.yml

@@ -7,7 +7,7 @@
   encoding: UTF-8
   followredirect: true
   links:
-    - https://www.cpasbiens.bz/
+    - https://www.cpasbien.vg/
   legacylinks:
     - http://www.cpasbiens.cc/
     - http://www.cpabien.cm/
@@ -34,6 +34,7 @@
     - https://www.cpabien.bz/
     - https://www.cpabien.link/
     - https://www.cpasbiens.cz/
+    - https://www.cpasbiens.bz/
 
   caps:
     categorymappings:
@@ -66,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

@@ -9,13 +9,12 @@
 
   caps:
     categorymappings:
-      - {id: 1, cat: Movies, desc: "Filmy"}
-      - {id: 25, cat: TV, desc: "Seriály"}
-      - {id: 23, cat: TV/Documentary, desc: "Filmy - dokument"}
       - {id: 22, cat: PC, desc: "Aplikace"}
+      - {id: 1, cat: Movies, desc: "Filmy"}
       - {id: 36, cat: Movies/3D, desc: "Filmy - 3D"}
       - {id: 35, cat: Movies/Other, desc: "Filmy - anime"}
       - {id: 37, cat: Movies/BluRay, desc: "Filmy - Blu-ray"}
+      - {id: 33, cat: TV/Documentary, desc: "Filmy - dokument"}
       - {id: 11, cat: Movies/DVD, desc: "Filmy - DVD"}
       - {id: 30, cat: Movies/DVD, desc: "Filmy - DVD full"}
       - {id: 5, cat: Movies, desc: "Filmy - kreslené"}
@@ -29,6 +28,7 @@
       - {id: 32, cat: Audio, desc: "Mluvené slovo"}
       - {id: 16, cat: PC/Phone-Other, desc: "Mobil, PDA"}
       - {id: 4, cat: Other, desc: "Ostatní"}
+      - {id: 25, cat: TV, desc: "Seriály"}
       - {id: 29, cat: Audio, desc: "Soundtrack"}
       - {id: 19, cat:  Audio/Video, desc: "Videoklipy"}
       - {id: 24, cat: XXX, desc: "xXx"}
@@ -88,11 +88,11 @@
           - name: re_replace
             args: ["(\\d{1})\\.", "S0$1"]
       category:
-        selector: td:nth-child(2)
+        selector: td.categorie
         case:
           ":contains(\"Filmy\")": 1
           ":contains(\"Seriály\")": 25
-          ":contains(\"Filmy - dokument\")": 23
+          ":contains(\"Filmy - dokument\")": 33
           ":contains(\"Aplikace\")": 22
           ":contains(\"Filmy - 3D\")": 36
           ":contains(\"Filmy - anime\")": 35
@@ -123,20 +123,16 @@
         selector: td.detaily
         filters:
           - name: split
-            args: [ "|", 0 ]
-          - name: regexp
-            args: "Velikost: (.+?) ?$"
+            args: [ "|", 1 ]
       date:
-        selector: td:nth-child(4)
+        selector: td.detaily
         filters:
           - name: split
-            args: [ "|", 1 ]
-          - name: regexp
-            args: "Přidán: (.+?) ?$"
+            args: [ "|", 2 ]
           - name: append
             args: " +02:00"
           - name: dateparse 
-            args: "2.1.2006 15:04 -07:00"
+            args: "2.1.2006 15:04  -07:00"
       seeders:
         selector: td:nth-child(7) span
       leechers:

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

@@ -0,0 +1,237 @@
+---
+  site: dark-shadow
+  name: Dark-Shadow
+  description: "Dark-Shadow is a German Private site for TV / MOVIES / GENERAL"
+  language: de-de
+  type: private
+  encoding: UTF-8
+  links:
+    - https://dark-shadow.ml/
+
+  caps:
+    categorymappings:
+      # Film
+      - {id: 32, cat: Movies/HD, desc: "Film HD"}
+      - {id: 28, cat: Movies/SD, desc: "Film SD"}
+      - {id: 119, cat: Movies/DVD, desc: "Film DVD"}
+      - {id: 114, cat: Movies/UHD, desc: "Film 4K/2160p"}
+      - {id: 26, cat: Movies/3D, desc: "Film 3D"}
+      # Serien
+      - {id: 57, cat: TV/HD, desc: "Serien HD"}
+      - {id: 60, cat: TV/SD, desc: "Serien SD"}
+      - {id: 59, cat: TV, desc: "Serien Pack"}
+      - {id: 122, cat: TV, desc: "Serien Show"}
+      - {id: 123, cat: TV/Documentary, desc: "Serien Doku"}
+      # Doku
+      - {id: 14, cat: TV/Documentary, desc: "Doku HD"}
+      - {id: 15, cat: TV/Documentary, desc: "Doku SD"}
+      # Spiele
+      - {id: 17, cat: PC/Games, desc: "Spiele PC"}
+      - {id: 24, cat: Console, desc: "Spiele Konsole"}
+      - {id: 121, cat: Console, desc: "Spiele Wimmelbild"}
+      - {id: 126, cat: Console/Other, desc: "Spiele Mobil"}
+      # Musik
+      - {id: 110, cat: Audio/MP3, desc: "Musik MP3"}
+      - {id: 52, cat: Audio, desc: "Musik Pack"}
+      - {id: 48, cat: Audio/Lossless, desc: "Musik Flac"}
+      - {id: 120, cat: Audio/Video, desc: "Musik Video"}
+      # App
+      - {id: 12, cat: PC/0day, desc: "App PC"}
+      - {id: 125, cat: PC/Mac, desc: "App MacOS"}
+      - {id: 11, cat: PC/Phone-Other, desc: "App Mobil"}
+      # Sport
+      - {id: 61, cat: TV/Sport, desc: "Sport HD"}
+      - {id: 62, cat: TV/Sport, desc: "Sport SD"}
+      #  Internal
+      - {id: 128, cat: Movies/HD, desc: "Internal Film HD"}
+      - {id: 129, cat: Movies/SD, desc: "Internal Film SD"}
+      - {id: 130, cat: TV/HD, desc: "Internal Serien HD"}
+      - {id: 131, cat: TV/SD, desc: "Internal Serien SD"}
+      - {id: 132, cat: Other, desc: "Internal Sonstiges"}
+      # Sonstiges
+      - {id: 64, cat: TV/Anime, desc: "Anime"}
+      - {id: 96, cat: Books/Ebook, desc: "e-Book"}
+      - {id: 63, cat: Audio/Audiobook, desc: "Hörbuch"}
+      - {id: 71, cat: Other, desc: "Anderes"}
+      # XXX
+      - {id: 73, cat: XXX/x264, desc: "XXX HD"}
+      - {id: 75, cat: XXX/Packs, desc: "XXX Pack"}
+      - {id: 76, cat: XXX/XviD, desc: "XXX SD"}
+      - {id: 124, cat: XXX/Other, desc: "XXX Clips"}
+
+    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: pin
+      type: text
+      label: Pin
+
+  login:
+    path: login.php
+    method: form
+    form: form[action="/login.php"]
+    cookies: ["JAVA=OK"] # avoid jscheck redirect
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      pin: "{{ .Config.pin }}"
+    error:
+      - selector: div#login_error
+    test:
+      path: selection.php
+
+  download:
+    before:
+      path: ajax_det_poll.php
+      method: "post"
+      inputs:
+        set_thanks: "thanks"
+        det_id: "{{ .DownloadUri.Query.torrent }}"
+        ajax: "yes"
+
+  search:
+    paths:
+      - path: selection.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      blah: "0"
+      orderby: "added"
+      sort: "desc"
+    rows:
+      selector: div.selection_wrap
+    fields:
+      download:
+        selector: a.selection_a
+        attribute: href
+        filters:
+          - name: replace
+            args: ["details.php?id=", "download.php?torrent="]
+      title:
+        selector: a.selection_a
+      details:
+        selector: a.selection_a
+        attribute: href
+      category:
+        selector: div.kat_cat_pic
+        case:
+          # Movies
+          ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"4K/2160p\"))": "114"
+          ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"DVD\"))": "119"
+          ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "32"
+          ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "28"
+          ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"3D\"))": "26"
+          # Serien
+          ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "60"
+          ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "57"
+          ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "59"
+          ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Show\"))": "122"
+          ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Doku\"))": "123"
+          # Musik
+          ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Flac\"))": "48"
+          ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"MP3\"))": "110"
+          ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "52"
+          ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Videos\"))": "120"
+          # Doku
+          ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "15"
+          ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "14"
+          # Games
+          ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": "17"
+          ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Wimmelbild\"))": "121"
+          ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Konsole\"))": "24"
+          ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Mobil\"))": "126"
+          # App
+          ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": "12"
+          ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"MacOS\"))": "125"
+          ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Mobil\"))": "11"
+          # Sport
+          ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "62"
+          ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "61"
+          # Sonstiges
+          ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Anime\"))": "64"
+          ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"E-Book\"))": "96"
+          ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Hörbuch\"))": "63"
+          ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Other\"))": "71"
+          # XXX
+          ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "76"
+          ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "73"
+          ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "75"
+          ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Clips\"))": "124"
+          # Internal
+          ":has(div.kat_cat_pic_name:contains(\"Internal\")):has(div.kat_cat_pic_name_b:contains(\"Film HD\"))": "128"
+          ":has(div.kat_cat_pic_name:contains(\"Internal\")):has(div.kat_cat_pic_name_b:contains(\"Film SD\"))": "129"
+          ":has(div.kat_cat_pic_name:contains(\"Internal\")):has(div.kat_cat_pic_name_b:contains(\"Serien HD\"))": "130"
+          ":has(div.kat_cat_pic_name:contains(\"Internal\")):has(div.kat_cat_pic_name_b:contains(\"Serien SD\"))": "131"
+          ":has(div.kat_cat_pic_name:contains(\"Internal\")):has(div.kat_cat_pic_name_b:contains(\"Sonstiges\"))": "132"
+      banner:
+        selector: div[id^="details"] img
+        attribute: src
+      size:
+        selector: div.selection_unter_ad
+        filters:
+          - name: replace
+            args: [".", ""]
+          - name: replace
+            args: [",", "."]
+      grabs:
+        selector: div.selection_unter_ae
+        filters:
+          - name: trim
+            args: "x"
+          - name: replace
+            args: [".", ""]
+          - name: replace
+            args: [",", "."]
+      seeders:
+        selector: div.selection_unter_aa
+        filters:
+          - name: replace
+            args: [".", ""]
+          - name: replace
+            args: [",", "."]
+      leechers:
+        selector: div.selection_unter_aaa
+        filters:
+          - name: replace
+            args: [".", ""]
+          - name: replace
+            args: [",", "."]
+      downloadvolumefactor:
+        case:
+          ":root:has(div.onlyup)": "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"
+        # 2 flavours of dates
+      date:
+        # Heute 13:30:04
+        # Gestern 09:10:10
+        selector: div.selection_unter_ab:not(:contains("."))
+        optional: true
+        filters:
+          - name: replace
+            args: ["Heute", "Today"]
+          - name: replace
+            args: ["Gestern", "Yesterday"]
+      date:
+          # 30.02.2018 um 23:12:50
+        selector: div.selection_unter_ab:contains(".")
+        optional: true
+        filters:
+          - name: replace
+            args: [" um", ""]
+          - name: dateparse
+            args: "02.01.2006 15:04:05"
+      description:
+        selector: selection_unter_af
+        optional: true

src/Jackett.Common/Definitions/desireleasers.yml

@@ -1,50 +1,63 @@
 ---
-  site: redtopia
-  name: Redtopia
-  description: "Tracker Music/Podcasts/Audiobooks"
+  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://redtopia.xyz/
+    - https://desireleasers.be/
 
   caps:
     categorymappings:
-      - {id: 1, cat: Audio, desc: "Studio Album"}
-      - {id: 2, cat: Audio, desc: "Studio Single"}
-      - {id: 3, cat: Audio, desc: "Studio Collection"}
-      - {id: 4, cat: Audio, desc: "Indie Album"}
-      - {id: 5, cat: Audio, desc: "Indie Single"}
-      - {id: 6, cat: Audio, desc: "Indie Collection"}
-      - {id: 7, cat: Audio, desc: "Live Album"}
-      - {id: 8, cat: Audio, desc: "OST"}
-      - {id: 9, cat: Audio, desc: "Podcast"}
-      - {id: 10, cat: Audio, desc: "Audio Book"}
-      - {id: 11, cat: Audio, desc: "Audio Drama"}
+      - {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]
-      music-search: [q]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
 
+  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: login
-    method: form
+    method: cookie
     inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: form[action*="/login"] .text-red
+      cookie: "{{ .Config.cookie }}"
+    test:
     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:
       - path: filterTorrents
     inputs:
       $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
-      search: "{{ .Keywords }}"
+      search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      description: ""
       uploader: ""
-      sorting: created_at
+      imdb: "{{ .Query.IMDBIDShort }}"
+      tvdb: ""
+      tmdb: ""
+      mal: ""
+      sort: created_at
       direction: desc
       qty: 100
     rows:
@@ -64,17 +77,25 @@
       details:
         selector: a.view-torrent
         attribute: href
+      banner:
+        optional: true
+        selector: div.torrent-poster img
+        attribute: src
       size:
-        selector: td:nth-child(4)
+        selector: td:nth-child(5)
       seeders:
         selector: td:nth-child(6)
       leechers:
         selector: td:nth-child(7)
       grabs:
-        selector: td:nth-child(5)
+        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:
@@ -103,11 +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"
-          "i[data-original-title=\"Global FreeLeech\"]": "0"
+          "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" # global flag
-          "i[data-original-title=\"Double upload\"]": "2" # torrent specific flag
+          "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 1.9.1

src/Jackett.Common/Definitions/dragonworldreloaded.yml

@@ -236,13 +236,22 @@
       uploadvolumefactor:
         case:
           "*": "1"
+        # 2 flavours of dates
       date:
-        selector: div.selection_unter_ab
+        # Heute 13:30:04
+        # Gestern 09:10:10
+        selector: div.selection_unter_ab:not(:contains("."))
+        optional: true
         filters:
           - name: replace
             args: ["Heute", "Today"]
           - name: replace
             args: ["Gestern", "Yesterday"]
+      date:
+          # 30.02.2018 um 23:12:50
+        selector: div.selection_unter_ab:contains(".")
+        optional: true
+        filters:
           - name: replace
             args: [" um", ""]
           - name: dateparse

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,19 @@
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
+      remember: 1
     error:
-      - selector: table.main:contains("Login Failed!")
+      - 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+)"
 
   search:
     paths:
@@ -42,13 +52,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 +78,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)
       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:
@@ -106,11 +128,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 1.9.2

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

@@ -6,6 +6,8 @@
   type: public
   encoding: UTF-8
   links:
+    - https://www.elitetorrent.io/
+  legacylinks:
     - https://www.elitetorrent.biz/
 
   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

@@ -21,55 +21,70 @@
   caps:
     categorymappings:
       # ANIMES
-      - {id: 105, cat: TV/Anime, desc: "1080p"}
-      - {id: 104, cat: TV/Anime, desc: "720p"}
-      - {id: 90, cat: TV/Anime, desc: "HDRIP-720p"}
-      - {id: 93, cat: TV/Anime, desc: "HDRIP1080p"}
-      - {id: 131, cat: TV/Anime, desc: "SD"}
-      - {id: 120, cat: TV/Anime, desc: "X265-1080p"}
-      - {id: 119, cat: TV/Anime, desc: "X265-720p"}
-      - {id: 107, cat: TV/Anime, desc: "1080p"}
-      - {id: 106, cat: TV/Anime, desc: "720p"}
-      - {id: 94, cat: TV/Anime, desc: "HDRIP1080p"}
-      - {id: 91, cat: TV/Anime, desc: "HDRIP720p"}
-
+      - {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: "1080p"}
-      - {id: 103, cat: Movies/3D, desc: "3D"}
-      - {id: 111, cat: Movies/HD, desc: "4K"}
-      - {id: 96, cat: Movies/HD, desc: "720p"}
-      - {id: 127, cat: Movies/HD, desc: "BDrip"}
-      - {id: 128, cat: Movies/HD, desc: "BRrip"}
-      - {id: 126, cat: Movies/SD, desc: "DVDrip"}
-      - {id: 89, cat: Movies/HD, desc: "HDRIP-720p"}
-      - {id: 92, cat: Movies/HD, desc: "HDRIP1080p"}
-      - {id: 112, cat: Movies/SD, desc: "Team-Hush"}
-      - {id: 129, cat: Movies/HD, desc: "Team-Romkent"}
-      - {id: 125, cat: Movies/Other, desc: "WEBrip"}
-      - {id: 110, cat: Movies/HD, desc: "X265-1080p"}
-      - {id: 109, cat: Movies/HD, desc: "X265-720p"}
-
+      - {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: "Flac"}
-      - {id: 113, cat: Audio/MP3, desc: "MP3"}
-      - {id: 132, cat: Audio, desc: "Musiques-HQ"}
-      - {id: 130, cat: Audio/Video, desc: "video clip"}
-
-      # SERIE-sd
-      - {id: 121, cat: TV/SD, desc: "SD"}
-
-      # SERIES-HD
-      - {id: 102, cat: TV/HD, desc: "1080p"}
-      - {id: 101, cat: TV/HD, desc: "720p"}
-      - {id: 100, cat: TV/HD, desc: "HDrip1080p"}
-      - {id: 99, cat: TV/HD, desc: "HDrip720p"}
-
+      - {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: 118, cat: TV/Sport, desc: "HDRIP1080p"}
-      - {id: 117, cat: TV/Sport, desc: "HDRIP720p"}
+      - {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]
@@ -134,6 +149,8 @@
         selector: td:nth-child(4)
       leechers:
         selector: td:nth-child(5)
+      date:
+        text: now
       downloadvolumefactor:
         case:
           img[alt="freeleech"]: "0"

src/Jackett.Common/Definitions/freetorrent.yml

@@ -1,18 +1,28 @@
 ---
-  site: 420files
-  name: 420files
-  description: "Tracker Movies/TV/Music"
+  site:  freetorrent
+  name:  FreeTorrent
+  description: "FreeTorrent is a Private Torrent Tracker for HD MOVIES / TV"
   language: en-us
   type: private
   encoding: UTF-8
   links:
-    - https://420.org/
+    -  https://freetorrent.tk/
 
   caps:
     categorymappings:
       - {id: 1, cat: Movies, desc: "Movies"}
       - {id: 2, cat: TV, desc: "TV"}
       - {id: 3, cat: Audio, desc: "Music"}
+      - {id: 4, cat: PC/0day, desc: "Software"}
+      - {id: 5, cat: Books, desc: "Ebook"}
+      - {id: 6, cat: PC/Games, desc: "Games"}
+      - {id: 7, cat: TV, desc: "Animations"}
+      - {id: 8, cat: PC, desc: "Linux"}
+      - {id: 9, cat: PC/Mac, desc: "MacOS"}
+      - {id: 10, cat: PC/Phone-Android, desc: "Android app"}
+      - {id: 11, cat: PC/Phone-Android, desc: "Android ROMs"}
+      - {id: 12, cat: TV/Documentary, desc: "Documentaries"}
+      - {id: 13, cat: TV, desc: "Shows"}
 
     modes:
       search: [q]
@@ -41,7 +51,7 @@
       tvdb: ""
       tmdb: ""
       mal: ""
-      sorting: created_at
+      sort: created_at
       direction: desc
       qty: 100
     rows:
@@ -72,6 +82,10 @@
         filters:
           - name: regexp
             args: ([\d\.]+)
+      imdb:
+        optional: true
+        selector: a[href^="https://www.imdb.com/title/"]
+        attribute: href
       date:
         selector: time
         filters:
@@ -102,9 +116,11 @@
         case:
           "i[data-original-title=\"100% Free\"]": "0" # Single Torrent Freeleech
           "i[data-original-title=\"Global FreeLeech\"]": "0" # Global Freeleech
+          "i[data-original-title=\"Freeleech\"]": "0" # Freeleech
           "*": "1"
       uploadvolumefactor:
         case:
           "i[data-original-title=\"Double upload\"]": "2" # Single Torrent Double Upload
           "i[data-original-title=\"Double Upload\"]": "2" # Global Double Upload
           "*": "1"
+# UNIT3D

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

@@ -23,8 +23,9 @@
     - https://www.gktorrent.org/
     - https://www.gktorrent.me/
     - https://www.rantop.org/
-    - https://www.gktorrent.net/
     - https://www.gktorrent.cx/
+    - https://www.gktorrent.net/
+
   caps:
     categorymappings:
       - {id: movies, cat: Movies, desc: "Movies"}
@@ -62,7 +63,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

@@ -13,7 +13,7 @@
       # Movie
       - {id: 132, cat: Movies/BluRay, desc: "BluRay"}
       - {id: 146, cat: Movies/HD, desc: "Remux"}
-      - {id: 186, cat: Movies/HD, desc: "UHD"}
+      - {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"}
@@ -21,10 +21,10 @@
       - {id: 16, cat: Movies, desc: "Packs"}
 
       # Serien
-      - {id: 187, cat: TV/HD, desc: "Staffeln UHD"}
+      - {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/HD, desc: "Folgen UHD"}
+      - {id: 188, cat: TV/UHD, desc: "Folgen UHD"}
       - {id: 174, cat: TV/HD, desc: "Folgen HD"}
       - {id: 7, cat: TV/SD, desc: "Folgen SD"}
 
@@ -76,6 +76,7 @@
     modes:
       search: [q]
       tv-search: [q, season, ep]
+      movie-search: [q]
 
   settings:
     - name: pin

src/Jackett.Common/Definitions/hd4free.yml

@@ -113,3 +113,4 @@
           "i[data-original-title=\"Double upload\"]": "2"
           "i[data-original-title=\"Double Upload\"]": "2" # Global Double Upload
           "*": "1"
+# UNIT3D

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

@@ -26,19 +26,19 @@
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
+  settings:
+    - name: cookie
+      type: text
+      label: Cookie
+    - name: info
+      type: info
+      label: How to get the Cookie
+      default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<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: login.php
-    method: form
-    form: form[action="takelogin.php"]
-    captcha:
-      type: image
-      selector: img[alt="CAPTCHA"]
-      input: imagestring
+    method: cookie
     inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: td.embedded:has(h2:contains("failed"))
+      cookie: "{{ .Config.cookie }}"
     test:
       path: torrents.php
 
@@ -58,11 +58,16 @@
     inputs:
       $raw: "{{range .Categories}}cat{{.}}=1&{{end}}"
       search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-      incldead: "1"
-      spstate: "0"
-      inclbookmarked: "0"
+      # 0=including dead 1=active 2=dead
+      incldead: 0
+      # show promotions 0=all 1=normal 2=free 3=2x 4=2x free 5=50% 6=2x50% 7=30%
+      spstate: 0
+      # 0=all 1=bookmarked 2=not
+      inclbookmarked: 0
+      # 0=title 1=descr 3=uploaded 4=imdb url
       search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
-      search_mode: "0"
+      # 0=AND 1=OR 2=exact
+      search_mode: 0
     rows:
       selector: table.torrents > tbody > tr:has(table.torrentname)
       filters:
@@ -84,7 +89,7 @@
         selector: form[action^="download.php?id="]
         attribute: action
       imdb:
-        selector: a[href^="http://www.imdb.com/title/tt"]
+        selector: a[href*="www.imdb.com/title/tt"]
         attribute: href
       size:
         selector: td.rowfollow:nth-child(5)
@@ -118,4 +123,5 @@
           "*": "1"
       description:
         selector: td:nth-child(2)
-        remove: a, img
+        remove: a, img
+# NexusPHP

src/Jackett.Common/Definitions/hdtorrentsit.yml

@@ -118,13 +118,19 @@
         attribute: href
       size:
         selector: td:nth-child(3)
+      seeders:
+        text: 1
       seeders:
         selector: td:nth-child(4)
+        optional: true
         filters:
           - name: re_replace
             args: ["(\\d*) \\(\\+\\d*\\)\n? \\| (\\d*) \\(\\+\\d*\\)", "$1"]
+      leechers:
+        text: 1
       leechers:
         selector: td:nth-child(4)
+        optional: true
         filters:
           - name: re_replace
             args: ["(\\d*) \\(\\+\\d*\\)\n? \\| (\\d*) \\(\\+\\d*\\)", "$2"]

src/Jackett.Common/Definitions/hush.yml

@@ -111,3 +111,4 @@
           "i[data-original-title=\"Double upload\"]": "2" # Single Torrent Double Upload
           "i[data-original-title=\"Double Upload\"]": "2" # Global Double Upload          
           "*": "1"
+# UNIT3D

src/Jackett.Common/Definitions/icetorrent.yml

@@ -60,7 +60,7 @@
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
     error:
-      - selector: font:contains("failed") + table
+      - selector: div.alert:contains("failed")
     test:
       path: browse.php
       

src/Jackett.Common/Definitions/ilcorsaronero.yml

@@ -6,8 +6,9 @@
   type: public
   encoding: UTF-8
   links:
-    - https://ilcorsaronero.live/
+    - https://ilcorsaronero.pizza/
   legacylinks:
+    - https://ilcorsaronero.live/
     - https://ilcorsaronero.vip/
     - https://ilcorsaronero.info/
     - https://ilcorsaronero.ch/
@@ -58,16 +59,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/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

@@ -0,0 +1,73 @@
+---
+  site: kikibt
+  name: KikiBT
+  description: "KikiBT is a CHINESE Public BitTorrent DHT search engine."
+  language: cn-cn
+  type: public
+  encoding: UTF-8
+  followredirect: true
+  links:
+    -  https://kikibt.cc/
+    -  https://kikibt.pw/
+  legacylinks:
+    -  https://kikibt.me/
+    -  http://kikibt.pw/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Other, desc: "Other"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings:
+    - name: info
+      type: info
+      default: KikiBT does not use categories. In your software Indexer settings, set the category to 100001.
+
+  download:
+    selector: a[href^="magnet:?"]
+
+  search:
+    paths:
+      - path: /
+        method: post
+        followredirect: true
+    inputs:
+      keyword: "{{if .Keywords }}{{.Keywords}}{{else}}test{{end}}"
+    rows:
+      selector: dl.item
+      filters:
+        - name: andmatch
+    fields:
+      title:
+        selector: dt a
+      category:
+        text: "1"
+      details:
+        selector: dt a
+        attribute: href
+      download:
+        selector: dt a
+        attribute: href
+      size:
+        selector: dd span:nth-of-type(2) b
+      files:
+        selector: dd span:nth-of-type(3) b
+      date:
+        selector: dd span:nth-of-type(1) b
+        filters:
+          - name: dateparse
+            args: "2006-01-02"
+      grabs:
+        selector: dd span:nth-of-type(5) b
+      seeders:
+        text: "1"
+      leechers:
+        text: "1"
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"

src/Jackett.Common/Definitions/kinozal.yml

@@ -88,6 +88,10 @@
         "10" : "9.5GB or higher"
         "11": "Gold (FreeLeech)"
         "12": "Silver (50%DL)"
+    - name: striprussian
+      type: checkbox
+      label: Strip Russian Letters
+      default: true
 
   login:
     path: takelogin.php
@@ -106,6 +110,13 @@
     paths:
     # http://kinozal.tv/browse.php?s=lucifer+2017&g=0&c=0&v=0&d=0&w=0&t=0&f=0
       - path: browse.php
+    keywordsfilters:
+      - name: diacritics
+        args: replace
+      - name: re_replace # S01 to 1
+        args: ["(?i)\\bS0*(\\d+)\\b", "$1"]
+      - name: re_replace # S01E01 to 1 1
+        args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "$1 $2"]
     inputs:
       # multi cat is not supported. so defaulting to ALL
       c: "0"
@@ -154,6 +165,28 @@
     fields:
       title:
         selector: td.nam a[href^="/details.php?id="]
+        filters:
+          # normalize to SXXEYY format
+          - name: replace
+            args: [" / ", " "]
+          - name: replace
+            args: ["Кураж-Бамбей", "kurazh"]
+          - name: replace
+            args: ["Кубик в Кубе", "Kubik"]
+          - name: 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
+            args: ["(\\([А-Яа-я\\W]+\\))|(^[А-Яа-я\\W\\d]+\\/ )|([а-яА-Я \\-]+,+)|([а-яА-Я]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
+          - name: re_replace
+            args: ["\\((\\d+p)\\)", "$1"]
+          - name: replace
+            args: ["-Rip", "Rip"]
+          - name: replace
+            args: ["WEB-DL", "WEBDL"]
+          - name: replace
+            args: ["WEBDLRip", "WEBDL"]
+          - name: replace
+            args: ["HDTVRip", "HDTV"]
       details:
         selector: td.nam a[href^="/details.php?id="]
         attribute: href

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

@@ -0,0 +1,63 @@
+---
+  site: mactorrents
+  name: MacTorrents
+  description: "MacTorrents is a Public tracker for Mac software"
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    - https://mac-torrents.com/
+
+  caps:
+    categories:
+      "mac-os-apps": PC/Mac
+      "mac-os-games": PC/Games
+
+    modes:
+      search: [q]
+
+  settings: []
+
+  search:
+    paths:
+      - path: /
+    inputs:
+      s: "{{.Keywords}}"
+    rows:
+      selector: div.iso-item article
+    fields:
+      title:
+        selector: div.blog-content h3 a
+      category:
+        selector: a[href*="/category/"]
+        attribute: href
+        filters:
+          - name: split
+            args: ["/", 4]
+      details:
+        selector: div.blog-content h3 a
+        attribute: href
+      download:
+        selector: a.download
+        attribute: href
+      banner:
+        selector: div.blog-media p a img
+        attribute: data-src
+      date:
+        selector: div.blog-content div.entry-meta time
+        attribute: datetime
+        filters:
+          - name: replace
+            args: ["T", " "]
+          - name: dateparse
+            args: "2006-01-02 15:04:05-07:00"
+      size:
+        text: "500 MB"
+      seeders:
+        text: "1"
+      leechers:
+        text: "1"
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"

src/Jackett.Common/Definitions/metaltracker.yml

@@ -6,6 +6,8 @@
   type: semi-private
   encoding: UTF-8
   links:
+    - https://en.metal-tracker.com/
+  legacylinks:
     - http://en.metal-tracker.com/
 
   caps:
@@ -20,7 +22,7 @@
 
   login:
     path: user/login.html
-    method: form
+    method: post
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"

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

@@ -87,10 +87,7 @@
       date:
         selector: td:nth-child(4)
         filters:
-          - name: append
-            args: " +0700"
-          - name: dateparse
-            args: "2006-01-0215:04:05 -0700"
+          - name: timeago
       downloadvolumefactor:
         case:
           "span.label:contains(\"Free\")": "0"

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

@@ -732,18 +732,22 @@
       title:
         selector: a[href^="viewtopic.php?t="] > b
         filters:
-          - name: re_replace
-            args: ["\\b(\\d)\\b", "0$1"]
+          - name: replace
+            args: [" / ", " "]
           - name: replace
             args: ["Кураж-Бамбей", "kurazh"]
+          - name: replace
+            args: ["Кубик в Кубе", "Kubik"]
           - name: re_replace
-            args: ["(\\([Сс]езон\\s+(\\d+).+[Сс]ери[ия]\\s+(?:(\\d+-*\\d*).*\\d+)*\\))", "(S$2E$3) RUS"]
+            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: ["WEBDLRip", "WEBDL"]
+            args: ["-Rip", "Rip"]
           - name: replace
-            args: ["WEB-DLRip", "WEBDL"]
+            args: ["WEB-DL", "WEBDL"]
+          - name: replace
+            args: ["WEBDLRip", "WEBDL"]
           - name: replace
             args: ["HDTVRip", "HDTV"]
       details:

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

@@ -0,0 +1,169 @@
+---
+  site: p2pbg
+  name: P2PBG
+  description: "P2PBG is a BULGARIAN Private Torrent Tracker for 0DAY / GENERAL"
+  language: bg
+  type: private
+  encoding: UTF-8
+  links:
+    - http://p2pbg.com/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Movies/SD, desc: "Movies-XviD"}
+      - {id: 16, cat: Movies/HD, desc: "Movies-x264"}
+      - {id: 34, cat: Movies, desc: "Movies-BG"}
+      - {id: 17, cat: Movies/HD, desc: "Movies-MPEG2"}
+      - {id: 35, cat: Movies, desc: "Movies-GSM"}
+      - {id: 55, cat: Movies/3D, desc: "Movies-3D"}
+      - {id: 18, cat: Movies/BluRay, desc: "Movies-BR/HD-DVD"}
+      - {id: 7, cat: TV/Documentary , desc: "Movies-Documentaries"}
+      - {id: 11, cat: Movies/DVD, desc: "Movies-DVD"}
+      - {id: 24, cat: TV/SD, desc: "TV-BG"}
+      - {id: 14, cat: TV, desc: "TV-Shows"}
+      - {id: 15, cat: TV, desc: "TV-Boxset"}
+      - {id: 38, cat: TV/Anime, desc: "TV-Cartoons"}
+      - {id: 8, cat: PC/Games, desc: "Games-PC ISO"}
+      - {id: 9, cat: PC/Games, desc: "Games-PC Rips"}
+      - {id: 21, cat: Console/Xbox, desc: "Games-XboX"}
+      - {id: 22, cat: Console/Xbox 360, desc: "Games-X360"}
+      - {id: 33, cat: Console/Wii, desc: "Games-Wii"}
+      - {id: 20, cat: Console/PSP, desc: "Games-PSP"}
+      - {id: 23, cat: Console/PS3, desc: "Games-PS3"}
+      - {id: 12, cat: Console/PS3, desc: "Games-PS2"}
+      - {id: 2, cat: Audio/MP3, desc: "Music-Song"}
+      - {id: 28, cat: Audio, desc: "Music-Album"}
+      - {id: 19, cat: Audio/Video, desc: "Music-Video"}
+      - {id: 29, cat: Audio, desc: "Music-Discography"}
+      - {id: 3, cat: Audio/Video, desc: "Music-DVD"}
+      - {id: 31, cat: PC/0day, desc: "Appz Ripped"}
+      - {id: 26, cat: PC/ISO, desc: "Appz PC-ISO"}
+      - {id: 49, cat: PC/Mac, desc: "Appz MacOS"}
+      - {id: 30, cat: PC, desc: "Appz-Linux"}
+      - {id: 27, cat: PC, desc: "Appz-GSM"}
+      - {id: 39, cat: Other, desc: "e-Learning"}
+      - {id: 37, cat: Other/Misc, desc: "Pictures"}
+      - {id: 4, cat: Other, desc: "Other"}
+      - {id: 6, cat: Books, desc: "Books"}
+      - {id: 52, cat: PC/Phone-Other, desc: "Mobile-GSM"}
+      - {id: 40, cat: PC/Phone-IOS, desc: "Mobile-iPhone"}
+      - {id: 51, cat: TV/Sport, desc: "Sport"}
+      - {id: 5, cat: TV/Sport, desc: "Sport F1"}
+      - {id: 13, cat: XXX, desc: "XXX"}
+      - {id: 54, cat: XXX/x264, desc: "XXX HD"}
+      - {id: 32, cat: XXX/Imageset, desc: "XXX Pictures"}
+      - {id: 56, cat: XXX, desc: "XXX 3D"}
+      - {id: 53, cat: XXX, desc: "XXX Hentai"}
+      - {id: 48, cat: XXX, desc: "XXX BG Amateurs"}
+
+
+    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: info_results
+      type: info
+      label: "Search results"
+      default: "For best results, increase the torrents number in your profile to 100.<br />Default is 15."
+
+  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:
+      # http://p2pbg.com/index.php?page=torrents&search=%D0%9A%D0%B0%D1%82%D0%BE&category=0&active=0
+      - path: index.php
+    inputs:
+      page: "torrents"
+      category: "{{if .Categories }}{{range .Categories}}{{.}};{{end}}{{else}}0;{{end}}"
+      search: "{{if .Keywords }}{{.Keywords}}{{else}}{{end}}"
+      active: "1"
+
+    rows:
+      selector: table.lista tr td table.lista tr:has(a[href^="index.php?page=torrent-details"])
+    fields:
+      title:
+        selector: td a[onclick]
+        attribute: title
+        filters:
+          - name: replace
+            args: ["View details: ", ""]
+          - name: replace
+            args: ["Преглед на детайли: ", ""]
+          - name: replace
+            args: ["Преглед на детайли: ", ""]
+      details:
+        selector: td a[href*="id="]
+        attribute: href
+      category:
+        selector: td a[href*="category="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: category
+      download:
+        selector: td a[href*="id="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: id
+          - name: prepend
+            args: "download.php?id="
+          - name: append
+            args: "&f={{.Result.title}}.torrent"
+      banner:
+        selector: td img[src="/torrentimg/pic.png"]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "src=(.+?) width="
+      # two flavours
+      date:
+        # Yesterday
+        # Вчера
+        selector: td:nth-child(6):not(:contains("/"))
+        optional: true
+        filters:
+          - name: replace
+            args: ["сейчас", "now"]
+          - name: replace
+            args: ["сегодня", "Today"]
+          - name: replace
+            args: ["вчера", "Yesterday"]
+      date:
+        # 14/03/2019
+        selector: td:nth-child(6):contains("/")
+        optional: true
+        filters:
+          - name: dateparse
+            args: "02/01/2006"
+      size:
+        selector: td:nth-child(7)
+      seeders:
+        selector: td:nth-child(8)
+      leechers:
+        selector: td:nth-child(9)
+      grabs:
+        selector: td:nth-child(10)
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"

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

@@ -6,6 +6,9 @@
   type: private
   encoding: UTF-8
   links:
+    - https://piratbit.top/
+    - https://piratbit.ml/
+  legacylinks:
     - https://pb.wtf/
     - https://piratbit.pw/
 

src/Jackett.Common/Definitions/pleasuredome.yml

@@ -0,0 +1,137 @@
+---
+  site: pleasuredome
+  name: PleasureDome
+  description: "PleasureDome is a private site for Arcade / Console / PC Games"
+  language: en
+  type: private
+  encoding: UTF-8
+  links:
+    - http://www.pleasuredome.org.uk/
+
+  caps:
+    categorymappings:
+      # Arcade
+      - {id: 10, cat: Console, desc: "MAME"}
+      - {id: 11, cat: Console, desc: "Pinball"}
+      - {id: 12, cat: Console, desc: "ZiNc"}
+      - {id: 13, cat: Console, desc: "Nebula"}
+      - {id: 14, cat: Console, desc: "Daphne"}
+      - {id: 17, cat: Console, desc: "Fruit"}
+      - {id: 32, cat: Console, desc: "Neo-Geo"}
+      - {id: 33, cat: Console, desc: "NonMAME"}
+      - {id: 34, cat: Console, desc: "RAINE"}
+      - {id: 35, cat: Console, desc: "Kawaks"}
+      - {id: 40, cat: Console, desc: "FBA"}
+      - {id: 51, cat: Console, desc: "HBMAME"}
+      - {id: 58, cat: Console, desc: "Dice"}
+       # Computer
+      - {id: 16, cat: Console, desc: "Amiga"}
+      - {id: 19, cat: Console, desc: "Amstrad"}
+      - {id: 20, cat: Console, desc: "Commodore 64"}
+      - {id: 22, cat: Console, desc: "Apple"}
+      - {id: 25, cat: Console, desc: "Sinclair"}
+      - {id: 41, cat: Console, desc: "Doom"}
+      - {id: 44, cat: Console, desc: "MS-DOS"}
+      - {id: 50, cat: Console, desc: "eXoDOS"}
+      - {id: 53, cat: Console, desc: "Win3xO"}
+      - {id: 55, cat: Console, desc: "Neo Kobe"}
+       # Computer / Console
+      - {id: 15, cat: Console, desc: "MESS"}
+      - {id: 24, cat: Console, desc: "Atari"}
+      - {id: 31, cat: Console, desc: "TOSEC"}
+      - {id: 38, cat: Console, desc: "Dreamcast"}
+      - {id: 43, cat: Console, desc: "ScummVM"}
+      - {id: 46, cat: Console, desc: "Redump"}
+      - {id: 48, cat: Console, desc: "Trurip"}
+      - {id: 52, cat: Console, desc: "GoodTools"}
+      - {id: 57, cat: Console, desc: "Hyperspin"}
+      - {id: 61, cat: Console, desc: "RAWdump"}
+       # Console
+      - {id: 18, cat: Console, desc: "Sega"}
+      - {id: 21, cat: Console, desc: "3DO"}
+      - {id: 23, cat: Console, desc: "PC Engine"}
+      - {id: 47, cat: Console, desc: "Demul"}
+      - {id: 49, cat: Console, desc: "Sega Saturn"}
+      - {id: 54, cat: Console, desc: "No-Intro"}
+      - {id: 59, cat: Console, desc: "XBOX"}
+      - {id: 60, cat: Console, desc: "DMC"}
+       # iscellaneous
+      - {id: 4, cat: Console, desc: "Other"}
+      - {id: 37, cat: Console, desc: "Remix Projects"}
+      - {id: 39, cat: Console, desc: "EmuMovies"}
+      - {id: 42, cat: Console, desc: "CDi"}
+      - {id: 45, cat: Console, desc: "NUON"}
+
+    modes:
+      search: [q]
+
+  login:
+    path: login2.php
+    method: form
+    form: form[action="login2.php"]
+    inputs:
+      uid: "{{ .Config.username }}"
+      pwd: "{{ .Config.password }}"
+    error:
+      - selector: div font[color="#FF0000"]
+    test:
+      path: torrents.php
+      selector: a[href="logout.php"]
+
+  search:
+    paths:
+      - path: torrents.php
+    inputs:
+      search: "{{ .Keywords }}"
+      category: 0
+      active: 0
+      sort: "data"
+      order: "DESC"
+
+    rows:
+      selector: table[width="100%"] > tbody tr:has(a[href^="download.php?id="])
+    fields:
+      title:
+        selector: td:nth-child(2) a
+        filters:
+          - name: replace
+            args: ["[FREE] ", ""]
+      details:
+        selector: td:nth-child(2) a
+        attribute: href
+        filters:
+          - name: replace
+            args: ["javascript:popdetails('", ""]
+          - name: replace
+            args: [");'", ""]
+      category:
+        selector: td:nth-child(1) a
+        attribute: href
+        filters:
+          - name: querystring
+            args: category
+      download:
+        optional: true
+        selector: td:nth-child(4) a
+        attribute: href
+      date:
+          # 19/01/2019
+        selector: td:nth-child(5)
+        filters:
+          - name: dateparse
+            args: "02/01/2006"
+      size:
+        selector: td:nth-child(6)
+      seeders:
+        selector: td:nth-child(8)
+      leechers:
+        selector: td:nth-child(9) a
+      grabs:
+        selector: td:nth-child(10)
+      downloadvolumefactor:
+        case:
+          "img[src=\"images/fdownload.gif\"]": "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

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

@@ -13,10 +13,8 @@
   caps:
     categorymappings:
       - {id: 1, cat: TV/Sport, desc: "BTCC"}
+      - {id: 2, cat: TV/Sport, desc: "Documentaries/TV"}
       - {id: 3, cat: TV/Sport, desc: "DTM"}
-      - {id: 4, cat: TV/Sport, desc: "Formula 1 2018"}
-      - {id: 6, cat: TV/Sport, desc: "Formula 1 2017-1950 (HD)"}
-      - {id: 21, cat: TV/Sport, desc: "Formula 1 2017-1950 (SD)"}
       - {id: 22, cat: TV/Sport, desc: "Formula 2"}
       - {id: 23, cat: TV/Sport, desc: "Formula E"}
       - {id: 24, cat: TV/Sport, desc: "Misc"}
@@ -27,8 +25,19 @@
       - {id: 33, cat: TV/Sport, desc: "Touring Cars"}
       - {id: 50, cat: TV/Sport, desc: "WRC"}
       - {id: 53, cat: TV/Sport, desc: "Open-Wheelers"}
-      - {id: 54, cat: TV/Sport, desc: "Documentaries/Movies"}
       - {id: 55, cat: TV/Sport, desc: "Season Reviews"}
+      - {id: 56, cat: TV/Sport, desc: "WRX"}
+      - {id: 57, cat: TV/Sport, desc: "WEC"}
+      - {id: 58, cat: TV/Sport, desc: "Formula 1 Full Seasons"}
+      - {id: 60, cat: TV/Sport, desc: "Drag Racing"}
+      - {id: 61, cat: TV/Sport, desc: "Rally"}
+      - {id: 62, cat: TV/Sport, desc: "Formula 1 Testing"}
+      - {id: 63, cat: TV/Sport, desc: "Supercars"}
+      - {id: 64, cat: TV/Sport, desc: "Indycar Complete Seasons"}
+      - {id: 65, cat: TV/Sport, desc: "NASCAR Complete Seasons"}
+      - {id: 66, cat: TV/Sport, desc: "Documentaries"}
+      - {id: 67, cat: TV/Sport, desc: "Formula 1 2019"}
+      - {id: 68, cat: TV/Sport, desc: "Formula 1 2018-1950"}
 
     modes:
       search: [q]
@@ -39,10 +48,19 @@
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
+      remember: 1
     error:
-      - selector: table.main:contains("Login Failed!")
+      - selector: div.has-error
     test:
       path: torrents
+      selector: a[href$="/logout"]
+
+  ratio:
+    path: /
+    selector: span:has(i.fa-sync-alt)
+    filters:
+      - name: regexp
+        args: "Ratio : (\\d+)"
 
   search:
     paths:
@@ -50,8 +68,12 @@
     inputs:
       $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
       search: "{{ .Keywords }}"
+      description: ""
       uploader: ""
-      sorting: created_at
+      imdb: ""
+      tvdb: ""
+      tmdb: ""
+      sort: created_at
       direction: desc
       qty: 100
     rows:
@@ -74,11 +96,11 @@
       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\.]+)
@@ -110,11 +132,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 1.9.2

src/Jackett.Common/Definitions/sharewood.yml

@@ -0,0 +1,105 @@
+---
+  site:  sharewood
+  name:  Sharewood
+  description: "sharewood is a Semi-Private FRENCH Torrent Tracker for GENERAL"
+  language: fr-fr
+  type: semi-private
+  encoding: UTF-8
+  links:
+    -  https://www.sharewood.tv/
+
+  caps:
+    categorymappings:
+      - {id: "Vidéos Torrent", cat: Movies, desc: "Vidéos"}
+      - {id: "Vidéos Torrent", cat: TV, desc: "Vidéos"}
+      - {id: "Audios Torrent", cat: Audio, desc: "Audios"}
+      - {id: "Applications Torrent", cat: PC, desc: "Applications"}
+      - {id: "Ebooks Torrent", cat: Books, desc: "Ebooks"}
+      - {id: "Jeux-Vidéos  Torrent", cat: Console, desc: "Jeux-Vidéos"}
+      - {id: "Formations  Torrent", cat: Other, desc: "Formations"}
+      - {id: "XXX  Torrent", cat: XXX, desc: "XXX"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  login:
+    path: login
+    method: form
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      remember: 1
+    selectorinputs:
+      _token:
+        selector: meta[name="csrf-token"]
+        attribute: content
+    error:
+      - selector: form[action$="/login"] .text-red
+    test:
+      path: /
+      selector: a[href$="/logout"]
+
+  ratio:
+    path: /
+    selector: li:has(i.fa-signal)
+    filters:
+      - name: regexp
+        args: "Ratio : (\\d+)"
+
+  search:
+    paths:
+      - path: filterTorrents
+    inputs:
+      search: "{{ .Keywords }}"
+      description: ""
+      uploader: ""
+      sorting: created_at
+      direction: desc
+      qty: 100
+    rows:
+      selector: div.table-responsive-line
+    fields:
+      category:
+        selector: i.torrent-icon
+        attribute: data-original-title
+      title:
+        selector: a.view-torrent
+      download:
+        selector: a.view-torrent
+        attribute: href
+        filters:
+          - name: replace
+            args: ["/torrents/", "/download/"]
+      details:
+        selector: a.view-torrent
+        attribute: href
+      size:
+        selector: div.col-detail div.row div:nth-child(2)
+      seeders:
+        selector: div.bouton-s
+      leechers:
+        selector: div.bouton-l
+      date:
+        selector: div.col-detail div.row div span
+        filters:
+          - name: replace
+            args: ["il y a ", ""]
+          - name: replace
+            args: ["heure", "hour"]
+          - name: replace
+            args: ["jour", "day"]
+          - name: replace
+            args: ["semaine", "week"]
+          - name: replace
+            args: ["mois", "month"]
+          - name: append
+            args: " ago"
+      downloadvolumefactor:
+        case:
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"
+# UNIT3D

src/Jackett.Common/Definitions/sharingue.yml

@@ -122,3 +122,4 @@
           "i[data-original-title=\"Double upload\"]": "2" # Single Torrent Double Upload
           "i[data-original-title=\"Double Upload\"]": "2" # Global Double Upload
           "*": "1"
+# UNIT3D

src/Jackett.Common/Definitions/shellife.yml

@@ -1,4 +1,4 @@
----
+ ---
   site: shellife
   name: Shellife
   description: "Shellife (SL) is a Private Torrent Tracker for NON MAINSTREAM MUSIC"
@@ -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/skytorrentsclone.yml

@@ -29,14 +29,14 @@
       movie-search: [q]
 
   settings:
-    - name: itorrents-links
+    - name: btdb.eu-links
       type: checkbox
-      label: Add download links via itorrents.org
+      label: Add download links via btdb.eu
       default: true
     - name: info
       type: info
-      label: ITorrents Note
-      default: Without the itorrents option only magnet links will be provided.
+      label: btdb.eu Note
+      default: Without the btdb.eu option only magnet links will be provided.
 
   search:
     # https://www.skytorrents.lol/?search=mr+mercedes+s02e05&sort=created
@@ -62,11 +62,11 @@
       details:
         selector: td a
         attribute: href
-      download-itorrents:
-        selector: a[href^="//itorrents"]
+      download-btdb.eu:
+        selector: a[href^="//btdb.eu"]
         attribute: href
       download:
-        text: "{{if .Config.itorrents-links}}{{ .Result.download-itorrents }}{{else}}{{end}}"
+        text: "{{if .Config.btdb.eu-links}}{{ .Result.download-btdb.eu }}{{else}}{{end}}"
       magnet:
         selector: a[href^="magnet:?"]
         attribute: href

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

@@ -128,3 +128,4 @@
           "i[data-original-title=\"Double upload\"]": "2" # Single Torrent Double Upload
           "i[data-original-title=\"Double Upload\"]": "2" # Global Double Upload
           "*": "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/torrent9.yml

@@ -7,8 +7,8 @@
   encoding: UTF-8
   followredirect: true
   links:
-    - https://wvw.torrent9.uno/
-    - https://wvw.t9.pe/
+    - https://www.torrent9.cat/
+
   legacylinks:
     - http://www.torrent9.ec/
     - http://www.torrent9.red/
@@ -24,6 +24,9 @@
     - https://ww1.torrent9.ph/
     - https://torrent9.ga/
     - https://www.torrent9.uno/
+    - https://wvw.torrent9.uno/
+    - https://ww1.torrent9.uno/
+    - https://wvw.t9.pe/
 
   caps:
     categorymappings:
@@ -39,6 +42,8 @@
       search: [q]
       tv-search: [q, season, ep]
 
+  settings: []
+
   download:
     selector: a[href^="/downloading/"]
       
@@ -59,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/torrent9clone.yml

@@ -7,11 +7,15 @@
   encoding: UTF-8
   followredirect: true
   links:
-    - https://www2.torrent9.ch/
+    - https://wvw.torrent9.vc/
   legacylinks:
     - https://www.torrents9.pw/
     - https://www.torrent9.ch/
     - https://www1.torrent9.ch/
+    - https://www2.torrent9.ch/
+    - https://wwv.torrent9.vg/
+    - https://www.torrent9.lol/
+    - https://www.torrent9.vc/
 
   caps:
     categorymappings:
@@ -72,7 +76,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/torrentproject2.yml

@@ -61,7 +61,7 @@
       - path: "?t={{if .Keywords}}{{.Keywords}}{{else}}test{{end}}&orderby=latest{{if .Config.filter-verified }}&safe=on{{else}}{{end}}"
         followredirect: true
     rows:
-      selector: "#similarfiles div:has(a[href^=\"/t3-\"])"
+      selector: "#similarfiles div:has(a[href^=\"/t0-\"])"
     fields:
       title:
         selector: span > a

src/Jackett.Common/Definitions/torrentsectorcrew.yml

@@ -4,7 +4,7 @@
   description: "Torrent Sector Crew (TSC) is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
   language: de-de
   type: private
-  encoding: windows-1252
+  encoding: ISO-8859-1
   links:
     - https://tsctracker.org/
   legacylinks:
@@ -13,70 +13,64 @@
   caps:
     categorymappings:
       # Apps
-      - {id: 65, cat: PC/Phone-Android, desc: "Android"}
-      - {id: 83, cat: PC/Phone-IOS, desc: "iOS"}
-      - {id: 107, cat: PC/0day, desc: "Linux"}
-      - {id: 48, cat: PC/Mac, desc: "MAC"}
-      - {id: 109, cat: PC, desc: "Sonstige"}
-      - {id: 22, cat: PC/0day, desc: "Win"}
-
+      - {id: 65, cat: PC/Phone-Android, desc: "Apps Android"}
+      - {id: 83, cat: PC/Phone-IOS, desc: "Apps iOS"}
+      - {id: 107, cat: PC/0day, desc: "Apps Linux"}
+      - {id: 48, cat: PC/Mac, desc: "Apps MAC"}
+      - {id: 109, cat: PC, desc: "Apps Sonstige"}
+      - {id: 22, cat: PC/0day, desc: "Apps Win"}
       # Audio
-      - {id: 24, cat: Audio/Audiobook, desc: "aBooks"}
-      - {id: 104, cat: Audio, desc: "Disco's"}
-      - {id: 38, cat: Audio/Audiobook, desc: "Hörspiel"}
-      - {id: 6, cat: Audio, desc: "Musik"}
-      - {id: 82, cat: Audio, desc: "Tracks"}
-      - {id: 29, cat: Audio/Video, desc: "Videos"}
-
+      - {id: 24, cat: Audio/Audiobook, desc: "Audio aBooks"}
+      - {id: 104, cat: Audio, desc: "Audio Disco's"}
+      - {id: 38, cat: Audio/Audiobook, desc: "Audio Hörspiel"}
+      - {id: 6, cat: Audio, desc: "Audio Musik"}
+      - {id: 82, cat: Audio, desc: "Audio Tracks"}
+      - {id: 29, cat: Audio/Video, desc: "Audio Videos"}
       # Doku
-      - {id: 113, cat: TV/Documentary, desc: "3D"}
-      - {id: 76, cat: TV/Documentary, desc: "HD"}
-      - {id: 78, cat: TV/Documentary, desc: "Packs"}
-      - {id: 75, cat: TV/Documentary, desc: "SD"}
-      - {id: 114, cat: TV/Documentary, desc: "Sonstige"}
-      - {id: 77, cat: TV/Documentary, desc: "Untouched"}
-
+      - {id: 113, cat: TV/Documentary, desc: "Doku 3D"}
+      - {id: 76, cat: TV/Documentary, desc: "Doku HD"}
+      - {id: 78, cat: TV/Documentary, desc: "Doku Packs"}
+      - {id: 75, cat: TV/Documentary, desc: "Doku SD"}
+      - {id: 114, cat: TV/Documentary, desc: "Doku Sonstige"}
+      - {id: 77, cat: TV/Documentary, desc: "Doku Untouched"}
       # Filme
-      - {id: 54, cat: Movies/HD, desc: "1080p"}
-      - {id: 5, cat: Movies/3D, desc: "3D"}
-      - {id: 55, cat: Movies/HD, desc: "720p"}
-      - {id: 111, cat: Movies, desc: "Anime"}
-      - {id: 43, cat: Movies/BluRay, desc: "BluRay"}
-      - {id: 20, cat: Movies/DVD, desc: "DVDR"}
-      - {id: 120, cat: Movies/Foreign, desc: "Int."}
-      - {id: 119, cat: Movies, desc: "Remux"}
-      - {id: 121, cat: Movies/HD, desc: "UHD"}
-      - {id: 36, cat: Movies/HD, desc: "x264"}
-      - {id: 19, cat: Movies/SD, desc: "XviD"}
-
+      - {id: 54, cat: Movies/HD, desc: "Filme 1080p"}
+      - {id: 5, cat: Movies/3D, desc: "Filme 3D"}
+      - {id: 55, cat: Movies/HD, desc: "Filme 720p"}
+      - {id: 111, cat: Movies, desc: "Filme Anime"}
+      - {id: 43, cat: Movies/BluRay, desc: "Filme BluRay"}
+      - {id: 20, cat: Movies/DVD, desc: "Filme DVDR"}
+      - {id: 120, cat: Movies/Foreign, desc: "Filme Int."}
+      - {id: 119, cat: Movies, desc: "Filme Remux"}
+      - {id: 121, cat: Movies/HD, desc: "Filme UHD"}
+      - {id: 124, cat: Movies/HD, desc: "Filme UHD Remux"}
+      - {id: 36, cat: Movies/HD, desc: "Filme SD"}
       # Serien
-      - {id: 112, cat: TV/Anime, desc: "Anime"}
-      - {id: 69, cat: TV/HD, desc: "HD"}
-      - {id: 72, cat: TV/Foreign, desc: "Int."}
-      - {id: 68, cat: TV, desc: "Packs"}
-      - {id: 66, cat: TV/SD, desc: "SD"}
-      - {id: 108, cat: TV, desc: "TV-Shows"}
-
+      - {id: 112, cat: TV/Anime, desc: "Serien Anime"}
+      - {id: 69, cat: TV/HD, desc: "Serien HD"}
+      - {id: 72, cat: TV/Foreign, desc: "Serien Int."}
+      - {id: 68, cat: TV, desc: "Serien Packs"}
+      - {id: 66, cat: TV/SD, desc: "Serien SD"}
+      - {id: 108, cat: TV, desc: "Serien TV-Shows"}
       # Sonstige
-      - {id: 117, cat: Other, desc: "Diverses"}
-      - {id: 28, cat: Books, desc: "eBooks"}
-      - {id: 42, cat: TV/Sport, desc: "Sport"}
-      - {id: 103, cat: Other, desc: "Tutorials"}
-      - {id: 9, cat: Other, desc: "Wallpaper"}
-      - {id: 64, cat: XXX, desc: "XXX"}
-
+      - {id: 117, cat: Other, desc: "Sonstige Diverses"}
+      - {id: 28, cat: Books, desc: "Sonstige eBooks"}
+      - {id: 42, cat: TV/Sport, desc: "Sonstige Sport"}
+      - {id: 103, cat: Other, desc: "Sonstige Tutorials"}
+      - {id: 9, cat: Other, desc: "Sonstige Wallpaper"}
+      - {id: 64, cat: XXX, desc: "Sonstige XXX"}
       # Spiele
-      - {id: 115, cat: PC/Mac, desc: "MAC"}
-      - {id: 37, cat: Console/NDS, desc: "Nintendo"}
-      - {id: 4, cat: PC/Games, desc: "PC"}
-      - {id: 58, cat: Console/PS4, desc: "PSX"}
-      - {id: 116, cat: Other, desc: "Sonstige"}
-      - {id: 50, cat: Console/Xbox, desc: "XBOX"}
-
+      - {id: 115, cat: PC/Mac, desc: "Spiele MAC"}
+      - {id: 37, cat: Console/NDS, desc: "Spiele Nintendo"}
+      - {id: 4, cat: PC/Games, desc: "Spiele PC"}
+      - {id: 58, cat: Console/PS4, desc: "Spiele PSX"}
+      - {id: 116, cat: Other, desc: "Spiele Sonstige"}
+      - {id: 50, cat: Console/Xbox, desc: "Spiele XBOX"}
 
     modes:
       search: [q]
       tv-search: [q, season, ep]
+      movie-search: [q]
 
   settings:
     - name: pin
@@ -88,7 +82,10 @@
     - name: password
       type: password
       label: Password
-
+    - name: info_results
+      type: info
+      label: "Search results"
+      default: "<ol><li>Only the Classic profile is supported.<li>Make sure to set the <b>TorrentList-Layout</b> option in your profile to <b>Klassisches Layout, sehr breite Darstellung.</b><li>And for best results set the <b>Torrents pro Seite</b> to <b>100.</b></ol>"
   login:
     path: landing.php
     method: form
@@ -118,12 +115,12 @@
       - path: browse.php
     inputs:
       $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
+      search: "{{ .Keywords }}"
       incldead: "1"
       orderby: "added"
-      sort: desc
+      sort: "desc"
     rows:
-      selector: "h2 +p + br + table.tablebrowse > tbody > tr[style=\"height: 45px;\"], tr:contains(\"Weiter\") > td > table.tablebrowse > tbody > tr[style=\"height: 45px;\"]"
+      selector: table.tablebrowse > tbody > tr:has(a[href^="download_ssl.php"])
     fields:
       title:
         selector: a[title][href^="details.php"]
@@ -140,13 +137,14 @@
       download:
         selector: a[href^="download_ssl.php"]
         attribute: href
-      files:
-        selector: td:nth-child(3)
+      banner:
+        selector: a.thumbnail > span > img
+        attribute: src
       grabs:
         selector: td:nth-child(9)
         filters:
-          - name: replace
-            args: ["-mal", ""]
+          - name: regexp
+            args: "(\\d+)"
       size:
         selector: td:nth-child(6)
         filters:
@@ -154,26 +152,28 @@
             args: [".", ""]
           - name: replace
             args: [",", "."]
+      files:
+        selector: a[href*="&filelist=1"]
       seeders:
-        selector: td:nth-child(7)
+        selector: td:has(a[href*="&toseeders="])
         filters:
           - name: regexp
             args: "(\\d+)"
       leechers:
-        selector: td:nth-child(8)
+        selector: td:has(a[href*="&todlers="])
         filters:
           - name: regexp
             args: "(\\d+)"
       date:
         selector: td:nth-child(5)
-        remove: br
         filters:
+          - name: re_replace
+            args: ["\\s", " "]
           - name: dateparse
             args: "02.01.200615:04:05"
       downloadvolumefactor:
         case:
-          "font:contains(\"[OnlyUpload]\")": "0"
-          "font:contains(\"[-40 Download]\")": "0.6"
+          "font[color=\"#730d1e\"]:contains(\"[OnlyUpload]\")": "0"
           "*": "1"
       uploadvolumefactor:
         case:

src/Jackett.Common/Definitions/torrentseeds.yml

@@ -15,19 +15,22 @@
       - {id: 9, cat: TV/Anime, desc: "Anime/SD"}
       - {id: 1, cat: PC/0day, desc: "Apps"}
       - {id: 27, cat: Books, desc: "Bookware"}
-      - {id: 32, cat: Books/EBook, desc: "EBOOK"}
+      - {id: 32, cat: Books/Ebook, desc: "EBOOK"}
       - {id: 47, cat: Console/Other, desc: "GAMES/NSW"}
+      - {id: 60, cat: Console/Other, desc: "GAMES/ATARI"}
+      - {id: 63, cat: Console/Other, desc: "GAMES/UPDATES"}
       - {id: 2, cat: PC/Games, desc: "Games/PC"}
       - {id: 8, cat: Console/PS3, desc: "Games/PS3"}
       - {id: 30, cat: Console/PS4, desc: "GAMES/PS4"}
       - {id: 7, cat: Console/PSP, desc: "Games/PSP"}
       - {id: 16, cat: Console/Wii, desc: "GAMES/WII"}
       - {id: 29, cat: Console/WiiU, desc: "GAMES/WIIU"}
-      - {id: 17, cat: Console/XBox360, desc: "GAMES/XBOX360"}
+      - {id: 17, cat: Console/XBox 360, desc: "GAMES/XBOX360"}
       - {id: 50, cat: Movies/BluRay, desc: "Movies/Bluray-UHD"}
       - {id: 31, cat: Movies/BluRay, desc: "MOVIES/COMPLETE-BLURAY"}
       - {id: 3, cat: Movies/DVD, desc: "MOVIES/DVDR"}
       - {id: 39, cat: Movies/Foreign, desc: "MOVIES/HD-Foreign"}
+      - {id: 62, cat: Movies/Foreign, desc: "MOVIES/SD-Foreign"}
       - {id: 19, cat: Movies/HD, desc: "MOVIES/X264"}
       - {id: 49, cat: Movies/HD, desc: "Movies/X265"}
       - {id: 25, cat: Movies/SD, desc: "MOVIES/XVID"}
@@ -56,6 +59,8 @@
       - {id: 24, cat: TV/SD, desc: "TV/DVDRIP"}
       - {id: 18, cat: TV/SD, desc: "TV/SD"}
       - {id: 26, cat: TV/HD, desc: "TV/X264"}
+      - {id: 61, cat: TV/UHD, desc: "TV/2160P"}
+      - {id: 64, cat: TV/FOREIGN, desc: "TV/X264-FOREIGN"}
 
 
     modes:
@@ -85,7 +90,7 @@
     - name: info
       type: info
       label: Results Per Page
-      default: For best results, change the 'Torrents per page' setting to 100 on your 'Personal Options' from the 'Personal' menu on the Mega-Blitz webpage.
+      default: For best results, change the 'Torrents per page' setting to 100 on your 'Torrent Options' from the 'Pers Tools > UserCP' menu on the TorrentSeeds webpage.
 
   login:
     path: login.php
@@ -94,7 +99,6 @@
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
-      submitme: "X"
     error:
       - selector: h2:contains("Login failed!")
         message:
@@ -148,11 +152,19 @@
         attribute: href
       files:
         selector: td:nth-of-type(5)
+      # 2 flavours of dates
       date:
-        selector: td:nth-of-type(7)
+        # Today<br /> 10:20 AM
+        # Yesterday<br /> 08:03 PM
+        optional: true
+        selector: td:nth-child(7):contains("day")
+      date:
+        # Feb 14 2019<br /> 10:20 AM
+        optional: true
+        selector: td:nth-child(7):not(:contains("day"))
         filters:
           - name: dateparse
-            args: "Jan 02 2006 03:04 PM"
+            args: "Jan 2 2006 03:04 pm"
       size:
         selector: td:nth-of-type(8)
       grabs:

src/Jackett.Common/Definitions/torrentslocal.yml

@@ -0,0 +1,863 @@
+---
+  site: torrentslocal
+  name: Torrents-Local
+  description: "Torrents-Local is a RUSSIAN Semi-Private Torrent Tracker"
+  language: ru-ru
+  type: semi-private
+  encoding: UTF-8
+  links:
+    - https://torrents-local.xyz/
+
+  caps:
+    categorymappings:
+      # Кино, Видео и ТВ
+      - {id: 8, cat: Movies, desc: "Арт-хаус и авторское кино"}
+      - {id: 12, cat: Movies, desc: "Аниме"}
+      - {id: 473, cat: Movies, desc: "AMV и пр. видео"}
+      - {id: 214, cat: Movies, desc: "Dorama и live-action"}
+      - {id: 685, cat: Movies, desc: "DVD"}
+      - {id: 371, cat: Movies, desc: "HD"}
+      - {id: 932, cat: Movies, desc: "HD Полнометражные"}
+      - {id: 119, cat: Movies, desc: "OST"}
+      - {id: 561, cat: Movies, desc: "OST (lossless)"}
+      - {id: 149, cat: Movies, desc: "Манга"}
+      - {id: 148, cat: Movies, desc: "Онгоинги"}
+      - {id: 215, cat: Movies, desc: "Полнометражные"}
+      - {id: 202, cat: Movies, desc: "Фэндом"}
+      - {id: 6, cat: Movies, desc: "Зарубежное кино"}
+      - {id: 592, cat: Movies, desc: "Азиатские фильмы"}
+      - {id: 160, cat: Movies, desc: "Индийские фильмы"}
+      - {id: 813, cat: Movies, desc: "Коллекции"}
+      - {id: 591, cat: Movies, desc: "Фильмы до 1960 года"}
+      - {id: 590, cat: Movies, desc: "Фильмы 1961 - 2000"}
+      - {id: 589, cat: Movies, desc: "Фильмы 2001 - 2005"}
+      - {id: 588, cat: Movies, desc: "Фильмы 2006 - 2010"}
+      - {id: 945, cat: Movies, desc: "Фильмы 2011 - 2015"}
+      - {id: 978, cat: Movies, desc: "Фильмы 2016 - 2019"}
+      - {id: 479, cat: Movies, desc: "Фильмы на языке оригинала"}
+      - {id: 10, cat: Movies, desc: "Мультфильмы"}
+      - {id: 759, cat: Movies, desc: "Короткометражные"}
+      - {id: 475, cat: Movies, desc: "СССР"}
+      - {id: 7, cat: Movies, desc: "Отечественное кино"}
+      - {id: 227, cat: Movies, desc: "СССР"}
+      - {id: 888, cat: Movies, desc: "3D и 4K Видео"}
+      - {id: 399, cat: Movies, desc: "3D и 4K Кинофильмы"}
+      - {id: 339, cat: Movies, desc: "3D и 4K Мультфильмы"}
+      - {id: 948, cat: Movies, desc: "3D и 4K Документальные фильмы"}
+      - {id: 670, cat: Movies, desc: "Разное"}
+      - {id: 212, cat: Movies, desc: "Театр"}
+      - {id: 146, cat: Movies, desc: "Трейлеры и дополнительные материалы"}
+      - {id: 100, cat: Movies, desc: "Видео для портативных устройств"}
+      - {id: 105, cat: Movies, desc: "Видео для мобильных (3GP, MP4, AVI)"}
+      - {id: 690, cat: Movies, desc: "Видео для iPhone, iPod Touch"}
+      - {id: 689, cat: Movies, desc: "Видео для PSP"}
+      # DVD/HD видео"
+      - {id: 832, cat: Movies/HD, desc: "Арт-хаус и авторское кино HD"}
+      - {id: 835, cat: Movies/HD, desc: "Классика зарубежного кино"}
+      - {id: 837, cat: Movies/HD, desc: "Классика зарубежного кино DVD"}
+      - {id: 836, cat: Movies/HD, desc: "Классика зарубежного кино HD"}
+      - {id: 842, cat: Movies/HD, desc: "Зарубежное кино HD"}
+      - {id: 876, cat: Movies/HD, desc: "HD Коллекции"}
+      - {id: 845, cat: Movies/HD, desc: "HD до 2000 года"}
+      - {id: 844, cat: Movies/HD, desc: "HD 2001 - 2005"}
+      - {id: 843, cat: Movies/HD, desc: "HD 2006 - 2010"}
+      - {id: 870, cat: Movies/HD, desc: "HD 2011 - 2015"}
+      - {id: 980, cat: Movies/HD, desc: "HD 2016 - 2019"}
+      - {id: 846, cat: Movies/HD, desc: "Мультфильмы HD"}
+      - {id: 849, cat: Movies/HD, desc: "Отечественное кино DVD/HD"}
+      - {id: 851, cat: Movies/HD, desc: "Отечественное кино DVD"}
+      - {id: 850, cat: Movies/HD, desc: "Отечественное кино HD"}
+      # Сериалы
+      - {id: 14, cat: TV, desc: "Зарубежные сериалы"}
+      - {id: 862, cat: TV, desc: "Сборники"}
+      - {id: 454, cat: TV, desc: "Сериалы на языке оригинала"}
+      - {id: 115, cat: TV, desc: "24 часа / 24"}
+      - {id: 981, cat: TV, desc: "Ад на колёсах / Hell on Wheels"}
+      - {id: 982, cat: TV, desc: "Американская история ужасов / American Horror Story"}
+      - {id: 194, cat: TV, desc: "Анатомия страcти / Grey's Anatomy"}
+      - {id: 734, cat: TV, desc: "Антураж / Красавцы / Entourage"}
+      - {id: 997, cat: TV, desc: "Банши / Banshee"}
+      - {id: 153, cat: TV, desc: "Баффи - Истребительница вампиров / Buffy the Vampire..."}
+      - {id: 998, cat: TV, desc: "Белый воротничок / White Collar"}
+      - {id: 1013, cat: TV, desc: "Бесстыжие / Shameless"}
+      - {id: 379, cat: TV, desc: "Блудливая калифорния / Californication"}
+      - {id: 988, cat: TV, desc: "Бруклин 9-9 / Brooklyn Nine-Nine"}
+      - {id: 999, cat: TV, desc: "Быть человеком / Being Human"}
+      - {id: 992, cat: TV, desc: "В поле зрения / Person of Interest"}
+      - {id: 1000, cat: TV, desc: "Викинги / Vikings"}
+      - {id: 818, cat: TV, desc: "Во все тяжкие / Breaking Bad; Лучше звоните Солу / Better..."}
+      - {id: 1011, cat: TV, desc: "Воздействие / Leverage"}
+      - {id: 90, cat: TV, desc: "Герои / Heroes"}
+      - {id: 86, cat: TV, desc: "Говорящая с призраками / Ghost Whisperer"}
+      - {id: 558, cat: TV, desc: "Готэм / Gotham"}
+      - {id: 126, cat: TV, desc: "Грань / Fringe"}
+      - {id: 162, cat: TV, desc: "Гримм / Grimm"}
+      - {id: 1001, cat: TV, desc: "Далеко во Вселенной / Farscape"}
+      - {id: 134, cat: TV, desc: "Два с половиной человека / Two and a Half Men"}
+      - {id: 1002, cat: TV, desc: "Две девицы на мели / 2 Broke Girls"}
+      - {id: 81, cat: TV, desc: "Декстер / Dexter"}
+      - {id: 114, cat: TV, desc: "Демоны Да Винчи / Da Vinci's Demons"}
+      - {id: 380, cat: TV, desc: "Дефективный детектив / Monk"}
+      - {id: 164, cat: TV, desc: "Дневники вампира / The Vampire Diaries; Древние / The..."}
+      - {id: 112, cat: TV, desc: "Доктор Кто / Doctor Who"}
+      - {id: 61, cat: TV, desc: "Доктор Хаус / House M.D."}
+      - {id: 121, cat: TV, desc: "Друзья / Friends & Джо / Joey"}
+      - {id: 560, cat: TV, desc: "Её звали Никита / La Femme Nikita"}
+      - {id: 125, cat: TV, desc: "Зачарованные / Charmed"}
+      - {id: 91, cat: TV, desc: "Звездные Врата / Stargate"}
+      - {id: 433, cat: TV, desc: "Звездный крейсер Галактика / Battlestar Galactica"}
+      - {id: 92, cat: TV, desc: "Звездный путь / Star Trek"}
+      - {id: 220, cat: TV, desc: "Игра Престолов / Game of Thrones"}
+      - {id: 245, cat: TV, desc: "Как сказал Джим / According to Jim"}
+      - {id: 201, cat: TV, desc: "Как я встретил вашу маму / How I met your mother"}
+      - {id: 995, cat: TV, desc: "Карточный домик / House of Cards"}
+      - {id: 641, cat: TV, desc: "Касл / Castle"}
+      - {id: 653, cat: TV, desc: "Клан Сопрано / The Sopranos"}
+      - {id: 127, cat: TV, desc: "Коломбо / Columbo"}
+      - {id: 191, cat: TV, desc: "Компьютерщики / The IT Crowd"}
+      - {id: 1010, cat: TV, desc: "Континуум / Continuum"}
+      - {id: 196, cat: TV, desc: "Кости / Bones"}
+      - {id: 431, cat: TV, desc: "Косяки (Дурман) / Weeds"}
+      - {id: 62, cat: TV, desc: "Клиника / Scrubs"}
+      - {id: 424, cat: TV, desc: "Легенда об Искателе / Legend of the Seeker"}
+      - {id: 387, cat: TV, desc: "Медиум / Medium"}
+      - {id: 1003, cat: TV, desc: "Менталист / The Mentalist"}
+      - {id: 193, cat: TV, desc: "Меня зовут Эрл / My name is Earl"}
+      - {id: 751, cat: TV, desc: "Мерлин / Merlin"}
+      - {id: 165, cat: TV, desc: "Мертвая зона / The Dead Zone"}
+      - {id: 192, cat: TV, desc: "Молокососы / Skins"}
+      - {id: 994, cat: TV, desc: "Мотель Бейтс / Bates Motel"}
+      - {id: 197, cat: TV, desc: "Мыслить как преступник / Criminal minds"}
+      - {id: 381, cat: TV, desc: "Настоящая Кровь / True Blood"}
+      - {id: 1014, cat: TV, desc: "Нация Z / Z Nation"}
+      - {id: 1004, cat: TV, desc: "Оборотень / Teen Wolf"}
+      - {id: 195, cat: TV, desc: "Одинокие сердца / The O.C."}
+      - {id: 1012, cat: TV, desc: "Однажды в сказке / Once Upon a Time"}
+      - {id: 990, cat: TV, desc: "Однокурсники / Community"}
+      - {id: 64, cat: TV, desc: "Остаться в живых / LOST"}
+      - {id: 198, cat: TV, desc: "Отбросы / Плохие / Misfits"}
+      - {id: 386, cat: TV, desc: "Отчаянные домохозяйки / Desperate housewives"}
+      - {id: 406, cat: TV, desc: "Офис / The Office"}
+      - {id: 63, cat: TV, desc: "Побег / Prison Break"}
+      - {id: 1005, cat: TV, desc: "Полтергейст: Наследие / Poltergeist: The Legacy"}
+      - {id: 583, cat: TV, desc: "Притворщик / Pretender"}
+      - {id: 1006, cat: TV, desc: "Прослушка / The Wire"}
+      - {id: 167, cat: TV, desc: "Пуаро Агаты Кристи / Agatha Christie's Poirot"}
+      - {id: 943, cat: TV, desc: "Редкие и старинные сериалы"}
+      - {id: 991, cat: TV, desc: "Рухнувшие небеса / Falling Skies"}
+      - {id: 98, cat: TV, desc: "Сверхъестественное / Supernatural"}
+      - {id: 88, cat: TV, desc: "Секретные материалы / X-files"}
+      - {id: 1007, cat: TV, desc: "Силиконовая долина / Silicon Valley"}
+      - {id: 166, cat: TV, desc: "Скорая помощь / ER"}
+      - {id: 385, cat: TV, desc: "Спартак / Spartacus"}
+      - {id: 752, cat: TV, desc: "Сплетница / Gossip Girl"}
+      - {id: 128, cat: TV, desc: "Стрела / Arrow"}
+      - {id: 983, cat: TV, desc: "Сыны Анархии / Sons of Anarchy"}
+      - {id: 101, cat: TV, desc: "Тайны Смолвиля / Smallville"}
+      - {id: 993, cat: TV, desc: "Темное дитя / Orphan Black"}
+      - {id: 190, cat: TV, desc: "Теория Большого Взрыва / The Big Bang Theory; Мол..."}
+      - {id: 738, cat: TV, desc: "Теория Лжи (Обмани меня) / Lie to me"}
+      - {id: 246, cat: TV, desc: "Торчвуд / Torchwood"}
+      - {id: 996, cat: TV, desc: "Уилфред / Wilfred"}
+      - {id: 129, cat: TV, desc: "Флэш / The Flash"}
+      - {id: 161, cat: TV, desc: "Ходячие мертвецы / The Walking Dead; Бойтесь хо..."}
+      - {id: 150, cat: TV, desc: "Холм одного дерева / One Tree Hill"}
+      - {id: 986, cat: TV, desc: "Хранилище 13 / Warehouse 13"}
+      - {id: 124, cat: TV, desc: "Части тела / Nip Tuck"}
+      - {id: 985, cat: TV, desc: "Чертова служба в госпитале Мэш / M*A*S*H"}
+      - {id: 984, cat: TV, desc: "Чёрный список / The Blacklist"}
+      - {id: 200, cat: TV, desc: "Числа / Numb3rs"}
+      - {id: 472, cat: TV, desc: "Шерлок / Sherlock"}
+      - {id: 1008, cat: TV, desc: "Штамм / The Strain"}
+      - {id: 123, cat: TV, desc: "Эврика / Eureka"}
+      - {id: 1009, cat: TV, desc: "Электронные жучки / Bugs"}
+      - {id: 987, cat: TV, desc: "Элементарно / Elementary"}
+      - {id: 597, cat: TV, desc: "Латиноамериканские сериалы"}
+      - {id: 11, cat: TV, desc: "Мультсериалы"}
+      - {id: 383, cat: TV, desc: "Аватар: Легенда об Аанге / Avatar: The Last Airbender"}
+      - {id: 889, cat: TV, desc: "Американский папаша / American Dad! (Seth MacFarlane)"}
+      - {id: 933, cat: TV, desc: "Бернард / Bernard"}
+      - {id: 143, cat: TV, desc: "Битва зверей / Beast Wars"}
+      - {id: 168, cat: TV, desc: "Букашки / Minuscule"}
+      - {id: 758, cat: TV, desc: "Гриффины / Family Guy (Seth MacFarlane)"}
+      - {id: 934, cat: TV, desc: "Губка Боб Квадратные Штаны / SpongeBob SquarePants"}
+      - {id: 46, cat: TV, desc: "Звездные войны / Star wars"}
+      - {id: 935, cat: TV, desc: "Маша и Медведь"}
+      - {id: 133, cat: TV, desc: "Мыши-байкеры с Марса / Biker Mice from Mars"}
+      - {id: 652, cat: TV, desc: "Охотники за привидениями"}
+      - {id: 936, cat: TV, desc: "Пингвины из Мадагаскара / The Penguins of Madagascar"}
+      - {id: 937, cat: TV, desc: "Приключения Лунтика"}
+      - {id: 938, cat: TV, desc: "Робоцып / Robot Chicken"}
+      - {id: 132, cat: TV, desc: "Симпсоны / The Simpsons"}
+      - {id: 421, cat: TV, desc: "Смешарики"}
+      - {id: 184, cat: TV, desc: "Том и Джерри / Tom and Jerry"}
+      - {id: 405, cat: TV, desc: "Тотали Спайс / Totally Spies"}
+      - {id: 142, cat: TV, desc: "Трансформеры / Transformers"}
+      - {id: 687, cat: TV, desc: "Футурама / Futurama"}
+      - {id: 384, cat: TV, desc: "Царь горы / King of the hill"}
+      - {id: 158, cat: TV, desc: "Что с Энди / What with Andy"}
+      - {id: 382, cat: TV, desc: "Школа волшебниц / Winx Club"}
+      - {id: 939, cat: TV, desc: "Шоу Кливленда / The Cleveland Show (Seth MacFarlane)"}
+      - {id: 434, cat: TV, desc: "Экранизация комиксов / Comics"}
+      - {id: 131, cat: TV, desc: "Южный Парк / South Park"}
+      - {id: 13, cat: TV, desc: "Отечественные cериалы"}
+      - {id: 137, cat: TV, desc: "Бригада"}
+      - {id: 188, cat: TV, desc: "Восьмидесятые"}
+      - {id: 815, cat: TV, desc: "Глухарь"}
+      - {id: 559, cat: TV, desc: "Интерны"}
+      - {id: 189, cat: TV, desc: "Кадетство"}
+      - {id: 221, cat: TV, desc: "Карпов"}
+      - {id: 422, cat: TV, desc: "Реальные пацаны"}
+      - {id: 661, cat: TV, desc: "Сваты"}
+      - {id: 138, cat: TV, desc: "Солдаты"}
+      - {id: 584, cat: TV, desc: "Убойная сила"}
+      - {id: 651, cat: TV, desc: "Улицы разбитых фонарей"}
+      - {id: 136, cat: TV, desc: "Универ"}
+      # Документалистика, юмор, спорт"
+      - {id: 57, cat: TV, desc: "Документальные фильмы и телепередачи"}
+      - {id: 155, cat: TV, desc: "BBC"}
+      - {id: 186, cat: TV, desc: "Discovery Channel"}
+      - {id: 570, cat: TV, desc: "HD"}
+      - {id: 634, cat: TV, desc: "IMAX/3D"}
+      - {id: 403, cat: TV, desc: "National Geographic"}
+      - {id: 824, cat: TV, desc: "Авиация"}
+      - {id: 855, cat: TV, desc: "Биографии. Личности и кумиры"}
+      - {id: 856, cat: TV, desc: "Видовые, релаксационные"}
+      - {id: 443, cat: TV, desc: "Военное дело"}
+      - {id: 635, cat: TV, desc: "Диагностика кармы"}
+      - {id: 929, cat: TV, desc: "Документальные фильмы на языке оригинала"}
+      - {id: 554, cat: TV, desc: "Живая планета"}
+      - {id: 830, cat: TV, desc: "За рулем"}
+      - {id: 867, cat: TV, desc: "Информационно-аналитические передачи и публицистика"}
+      - {id: 633, cat: TV, desc: "История и мировая культура"}
+      - {id: 531, cat: TV, desc: "Космос"}
+      - {id: 185, cat: TV, desc: "Криминальная документалистика"}
+      - {id: 965, cat: TV, desc: "Научно-популярные фильмы"}
+      - {id: 866, cat: TV, desc: "Паранормальные явления и экстрасенсорика"}
+      - {id: 523, cat: TV, desc: "Политика и экономика"}
+      - {id: 949, cat: TV, desc: "Путешествия и туризм"}
+      - {id: 425, cat: TV, desc: "Религия"}
+      - {id: 109, cat: TV, desc: "Обои и картинки"}
+      - {id: 890, cat: TV, desc: "Абстракции"}
+      - {id: 736, cat: TV, desc: "Аватары, Иконки, Смайлы"}
+      - {id: 625, cat: TV, desc: "Живопись, Графика, Фэнтези арт"}
+      - {id: 891, cat: TV, desc: "Игры"}
+      - {id: 626, cat: TV, desc: "Картинки"}
+      - {id: 899, cat: TV, desc: "Кино и мультфильмы"}
+      - {id: 927, cat: TV, desc: "Компьютеры, ноутбуки, Интернет"}
+      - {id: 919, cat: TV, desc: "Космос"}
+      - {id: 898, cat: TV, desc: "Красивые девушки"}
+      - {id: 920, cat: TV, desc: "Кулинария"}
+      - {id: 627, cat: TV, desc: "Обои на разную тематику"}
+      - {id: 926, cat: TV, desc: "Праздники"}
+      - {id: 892, cat: TV, desc: "Природа, города и страны"}
+      - {id: 893, cat: TV, desc: "Спорт"}
+      - {id: 894, cat: TV, desc: "Техника"}
+      - {id: 628, cat: TV, desc: "Фото знаменитостей"}
+      - {id: 58, cat: TV, desc: "Развлекательные телепередачи и шоу, приколы и юмор"}
+      - {id: 154, cat: TV, desc: "Comedy Club"}
+      - {id: 551, cat: TV, desc: "Top Gear"}
+      - {id: 877, cat: TV, desc: "Авторские шоу и концерты, бенефисы и концертографии"}
+      - {id: 878, cat: TV, desc: "Демонстрационные шоу"}
+      - {id: 145, cat: TV, desc: "КВН"}
+      - {id: 858, cat: TV, desc: "Пародийные телепередачи и шоу"}
+      - {id: 632, cat: TV, desc: "Познавательно-развлекательные телепередачи, игры и виктори..."}
+      - {id: 621, cat: TV, desc: "Пост-КВН и Молодежные скетч-шоу"}
+      - {id: 857, cat: TV, desc: "Премии вручения, праздничные и новогодние программы"}
+      - {id: 930, cat: TV, desc: "Развлекательные телепередачи на языке оригинала"}
+      - {id: 372, cat: TV, desc: "Реалити и ток-шоу"}
+      - {id: 59, cat: TV, desc: "Спорт"}
+      - {id: 208, cat: TV, desc: "Автоспорт"}
+      - {id: 750, cat: TV, desc: "Американский футбол, регби и бейсбол"}
+      - {id: 229, cat: TV, desc: "Биатлон и лыжи"}
+      - {id: 528, cat: TV, desc: "Бильярд"}
+      - {id: 206, cat: TV, desc: "Боевые искусства"}
+      - {id: 828, cat: TV, desc: "Бокс"}
+      - {id: 205, cat: TV, desc: "Брейк-данс"}
+      - {id: 207, cat: TV, desc: "Велоспорт и мотоспорт"}
+      - {id: 210, cat: TV, desc: "Культуризм, фитнес"}
+      - {id: 407, cat: TV, desc: "Паркур"}
+      - {id: 817, cat: TV, desc: "Покер"}
+      - {id: 404, cat: TV, desc: "Скейтборд"}
+      - {id: 209, cat: TV, desc: "Сноуборд"}
+      - {id: 673, cat: TV, desc: "Теннис"}
+      - {id: 791, cat: TV, desc: "Зимние Олимпийские Игры 2014 в Сочи"}
+      - {id: 793, cat: TV, desc: "Биатлон"}
+      - {id: 970, cat: TV, desc: "Бобслей/Санный спорт/Скелетон"}
+      - {id: 795, cat: TV, desc: "Конькобежный спорт"}
+      - {id: 794, cat: TV, desc: "Лыжный спорт"}
+      - {id: 971, cat: TV, desc: "Сноуборд/Фристайл/Шорт-трек/Керлинг"}
+      - {id: 969, cat: TV, desc: "Фигурное катание"}
+      - {id: 792, cat: TV, desc: "Хоккей"}
+      - {id: 797, cat: TV, desc: "Обзорные и разные тематические передачи"}
+      - {id: 60, cat: TV, desc: "Футбол"}
+      - {id: 490, cat: TV, desc: "Игры национальных сборных"}
+      - {id: 491, cat: TV, desc: "Международные лиги и кубки"}
+      - {id: 492, cat: TV, desc: "Национальные чемпионаты и кубки зарубежных стран"}
+      - {id: 489, cat: TV, desc: "Обзоры и передачи о футболе"}
+      - {id: 649, cat: TV, desc: "Товарищеские и выставочные матчи"}
+      - {id: 488, cat: TV, desc: "Футбольное видео"}
+      - {id: 493, cat: TV, desc: "Чемпионат и Кубок России"}
+      - {id: 829, cat: TV, desc: "Чемпионат мира 2014"}
+      - {id: 204, cat: TV, desc: "Хоккей"}
+      - {id: 450, cat: TV, desc: "NHL"}
+      - {id: 449, cat: TV, desc: "КХЛ"}
+      - {id: 451, cat: TV, desc: "Международные турниры по хоккею"}
+      - {id: 636, cat: TV, desc: "Обучающее видео"}
+      - {id: 452, cat: TV, desc: "Хоккейное видео"}
+      - {id: 203, cat: TV, desc: "Баскетбол"}
+      - {id: 662, cat: TV, desc: "NBA"}
+      - {id: 760, cat: TV, desc: "NCAA"}
+      - {id: 666, cat: TV, desc: "Баскетбольное видео"}
+      - {id: 664, cat: TV, desc: "Европейский клубный баскетбол"}
+      - {id: 663, cat: TV, desc: "Международные турниры"}
+      - {id: 665, cat: TV, desc: "Обучающее видео"}
+      - {id: 763, cat: TV, desc: "Рестлинг"}
+      - {id: 897, cat: TV, desc: "DVD"}
+      - {id: 814, cat: TV, desc: "NXT"}
+      - {id: 772, cat: TV, desc: "Packs & Documentaries"}
+      - {id: 764, cat: TV, desc: "RAW"}
+      - {id: 765, cat: TV, desc: "SmackDown!"}
+      - {id: 768, cat: TV, desc: "TNA IMPACT WRESTLING"}
+      - {id: 770, cat: TV, desc: "TNA PPV"}
+      - {id: 896, cat: TV, desc: "WWE Classics"}
+      - {id: 769, cat: TV, desc: "WWE PPV"}
+      # Книги, аудиокниги, обучающие видео"
+      - {id: 15, cat: Books, desc: "Книги (общий раздел)"}
+      - {id: 1015, cat: Books, desc: "Собрание сочинений"}
+      - {id: 1016, cat: Books, desc: "Издательские серии и циклы"}
+      - {id: 852, cat: Books, desc: "Библиотеки и собрания книг"}
+      - {id: 1018, cat: Books, desc: "Естественные и формальные науки"}
+      - {id: 358, cat: Books, desc: "Научно-популярная литература"}
+      - {id: 1032, cat: Books, desc: "Головоломки, логические задачи и игры"}
+      - {id: 942, cat: Books, desc: "Иностранные языки"}
+      - {id: 20, cat: Books, desc: "Авто и мото"}
+      - {id: 359, cat: Books, desc: "Детские книги и журналы"}
+      - {id: 97, cat: Books, desc: "Журналы (общий раздел)"}
+      - {id: 972, cat: Books, desc: "Искусство. Культурология. Путеводители"}
+      - {id: 356, cat: Books, desc: "Искусство фотографии"}
+      - {id: 354, cat: Books, desc: "Историческая литература и военное дело"}
+      - {id: 116, cat: Books, desc: "Комиксы"}
+      - {id: 973, cat: Books, desc: "Кулинария"}
+      - {id: 352, cat: Books, desc: "Медицина и здоровье"}
+      - {id: 816, cat: Books, desc: "Многопредметные энциклопедии и словари"}
+      - {id: 446, cat: Books, desc: "Ноты и музыкальная литература"}
+      - {id: 946, cat: Books, desc: "Психология. Философия. Эзотерика."}
+      - {id: 756, cat: Books, desc: "Радиоэлектроника"}
+      - {id: 355, cat: Books, desc: "Рисунок, графический дизайн"}
+      - {id: 353, cat: Books, desc: "Спорт, боевые искусства"}
+      - {id: 357, cat: Books, desc: "Строительство и ремонт"}
+      - {id: 94, cat: Books, desc: "Учебные"}
+      - {id: 93, cat: Books, desc: "Художественные"}
+      - {id: 640, cat: Books, desc: "Хобби и увлечения, коллекционирование (разное)"}
+      - {id: 1019, cat: Books, desc: "Художественная литература"}
+      - {id: 1020, cat: Books, desc: "Собрание сочинений (классическая литература)"}
+      - {id: 1021, cat: Books, desc: "Собрание сочинений (классическая фантастика/фэнтези)"}
+      - {id: 1022, cat: Books, desc: "Собрание сочинений (современная литература)"}
+      - {id: 1023, cat: Books, desc: "Собрание сочинений (современная фантастика/фэнтези)"}
+      - {id: 1024, cat: Books, desc: "Издательские серии и циклы"}
+      - {id: 1025, cat: Books, desc: "Библиотеки и собрания книг"}
+      - {id: 1026, cat: Books, desc: "Классическая русская литература"}
+      - {id: 1027, cat: Books, desc: "Классическая зарубежная литература"}
+      - {id: 1028, cat: Books, desc: "Классическая фантастика и фэнтези"}
+      - {id: 1029, cat: Books, desc: "Современная литература"}
+      - {id: 1030, cat: Books, desc: "Современная фантастика и фэнтези"}
+      - {id: 1031, cat: Books, desc: "Ранобэ"}
+      - {id: 16, cat: Books, desc: "Компьютерная литература"}
+      - {id: 344, cat: Books, desc: "Unix-подобная операционная система"}
+      - {id: 346, cat: Books, desc: "Веб-дизайн и программирование"}
+      - {id: 348, cat: Books, desc: "Графика"}
+      - {id: 351, cat: Books, desc: "Железо (книги о ПК)"}
+      - {id: 341, cat: Books, desc: "Компьютерные журналы"}
+      - {id: 347, cat: Books, desc: "Программирование"}
+      - {id: 343, cat: Books, desc: "Программы"}
+      - {id: 342, cat: Books, desc: "Программы от Microsoft"}
+      - {id: 349, cat: Books, desc: "Сети"}
+      - {id: 345, cat: Books, desc: "Базы данных, СУБД"}
+      - {id: 350, cat: Books, desc: "Хакинг и безопасность"}
+      - {id: 17, cat: Books, desc: "Аудиокниги"}
+      - {id: 941, cat: Books, desc: "Детская литература"}
+      - {id: 940, cat: Books, desc: "Иностранные языки"}
+      - {id: 468, cat: Books, desc: "Классическая литература (Аудиокниги)"}
+      - {id: 853, cat: Books, desc: "Психология, тренинги, саморазвитие (Аудиокниги)"}
+      - {id: 95, cat: Books, desc: "Современная литература (Аудиокниги)"}
+      - {id: 96, cat: Books, desc: "Учебные аудиокниги (разное)"}
+      - {id: 854, cat: Books, desc: "Фантастика / Фэнтези / Мистика (Аудиокниги)"}
+      - {id: 19, cat: Books, desc: "Видеоуроки и обучающие интерактивные DVD"}
+      - {id: 629, cat: Books, desc: "Авто и мото"}
+      - {id: 596, cat: Books, desc: "Беременность, роды, уход за новорождённым"}
+      - {id: 439, cat: Books, desc: "Бизнес"}
+      - {id: 575, cat: Books, desc: "Для детей"}
+      - {id: 642, cat: Books, desc: "Игра на барабанах"}
+      - {id: 522, cat: Books, desc: "Иностранные языки"}
+      - {id: 426, cat: Books, desc: "Йога"}
+      - {id: 595, cat: Books, desc: "Кулинария"}
+      - {id: 744, cat: Books, desc: "Массаж"}
+      - {id: 577, cat: Books, desc: "Медицина и здоровье"}
+      - {id: 219, cat: Books, desc: "Музыка"}
+      - {id: 811, cat: Books, desc: "Пикап, правила общения"}
+      - {id: 217, cat: Books, desc: "ПО"}
+      - {id: 593, cat: Books, desc: "Психология, тренинги, саморазвитие"}
+      - {id: 654, cat: Books, desc: "Рисование"}
+      - {id: 218, cat: Books, desc: "Рыбалка"}
+      - {id: 747, cat: Books, desc: "Секреты красоты"}
+      - {id: 576, cat: Books, desc: "Строительство и ремонт"}
+      - {id: 474, cat: Books, desc: "Танцы"}
+      - {id: 743, cat: Books, desc: "Фокусы и трюки"}
+      - {id: 82, cat: Books, desc: "Подкасты"}
+      # Музыка"
+      - {id: 216, cat: Audio, desc: "Rocksteady, Ska, Reggae, Dub"}
+      - {id: 83, cat: Audio, desc: "World Music, Ethnic, Folk"}
+      - {id: 401, cat: Audio, desc: "Сборники"}
+      - {id: 598, cat: Audio, desc: "Башкирская, татарская"}
+      - {id: 617, cat: Audio, desc: "Видео"}
+      - {id: 616, cat: Audio, desc: "Сборники клипов"}
+      - {id: 615, cat: Audio, desc: "Сборники"}
+      - {id: 637, cat: Audio, desc: "Юмор"}
+      - {id: 22, cat: Audio, desc: "Джаз и Блюз"}
+      - {id: 606, cat: Audio, desc: "Lossless"}
+      - {id: 686, cat: Audio, desc: "Кавказ"}
+      - {id: 733, cat: Audio, desc: "Видео"}
+      - {id: 23, cat: Audio, desc: "Классическая музыка"}
+      - {id: 607, cat: Audio, desc: "Lossless"}
+      - {id: 27, cat: Audio, desc: "Музыка других жанров"}
+      - {id: 608, cat: Audio, desc: "Lossless"}
+      - {id: 553, cat: Audio, desc: "Мюзикл"}
+      - {id: 24, cat: Audio, desc: "Поп музыка"}
+      - {id: 470, cat: Audio, desc: "Зарубежная"}
+      - {id: 599, cat: Audio, desc: "Зарубежная (lossless)"}
+      - {id: 469, cat: Audio, desc: "Отечественная"}
+      - {id: 600, cat: Audio, desc: "Отечественная (lossless)"}
+      - {id: 471, cat: Audio, desc: "Сборники"}
+      - {id: 25, cat: Audio, desc: "Рэп, Хип-Хоп, R'n'B"}
+      - {id: 925, cat: Audio, desc: "WebRip Видео (Зарубежное)"}
+      - {id: 880, cat: Audio, desc: "WebRip Видео (Отечественное)"}
+      - {id: 410, cat: Audio, desc: "DVD видео"}
+      - {id: 411, cat: Audio, desc: "HD видео"}
+      - {id: 420, cat: Audio, desc: "Instrumental"}
+      - {id: 235, cat: Audio, desc: "Зарубежный Рэп, Хип-Хоп"}
+      - {id: 611, cat: Audio, desc: "Зарубежный Рэп, Хип-Хоп, R'n'B (lossless)"}
+      - {id: 921, cat: Audio, desc: "Зарубежный R'n'B"}
+      - {id: 922, cat: Audio, desc: "Отечественный R'n'B"}
+      - {id: 234, cat: Audio, desc: "Отечественный Рэп, Хип-Хоп"}
+      - {id: 612, cat: Audio, desc: "Отечественный Рэп, Хип-Хоп, R'n'B (lossless)"}
+      - {id: 409, cat: Audio, desc: "Видео (Заруб.)"}
+      - {id: 412, cat: Audio, desc: "Видео (Отеч.)"}
+      - {id: 26, cat: Audio, desc: "Саундтреки и Караоке"}
+      - {id: 484, cat: Audio, desc: "Саундтреки к играм"}
+      - {id: 579, cat: Audio, desc: "Саундтреки к играм (lossless)"}
+      - {id: 485, cat: Audio, desc: "Саундтреки к фильмам и сериалам"}
+      - {id: 580, cat: Audio, desc: "Саундтреки к фильмам и сериалам (lossless)"}
+      - {id: 735, cat: Audio, desc: "Караоке"}
+      - {id: 156, cat: Audio, desc: "Шансон, Авторская и Военная песня"}
+      - {id: 676, cat: Audio, desc: "Шансон"}
+      - {id: 677, cat: Audio, desc: "Авторская и Военная песня"}
+      - {id: 678, cat: Audio, desc: "Сборники"}
+      - {id: 239, cat: Audio, desc: "Видео (Музыка)"}
+      - {id: 241, cat: Audio, desc: "DVD"}
+      - {id: 240, cat: Audio, desc: "HD"}
+      - {id: 376, cat: Audio, desc: "Клипы (Зарубежные)"}
+      - {id: 375, cat: Audio, desc: "Клипы (Отечественные)"}
+      - {id: 549, cat: Audio, desc: "Сборники Клипов"}
+      # Рок-музыка"
+      - {id: 30, cat: Audio, desc: "Зарубежная Alternative"}
+      - {id: 267, cat: Audio, desc: "Alternative"}
+      - {id: 562, cat: Audio, desc: "Alternative (lossless)"}
+      - {id: 368, cat: Audio, desc: "Emo / Hardcore"}
+      - {id: 563, cat: Audio, desc: "Emo / Hardcore (lossless)"}
+      - {id: 369, cat: Audio, desc: "Industrial"}
+      - {id: 564, cat: Audio, desc: "Industrial (lossless)"}
+      - {id: 266, cat: Audio, desc: "Punk"}
+      - {id: 565, cat: Audio, desc: "Punk (lossless)"}
+      - {id: 364, cat: Audio, desc: "Отечественная Alternative"}
+      - {id: 370, cat: Audio, desc: "Alternative"}
+      - {id: 566, cat: Audio, desc: "Alternative (lossless)"}
+      - {id: 365, cat: Audio, desc: "Emo / Hardcore"}
+      - {id: 567, cat: Audio, desc: "Emo / Hardcore (lossless)"}
+      - {id: 366, cat: Audio, desc: "Industrial"}
+      - {id: 568, cat: Audio, desc: "Industrial (lossless)"}
+      - {id: 367, cat: Audio, desc: "Punk"}
+      - {id: 569, cat: Audio, desc: "Punk (lossless)"}
+      - {id: 29, cat: Audio, desc: "Зарубежный Metal"}
+      - {id: 254, cat: Audio, desc: "Avant-garde, Experimental"}
+      - {id: 498, cat: Audio, desc: "Avant-garde, Experimental (lossless)"}
+      - {id: 253, cat: Audio, desc: "Black, Folk, Pagan, Viking"}
+      - {id: 499, cat: Audio, desc: "Black, Folk, Pagan, Viking (lossless)"}
+      - {id: 252, cat: Audio, desc: "Death, Doom, Sludge, Stoner"}
+      - {id: 500, cat: Audio, desc: "Death, Doom, Sludge, Stoner (lossless)"}
+      - {id: 251, cat: Audio, desc: "Gothic Metal"}
+      - {id: 501, cat: Audio, desc: "Gothic Metal (lossless)"}
+      - {id: 250, cat: Audio, desc: "Grind, Brutal Death"}
+      - {id: 502, cat: Audio, desc: "Grind, Brutal Death (lossless)"}
+      - {id: 249, cat: Audio, desc: "Heavy, Power, Progressive"}
+      - {id: 503, cat: Audio, desc: "Heavy, Power, Progressive (lossless)"}
+      - {id: 895, cat: Audio, desc: "Symphonic, Operatic"}
+      - {id: 909, cat: Audio, desc: "Symphonic, Operatic (lossless)"}
+      - {id: 247, cat: Audio, desc: "Thrash, Speed"}
+      - {id: 504, cat: Audio, desc: "Thrash, Speed (lossless)"}
+      - {id: 28, cat: Audio, desc: "Зарубежный Rock"}
+      - {id: 260, cat: Audio, desc: "Classic Rock & Hard Rock"}
+      - {id: 505, cat: Audio, desc: "Classic Rock & Hard Rock (lossless)"}
+      - {id: 258, cat: Audio, desc: "Folk-Rock"}
+      - {id: 506, cat: Audio, desc: "Folk-Rock (lossless)"}
+      - {id: 444, cat: Audio, desc: "Garage Rock, Post-Punk, Gothic Rock, Synth Pop"}
+      - {id: 507, cat: Audio, desc: "Garage Rock, Post-Punk, Gothic Rock, Synth Pop (lossless)"}
+      - {id: 256, cat: Audio, desc: "Instrumental"}
+      - {id: 508, cat: Audio, desc: "Instrumental (lossless)"}
+      - {id: 257, cat: Audio, desc: "Indie Rock, Britpop, Pop-Rock, Soft Rock"}
+      - {id: 509, cat: Audio, desc: "Indie Rock, Britpop, Pop-Rock, Soft Rock (lossless)"}
+      - {id: 259, cat: Audio, desc: "Progressive & Art-Rock"}
+      - {id: 510, cat: Audio, desc: "Progressive & Art-Rock (lossless)"}
+      - {id: 255, cat: Audio, desc: "Rockabilly, Psychobilly, Rock'n'Roll"}
+      - {id: 511, cat: Audio, desc: "Rockabilly, Psychobilly, Rock'n'Roll (lossless)"}
+      - {id: 99, cat: Audio, desc: "Отечественный Метал"}
+      - {id: 336, cat: Audio, desc: "Black, Folk, Pagan, Viking"}
+      - {id: 512, cat: Audio, desc: "Black, Folk, Pagan, Viking (lossless)"}
+      - {id: 338, cat: Audio, desc: "Death, Grind"}
+      - {id: 513, cat: Audio, desc: "Death, Grind (lossless)"}
+      - {id: 335, cat: Audio, desc: "Doom, Gothic"}
+      - {id: 514, cat: Audio, desc: "Doom, Gothic (lossless)"}
+      - {id: 333, cat: Audio, desc: "Hard & Heavy, Power, Speed, Thrash"}
+      - {id: 515, cat: Audio, desc: "Hard & Heavy, Power, Speed, Thrash (lossless)"}
+      - {id: 334, cat: Audio, desc: "Progressive, Art"}
+      - {id: 516, cat: Audio, desc: "Progressive, Art (lossless)"}
+      - {id: 31, cat: Audio, desc: "Отечественный Рок"}
+      - {id: 360, cat: Audio, desc: "Classic Rock & Hard Rock & Rock'n'Roll"}
+      - {id: 517, cat: Audio, desc: "Classic Rock & Hard Rock & Rock'n..."}
+      - {id: 361, cat: Audio, desc: "Progressive & Art-Rock"}
+      - {id: 518, cat: Audio, desc: "Progressive & Art-Rock (lossless)"}
+      - {id: 362, cat: Audio, desc: "Pop-Rock & Soft Rock & Folk Rock"}
+      - {id: 519, cat: Audio, desc: "Pop-Rock & Soft Rock & Folk Rock (lossless)"}
+      - {id: 141, cat: Audio, desc: "Experimental"}
+      - {id: 526, cat: Audio, desc: "Lossless"}
+      - {id: 85, cat: Audio, desc: "Восточноазиатский Рок / Поп"}
+      - {id: 527, cat: Audio, desc: "Lossless"}
+      - {id: 32, cat: Audio, desc: "Видео (Рок-музыка)"}
+      - {id: 374, cat: Audio, desc: "Alternative"}
+      - {id: 238, cat: Audio, desc: "DVD"}
+      - {id: 573, cat: Audio, desc: "Experimental"}
+      - {id: 237, cat: Audio, desc: "HD"}
+      - {id: 574, cat: Audio, desc: "J-Rock / Pop / Visual Kei"}
+      - {id: 571, cat: Audio, desc: "Metal"}
+      - {id: 572, cat: Audio, desc: "Rock"}
+      - {id: 373, cat: Audio, desc: "Документалистика"}
+      - {id: 400, cat: Audio, desc: "Сборники Рок-Музыки"}
+      # Электронная музыка"
+      - {id: 33, cat: Audio, desc: "Trance, Goa-Trance, Psy-Trance, PsyChill, Ambient Dub"}
+      - {id: 429, cat: Audio, desc: "Trance - Albums, Compilations"}
+      - {id: 430, cat: Audio, desc: "Trance - Radioshows, Livesets, Mixes"}
+      - {id: 874, cat: Audio, desc: "Trance - Singles, EPs"}
+      - {id: 533, cat: Audio, desc: "Trance - Singles, Albums, LPs (lossless)"}
+      - {id: 428, cat: Audio, desc: "Goa-Trance / Psychedelic / Psy-Chill / Ambient Dub"}
+      - {id: 534, cat: Audio, desc: "Goa-Trance / Psychedelic / Psy-Chill / Ambient Dub..."}
+      - {id: 658, cat: Audio, desc: "Сборники"}
+      - {id: 34, cat: Audio, desc: "House, Techno"}
+      - {id: 438, cat: Audio, desc: "Techno / Minimal / Tech House"}
+      - {id: 535, cat: Audio, desc: "Techno / Minimal / Tech House (lossless)"}
+      - {id: 435, cat: Audio, desc: "House / Electro House"}
+      - {id: 536, cat: Audio, desc: "House / Electro House (lossless)"}
+      - {id: 659, cat: Audio, desc: "Сборники House / Electro House"}
+      - {id: 398, cat: Audio, desc: "Livesets"}
+      - {id: 436, cat: Audio, desc: "Progressive House / Deep House"}
+      - {id: 396, cat: Audio, desc: "Vinyls / EPs / tracks"}
+      - {id: 35, cat: Audio, desc: "Drum & Bass, Jungle, Electro, Breakbeat, IDM,..."}
+      - {id: 416, cat: Audio, desc: "Breakbeat / Beats"}
+      - {id: 540, cat: Audio, desc: "Breakbeat / Beats (lossless)"}
+      - {id: 415, cat: Audio, desc: "Drum & Bass / Jungle"}
+      - {id: 543, cat: Audio, desc: "Drum & Bass / Jungle (lossless)"}
+      - {id: 417, cat: Audio, desc: "Electro"}
+      - {id: 544, cat: Audio, desc: "Electro (lossless)"}
+      - {id: 419, cat: Audio, desc: "Hardcore / Hardstyle"}
+      - {id: 545, cat: Audio, desc: "Hardcore / Hardstyle (lossless)"}
+      - {id: 418, cat: Audio, desc: "Idm"}
+      - {id: 546, cat: Audio, desc: "Idm (lossless)"}
+      - {id: 660, cat: Audio, desc: "Сборники"}
+      - {id: 36, cat: Audio, desc: "Chillout, Lounge, Downtempo, Trip-Hop"}
+      - {id: 538, cat: Audio, desc: "Lossless"}
+      - {id: 402, cat: Audio, desc: "Сборники"}
+      - {id: 84, cat: Audio, desc: "Industrial"}
+      - {id: 539, cat: Audio, desc: "Lossless"}
+      - {id: 630, cat: Audio, desc: "Дискографии"}
+      - {id: 242, cat: Audio, desc: "Видео (Электронная музыка)"}
+      - {id: 244, cat: Audio, desc: "DVD"}
+      - {id: 243, cat: Audio, desc: "HD"}
+      - {id: 377, cat: Audio, desc: "Клипы"}
+      # Игры для PC"
+      - {id: 40, cat: PC/Games, desc: "Новые раздачи"}
+      - {id: 65, cat: PC/Games, desc: "Горячие Новинки"}
+      - {id: 75, cat: PC/Games, desc: "Action"}
+      - {id: 457, cat: PC/Games, desc: "Action до 2003 г."}
+      - {id: 900, cat: PC/Games, desc: "FPS (1st Person)"}
+      - {id: 901, cat: PC/Games, desc: "TPS (3rd Person)"}
+      - {id: 902, cat: PC/Games, desc: "Counter Strike"}
+      - {id: 102, cat: PC/Games, desc: "Horror"}
+      - {id: 456, cat: PC/Games, desc: "Horror до 2003 г."}
+      - {id: 822, cat: PC/Games, desc: "Азартные игры"}
+      - {id: 68, cat: PC/Games, desc: "Аркады"}
+      - {id: 464, cat: PC/Games, desc: "Аркады до 2003 г."}
+      - {id: 73, cat: PC/Games, desc: "Гонки"}
+      - {id: 463, cat: PC/Games, desc: "Гонки до 2003 г."}
+      - {id: 270, cat: PC/Games, desc: "Для самых маленьких"}
+      - {id: 823, cat: PC/Games, desc: "Другое"}
+      - {id: 624, cat: PC/Games, desc: "Программы для игр"}
+      - {id: 548, cat: PC/Games, desc: "Сборники  до 2003 г."}
+      - {id: 67, cat: PC/Games, desc: "Демо-версии"}
+      - {id: 458, cat: PC/Games, desc: "Русификаторы \ Англофикаторы"}
+      - {id: 442, cat: PC/Games, desc: "Патчи"}
+      - {id: 66, cat: PC/Games, desc: "Модификации"}
+      - {id: 657, cat: PC/Games, desc: "Логические"}
+      - {id: 77, cat: PC/Games, desc: "Многопользовательские"}
+      - {id: 69, cat: PC/Games, desc: "Приключения и квесты"}
+      - {id: 461, cat: PC/Games, desc: "Приключения и квесты до 2003 г."}
+      - {id: 76, cat: PC/Games, desc: "Ролевые (RPG)"}
+      - {id: 455, cat: PC/Games, desc: "Ролевые (RPG) до 2003 г."}
+      - {id: 908, cat: PC/Games, desc: "Симуляторы"}
+      - {id: 271, cat: PC/Games, desc: "Спортивные симуляторы"}
+      - {id: 787, cat: PC/Games, desc: "Космические симуляторы"}
+      - {id: 74, cat: PC/Games, desc: "Другие симуляторы"}
+      - {id: 71, cat: PC/Games, desc: "Автосимуляторы"}
+      - {id: 72, cat: PC/Games, desc: "Авиасимуляторы"}
+      - {id: 70, cat: PC/Games, desc: "Стратегии"}
+      - {id: 459, cat: PC/Games, desc: "Стратегии до 2003 г."}
+      - {id: 903, cat: PC/Games, desc: "TBS (пошаговые стратегии)"}
+      - {id: 904, cat: PC/Games, desc: "RTS (стратегии в реальном времени)"}
+      - {id: 905, cat: PC/Games, desc: "Экономические стратегии"}
+      - {id: 496, cat: PC/Games, desc: "Файтинги"}
+      - {id: 497, cat: PC/Games, desc: "Файтинги до 2003 г."}
+      - {id: 906, cat: PC/Games, desc: "Репаки от R.G.Packers Torrents.Local"}
+      - {id: 38, cat: PC/Games, desc: "Игровые серверы"}
+      - {id: 961, cat: PC/Games, desc: "Игры с эмуляторами"}
+      - {id: 78, cat: PC/Games, desc: "Игровое видео"}
+      - {id: 117, cat: PC/Games, desc: "Counter-Strike"}
+      - {id: 483, cat: PC/Games, desc: "Lineage"}
+      - {id: 788, cat: PC/Games, desc: "Warcraft 3"}
+      - {id: 486, cat: PC/Games, desc: "World of Warcraft"}
+      - {id: 487, cat: PC/Games, desc: "Видеожурналы"}
+      - {id: 825, cat: PC/Games, desc: "Видеопрохождение игр"}
+      - {id: 482, cat: PC/Games, desc: "Телепередачи"}
+      # Игры для других платформ"
+      - {id: 44, cat: Console, desc: "Xbox 360"}
+      - {id: 868, cat: Console, desc: "PS3"}
+      - {id: 56, cat: Console, desc: "PS2"}
+      - {id: 337, cat: Console, desc: "PS1"}
+      - {id: 45, cat: Console, desc: "PSP"}
+      - {id: 42, cat: Console, desc: "Разное"}
+      # Программы и дизайн"
+      - {id: 918, cat: PC, desc: "Новые раздачи"}
+      - {id: 808, cat: PC, desc: "Android"}
+      - {id: 809, cat: PC, desc: "Игры"}
+      - {id: 810, cat: PC, desc: "Софт"}
+      - {id: 89, cat: PC, desc: "Linux, Unix и другие ОС"}
+      - {id: 631, cat: PC, desc: "Устаревшие дистрибутивы"}
+      - {id: 427, cat: PC, desc: "Программное обеспечение"}
+      - {id: 495, cat: PC, desc: "Игры"}
+      - {id: 55, cat: PC, desc: "Mac OS X, iPhone, iPod Touch"}
+      - {id: 586, cat: PC, desc: "Программы для iPhone/iPod Touch"}
+      - {id: 684, cat: PC, desc: "Игры для iPhone/iPod Touch"}
+      - {id: 683, cat: PC, desc: "Темы для iPhone/iPod Touch"}
+      - {id: 681, cat: PC, desc: "Дистрибутивы, сборки Mac OS X"}
+      - {id: 585, cat: PC, desc: "Программы для Mac OS X"}
+      - {id: 680, cat: PC, desc: "Игры для Mac OS X"}
+      - {id: 737, cat: PC, desc: "Разное"}
+      - {id: 50, cat: PC, desc: "Веб-разработка и Программирование"}
+      - {id: 319, cat: PC, desc: "WYSIWYG Редакторы для веб-диза"}
+      - {id: 316, cat: PC, desc: "Компоненты для сред программирования"}
+      - {id: 315, cat: PC, desc: "Скрипты и шаблоны"}
+      - {id: 317, cat: PC, desc: "Среды программирования, компиляторы и вспомогател..."}
+      - {id: 318, cat: PC, desc: "Текстовые редакторы"}
+      - {id: 52, cat: PC, desc: "ГИС, системы навигации и карты"}
+      - {id: 332, cat: PC, desc: "Материалы для мультимедиа и дизайна"}
+      - {id: 594, cat: PC, desc: "Авторские сборки"}
+      - {id: 582, cat: PC, desc: "Кисти"}
+      - {id: 746, cat: PC, desc: "Семплы"}
+      - {id: 552, cat: PC, desc: "Футажи"}
+      - {id: 581, cat: PC, desc: "Шрифты"}
+      - {id: 47, cat: PC, desc: "Операционные системы от Microsoft"}
+      - {id: 284, cat: PC, desc: "Настольные ОС от Microsoft (выпущенные до Windows XP)"}
+      - {id: 280, cat: PC, desc: "Windows XP"}
+      - {id: 282, cat: PC, desc: "Windows Vista"}
+      - {id: 378, cat: PC, desc: "Windows 7"}
+      - {id: 944, cat: PC, desc: "Windows 8"}
+      - {id: 789, cat: PC, desc: "Windows 10"}
+      - {id: 281, cat: PC, desc: "Серверные ОС"}
+      - {id: 732, cat: PC, desc: "WPI, Live CD, Пакеты обновлений"}
+      - {id: 51, cat: PC, desc: "Программы для работы с мультимедиа и 3D"}
+      - {id: 324, cat: PC, desc: "3D моделирование, рендеринг и плагины для них"}
+      - {id: 325, cat: PC, desc: "Анимация"}
+      - {id: 330, cat: PC, desc: "Аудио- и видео-, CD- проигрыватели и каталогизаторы"}
+      - {id: 328, cat: PC, desc: "Аудио- и видео- конверторы"}
+      - {id: 118, cat: PC, desc: "Графические редакторы"}
+      - {id: 331, cat: PC, desc: "Каталогизаторы и просмотрщики графики"}
+      - {id: 623, cat: PC, desc: "Кодеки"}
+      - {id: 329, cat: PC, desc: "Работа со звуком"}
+      - {id: 327, cat: PC, desc: "Редакторы видео"}
+      - {id: 326, cat: PC, desc: "Создание DVD-видео"}
+      - {id: 322, cat: PC, desc: "Плагины для программ компании Adobe"}
+      - {id: 321, cat: PC, desc: "Программные комплекты"}
+      - {id: 323, cat: PC, desc: "Программы для верстки, печати и работы со шрифтами"}
+      - {id: 48, cat: PC, desc: "Системные программы"}
+      - {id: 291, cat: PC, desc: "Анти-шпионы и анти-трояны"}
+      - {id: 300, cat: PC, desc: "Архиваторы и файловые менеджеры"}
+      - {id: 289, cat: PC, desc: "Драйвера"}
+      - {id: 287, cat: PC, desc: "Изменение интерфейса ОС Windows"}
+      - {id: 296, cat: PC, desc: "Информация и диагностика"}
+      - {id: 290, cat: PC, desc: "Программы для защиты информации"}
+      - {id: 295, cat: PC, desc: "Программы для интернет и сетей"}
+      - {id: 292, cat: PC, desc: "Программы для защиты компьютера"}
+      - {id: 299, cat: PC, desc: "Программы для настройки и оптимизации ОС"}
+      - {id: 297, cat: PC, desc: "Работа с носителями информации"}
+      - {id: 285, cat: PC, desc: "Работа с жёстким диском"}
+      - {id: 301, cat: PC, desc: "Резервное копирование"}
+      - {id: 288, cat: PC, desc: "Серверное ПО для Windows"}
+      - {id: 298, cat: PC, desc: "Сервисное обслуживание компьютера"}
+      - {id: 286, cat: PC, desc: "Скринсейверы"}
+      - {id: 54, cat: PC, desc: "Разное"}
+      - {id: 622, cat: PC, desc: "Обучающие программы, энциклопедии, электронные пособия ..."}
+      - {id: 303, cat: PC, desc: "Системы для бизнеса, офиса, научной и проектной работы"}
+      - {id: 313, cat: PC, desc: "Медицинский софт"}
+      - {id: 305, cat: PC, desc: "Офисные системы"}
+      - {id: 312, cat: PC, desc: "Программы для архитекторов и дизайнеров интерьеров"}
+      - {id: 314, cat: PC, desc: "Прочие справочные системы"}
+      - {id: 308, cat: PC, desc: "Работа с PDF и DjVu"}
+      - {id: 307, cat: PC, desc: "Распознавание текста, звука и синтез речи"}
+      - {id: 311, cat: PC, desc: "САПР"}
+      - {id: 306, cat: PC, desc: "Системы для бизнеса"}
+      - {id: 310, cat: PC, desc: "Системы для научной работы"}
+      - {id: 309, cat: PC, 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: h4.text-danger
+    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: ""
+
+    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: querystring
+            args: "f"
+      size:
+        selector: td a.tr-dl
+        filters:
+          - name: replace
+            args: [".", ""]
+          - name: replace
+            args: [",", "."]
+      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/torrof.yml

@@ -1,117 +0,0 @@
----
-  site: torrof
-  name: Torrof
-  description: "Torrof (Torrentoff) is meta-search engine for torrents"
-  language: en-us
-  type: public
-  encoding: UTF-8
-  links:
-    - http://www.torrof.com/
-
-  caps:
-    categories:
-      "Software": PC
-      "Book": Books
-      "Video": Movies
-      "Music": Audio
-      "Other": Other
-      "Picture": Other/Misc
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
-
-  settings:
-    - name: category
-      type: select
-      label: Category
-      default: "_"
-      options:
-        "_": "All"
-        "Book": "Book"
-        "Music": "Music"
-        "Other": "Other"
-        "Picture": "Picture"
-        "Software": "Software"
-        "Video": "Video"
-    - name: verified
-      type: select
-      label: Verified
-      default: "_"
-      options:
-        "_": "Any"
-        "1": "Verified Only"
-    - name: sort
-      type: select
-      label: Sort
-      default: "_"
-      options:
-        "_": "Default"
-        "creation_date desc": "Age desc"
-        "creation_date asc": "Age asc"
-        "total_size desc": "Size desc"
-        "total_size asc": "Size asc"
-
-  download:
-    selector: section.file-info a:nth-child(2)
-
-  search:
-    paths:
-      - path: "{{if .Keywords}}{{.Keywords}}{{else}}test{{end}}"
-        method: post
-    inputs:
-      # torrof does not support trending/latest/new pages
-      text: "{{if .Keywords}}{{.Keywords}}{{else}}test{{end}}"
-      size: "0:inf"
-      date: "0:inf"
-      verified_only: "{{ re_replace .Config.verified \"_\" \"\" }}"
-      category: "{{ re_replace .Config.category \"_\" \"\" }}"
-      tags: ""
-      mode: "titles"
-      sort: "{{ re_replace .Config.sort \"_\" \"\" }}"
-      page: "0" 
-
-    rows:
-      # ignore adverts
-      selector: tr:has(a[href^="/view/"])
-      filters:
-        # torrof uses fuzzy search logic
-        - name: andmatch
-
-    fields:
-      title:
-        selector: td:nth-child(2) a:nth-child(1)
-      category:
-        selector: td:nth-child(1) span
-        attribute: title
-        filters:
-          # grab first word
-          - name: split
-            args: [" ", 0]
-      details:
-        selector: td:nth-child(2) a:nth-child(1)
-        attribute: href
-      download:
-        selector: td:nth-child(2) a:nth-child(1)
-        attribute: href
-      date:
-        selector: td:nth-child(4)
-        filters:
-          - name: dateparse 
-            args: "Jan 2006"
-      size:
-        selector: td:nth-child(3) span:nth-child(1) 
-      files:
-        selector: td:nth-child(3) span:nth-last-child(1) 
-        filters:
-          - name: replace
-            args: [" Files", ""]
-      seeders:
-        text: "1"
-      leechers:
-        text: "1"
-      downloadvolumefactor:
-        text: "0"
-      uploadvolumefactor:
-        text: "1"

src/Jackett.Common/Definitions/trancetraffic.yml

@@ -16,7 +16,7 @@
 
     modes:
       search: [q]
-      tv-search: [q, season, ep]
+      music-search: [q, album, artist, label, year]
 
   login:
     path: takelogin.php
@@ -33,7 +33,7 @@
     paths:
       - path: browse.php
     inputs:
-      search: "{{ .Query.Keywords }}"
+      search: "{{if .Query.Artist}}{{ .Query.Artist }}{{else}}{{ .Keywords }}{{end}}"
     rows:
       selector: table.mainouter table > tbody > tr:has(a[href^="details.php?id="])
     fields:

src/Jackett.Common/Definitions/turktorrent.yml

@@ -112,20 +112,26 @@
   search:
     paths:
       - path: browse.php
+    keywordsfilters:
+      - name: re_replace # S01E01 to X.sezon X.blm
+        args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "$1.sezon $2.blm"]
     inputs:
     # does not support multi categories so defaulting to ALL
       do: "search"
-      keywords: "{{.Keywords}}"
+      keywords: "{{if .Keywords}}\"{{.Keywords}}\"{{else}}{{end}}"
       category: "0"
       search_type: "t_name"
       include_dead_torrents: "yes"
     rows:
       selector: table#sortabletable tbody tr:has(div[id^="port-target-"])
-      filters:
-        - name: andmatch
     fields:
       title:
         selector: div[id^="port-target-"] a
+        filters:
+          - name: re_replace # X.sezon X.blm to S01E01
+            args: ["(?i)\\b(\\d+).sezon\\s(\\d+).blm\\b", "S$1E$2"]
+          - name: re_replace # switch (dd.mm.yyyy) to mm.dd.yyyy
+            args: ["\\((\\d+)\\.(\\d+)\\.(\\d+)\\)", "$2/$1/$3"]
       details:
         selector: div[id^="port-target-"] a
         attribute: href
@@ -159,4 +165,4 @@
       uploadvolumefactor:
         case:
           img[src$="/x2.gif"]: "2"
-          "*": "1"
+          "*": "1"

src/Jackett.Common/Definitions/world-of-tomorrow.yml

@@ -0,0 +1,143 @@
+---
+  site: world-of-tomorrow
+  name: world-of-tomorrow
+  description: "world-of-tomorrow is a Private GERMAN tracker"
+  language: de-de
+  type: private
+  encoding: UTF-8
+  followredirect: true
+  links:
+    - https://world-of-tomorrow.eu
+
+  caps:
+    categorymappings:
+      # Movie
+      - {id: 47, cat: Movies/HD, desc: "Bluray"}
+      - {id: 48, cat: Movies/HD, desc: "720p"}
+      - {id: 49, cat: Movies/HD, desc: "1080p"}
+      - {id: 11, cat: Movies/SD, desc: "DVD-R"}
+      - {id: 60, cat: Movies/HD, desc: "HDTV"}
+      - {id: 62, cat: Movies/SD, desc: "SD"}
+      - {id: 89, cat: Movies/HD, desc: "UHD"}
+      - {id: 91, cat: Movies, desc: "Packs"}
+
+      # Serien
+      - {id: 16, cat: TV, desc: "Serien-Packs"}
+      - {id: 64, cat: TV/Documentary, desc: "Serien-Doku"}
+      - {id: 77, cat: TV/SD, desc: "Serien-SD"}
+      - {id: 78, cat: TV/HD, desc: "Serien-720p"}
+      - {id: 79, cat: TV/HD, desc: "Serien-1080p"}
+      - {id: 95, cat: TV/HD, desc: "Serien-2160p"}
+
+      # Games
+      - {id: 4, cat: PC/Games, desc: "Windows"}
+      - {id: 84, cat: Console/PS3, desc: "PS3/PS4"}
+      - {id: 84, cat: Console/PS4, desc: "PS3/PS4"}
+      - {id: 85, cat: Console/Xbox 360, desc: "Xbox-360"}
+      - {id: 92, cat: PC/Games, desc: "Wimmelbild"}
+
+      # Musik
+      - {id: 14, cat: Audio/MP3, desc: "MP3"}
+      - {id: 36, cat: Audio/Audiobook, desc: "Hörbuch"}
+      - {id: 71, cat: Audio, desc: "Soundtracks"}
+      - {id: 70, cat: Audio, desc: "Flac"}
+      - {id: 72, cat: Audio, desc: "Musik-Packs"}
+      - {id: 93, cat: Audio/Video, desc: "Musik-Videos"}
+
+      # Programme
+      - {id: 18, cat: PC, desc: "Appz-Sonstige"}
+      - {id: 28, cat: PC, desc: "Windows"}
+
+      # Sport
+      - {id: 23, cat: TV/Sport, desc: "Wrestling"}
+      - {id: 74, cat: TV/Sport, desc: "Fussball"}
+      - {id: 75, cat: TV/Sport, desc: "Formel 1"}
+
+      # Misc
+      - {id: 88, cat: XXX, desc: "XXX"}
+      - {id: 19, cat: Books/Ebook, desc: "Ebooks"}
+      - {id: 87, cat: TV/Anime, desc: "Anime/Zeichentrick"}
+      - {id: 96, cat: Other/Misc, desc: "Sonstiges"}
+
+    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: secure_code
+      type: password
+      label: "Secure Code"
+
+  login:
+    path: login.php
+    method: form
+    form: form
+    inputs:
+      take: "yes"
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      secure_code: "{{ .Config.secure_code }}"
+    test:
+      path: sessioncheck.php
+
+  search:
+    path: tfiles.php
+    inputs:
+      search: "{{ .Query.Keywords }}"
+      incldead: "1"
+      showsearch: 0
+
+    rows:
+      selector: table.table-bordered > tbody > tr
+    fields:
+      title:
+        selector: a[href^="details.php"]
+      category:
+        selector: a[href^="tfiles.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
+      grabs:
+        selector: span:nth-child(5)
+        filters:
+          - name: split
+            args: [":",1]
+      size:
+        selector: span:nth-child(2)
+        filters:
+          - name: split
+            args: [":",1]
+          - name: replace
+            args: [".", ""]
+          - name: replace
+            args: [",", "."]
+      seeders:
+        selector: span:nth-child(3)
+        filters:
+          - name: split
+            args: [":",1]
+      leechers:
+        selector: span:nth-child(4)
+        filters:
+          - name: split
+            args: [":",1]
+      date:
+        selector: td:nth-child(3)
+        remove: center, br
+        filters:
+          - name: dateparse
+            args: "02.01.2006 15:04:05"

src/Jackett.Common/Definitions/worldofp2p.yml

@@ -68,8 +68,9 @@
       - {id: 6, cat: XXX/XviD, desc: "xXx-XviD"}
 
     modes:
-      search: [q]
-      tv-search: [q, season, ep]
+      search: [q, imdbid]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
 
   login:
     path: login.php
@@ -89,9 +90,10 @@
       - path: browse.php
     inputs:
       $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
+      search: "{{if .Query.IMDBID}}{{.Query.IMDBID}}{{else}}{{.Keywords}}{{end}}"
       incldead: "1"
-      searchin: "title"
+      # searchin: title, descr, genre, all
+      searchin: "{{if .Query.IMDBID}}all{{else}}title{{end}}"
 
     rows:
       selector: table > tbody > tr:has(a[href^="download.php?torrent="])

src/Jackett.Common/Definitions/xktorrent.yml

@@ -0,0 +1,115 @@
+---
+  site: xktorrent
+  name: XKTorrent
+  description: "XKTorrent is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
+  language: fr-fr
+  type: private
+  encoding: UTF-8
+  links:
+    - https://xktorrent.com/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Movies, desc: "Film"}
+      - {id: 2, cat: TV, desc: "Série"}
+      - {id: 3, cat: TV/Anime, desc: "Animés"}
+      - {id: 5, cat: Audio, desc: "Audios"}
+      - {id: 6, cat: TV/Documentary, desc: "Documentaire"}
+      - {id: 7, cat: Other, desc: "Formations"}
+      - {id: 13, cat: Books/Ebook, desc: "eBooks"}
+      - {id: 14, cat: Console, desc: "Jeux"}
+      - {id: 15, cat: Audio/Video, desc: "Concert"}
+      - {id: 25, cat: PC, desc: "Logiciels"}
+      - {id: 27, cat: TV, desc: "Spectacles"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  login:
+    path: login
+    method: form
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      remember: 1
+    error:
+      - selector: form[action$="/login"] span strong
+    test:
+      path: torrents
+      selector: a[href$="/logout"]
+
+  ratio:
+    path: torrents
+    selector: span:has(i.fa-sync-alt)
+    filters:
+      - name: regexp
+        args: "Ratio : (\\d+)"
+
+  search:
+    paths:
+      - path: filterTorrents
+    inputs:
+      $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
+      search: "{{ .Keywords }}"
+      description: ""
+      uploader: ""
+      sort: "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.view-torrent
+      download:
+        selector: a[href*="/download/"]
+        attribute: href
+      details:
+        selector: a.view-torrent
+        attribute: href
+      size:
+        selector: td:nth-child(4)
+      grabs:
+        selector: td:nth-child(5)
+        filters:
+          - name: regexp
+            args: ([\d\.]+)
+      seeders:
+        selector: td:nth-child(6)
+      leechers:
+        selector: td:nth-child(7)
+      date:
+        selector: time
+        filters:
+          - name: replace
+            args: ["il y a ", ""]
+          - name: replace
+            args: ["heure", "hour"]
+          - name: replace
+            args: ["jour", "day"]
+          - name: replace
+            args: ["semaine", "week"]
+          - name: replace
+            args: ["mois", "month"]
+          - name: append
+            args: " ago"
+      downloadvolumefactor:
+        case:
+          "i[data-original-title=\"Freeleech\"]": "0" # Single Torrent Freeleech
+          "i[data-original-title=\"Global freeleech\"]": "0" # Global Freeleech
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "i[data-original-title=\"Global freeleech\"]": "2" # Global Freeleech
+          "i[data-original-title=\"Double upload\"]": "2" # Single Torrent Double Upload
+          "i[data-original-title=\"Double Upload\"]": "2" # Global Double Upload
+          "*": "1"
+# UNIT3D 1.?

src/Jackett.Common/Definitions/yggtorrent.yml

@@ -25,6 +25,8 @@
     - https://ygg.to/
     - https://www.ygg.to/
     - https://ww3.yggtorrent.gg/
+    - http://www2.yggtorrent.gg/
+
   caps:
     categorymappings:
       - {id: 2145, cat: TV, desc: "Film/Vidéo"}
@@ -137,6 +139,10 @@
       type: checkbox
       label: Enhance sonarr compatibility with anime by renaming episode (xxx to exxx). Works only if episode is at the end of the query. Can disturb movies search. (back to the future 3 -> back to the future e3)
       default: false
+    - name: sonarrv3hack
+      type: checkbox
+      label: "Enable Full season search hack: Sonarrv3 send 'Series Name SXX' but it won't match 'Series Name - Saison 01' for example so we remove the 'SXX' ==> 'Series Name'"
+      default: true
 
   login:
     method: form
@@ -157,7 +163,7 @@
     keywordsfilters:
       # Full season seach hack: Sonarrv3 send 'Series Name SXX' but it won't match 'Series Name - Saison 01' for example so we remove the 'SXX' ==> 'Series Name'
       - name: re_replace
-        args: ["(.*)[sS](\\d{1,4})$", "$1"]
+        args: ["(.*)[sS](\\d{1,4})$", "{{ if .Config.sonarrv3hack }}$1{{else}}$1S$2{{end}}"]
       - name: replace
         args: ["\"", ""]
       - name: trim

src/Jackett.Common/Indexers/720pier.cs

@@ -60,6 +60,7 @@ namespace Jackett.Common.Indexers
             AddCategoryMapping(66, TorznabCatType.TVSport, "Football - Super Bowls");
             AddCategoryMapping(53, TorznabCatType.TVSport, "Football - NCAA");
             AddCategoryMapping(99, TorznabCatType.TVSport, "Football - CFL");
+            AddCategoryMapping(101, TorznabCatType.TVSport, "Football - AAF");
             AddCategoryMapping(54, TorznabCatType.TVSport, "Football - Reviews and highlights");
             AddCategoryMapping(97, TorznabCatType.TVSport, "Football - Documentaries");
             AddCategoryMapping(44, TorznabCatType.TVSport, "Football - Other");
@@ -103,6 +104,7 @@ namespace Jackett.Common.Indexers
             AddCategoryMapping(94, TorznabCatType.TVSport, "Other sports - Misc");
 
             AddCategoryMapping(56, TorznabCatType.TVSport, "Sports on tv");
+            AddCategoryMapping(30, TorznabCatType.TVSport, "Sports");
         }
 
         public override async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)

src/Jackett.Common/Indexers/7tor.cs

@@ -41,6 +41,7 @@ namespace Jackett.Common.Indexers
             Type = "semi-private";
 
             AddCategoryMapping(30, TorznabCatType.Movies, "Video content");
+            AddCategoryMapping(1918, TorznabCatType.Movies, "UHD Video");
             AddCategoryMapping(31, TorznabCatType.TVDocumentary, "   Documentary films, TV and other video");
             AddCategoryMapping(127, TorznabCatType.TVDocumentary, "      Documentary movies and TV shows");
             AddCategoryMapping(1071, TorznabCatType.TVDocumentary, "         Documentary (DVD)");
@@ -114,17 +115,10 @@ namespace Jackett.Common.Indexers
             AddCategoryMapping(1111, TorznabCatType.TV, "         Evening Quarter");
             AddCategoryMapping(1112, TorznabCatType.TV, "         Films with a funny transfer (parody)");
             AddCategoryMapping(1113, TorznabCatType.TV, "         Stand-up comedy");
-            AddCategoryMapping(1114, TorznabCatType.TV, "         Moment of glory");
-            AddCategoryMapping(1115, TorznabCatType.TV, "         Ukrainian Show");
-            AddCategoryMapping(1116, TorznabCatType.TV, "         Star Factory");
-            AddCategoryMapping(1117, TorznabCatType.TV, "         Dance shows, concerts, performances");
-            AddCategoryMapping(1118, TorznabCatType.TV, "         Circus");
-            AddCategoryMapping(1119, TorznabCatType.TV, "         School for Scandal");
-            AddCategoryMapping(1120, TorznabCatType.TV, "         Satirists and humorists");
             AddCategoryMapping(1873, TorznabCatType.TV, "         Musical show");
-            AddCategoryMapping(1121, TorznabCatType.TV, "         Humorous audio transmission");
-            AddCategoryMapping(1122, TorznabCatType.TV, "         Audio and video clips (Jokes and humor)");
             AddCategoryMapping(32, TorznabCatType.Movies, "   Foreign movies");
+            AddCategoryMapping(1906, TorznabCatType.Movies, "   Foreign films of 2019");
+            AddCategoryMapping(33, TorznabCatType.Movies, "   Russian movies");
             AddCategoryMapping(567, TorznabCatType.Movies, "      Foreign films 2016");
             AddCategoryMapping(37, TorznabCatType.Movies, "      Foreign films 2011 - 2015 the year");
             AddCategoryMapping(38, TorznabCatType.Movies, "      Foreign films of the year 2006-2010");
@@ -173,11 +167,8 @@ namespace Jackett.Common.Indexers
             AddCategoryMapping(51, TorznabCatType.TV, "      Domestic series");
             AddCategoryMapping(1860, TorznabCatType.TV, "         Domestic series 2016");
             AddCategoryMapping(1810, TorznabCatType.TV, "         Domestic series 2015");
-            AddCategoryMapping(574, TorznabCatType.TV, "         Domestic series 2014");
             AddCategoryMapping(50, TorznabCatType.TV, "      Foreign TV series");
-            AddCategoryMapping(1861, TorznabCatType.TV, "         Foreign series 2016");
             AddCategoryMapping(1809, TorznabCatType.TV, "         Foreign series 2015");
-            AddCategoryMapping(575, TorznabCatType.TV, "         Foreign series 2014");
             AddCategoryMapping(1181, TorznabCatType.TV, "         Foreign TV shows (HD Video)");
             AddCategoryMapping(1184, TorznabCatType.TV, "         Soaps Spain, Italy, Latin America, Turkey and India");
             AddCategoryMapping(1185, TorznabCatType.TV, "            Indian series");
@@ -300,6 +291,7 @@ namespace Jackett.Common.Indexers
             AddCategoryMapping(1152, TorznabCatType.TVSport, "         Ukraine");
             AddCategoryMapping(1153, TorznabCatType.TVSport, "         Other national championships and cups");
             AddCategoryMapping(1154, TorznabCatType.TVSport, "         International football tournaments");
+            AddCategoryMapping(1901, TorznabCatType.TVSport, "         Confederations Cup 2017");
             AddCategoryMapping(1157, TorznabCatType.TVSport, "         European Cups");
             AddCategoryMapping(1156, TorznabCatType.TVSport, "            Eurocup 2011-2014");
             AddCategoryMapping(1155, TorznabCatType.TVSport, "            Eurocup 2014-2015");
@@ -324,15 +316,7 @@ namespace Jackett.Common.Indexers
             AddCategoryMapping(1886, TorznabCatType.TVSport, "         Football");
             AddCategoryMapping(1887, TorznabCatType.TVSport, "         Basketball");
             AddCategoryMapping(1888, TorznabCatType.TVSport, "         Volleyball / Beach Volleyball / Handball / Water Polo");
-            AddCategoryMapping(1889, TorznabCatType.TVSport, "         Athletics");
-            AddCategoryMapping(1890, TorznabCatType.TVSport, "         Tennis / Table Tennis / Badminton");
-            AddCategoryMapping(1891, TorznabCatType.TVSport, "         Boxing / Martial Arts and Martial Arts / Weightlifting");
-            AddCategoryMapping(1892, TorznabCatType.TVSport, "         Water Sports / Boating");
-            AddCategoryMapping(1893, TorznabCatType.TVSport, "         cycle racing");
-            AddCategoryMapping(1894, TorznabCatType.TVSport, "         Gymnastics");
-            AddCategoryMapping(1895, TorznabCatType.TVSport, "         Other Sports");
-            AddCategoryMapping(1896, TorznabCatType.TVSport, "         The survey and analysis of transmission");
-            AddCategoryMapping(1897, TorznabCatType.Books, "         Books, manuals, periodicals on the Olympic theme");
+            AddCategoryMapping(1907, TorznabCatType.TVSport, "         2018 Winter Olympics");
             AddCategoryMapping(1575, TorznabCatType.Movies, "   Video for mobile devices");
             AddCategoryMapping(1576, TorznabCatType.Movies, "      Video for Smartphones and PDAs");
             AddCategoryMapping(1577, TorznabCatType.Movies, "      Mobile Video (3GP)");
@@ -390,18 +374,17 @@ namespace Jackett.Common.Indexers
             AddCategoryMapping(73, TorznabCatType.PCGames, "      Simulations");
             AddCategoryMapping(74, TorznabCatType.PCGames, "         Autos and Racing");
             AddCategoryMapping(75, TorznabCatType.PCGames, "         Sports simulators");
-            AddCategoryMapping(464, TorznabCatType.PCGames, "         Other simulators");
             AddCategoryMapping(1531, TorznabCatType.PCGames, "         Space and flight simulators");
             AddCategoryMapping(76, TorznabCatType.PCGames, "            Aviasimulators");
             AddCategoryMapping(463, TorznabCatType.PCGames, "            space Simulation");
             AddCategoryMapping(1540, TorznabCatType.PCGames, "            Microsoft Flight Simulator add-ons, and for him");
             AddCategoryMapping(1541, TorznabCatType.PCGames, "               Scripts, meshes and airports");
             AddCategoryMapping(1542, TorznabCatType.PCGames, "               Airplanes and helicopters");
+            AddCategoryMapping(1902, TorznabCatType.PCGames, "               Planes, helicopters (FSX-P3D)");
+            AddCategoryMapping(1903, TorznabCatType.PCGames, "               Planes and helicopters [FS2004]");
             AddCategoryMapping(1543, TorznabCatType.PCGames, "               Mission, traffic sounds, packs and tools");
             AddCategoryMapping(1899, TorznabCatType.PCGames, "               Scenarios (FSX-P3D)");
             AddCategoryMapping(77, TorznabCatType.PCGames, "      Arcade");
-            AddCategoryMapping(459, TorznabCatType.PCGames, "         Arcade (various)");
-            AddCategoryMapping(461, TorznabCatType.PCGames, "         Board & Card Arcade");
             AddCategoryMapping(78, TorznabCatType.PCGames, "      Adventure Quests");
             AddCategoryMapping(746, TorznabCatType.PCGames, "         Quest-style \"search objects\"");
             AddCategoryMapping(79, TorznabCatType.PCGames, "      Online Games");
@@ -409,25 +392,17 @@ namespace Jackett.Common.Indexers
             AddCategoryMapping(744, TorznabCatType.PCGames, "         paid");
             AddCategoryMapping(742, TorznabCatType.PCGames, "         Other online gaming");
             AddCategoryMapping(157, TorznabCatType.PCGames, "      For the little ones");
-            AddCategoryMapping(465, TorznabCatType.PCGames, "      Old games for PC");
             AddCategoryMapping(466, TorznabCatType.PCGames, "         Arcade and Puzzle Games (old games)");
             AddCategoryMapping(1871, TorznabCatType.PCGames, "            Arcade (Old Games)");
             AddCategoryMapping(1872, TorznabCatType.PCGames, "            Puzzle games (old games)");
-            AddCategoryMapping(467, TorznabCatType.PCGames, "         Adventure quests (old games)");
-            AddCategoryMapping(468, TorznabCatType.PCGames, "         Action (old games)");
-            AddCategoryMapping(469, TorznabCatType.PCGames, "         Strategy (old games)");
-            AddCategoryMapping(470, TorznabCatType.PCGames, "         RPG (old games)");
-            AddCategoryMapping(471, TorznabCatType.PCGames, "         Simulations (old games)");
             AddCategoryMapping(1532, TorznabCatType.PCGames, "            Autos and Racing (old games)");
             AddCategoryMapping(1533, TorznabCatType.PCGames, "            Space simulators, flight simulators and aviaigry (old games)");
             AddCategoryMapping(1534, TorznabCatType.PCGames, "            Sports simulators (old games)");
             AddCategoryMapping(1535, TorznabCatType.PCGames, "            Other simulators (Old Games)");
-            AddCategoryMapping(472, TorznabCatType.PCGames, "         Multi-genre compilations (old games)");
             AddCategoryMapping(1536, TorznabCatType.PCGames, "         Erotic games (old games)");
             AddCategoryMapping(1537, TorznabCatType.PCGames, "         For the little ones (Old Games)");
             AddCategoryMapping(1538, TorznabCatType.PCGames, "         Puzzle Games (Old Games)");
             AddCategoryMapping(1539, TorznabCatType.PCGames, "         IBM PC are not compatible (old games)");
-            AddCategoryMapping(473, TorznabCatType.PCGames, "      Erotic games");
             AddCategoryMapping(745, TorznabCatType.PCGames, "      Chess");
             AddCategoryMapping(924, TorznabCatType.PCGames, "      game Collections");
             AddCategoryMapping(970, TorznabCatType.PCGames, "      Other for PC-games");
@@ -469,15 +444,12 @@ namespace Jackett.Common.Indexers
             AddCategoryMapping(622, TorznabCatType.ConsolePSP, "         PS1 games for PSP");
             AddCategoryMapping(143, TorznabCatType.ConsolePSP, "         PSP | Programs | Other");
             AddCategoryMapping(1548, TorznabCatType.ConsolePSP, "            Software for PSP (Homebrew)");
-            AddCategoryMapping(455, TorznabCatType.ConsolePSVita, "         PS Vita | Games");
             AddCategoryMapping(130, TorznabCatType.ConsoleOther, "      Nintendo");
             AddCategoryMapping(144, TorznabCatType.ConsoleNDS, "         NDS | Games");
             AddCategoryMapping(145, TorznabCatType.ConsoleWii, "         Wii | Games");
             AddCategoryMapping(146, TorznabCatType.ConsoleWiiwareVC, "         WiiWare | Games");
             AddCategoryMapping(147, TorznabCatType.ConsoleOther, "         GameCube | Games");
-            AddCategoryMapping(456, TorznabCatType.ConsoleOther, "      Sega");
             AddCategoryMapping(588, TorznabCatType.ConsoleOther, "         Dreamcast");
-            AddCategoryMapping(457, TorznabCatType.ConsoleOther, "      Games for older consoles");
             AddCategoryMapping(589, TorznabCatType.ConsoleOther, "      Games for the DVD player");
             AddCategoryMapping(928, TorznabCatType.PCGames, "   Games for Linux");
             AddCategoryMapping(1868, TorznabCatType.PCGames, "      Native games for Linux");
@@ -514,7 +486,6 @@ namespace Jackett.Common.Indexers
             AddCategoryMapping(282, TorznabCatType.PC0day, "      Operating Systems (Linux, Unix)");
             AddCategoryMapping(1574, TorznabCatType.PC0day, "      Program (Linux, Unix)");
             AddCategoryMapping(284, TorznabCatType.PC0day, "      Other operating systems and software for them");
-            AddCategoryMapping(287, TorznabCatType.PC0day, "      Archive (Linux OS, Unix etc)");
             AddCategoryMapping(276, TorznabCatType.PCMac, "   Apple OS");
             AddCategoryMapping(277, TorznabCatType.PCMac, "      Mac OS [for Macintosh]");
             AddCategoryMapping(278, TorznabCatType.PCMac, "      Mac OS [PC-Hackintosh]");
@@ -538,13 +509,11 @@ namespace Jackett.Common.Indexers
             AddCategoryMapping(1811, TorznabCatType.PC0day, "         Windows 10");
             AddCategoryMapping(274, TorznabCatType.PC0day, "      Windows Server");
             AddCategoryMapping(927, TorznabCatType.PC0day, "      Other (Operating Systems from Microsoft)");
-            AddCategoryMapping(275, TorznabCatType.PC0day, "      Archive (OS from Microsoft)");
             AddCategoryMapping(84, TorznabCatType.PC0day, "   System programs");
             AddCategoryMapping(86, TorznabCatType.PC0day, "      Programs for configuring and optimizing OS");
             AddCategoryMapping(87, TorznabCatType.PC0day, "      Archivers and File Managers");
             AddCategoryMapping(1630, TorznabCatType.PC0day, "      Safety protection system and PC");
             AddCategoryMapping(93, TorznabCatType.PC0day, "         Software to protect your computer (antivirus software, firewalls)");
-            AddCategoryMapping(580, TorznabCatType.PC0day, "            Keys and Activation");
             AddCategoryMapping(94, TorznabCatType.PC0day, "         Anti-spyware and anti-trojan");
             AddCategoryMapping(95, TorznabCatType.PC0day, "         Programs for the protection of information");
             AddCategoryMapping(88, TorznabCatType.PC0day, "      Backup");
@@ -585,29 +554,20 @@ namespace Jackett.Common.Indexers
             AddCategoryMapping(941, TorznabCatType.PC0day, "      Libraries and projects for architects and interior designers");
             AddCategoryMapping(942, TorznabCatType.PC0day, "      Other reference systems");
             AddCategoryMapping(107, TorznabCatType.PC0day, "   Web Development and Programming");
-            AddCategoryMapping(293, TorznabCatType.PC0day, "      Search / Offer");
             AddCategoryMapping(943, TorznabCatType.PC0day, "      WYSIWYG editors for web design");
-            AddCategoryMapping(496, TorznabCatType.PC0day, "      Database Management Systems (DBMS)");
-            AddCategoryMapping(494, TorznabCatType.PC0day, "      programming environments, compilers and software tools");
             AddCategoryMapping(290, TorznabCatType.PC0day, "      The components for the development of media");
-            AddCategoryMapping(495, TorznabCatType.PC0day, "      Text editors Illuminated");
             AddCategoryMapping(291, TorznabCatType.PC0day, "      Scripting engines and websites, CMS and extensions to it");
             AddCategoryMapping(944, TorznabCatType.PC0day, "      Templates for websites and CMS");
             AddCategoryMapping(292, TorznabCatType.PC0day, "      Miscellaneous (Web Development and Programming)");
-            AddCategoryMapping(294, TorznabCatType.PC0day, "      Archive (Web Development and Programming)");
             AddCategoryMapping(108, TorznabCatType.PC0day, "   Programs to work with multimedia and 3D");
             AddCategoryMapping(487, TorznabCatType.PC0day, "      Software kits");
-            AddCategoryMapping(488, TorznabCatType.PC0day, "      Plug-ins for Adobe's programs");
-            AddCategoryMapping(491, TorznabCatType.PC0day, "      3D modeling, rendering and plugins for them");
             AddCategoryMapping(489, TorznabCatType.PC0day, "      Graphic editor");
             AddCategoryMapping(303, TorznabCatType.PC0day, "      Editors video");
             AddCategoryMapping(305, TorznabCatType.PC0day, "      Virtual Studios, sequencers and audio editor");
             AddCategoryMapping(492, TorznabCatType.PC0day, "      Animation");
             AddCategoryMapping(490, TorznabCatType.PC0day, "      Programs for typesetting, printing, and working with fonts");
             AddCategoryMapping(304, TorznabCatType.PC0day, "      Video, Audio Conversion");
-            AddCategoryMapping(493, TorznabCatType.PC0day, "      Creating a BD / HD / DVD-Video");
             AddCategoryMapping(306, TorznabCatType.PC0day, "      Plug-ins for sound processing");
-            AddCategoryMapping(308, TorznabCatType.PC0day, "      Archive (Programme for multimedia and 3D)");
             AddCategoryMapping(595, TorznabCatType.PC0day, "      Miscellaneous (Programme for multimedia and 3D)");
             AddCategoryMapping(596, TorznabCatType.PC0day, "      Miscellaneous (Programs for working with audio)");
             AddCategoryMapping(597, TorznabCatType.PC0day, "      Virtual instruments and synthesizers");
@@ -637,8 +597,6 @@ namespace Jackett.Common.Indexers
             AddCategoryMapping(955, TorznabCatType.PC0day, "      Multitracks");
             AddCategoryMapping(956, TorznabCatType.PC0day, "      Materials for creating menus and DVD covers");
             AddCategoryMapping(351, TorznabCatType.PC0day, "      Styles, brushes, shapes and patterns for Adobe Photoshop");
-            AddCategoryMapping(356, TorznabCatType.PC0day, "      Fonts");
-            AddCategoryMapping(358, TorznabCatType.PC0day, "      Miscellaneous (Materials for Multimedia and Design)");
             AddCategoryMapping(1632, TorznabCatType.PC0day, "      Digital Juice");
             AddCategoryMapping(1874, TorznabCatType.PC0day, "      Projects");
             AddCategoryMapping(1875, TorznabCatType.PC0day, "         Children (projects)");
@@ -653,14 +611,8 @@ namespace Jackett.Common.Indexers
             AddCategoryMapping(1884, TorznabCatType.PC0day, "         Miscellaneous (projects)");
             AddCategoryMapping(1898, TorznabCatType.PC0day, "         Trailers (projects)");
             AddCategoryMapping(295, TorznabCatType.PC0day, "   Reference and legal system");
-            AddCategoryMapping(296, TorznabCatType.PC0day, "      Consultant Plus");
-            AddCategoryMapping(584, TorznabCatType.PC0day, "         Consultant Accountant");
-            AddCategoryMapping(755, TorznabCatType.PC0day, "         Archive irrelevant hands");
             AddCategoryMapping(297, TorznabCatType.PC0day, "      code");
             AddCategoryMapping(298, TorznabCatType.PC0day, "      Guarantee");
-            AddCategoryMapping(299, TorznabCatType.PC0day, "      other");
-            AddCategoryMapping(300, TorznabCatType.PC0day, "      Archive (Reference and legal system)");
-            AddCategoryMapping(301, TorznabCatType.PC0day, "      RG PCA - a hidden forum");
             AddCategoryMapping(587, TorznabCatType.PC0day, "   Collections of programs and WPI");
             AddCategoryMapping(929, TorznabCatType.PC0day, "   Test drives to adjust the audio / video equipment");
             AddCategoryMapping(957, TorznabCatType.PC0day, "   GIS, navigation systems and maps");
@@ -683,16 +635,11 @@ namespace Jackett.Common.Indexers
             AddCategoryMapping(544, TorznabCatType.AudioVideo, "         Concert recording");
             AddCategoryMapping(1781, TorznabCatType.AudioVideo, "            Concerts (DVD)");
             AddCategoryMapping(1782, TorznabCatType.AudioVideo, "            Concerts (HD)");
-            AddCategoryMapping(1784, TorznabCatType.AudioVideo, "         Opera, Ballet, Musicals");
-            AddCategoryMapping(1785, TorznabCatType.AudioVideo, "         Music videos (transit)");
             AddCategoryMapping(501, TorznabCatType.AudioLossless, "      unsorted Lossless");
             AddCategoryMapping(532, TorznabCatType.Audio, "      Multi-channel HD Audio and Music");
             AddCategoryMapping(533, TorznabCatType.Audio, "         DVD-Audio, SACD, Audio-DVD");
             AddCategoryMapping(1687, TorznabCatType.Audio, "            DVD-Audio");
             AddCategoryMapping(1688, TorznabCatType.Audio, "            SACD-R");
-            AddCategoryMapping(534, TorznabCatType.Audio, "         DTS");
-            AddCategoryMapping(535, TorznabCatType.Audio, "         Vinyl-Rip and Hand-Made");
-            AddCategoryMapping(536, TorznabCatType.Audio, "         Hi-Res stereo");
             AddCategoryMapping(529, TorznabCatType.Audio, "      discography");
             AddCategoryMapping(530, TorznabCatType.Audio, "         Domestic");
             AddCategoryMapping(531, TorznabCatType.Audio, "         foreign");
@@ -754,7 +701,6 @@ namespace Jackett.Common.Indexers
             AddCategoryMapping(1735, TorznabCatType.Audio, "         Rap, Hip-hop domestic (transit Lossy)");
             AddCategoryMapping(1736, TorznabCatType.Audio, "         RnB, Reggae (transit Lossless)");
             AddCategoryMapping(1737, TorznabCatType.Audio, "         RnB, Reggae (transit Lossy)");
-            AddCategoryMapping(1819, TorznabCatType.Audio, "         Rap, Hip-hop, RnB (transit Lossless)");
             AddCategoryMapping(1738, TorznabCatType.Audio, "      East Asian Music (transit)");
             AddCategoryMapping(1739, TorznabCatType.Audio, "         Asian Traditional, Ethnic (transit Lossless)");
             AddCategoryMapping(1740, TorznabCatType.Audio, "         Asian Traditional, Ethnic (transit Lossy)");
@@ -797,14 +743,7 @@ namespace Jackett.Common.Indexers
             AddCategoryMapping(1798, TorznabCatType.Audio, "         Author and war songs (transit Lossless)");
             AddCategoryMapping(1799, TorznabCatType.Audio, "         Author and war songs (transit Lossy)");
             AddCategoryMapping(1772, TorznabCatType.Audio, "      Unofficial collections (transit)");
-            AddCategoryMapping(1773, TorznabCatType.Audio, "         Jazz, Blues, Soul (transit collections)");
-            AddCategoryMapping(1774, TorznabCatType.Audio, "         Chanson, Author and war songs (collections transit)");
-            AddCategoryMapping(1775, TorznabCatType.Audio, "         Rock, Alternative, Punk, Metal (collections of transit)");
             AddCategoryMapping(1776, TorznabCatType.Audio, "         Pop (transit collections)");
-            AddCategoryMapping(1777, TorznabCatType.Audio, "         Electronic (transit collections)");
-            AddCategoryMapping(1778, TorznabCatType.Audio, "         Rap, Hip-hop, RnB, Reggae (transit collections)");
-            AddCategoryMapping(1779, TorznabCatType.Audio, "         Instrumental / New Age / Meditative / Relax (transit collections)");
-            AddCategoryMapping(1780, TorznabCatType.Audio, "         Other (transit collections)");
             AddCategoryMapping(1816, TorznabCatType.Audio, "      Chanson, Author and war songs (transit)");
             AddCategoryMapping(1677, TorznabCatType.Audio, "         Chanson, Author and war songs (transit lossless)");
             AddCategoryMapping(1678, TorznabCatType.Audio, "         Chanson, Author and war songs (transit lossy)");
@@ -1192,9 +1131,9 @@ namespace Jackett.Common.Indexers
             AddCategoryMapping(1606, TorznabCatType.Audio, "      Music Lossy (AAC) (Singles, EPs)");
             AddCategoryMapping(113, TorznabCatType.Books, "Books, Audio Books, Journals");
             AddCategoryMapping(561, TorznabCatType.Books, "   Books, Audio Books, Journals (General Discussion)");
-            AddCategoryMapping(316, TorznabCatType.Books, "      Archive (Books, Audio Books, Journals)");
             AddCategoryMapping(1620, TorznabCatType.Books, "      Meditation");
             AddCategoryMapping(1802, TorznabCatType.Books, "      Historiography");
+            AddCategoryMapping(1900, TorznabCatType.Books, "      Classic, modern prose and poetry");
             AddCategoryMapping(116, TorznabCatType.AudioAudiobook, "   Audiobooks");
             AddCategoryMapping(1231, TorznabCatType.AudioAudiobook, "      Audio, history, memoirs (Audiobooks)");
             AddCategoryMapping(119, TorznabCatType.AudioAudiobook, "         Audio and literary readings (Audiobooks)");
@@ -1203,6 +1142,8 @@ namespace Jackett.Common.Indexers
             AddCategoryMapping(321, TorznabCatType.AudioAudiobook, "      Science fiction, fantasy, mystery, horror, fanfiction (Audiobooks)");
             AddCategoryMapping(1234, TorznabCatType.AudioAudiobook, "         Russian fiction, fantasy, mystery, horror, fanfiction (audiobook)");
             AddCategoryMapping(1235, TorznabCatType.AudioAudiobook, "         Foreign fiction, fantasy, mystery, horror, fanfiction (audiobook)");
+            AddCategoryMapping(1904, TorznabCatType.AudioAudiobook, "         Love-fiction novel (audiobooks)");
+            AddCategoryMapping(1905, TorznabCatType.AudioAudiobook, "         Compilations / Miscellaneous Fantastic, Fantasy, Mystic, Horror, Fan-fiction (Audiobooks)");
             AddCategoryMapping(317, TorznabCatType.AudioAudiobook, "      Fiction (Audiobooks)");
             AddCategoryMapping(1236, TorznabCatType.AudioAudiobook, "         Poetry (audiobook)");
             AddCategoryMapping(118, TorznabCatType.AudioAudiobook, "         Foreign literature (audiobook)");
@@ -1218,7 +1159,6 @@ namespace Jackett.Common.Indexers
             AddCategoryMapping(1242, TorznabCatType.AudioAudiobook, "            Nontraditional religious philosophies (Audio)");
             AddCategoryMapping(1243, TorznabCatType.AudioAudiobook, "      Educational, scientific and popular literature (Audio)");
             AddCategoryMapping(1244, TorznabCatType.AudioAudiobook, "      Audiobooks in lossless-format");
-            AddCategoryMapping(323, TorznabCatType.AudioAudiobook, "      Business (Audio)");
             AddCategoryMapping(319, TorznabCatType.AudioAudiobook, "      Historical literature (Audiobooks)");
             AddCategoryMapping(1245, TorznabCatType.AudioAudiobook, "      Miscellaneous (Audiobooks)");
             AddCategoryMapping(1622, TorznabCatType.AudioAudiobook, "      Meditation (Audio)");
@@ -1235,7 +1175,6 @@ namespace Jackett.Common.Indexers
             AddCategoryMapping(889, TorznabCatType.Books, "      Celebrities and idols");
             AddCategoryMapping(890, TorznabCatType.Books, "      Miscellaneous");
             AddCategoryMapping(982, TorznabCatType.Books, "      Magazines and newspapers (general section)");
-            AddCategoryMapping(566, TorznabCatType.Books, "         Men's magazines");
             AddCategoryMapping(1204, TorznabCatType.Books, "         For women (magazines and books)");
             AddCategoryMapping(1793, TorznabCatType.Books, "         Popular science magazines");
             AddCategoryMapping(1794, TorznabCatType.Books, "         Journals of Electrical and Electronics");

src/Jackett.Common/Indexers/BJShare.cs

@@ -139,6 +139,12 @@ namespace Jackett.Common.Indexers
             if (string.IsNullOrWhiteSpace(query.SearchTerm) && !query.IsImdbQuery)
             {
                 var results = await RequestStringWithCookies(TodayUrl);
+                if (results.IsRedirect)
+                {
+                    // re-login
+                    await ApplyConfiguration(null);
+                    results = await RequestStringWithCookies(TodayUrl);
+                }
                 try
                 {
                     const string rowsSelector = "table.torrent_table > tbody > tr:not(tr.colhead)";
@@ -198,18 +204,21 @@ namespace Jackett.Common.Indexers
                             var catStr = qCatLink.GetAttribute("href").Split('=')[1];
                             release.Title = FixAbsoluteNumbering(release.Title);
 
-                            var quality = qQuality.TextContent;
-                            switch (quality)
+                            if (qQuality != null)
                             {
-                                case "Full HD":
-                                    release.Title += " 1080p";
-                                    break;
-                                case "HD":
-                                    release.Title += " 720p";
-                                    break;
-                                default:
-                                    release.Title += " 480p";
-                                    break;
+                                var quality = qQuality.TextContent;
+                                switch (quality)
+                                {
+                                    case "Full HD":
+                                        release.Title += " 1080p";
+                                        break;
+                                    case "HD":
+                                        release.Title += " 720p";
+                                        break;
+                                    default:
+                                        release.Title += " 480p";
+                                        break;
+                                }
                             }
 
                             release.Category = MapTrackerCatToNewznab(catStr);
@@ -271,6 +280,12 @@ namespace Jackett.Common.Indexers
                 searchUrl += "?" + queryCollection.GetQueryString();
 
                 var results = await RequestStringWithCookies(searchUrl);
+                if (results.IsRedirect)
+                {
+                    // re-login
+                    await ApplyConfiguration(null);
+                    results = await RequestStringWithCookies(searchUrl);
+                }
                 try
                 {
                     const string rowsSelector = "table.torrent_table > tbody > tr:not(tr.colhead)";