underverse, underverseL: handle genmed and seedmed user classes. resolves #6360

Missing spaces in fields args that broke the HDCity template

README.md

@@ -28,11 +28,11 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Anime Tosho
  * AniRena
  * AudioBook Bay (ABB)
- * btbit
+ * BigFANGroup
  * BTDB
- * BTDigg
- * BTKitty
+ * BTDIGG
  * ConCen
+ * Corsaro.red
  * cpasbien
  * cpasbienClone
  * Demonoid
@@ -41,9 +41,13 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * ETTV
  * EliteTorrent.biz
  * ExtraTorrent.ag
+ * EXT Torrents
  * EZTV
  * Frozen Layer
+ * GamesTorrents
  * GkTorrent
+ * GloDLS
+ * HDReactor
  * Hon3yHD.net
  * Horrible Subs
  * Idope
@@ -51,10 +55,8 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Il Corsaro Blu
  * Isohunt2
  * iTorrent
- * KATcrs
  * KickAssTorrent (KATcr)
- * KickAssTorrent (thekat.se clone)
- * KikiBT
+ * KickAssTorrent (kat.li)
  * LePorno
  * LimeTorrents
  * MacTorrents
@@ -64,9 +66,13 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Monova
  * MovCr
  * Newpct (aka: tvsinpagar, descargas2020, torrentlocura, torrentrapid, tumejortorrent, pctnew, etc)
+ * Newstudio
+ * Nitro
+ * NoName Club (NNM-Club)
  * Nyaa.si
  * Nyaa-Pantsu
  * OxTorrent
+ * PiratBit
  * ProStyleX
  * RARBG
  * RuTor
@@ -78,55 +84,56 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * sukebei-Pantsu
  * TFile
  * The Pirate Bay (TPB)
- * TNTVillage <!-- maintained by bonny1992 -->
  * Tokyo Tosho
  * Torlock
  * Torrent Downloads (TD)
  * TorrentFunk
- * TorrentGalaxy.org (TGx)
- * TorrentKitty
+ * TorrentGalaxy (TGx)
  * TorrentProject2
  * TorrentQuest
  * Torrents.csv
+ * TorrentWal
  * Torrent9
- * Torernt9 clone (torrents9.ch)
+ * Torrent9Clone
  * Torrentz2
- * World Wide Torrents
+ * Underverse
  * YourBittorrent
  * YTS.ag
  * Zooqle
 
 ### Supported Semi-Private Trackers
- * 7tor
  * Alein
  * AlexFilm
  * AniDUB
  * ArenaBG
  * BaibaKo
+ * BookTracker
+ * CasStudioTV
  * Crazy's Corner
  * CzTorrent
  * Deildu
+ * EniaHD
  * Film-Paleis
  * Gay-Torrents.net
  * Gay-Torrents.org
- * GDF76
  * HamsterStudio
+ * HD Dolby
  * Kinozal
  * LostFilm.tv
  * Marine Tracker
  * Metal Tracker
  * MVGroup Forum
  * MVGroup Main
- * Newstudio
  * NetHD (VietTorrent)
- * NoName Club (NNM-Club)
  * RockBox
  * RuTracker
  * Sharewood
  * SkTorrent
  * SoundPark
  * Toloka.to
+ * Torrent-Explosiv
  * Torrents-Local
+ * TribalMixes
  * Union Fansub
  * Vanila
  * YggTorrent (YGG)
@@ -147,7 +154,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * AnimeBytes (AB)
  * AnimeTorrents (AnT)
  * Anthelion
- * AOX (Chippu)
  * Araba Fenice (Phoenix)
  * Asgaard (AG)
  * AsianCinema
@@ -156,7 +162,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Audiobook Torrents (ABT)
  * AudioNews (AN)
  * Awesome-HD (AHD)
- * AVG (Audio Video Games)
  * Avistaz (AsiaTorrents)
  * Back-ups
  * BakaBT
@@ -170,7 +175,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Bithorlo (BHO)
  * BitHUmen
  * BitMe
- * BitMeTV
  * BitsPiracy
  * Bitspyder
  * BitTorrentFiles
@@ -186,7 +190,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Carpathians
  * CartoonChaos (CC)
  * CasaTorrent
- * CasStudioTV
  * CCFBits
  * CGPeers
  * CHDBits
@@ -195,6 +198,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Cinematik
  * CinemaZ (EuTorrents)
  * Classix
+ * Concertos
  * CrazyHD
  * CrazySpirits
  * CrnaBerza
@@ -211,12 +215,10 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * DocumentaryTorrents (DT)
  * Downloadville
  * Dragonworld Reloaded
- * Dream Team
  * DXDHD
  * EbookParadijs
  * Ebooks-Shares
  * EfectoDoppler
- * EliteHD (HDClub) [![(invite needed)][inviteneeded]](#)
  * Elit Tracker (ET)
  * Elite-Tracker
  * Empornium (EMP)
@@ -232,18 +234,17 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * FunFile (FF)
  * FunkyTorrents (FT)
  * Fuzer (FZ)
+ * Galeriens (LaPauseTorrents)
  * GAYtorrent.ru
  * GazelleGames (GGn)
  * Generation-Free
- * GFXNews
  * GFXPeers
  * GigaTorrents
  * GimmePeers (formerly ILT) <!-- maintained by jamesb2147 -->
  * GiroTorrent
+ * Greek Legends
  * Greek Team
  * HacheDe
- * Hardbay
- * HD4Free (HD4)
  * HD-Forever (HDF)
  * HD-Only (HDO)
  * HD-Space (HDS)
@@ -259,13 +260,13 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * HDME
  * HDSky
  * HDTorrents.it
+ * HDTurk
+ * HDZone
  * Hebits
  * Hon3y HD
  * HQSource (HQS)
  * HuSh 
- * Hyperay
  * ICE Torrent
- * iLoveClassics (iLC)
  * ImmortalSeed (iS)
  * Immortuos
  * inPeril
@@ -274,8 +275,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * JPopsuki
  * Kapaki
  * Karagarga
- * LaPauseTorrents
- * Le Chaudron
  * Le Saloon
  * LearnFlakes
  * LibraNet (LN)
@@ -284,16 +283,16 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * M-Team TP (MTTP)
  * Magico (Trellas)
  * Majomparádé (TurkDepo)
- * Mega-Bliz
  * Mononoké-BT
  * MoreThanTV (MTV)
  * Music-Master
  * MyAnonamouse (MAM)
  * myAmity
  * MySpleen
- * NCore
  * NBTorrents
+ * NCore
  * Nebulance (NBL) (TransmiTheNet)
+ * NetLab
  * New Real World
  * Norbits
  * NordicBits (NB)
@@ -305,7 +304,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Passione Torrent <!-- maintained by bonny1992 -->
  * PassThePopcorn (PTP)
  * Peers.FM
- * PiratBit
  * PirateTheNet (PTN)
  * PixelCove (Ultimate Gamer)
  * PiXELHD (PxHD)
@@ -324,19 +322,18 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * R3V WTF!
  * Racing4Everyone (R4E)
  * RacingForMe (RFM)
+ * RainbowNation Sharing (RNS)
  * Redacted (PassTheHeadphones)
  * Red Star Torrent (RST)
  * RetroFlix
  * RevolutionTT
  * RGU
- * RocketHD
  * RoDVD (Cinefiles)
  * Romanian Metal Torrent (RMT)
  * RPTorrents
  * SceneFZ
  * SceneHD
  * ScenePalace (SP)
- * SceneReactor
  * SceneRush
  * SceneTime
  * SDBits
@@ -344,6 +341,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * SeedFile (SF)
  * Shareisland
  * ShareSpaceDB
+ * ShareUniversity
  * Shazbat
  * Shellife (SL)
  * SiamBIT
@@ -359,6 +357,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Tazmania-Den
  * TeamHD
  * TeamOS
+ * TEKNO3D
  * TellyTorrent
  * TenYardTorrents (TYT)
  * TheAudioScene
@@ -373,7 +372,6 @@ 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
@@ -395,7 +393,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * ToTheGlory
  * TranceTraffic
  * Trezzor
- * TurkTorrent (TT)
+ * TurkTorrent (TT) [![(invite needed)][inviteneeded]](#)
  * TV Chaos UK (TVCUK)
  * TV-Vault
  * TVstore
@@ -408,11 +406,9 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Waffles
  * World-In-HD
  * World-of-Tomorrow
- * WorldOfP2P (WOP)
  * x-ite.me (XM)
  * xBytesV2
  * XSpeeds (XS)
- * XKTorrent
  * XWTorrents (XWT)
  * Xthor
  * XtremeFile
@@ -461,10 +457,10 @@ On most operating systems all the required dependencies will already be present.
 
 ### Install as service
 1. Download and extract the latest `Jackett.Binaries.LinuxAMDx64.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases)
-2. To install Jackett as a service, open the Terminal and run `sudo ./install_service_systemd.sh` You need root permissions to install the service. The service will start on each logon. You can always stop it by running `systemctl stop jackett.service` from Terminal. You can start it again it using `systemctl start jackett.service`. Logs are stored as usual under `~/.config/Jackett/log.txt` and also in `journalctl -u jackett.service`.
+2. To install Jackett as a service, open a Terminal, cd to the jackett folder and run `sudo ./install_service_systemd.sh` You need root permissions to install the service. The service will start on each logon. You can always stop it by running `systemctl stop jackett.service` from Terminal. You can start it again it using `systemctl start jackett.service`. Logs are stored as usual under `~/.config/Jackett/log.txt` and also in `journalctl -u jackett.service`.
 
 ### 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`
+Download and extract the latest `Jackett.Binaries.LinuxAMDx64.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases), open a Terminal, cd to the jackett folder 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.  
@@ -475,10 +471,10 @@ On most operating systems all the required dependencies will already be present.
 
 ### Install as service
 1. Download and extract the latest `Jackett.Binaries.LinuxARM32.tar.gz` or `Jackett.Binaries.LinuxARM64.tar.gz` (32 bit is the most common on ARM) release from the [releases page](https://github.com/Jackett/Jackett/releases) 
-2. To install Jackett as a service, open the Terminal and run `sudo ./install_service_systemd.sh` You need root permissions to install the service. The service will start on each logon. You can always stop it by running `systemctl stop jackett.service` from Terminal. You can start it again it using `systemctl start jackett.service`. Logs are stored as usual under `~/.config/Jackett/log.txt` and also in `journalctl -u jackett.service`.
+2. To install Jackett as a service, open a Terminal, cd to the jackett folder and run `sudo ./install_service_systemd.sh` You need root permissions to install the service. The service will start on each logon. You can always stop it by running `systemctl stop jackett.service` from Terminal. You can start it again it using `systemctl start jackett.service`. Logs are stored as usual under `~/.config/Jackett/log.txt` and also in `journalctl -u jackett.service`.
 
 ### 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`
+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), open a Terminal, cd to the jackett folder 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.  
@@ -609,7 +605,7 @@ All contributions are welcome just send a pull request.
 * Install the .NET Core [SDK](https://www.microsoft.com/net/download/windows)
 * Clone Jackett
 * Open Powershell and from the `src` directory, run `dotnet restore`
-* Open the Jackett solution in Visual Studio 2017 (version 15.9 or above)
+* Open the Jackett solution in Visual Studio 2019 (version 16.3 or above)
 * Right click on the Jackett solution and click 'Rebuild Solution' to restore nuget packages
 * Select Jackett.Server as startup project
 * In the drop down menu of the run button select "Jackett.Server" instead of "IIS Express"
@@ -626,21 +622,21 @@ git clone https://github.com/Jackett/Jackett.git
 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/jackett # run jackett
+dotnet publish Jackett.Server -f netcoreapp3.0 --self-contained -r osx-x64 -c Debug # takes care of everything
+./Jackett.Server/bin/Debug/netcoreapp3.0/osx-x64/jackett # run jackett
 ```
 
 ### Linux
 
 
 ```bash
-sudo apt install mono-complete nuget msbuild dotnet-sdk-2.2 # install build tools (debian/ubuntu)
+sudo apt install mono-complete nuget msbuild dotnet-sdk-3.0 # install build tools (debian/ubuntu)
 git clone https://github.com/Jackett/Jackett.git
 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/jackett # run jackett
+dotnet publish Jackett.Server -f netcoreapp3.0 --self-contained -r linux-x64 -c Debug # takes care of everything
+./Jackett.Server/bin/Debug/netcoreapp3.0/linux-x64/jackett # run jackett
 ```
 
 ## Screenshots

appveyor.yml

@@ -1,15 +1,11 @@
-version: 0.11.{build}
+version: 0.12.{build}
 skip_tags: true
 image:
   - Ubuntu
-  - Visual Studio 2017
+  - Visual Studio 2019
 environment:
   APPVEYOR_YML_DISABLE_PS_LINUX: true
 configuration: Release
-install:
-  #Remove once .NET Core 2.2.5 is deployed to Appveyor
-  - sh: sudo apt-get update
-  - sh: sudo apt-get -y install dotnet-sdk-2.2
 assembly_info:
   patch: true
   file: '**\AssemblyInfo.*'

build.cake

@@ -16,7 +16,7 @@ var configuration = Argument("configuration", "Debug");
 var workingDir = MakeAbsolute(Directory("./"));
 string artifactsDirName = "Artifacts";
 string testResultsDirName = "TestResults";
-string netCoreFramework = "netcoreapp2.2";
+string netCoreFramework = "netcoreapp3.0";
 string serverProjectPath = "./src/Jackett.Server/Jackett.Server.csproj";
 string updaterProjectPath = "./src/Jackett.Updater/Jackett.Updater.csproj";
 
@@ -28,7 +28,7 @@ Task("Info")
 	.Does(() =>
 	{
 		Information(@"Jackett Cake build script starting...");
-		Information(@"Requires InnoSetup and C:\cygwin to be present for packaging (Pre-installed on AppVeyor) on Windows");
+		Information(@"Requires InnoSetup and C:\msys64 to be present for packaging (Pre-installed on AppVeyor) on Windows");
 		Information(@"Working directory is: " + workingDir);
 
 		if (IsRunningOnWindows())
@@ -64,7 +64,7 @@ Task("Build-Full-Framework")
 
 		var buildSettings = new MSBuildSettings()
                 .SetConfiguration(configuration)
-                .UseToolVersion(MSBuildToolVersion.VS2017);
+                .UseToolVersion(MSBuildToolVersion.VS2019);
 		
 		MSBuild("./src/Jackett.sln", buildSettings);
 	});
@@ -106,6 +106,8 @@ Task("Package-Windows-Full-Framework")
 
 		InnoSetupSettings settings = new InnoSetupSettings();
 		settings.OutputDirectory = workingDir + "/" + artifactsDirName;
+		//Can remove below line once Cake is updated for InnoSetup 6 - https://github.com/cake-build/cake/pull/2565
+		settings.ToolPath = @"C:\Program Files (x86)\Inno Setup 6\ISCC.exe";
  		settings.Defines = new Dictionary<string, string>
 			{
 				{ "MyFileForVersion", sourceFolder + "/Jackett.Common.dll" },
@@ -145,6 +147,7 @@ Task("Package-Mono-Full-Framework")
 
 		DeleteFile(buildOutputPath + "/System.Runtime.InteropServices.RuntimeInformation.dll");
 
+		InstallMsysTar();
 		Gzip("./BuildOutput/net461/linux-x64", $"./{artifactsDirName}", "Jackett", "Jackett.Binaries.Mono.tar.gz");
 	});
 
@@ -182,6 +185,7 @@ Task("Package-DotNetCore-LinuxAMDx64")
 		DeleteDirectory(updaterOutputPath, new DeleteDirectorySettings {Recursive = true, Force = true});
 
 		CopyFileToDirectory("./install_service_systemd.sh", buildOutputPath);
+		CopyFileToDirectory("./jackett_launcher.sh", buildOutputPath);
 
 		Gzip($"./BuildOutput/{netCoreFramework}/{runtimeId}", $"./{artifactsDirName}", "Jackett", "Jackett.Binaries.LinuxAMDx64.tar.gz");
 	});
@@ -201,6 +205,7 @@ Task("Package-DotNetCore-LinuxARM32")
 		DeleteDirectory(updaterOutputPath, new DeleteDirectorySettings {Recursive = true, Force = true});
 
 		CopyFileToDirectory("./install_service_systemd.sh", buildOutputPath);
+		CopyFileToDirectory("./jackett_launcher.sh", buildOutputPath);
 
 		Gzip($"./BuildOutput/{netCoreFramework}/{runtimeId}", $"./{artifactsDirName}", "Jackett", "Jackett.Binaries.LinuxARM32.tar.gz");
 	});
@@ -220,6 +225,7 @@ Task("Package-DotNetCore-LinuxARM64")
 		DeleteDirectory(updaterOutputPath, new DeleteDirectorySettings {Recursive = true, Force = true});
 
 		CopyFileToDirectory("./install_service_systemd.sh", buildOutputPath);
+		CopyFileToDirectory("./jackett_launcher.sh", buildOutputPath);
 
 		Gzip($"./BuildOutput/{netCoreFramework}/{runtimeId}", $"./{artifactsDirName}", "Jackett", "Jackett.Binaries.LinuxARM64.tar.gz");
 	});
@@ -326,13 +332,13 @@ Task("Linux-Environment")
 	});
 
 
-private void RunCygwinCommand(string utility, string utilityArguments)
+private void RunMsysCommand(string utility, string utilityArguments)
 {
-	var cygwinDir = @"C:\cygwin\bin\";
-	var utilityProcess = cygwinDir + utility + ".exe";
+	var msysDir = @"C:\msys64\usr\bin\";
+	var utilityProcess = msysDir + utility + ".exe";
 
-	Information("CygWin Utility: " + utility);
-	Information("CygWin Directory: " + cygwinDir);
+	Information("MSYS2 Utility: " + utility);
+	Information("MSYS2 Directory: " + msysDir);
 	Information("Utility Location: " + utilityProcess);
 	Information("Utility Arguments: " + utilityArguments);
 
@@ -343,7 +349,7 @@ private void RunCygwinCommand(string utility, string utilityArguments)
 			utilityProcess,
 			new ProcessSettings {
 				Arguments = utilityArguments,
-				WorkingDirectory = cygwinDir,
+				WorkingDirectory = msysDir,
 				RedirectStandardOutput = true
 			},
 			out redirectedStandardOutput,
@@ -364,11 +370,9 @@ private void RunCygwinCommand(string utility, string utilityArguments)
 	Information(utility + " Exit code: {0}", exitCodeWithArgument);
 }
 
-private string RelativeWinPathToCygPath(string relativePath)
+private string RelativeWinPathToFullPath(string relativePath)
 {
-	var cygdriveBase = "/cygdrive/" + workingDir.ToString().Replace(":", "").Replace("\\", "/");
-	var cygPath = cygdriveBase + relativePath.TrimStart('.');
-	return cygPath;
+	return (workingDir + relativePath.TrimStart('.'));
 }
 
 private void RunLinuxCommand(string file, string arg)
@@ -390,12 +394,12 @@ private void Gzip(string sourceFolder, string outputDirectory, string tarCdirect
 	
 	if (IsRunningOnWindows())
 	{
-		var cygSourcePath = RelativeWinPathToCygPath(sourceFolder);
-		var tarArguments = @"-cvf " + cygSourcePath + "/" + tarFileName + " -C " + cygSourcePath + $" {tarCdirectoryOption} --mode ='755'";
-		var gzipArguments = @"-k " + cygSourcePath + "/" + tarFileName;
+		var fullSourcePath = RelativeWinPathToFullPath(sourceFolder);
+		var tarArguments = @"--force-local -cvf " + fullSourcePath + "/" + tarFileName + " -C " + fullSourcePath + $" {tarCdirectoryOption} --mode ='755'";
+		var gzipArguments = @"-k " + fullSourcePath + "/" + tarFileName;
 
-		RunCygwinCommand("Tar", tarArguments);
-		RunCygwinCommand("Gzip", gzipArguments);
+		RunMsysCommand("tar", tarArguments);
+		RunMsysCommand("gzip", gzipArguments);
 		MoveFile($"{sourceFolder}/{tarFileName}.gz", $"{outputDirectory}/{tarFileName}.gz");
 	}
 	else
@@ -405,32 +409,85 @@ private void Gzip(string sourceFolder, string outputDirectory, string tarCdirect
 		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}");
 		}
 
+		string systemdMonoScript = MakeAbsolute(Directory(sourceFolder)) + "/Jackett/install_service_systemd_mono.sh";
+		if (FileExists(systemdMonoScript))
+		{
+			RunLinuxCommand("chmod", $"755 {systemdMonoScript}");
+		}
+
+		string systemdScript = MakeAbsolute(Directory(sourceFolder)) + "/Jackett/install_service_systemd.sh";
+		if (FileExists(systemdScript))
+		{
+			RunLinuxCommand("chmod", $"755 {systemdScript}");
+		}
+
+		string launcherScript = MakeAbsolute(Directory(sourceFolder)) + "/Jackett/jackett_launcher.sh";
+		if (FileExists(launcherScript))
+		{
+			RunLinuxCommand("chmod", $"755 {launcherScript}");
+		}
+
 		RunLinuxCommand("tar",  $"-C {sourceFolder} -zcvf {outputDirectory}/{tarFileName}.gz {tarCdirectoryOption}");
 	}	
 }
 
-private void DotNetCorePublish(string projectPath, string framework, string runtime, string outputPath)
+private void InstallMsysTar()
 {
-	var settings = new DotNetCorePublishSettings
+	//Gzip is included by default with MSYS2, but not tar. Use the package manager to install tar
+
+	var startInfo = new System.Diagnostics.ProcessStartInfo()
 	{
-		Framework = framework,
-		Runtime = runtime,
-		OutputDirectory = outputPath
+		Arguments = "-S --noconfirm tar",
+		FileName = @"C:\msys64\usr\bin\pacman.exe",
+		UseShellExecute = false
 	};
 
-	DotNetCorePublish(projectPath, settings);
+	var process = System.Diagnostics.Process.Start(startInfo);
+	process.WaitForExit();
+
+	if (FileExists(@"C:\msys64\usr\bin\tar.exe") && FileExists(@"C:\msys64\usr\bin\gzip.exe"))
+	{
+		Information("tar.exe and gzip.exe were found");
+	}
+	else
+    {
+        throw new Exception("tar.exe and gzip.exe were NOT found");   
+    }
+}
+
+private void DotNetCorePublish(string projectPath, string framework, string runtime, string outputPath)
+{
+	bool publishSingleFile = false;
+
+	if (publishSingleFile && framework != "net461")
+	{
+		var settings = new DotNetCorePublishSettings
+		{
+			Framework = framework,
+			Runtime = runtime,
+			OutputDirectory = outputPath,
+			ArgumentCustomization = args=>args.Append("/p:PublishSingleFile=true")
+		};
+
+		DotNetCorePublish(projectPath, settings);
+	}
+	else
+	{
+		var settings = new DotNetCorePublishSettings
+		{
+			Framework = framework,
+			Runtime = runtime,
+			OutputDirectory = outputPath
+		};
+
+		DotNetCorePublish(projectPath, settings);
+	}
 }
 
 //////////////////////////////////////////////////////////////////////

install_service_systemd.sh

@@ -46,7 +46,7 @@ Type=simple
 User=${jackettuser}
 Group=${jackettuser}
 WorkingDirectory=${jackettdir}
-ExecStart=${jackettdir}/jackett --NoRestart
+ExecStart=${jackettdir}/jackett_launcher.sh
 TimeoutStopSec=20
 
 [Install]

jackett_launcher.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Helper script to fix
+# https://github.com/Jackett/Jackett/issues/5208#issuecomment-547565515
+
+# Get full Jackett root path
+JACKETT_DIR="$(dirname "$(readlink -f "$0")")"
+
+# Launch Jackett
+${JACKETT_DIR}/jackett --NoRestart
+
+# Get user running the service
+JACKETT_USER=$(whoami)
+
+# Wait until the updater ends
+while pgrep -u ${JACKETT_USER} JackettUpdater > /dev/null; do
+     sleep 1
+done

src/Jackett.Common/Content/custom.js

@@ -738,7 +738,7 @@ function updateReleasesRow(row)
     labels.empty();
 
     if (IMDBId) {
-        labels.append('\n<a href="http://www.imdb.com/title/tt' + ("000000" + IMDBId).slice(-7) + '/" class="label label-imdb" alt="IMDB" title="IMDB">IMDB</a>');
+        labels.append('\n<a href="http://www.imdb.com/title/tt' + ("0000000" + IMDBId).slice(-8) + '/" class="label label-imdb" alt="IMDB" title="IMDB">IMDB</a>');
     }
 
     if (!isNaN(DownloadVolumeFactor)) {

src/Jackett.Common/Definitions/0daykiev.yml

@@ -110,7 +110,7 @@
           - name: re_replace
             args: ["(.*)\\([CСcс]езон\\s+(\\d+)\\)(.*)", "$1 S$2 rus $3"]
           - name: re_replace
-            args: ["(\\([А-Яа-я\\W]+\\))|(^[А-Яа-я\\W\\d]+\\/ )|([а-яА-Я \\-]+,+)|([а-яА-Я]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
+            args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
           - name: replace
             args: ["WEB DL", "WEBDL"]
           - name: replace

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

@@ -7,6 +7,12 @@
   encoding: UTF-8
   links:
     - https://1337x.to/
+    - https://1337x.gd/
+    - https://1337x.is/
+    - https://1337x.st/
+    - https://x1337x.ws/
+    - https://x1337x.eu/
+    - https://x1337x.se/
 
   caps:
     categorymappings:
@@ -36,7 +42,6 @@
       - {id: 2, cat: Movies/SD, desc: "Movies/Divx/Xvid"}
       - {id: 3, cat: Movies, desc: "Movies/SVCD/VCD"}
       - {id: 4, cat: Movies/Foreign, desc: "Movies/Dubs/Dual Audio"}
-      - {id: 9, cat: Movies, desc: "Documentaries/Documentary"}
       - {id: 42, cat: Movies/HD, desc: "Movies/HD"}
       - {id: 54, cat: Movies, desc: "Movies/h.264/x264"}
       - {id: 55, cat: Movies, desc: "Movies/Mp4"}
@@ -53,6 +58,7 @@
       - {id: 71, cat: TV, desc: "TV/HEVC/x265"}
       - {id: 74, cat: TV, desc: "TV/Cartoons"}
       - {id: 75, cat: TV/SD, desc: "TV/SD"}
+      - {id: 9, cat: TV/Documentary, desc: "TV/Documentary"}
 
       #Apps
       - {id: 18, cat: PC, desc: "Apps/PC Software"}
@@ -117,11 +123,9 @@
   download:
     # the .torrent url is on the on the details page 
     selector: ul li a[href^="{{ .Config.downloadlink }}"]
-    # temp fix for #5372
-    filters: 
-      - name: urldecode
-      - name: replace
-        args: [" ⭐", ""]
+    filters:
+      - name: replace # temp fix for #5372
+        args: ["%E2%AD%90", ""]
 
   search:
     paths:
@@ -143,6 +147,8 @@
         filters:
           - name: replace
             args: ["Grey's Anatomy", "Greys Anatomy"]
+          - name: replace
+            args: ["\u000f", ""] # get rid of unwanted character
       category:
         optional: true
         selector:  td[class^="coll-1"] a[href^="/sub/"]

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

@@ -11,23 +11,20 @@
   caps:
     categorymappings:
       - {id: 65, cat: Books, desc: "Books"}
-      - {id: 27, cat: Console/NDS, desc: "Games/Nintendo-DS"}
-      - {id: 28, cat: Console/Other, desc: "Games/Switch"}
-      - {id: 42, cat: PC/Phone-Android, desc: "Mobile/Android"}
-      - {id: 44, cat: Movies/UHD, desc: "Movies/4K"}
-      - {id: 13, cat: Movies/BluRay, desc: "Movies/Bluray"}
-      - {id: 12, cat: Movies/DVD, desc: "Movies/DVD-R"}
+      - {id: 11, cat: Movies/UHD, desc: "Movies/Encodes 2160p"}
+      - {id: 12, cat: Movies/UHD, desc: "Movies/Remux 2160p"}
+      - {id: 13, cat: Movies/HD, desc: "Movies/Remux 1080p"}
       - {id: 14, cat: Movies, desc: "Movies/Packs"}
-      - {id: 67, cat: Movies/HD, desc: "Movies/x264"}
-      - {id: 55, cat: Movies/HD, desc: "Movies/X265"}
-      - {id: 45, cat: Movies, desc: "Movies/Remux"}
-      - {id: 62, cat: Audio, desc: "Music/Audio"}
+      - {id: 16, cat: Movies/HD, desc: "Movies/x264"}
+      - {id: 17, cat: Movies/HD, desc: "Movies/X265"}
+      - {id: 33, cat: Audio, desc: "Music/Audio"}
       - {id: 32, cat: Audio, desc: "Music/Packs"}
       - {id: 6, cat: TV, desc: "TV/Packs"}
       - {id: 3, cat: TV/HD, desc: "TV/x264"}
       - {id: 4, cat: TV/HD, desc: "TV/x265"}
       - {id: 8, cat: TV/SD, desc: "TV/Xvid"}
-      - {id: 63, cat: PC/0day, desc: "Windows/Applications"}
+      - {id: 43, cat: PC/0day, desc: "Appz/Windows"}
+      - {id: 42, cat: PC/Phone-Android, desc: "Appz/Android"}
 
     modes:
       search: [q]
@@ -35,108 +32,94 @@
       movie-search: [q]
 
   login:
-    path: login.php
-    method: form
-    form: form[action="takelogin.php"]
+    path: takelogin.php
+    method: post
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
-      returnto: "/browse.php"
+      submitme: "X"
     error:
-      - selector: h2:contains("Login failed!")
-        message:
-          selector: table tr td.colhead2
+      - selector: div.callout:contains("Login failed!")
     test:
       path: /
-      selector: :has(a[href$="/logout.php?hash_please="])
+      selector: a[href*="/logout.php?hash_please="]
 
   search:
     paths:
-    # ttps://www.3evils.com/browse.php?search=black+lightning+s02e11&searchin=title&incldead=1
-    # https://www.3evils.com/browse.php?c3=1&c4=1&search=&searchin=title&incldead=0
+    # https://www.3evils.com/browse.php?search=black+lightning+s02e11&searchin=title&incldead=1
+    # https://www.3evils.com/browse.php?c3=1&c4=1&search=&searchin=title&incldead=1
       - path: browse.php
     inputs:
       $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
       search: "{{.Keywords}}"
-      searchin: "title"
+      # title descr genre all
+      searchin: title
+      # 0 active 1 incldead 2 onlydead
       incldead: 1
     rows:
-      selector: table.table-bordered tr:has(a[href^="browse.php?cat="])
+      selector: table.responsive-card-table tr:has(td[data-label])
       filters:
         - name: andmatch
     fields:
+      category:
+        selector: td[data-label="Type"] a
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
       title:
-        selector: a[href^="details.php?id="] b
-      title:
-        # if this is available it is the full length title, as the one above can be abbreviated with ...
-        optional: true
-        selector: a[href^="details.php?id="][onmouseover]
+        selector: td[data-label="Name"] a[onmouseover]
         attribute: onmouseover
         filters:
           - name: regexp
             args: "Tip\\('<b>(.*?)</b>"
       details:
-        selector: a[href^="details.php?id="]
+        selector: td[data-label="Name"] a
         attribute: href
-      category:
-        selector: a[href^="browse.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
       download:
-        selector: a[href^="details.php?id="]
+        selector: td[data-label="Download"] a
         attribute: href
-        filters:
-          - name: replace
-            args: ["details.php?id=", "download.php?torrent="]
       banner:
-        selector: a[href^="details.php?id="][onmouseover]
+        selector: td[data-label="Name"] a[onmouseover]
         attribute: onmouseover
+        optional: true
         filters:
-            #  onmouseover="Tip('<b>blahblah /><img src=\'/imdb/images/0090293.jpg\' blahblah />');"
+            #  onmouseover="Tip('<b>blahblah /><img src=\'img.php/tvmaze/80.jpg\' blahblah />');"
+            # <img src=\'./pic/noposter.png\' 
           - name: regexp
-            args: "/imdb/(.*?).jpg"
-          - name: prepend
-            args: "/imdb/"
-          - name: append
-            args: ".jpg"
+            args: "src=\\\\\'(.+?)\\\\\'"
+          - name: replace
+            args: ["./pic/noposter.png", ""]
       size:
-        selector: td:nth-last-child(4)
+        selector: td[data-label="Size"]
       files:
-        selector: a[href^="filelist.php?id="]
+        selector: td[data-label="Files"]
       grabs:
-        selector: a[href^="snatches.php?id="]
+        selector: td[data-label="Snatched"]
         filters:
           - name: regexp
-            args: "(\\d+)"
+            args: (\d+)
       # 2 flavours of dates
       date:
-        # Today<br /> 10:20 AM
-        # Yesterday<br /> 08:03 PM
+        # Today<br> 10:20 AM
+        # Yesterday<br> 08:03 PM
         optional: true
-        selector: td:nth-last-child(5):contains("day")
+        selector: td[data-label="Added"]:contains("day")
       date:
-        # Feb 14 2019<br /> 10:20 AM
+        # Feb 14 2019<br> 10:20 AM
         optional: true
-        selector: td:nth-last-child(5):not(:contains("day"))
+        selector: td[data-label="Added"]:not(:contains("day"))
         filters:
           - name: dateparse
-            args: "Jan 2 2006 03:04 pm"
+            args: "Jan 2 2006 03:04 PM"
       seeders:
-        text: "0"
-      seeders:
-        optional: true
-        selector: a[href$="#seeders"]
+        selector: td[data-label="Seeders"]
       leechers:
-        text: "0"
-      leechers:
-        optional: true
-        selector: a[href$="#leechers"]
+        selector: td[data-label="Leechers"]
       downloadvolumefactor:
         case:
-          "b:contains(\"[FREE]\")": "0"
-          "*": "1"
+          img[src="./pic/freedownload.gif"]: 0
+          "*": 1
       uploadvolumefactor:
         case:
-          "*": "1"
+          "*": 1

src/Jackett.Common/Definitions/alexfilm.yml

@@ -6,6 +6,8 @@
   type: semi-private
   encoding: UTF-8
   links:
+    - https://alexfilm.org/
+  legacylinks:
     - https://alexfilm.cc/
 
   caps:
@@ -106,7 +108,7 @@
           - name: re_replace
             args: ["(.*)[CСcс]езон\\s+(\\d+)(.*)", "$1 S$2 rus $3"]
           - name: re_replace
-            args: ["(\\([А-Яа-я\\W]+\\))|(^[А-Яа-я\\W\\d]+\\/ )|([а-яА-Я \\-]+,+)|([а-яА-Я]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
+            args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
       details:
         selector: td a.tLink
         attribute: href

src/Jackett.Common/Definitions/anidex.yml

@@ -42,7 +42,7 @@
   search:
     paths:
     # 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}}"
+      - 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/aox.yml

@@ -1,106 +0,0 @@
----
-  site: aox
-  name: AOX
-  description: "AOX (Chippu) is a Private Torrent Tracker for ASIAN MOVIES / TV"
-  language: en-us
-  type: private
-  encoding: UTF-8
-  links:
-    - https://aox.to/
-
-  caps:
-    categorymappings:
-      - {id: 13, cat: Movies, desc: "Movie"}
-      - {id: 11, cat: TV, desc: "TV-Show"}
-      - {id: 5, cat: TV/Other, desc: "Variety Show"}
-      - {id: 24, cat: XXX, desc: "Adult"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: index.php?page=login
-    method: post
-    inputs:
-      uid: "{{ .Config.username }}"
-      pwd: "{{ .Config.password }}"
-    error:
-      - selector: body[onLoad^="makeAlert('"]
-        message:
-          selector: body[onLoad^="makeAlert('"]
-          attribute: onLoad
-          filters:
-            - name: replace
-              args: ["makeAlert('Error' , '", ""]
-            - name: replace
-              args: ["');", ""]
-    test:
-      path: index.php
-
-  search:
-    paths:
-      - path: index.php
-    inputs:
-      search: "{{ .Query.Keywords }}"
-      page: "torrents"
-      category: "{{range .Categories}}{{.}};{{end}}"
-      options: "0"
-      active: "0"
-    rows:
-      selector: table.table.table-bordered > tbody > tr:has(a[href^="index.php?page=torrent-details&id="])
-    fields:
-      download:
-        selector: a[href^="download.php"]
-        attribute: href
-      title:
-        selector: a[title][href^="index.php?page=torrent-details&id="]
-      banner:
-        selector: img[src^="torrentimg/"]
-        attribute: src
-      category:
-        selector: a[href^="index.php?page=torrents&category="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: category
-      details:
-        selector: a[title][href^="index.php?page=torrent-details&id="]
-        attribute: href
-      size:
-        selector: p:has(b:contains("Size:"))
-        remove: b
-      date:
-        selector: p:has(b:contains("Added:"))
-        remove: b
-        filters:
-          - name: replace
-            args: ["@ ", ""]
-          - name: append
-            args: " +01:00"
-          - name: dateparse
-            args: "01/02/2006 15:04:05 -07:00"
-      seeders:
-        selector: b:contains("Seeds:") + a
-      leechers:
-        selector: b:contains("Leechers:") + a
-      grabs:
-        selector: p:has(b:contains("Complete:"))
-        remove: b, a[href^="index.php?page=peers"]
-        filters:
-          - name: replace
-            args: ["---", "0"]
-      downloadvolumefactor:
-        case:
-          i.fa-star: "0"
-          i.fa-star-half-o: "0.5"
-          i.fa-star-o: "0.75"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          span[title="2x Upload Multiplier"]: "2"
-          "*": "1"
-      description:
-        selector: p:has(b:contains("Language:"))
-       
-        

src/Jackett.Common/Definitions/arenabg.yml

@@ -15,7 +15,7 @@
       - {id: "xvid", cat: Movies, desc: "Movies / XviD"}
       - {id: "dvd-r", cat: Movies, desc: "Movies / DVD-R"}
       - {id: "x264", cat: Movies, desc: "Movies / x264"}
-      - {id: "animemanga", cat: Movies, desc: "Movies / Anime & Manga"}
+      - {id: "animemanga", cat: Movies, desc: "Movies / Anime & Manga"}
       - {id: "documentaries", cat: Movies, desc: "Movies / Documentaries"}
       - {id: "blu-ray", cat: Movies, desc: "Movies / Blu-ray"}
       - {id: "boxset", cat: Movies, desc: "Movies / Boxset"}

src/Jackett.Common/Definitions/asgaard.yml

@@ -22,22 +22,18 @@
       - {id: 10, cat: TV, desc: "Kidz Boxset"}
       - {id: 54, cat: Movies/SD, desc: "Movies SD"}
       - {id: 55, cat: Movies/DVD, desc: "Movies DVDR"}
-      - {id: 13, cat: Movies/HD, desc: "Movies 720p"}
-      - {id: 14, cat: Movies/HD, desc: "Movies 1080p"}
-      - {id: 56, cat: Movies/HD, desc: "Movies x265"}
+      - {id: 14, cat: Movies/HD, desc: "Movies HD"}
       - {id: 15, cat: Movies/UHD, desc: "Movies 4K"}
-      - {id: 16, cat: Movies, desc: "Movies Remux"}
-      - {id: 17, cat: Movies/BluRay, desc: "Movies Bluray Disc"}
-      - {id: 53, cat: Movies, desc: "Movies Boxset"}
+      - {id: 17, cat: Movies/BluRay, desc: "Movies BD"}
+      - {id: 73, cat: Movies, desc: "Movies Boxset"}
       - {id: 51, cat: Movies, desc: "Movies No Nordic Subs"}
       - {id: 52, cat: TV/SD, desc: "TV SD"}
       - {id: 58, cat: TV/SD, desc: "TV DVDR"}
-      - {id: 18, cat: TV/HD, desc: "TV 720p"}
-      - {id: 19, cat: TV/HD, desc: "TV 1080p"}
-      - {id: 60, cat: TV/HD, desc: "TV Bluray Disc"}
+      - {id: 18, cat: TV/HD, desc: "TV HD"}
+      - {id: 19, cat: TV/UHD, desc: "TV 4K"}
+      - {id: 60, cat: TV/HD, desc: "TV BD"}
       - {id: 20, cat: TV, desc: "TV Boxset"}
       - {id: 50, cat: TV, desc: "TV No Nordic Subs"}
-      - {id: 59, cat: TV/UHD, desc: "TV 4K"}
       - {id: 49, cat: Audio/Video, desc: "Music Video"}
       - {id: 23, cat: Audio/MP3, desc: "Music MP3"}
       - {id: 61, cat: Audio/MP3, desc: "Music MP3 Boxset"}
@@ -143,24 +139,22 @@
       download:
         selector: a[href*="download.php?torrent="]
         attribute: href
-      files:
-        selector: td:nth-child(5)
       date:
-        selector: td:nth-child(7)
+        selector: td:nth-child(2) > div > div:last-of-type
         filters:
           - name: dateparse
             args: "2 Jan 2006 15:04:05"
+      files:
+      # remember #5754 advanced users have additional last TD so dont go using nth-last-child ;-)
+        selector: td:nth-child(5)
       size:
-        selector: td:nth-child(8)
+        selector: td:nth-child(7)
       grabs:
-        selector: td:nth-child(9)
-        filters:
-          - name: regexp
-            args: (\d+)
+        selector: td:nth-child(8)
       seeders:
-        selector: td:nth-child(11)
+        selector: td:nth-child(9)
       leechers:
-        selector: td:nth-child(12)
+        selector: td:nth-child(10)
       downloadvolumefactor:
         case:
           img[src="./images/gold.png"]: "0"

src/Jackett.Common/Definitions/asiancinema.yml

@@ -25,15 +25,17 @@
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
-      remember: 1
+      remember: on
     error:
-      - selector: div.has-error
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
     test:
-      path: torrents
+      path: /
       selector: a[href$="/logout"]
 
   ratio:
-    path: torrents
+    path: /
     selector: li:has(i.fa-sync-alt)
     filters:
       - name: regexp
@@ -54,8 +56,8 @@
       tvdb: ""
       tmdb: ""
       mal: ""
-      sort: "created_at"
-      direction: "desc"
+      sort: created_at
+      direction: desc
       qty: 100
     rows:
       selector: table > tbody > tr
@@ -81,17 +83,20 @@
         filters:
           - name: replace
             args: ["https://via.placeholder.com/600x900", ""]
+      comments:
+        selector: a[href*="#comments"]
+        attribute: href
       size:
-        selector: td:nth-child(5)
+        selector: td:nth-last-child(4)
       seeders:
-        selector: td:nth-child(6)
+        selector: td:nth-last-child(3)
       leechers:
-        selector: td:nth-child(7)
+        selector: td:nth-last-child(2)
       grabs:
-        selector: td:nth-child(8)
+        selector: td:nth-last-child(1)
         filters:
           - name: regexp
-            args: ([\d\.]+)
+            args: (\d+)
       imdb:
         optional: true
         selector: a[href*="www.imdb.com/title/tt"]
@@ -124,17 +129,18 @@
             args: [" (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
       downloadvolumefactor:
         case:
-          "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"
+          i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
+          i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
+          i[class*="fa-star text-bold"]: 0 # Freeleech From Token
+          i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
+          i[class*="fa-globe text-blue"]: 0 # Global Freeleech
+          i[class*="fa-star text-gold"]: 0 # Freeleech
+          i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
+          "*": 1
       uploadvolumefactor:
         case:
-          "i[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
+          i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
+          i[class*="fa-globe text-green"]: 2 # Global Double Upload
+          i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
+          "*": 1
+# UNIT3D 1.9.3

src/Jackett.Common/Definitions/avg.yml

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

@@ -3,7 +3,7 @@
   name: BaibaKo
   description: "BaibaKo is a RUSSIAN Semi-Private Torrent Tracker for TV"
   language: ru-ru
-  type: private
+  type: semi-private
   encoding: windows-1251
   links:
     - http://baibako.tv/
@@ -77,7 +77,7 @@
           - name: replace
             args: ["HDR1080p", "HD 1080p"]
           - name: re_replace
-            args: ["(\\([А-Яа-я\\W]+\\))|(^[А-Яа-я\\W\\d]+\\/ )|([а-яА-Я \\-]+,+)|([а-яА-Я]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
+            args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
           - name: append
             args: " - rus"
       details:

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

@@ -21,10 +21,14 @@
   login:
     path: login
     method: form
+    captcha:
+      type: text
+      selector: div[style*="#999999;"]
+      input: key
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
-      remember: 1
+      remember: on
     error:
       - selector: div.has-error
     test:
@@ -45,6 +49,7 @@
       qty: 100
     rows:
       selector: table > tbody > tr
+      after: 1
     fields:
       _category:
         selector: a[href*="/categories/"]
@@ -69,7 +74,7 @@
         attribute: src
         filters:
           - name: replace
-            args: ["https://via.placeholder.com/600x900", ""]
+            args: ["/img/person.png", ""]
       date:
         selector: td:not(a[href$="/history"]) span.text-orange
         filters:

src/Jackett.Common/Definitions/bigfangroup.yml

@@ -0,0 +1,185 @@
+---
+  site: bigfangroup
+  name: BigFANGroup
+  description: "BigFANGroup is a RUSSIAN Public Torrent Tracker for MOVIES / TV"
+  language: ru-ru
+  type: public
+  encoding: windows-1251
+  links:
+    - https://bigfangroup.org/
+    - https://www.freebfg.org/
+
+  caps:
+    categorymappings:
+      # Movies
+      - {id: 13, cat: Movies, desc: "Боевик"}
+      - {id: 18, cat: Movies, desc: "Катастрофа"}
+      - {id: 19, cat: Movies, desc: "Мелодрама"}
+      - {id: 21, cat: Movies, desc: "Драма"}
+      - {id: 22, cat: Movies, desc: "Триллер"}
+      - {id: 23, cat: Movies, desc: "Фантастика"}
+      - {id: 24, cat: Movies, desc: "Комедия"}
+      - {id: 26, cat: Movies, desc: "Ужасы"}
+      - {id: 27, cat: Movies, desc: "Приключения"}
+      - {id: 28, cat: Movies, desc: "Исторический"}
+      - {id: 29, cat: Movies/Foreign, desc: "Наше кино"}
+      - {id: 30, cat: Movies, desc: "Фэнтази"}
+      - {id: 31, cat: Movies, desc: "Мистика"}
+      - {id: 33, cat: Movies, desc: "Военный"}
+      - {id: 36, cat: Movies, desc: "Криминал"}
+      - {id: 39, cat: Movies, desc: "Детектив"}
+      - {id: 47, cat: Movies, desc: "Сказки"}
+      - {id: 48, cat: Movies, desc: "Вестерн"}
+      - {id: 52, cat: Movies, desc: "Биография"}
+      - {id: 53, cat: Movies, desc: "Классика"}
+      - {id: 14, cat: Movies/HD, desc: "HDTV"}
+      - {id: 15, cat: Movies/DVD, desc: "DVD"}
+      - {id: 51, cat: Movies/3D, desc: "3D"}
+      - {id: 20, cat: Movies, desc: "Мультфильм"}
+      # Audio
+      - {id: 35, cat: Audio/Audiobook, desc: "Аудио-книги"}
+      - {id: 43, cat: Audio/Foreign, desc: "Русская музыка"}
+      - {id: 44, cat: Audio, desc: "Зарубежная музыка"}
+      - {id: 45, cat: Audio/Video, desc: "Видеоклипы"}
+      - {id: 46, cat: Audio, desc: "Муз. сборники"}
+      - {id: 54, cat: Audio, desc: "Классическая музыка"}
+      - {id: 55, cat: Audio, desc: "Саундтрек"}
+      # TV
+      - {id: 11, cat: TV, desc: "Сериалы"}
+      - {id: 25, cat: TV, desc: "ТВ-шоу"}
+      - {id: 37, cat: TV/Sport, desc: "Спорт"}
+      - {id: 50, cat: TV, desc: "Новости"}
+      - {id: 49, cat: TV, desc: "Научно-популярное"}
+      - {id: 32, cat: TV/Documentary, desc: "Документальный"}
+      - {id: 12, cat: TV, desc: "Анимация"}
+      # PC
+      - {id: 1, cat: PC, desc: "Софт"}
+      - {id: 5, cat: PC/Games, desc: "Игры"}
+      # Other
+      - {id: 38, cat: Books, desc: "Книги и журналы"}
+      - {id: 42, cat: XXX, desc: "Эротика"}
+      - {id: 9, cat: Other, desc: "Разное"}
+
+    modes:
+      search: [q]
+# seems that site does not support season/episode searching      
+#      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings:
+    - name: striprussian
+      type: checkbox
+      label: Strip Russian Letters
+      default: false
+
+  search:
+    # https://bigfangroup.org/browse.php?search=black+lightning&cat=0&incldead=0&year=0&format=0
+    # 
+    paths:
+      - path: browse.php
+# cant get season/episode search working on this site
+#    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 category filters not supported
+#      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      cat: 0
+      # 0 active 1 incldead 2 onlydead 3 gold 4 noseed 5 silver 7 BFG
+      incldead: 1
+      year: 0
+      format: 0
+
+    rows:
+      selector: table > tbody#highlighted > tr:has(a[href^="browse.php?cat="])
+
+    fields:
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        selector: a[href^="details.php?id="]
+        filters:
+          # normalize to SXXEYY format
+          - name: re_replace
+            args: ["[\\.\\,\\:\\-\\/\\|]", " "]
+          - name: re_replace
+            args: ["(.*)[CСcс]езон\\s+(\\d+).+[CСcс]ери[ия]\\s+(\\d+)\\s+(\\d+)\\s+из\\s+\\d+(.*)", "$1 S$2E$3-$4 rus $5"]
+          - name: re_replace
+            args: ["(.*)[CСcс]езон\\s+(\\d+).+[CСcс]ери[ия]\\s+(\\d+)\\s+из\\s+\\d+(.*)", "$1 S$2E$3 rus $4"]
+          - name: re_replace
+            args: ["(.*)[CСcс]езон\\s+(\\d+)(.*)", "$1 S$2 rus $3"]
+          - name: re_replace
+            args: ["(.*)[CСcс]]ери[ия]\\s+(\\d+)(.*)", "$1 E$2 rus $3"]
+          - name: re_replace
+            args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
+          - name: replace
+            args: ["WEBRip", "WEBDL"]
+          - name: replace
+            args: ["WEB DL", "WEBDL"]
+          - name: replace
+            args: ["WEB DLRip", "WEBDL"]
+          - name: replace
+            args: ["HDTVRip", "HDTV"]
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="details.php?id="]
+        attribute: href
+        filters:
+          - name: replace
+            args: ["details", "download"]
+      size:
+        selector: td:nth-child(6)
+      seeders:
+        selector: td:nth-child(7)
+      leechers:
+        selector: td:nth-child(8)
+      date:
+        selector: img[src="pic/time.png"]
+        attribute: title
+        filters:
+          - name: replace
+            args: [" в ", " "]
+          - name: replace
+            args: ["января", "January"]
+          - name: replace
+            args: ["февраля", "February"]
+          - name: replace
+            args: ["марта ", "March"]
+          - name: replace
+            args: ["апреля", "April"]
+          - name: replace
+            args: ["мая", "May"]
+          - name: replace
+            args: ["июня", "June"]
+          - name: replace
+            args: ["июля", "July"]
+          - name: replace
+            args: ["августа", "August"]
+          - name: replace
+            args: ["сентября", "September"]
+          - name: replace
+            args: ["октября", "October"]
+          - name: replace
+            args: ["ноября", "November"]
+          - name: replace
+            args: ["декабря", "December"]
+          - name: dateparse
+            args: "2 January 2006 15:04:05"
+      downloadvolumefactor:
+        case:
+          img[src="pic/freedownload.gif"]: 0
+          img[src="pic/silverdown.gif"]: 0
+          "*": 1
+      uploadvolumefactor:
+        text: 1

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

@@ -10,46 +10,81 @@
 
   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"}
+      - {id: 1010, cat: Movies/UHD, desc: "Movies 2160p"}
+      - {id: 1020, cat: Movies/HD, desc: "Movies 1080p"}
+      - {id: 1030, cat: Movies/HD, desc: "Movies 720p"}
+      - {id: 1040, cat: Movies/HD, desc: "Movies x264"}
+      - {id: 1050, cat: Movies/HD, desc: "Movies x265"}
+      - {id: 1060, cat: Movies/SD, desc: "Movies XviD"}
+      - {id: 1070, cat: Movies/3D, desc: "Movies 3D"}
+      - {id: 1080, cat: Movies/DVD, desc: "Movies DVD"}
+      - {id: 1090, cat: Movies/BluRay, desc: "Movies BluRay"}
+      - {id: 1100, cat: Movies/DVD, desc: "Movies HD2DVD"}
+      - {id: 1110, cat: Movies/Foreign, desc: "Movies nternational"}
+      - {id: 1120, cat: Movies/HD, desc: "Movies HD Packs"}
+      - {id: 1130, cat: Movies/SD, desc: "Movies SD Packs"}
+      - {id: 2010, cat: TV/UHD, desc: "TV 2160p"}
+      - {id: 2020, cat: TV/HD, desc: "TV 1080p"}
+      - {id: 2030, cat: TV/HD, desc: "TV 720p"}
+      - {id: 2040, cat: TV/HD, desc: "TV x264"}
+      - {id: 2050, cat: TV/HD, desc: "TV x265"}
+      - {id: 2060, cat: TV/SD, desc: "TV XviD"}
+      - {id: 2070, cat: TV/HD, desc: "TV HD Packs"}
+      - {id: 2080, cat: TV/SD, desc: "TV SD Packs"}
+      - {id: 2090, cat: TV/FOREIGN, desc: "TV International"}
+      - {id: 3010, cat: TV/Documentary, desc: "Docu 2160p"}
+      - {id: 3020, cat: TV/Documentary, desc: "Docu 1080p"}
+      - {id: 3030, cat: TV/Documentary, desc: "Docu 720p"}
+      - {id: 3040, cat: TV/Documentary, desc: "Docu x264"}
+      - {id: 3050, cat: TV/Documentary, desc: "Docu x265"}
+      - {id: 3060, cat: TV/Documentary, desc: "Docu XviD"}
+      - {id: 3070, cat: TV/Documentary, desc: "Docu HD Packs"}
+      - {id: 3080, cat: TV/Documentary, desc: "Docu SD Packs"}
+      - {id: 3090, cat: TV/Documentary, desc: "Docu International"}
+      - {id: 4010, cat: TV/Sport, desc: "Sport 2160p"}
+      - {id: 4020, cat: TV/Sport, desc: "Sport 1080p"}
+      - {id: 4030, cat: TV/Sport, desc: "Sport 720p"}
+      - {id: 4040, cat: TV/Sport, desc: "Sport SD Sport"}
+      - {id: 4050, cat: TV/Sport, desc: "Sport HD Packs"}
+      - {id: 4060, cat: TV/Sport, desc: "Sport SD Packs"}
+      - {id: 5010, cat: XXX, desc: "XXX 2160p"}
+      - {id: 5020, cat: XXX, desc: "XXX 1080p"}
+      - {id: 5030, cat: XXX, desc: "XXX 720p"}
+      - {id: 5040, cat: XXX, desc: "XXX x264"}
+      - {id: 5050, cat: XXX, desc: "XXX x265"}
+      - {id: 5060, cat: XXX, desc: "XXX XviD"}
+      - {id: 5070, cat: XXX, desc: "XXX HD Packs"}
+      - {id: 5080, cat: XXX, desc: "XXX SD Packs"}
+      - {id: 6010, cat: PC/Games, desc: "Games Windows"}
+      - {id: 6020, cat: Console, desc: "Games Linux"}
+      - {id: 6030, cat: PC/Mac, desc: "Games MacOS"}
+      - {id: 6040, cat: PC/Phone-Android, desc: "Games Android"}
+      - {id: 6050, cat: Console/Xbox, desc: "Games Xbox"}
+      - {id: 6060, cat: Console/PSP, desc: "Games PlayStation"}
+      - {id: 6070, cat: Console/NDS, desc: "Games Nintendo"}
+      - {id: 6080, cat: Console, desc: "Games Sonstige"}
+      - {id: 7010, cat: PC/0day, desc: "Software Windows"}
+      - {id: 7020, cat: PC, desc: "Software Linux"}
+      - {id: 7030, cat: PC/Mac, desc: "Software MacOS"}
+      - {id: 7040, cat: PC/Phone-Android, desc: "Software Android"}
+      - {id: 8010, cat: Audio/MP3, desc: "Music MP3-Album"}
+      - {id: 8020, cat: Audio/MP3, desc: "Music MP3-Charts"}
+      - {id: 8030, cat: Audio/MP3, desc: "Music MP3-Sampler"}
+      - {id: 8040, cat: Audio/MP3, desc: "Music MP3-Single"}
+      - {id: 8050, cat: Audio/Lossless, desc: "Music FLAC-Album"}
+      - {id: 8060, cat: Audio/Lossless, desc: "Music FLAC-Charts"}
+      - {id: 8070, cat: Audio/Lossless, desc: "Music FLAC-Sampler"}
+      - {id: 8080, cat: Audio/Lossless, desc: "Music FLAC-Single"}
+      - {id: 8090, cat: Audio/Video, desc: "Music Video"}
+      - {id: 9010, cat: Audio/Audiobook, desc: "Books A-Book"}
+      - {id: 9020, cat: Books/Ebook, desc: "Books E-Book"}
+      - {id: 9030, cat: Books, desc: "Books E-Paper"}
+      - {id: 9040, cat: Books, desc: "Books E-Learning"}
+      - {id: 9050, cat: TV, desc: "TV Kids"}
+      - {id: 9060, cat: TV/Anime, desc: "Anime HD"}
+      - {id: 9070, cat: TV/Anime, desc: "Anime SD"}
+      - {id: 9080, cat: TV/Anime, desc: "Anime Pack"}
+      - {id: 9999, cat: Other, desc: "unsort"}
 
     modes:
       search: [q]
@@ -101,8 +136,8 @@
       blah: 0
       # include dead 0=active 1=all 2=dead
       incldead: 1
-      orderby: "added"
-      sort: "desc"
+      orderby: added
+      sort: desc
       showsearch: 0
     rows:
       selector: table.tableinborder[border="0"][cellspacing="0"][cellpadding="0"] tr
@@ -162,11 +197,17 @@
         selector: div.tor-take
         filters:
           - name: regexp
-            args: "(\\d+)"
+            args: (\d+)
       downloadvolumefactor:
         case:
-          img[src="pic/ou_new.png"]: "0"
-          "*": "1"
+          img[src="pic/new_details/25k.png"]: 0.25
+          img[src="pic/new_details/50k.png"]: 0.5
+          img[src="pic/new_details/75k.png"]: 0.75
+          img[src="pic/ou_new.png"]: 0
+          "*": 1
       uploadvolumefactor:
         case:
-          "*": "1"
+          img[src="pic/sc-dark/multi2.jpg"]: 2
+          img[src="pic/sc-dark/multi5.jpg"]: 5
+          img[src="pic/sc-dark/multi10.jpg"]: 10
+          "*": 1

src/Jackett.Common/Definitions/bithorlo.yml

@@ -53,6 +53,7 @@
     modes:
       search: [q]
       tv-search: [q, season, ep]
+      movie-search: [q]
 
   settings:
     - name: cookie
@@ -73,7 +74,7 @@
       - path: browse.php
     inputs:
       $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
+      search: "{{ .Keywords }}"
     rows:
       selector: tr[class^="browse"]
     fields:

src/Jackett.Common/Definitions/bithumen.yml

@@ -91,7 +91,7 @@
         selector: a[href^="details.php?id="]
         attribute: href
       imdb:
-        selector: a[href^="http://anonym.to/?http://www.imdb.com/title/"]
+        selector: a[href*="www.imdb.com/title/tt"]
         attribute: href
       banner:
         selector: a[onmouseover^="bithumen.UI.images.coverShow"]

src/Jackett.Common/Definitions/bitspyder.yml

@@ -21,7 +21,7 @@
       - {id: 63, cat: Books, desc: "College"}
       - {id: 53, cat: Books, desc: "Cooking"}
       - {id: 42, cat: Books, desc: "Documentary"}
-      - {id: 37, cat: Books, desc: "e-Books"}
+      - {id: 37, cat: Books/Ebook, desc: "e-Books"}
       - {id: 65, cat: Books, desc: "Engineering"}
       - {id: 54, cat: Books, desc: "Health-Fitness"}
       - {id: 64, cat: Books, desc: "Kids"}
@@ -29,27 +29,26 @@
       - {id: 49, cat: Books, desc: "Linux CBTs"}
       - {id: 43, cat: Books, desc: "Lynda.com"}
       - {id: 57, cat: Books/Magazines, desc: "Magazines"}
-      - {id: 71, cat: Books, desc: "Magic"}
+      - {id: 71, cat: Books, desc: "Pluralsight"}
       - {id: 60, cat: Books, desc: "Medical"}
       - {id: 44, cat: Books, desc: "Misc Learning"}
       - {id: 51, cat: Books, desc: "Music Learning"}
       - {id: 41, cat: Books, desc: "Others"}
       - {id: 52, cat: Books, desc: "Photography"}
-      - {id: 35, cat: Books, desc: "PPT 'n Docs"}
-      - {id: 38, cat: Books, desc: "Religion"}
+      - {id: 35, cat: Books, desc: "Developer"}
+      - {id: 38, cat: Books, desc: "Udemy"}
       - {id: 68, cat: Books, desc: "Self Growth"}
       - {id: 72, cat: Books, desc: "Templates"}
-      - {id: 58, cat: Books, desc: "Total Training"}
-      - {id: 45, cat: Books, desc: "Trainsignal"}
-      - {id: 59, cat: Books, desc: "VTC"}
+      - {id: 58, cat: Books, desc: "Packt"}
+      - {id: 45, cat: Books, desc: "Ethical hacking"}
+      - {id: 59, cat: Books, desc: "WEB | SocialMedia"}
 
 
     modes:
       search: [q]
-      tv-search: [q, season, ep]
 
   login:
-    path: processid.php
+    path: processf.php
     method: post
     inputs:
       username: "{{ .Config.username }}"
@@ -64,8 +63,11 @@
       - path: browse.php
         method: post
     inputs:
-      search: "{{ .Query.Keywords }}"
-      incldead: "1"
+      search: "{{ .Keywords }}"
+      # 0 active 1 incldead 2 onlydead
+      incldead: 1
+      # 0 title 1 default
+      scope: 1
     rows:
       selector: table > tbody > tr[class]
       filters:

src/Jackett.Common/Definitions/bitturk.yml

@@ -80,7 +80,6 @@
       loginbox_membername: "{{ .Config.username }}"
       loginbox_password: "{{ .Config.password }}"
       loginbox_remember: 1
-      loginbox_remember: "true"
     selectorinputs:
       securitytoken:
         selector: "script:contains(\"stKey: \")"

src/Jackett.Common/Definitions/blutopia.yml

@@ -25,18 +25,25 @@
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
-      remember: 1
+      remember: on
     error:
       - selector: script[nonce]:contains("Error")
         message:
           selector: script[nonce]:contains("Error")
     test:
-      path: torrents
+      path: /
       selector: a[href$="/logout"]
+      
+  ratio:
+    path: /
+    selector: li:has(i.fa-sync-alt)
+    filters:
+      - name: regexp
+        args: "Ratio : (\\d+)"
 
   search:
     paths:
-      - path: filterTorrents
+      - path: torrents/filter
     inputs:
       $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
       search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
@@ -46,6 +53,7 @@
       tvdb: ""
       tmdb: ""
       mal: ""
+      igdb: ""
       sort: created_at
       direction: desc
       qty: 100
@@ -57,7 +65,7 @@
         attribute: href
         filters:
           - name: regexp
-            args: "/categories/.*?\\.(\\d+)"
+            args: "/categories/(\\d+)"
       title:
         selector: a.view-torrent
       download:
@@ -73,6 +81,9 @@
         filters:
           - name: replace
             args: ["https://via.placeholder.com/600x900", ""]
+      comments:
+        selector: a[href*="#comments"]
+        attribute: href
       size:
         selector: td:nth-last-child(4)
       seeders:
@@ -83,7 +94,7 @@
         selector: td:nth-last-child(1)
         filters:
           - name: regexp
-            args: ([\d\.]+)
+            args: (\d+)
       imdb:
         optional: true
         selector: a[href*="www.imdb.com/title/tt"]
@@ -116,17 +127,18 @@
             args: [" (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
       downloadvolumefactor:
         case:
-          "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"
+          i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
+          i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
+          i[class*="fa-star text-bold"]: 0 # Freeleech From Token
+          i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
+          i[class*="fa-globe text-blue"]: 0 # Global Freeleech
+          i[class*="fa-star text-gold"]: 0 # Freeleech
+          i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
+          "*": 1
       uploadvolumefactor:
         case:
-          "i[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
+          i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
+          i[class*="fa-globe text-green"]: 2 # Global Double Upload
+          i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
+          "*": 1
+# UNIT3D 2.2.0

src/Jackett.Common/Definitions/booktracker.yml

@@ -0,0 +1,74 @@
+---
+  site: booktracker
+  name: BookTracker
+  description: "BookTracker is a RUSSIAN Semi-Private Torrent Tracker for EBOOKS"
+  language: ru-ru
+  type: semi-private
+  encoding: UTF-8
+  links:
+    - https://booktracker.org/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Books/Ebook, desc: "Ebooks"}
+
+    modes:
+      search: [q]
+
+  login:
+    path: login.php
+    method: form
+    form: form[action$="/login.php"]
+    inputs:
+      login_username: "{{ .Config.username }}"
+      login_password: "{{ .Config.password }}"
+      redirect: "index.php"
+      autologin: 1
+    selectorinputs:
+      cookie_test:
+        selector: input[name="cookie_test"]
+        attribute: value
+    error:
+      - selector: h4.warnColor1
+    test:
+      path: index.php
+      selector: a[href="./login.php?logout=1"]
+
+  search:
+    paths:
+      - path: tracker.php
+    inputs:
+      nm: "{{ .Keywords }}"
+      o: 1
+      s: 2
+      tm: -1
+      sns: -1
+
+    rows:
+      selector: tr[id^="tor_"]:has(a[href^="./download.php?id="])
+
+    fields:
+      title:
+        selector: a.tLink
+      details:
+        selector: a.tLink
+        attribute: href
+      download:
+        selector: a[href^="./download.php?id="]
+        attribute: href
+      category:
+        text: 1
+      size:
+        selector: td:nth-child(6) > u
+      seeders:
+        selector: td.seedmed > b
+      leechers:
+        selector: td.leechmed > b
+      grabs:
+        selector: td:nth-child(9)
+      date:
+        selector: td:last-child > u
+      downloadvolumefactor:
+        text: "1"
+      uploadvolumefactor:
+        text: "1"

src/Jackett.Common/Definitions/btbit.yml

@@ -1,70 +0,0 @@
----
-  site: btbit
-  name: btbit
-  description: "btbit is a public magnet search engine for MOVIES / GENERAL. This definition is for the English site."
-  language: en-us
-  type: public
-  encoding: UTF-8
-  links:
-    - http://en.btbit.org/
-
-  caps:
-    categories:
-      "Movie": Movies
-      "Package": PC/0day
-      "Other": Other
-      "Software": PC
-      "Mirror": PC/ISO
-      "Music": Audio
-      "Picture": Other/Misc
-      "Document": Books
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
-
-  settings: []
-
-  search:
-    paths:
-    # site returns just 15 results per page, attempt to fetch 100
-      - path: "list/{{if .Keywords}}{{.Keywords}}{{else}}movie{{end}}/1-1-0.html"
-      - path: "list/{{if .Keywords}}{{.Keywords}}{{else}}movie{{end}}/2-1-0.html"
-      - path: "list/{{if .Keywords}}{{.Keywords}}{{else}}movie{{end}}/3-1-0.html"
-      - path: "list/{{if .Keywords}}{{.Keywords}}{{else}}movie{{end}}/4-1-0.html"
-      - path: "list/{{if .Keywords}}{{.Keywords}}{{else}}movie{{end}}/5-1-0.html"
-      - path: "list/{{if .Keywords}}{{.Keywords}}{{else}}movie{{end}}/6-1-0.html"
-      - path: "list/{{if .Keywords}}{{.Keywords}}{{else}}movie{{end}}/7-1-0.html"
-    rows:
-      selector: .rs:has(a[href^="magnet:?xt"])
-    fields:
-      title:
-        selector: .title
-      category:
-        selector: .sbar span[class^="cpill"]
-      details:
-        selector: .title h3 a
-        attribute: href
-      download:
-        selector: .sbar a[href^="magnet:?xt"]
-        attribute: href
-      date:
-        selector: .sbar span:nth-of-type(3) b
-        filters:
-          - name: dateparse 
-            args: "2006-01-02"
-      size:
-        selector: .sbar span:nth-of-type(4) b
-      files:
-        selector: .sbar span:nth-of-type(5) b
-      grabs:
-        selector: .sbar span:nth-of-type(6) b
-      seeders:
-        text: "1"
-      leechers:
-        text: "1"
-      downloadvolumefactor:
-        text: "0"
-      uploadvolumefactor:
-        text: "1"

src/Jackett.Common/Definitions/btdigg.yml

@@ -25,26 +25,11 @@
   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
-    headers:
-      user-agent: ["Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.142 Safari/537.36"]
     rows:
       selector: div.one_result
       filters:
@@ -79,4 +64,4 @@
       downloadvolumefactor:
         text: "0"
       uploadvolumefactor:
-        text: "1"
+        text: "1"

src/Jackett.Common/Definitions/btgigs.yml

@@ -89,7 +89,7 @@
             args: "{{ .Result.description }}"
       imdb:
         optional: true
-        selector: a[href^="http://www.imdb.com/title/tt"]
+        selector: a[href*="www.imdb.com/title/tt"]
       date:
         selector: td:nth-child(5)
         filters:

src/Jackett.Common/Definitions/btkitty.yml

@@ -1,79 +0,0 @@
----
-  site: btkitty
-  name: BTKitty
-  description: "BTKITTY is a Public BitTorrent DHT search engine."
-  language: en-us
-  type: public
-  encoding: UTF-8
-  followredirect: true
-  links:
-    - https://btkittys.co/
-  legacylinks:
-    - https://cnbtkitty.org/
-    - http://cnbtkitty.org/
-    - https://cnbtkitty.com/
-    - http://cnbtkitty.com/
-    - https://cnbtkitty.me/
-    - http://cnbtkitty.me/
-    - http://cnbtkitty.ws/
-    - http://btkitty.pet/
-
-  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: BTKitty 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}}"
-      hidden: "true"
-    rows:
-      selector: dl.list-con
-      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(4) b
-      files:
-        selector: dd span:nth-of-type(5) b
-      date:
-        selector: dd span:nth-of-type(3) b
-        filters:
-          - name: dateparse
-            args: "2006-01-02"
-      grabs:
-        selector: dd span:nth-of-type(7) b
-      seeders:
-        text: "1"
-      leechers:
-        text: "1"
-      downloadvolumefactor:
-        text: "0"
-      uploadvolumefactor:
-        text: "1"

src/Jackett.Common/Definitions/btnext.yml

@@ -95,7 +95,7 @@
       action: "login"
       loginbox_membername: "{{ .Config.username }}"
       loginbox_password: "{{ .Config.password }}"
-      loginbox_remember: "true"
+      loginbox_remember: 1
     selectorinputs:
       securitytoken:
         selector: "script:contains(\"stKey: \")"

src/Jackett.Common/Definitions/cartoonchaos.yml

@@ -88,7 +88,7 @@
         attribute: href
       imdb:
         optional: true
-        selector: a[href*="http://www.imdb.com/title/"]
+        selector: a[href*="www.imdb.com/title/tt"]
         attribute: href
         filters:
           # http://anonym.to?javascript:popdetails('http://www.imdb.com/title/tt0086817');

src/Jackett.Common/Definitions/casstudiotv.yml

@@ -1,9 +1,9 @@
 ---
   site: casstudiotv
   name: CasStudioTV
-  description: "CasStudioTV is a RUSSIAN Private Torrent Tracker for TV"
+  description: "CasStudioTV is a RUSSIAN Semi-Private Torrent Tracker for TV"
   language: ru
-  type: private
+  type: semi-private
   encoding: UTF-8
   links:
     - https://casstudio.tk/

src/Jackett.Common/Definitions/ccfbits.yml

@@ -91,7 +91,7 @@
         attribute: href
       imdb:
         optional: true
-        selector: a[href^="http://www.imdb.com/title/"]
+        selector: a[href*="www.imdb.com/title/tt"]
         attribute: href
       files:
         selector: a[href$="&filelist=1"]

src/Jackett.Common/Definitions/channelx.yml

@@ -26,25 +26,22 @@
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
-      remember: 1
+      remember: on
     error:
       - selector: script[nonce]:contains("Error")
         message:
           selector: script[nonce]:contains("Error")
     test:
-      path: torrents
+      path: /
       selector: a[href$="/logout"]
 
   ratio:
-    path: torrents
+    path: /
     selector: li:has(i.fa-sync-alt)
     filters:
       - name: regexp
         args: "Ratio : (\\d+)"
 
-  download:
-    selector: a[href*="/download/"]
-
   search:
     paths:
       - path: filterTorrents
@@ -57,6 +54,7 @@
       tvdb: ""
       tmdb: ""
       mal: ""
+      igdb: ""
       sort: created_at
       direction: desc
       qty: 100
@@ -72,7 +70,7 @@
       title:
         selector: a.view-torrent
       download:
-        selector: a[href*="/download_check/"]
+        selector: a[href*="/download/"]
         attribute: href
       details:
         selector: a.view-torrent
@@ -84,6 +82,9 @@
         filters:
           - name: replace
             args: ["https://via.placeholder.com/600x900", ""]
+      comments:
+        selector: a[href*="#comments"]
+        attribute: href
       size:
         selector: td:nth-last-child(4)
       seeders:
@@ -94,7 +95,7 @@
         selector: td:nth-last-child(1)
         filters:
           - name: regexp
-            args: ([\d\.]+)
+            args: (\d+)
       imdb:
         optional: true
         selector: a[href*="www.imdb.com/title/tt"]
@@ -127,17 +128,18 @@
             args: [" (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
       downloadvolumefactor:
         case:
-          "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"
+          i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
+          i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
+          i[class*="fa-star text-bold"]: 0 # Freeleech From Token
+          i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
+          i[class*="fa-globe text-blue"]: 0 # Global Freeleech
+          i[class*="fa-star text-gold"]: 0 # Freeleech
+          i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
+          "*": 1
       uploadvolumefactor:
         case:
-          "i[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
+          i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
+          i[class*="fa-globe text-green"]: 2 # Global Double Upload
+          i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
+          "*": 1
+# UNIT3D 1.9.4

src/Jackett.Common/Definitions/concertos.yml

@@ -0,0 +1,100 @@
+---
+  site: concertos
+  name: Concertos
+  description: "Concertos - Private site for Live Concerts with Strict Quality Control"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://concertos.live/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: TV, desc: "Live Concert"}
+      - {id: 2, cat: Audio/Video, desc: "Music Video"}
+      - {id: 4, cat: TV, desc: "Music Documentary"}
+      - {id: 5, cat: Audio/Lossless, desc: "Pure Audio"}
+      - {id: 7, cat: TV, desc: "Opera"}
+      - {id: 8, cat: TV, desc: "Musical"}
+      - {id: 9, cat: Audio, desc: "Podcast"}
+
+
+    modes:
+      search: [q, imdbid]
+      tv-search: [q, imdbid]
+      movie-search: [q, imdbid]
+      music-search: [q, imdbid]
+
+  login:
+    path: login
+    method: form
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      remember: on
+    error:
+      - selector: form[action$="/login"] .text-red
+    test:
+      path: /
+      selector: a[href$="/logout"]
+  ratio:
+    path: /
+    selector: span:has(i.fa-percent)
+    filters:
+      - name: regexp
+        args: "Ratio : (\\d+)"
+
+  search:
+    paths:
+      - path: torrents
+    inputs:
+      $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
+      title: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      imdb: "{{ .Query.IMDBIDShort }}"
+      order_by: created_at
+      direction: desc
+    rows:
+      selector: table > tbody > tr
+    fields:
+      category:
+        selector: a[href*="?category_"]
+        attribute: href
+        filters:
+          - name: regexp
+            args: "category_(\\d+)"
+      title:
+        selector: a[href*="/torrent/"]
+      details:
+        selector: a[href*="/torrent/"]
+        attribute: href
+      download:
+        selector: a[href*="/torrent/"]
+        attribute: href
+        filters:
+          - name: append
+            args: "/download"
+      size:
+        selector: td.torrents__size
+      date:
+        selector: td.torrents__age
+      seeders:
+        selector: td:nth-last-child(3)
+      leechers:
+        selector: td:nth-last-child(2)
+      grabs:
+        selector: td:nth-last-child(1)
+      imdb:
+        optional: true
+        selector: a[href*="www.imdb.com/title/tt"]
+        attribute: href
+      downloadvolumefactor:
+        case:
+          i.fa-star: 0 # Freeleech
+          i.fa-certificate: 0 # Featured
+          "*": 1
+      uploadvolumefactor:
+        case:
+          i.fa-certificate: 2 # Featured
+          i.fa-gem: 2 # Double Upload
+          "*": 1
+# UNIT3D

src/Jackett.Common/Definitions/cpabien.yml

@@ -7,7 +7,7 @@
   encoding: UTF-8
   followredirect: true
   links:
-    - https://www.cpasbien.vg/
+    - https://vww.cpasbien-fr.fr/
   legacylinks:
     - http://www.cpasbiens.cc/
     - http://www.cpabien.cm/
@@ -35,6 +35,8 @@
     - https://www.cpabien.link/
     - https://www.cpasbiens.cz/
     - https://www.cpasbiens.bz/
+    - https://www.cpasbien.vg/
+    - https://www.cpasbien.lol/
 
   caps:
     categorymappings:
@@ -48,11 +50,13 @@
   settings: []
 
   download:
-    selector: div.btn-download a
+    selector: a[href^="magnet:?xt="]
     attribute: href
+
   search:
     paths:
-      - path: "{{if .Keywords}}recherche/{{.Keywords}}{{else}}{{end}}"
+    # https://vww.cpasbien-fr.fr/index.php?do=search&subaction=search&story=dickinson%20s01e10
+      - path: "{{if .Keywords}}index.php?do=search&subaction=search&story={{.Keywords}}{{else}}{{end}}"
     rows:
       selector: div#gauche > table > tbody > tr:has(a)
     fields:
@@ -85,25 +89,6 @@
         attribute: href
       size:
         selector: div.poid
-        filters:
-          - name: re_replace
-            args: [ "\\.(\\d) Ko", "$1X00"]
-          - name: re_replace
-            args: [ " Ko", "000"]
-          - name: re_replace
-            args: [ "\\.(\\d) Mo", "$1X00000"]
-          - name: re_replace
-            args: [ " Mo", "000000"]
-          - name: re_replace
-            args: [ "\\.(\\d) Go", "$1X00000000"]
-          - name: re_replace
-            args: [ " Go", "000000000"]
-          - name: re_replace
-            args: [ "\\.(\\d) To", "$1X00000000000"]
-          - name: re_replace
-            args: [ " To", "000000000000"]
-          - name: replace
-            args: [ "X", "" ]
       date:
         text: "now"
       seeders:

src/Jackett.Common/Definitions/datascene.yml

@@ -93,7 +93,7 @@
           - name: regexp
             args: src=([^\s]+)
       imdb:
-        selector: a[href^="http://www.imdb.com/title/"]
+        selector: a[href*="www.imdb.com/title/tt"]
         optional: true
         attribute: href
       category:

src/Jackett.Common/Definitions/demonoid.yml

@@ -6,6 +6,8 @@
   type: public
   encoding: UTF-8
   links:
+    - https://www.demonoid.is/
+  legacylinks:
     - https://www.dnoid.to/
 
   caps:
@@ -118,66 +120,144 @@
       - {id: 101, cat: PC/Games, desc: "Games Windows"}
       - {id: 102, cat: Console/Xbox, desc: "Games XBox"}
       # Anime
-      - {id: 158, cat: TV/Anime, desc: "Anime 4K / UHD"}
-      - {id: 103, cat: TV/Anime, desc: "Anime DVD Quality"}
-      - {id: 104, cat: TV/Anime, desc: "Anime HD 1080p / 1080i"}
-      - {id: 105, cat: TV/Anime, desc: "Anime HD 720p"}
-      - {id: 106, cat: TV/Anime, desc: "Anime HEVC / x265"}
-      - {id: 107, cat: TV/Anime, desc: "Anime Other Quality"}
-      - {id: 108, cat: TV/Anime, desc: "Anime TV Quality"}
-      - {id: 109, cat: TV/Anime, desc: "Anime VHS Quality"}
-      - {id: 157, cat: TV/Anime, desc: "Anime WEBRip"}
+      - {id: 158, cat: TV/Anime, desc: "Anime Sci-Fi"}
+      - {id: 103, cat: TV/Anime, desc: "Anime Action"}
+      - {id: 104, cat: TV/Anime, desc: "Anime Adventure"}
+      - {id: 105, cat: TV/Anime, desc: "Anime Comedy"}
+      - {id: 106, cat: TV/Anime, desc: "Anime Drama"}
+      - {id: 107, cat: TV/Anime, desc: "Anime Fantasy"}
+      - {id: 108, cat: TV/Anime, desc: "Anime Horror"}
+      - {id: 109, cat: TV/Anime, desc: "Anime Other"}
+      - {id: 157, cat: TV/Anime, desc: "Anime Romance"}
       # Movies
-      - {id: 151, cat: Movies/UHD, desc: "Movies 4K / UHD"}
-      - {id: 110, cat: Movies/BluRay, desc: "Movies Blu-ray"}
-      - {id: 111, cat: Movies/3D, desc: "Movies Blu-ray 3D"}
-      - {id: 152, cat: Movies/BluRay, desc: "Movies Blu-ray Rip"}
-      - {id: 112, cat: Movies, desc: "Movies Cam"}
-      - {id: 113, cat: Movies/DVD, desc: "Movies DVD Full"}
-      - {id: 114, cat: Movies/DVD, desc: "Movies DVD Rip"}
-      - {id: 115, cat: Movies/HD, desc: "Movies HD 1080p / 1080i"}
-      - {id: 116, cat: Movies/HD, desc: "Movies HD 720p"}
-      - {id: 153, cat: Movies/HD, desc: "Movies HDRip"}
-      - {id: 117, cat: Movies/HD, desc: "Movies HEVC / x265"}
-      - {id: 118, cat: Movies/SD, desc: "Movies Other Quality"}
-      - {id: 119, cat: Movies, desc: "Movies Remux"}
-      - {id: 120, cat: Movies/SD, desc: "Movies Screener VHS"}
-      - {id: 121, cat: Movies/SD, desc: "Movies VHS Rip"}
-      - {id: 154, cat: Movies/WEBDL, desc: "Movies WEBRip"}
+      - {id: 151, cat: Movies, desc: "Movies Action"}
+      - {id: 110, cat: Movies, desc: "Movies Adventure"}
+      - {id: 236, cat: Movies, desc: "Movies Animation"}
+      - {id: 111, cat: Movies, desc: "Movies Biography"}
+      - {id: 152, cat: Movies, desc: "Movies Comedy"}
+      - {id: 112, cat: Movies, desc: "Movies Concerts"}
+      - {id: 113, cat: Movies, desc: "Movies Crime"}
+      - {id: 114, cat: Movies, desc: "Movies Documentary"}
+      - {id: 115, cat: Movies, desc: "Movies Drama"}
+      - {id: 116, cat: Movies, desc: "Movies Family"}
+      - {id: 153, cat: Movies, desc: "Movies Fantasy"}
+      - {id: 117, cat: Movies, desc: "Movies Horror"}
+      - {id: 118, cat: Movies, desc: "Movies Musical"}
+      - {id: 119, cat: Movies, desc: "Movies Mystery"}
+      - {id: 120, cat: Movies, desc: "Movies Other"}
+      - {id: 121, cat: Movies, desc: "Movies Romance"}
+      - {id: 154, cat: Movies, desc: "Movies Sci-Fi"}
+      - {id: 159, cat: Movies, desc: "Movies Short-Film"}
+      - {id: 160, cat: Movies, desc: "Movies Sports"}
+      - {id: 161, cat: Movies, desc: "Movies Thriller"}
+      - {id: 162, cat: Movies, desc: "Movies Trailers"}
+      - {id: 163, cat: Movies, desc: "Movies War"}
+      - {id: 164, cat: Movies, desc: "Movies Western"}
       # Music
-      - {id: 122, cat: Audio, desc: "Music AAC"}
-      - {id: 123, cat: Audio/Lossless, desc: "Music Loseless"}
-      - {id: 124, cat: Audio/MP3, desc: "Music MP3/128Kbps"}
-      - {id: 125, cat: Audio/MP3, desc: "Music MP3/192Kbps"}
-      - {id: 126, cat: Audio/MP3, desc: "Music MP3/256Kbps"}
-      - {id: 127, cat: Audio/MP3, desc: "Music MP3/64Kbps"}
-      - {id: 128, cat: Audio/MP3, desc: "Music MP3/Over 256Kbps"}
-      - {id: 129, cat: Audio/MP3, desc: "Music MP3/Surround"}
-      - {id: 130, cat: Audio/MP3, desc: "Music MP3/Variable"}
-      - {id: 131, cat: Audio, desc: "Music MPC"}
-      - {id: 132, cat: Audio, desc: "Music OGG"}
-      - {id: 133, cat: Audio, desc: "Music Other Quality"}
-      - {id: 134, cat: Audio, desc: "Music WMA"}
+      - {id: 122, cat: Audio, desc: "Music Alternative"}
+      - {id: 123, cat: Audio, desc: "Music Bluegrass"}
+      - {id: 124, cat: Audio, desc: "Music Blues"}
+      - {id: 125, cat: Audio, desc: "Music Childrens"}
+      - {id: 126, cat: Audio, desc: "Music Christian"}
+      - {id: 127, cat: Audio, desc: "Music Classical"}
+      - {id: 128, cat: Audio, desc: "Music Comedy"}
+      - {id: 129, cat: Audio, desc: "Music Contemporary African"}
+      - {id: 130, cat: Audio, desc: "Music Country"}
+      - {id: 131, cat: Audio, desc: "Music Dance / Disco"}
+      - {id: 132, cat: Audio, desc: "Music Drum and Bass"}
+      - {id: 133, cat: Audio, desc: "Music Electro / Techno"}
+      - {id: 134, cat: Audio, desc: "Music Folk"}
+      - {id: 165, cat: Audio, desc: "Music Gospel"}
+      - {id: 166, cat: Audio, desc: "Music Grunge"}
+      - {id: 167, cat: Audio, desc: "Music Hip-Hop / Rap"}
+      - {id: 168, cat: Audio, desc: "Music Indie"}
+      - {id: 169, cat: Audio, desc: "Music Industrial"}
+      - {id: 170, cat: Audio, desc: "Music J-Pop"}
+      - {id: 171, cat: Audio, desc: "Music Jazz"}
+      - {id: 172, cat: Audio, desc: "Music Latin American"}
+      - {id: 173, cat: Audio, desc: "Music Melodic"}
+      - {id: 174, cat: Audio, desc: "Music Metal"}
+      - {id: 175, cat: Audio, desc: "Music Other"}
+      - {id: 176, cat: Audio, desc: "Music Pop"}
+      - {id: 177, cat: Audio, desc: "Music Punk"}
+      - {id: 178, cat: Audio, desc: "Music Radio Show"}
+      - {id: 179, cat: Audio, desc: "Music Reggae"}
+      - {id: 180, cat: Audio, desc: "Music Rhythm and blues"}
+      - {id: 181, cat: Audio, desc: "Music Rock"}
+      - {id: 182, cat: Audio, desc: "Music Soul"}
+      - {id: 183, cat: Audio, desc: "Music Soundtrack"}
+      - {id: 184, cat: Audio, desc: "Music Trance"}
+      - {id: 185, cat: Audio, desc: "Music Trip Hop"}
       # Music Videos
-      - {id: 135, cat: Audio/Video, desc: "Music Videos DVD Quality"}
-      - {id: 136, cat: Audio/Video, desc: "Music Videos HEVC / x265"}
-      - {id: 137, cat: Audio/Video, desc: "Music Videos Other Quality"}
-      - {id: 138, cat: Audio/Video, desc: "Music Videos TV Quality"}
-      - {id: 139, cat: Audio/Video, desc: "Music Videos VHS Quality"}
+      - {id: 135, cat: Audio/Video, desc: "Music Videos Alternative"}
+      - {id: 136, cat: Audio/Video, desc: "Music Videos Bluegrass"}
+      - {id: 137, cat: Audio/Video, desc: "Music Videos Blues"}
+      - {id: 138, cat: Audio/Video, desc: "Music Videos Childrens"}
+      - {id: 139, cat: Audio/Video, desc: "Music Videos Christian"}
+      - {id: 186, cat: Audio/Video, desc: "Music Videos Classical"}
+      - {id: 187, cat: Audio/Video, desc: "Music Videos Comedy"}
+      - {id: 188, cat: Audio/Video, desc: "Music Videos Contemporary African"}
+      - {id: 189, cat: Audio/Video, desc: "Music Videos Country"}
+      - {id: 190, cat: Audio/Video, desc: "Music Videos Dance / Disco"}
+      - {id: 191, cat: Audio/Video, desc: "Music Videos Drum and Bass"}
+      - {id: 192, cat: Audio/Video, desc: "Music Videos Electro / Techno"}
+      - {id: 193, cat: Audio/Video, desc: "Music Videos Folk"}
+      - {id: 194, cat: Audio/Video, desc: "Music Videos Gospel"}
+      - {id: 195, cat: Audio/Video, desc: "Music Videos Grunge"}
+      - {id: 196, cat: Audio/Video, desc: "Music Videos Hip-Hop / Rap"}
+      - {id: 197, cat: Audio/Video, desc: "Music Videos Indie"}
+      - {id: 198, cat: Audio/Video, desc: "Music Videos Industrial"}
+      - {id: 199, cat: Audio/Video, desc: "Music Videos J-Pop"}
+      - {id: 200, cat: Audio/Video, desc: "Music Videos Jazz"}
+      - {id: 201, cat: Audio/Video, desc: "Music Videos Latin American"}
+      - {id: 202, cat: Audio/Video, desc: "Music Videos Melodic"}
+      - {id: 203, cat: Audio/Video, desc: "Music Videos Metal"}
+      - {id: 204, cat: Audio/Video, desc: "Music Videos Other"}
+      - {id: 205, cat: Audio/Video, desc: "Music Videos Pop"}
+      - {id: 206, cat: Audio/Video, desc: "Music Videos Punk"}
+      - {id: 207, cat: Audio/Video, desc: "Music Videos Radio Show"}
+      - {id: 208, cat: Audio/Video, desc: "Music Videos Reggae"}
+      - {id: 209, cat: Audio/Video, desc: "Music Videos Rhythm and blues"}
+      - {id: 210, cat: Audio/Video, desc: "Music Videos Rock"}
+      - {id: 211, cat: Audio/Video, desc: "Music Videos Soul"}
+      - {id: 212, cat: Audio/Video, desc: "Music Videos Soundtrack"}
+      - {id: 213, cat: Audio/Video, desc: "Music Videos Trance"}
+      - {id: 214, cat: Audio/Video, desc: "Music Videos Trip Hop"}
       # Pictures
-      - {id: 140, cat: Other, desc: "Pictures Hi-Res"}
-      - {id: 141, cat: Other, desc: "Pictures Low-Res"}
-      - {id: 142, cat: Other, desc: "Pictures Mixed Quality"}
+      - {id: 140, cat: Other, desc: "Pictures Art"}
+      - {id: 141, cat: Other, desc: "Pictures Commercial"}
+      - {id: 142, cat: Other, desc: "Pictures Glamour"}
+      - {id: 215, cat: Other, desc: "Pictures Other"}
+      - {id: 216, cat: Other, desc: "Pictures Photojournalism"}
+      - {id: 217, cat: Other, desc: "Pictures Snapshots"}
+      - {id: 218, cat: Other, desc: "Pictures Sports"}
+      - {id: 219, cat: Other, desc: "Pictures Wildlife"}
       # TV
-      - {id: 155, cat: TV/UHD, desc: "TV 4K / UHD"}
-      - {id: 143, cat: TV/SD, desc: "TV DVD Quality"}
-      - {id: 144, cat: TV/HD, desc: "TV HD 1080p / 1080i"}
-      - {id: 145, cat: TV/HD, desc: "TV HD 720p"}
-      - {id: 146, cat: TV/HD, desc: "TV HEVC / x265"}
-      - {id: 147, cat: TV/SD, desc: "TV Other Quality"}
-      - {id: 148, cat: TV/HD, desc: "TV TV Quality"}
-      - {id: 149, cat: TV/SD, desc: "TV VHS Quality"}
-      - {id: 156, cat: TV/WEB-DL, desc: "TV WEBRip"}
+      - {id: 155, cat: TV, desc: "TV Action"}
+      - {id: 143, cat: TV, desc: "TV Adventure"}
+      - {id: 144, cat: TV, desc: "TV Biography"}
+      - {id: 145, cat: TV, desc: "TV Cartoons"}
+      - {id: 146, cat: TV, desc: "TV Comedy"}
+      - {id: 147, cat: TV, desc: "TV Concerts"}
+      - {id: 148, cat: TV, desc: "TV Crime"}
+      - {id: 149, cat: TV, desc: "TV Documentary"}
+      - {id: 156, cat: TV, desc: "TV Drama"}
+      - {id: 220, cat: TV, desc: "TV Family"}
+      - {id: 221, cat: TV, desc: "TV Fantasy"}
+      - {id: 222, cat: TV, desc: "TV Horror"}
+      - {id: 223, cat: TV, desc: "TV Musical"}
+      - {id: 224, cat: TV, desc: "TV Mystery"}
+      - {id: 225, cat: TV, desc: "TV Other"}
+      - {id: 226, cat: TV, desc: "TV Reality"}
+      - {id: 227, cat: TV, desc: "TV Romance"}
+      - {id: 228, cat: TV, desc: "TV Sci-Fi"}
+      - {id: 229, cat: TV, desc: "TV Short film"}
+      - {id: 230, cat: TV, desc: "TV Sports"}
+      - {id: 231, cat: TV, desc: "TV Talk show"}
+      - {id: 232, cat: TV, desc: "TV Thriller"}
+      - {id: 233, cat: TV, desc: "TV Trailers"}
+      - {id: 234, cat: TV, desc: "TV War"}
+      - {id: 235, cat: TV, desc: "TV Western"}
 
     modes:
       search: [q]
@@ -191,39 +271,50 @@
 
   search:
     paths:
-      # https://www.dnoid.to/files/?c118=1&c115=1&lang=0&incldead=0&search=&sort=id&order=desc
+      # https://www.demonoid.is/files/?c154&language=0&quality=0&seeded=2&query=world&to=on&sort=
+      # https://www.demonoid.is/files/?seeded=2&language=0&quality=0&to=on&query=world
       - path: files/
     inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      lang: 0
-      incldead: 0
-      search: "{{.Keywords}}"
-      sort: id
-      order: desc
+      $raw: "{{range .Categories}}c{{.}}&{{end}}"
+      # 0 seeded 1 unseeded 2 both
+      seeded: 2
+      # 0 all 1 English etc
+      language: 0
+      # 0 all
+      quality: 0
+      # search in titles only
+      to: on
+      query: "{{.Keywords}}"
     rows:
-      selector: table.ttable_headinner tr:has(td[class^="tone_"])
+      selector: table.font_12px tr:has(td[class^="tone_1"])
       after: 1
-      filters:
-        - name: andmatch
+#      filters:
+#        - name: andmatch
+      dateheaders:
+        selector: tr td.added_today:not(:contains("Sponsored links"))
+        filters:
+          - name: replace
+            args: ["Added ", ""]
+          - name: replace
+            args: ["on  ", ""]
     fields:
       title:
         selector: a[href^="/files/details/"]
+        attribute: title
       category:
-        selector:  a[href^="/files/?cat="]
+        selector:  a[href*="&subcategory="]
         attribute: href
         filters:
           - name: querystring
-            args: cat
+            args: subcategory
       details:
         selector: a[href^="/files/details/"]
         attribute: href
       download:
         selector: a[href^="/files/details/"]
         attribute: href
-      date:
-        selector: td:nth-last-child(7)
-        filters:
-          - name: timeago
+      description:
+        selector: td:nth-last-child(9)
       size:
         selector: td:nth-last-child(6)
       grabs:

src/Jackett.Common/Definitions/desireleasers.yml

@@ -14,6 +14,7 @@
       - {id: 2, cat: TV, desc: "TV"}
       - {id: 3, cat: Audio, desc: "Music"}
       - {id: 4, cat: Audio/Video, desc: "Music Videos"}
+      - {id: 5, cat: Console, desc: "Game"}
 
     modes:
       search: [q]
@@ -26,15 +27,17 @@
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
-      remember: 1
+      remember: on
     error:
-      - selector: form[action$="/login"] span strong
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
     test:
-      path: torrents
+      path: /
       selector: a[href$="/logout"]
 
   ratio:
-    path: torrents
+    path: /
     selector: li:has(i.fa-sync-alt)
     filters:
       - name: regexp
@@ -42,7 +45,7 @@
 
   search:
     paths:
-      - path: filterTorrents
+      - path: torrents/filter
     inputs:
       $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
       search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
@@ -52,6 +55,7 @@
       tvdb: ""
       tmdb: ""
       mal: ""
+      igdb: ""
       sort: created_at
       direction: desc
       qty: 100
@@ -63,7 +67,7 @@
         attribute: href
         filters:
           - name: regexp
-            args: "/categories/.*?\\.(\\d+)"
+            args: "/categories/(\\d+)"
       title:
         selector: a.view-torrent
       download:
@@ -76,17 +80,23 @@
         optional: true
         selector: div.torrent-poster img
         attribute: src
+        filters:
+          - name: replace
+            args: ["https://via.placeholder.com/600x900", ""]
+      comments:
+        selector: a[href*="#comments"]
+        attribute: href
       size:
-        selector: td:nth-child(5)
+        selector: td:nth-last-child(4)
       seeders:
-        selector: td:nth-child(6)
+        selector: td:nth-last-child(3)
       leechers:
-        selector: td:nth-child(7)
+        selector: td:nth-last-child(2)
       grabs:
-        selector: td:nth-child(8)
+        selector: td:nth-last-child(1)
         filters:
           - name: regexp
-            args: ([\d\.]+)
+            args: (\d+)
       imdb:
         optional: true
         selector: a[href*="www.imdb.com/title/tt"]
@@ -119,17 +129,18 @@
             args: [" (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
       downloadvolumefactor:
         case:
-          "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"
+          i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
+          i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
+          i[class*="fa-star text-bold"]: 0 # Freeleech From Token
+          i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
+          i[class*="fa-globe text-blue"]: 0 # Global Freeleech
+          i[class*="fa-star text-gold"]: 0 # Freeleech
+          i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
+          "*": 1
       uploadvolumefactor:
         case:
-          "i[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
+          i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
+          i[class*="fa-globe text-green"]: 2 # Global Double Upload
+          i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
+          "*": 1
+# UNIT3D 2.0.0

src/Jackett.Common/Definitions/diablotorrent.yml

@@ -125,7 +125,7 @@
             args: src='(.*?)' 
       imdb:
         optional: true
-        selector: a[href^="http://www.imdb.com/title/"]
+        selector: a[href*="www.imdb.com/title/tt"]
         attribute: href
       description:
         selector: div.torrent_row_magyarcim

src/Jackett.Common/Definitions/dreamteam.yml

@@ -1,231 +0,0 @@
----
-  site: dreamteam
-  name: Dream Team
-  description: "Dream Team is a GREEK Private Torrent Tracker for MOVIES / TV / GENERAL"
-  language: el-gr
-  type: private
-  encoding: UTF-8
-  links:
-    - http://dream-team.ga/
-  legacylinks:
-    - http://dream-team.ml/
-
-  caps:
-    categorymappings:
-#      - {id: 115, cat: , desc: ""}
-      - {id: 115, cat: Movies, desc: "One foreign films external subtitles"}
-      - {id: 130, cat: Movies, desc: "CAM / TS / TC"}
-      - {id: 131, cat: Movies, desc: "DVDSCR / PPVRiP / WebRip / R5"}
-      - {id: 132, cat: Movies, desc: "DVDRrip"}
-      - {id: 133, cat: Movies, desc: "BDRip / BRRip / HDRip"}
-      - {id: 134, cat: Movies, desc: "MicroHD"}
-      - {id: 135, cat: Movies, desc: "HD - WEB-DL"}
-      - {id: 136, cat: Movies, desc: "HD - 480p"}
-      - {id: 137, cat: Movies, desc: "HD - 720p"}
-      - {id: 138, cat: Movies, desc: "HD - 1080p"}
-      - {id: 139, cat: Movies, desc: "9.01 3D HD 720p Half SBS & OU"}
-      - {id: 140, cat: Movies, desc: "9.2 3D HD 1080p Half SBS & OU"}
-      - {id: 141, cat: Movies, desc: "9.3 3D Bluray Disc HD 720p / 1080p"}
-      - {id: 142, cat: Movies, desc: "9.4 3D MicroHD 720p / 1080p"}
-      - {id: 144, cat: Movies, desc: "9.5 packages"}
-      - {id: 145, cat: Movies, desc: "9.6 filmography"}
-      - {id: 143, cat: Movies, desc: "9.7 Tv Movies"}
-      - {id: 116, cat: Movies, desc: "Two foreign films integrated subtitles"}
-      - {id: 146, cat: Movies, desc: "CAM / TS / TC"}
-      - {id: 147, cat: Movies, desc: "DVDSCR / PPVRiP / WebRip / R5"}
-      - {id: 148, cat: Movies, desc: "DVDRrip"}
-      - {id: 149, cat: Movies, desc: "BDRip / BRRip / HDRip"}
-      - {id: 150, cat: Movies, desc: "MicroHD"}
-      - {id: 151, cat: Movies, desc: "HD - WEB-DL"}
-      - {id: 152, cat: Movies, desc: "Tv Movies"}
-      - {id: 153, cat: Movies, desc: "Packages"}
-      - {id: 154, cat: Movies, desc: "filmography"}
-      - {id: 243, cat: Movies, desc: "HD 1080p"}
-      - {id: 244, cat: Movies, desc: "HD 480p"}
-      - {id: 117, cat: Movies, desc: "???????e? ?a???e?"}
-      - {id: 155, cat: Movies, desc: "CAM / TS / TC"}
-      - {id: 156, cat: Movies, desc: "SCR / PPVRiP / Webrip / R5"}
-      - {id: 157, cat: Movies, desc: "DVDRrip 3"}
-      - {id: 158, cat: Movies, desc: "BDRip / BRRip / HDRip"}
-      - {id: 159, cat: Movies, desc: "MicroHD 5"}
-      - {id: 160, cat: Movies, desc: "HD - 480p"}
-      - {id: 161, cat: Movies, desc: "6.1 HD - 720p"}
-      - {id: 162, cat: Movies, desc: "HD 6.2 - 1080"}
-      - {id: 163, cat: Movies, desc: "TV Movies"}
-      - {id: 164, cat: Movies, desc: "?a?eta 8"}
-      - {id: 165, cat: Movies, desc: "F??µ???af?e?"}
-      - {id: 118, cat: TV, desc: "Foreign Television external subtitles"}
-      - {id: 166, cat: TV, desc: "SD"}
-      - {id: 167, cat: TV, desc: "720p"}
-      - {id: 168, cat: TV, desc: "1080p"}
-      - {id: 169, cat: TV, desc: "Sport"}
-      - {id: 170, cat: TV, desc: "documentaries"}
-      - {id: 171, cat: TV, desc: "Packages"}
-      - {id: 119, cat: TV, desc: "foreign Television integrated subtitles"}
-      - {id: 172, cat: TV, desc: "SD"}
-      - {id: 173, cat: TV, desc: "720p"}
-      - {id: 174, cat: TV, desc: "1080p"}
-      - {id: 175, cat: TV, desc: "Sport"}
-      - {id: 176, cat: TV, desc: "documentaries"}
-      - {id: 177, cat: TV, desc: "Tv Rips"}
-      - {id: 178, cat: TV, desc: "Packages"}
-      - {id: 120, cat: TV, desc: "Greek Television"}
-      - {id: 179, cat: TV, desc: "SD"}
-      - {id: 180, cat: TV, desc: "720p"}
-      - {id: 181, cat: TV, desc: "1080p"}
-      - {id: 182, cat: TV, desc: "Sport"}
-      - {id: 183, cat: TV, desc: "five documentaries"}
-      - {id: 184, cat: TV, desc: "six Tv Rips"}
-      - {id: 185, cat: TV, desc: "Packages"}
-      - {id: 122, cat: Audio, desc: "?e?? ???s???"}
-      - {id: 216, cat: Audio, desc: "1. DJs Stuff & Promos"}
-      - {id: 217, cat: Audio, desc: "2. DJs Stuff & Promos (Flac)"}
-      - {id: 218, cat: Audio, desc: "3. Singles"}
-      - {id: 219, cat: Audio, desc: "4. Singles (Flac)"}
-      - {id: 220, cat: Audio, desc: "5. ??s????af?e?"}
-      - {id: 221, cat: Audio, desc: "6. ??s????af?e? (Flac)"}
-      - {id: 222, cat: Audio, desc: "7. ??af??e? S?????e?"}
-      - {id: 223, cat: Audio, desc: "8. ??af??e? S?????e? (Flac)"}
-      - {id: 224, cat: Audio, desc: "9. SoundTracks"}
-      - {id: 225, cat: Audio, desc: "9.1 Varius Artist"}
-      - {id: 226, cat: Audio, desc: "9.2 Compact Disc Club"}
-      - {id: 227, cat: Audio, desc: "9.3 ???s??a Video Clips"}
-      - {id: 123, cat: Audio, desc: "???????? ???s???"}
-      - {id: 228, cat: Audio, desc: "1. DJs Stuff & Promos"}
-      - {id: 229, cat: Audio, desc: "2. DJs Stuff & Promos (Flac)"}
-      - {id: 230, cat: Audio, desc: "3. Singles"}
-      - {id: 231, cat: Audio, desc: "4. Singles (Flac)"}
-      - {id: 232, cat: Audio, desc: "5. ??s????af?e?"}
-      - {id: 233, cat: Audio, desc: "6. ??s????af?e? (Flac)"}
-      - {id: 234, cat: Audio, desc: "7. ??af??e? S?????e?"}
-      - {id: 235, cat: Audio, desc: "8. ??af??e? S?????e? (Flac)"}
-      - {id: 236, cat: Audio, desc: "9. ?a?d??a"}
-      - {id: 237, cat: Audio, desc: "9.1 SoundTracks"}
-      - {id: 238, cat: Audio, desc: "9.2 Varius Artist"}
-      - {id: 239, cat: Audio, desc: "9.3 Compact Disc Club"}
-      - {id: 240, cat: Audio, desc: "9.4 ???s??a Video Clips"}
-      - {id: 121, cat: Movies, desc: "children"}
-      - {id: 186, cat: Movies, desc: "children's films external subtitles"}
-      - {id: 187, cat: Movies, desc: "two children's films integrated subtitles"}
-      - {id: 188, cat: Movies, desc: "three children's films Metaglotismenes"}
-      - {id: 189, cat: Movies, desc: "four cartoon series external subtitles"}
-      - {id: 190, cat: Movies, desc: "five children's series integrated subtitles"}
-      - {id: 191, cat: Movies, desc: "six children's series Metaglotismenes"}
-      - {id: 192, cat: Movies, desc: "Anime external subtitles"}
-      - {id: 193, cat: Movies, desc: "Anime integrated subtitles"}
-      - {id: 194, cat: Movies, desc: "Anime Metaglotismenes"}
-      - {id: 128, cat: Console, desc: "9.1 ?a????d?a"}
-      - {id: 195, cat: Console, desc: "Windows Games"}
-      - {id: 196, cat: Console, desc: "Nintendo DS"}
-      - {id: 197, cat: Console, desc: "Sony PS1"}
-      - {id: 198, cat: Console, desc: "Sony PS2"}
-      - {id: 199, cat: Console, desc: "Sony PS3"}
-      - {id: 200, cat: Console, desc: "Sony PSP"}
-      - {id: 201, cat: Console, desc: "Wii"}
-      - {id: 202, cat: Console, desc: "XboX 360"}
-      - {id: 124, cat: PC, desc: "9.2 Applications"}
-      - {id: 203, cat: PC, desc: "Applications Windows"}
-      - {id: 204, cat: PC, desc: "Applications Mac"}
-      - {id: 205, cat: PC, desc: "Linux Applications"}
-      - {id: 126, cat: Books, desc: "9.3 Electronic Books"}
-      - {id: 206, cat: Books, desc: "Electronic books"}
-      - {id: 207, cat: Books, desc: "Magazines"}
-      - {id: 208, cat: Books, desc: "Comic Books"}
-      - {id: 125, cat: Other, desc: "9.4 Gallery"}
-      - {id: 209, cat: Other, desc: "Gallery"}
-      - {id: 210, cat: Other, desc: "Gallery HD"}
-      - {id: 211, cat: Other, desc: "Photos 3D"}
-      - {id: 212, cat: Other, desc: "Wallpapers"}
-      - {id: 213, cat: Other, desc: "Screensavers"}
-      - {id: 127, cat: PC/Phone-Other, desc: "9.5 Mobile / Miscellaneous"}
-      - {id: 214, cat: PC/Phone-Other, desc: "Mobile"}
-      - {id: 215, cat: PC/Phone-Other, desc: "Miscellaneous"}
-      - {id: 129, cat: Other, desc: "9.6 Blocked DREAM TEAM"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-  
-  login:
-    path: takelogin.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: td:contains("remaining tries")
-    test:
-      path: browse.php
-      selector: a[href*="/logout.php"]
-
-  download:
-    before:
-      path: takethanks.php
-      method: "post"
-      inputs:
-        torrentid: "{{ .DownloadUri.Query.id }}"
-      
-  search:
-    paths:
-      - path: browse.php
-    keywordsfilters:
-      # remove words <= 3 characters and surrounding special characters
-      - name: re_replace
-        args: ["(?:^|\\s)[_\\+\\/\\.\\-\\(\\)]*[\\S]{0,3}[_\\+\\/\\.\\-\\(\\)]*(?:\\s|$)", " "]
-    inputs:
-      do: "search"
-      keywords: "{{ .Keywords }}"
-      search_type: "t_name"
-      category: "0" # multi cat search not supported
-      include_dead_torrents: "yes"
-    rows:
-      selector: table#sortabletable > tbody > tr:has(a[href*="/details.php?id="])
-      filters:
-        - name: andmatch
-          args: 66
-    fields:
-      download:
-        selector: a[href*="/download.php?id="]
-        attribute: href
-      title:
-        selector: a[href*="/details.php?id="]
-      title:
-        optional: true
-        selector: div.tooltip-content > div
-      details:
-        selector: a[href*="/details.php?id="]
-        attribute: href
-      category:
-        selector: a[href*="/browse.php?category="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: category
-      banner:
-        optional: true
-        selector: div.tooltip-content > img
-        attribute: src
-      size:
-        selector: td:nth-child(5)
-      grabs:
-        selector: td:nth-child(6)
-      seeders:
-        selector: td:nth-child(7)
-      leechers:
-        selector: td:nth-child(8)
-      downloadvolumefactor:
-        case:
-          img[alt^="Free Torrent "]: "0"
-          img[alt^="Silver Torrent "]: "0.5"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
-      date:
-        selector: "td:nth-child(2) > div:has(span[style=\"float: right;\"])"
-        remove: span
-        filters:
-          - name: append
-            args: " +00:00"
-          - name: dateparse
-            args: "02-01-2006 15:04 -07:00"

src/Jackett.Common/Definitions/dxdhd.yml

@@ -13,13 +13,15 @@
       - {id: 1, cat: Movies, desc: "Movies"}
       - {id: 2, cat: TV, desc: "TV"}
       - {id: 3, cat: Audio, desc: "Music"}
-      - {id: 4, cat: TV/Anime, desc: "Anime"}
+      - {id: 4, cat: TV/Anime, desc: "Anime-TV"}
       - {id: 5, cat: PC/0day, desc: "Apps"}
-      - {id: 6, cat: Books, desc: "eBooks"}
+      - {id: 6, cat: Books/Ebook, desc: "eBooks"}
       - {id: 7, cat: PC/Games, desc: "Games"}
       - {id: 8, cat: TV/Sport, desc: "Sports"}
       - {id: 9, cat: Other, desc: "Others"}
       - {id: 10, cat: XXX, desc: "XXX"}
+      - {id: 11, cat: Books/Comics, desc: "Comics"}
+      - {id: 12, cat: TV/Anime, desc: "Anime-Movie"}
 
     modes:
       search: [q]
@@ -32,17 +34,17 @@
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
-      remember: 1
+      remember: on
     error:
       - selector: script[nonce]:contains("Error")
         message:
           selector: script[nonce]:contains("Error")
     test:
-      path: torrents
+      path: /
       selector: a[href$="/logout"]
 
   ratio:
-    path: torrents
+    path: /
     selector: li:has(i.fa-sync-alt)
     filters:
       - name: regexp
@@ -60,8 +62,9 @@
       tvdb: ""
       tmdb: ""
       mal: ""
-      sort: "created_at"
-      direction: "desc"
+      igdb: ""
+      sort: created_at
+      direction: desc
       qty: 100
     rows:
       selector: table > tbody > tr
@@ -87,6 +90,9 @@
         filters:
           - name: replace
             args: ["https://via.placeholder.com/600x900", ""]
+      comments:
+        selector: a[href*="#comments"]
+        attribute: href
       size:
         selector: td:nth-last-child(4)
       seeders:
@@ -97,7 +103,7 @@
         selector: td:nth-last-child(1)
         filters:
           - name: regexp
-            args: ([\d\.]+)
+            args: (\d+)
       imdb:
         optional: true
         selector: a[href*="www.imdb.com/title/tt"]
@@ -130,17 +136,18 @@
             args: [" (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
       downloadvolumefactor:
         case:
-          "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"
+          i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
+          i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
+          i[class*="fa-star text-bold"]: 0 # Freeleech From Token
+          i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
+          i[class*="fa-globe text-blue"]: 0 # Global Freeleech
+          i[class*="fa-star text-gold"]: 0 # Freeleech
+          i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
+          "*": 1
       uploadvolumefactor:
         case:
-          "i[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
+          i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
+          i[class*="fa-globe text-green"]: 2 # Global Double Upload
+          i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
+          "*": 1
+# UNIT3D 1.9.4

src/Jackett.Common/Definitions/ebookparadijs.yml

@@ -24,6 +24,10 @@
       - {id: 17, cat: Books/Ebook, desc: "hobby"}
       - {id: 19, cat: Books/Ebook, desc: "medisch"}
       - {id: 21, cat: Books/Ebook, desc: "sport"}
+      - {id: 50, cat: Books/Ebook, desc: "Kookboeken"}
+      - {id: 51, cat: Books/Ebook, desc: "Fantasy"}
+      - {id: 52, cat: Books/Ebook, desc: "Kerst"}
+      - {id: 53, cat: Books/Ebook, desc: "Waargebeurd"}
 
     modes:
       search: [q]
@@ -59,7 +63,7 @@
           - name: querystring
             args: cat
       banner:
-        selector: img[src*="/covers"]
+        selector: img[src*="/covers/"]
         attribute: src
       title:
         selector: a[href^="details.php?id="]
@@ -88,7 +92,7 @@
           - name: regexp
             args: "(\\d{1,})"
       date:
-        selector: td:nth-child(4) table tr:nth-child(2) td:nth-child(3)
+        selector: td:nth-child(4) table tr:nth-child(2) td:last-child
         filters:
           - name: replace
             args: ["januari", "January"]

src/Jackett.Common/Definitions/ebooks-shares.yml

@@ -60,7 +60,7 @@
       - {id: 291, cat: Books/Ebook, desc: "Collections: Fiction"}
       - {id: 292, cat: Books/Ebook, desc: "Collections: Non Fiction"}
       - {id: 220, cat: Books/Comics, desc: "Comics: Archie"}
-      - {id: 222, cat: Books/Comics, desc: "Comics: Books & Mags - Comics"}
+      - {id: 222, cat: Books/Comics, desc: "Comics: Books & Mags - Comics"}
       - {id: 225, cat: Books/Comics, desc: "Comics: ComicStrip Collection"}
       - {id: 228, cat: Books/Comics, desc: "Comics: DC"}
       - {id: 244, cat: Books/Comics, desc: "Comics: Manga"}
@@ -94,12 +94,12 @@
       - {id: 287, cat: Books/Ebook, desc: "Doc/Vid/Tut: Martial Arts/Boxing/Wrestling"}
       - {id: 121, cat: Books/Ebook, desc: "Educational: Arts"}
       - {id: 122, cat: Books/Ebook, desc: "Educational: Astronomy/Cosmology"}
-      - {id: 123, cat: Books/Ebook, desc: "Educational: Biology & Genetics"}
+      - {id: 123, cat: Books/Ebook, desc: "Educational: Biology & Genetics"}
       - {id: 124, cat: Books/Ebook, desc: "Educational: Chemistry"}
       - {id: 125, cat: Books/Ebook, desc: "Educational: Culture/Languages"}
       - {id: 126, cat: Books/Ebook, desc: "Educational: Earth Sciences"}
       - {id: 127, cat: Books/Ebook, desc: "Educational:  Educational"}
-      - {id: 128, cat: Books/Ebook, desc: "Educational: Engineering & Technology "}
+      - {id: 128, cat: Books/Ebook, desc: "Educational: Engineering & Technology "}
       - {id: 129, cat: Books/Ebook, desc: "Educational: Environmental Studies"}
       - {id: 130, cat: Books/Ebook, desc: "Educational: General Science Titles"}
       - {id: 131, cat: Books/Ebook, desc: "Educational: Literature / Writing"}
@@ -120,7 +120,7 @@
       - {id: 302, cat: Books/Ebook, desc: "Fiction: Cozy Mysteries"}
       - {id: 82, cat: Books/Ebook, desc: "Fiction: General Fiction"}
       - {id: 83, cat: Books/Ebook, desc: "Fiction: Horror"}
-      - {id: 84, cat: Books/Ebook, desc: "Fiction: Military & Historic"}
+      - {id: 84, cat: Books/Ebook, desc: "Fiction: Military & Historic"}
       - {id: 86, cat: Books/Ebook, desc: "Fiction: Romance"}
       - {id: 87, cat: Books/Ebook, desc: "Fiction: Sci-Fi/Fantasy"}
       - {id: 88, cat: Books/Ebook, desc: "Fiction: Westerns"}
@@ -130,7 +130,7 @@
       - {id: 140, cat: Books/Ebook, desc: "Hobby/Pastime: Art"}
       - {id: 141, cat: Books/Ebook, desc: "Hobby/Pastime: Boating"}
       - {id: 142, cat: Books/Ebook, desc: "Hobby/Pastime: Crafts/Knitting/Sewing"}
-      - {id: 143, cat: Books/Ebook, desc: "Hobby/Pastime: Food & Drink"}
+      - {id: 143, cat: Books/Ebook, desc: "Hobby/Pastime: Food & Drink"}
       - {id: 144, cat: Books/Ebook, desc: "Hobby/Pastime: Games/RPG/Gaming"}
       - {id: 145, cat: Books/Ebook, desc: "Hobby/Pastime: General Pastimes"}
       - {id: 146, cat: Books/Ebook, desc: "Hobby/Pastime: Graphic Arts and Design"}
@@ -192,26 +192,26 @@
       - {id: 89, cat: Books/Ebook, desc: "Non Fict/Ref: Agricultural"}
       - {id: 90, cat: Books/Ebook, desc: "Non Fict/Ref: Alt. Therapies"}
       - {id: 95, cat: Books/Ebook, desc: "Non Fict/Ref: Architecture"}
-      - {id: 91, cat: Books/Ebook, desc: "Non Fict/Ref: Auto & Repair"}
+      - {id: 91, cat: Books/Ebook, desc: "Non Fict/Ref: Auto & Repair"}
       - {id: 92, cat: Books/Ebook, desc: "Non Fict/Ref: Aviation"}
       - {id: 94, cat: Books/Ebook, desc: "Non Fict/Ref: Biographies and Memoirs"}
       - {id: 96, cat: Books/Ebook, desc: "Non Fict/Ref: Business/Finance"}
       - {id: 97, cat: Books/Ebook, desc: "Non Fict/Ref: Comedy/Humorous"}
       - {id: 98, cat: Books/Ebook, desc: "Non Fict/Ref: Crime"}
       - {id: 99, cat: Books/Ebook, desc: "Non Fict/Ref: Criminology"}
-      - {id: 100, cat: Books/Ebook, desc: "Non Fict/Ref: Economics & Math"}
+      - {id: 100, cat: Books/Ebook, desc: "Non Fict/Ref: Economics & Math"}
       - {id: 102, cat: Books/Ebook, desc: "Non Fict/Ref: Electronics"}
       - {id: 103, cat: Books/Ebook, desc: "Non Fict/Ref: Enc/Dict/Atlas,s"}
       - {id: 104, cat: Books/Ebook, desc: "Non Fict/Ref: Entertainment"}
       - {id: 105, cat: Books/Ebook, desc: "Non Fict/Ref: General Ref"}
-      - {id: 106, cat: Books/Ebook, desc: "Non Fict/Ref: Geo & Archaeology"}
+      - {id: 106, cat: Books/Ebook, desc: "Non Fict/Ref: Geo & Archaeology"}
       - {id: 107, cat: Books/Ebook, desc: "Non Fict/Ref: Journ/Current Affairs "}
       - {id: 108, cat: Books/Ebook, desc: "Non Fict/Ref: Legal"}
       - {id: 109, cat: Books/Ebook, desc: "Non Fict/Ref: Medical/Health"}
       - {id: 110, cat: Books/Ebook, desc: "Non Fict/Ref: Motorcycle"}
       - {id: 111, cat: Books/Ebook, desc: "Non Fict/Ref:  Music"}
       - {id: 112, cat: Books/Ebook, desc: "Non Fict/Ref: Parenting/Family"}
-      - {id: 113, cat: Books/Ebook, desc: "Non Fict/Ref: Philosophy & Belief"}
+      - {id: 113, cat: Books/Ebook, desc: "Non Fict/Ref: Philosophy & Belief"}
       - {id: 114, cat: Books/Ebook, desc: "Non Fict/Ref: Literature / Writing"}
       - {id: 115, cat: Books/Ebook, desc: "Non Fict/Ref: Political Science"}
       - {id: 116, cat: Books/Ebook, desc: "Non Fict/Ref: Project Management"}
@@ -228,7 +228,7 @@
       - {id: 279, cat: Books/Ebook, desc: "Non Fict/Ref: Psychology"}
       - {id: 280, cat: Books/Ebook, desc: "Non Fict/Ref: Education"}
       - {id: 282, cat: Books/Ebook, desc: "Non Fict/Ref: Martial Arts/Boxing/Wrestling"}
-      - {id: 293, cat: Books/Ebook, desc: "Non Fict/Ref: Zoology & Veterinary Science"}
+      - {id: 293, cat: Books/Ebook, desc: "Non Fict/Ref: Zoology & Veterinary Science"}
       - {id: 294, cat: Books/Ebook, desc: "Non Fict/Ref: True Stories"}
       - {id: 300, cat: Books/Ebook, desc: "Non Fict/Ref: Maritime Books (Building,navig"}
       - {id: 200, cat: Books/Ebook, desc: "Teens: Collections"}

src/Jackett.Common/Definitions/elitehd.yml

@@ -1,100 +0,0 @@
----
-  site: elitehd
-  name: EliteHD
-  description: "EliteHD (HDClub) is a RUSSIAN Private Torrent Tracker for HD MOVIES / TV / GENERAL"
-  language: ru-ru
-  type: private
-  encoding: windows-1251
-  links:
-    - https://elitehd.org/
-
-  caps:
-    categorymappings:
-      - {id: 70, cat: Movies, desc: "Animation"}
-      - {id: 71, cat: Movies, desc: "Movie"}
-      - {id: 81, cat: Audio, desc: "HD Audio"}
-      - {id: 78, cat: TV/Documentary, desc: "Documentary"}
-      - {id: 68, cat: Audio/Video, desc: "Music Video"}
-      - {id: 64, cat: TV, desc: "TV Show"}
-      - {id: 62, cat: TV/Sport, desc: "Sport"}
-      - {id: 82, cat: Other, desc: "Demo"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: login.php
-    method: form
-    form: form[action="takelogin.php"]
-    captcha:
-      type: image
-      selector: img#captcha
-      input: imagestring
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: td.embedded > div.error
-    test:
-      path: browse.php
-      selector: td.main_bottom
-      
-  search:
-    paths:
-      - path: browse.php
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
-      dsearch: ""
-      stype: "or"
-      incldead: "1"
-      webdl: "0"
-      3d: "0"
-    rows:
-      selector: tbody#highlighted > tr
-    fields:
-      download:
-        selector: a[href^="details.php?id="]
-        attribute: href
-        filters:
-          - name: replace
-            args: ["details.php", "download.php"]
-      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
-      date:
-        selector: div#frame > div#cleft > font
-        filters:
-          - name: append
-            args: " +02:00"
-          - name: dateparse
-            args: "2006-01-02 15:04:05 -07:00"
-      seeders:
-        selector: td:nth-child(5)
-      leechers:
-        selector: td:nth-child(6)
-      grabs:
-        selector: td:nth-child(7) b
-        filters:
-          - name: regexp
-            args: ([\d,]+)
-      size:
-        selector: td:nth-child(7)
-        remove: a, br, b
-      downloadvolumefactor:
-        case:
-          img[src="pic/freedownload.gif"]: "0"
-          img[src="pic/silver.gif"]: "0.5"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"

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

@@ -6,10 +6,12 @@
   type: public
   encoding: UTF-8
   links:
-    - https://www.elitetorrent.one/
+    - https://www.elitetorrent.nu/
   legacylinks:
     - https://www.elitetorrent.biz/
     - https://www.elitetorrent.io/
+    - https://www.elitetorrent.one/
+    - https://www.elitetorrent.is/
 
   caps:
     categories:
@@ -49,8 +51,13 @@
     fields:
       title:
         selector: .meta a
+        attribute: href
         # normalize to SXXEYY format
         filters:
+          - name: re_replace
+            args: [".*/([^/]*)/$", "$1"]
+          - name: replace
+            args: ["-", " "]
           - name: re_replace
             args: ["(\\d{2})×(\\d{2})", "S$1E$2"]
           - name: re_replace

src/Jackett.Common/Definitions/empornium.yml

@@ -95,7 +95,7 @@
       selector: table#torrent_table > tbody > tr[class^="torrent row"]
     fields:
       download:
-        selector: a[href^="torrents.php?action=download&id="]
+        selector: a[href^="/torrents.php?action=download&id="]
         attribute: href
       description:
         selector: div.tags
@@ -140,6 +140,7 @@
         selector: td:nth-child(9)
       downloadvolumefactor:
         case:
+          span.icon[title*="Freeleech"]: 0
           "img[alt=\"Freeleech\"]": "0"
           "*": "1"
       uploadvolumefactor:

src/Jackett.Common/Definitions/eniahd.yml

@@ -0,0 +1,170 @@
+---
+  site: eniahd
+  name: EniaHD
+  description: "EniaHD is a RUSSIAN Semi-Private Torrent Tracker for MOVIES / TV"
+  language: ru-ru
+  type: semi-private
+  encoding: UTF-8
+  links:
+    - https://eniahd.com/
+
+  caps:
+    categorymappings:
+      # Cinema
+      - {id: 13, cat: Movies/HD, desc: "Зарубежное кино HD"}
+      - {id: 11, cat: Movies, desc: "Зарубежное кино"}
+      - {id: 12, cat: Movies, desc: "Наше кино"}
+      # TV
+      - {id: 2, cat: TV/HD, desc: "Зарубежные сериалы HD"}
+      - {id: 17, cat: TV/HD, desc: "Зарубежные сериалы HD для Apple TV"}
+      - {id: 22, cat: TV, desc: "Зарубежные сериалы HEVC"}
+      - {id: 3, cat: TV, desc: "Зарубежные сериалы"}
+      - {id: 14, cat: TV, desc: "Русские сериалы"}
+      - {id: 10, cat: TV, desc: "Звуковые дорожки"}
+      # Cartoons
+      - {id: 24, cat: TV, desc: "Мультфильмы"}
+      - {id: 25, cat: TV, desc: "Мультсериалы"}
+      # Documentary
+      - {id: 7, cat: TV/Documentary, desc: "Документальные (HD Video)"}
+      - {id: 21, cat: TV/Documentary, desc: "Документальные"}
+      - {id: 28, cat: TV/Documentary, desc: "Развлекательные телепередачи и шоу"}
+      # Miscellaneous
+      - {id: 8, cat: Other, desc: "Разное (раздачи)"}
+
+    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: striprussian
+      type: checkbox
+      label: Strip Russian Letters
+      default: false
+
+  login:
+    path: login.php
+    method: form
+    form: form[action="login.php"]
+    inputs:
+      login_username: "{{ .Config.username }}"
+      login_password: "{{ .Config.password }}"
+      redirect: "/index.php"
+      autologin: 1
+    error:
+      - selector: table.error
+    test:
+      path: index.php
+      selector: a[href="./login.php?logout=1"]
+
+  search:
+    paths:
+      - path: tracker.php
+    keywordsfilters:
+      - name: diacritics
+        args: replace
+      - name: re_replace # S01 to сезон 1
+        args: ["(?i)\\bS0*(\\d+)\\b", "сезон $1"]
+      - name: re_replace # S01E01 to сезон 1 серии 1
+        args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "сезон $1 серии $2"]
+    inputs:
+      $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{else}}f[]=-1{{end}}"
+      prev_allw: 0
+      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
+      # title search
+      nm: "{{ .Keywords }}"
+      # find a username
+      pn: ""
+      # search by partial word
+      allw: 0
+
+    rows:
+      selector: tr[id^="tor_"]:has(a[href^="./dl.php?id="])
+
+    fields:
+      title:
+        selector: a.tLink
+        filters:
+          # normalize to SXXEYY format
+          - name: re_replace
+            args: ["[\\:\\-\\/\\|]", " "]
+          - name: re_replace
+            args: ["(.*)[CСcс]езон\\s+(\\d+).+[CСcс]ери[ия]\\s+(\\d+)\\s+(\\d+)\\s+из\\s+\\d+(.*)", "$1 S$2E$3-$4 rus $5"]
+          - name: re_replace
+            args: ["(.*)[CСcс]езон\\s+(\\d+).+[CСcс]ери[ия]\\s+(\\d+)\\s+из\\s+\\d+(.*)", "$1 S$2E$3 rus $4"]
+          - name: re_replace
+            args: ["(.*)[CСcс]езон\\s+(\\d+)(.*)", "$1 S$2 rus $3"]
+          - name: re_replace
+            args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
+          - name: replace
+            args: ["WEB DL", "WEBDL"]
+          - name: replace
+            args: ["WEBDLRip", "WEBDL"]
+          - name: replace
+            args: ["HDTVRip", "HDTV"]
+      details:
+        selector: a.tLink
+        attribute: href
+      download:
+        selector: a[href^="./dl.php?id="]
+        attribute: href
+      magnet:
+        optional: true
+        selector: a[href^="magnet:?xt="]      
+        attribute: href
+      category:
+        selector: a.gen
+        attribute: href
+        filters:
+          - name: querystring
+            args: f
+      size:
+        selector: td:nth-child(6) > u
+      seeders:
+        selector: td.seedmed > b
+      leechers:
+        selector: td.leechmed > b
+      grabs:
+        selector: td:nth-child(9)
+      date:
+        selector: td:last-child > u
+      downloadvolumefactor:
+        text: "1"
+      uploadvolumefactor:
+        text: "1"

src/Jackett.Common/Definitions/esharenet.yml

@@ -51,17 +51,17 @@
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
-      remember: 1
+      remember: on
     error:
       - selector: script[nonce]:contains("Error")
         message:
           selector: script[nonce]:contains("Error")
     test:
-      path: torrents
+      path: /
       selector: a[href$="/logout"]
 
   ratio:
-    path: torrents
+    path: /
     selector: li:has(i.fa-sync-alt)
     filters:
       - name: regexp
@@ -79,8 +79,9 @@
       tvdb: ""
       tmdb: ""
       mal: ""
-      sort: "created_at"
-      direction: "desc"
+      igdb: ""
+      sort: created_at
+      direction: desc
       qty: 100
     rows:
       selector: table > tbody > tr
@@ -106,6 +107,9 @@
         filters:
           - name: replace
             args: ["https://via.placeholder.com/600x900", ""]
+      comments:
+        selector: a[href*="#comments"]
+        attribute: href
       size:
         selector: td:nth-last-child(4)
       seeders:
@@ -116,7 +120,7 @@
         selector: td:nth-last-child(1)
         filters:
           - name: regexp
-            args: ([\d\.]+)
+            args: (\d+)
       imdb:
         optional: true
         selector: a[href*="www.imdb.com/title/tt"]
@@ -149,17 +153,18 @@
             args: [" (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
       downloadvolumefactor:
         case:
-          "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"
+          i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
+          i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
+          i[class*="fa-star text-bold"]: 0 # Freeleech From Token
+          i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
+          i[class*="fa-globe text-blue"]: 0 # Global Freeleech
+          i[class*="fa-star text-gold"]: 0 # Freeleech
+          i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
+          "*": 1
       uploadvolumefactor:
         case:
-          "i[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.3
+          i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
+          i[class*="fa-globe text-green"]: 2 # Global Double Upload
+          i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
+          "*": 1
+# UNIT3D 1.9.4

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

@@ -957,11 +957,9 @@
       download:
         selector: td a[href^="magnet:?xt="]
         attribute: href
-        # temp fix for #5372
-        filters: 
-          - name: urldecode
-          - name: replace
-            args: [" ⭐", ""]
+        filters:
+          - name: replace # temp fix for #5372
+            args: ["%E2%AD%90", ""]
       date:
         selector: td:nth-last-of-type(5)
         filters:

src/Jackett.Common/Definitions/exttorrents.yml

@@ -0,0 +1,62 @@
+---
+  site: exttorrents
+  name: EXT Torrents
+  description: "EXT Torrents is a Public torrent site for MOVIES / TV / GENERAL"
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    - https://ext.to/
+
+  caps:
+    categories:
+      "/anime/": TV/Anime
+      "/applications/": PC
+      "/books/": Books
+      "/games/": PC/Games
+      "/movies/": Movies
+      "/music/": Audio
+      "/other/": Other
+      "/tv/": TV
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings: []
+
+  download:
+    selector: a[href^="magnet:?xt="]
+
+  search:
+    paths:
+      - path: "{{ if .Keywords }}search/?order=age&sort=desc&q={{ .Keywords }}{{ else }}latest/{{ end }}"
+    rows:
+      selector: table.table-striped > tbody > tr
+    fields:
+      category:
+        selector: td:nth-child(1) div div a
+        attribute: href
+      title:
+        selector: td:nth-child(1) div a
+      details:
+        selector: td:nth-child(1) div a
+        attribute: href
+      download:
+        selector: td:nth-child(1) div a
+        attribute: href
+      size:
+        selector: td:nth-child(2)
+      files:
+        selector: td:nth-child(3)
+      date:
+        selector: td:nth-child(4)
+      seeders:
+        selector: td:nth-child(5)
+      leechers:
+        selector: td:nth-child(6)
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"

src/Jackett.Common/Definitions/fanoin.yml

@@ -99,7 +99,7 @@
           - name: replace
             args: ["details.php", "download.php"]
       imdb:
-        selector: a[href^="http://www.imdb.com/title/"]
+        selector: a[href*="www.imdb.com/title/tt"]
         attribute: href
       size:
         selector: td:nth-child(5)

src/Jackett.Common/Definitions/focusx.yml

@@ -2,7 +2,7 @@
   site: focusx
   name: FocusX
   description: "FocusX is a RUSSIAN Public torrent site for MOVIES and TV"
-  language: re-RU
+  language: ru-ru
   type: public
   encoding: UTF-8
   links:

src/Jackett.Common/Definitions/freetorrent.yml

@@ -19,11 +19,10 @@
       - {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"}
       - {id: 14, cat: Audio/Video, desc: "Music clips"}
+      - {id: 15, cat: PC/Phone-Android, desc: "Apps APK"}
 
     modes:
       search: [q]
@@ -36,12 +35,21 @@
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
+      remember: on
     error:
       - selector: script[nonce]:contains("Error")
         message:
           selector: script[nonce]:contains("Error")
     test:
-      path: torrents
+      path: /
+      selector: a[href$="/logout"]
+      
+  ratio:
+    path: /
+    selector: li:has(i.fa-sync-alt)
+    filters:
+      - name: regexp
+        args: "Ratio : (\\d+)"
 
   search:
     paths:
@@ -82,6 +90,9 @@
         filters:
           - name: replace
             args: ["https://via.placeholder.com/600x900", ""]
+      comments:
+        selector: a[href*="#comments"]
+        attribute: href
       size:
         selector: td:nth-last-child(4)
       seeders:
@@ -92,7 +103,7 @@
         selector: td:nth-last-child(1)
         filters:
           - name: regexp
-            args: ([\d\.]+)
+            args: (\d+)
       imdb:
         optional: true
         selector: a[href*="www.imdb.com/title/tt"]
@@ -138,4 +149,4 @@
           "i[data-original-title=\"Global Double Upload\"]": "2" # Global Double Upload
           "i[data-original-title=\"Featured\"]": "2" # Featured Torrent
           "*": "1"
-# UNIT3D 1.9.2
+# UNIT3D 1.9.3

src/Jackett.Common/Definitions/galeriens.yml

@@ -1,12 +1,12 @@
 ---
-  site: lapausetorrents
-  name: Lapausetorrents
-  description: "Lapausetorrents is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
+  site: galeriens
+  name: Galeriens
+  description: "Galeriens is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
   language: fr-fr
   type: private
   encoding: UTF-8
   links:
-    - https://tempsdepause.eu/
+    - https://galeriens.eu/
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/gamestorrents.yml

@@ -0,0 +1,70 @@
+---
+  site: gamestorrents
+  name: GamesTorrents
+  description: "GamesTorrents is a SPANISH Public tracker for GAMES"
+  language: es-es
+  type: public
+  encoding: UTF-8
+  links:
+    - https://www.gamestorrents.tv/
+  legacylinks:
+    - https://www.gamestorrents.com/
+
+  caps:
+    categories:
+      "juegos-pc": PC/Games
+      "juegos-psp": Console/PSP
+      "juegos-ps3": Console/PS3
+      "juegos-ps4": Console/PS4
+      "juegos-ps2": Console/PS Vita
+      "juegos-mac": PC/Mac
+      "juegos-xbox360": Console/Xbox 360
+      "juegos-wii": Console/Wii
+      "juegos-nds": Console/NDS
+
+    modes:
+      search: [q]
+
+  settings: []
+
+  download:
+    selector: a#download_torrent
+
+  search:
+    paths:
+      - path: /
+    inputs:
+      s: "{{ .Keywords }}"
+    rows:
+      selector: table.metalion > tbody > tr
+    fields:
+      title:
+        selector: td:nth-child(1) a
+      details:
+        selector: td:nth-child(1) a
+        attribute: href
+      category:
+        selector: td:nth-child(1) a
+        attribute: href
+        filters:
+          - name: split
+            args: ["/", 3]
+      download:
+        selector: td:nth-child(1) a
+        attribute: href
+      date:
+        selector: td:nth-child(2)
+        filters:
+          - name: dateparse
+            args: "02-01-2006"
+      size:
+        selector: td:nth-child(3)
+        filters:
+          - name: replace
+            args: ["s", ""]
+      description:
+        selector: td:nth-child(4)
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"

src/Jackett.Common/Definitions/gdf76.yml

@@ -1,86 +0,0 @@
----
-  site: gdf76
-  name: gdf76
-  description: "gdf76 is an ITALIAN semi-private site for ITA films in mp4 format optimized for streaming"
-  language: it-it
-  type: semi-private
-  encoding: UTF-8
-  links:
-    - http://gdf76.altervista.org/
-
-  caps:
-    categorymappings:
-      - {id: 11, cat: Movies, desc: "Film 720p"}
-      - {id: 13, cat: TV, desc: "Serie TV"}
-      - {id: 2, cat: Audio, desc: "Music"}
-      - {id: 3, cat: PC/Games, desc: "Games"}
-      - {id: 5, cat: TV/Anime, desc: "Anime"}
-      - {id: 6, cat: Books, desc: "Books"}
-      - {id: 7, cat: PC/0day, desc: "Apps Win"}
-      - {id: 8, cat: PC, desc: "Apps Linux"}
-      - {id: 9, cat: PC/Mac, desc: "Apps Mac"}
-      - {id: 4, cat: Other, desc: "Other"}
-      - {id: 12, cat: XXX, desc: "Adult"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
-
-  login:
-    path: index.php
-    method: form
-    form: form[action="index.php?page=login"]
-    inputs:
-      uid: "{{ .Config.username }}"
-      pwd: "{{ .Config.password }}"
-    error:
-      - selector: tr td span[style="color:#FF0000;"]
-    test:
-      path: index.php
-      selector: a[href="logout.php"]
-
-  search:
-    paths:
-      - path: index.php
-    inputs:
-      page: torrents
-      search: "{{ if .Keywords }}{{ .Keywords }}{{else}}{{end}}"
-      category: 0
-      active: 0
-
-    rows:
-      selector: tr > td > table > tbody tr:has(a[href^="index.php?page=torrent-details"])
-    fields:
-      title:
-        selector: td a[href^="index.php?page=torrent-details"]
-      details:
-        selector: td a[href^="index.php?page=torrent-details"]
-        attribute: href
-      category:
-        selector: td a[href^="index.php?page=torrents&category="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: category
-      download:
-        selector: td a[href^="download.php"]
-        attribute: href
-      size:
-        text: "500 MB"
-      date:
-          # 19/01/2019
-        selector: td:nth-child(4)
-        filters:
-          - name: dateparse
-            args: "02/01/2006"
-      seeders:
-        selector: td:nth-child(5)
-      leechers:
-        selector: td:nth-child(6)
-      grabs:
-        selector: td:nth-child(7)
-      downloadvolumefactor:
-        text: "0"
-      uploadvolumefactor:
-        text: "1"

src/Jackett.Common/Definitions/generationfree.yml

@@ -136,7 +136,7 @@
     error:
     - selector: td.tboxhead
     test:
-      path: torrents-search.php
+      path: index.php
       selector: a[href="account-logout.php"]
 
   download:

src/Jackett.Common/Definitions/gfxnews.yml

@@ -1,322 +0,0 @@
----
-  site: gfxnews
-  name: Gfxnews
-  description: "GFXNews is a Private Torrent Tracker for GRAPHICS SOFTWARE / TUTORIALS / ETC"
-  language: en-us
-  type: private
-  encoding: UTF-8
-  links:
-    - http://forum.gfxnews.org/
-
-  caps:
-    categorymappings:
-      - {id: 1, cat: Other, desc: "3D CONTENT"}
-      - {id: 204, cat: Other, desc: "3D CONTENT/3D Total"}
-      - {id: 106, cat: Other, desc: "3D CONTENT/AmbientLight"}
-      - {id: 215, cat: Other, desc: "3D CONTENT/Archvision"}
-      - {id: 214, cat: Other, desc: "3D CONTENT/Arroway"}
-      - {id: 216, cat: Other, desc: "3D CONTENT/AsileFX"}
-      - {id: 218, cat: Other, desc: "3D CONTENT/Axyz Design"}
-      - {id: 217, cat: Other, desc: "3D CONTENT/Daz3D"}
-      - {id: 136, cat: Other, desc: "3D CONTENT/DoschDesign"}
-      - {id: 213, cat: Other, desc: "3D CONTENT/Evermotion"}
-      - {id: 175, cat: Other, desc: "3D CONTENT/ImageCel"}
-      - {id: 162, cat: Other, desc: "3D CONTENT/Marlin Studios 3D"}
-      - {id: 174, cat: Other, desc: "3D CONTENT/PsicoSonic"}
-      - {id: 2, cat: PC, desc: "APPS"}
-      - {id: 29, cat: PC/ISO, desc: "APPS/ISO"}
-      - {id: 30, cat: PC, desc: "APPS/RIP"}
-      - {id: 201, cat: PC, desc: "APPS/CAD/CAM/CAE"}
-      - {id: 31, cat: PC, desc: "APPS/Adobe Plugins"}
-      - {id: 200, cat: PC, desc: "APPS/Archicad Plugins"}
-      - {id: 198, cat: PC, desc: "APPS/Avid Plugin"}
-      - {id: 38, cat: PC, desc: "APPS/Cinema 4D Plugin"}
-      - {id: 32, cat: PC, desc: "APPS/3DMax Plugins"}
-      - {id: 33, cat: PC, desc: "APPS/LW Plugins"}
-      - {id: 34, cat: PC, desc: "APPS/Maya Plugins"}
-      - {id: 10, cat: Books, desc: "BOOKS"}
-      - {id: 236, cat: Books/Magazines, desc: "BOOKS/Magazines"}
-      - {id: 11, cat: Other, desc: "DEVELOPMENT"}
-      - {id: 228, cat: Other, desc: "FILMMAKING & VIDEO PR."}
-      - {id: 3, cat: Other, desc: "FONTS"}
-      - {id: 4, cat: Other, desc: "FOOTAGE"}
-      - {id: 54, cat: Other, desc: "FOOTAGE/12 INCH Design"}
-      - {id: 40, cat: Other, desc: "FOOTAGE/3D Bank"}
-      - {id: 50, cat: Other, desc: "FOOTAGE/3D Fon"}
-      - {id: 55, cat: Other, desc: "FOOTAGE/5 THINGS"}
-      - {id: 46, cat: Other, desc: "FOOTAGE/Actionback"}
-      - {id: 56, cat: Other, desc: "FOOTAGE/Adobe Image Library Video"}
-      - {id: 57, cat: Other, desc: "FOOTAGE/Alien Box/Tommy Back"}
-      - {id: 58, cat: Other, desc: "FOOTAGE/Animation Factory"}
-      - {id: 41, cat: Other, desc: "FOOTAGE/Artbeats"}
-      - {id: 59, cat: Other, desc: "FOOTAGE/Canopus"}
-      - {id: 87, cat: Other, desc: "FOOTAGE/Capital DV Studio"}
-      - {id: 60, cat: Other, desc: "FOOTAGE/Corbis Video"}
-      - {id: 48, cat: Other, desc: "FOOTAGE/Datacraft Video"}
-      - {id: 61, cat: Other, desc: "FOOTAGE/Digital Brewery"}
-      - {id: 42, cat: Other, desc: "FOOTAGE/Digital Juice Video"}
-      - {id: 44, cat: Other, desc: "FOOTAGE/Digital Hotcakes"}
-      - {id: 62, cat: Other, desc: "FOOTAGE/Digital Preserves"}
-      - {id: 43, cat: Other, desc: "FOOTAGE/Digital Vision Video"}
-      - {id: 51, cat: Other, desc: "FOOTAGE/Dosch Video"}
-      - {id: 63, cat: Other, desc: "FOOTAGE/DV Club"}
-      - {id: 53, cat: Other, desc: "FOOTAGE/Easymotion"}
-      - {id: 49, cat: Other, desc: "FOOTAGE/Eyewire"}
-      - {id: 64, cat: Other, desc: "FOOTAGE/F4 Studio"}
-      - {id: 52, cat: Other, desc: "FOOTAGE/Film Disk"}
-      - {id: 88, cat: Other, desc: "FOOTAGE/FreedomFX"}
-      - {id: 65, cat: Other, desc: "FOOTAGE/Fuzion Films"}
-      - {id: 66, cat: Other, desc: "FOOTAGE/HyperEye"}
-      - {id: 67, cat: Other, desc: "FOOTAGE/Marlin Studios Video"}
-      - {id: 68, cat: Other, desc: "FOOTAGE/Motionloops"}
-      - {id: 69, cat: Other, desc: "FOOTAGE/MovieStock"}
-      - {id: 70, cat: Other, desc: "FOOTAGE/Prismo"}
-      - {id: 71, cat: Other, desc: "FOOTAGE/Pro-Motion"}
-      - {id: 72, cat: Other, desc: "FOOTAGE/ProCimar"}
-      - {id: 47, cat: Other, desc: "FOOTAGE/Rab-Byte"}
-      - {id: 73, cat: Other, desc: "FOOTAGE/Rhino House"}
-      - {id: 74, cat: Other, desc: "FOOTAGE/Rubberball Video"}
-      - {id: 75, cat: Other, desc: "FOOTAGE/Shiny DV"}
-      - {id: 76, cat: Other, desc: "FOOTAGE/ShowStoppers FX"}
-      - {id: 45, cat: Other, desc: "FOOTAGE/STASH"}
-      - {id: 77, cat: Other, desc: "FOOTAGE/Studio BS"}
-      - {id: 78, cat: Other, desc: "FOOTAGE/Taste Media"}
-      - {id: 79, cat: Other, desc: "FOOTAGE/Thinkstock"}
-      - {id: 84, cat: Other, desc: "FOOTAGE/Thought Equity"}
-      - {id: 80, cat: Other, desc: "FOOTAGE/TimeImage"}
-      - {id: 81, cat: Other, desc: "FOOTAGE/Ulead Pick-a-Video"}
-      - {id: 82, cat: Other, desc: "FOOTAGE/Video Copilot"}
-      - {id: 86, cat: Other, desc: "FOOTAGE/vce.com"}
-      - {id: 85, cat: Other, desc: "FOOTAGE/Video3D.RU"}
-      - {id: 83, cat: Other, desc: "FOOTAGE/Wededit.RU"}
-      - {id: 5, cat: PC/Mac, desc: "MAC"}
-      - {id: 36, cat: Other, desc: "LINUX"}
-      - {id: 6, cat: Other, desc: "PHOTOSTOCK"}
-      - {id: 108, cat: Other, desc: "PHOTOSTOCK/Apply Pictures"}
-      - {id: 109, cat: Other, desc: "PHOTOSTOCK/Aridi"}
-      - {id: 110, cat: Other, desc: "PHOTOSTOCK/Art Explosion"}
-      - {id: 111, cat: Other, desc: "PHOTOSTOCK/Artbeats Photo"}
-      - {id: 112, cat: Other, desc: "PHOTOSTOCK/Artville"}
-      - {id: 202, cat: Other, desc: "PHOTOSTOCK/AsiaImageBank"}
-      - {id: 114, cat: Other, desc: "PHOTOSTOCK/BackArts"}
-      - {id: 115, cat: Other, desc: "PHOTOSTOCK/BananaStock"}
-      - {id: 116, cat: Other, desc: "PHOTOSTOCK/Bee-Line"}
-      - {id: 117, cat: Other, desc: "PHOTOSTOCK/Brand X"}
-      - {id: 145, cat: Other, desc: "PHOTOSTOCK/Broderbund"}
-      - {id: 135, cat: Other, desc: "PHOTOSTOCK/Central Stock"}
-      - {id: 119, cat: Other, desc: "PHOTOSTOCK/Circa Art"}
-      - {id: 205, cat: Other, desc: "PHOTOSTOCK/China Stock"}
-      - {id: 120, cat: Other, desc: "PHOTOSTOCK/Classic PIO Partnership"}
-      - {id: 121, cat: Other, desc: "PHOTOSTOCK/Club Scorpius"}
-      - {id: 122, cat: Other, desc: "PHOTOSTOCK/ComStock"}
-      - {id: 123, cat: Other, desc: "PHOTOSTOCK/Corbis RF"}
-      - {id: 124, cat: Other, desc: "PHOTOSTOCK/Corel"}
-      - {id: 125, cat: Other, desc: "PHOTOSTOCK/Creatas"}
-      - {id: 126, cat: Other, desc: "PHOTOSTOCK/DAJ"}
-      - {id: 127, cat: Other, desc: "PHOTOSTOCK/Datacraft Photo"}
-      - {id: 128, cat: Other, desc: "PHOTOSTOCK/Dex Image"}
-      - {id: 129, cat: Other, desc: "PHOTOSTOCK/DiAMAR"}
-      - {id: 130, cat: Other, desc: "PHOTOSTOCK/Digigra"}
-      - {id: 131, cat: Other, desc: "PHOTOSTOCK/Digital Juice Drops"}
-      - {id: 132, cat: Other, desc: "PHOTOSTOCK/Digital Vision"}
-      - {id: 133, cat: Other, desc: "PHOTOSTOCK/DigiTouch"}
-      - {id: 134, cat: Other, desc: "PHOTOSTOCK/Discovery"}
-      - {id: 137, cat: Other, desc: "PHOTOSTOCK/Dover"}
-      - {id: 139, cat: Other, desc: "PHOTOSTOCK/Eyewire Photo"}
-      - {id: 140, cat: Other, desc: "PHOTOSTOCK/Fancy"}
-      - {id: 222, cat: Other, desc: "PHOTOSTOCK/FStop"}
-      - {id: 219, cat: Other, desc: "PHOTOSTOCK/GlowImages"}
-      - {id: 141, cat: Other, desc: "PHOTOSTOCK/GoodShoot"}
-      - {id: 206, cat: Other, desc: "PHOTOSTOCK/GoMedia"}
-      - {id: 143, cat: Other, desc: "PHOTOSTOCK/Hakata"}
-      - {id: 146, cat: Other, desc: "PHOTOSTOCK/Health Head"}
-      - {id: 144, cat: Other, desc: "PHOTOSTOCK/Hemera"}
-      - {id: 147, cat: Other, desc: "PHOTOSTOCK/iDREAM stock"}
-      - {id: 148, cat: Other, desc: "PHOTOSTOCK/Image Kit"}
-      - {id: 149, cat: Other, desc: "PHOTOSTOCK/Image Making"}
-      - {id: 150, cat: Other, desc: "PHOTOSTOCK/Image100"}
-      - {id: 151, cat: Other, desc: "PHOTOSTOCK/ImageDJ"}
-      - {id: 152, cat: Other, desc: "PHOTOSTOCK/ImageFarm"}
-      - {id: 203, cat: Other, desc: "PHOTOSTOCK/ImageIdeas"}
-      - {id: 153, cat: Other, desc: "PHOTOSTOCK/ImageMore"}
-      - {id: 154, cat: Other, desc: "PHOTOSTOCK/Imagesource (Electra Visi.."}
-      - {id: 159, cat: Other, desc: "PHOTOSTOCK/Imagestate (John Foxx)"}
-      - {id: 160, cat: Other, desc: "PHOTOSTOCK/Ingram Publishing"}
-      - {id: 155, cat: Other, desc: "PHOTOSTOCK/iStockPhotos"}
-      - {id: 156, cat: Other, desc: "PHOTOSTOCK/Ivan Ivanich"}
-      - {id: 157, cat: Other, desc: "PHOTOSTOCK/Izosoft"}
-      - {id: 161, cat: Other, desc: "PHOTOSTOCK/Lushpix"}
-      - {id: 163, cat: Other, desc: "PHOTOSTOCK/Medio"}
-      - {id: 164, cat: Other, desc: "PHOTOSTOCK/MH Foto Design"}
-      - {id: 165, cat: Other, desc: "PHOTOSTOCK/Mixa"}
-      - {id: 166, cat: Other, desc: "PHOTOSTOCK/OdinKot"}
-      - {id: 223, cat: Other, desc: "PHOTOSTOCK/Ojoimages"}
-      - {id: 167, cat: Other, desc: "PHOTOSTOCK/Pepin Press"}
-      - {id: 168, cat: Other, desc: "PHOTOSTOCK/PhotoAlto"}
-      - {id: 169, cat: Other, desc: "PHOTOSTOCK/Photodisc"}
-      - {id: 170, cat: Other, desc: "PHOTOSTOCK/PhotoSpin"}
-      - {id: 171, cat: Other, desc: "PHOTOSTOCK/PixLand"}
-      - {id: 172, cat: Other, desc: "PHOTOSTOCK/Pixtal"}
-      - {id: 173, cat: Other, desc: "PHOTOSTOCK/Planet Art"}
-      - {id: 176, cat: Other, desc: "PHOTOSTOCK/Rubberball"}
-      - {id: 177, cat: Other, desc: "PHOTOSTOCK/Shibvisi"}
-      - {id: 225, cat: Other, desc: "PHOTOSTOCK/Shutterstock"}
-      - {id: 179, cat: Other, desc: "PHOTOSTOCK/Spotty"}
-      - {id: 180, cat: Other, desc: "PHOTOSTOCK/StockDisc"}
-      - {id: 181, cat: Other, desc: "PHOTOSTOCK/StockByte"}
-      - {id: 182, cat: Other, desc: "PHOTOSTOCK/Tattoo"}
-      - {id: 183, cat: Other, desc: "PHOTOSTOCK/Think Stock"}
-      - {id: 184, cat: Other, desc: "PHOTOSTOCK/Ulead Pick-a-Photo"}
-      - {id: 185, cat: Other, desc: "PHOTOSTOCK/Visual Language"}
-      - {id: 186, cat: Other, desc: "PHOTOSTOCK/Zedcor DeskGallery"}
-      - {id: 191, cat: Other, desc: "PHOTOSTOCK/ZZVE"}
-      - {id: 8, cat: Other, desc: "TEMPLATES"}
-      - {id: 107, cat: Other, desc: "TEMPLATES/Animation Factory Photo"}
-      - {id: 209, cat: Other, desc: "TEMPLATES/Atmosphere Studio"}
-      - {id: 210, cat: Other, desc: "TEMPLATES/Boxedart"}
-      - {id: 212, cat: Other, desc: "TEMPLATES/DG Foto Art Gallerias"}
-      - {id: 211, cat: Other, desc: "TEMPLATES/DriveArt"}
-      - {id: 207, cat: Other, desc: "TEMPLATES/DreamTemplate"}
-      - {id: 190, cat: Other, desc: "TEMPLATES/Iconbase"}
-      - {id: 178, cat: Other, desc: "TEMPLATES/SPC International"}
-      - {id: 208, cat: Other, desc: "TEMPLATES/TemplateMonster"}
-      - {id: 231, cat: Other, desc: "TEMPLATES/Videohive"}
-      - {id: 9, cat: Books, desc: "TUTORIALS"}
-      - {id: 95, cat: Books, desc: "TUTORIALS/3D Garage"}
-      - {id: 105, cat: Books, desc: "TUTORIALS/3D Trainer"}
-      - {id: 96, cat: Books, desc: "TUTORIALS/AsileFX Tutorial"}
-      - {id: 100, cat: Books, desc: "TUTORIALS/Autodesk / Alias"}
-      - {id: 196, cat: Books, desc: "TUTORIALS/Cartoon Smart"}
-      - {id: 192, cat: Books, desc: "TUTORIALS/CG Academy"}
-      - {id: 234, cat: Books, desc: "TUTORIALS/cmiVFX"}
-      - {id: 195, cat: Books, desc: "TUTORIALS/Desktop Images"}
-      - {id: 102, cat: Books, desc: "TUTORIALS/Digital Art"}
-      - {id: 93, cat: Books, desc: "TUTORIALS/Digital Tutors"}
-      - {id: 194, cat: Books, desc: "TUTORIALS/Digital Media"}
-      - {id: 232, cat: Books, desc: "TUTORIALS/EAT3D"}
-      - {id: 97, cat: Books, desc: "TUTORIALS/FXphd"}
-      - {id: 92, cat: Books, desc: "TUTORIALS/Gnomonology"}
-      - {id: 193, cat: Books, desc: "TUTORIALS/KW Media Group"}
-      - {id: 98, cat: Books, desc: "TUTORIALS/Lost Pencil"}
-      - {id: 94, cat: Books, desc: "TUTORIALS/Luxology"}
-      - {id: 89, cat: Books, desc: "TUTORIALS/Lynda.com"}
-      - {id: 199, cat: Books, desc: "TUTORIALS/MacProVideo.com"}
-      - {id: 99, cat: Books, desc: "TUTORIALS/Simply Maya"}
-      - {id: 189, cat: Books, desc: "TUTORIALS/Softimage"}
-      - {id: 104, cat: Books, desc: "TUTORIALS/Technical Animation"}
-      - {id: 90, cat: Books, desc: "TUTORIALS/The Gnomon Workshop"}
-      - {id: 91, cat: Books, desc: "TUTORIALS/Total Training"}
-      - {id: 103, cat: Books, desc: "TUTORIALS/Turbo Squid"}
-      - {id: 230, cat: Books, desc: "TUTORIALS/TutPlus"}
-      - {id: 235, cat: Books, desc: "TUTORIALS/Video2Brain"}
-      - {id: 101, cat: Books, desc: "TUTORIALS/VTC"}
-      - {id: 233, cat: Books, desc: "TUTORIALS/ZbrushWorkshops"}
-      - {id: 187, cat: Other, desc: "PHOTOGRAPHY"}
-      - {id: 188, cat: Other, desc: "TRADITIONAL ART"}
-
-    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: td.thead
-        message:
-          selector: td.thead b
-    test:
-      path: tracker.php
-      selector: li 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_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_date_from: ""
-      prev_date_to: ""
-      prev_hide_rereg: 0
-      o: 1
-      s: 2
-      df: 1
-      da: 1
-      date_from: ""
-      date_to: ""
-      nm: "{{ .Keywords }}"
-      helper_sortby: "date"
-      pn: ""
-      submit: "Search"
-
-    rows:
-      selector: table > tbody > tr:has(a[href^="download.php?id="])
-      dateheaders:
-        selector: td.menu[colspan="17"] > b
-        filters:
-          - name: dateparse
-            args: "2-Jan-06"
-    fields:
-      title:
-        selector: td a[href^="./viewtopic.php?t="]
-      details:
-        selector: td a[href^="./viewtopic.php?t="]
-        attribute: href
-      download:
-        selector: td a[href^="download.php?id="]
-        attribute: href
-      category:
-        selector: td a[href^="tracker.php?f="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: f
-      size:
-        text: "0 B"
-      size:
-        optional: true
-        selector: td:contains(\00a0GB)
-      size:
-        optional: true
-        selector: td:contains(\00a0MB)
-      size:
-        optional: true
-        selector: td:contains(\00a0kB)
-      size:
-        optional: true
-        selector: td:contains(\00a0B)
-      seeders:
-        text: "0"
-      seeders:
-        optional: true
-        selector: td[title="Seeders"]
-      leechers:
-        text: "0"
-      leechers:
-        optional: true
-        selector: td[title="Leechers"]
-      grabs:
-        text: "0"
-      grabs:
-        optional: true
-        selector: td[title^="Replies:"]
-      downloadvolumefactor:
-        text: "1"
-      uploadvolumefactor:
-        text: "1"

src/Jackett.Common/Definitions/glodls.yml

@@ -0,0 +1,92 @@
+---
+  site: glodls
+  name: GloDLS
+  description: "GloDLS is a Public Torrent Tracker for MOVIES / TV / GENERAL"
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    - https://glodls.to/
+    - https://glodls.rocks/
+
+  caps:
+    categorymappings:
+      - {id: 50, cat: XXX, desc: "XXX"}
+      - {id: 5, cat: PC/Phone-Android, desc: "Android"}
+      - {id: 28, cat: TV/Anime, desc: "Anime"}
+      - {id: 18, cat: PC, desc: "Apps"}
+      - {id: 51, cat: Books/Ebook, desc: "Books"}
+      - {id: 73, cat: XXX, desc: "Desi Porn"}
+      - {id: 75, cat: Audio/Lossless, desc: "FLAC"}
+      - {id: 10, cat: PC/Games, desc: "Games"}
+      - {id: 55, cat: PC/Mac, desc: "Macintosh"}
+      - {id: 52, cat: PC/Phone-Other, desc: "Mobile"}
+      - {id: 1, cat: Movies, desc: "Movies"}
+      - {id: 22, cat: Audio, desc: "Music"}
+      - {id: 33, cat: Other, desc: "Other"}
+      - {id: 72, cat: TV, desc: "Packs"}
+      - {id: 70, cat: Other, desc: "Pictures"}
+      - {id: 76, cat: TV/Sport, desc: "Sports"}
+      - {id: 74, cat: Books, desc: "Tutorials"}
+      - {id: 41, cat: TV, desc: "TV"}
+      - {id: 71, cat: Audio/Video, desc: "Videos"}
+      - {id: 54, cat: PC/0day, desc: "Windows"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings: []
+
+  search:
+    paths:
+    # https://glodls.to/search_results.php?c1=1&c72=1&c41=1&search=blacklist+s07e05&cat=0&incldead=1&inclexternal=0&lang=0&sort=id&order=desc
+      - path: search_results.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      cat: 0
+      # 0 active 1 incldead 2 onlydead
+      incldead: 1
+      # 0 both 1 local 2 external
+      inclexternal: 0
+      # 0 all 1 english etc
+      lang: 0
+      sort: id
+      order: desc
+
+    rows:
+      selector: table.ttable_headinner tr.t-row
+      after: 1
+    fields:
+      category:
+        selector: a[href^="/search.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        selector: td:nth-child(2) a[title]
+        attribute: title
+      details:
+        selector: td:nth-child(2) a[title]
+        attribute: href
+      download:
+        selector: a[href^="/down.php?id="]
+        attribute: href
+      magnet:
+        selector: a[href^="magnet:?xt="]
+        attribute: href
+      size:
+        selector: td:nth-child(5)
+      seeders:
+        selector: td:nth-child(6)
+      leechers:
+        selector: td:nth-child(7)
+      date:
+        text: now
+      downloadvolumefactor:
+        text: 0
+      uploadvolumefactor:
+        text: 1

src/Jackett.Common/Definitions/greeklegends.yaml

@@ -1,20 +1,26 @@
 ---
-  site: rockethd
-  name: RocketHD
-  description: "RocketHD is a GERMAN Private Tracker for MOVIES / TV"
-  language: de-de
+  site: greeklegends
+  name: GreekLegends
+  description: "Greek Legends is a Private Torrent Tracker for High Quality Content"
+  language: en-us
   type: private
   encoding: UTF-8
   links:
-    - http://rocket-hd.me/
-  legacylinks:
-    - https://rocket-hd.me/
+    - https://greeklegends.net/
 
   caps:
     categorymappings:
       - {id: 1, cat: Movies, desc: "Movies"}
       - {id: 2, cat: TV, desc: "TV"}
-      - {id: 3, cat: Movies, desc: "Collection"}
+      - {id: 3, cat: Audio, desc: "Music"}
+      - {id: 4, cat: PC, desc: "Apps"}
+      - {id: 5, cat: Books, desc: "Books"}
+      - {id: 6, cat: Console, desc: "Games"}
+      - {id: 7, cat: TV/Documentary, desc: "Documentaries"}
+      - {id: 8, cat: PC/Phone-Other, desc: "Mobile Apps"}
+      - {id: 9, cat: Other/Misc, desc: "misc"}
+      - {id: 10, cat: TV/Sport, desc: "Sports"}
+      - {id: 11, cat: TV/Anime, desc: "Anime/Cartoon"}
 
     modes:
       search: [q]
@@ -27,17 +33,17 @@
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
-      remember: 1
+      remember: on
     error:
       - selector: script[nonce]:contains("Error")
         message:
           selector: script[nonce]:contains("Error")
     test:
-      path: torrents
+      path: /
       selector: a[href$="/logout"]
 
   ratio:
-    path: torrents
+    path: /
     selector: li:has(i.fa-sync-alt)
     filters:
       - name: regexp
@@ -54,9 +60,8 @@
       imdb: "{{ .Query.IMDBIDShort }}"
       tvdb: ""
       tmdb: ""
-      mal: ""
-      sort: "created_at"
-      direction: "desc"
+      sort: created_at
+      direction: desc
       qty: 100
     rows:
       selector: table > tbody > tr
@@ -82,6 +87,9 @@
         filters:
           - name: replace
             args: ["https://via.placeholder.com/600x900", ""]
+      comments:
+        selector: a[href*="#comments"]
+        attribute: href
       size:
         selector: td:nth-last-child(4)
       seeders:
@@ -92,7 +100,7 @@
         selector: td:nth-last-child(1)
         filters:
           - name: regexp
-            args: ([\d\.]+)
+            args: (\d+)
       imdb:
         optional: true
         selector: a[href*="www.imdb.com/title/tt"]
@@ -125,17 +133,18 @@
             args: [" (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
       downloadvolumefactor:
         case:
-          "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"
+          i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
+          i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
+          i[class*="fa-star text-bold"]: 0 # Freeleech From Token
+          i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
+          i[class*="fa-globe text-blue"]: 0 # Global Freeleech
+          i[class*="fa-star text-gold"]: 0 # Freeleech
+          i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
+          "*": 1
       uploadvolumefactor:
         case:
-          "i[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.3
+          i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
+          i[class*="fa-globe text-green"]: 2 # Global Double Upload
+          i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
+          "*": 1
+# UNIT3D 1.9.4

src/Jackett.Common/Definitions/greekteam.yml

@@ -11,66 +11,56 @@
   caps:
     categorymappings:
       - {id: 59, cat: TV/Anime, desc: "Anime DVD/BR-rip Gr Sub - Emb"}
-      - {id: 27, cat: TV/Anime, desc: "Anime/Cartoon DVD-R"}
-      - {id: 35, cat: TV/Anime, desc: "Anime/Cartoon DVDRip/BR-rip"}
-      - {id: 10, cat: Books, desc: "Books/Magazines"}
+      - {id: 35, cat: TV/Anime, desc: "Anime DVDRip/BR-rip"}
+      - {id: 9, cat: TV/Anime, desc: "Anime HD"}
+      - {id: 63, cat: TV/Anime, desc: "Anime HDTV"}
+      - {id: 57, cat: TV/Anime, desc: "Anime TV"}
+      - {id: 10, cat: Books, desc: "Books Magazines"}
       - {id: 31, cat: Console/Other, desc: "Games Other"}
       - {id: 30, cat: Console/PS4, desc: "Games PSx"}
       - {id: 20, cat: PC/Games, desc: "Games Windows"}
       - {id: 29, cat: Console/Xbox, desc: "Games XBOX"}
-      - {id: 54, cat: TV/Sport, desc: "HDTV Sport"}
-      - {id: 9, cat: Movies/HD, desc: "HiDef Anime/Cartoon"}
-      - {id: 18, cat: Movies/BluRay, desc: "HiDef Bluray-BD25"}
-      - {id: 25, cat: Movies/HD, desc: "HiDef Documentaries"}
-      - {id: 49, cat: TV/HD, desc: "HiDef Greek Tv"}
-      - {id: 52, cat: Movies/HD, desc: "HiDef Movie Packages"}
-      - {id: 19, cat: Movies/HD, desc: "HiDef Movies"}
-      - {id: 36, cat: TV/HD, desc: "HiDef Series  "}
-      - {id: 62, cat: TV/HD, desc: "HiDef Series Packages"}
       - {id: 11, cat: Other, desc: "Misc"}
-      - {id: 47, cat: PC/Phone-Other, desc: "Mobile Stuff"}
-      - {id: 15, cat: Movies/DVD, desc: "Movies - DVD-r"}
-      - {id: 40, cat: Movies/SD, desc: "Movies - DVD-rip x264"}
-      - {id: 60, cat: Movies/SD, desc: "Movies - DVD-rip x264 Packages"}
-      - {id: 39, cat: Movies/SD, desc: "Movies - DVD/BR-rip "}
-      - {id: 41, cat: Movies/Other, desc: "Movies - Others"}
+      - {id: 47, cat: PC/Phone-Other, desc: "Mobile"}
+      - {id: 27, cat: Movies/DVD, desc: "Movies DVD-R"}
       - {id: 53, cat: Movies/3D, desc: "Movies 3D"}
+      - {id: 15, cat: Movies/UHD, desc: "Movies 4K"}
+      - {id: 18, cat: Movies/BluRay, desc: "Movies Bluray"}
+      - {id: 40, cat: Movies/HD, desc: "Movies DVD-rip x264"}
+      - {id: 60, cat: Movies/HD, desc: "Movies DVD-rip x264 Packages"}
+      - {id: 39, cat: Movies/SD, desc: "Movies DVD/BR-rip"}
       - {id: 14, cat: Movies/SD, desc: "Movies DVD/BR-rip Gr Sub - Emb"}
-      - {id: 13, cat: Movies/DVD, desc: "Movies Greek - DVD-r"}
-      - {id: 12, cat: Movies/SD, desc: "Movies Greek - DVD/BRrip"}
-      - {id: 43, cat: Movies/Other, desc: "Movies Greek - Others"}
-      - {id: 61, cat: Movies/SD, desc: "Movies-DVD/BR-rip XviD Package"}
-      - {id: 17, cat: XXX, desc: "Movies/others XXX"}
-      - {id: 48, cat: Audio, desc: "Music-DJs Stuff & Promos"}
-      - {id: 22, cat: Audio, desc: "Music-Foreign"}
-      - {id: 33, cat: Audio/Lossless, desc: "Music-Foreign Flac"}
-      - {id: 2, cat: Audio, desc: "Music-Foreign-All Discographie"}
-      - {id: 28, cat: Audio, desc: "Music-Greek DVD-r/DVDrip"}
-      - {id: 50, cat: Audio/Lossless, desc: "Music-Greek Flac"}
-      - {id: 21, cat: Audio, desc: "Music-Greek-All Discographies"}
-      - {id: 1, cat: Audio, desc: "Music-Greek-Old & Classic"}
-      - {id: 51, cat: Audio, desc: "Music-Greek-Recent(2005-)&New "}
-      - {id: 16, cat: Audio/Video, desc: "Music-Video clips"}
+      - {id: 61, cat: Movies/SD, desc: "Movies DVD/BR-rip XviD Packs"}
+      - {id: 12, cat: Movies/SD, desc: "Movies Greek DVD/BRrip"}
+      - {id: 19, cat: Movies/HD, desc: "Movies HD"}
+      - {id: 52, cat: Movies/HD, desc: "Movies HD Packages"}
+      - {id: 48, cat: Audio, desc: "Music DJ & Promos"}
+      - {id: 22, cat: Audio, desc: "Music Foreign"}
+      - {id: 2, cat: Audio, desc: "Music Foreign Discographies"}
+      - {id: 33, cat: Audio/Lossless, desc: "Music Foreign Flac"}
+      - {id: 1, cat: Audio, desc: "Music Greek"}
+      - {id: 21, cat: Audio, desc: "Music Greek Discographies"}
+      - {id: 50, cat: Audio/Lossless, desc: "Music Greek Flac"}
+      - {id: 16, cat: Audio/Video, desc: "Music Videos"}
       - {id: 46, cat: PC, desc: "Programs Linux"}
       - {id: 45, cat: PC, desc: "Programs MAC"}
-      - {id: 32, cat: PC, desc: "Programs Other"}
       - {id: 23, cat: PC, desc: "Programs Windows"}
-      - {id: 58, cat: PC, desc: "Tutorials"}
-      - {id: 55, cat: TV/SD, desc: "TV-Greek Movies"}
-      - {id: 56, cat: TV/SD, desc: "TV-Movies Gr Sub - Emb"}
-      - {id: 57, cat: TV/SD, desc: "TV-Shows Cartoon/Anime"}
-      - {id: 34, cat: TV/SD, desc: "TV-Shows Foreign"}
-      - {id: 8, cat: TV/SD, desc: "TV-Shows Foreign DVD-rip Emb"}
-      - {id: 7, cat: TV/SD, desc: "TV-Shows Foreign HDTV Emb"}
-      - {id: 42, cat: TV/SD, desc: "TV-Shows Foreign Packages"}
-      - {id: 5, cat: TV/SD, desc: "TV-Shows Greek Doc"}
-      - {id: 26, cat: TV/SD, desc: "TV-Shows Greek Other"}
-      - {id: 37, cat: TV/SD, desc: "TV-Shows Greek Packages"}
-      - {id: 44, cat: TV/SD, desc: "TV-Shows Greek Packages x264"}
-      - {id: 3, cat: TV/SD, desc: "TV-Shows Greek Series"}
-      - {id: 4, cat: TV/SD, desc: "TV-Shows Greek Shows"}
-      - {id: 6, cat: TV/SD, desc: "TV-Shows Greek Sport"}
-      - {id: 38, cat: TV/SD, desc: "TV-Shows Greek x264"}
+      - {id: 8, cat: TV/Documentary, desc: "Documentaries Foreign"}
+      - {id: 25, cat: TV/Documentary, desc: "Documentaries Foreign HD"}
+      - {id: 5, cat: TV/Documentary, desc: "Documentaries Greek"}
+      - {id: 6, cat: TV/Sport, desc: "TV Sports"}
+      - {id: 54, cat: TV/Sport, desc: "TV Sports HD"}
+      - {id: 34, cat: TV/SD, desc: "TV Foreign Series"}
+      - {id: 7, cat: TV/SD, desc: "TV Foreign Series Emb"}
+      - {id: 36, cat: TV/HD, desc: "TV Foreign Series HD"}
+      - {id: 62, cat: TV/HD, desc: "TV Foreign Series HD Packages"}
+      - {id: 42, cat: TV/SD, desc: "TV Foreign Series Packages"}
+      - {id: 55, cat: TV/SD, desc: "TV Greek Movies"}
+      - {id: 49, cat: TV/HD, desc: "TV Greek Movies HD"}
+      - {id: 26, cat: TV/SD, desc: "TV Greek Other"}
+      - {id: 3, cat: TV/SD, desc: "TV Greek Series"}
+      - {id: 44, cat: TV/SD, desc: "TV Greek Packages"}
+      - {id: 4, cat: TV/SD, desc: "TV Greek Shows"}
 
     modes:
       search: [q]

src/Jackett.Common/Definitions/hachede.yml

@@ -74,8 +74,6 @@
 
   login:
     method: cookie
-    headers:
-      user-agent: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.104 Safari/537.36"
     inputs:
       cookie: "{{ .Config.cookie }}"
     test:
@@ -128,7 +126,7 @@
         selector: td.leechers a, .torrentInfo a[rel="torrent_leechers"]
       imdb:
         optional: true
-        selector: .torrentFlags a[href^="http://www.imdb.com/title/"]
+        selector: .torrentFlags a[href*="www.imdb.com/title/tt"]
         attribute: href
       date:
         selector: td.torrent_name, .torrentOwner

src/Jackett.Common/Definitions/hamsterstudio.yml

@@ -3,7 +3,7 @@
   name: HamsterStudio
   description: "HamsterStudio is a RUSSIAN Semi-Private Torrent Tracker for TV"
   language: ru-ru
-  type: private
+  type: semi-private
   encoding: windows-1251
   links:
     - http://hamsterstudio.org/

src/Jackett.Common/Definitions/hdbitscom.yml

@@ -70,7 +70,7 @@
         selector: a[href^="torrents.php?id="]
         attribute: href
       imdb:
-        selector: a[href*="http://www.imdb.com/title/"]
+        selector: a[href*="www.imdb.com/title/tt"]
         optional: true
         attribute: href
       banner:

src/Jackett.Common/Definitions/hdchina.yml

@@ -86,11 +86,8 @@
         selector: a[href^="details.php?id="]
         attribute: href    
       download:
-        selector: a[href^="details.php?id="]
+        selector: a[href^="download.php?hash="]
         attribute: href
-        filters:
-          - name: replace
-            args: ["details.php", "download.php"]
       size:
         selector: td.t_size
       grabs:

src/Jackett.Common/Definitions/hdcity.yml

@@ -146,6 +146,8 @@
         args: ["S0?(\\d{1,2})E(\\d{1,2})", "$1x$2"]
       - name: re_replace
         args: ["[^a-zA-Z0-9]+", " "]
+      - name: re_replace
+        args: ["(?i)\\bS0*(\\d+)\\b", "T$1"]
     inputs:
       page: "torrents"
       $raw: "&category={{range .Categories}}{{.}};{{end}}"
@@ -161,10 +163,21 @@
           - name: querystring
             args: category
       title:
-        selector: td[valign="middle"] a
+        selector: td[valign="middle"] a:contains("VOSE")
+        optional: true
         filters:
           - name: append
-            args: " [spanish]"
+            args: " [English]"
+          - name: re_replace
+            args: ["(?i)T\\s?(\\d{1,2})\\b", "S$1"]
+      title:
+        selector: td[valign="middle"] a:not(:contains("VOSE"))
+        optional: true
+        filters:
+          - name: append
+            args: " [Spanish]"
+          - name: re_replace
+            args: ["(?i)T\\s?(\\d{1,2})\\b", "S$1"]
       details:
         selector: td[valign="middle"] a
         attribute: href

src/Jackett.Common/Definitions/hddolby.yml

@@ -0,0 +1,121 @@
+---
+  site: hddolby
+  name: HDDolby
+  description: "HD Dolby is a CHINESE Semi-Private Torrent Tracker for HD MOVIES / TV / GENERAL"
+  language: zh-cn
+  type: semi-private
+  encoding: UTF-8
+  links:
+    - https://www.hddolby.com/
+
+  caps:
+    categorymappings:
+      - {id: 401, cat: Movies, desc: "Movies电影"}
+      - {id: 402, cat: TV, desc: "TV Series电视剧"}
+      - {id: 403, cat: TV, desc: "TV Shows综艺"}
+      - {id: 404, cat: TV/Documentary, desc: "Documentaries纪录片"}
+      - {id: 405, cat: TV/Anime, desc: "Animations动漫"}
+      - {id: 406, cat: Audio/Video, desc: "Music Videos"}
+      - {id: 407, cat: TV/Sport, desc: "Sports体育"}
+      - {id: 408, cat: Audio, desc: "HQ Audio音乐"}
+      - {id: 409, cat: Other, desc: "Others其他"}
+      - {id: 410, cat: Console, desc: "Games游戏"}
+      - {id: 411, cat: Books, desc: "Study学习"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: td.embedded:has(h2:contains("登录失败"))
+        message:
+          selector: td.text
+    test:
+      path: index.php
+      selector: a[href="logout.php"]
+
+  ratio:
+    path: index.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:
+      - path: torrents.php
+    inputs:
+      $raw: "{{range .Categories}}cat{{.}}=1&{{end}}"
+      search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+      # 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:
+      title:
+        selector: a[href^="details.php?id="]
+      title:
+        optional: true
+        selector: a[title][href^="details.php?id="]
+        attribute: title
+      category:
+        selector: a[href^="?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href    
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      date:
+        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"
+          img.pro_free2up: "0"
+          img.pro_50pctdown: "0.5"
+          img.pro_50pctdown2up: "0.5"
+          img.pro_30pctdown: "0.3"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          img.pro_50pctdown2up: "2"
+          img.pro_free2up: "2"
+          img.pro_2up: "2"
+          "*": "1"
+      description:
+        selector: td.rowfollow:nth-child(2)
+        remove: a, img
+# NexusPHP Standard v1.5 Beta 4

src/Jackett.Common/Definitions/hdreactor.yml

@@ -0,0 +1,125 @@
+---
+  site: hdreactor
+  name: HDReactor
+  description: "HDReactor is a RUSSIAN Public Torrent Tracker for MOVIES / TV"
+  language: ru-ru
+  type: public
+  encoding: windows-1251
+  links:
+    - https://hdreactor.net/
+    - https://hdreactor.club/
+    - https://hdreactor.guru/
+    - https://hdreactor.su/
+
+  caps:
+    categorymappings:
+      - {id: 2001, cat: Movies/HD, desc: "Кино HD"}
+      - {id: 5006, cat: Movies/HD, desc: "Кино 4K"}
+      - {id: 2007, cat: Movies/Other, desc: "Анимация"}
+      - {id: 2006, cat: TV/HD, desc: "Сериалы"}
+      - {id: 5005, cat: TV/Sport, desc: "Спорт"}
+      - {id: 2004, cat: Audio/Lossless, desc: "Музыка"}
+      - {id: 2005, cat: PC/Games, desc: "Игры"}
+      - {id: 2003, cat: XXX, desc: "18+"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings:
+    - name: striprussian
+      type: checkbox
+      label: Strip Russian Letters
+      default: false
+
+  download:
+    selector: a[href^="magnet:?xt="]
+
+  search:
+    # https://hdreactor.net/index.php?do=search&subaction=search&showposts=1&story=2019&catlist[]=2001&catlist[]=2006
+    paths:
+      - path: index.php
+    keywordsfilters:
+      - name: diacritics
+        args: replace
+      - name: re_replace # S01 to Сезон 1
+        args: ["(?i)\\bS0*(\\d+)\\b", " Сезон $1"]
+      - name: re_replace # S01E01 to Сезон 1 Серии 1
+        args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", " Сезон $1  Серии $2"]
+    inputs:
+      $raw: "{{range .Categories}}catlist[]={{.}}&{{end}}"
+      do: search
+      subaction: search
+      showposts: 1
+      story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}2019{{ end }}"
+
+    rows:
+      selector: div.news:contains("Категория:")
+
+    fields:
+      category:
+        selector: div.news-content > a
+        case:
+          a[href$="/4k_uhd/"]: 5006
+          a[href$="/1/"]: 2001
+          a[href$="/6/"]: 2006
+          a[href$="/7/"]: 2007
+          a[href$="/4/"]: 2004
+          a[href$="/5/"]: 2005
+          a[href$="/3/"]: 2003
+          a[href$="/sport-hd/"]: 5005
+      title:
+        selector: h1 > a
+        filters:
+          # normalize to SXXEYY format
+          - name: re_replace
+            args: ["[\\.\\,\\:\\-\\/\\|\\[\\]]", " "]
+          - name: re_replace
+            args: ["(.*)[CСcс]езон\\s*(\\d+)\\s*[CСcс]ери[ия]\\s*(\\d+)\\s*(\\d+)\\s*из\\s*\\d+(.*)", "$1 S$2E$3-$4 rus $5"]
+          - name: re_replace
+            args: ["(.*)[CСcс]езон\\s*(\\d+)\\s*[CСcс]ери[ия]\\s*(\\d+)\\s*(\\d+)\\s*(.*)", "$1 S$2E$3-$4 rus $5"]
+          - name: re_replace
+            args: ["(.*)[CСcс]езон\\s*(\\d+)\\s*[CСcс]ери[ия]\\s*(\\d+)\\s*из\\s*\\d+(.*)", "$1 S$2E$3 rus $4"]
+          - name: re_replace
+            args: ["(.*)[CСcс]езон\\s*(\\d+)(.*)", "$1 S$2 rus $3"]
+          - name: re_replace
+            args: ["(.*)[CСcс]]ери[ия]\\s*(\\d+)(.*)", "$1 E$2 rus $3"]
+          - name: re_replace
+            args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
+          - name: replace
+            args: ["WEBRip", "WEBDL"]
+          - name: replace
+            args: ["WEB DL", "WEBDL"]
+          - name: replace
+            args: ["WEB DLRip", "WEBDL"]
+          - name: replace
+            args: ["HDTVRip", "HDTV"]
+      details:
+        selector: h1 > a
+        attribute: href
+      download:
+        selector: h1 > a
+        attribute: href
+      size:
+        text: "500 MB"
+      seeders:
+        text: 1
+      leechers:
+        text: 1
+      date:
+        selector: div.news-content
+        filters:
+            # - 30-10-2019, 14:49]
+          - name: strdump
+          - name: regexp
+            args: "(\\d{1,2}\\-\\d{2}\\-\\d{4}\\, \\d{1,2}\\:\\d{2})"
+          - name: replace
+            args: [",", ""]
+          - name: dateparse
+            args: "2-01-2006 15:04"
+          - name: strdump
+      downloadvolumefactor:
+        text: 0
+      uploadvolumefactor:
+        text: 1

src/Jackett.Common/Definitions/hdturk.yml

@@ -0,0 +1,168 @@
+---
+  site: hdturk
+  name: HDTurk
+  description: "HDTurk is a TURKISH Private Torrent Tracker for MOVIES / TV / GENERAL"
+  language: tr
+  type: private
+  encoding: UTF-8
+  links:
+    - http://hdturk.de/
+
+  caps:
+    categorymappings:
+      - {id: 37, cat: Other, desc: "Diğer"}
+      - {id: 210, cat: Books/Ebook, desc: "E-Kitap"}
+      - {id: 208, cat: Other, desc: "Eğitim"}
+      - {id: 101, cat: Other, desc: "Resim"}
+      - {id: 15, cat: TV, desc: "TV Dizi/Show/Spor"}
+      - {id: 18, cat: TV, desc: "TV Dublaj"}
+      - {id: 81, cat: TV, desc: "TV Show"}
+      - {id: 207, cat: TV/Sport, desc: "TV Spor"}
+      - {id: 17, cat: TV, desc: "TV Yabancı"}
+      - {id: 16, cat: TV, desc: "TV Yerli"}
+      - {id: 19, cat: TV/HD, desc: "TV Yerli HD"}
+      - {id: 170, cat: Movies/HD, desc: "Movies HD"}
+      - {id: 174, cat: Movies/3D, desc: "Movies 3D DUAL"}
+      - {id: 180, cat: Movies/3D, desc: "Movies 3D TR"}
+      - {id: 181, cat: Movies/3D, desc: "Movies 3D Yabancı"}
+      - {id: 217, cat: Movies/UHD, desc: "Movies 4K DUAL"}
+      - {id: 218, cat: Movies/UHD, desc: "Movies 4K TR"}
+      - {id: 216, cat: Movies/UHD, desc: "Movies 4K Yabancı"}
+      - {id: 205, cat: Movies/DVD, desc: "Movies DVD DUAL"}
+      - {id: 206, cat: Movies/DVD, desc: "Movies DVD TR/Yerli"}
+      - {id: 219, cat: Movies/DVD, desc: "Movies DVD Yabancı"}
+      - {id: 173, cat: Movies/BluRay, desc: "Movies Full BD"}
+      - {id: 175, cat: Movies/HD, desc: "Movies Remux DUAL"}
+      - {id: 183, cat: Movies/HD, desc: "Movies Remux Yabancı"}
+      - {id: 171, cat: Movies/HD, desc: "Movies x264 DUAL"}
+      - {id: 176, cat: Movies/HD, desc: "Movies x264 TR"}
+      - {id: 177, cat: Movies/HD, desc: "Movies x264 Yabancı"}
+      - {id: 172, cat: Movies/HD, desc: "Movies x265 DUAL"}
+      - {id: 178, cat: Movies/HD, desc: "Movies x265 TR"}
+      - {id: 179, cat: Movies/HD, desc: "Movies x265 Yabancı"}
+      - {id: 198, cat: Movies/HD, desc: "Movies XviD DUAL"}
+      - {id: 200, cat: Movies/HD, desc: "Movies XviD TR"}
+      - {id: 202, cat: Movies/HD, desc: "Movies XviD Yabancı"}
+      - {id: 33, cat: Audio, desc: "MÜZİK"}
+      - {id: 34, cat: Audio, desc: "MÜZİK Albüm"}
+      - {id: 35, cat: Audio, desc: "MÜZİK Diskografi"}
+      - {id: 98, cat: Audio, desc: "MÜZİK Single"}
+      - {id: 36, cat: Audio/Video, desc: "MÜZİK Video"}
+      - {id: 56, cat: Console, desc: "OYUN"}
+      - {id: 59, cat: Console, desc: "Konsol"}
+      - {id: 58, cat: Console, desc: "Mobil/PDA"}
+      - {id: 57, cat: PC/Games, desc: "PC"}
+      - {id: 52, cat: PC, desc: "PROGRAM"}
+      - {id: 54, cat: PC/Mac, desc: "Apple"}
+      - {id: 55, cat: PC, desc: "Mobil/PDA"}
+      - {id: 53, cat: PC/0day, desc: "WINDOWS"}
+      - {id: 182, cat: Movies/SD, desc: "SD"}
+      - {id: 191, cat: Movies/SD, desc: "x264 DUAL"}
+      - {id: 192, cat: Movies/SD, desc: "x264 TR"}
+      - {id: 193, cat: Movies/SD, desc: "x264 Yabancı"}
+      - {id: 194, cat: Movies/SD, desc: "x265 DUAL"}
+      - {id: 195, cat: Movies/SD, desc: "x265 TR"}
+      - {id: 196, cat: Movies/SD, desc: "x265 Yabancı"}
+      - {id: 201, cat: Movies/SD, desc: "XviD DUAL"}
+      - {id: 197, cat: Movies/SD, desc: "XviD TR"}
+      - {id: 199, cat: Movies/SD, desc: "XviD Yabancı"}
+      - {id: 221, cat: Other, desc: "VIP"}
+      - {id: 85, cat: XXX, desc: "XXX"}
+      - {id: 92, cat: XXX, desc: "XXX E-Magazin"}
+      - {id: 93, cat: XXX, desc: "XXX Movie"}
+      - {id: 95, cat: XXX, desc: "XXX Packs"}
+      - {id: 96, cat: XXX, desc: "XXX Pics"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  login:
+    path: login.php
+    method: form
+    form: form[action="takelogin.php"]
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    captcha:
+      type: image
+      selector: img#regimage
+      input: imagestring
+    error:
+      - selector: table:contains("Bir hata oluştu!")
+    test:
+      path: index.php
+      selector: a[href*="/logout.php?logouthash="]
+
+  ratio:
+    path: index.php
+    selector: div#top div:nth-child(2) span:nth-child(2)
+    filters:
+      - name: regexp
+        args: "Ratio: (.+?) Bonus:"
+
+  search:
+    paths:
+      - path: browse.php
+    keywordsfilters:
+      - name: re_replace # E01 to BL01
+        args: ["(?i)\\bE(\\d+)\\b", "E$1"]
+    inputs:
+    # does not support multi categories so defaulting to ALL
+      do: search
+      keywords: "{{.Keywords}}"
+      category: 0
+      search_type: t_name
+      include_dead_torrents: yes
+    rows:
+      selector: table#sortabletable tbody tr:has(div[id^="port-target-"])
+    fields:
+      title:
+        selector: div[id^="port-target-"] a
+        filters:
+          - name: re_replace # BL01 to E01
+            args: ["(?i)\\bBL(\\d+)\\b", " E$1 "]
+      details:
+        selector: div[id^="port-target-"] a
+        attribute: href
+      category:
+        selector: a[href*="browse.php?category="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: category
+      banner:
+        selector: div[id^="port-content-"] img
+        attribute: src
+      date:
+        selector: td:nth-child(2)
+        filters:
+          - name: regexp
+            args: (\d{2}-\d{2}-\d{4} \d{2}:\d{2})
+        filters:
+          - name: dateparse
+            args: "02-01-2006 15:04"
+      download:
+        selector: a[href*="download.php?id="]
+        attribute: href
+      comments:
+        selector: td:nth-child(4) a
+        attribute: href
+      size:
+        selector: td:nth-child(5)
+      grabs:
+        selector: td:nth-child(6)
+      seeders:
+        selector: td:nth-child(7)
+      leechers:
+        selector: td:nth-child(8)
+      downloadvolumefactor:
+        case:
+          img[src$="/freedownload.gif"]: "0"
+          img[src$="/silverdownload.gif"]: "0.5"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          img[src$="/x2.gif"]: "2"
+          "*": "1"

src/Jackett.Common/Definitions/hdzone.yml

@@ -0,0 +1,162 @@
+---
+  site: hdzone
+  name: HDZone
+  description: "HDZone is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
+  language: zh-cn
+  type: private
+  encoding: UTF-8
+  links:
+    - https://hdzone.me/
+
+  caps:
+    categorymappings:
+      - {id: 411, cat: Movies/SD, desc: "Movies SD"}
+      - {id: 412, cat: Movies, desc: "Movies IPad"}
+      - {id: 413, cat: Movies/HD, desc: "Movies 720p"}
+      - {id: 414, cat: Movies/HD, desc: "Movies 1080p"}
+      - {id: 415, cat: Movies, desc: "Movies REMUX"}
+      - {id: 450, cat: Movies/BluRay, desc: "Movies Bluray"}
+      - {id: 499, cat: Movies/UHD, desc: "Movies UHD Blu-ray"}
+      - {id: 416, cat: Movies/UHD, desc: "Movies 2160p"}
+      - {id: 417, cat: TV/Documentary, desc: "Doc SD"}
+      - {id: 418, cat: TV/Documentary, desc: "Doc IPad"}
+      - {id: 419, cat: TV/Documentary, desc: "Doc 720p"}
+      - {id: 420, cat: TV/Documentary, desc: "Doc 1080p"}
+      - {id: 421, cat: TV/Documentary, desc: "Doc REMUX"}
+      - {id: 451, cat: TV/Documentary, desc: "Doc Bluray"}
+      - {id: 500, cat: TV/Documentary, desc: "Doc UHD Blu-ray"}
+      - {id: 422, cat: TV/Documentary, desc: "Doc 2160p"}
+      - {id: 423, cat: Audio/Video, desc: "TVMusic 720p"}
+      - {id: 424, cat: Audio/Video, desc: "TVMusic 1080i"}
+      - {id: 425, cat: TV/SD, desc: "TVShow SD"}
+      - {id: 426, cat: TV, desc: "TVShow IPad"}
+      - {id: 471, cat: TV, desc: "TVShow IPad"}
+      - {id: 427, cat: TV/HD, desc: "TVShow 720p"}
+      - {id: 472, cat: TV/HD, desc: "TVShow 720p"}
+      - {id: 428, cat: TV/HD, desc: "TVShow 1080i"}
+      - {id: 429, cat: TV/HD, desc: "TVShow 1080p"}
+      - {id: 430, cat: TV, desc: "TVShow REMUX"}
+      - {id: 452, cat: TV/HD, desc: "TVShow Bluray"}
+      - {id: 431, cat: TV/UHD, desc: "TVShow 2160p"}
+      - {id: 432, cat: TV/SD, desc: "TVSeries SD"}
+      - {id: 433, cat: TV, desc: "TVSeries IPad"}
+      - {id: 434, cat: TV/HD, desc: "TVSeries 720p"}
+      - {id: 435, cat: TV/HD, desc: "TVSeries 1080i"}
+      - {id: 436, cat: TV/HD, desc: "TVSeries 1080p"}
+      - {id: 437, cat: TV, desc: "TVSeries REMUX"}
+      - {id: 453, cat: TV/HD, desc: "TVSeries Bluray"}
+      - {id: 438, cat: TV/UHD, desc: "TVSeries 2160p"}
+      - {id: 439, cat: Audio, desc: "Music APE"}
+      - {id: 440, cat: Audio/Lossless, desc: "Music FLAC"}
+      - {id: 441, cat: Audio/Video, desc: "Music MV"}
+      - {id: 442, cat: TV/Sport, desc: "Sports 720p"}
+      - {id: 443, cat: TV/Sport, desc: "Sports 1080i"}
+      - {id: 444, cat: TV/Anime, desc: "Anime SD"}
+      - {id: 445, cat: TV/Anime, desc: "Anime IPad"}
+      - {id: 446, cat: TV/Anime, desc: "Anime 720p"}
+      - {id: 447, cat: TV/Anime, desc: "Anime 1080p"}
+      - {id: 448, cat: TV/Anime, desc: "Anime REMUX"}
+      - {id: 454, cat: TV/Anime, desc: "Anime Bluray"}
+      - {id: 409, cat: Other, desc: "Misc"}
+      - {id: 449, cat: TV/Anime, desc: "Anime 2160p"}
+      - {id: 501, cat: TV/Anime, desc: "Anime UHD Blu-ray"}
+
+    modes:
+      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:
+    method: cookie
+    inputs:
+      cookie: "{{ .Config.cookie }}"
+    test:
+      path: torrents.php
+      selector: a[href="logout.php"]
+
+  search:
+    paths:
+      - path: torrents.php
+    inputs:
+      $raw: "{{range .Categories}}cat{{.}}=1&{{end}}"
+      search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+      # 0 incldead 1 active 2 onlydead
+      incldead: 0
+      # 0 all 1 normal 2 free 3 2x 4 2xfree 5 50% 6 2x50% 7 30%
+      spstate: 0
+      # 0 all 1 bookm 2 notbookm
+      inclbookmarked: 0
+      # 0 title 1 descr 3 uploader 4 imdb
+      search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
+      # 0 AND 1 OR 2 exact
+      search_mode: 0
+    rows:
+      selector: table.torrents > tbody > tr:has(table.torrentname)
+    fields:
+      category:
+        selector: a[href^="?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        selector: a[href^="details.php?id="]
+      title:
+        optional: true
+        selector: a[title][href^="details.php?id="]
+        attribute: title
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href    
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      imdb:
+        optional: true
+        selector: a[href*="www.imdb.com/title/tt"]
+        attribute: href
+      comments:
+        selector: td:nth-child(3) a
+        attribute: href
+      date:
+        selector: td: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:nth-child(5)
+      seeders:
+        selector: td:nth-child(6)
+      leechers:
+        selector: td:nth-child(7)
+      grabs:
+        selector: td:nth-child(8)
+      downloadvolumefactor:
+        case:
+          img.pro_free: "0"
+          img.pro_free2up: "0"
+          img.pro_50pctdown: "0.5"
+          img.pro_50pctdown2up: "0.5"
+          img.pro_30pctdown: "0.3"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          img.pro_50pctdown2up: "2"
+          img.pro_free2up: "2"
+          img.pro_2up: "2"
+          "*": "1"
+      description:
+        selector: td:nth-child(2)
+        remove: a, img

src/Jackett.Common/Definitions/hon3yhd.yml

@@ -50,37 +50,19 @@
       search: [q]
       tv-search: [q, season, ep]
 
-  settings:
-    - name: cookie
-      type: text
-      label: Cookie
-    - name: info
-      type: info
-      label: How to get the Cookie
-      default: "<ol><li>Login to this tracker in your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
-          
   login:
-    method: cookie
+    path: login.php
+    method: form
+    form: form[action="takelogin.php"]
     inputs:
-      cookie: "{{ .Config.cookie }}"
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: tbody:has(td.colhead > span:contains("Error"))
+      - selector: tbody:has(td.colhead > span:contains("failed"))
     test:
       path: browse.php
 
-#  login:
-#    path: login.php
-#    method: form
-#    form: form[action="takelogin.php"]
-#    inputs:
-#      username: "{{ .Config.username }}"
-#      password: "{{ .Config.password }}"
-#      use_ssl: "1"
-#      perm_ssl: "1"
-#    error:
-#      - selector: tbody:has(td.colhead > span:contains("Error"))
-#      - selector: tbody:has(td.colhead > span:contains("failed"))
-#    test:
-#      path: browse.php
-
   search:
     paths:
       - path: browse.php

src/Jackett.Common/Definitions/hqsource.yml

@@ -101,7 +101,7 @@
             args: "{{ .Result.description }}"
       imdb:
         optional: true
-        selector: a[href^="http://www.imdb.com/title/tt"]
+        selector: a[href*="www.imdb.com/title/tt"]
       grabs:
         selector: td:nth-child(6)
         filters:

src/Jackett.Common/Definitions/hush.yml

@@ -28,15 +28,22 @@
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
-      remember: 1
+      remember: on
     error:
       - selector: script[nonce]:contains("Error")
         message:
           selector: script[nonce]:contains("Error")
     test:
-      path: torrents
+      path: /
       selector: a[href$="/logout"]
 
+  ratio:
+    path: /
+    selector: li:has(i.fa-sync-alt)
+    filters:
+      - name: regexp
+        args: "Ratio : (\\d+)"
+
   search:
     paths:
       - path: filterTorrents
@@ -49,7 +56,8 @@
       tvdb: ""
       tmdb: ""
       mal: ""
-      sorting: created_at
+      igdb: ""
+      sort: created_at
       direction: desc
       qty: 100
     rows:
@@ -69,6 +77,16 @@
       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", ""]
+      comments:
+        selector: a[href*="#comments"]
+        attribute: href
       size:
         selector: td:nth-last-child(4)
       seeders:
@@ -79,7 +97,11 @@
         selector: td:nth-last-child(1)
         filters:
           - name: regexp
-            args: ([\d\.]+)
+            args: (\d+)
+      imdb:
+        optional: true
+        selector: a[href*="www.imdb.com/title/tt"]
+        attribute: href
       date:
         selector: time
         filters:
@@ -108,17 +130,18 @@
             args: [" (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
       downloadvolumefactor:
         case:
-          "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"
+          i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
+          i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
+          i[class*="fa-star text-bold"]: 0 # Freeleech From Token
+          i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
+          i[class*="fa-globe text-blue"]: 0 # Global Freeleech
+          i[class*="fa-star text-gold"]: 0 # Freeleech
+          i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
+          "*": 1
       uploadvolumefactor:
         case:
-          "i[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
+          i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
+          i[class*="fa-globe text-green"]: 2 # Global Double Upload
+          i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
+          "*": 1
+# UNIT3D 1.9.4

src/Jackett.Common/Definitions/hyperay.yml

@@ -1,115 +0,0 @@
----
-  site: hyperay
-  name: Hyperay
-  description: "Hyperay is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
-  language: zh-cn
-  type: private
-  encoding: UTF-8
-  links:
-    - https://www.hyperay.org/
-  legacylinks:
-    - https://www.hyperay.cc
-
-  caps:
-    categorymappings:
-      - {id: 410, cat: Movies/HD, desc: "Movies 1080p"}
-      - {id: 411, cat: Movies/HD, desc: "Movies 720p"}
-      - {id: 401, cat: Movies/BluRay, desc: "Movies Blu-ray"}
-      - {id: 415, cat: Movies, desc: "Movies REMUX"}
-      - {id: 416, cat: Movies/3D, desc: "Movies 3D"}
-      - {id: 414, cat: Movies/DVD, desc: "Movies DVD"}
-      - {id: 412, cat: Movies/WEBDL, desc: "Movies WEB-DL"}
-      - {id: 413, cat: Movies/SD, desc: "Movies HDTV"}
-      - {id: 417, cat: Movies/Other, desc: "Movies iPad"}
-      - {id: 402, cat: TV, desc: "TV Series"}
-      - {id: 403, cat: TV, desc: "TV Shows"}
-      - {id: 404, cat: TV/Documentary, desc: "Documentaries"}
-      - {id: 405, cat: TV/Anime, desc: "Animations"}
-      - {id: 406, cat: Audio/Video, desc: "Music Videos"}
-      - {id: 407, cat: TV/Sport, desc: "Sports"}
-      - {id: 408, cat: Audio, desc: "HQ Audio"}
-      - {id: 418, cat: Books, desc: "Book"}
-      - {id: 409, cat: Other, desc: "Misc"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep, imdbid]
-      movie-search: [q, imdbid]
-
-  login:
-    path: takelogin.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      authcode: ""
-    error:
-      - selector: td.embedded:has(h2:contains("failed"))
-    test:
-      path: torrents.php
-
-  search:
-    paths:
-      - path: torrents.php
-        method: post
-    inputs:
-      $raw: "{{range .Categories}}cat{{.}}=1&{{end}}"
-      search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-      incldead: "1"
-      spstate: "0"
-      inclbookmarked: "0"
-      search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
-      search_mode: "0"
-    rows:
-      selector: table.torrents > tbody > tr[class]
-      filters:
-        - name: andmatch
-    error:
-      - selector: b:contains("This is a must-read message, please read before other operations!")
-    fields:
-      title:
-        selector: a[title][href^="details.php?id="]
-        attribute: title
-      category:
-        selector: a[href^="?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      details:
-        selector: a[title][href^="details.php?id="]
-        attribute: href    
-      download:
-        selector: a[href^="download.php?id="]
-        attribute: href
-      imdb:
-        selector: a[href^="http://www.imdb.com/title/"]
-        attribute: href
-      banner:
-        selector: a[title][onmouseover][href^="details.php?id="]
-        attribute: onmouseover
-        filters:
-          - name: regexp
-            args: "showmenu\\(this,'.*','(.*)'\\);"
-      size:
-        selector: td.rowfollow:nth-child(6)
-      grabs:
-        selector: td.rowfollow:nth-child(9)
-      seeders:
-        selector: td.rowfollow:nth-child(7)
-      leechers:
-        selector: td.rowfollow:nth-child(8)
-      date:
-        selector: td.rowfollow:nth-child(5) > span[title]
-        attribute: title
-        filters:
-          - name: append
-            args: " +08:00"
-          - name: dateparse
-            args: "2006-01-02 15:04:05 -07:00"
-      downloadvolumefactor:
-        case:
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"

src/Jackett.Common/Definitions/ilcorsaroblu.yml

@@ -17,28 +17,54 @@
        - {id: 12, cat: XXX, desc: "Adult"}
       # Applicazioni
        - {id: 5, cat: PC/Phone-Android, desc: "Android"}
+       - {id: 30, cat: PC/Phone-IOS, desc: "iOS / iPhone"}
+       - {id: 7, cat: PC/0day, desc: "Windows"}
+       - {id: 8, cat: PC, desc: "Linux"}
+       - {id: 9, cat: PC/Mac, desc: "Mac"}
+       - {id: 40, cat: PC, desc: "Emulatori"}
+       - {id: 34, cat: PC, desc: "Student's Office"}
       # Books
-       - {id: 6, cat: Books, desc: "Books"}
+       - {id: 6, cat: Books/Ebook, desc: "Books"}
+       - {id: 45, cat: Books/Comics, desc: "Fumetti"}
+       - {id: 51, cat: Books/Ebook, desc: "Pdf"}
+       - {id: 33, cat: Books/Ebook, desc: "Romanzi"}
+       - {id: 26, cat: Books/Magazines, desc: "Edicola: Giornali/Quotidiani"}
       # Games
-       - {id: 3, cat: Other, desc: "Games"}
+       - {id: 3, cat: PC/Games, desc: "Games PC"}
+       - {id: 27, cat: Console, desc: "Games Console"}
+       - {id: 41, cat: Console/Xbox, desc: "Games Xbox360"}
+       - {id: 43, cat: Console, desc: "Games Retro"}
+       - {id: 47, cat: Console/NDS, desc: "Games Nintendo"}
       # Music
        - {id: 2, cat: Audio, desc: "Music"}
+       - {id: 48, cat: Audio/MP3, desc: "Music MP3"}
+       - {id: 49, cat: Audio, desc: "Radio Trasmissioni"}
       # Movies
-       - {id: 17, cat: Movies/SD, desc: "Movie BDRip"}
-       - {id: 21, cat: Movies/Other, desc: "Movies - Films"}
-       - {id: 11, cat: Movies/DVD, desc: "DVD-R"}
+       - {id: 17, cat: Movies/HD, desc: "Movie BDRip"}
+       - {id: 39, cat: Movies/HD, desc: "Movie BDRip TNT"}
+       - {id: 21, cat: Movies/Other, desc: "Movie Films"}
+       - {id: 11, cat: Movies/DVD, desc: "Movie DVD-R"}
        - {id: 14, cat: Movies/HD, desc: "Movie 720p"}
        - {id: 13, cat: Movies/HD, desc: "Movie 1080p"}
        - {id: 15, cat: Movies/3D, desc: "Movie 3D"}
-       - {id: 24, cat: TV/OTHER, desc: "TV Show Standard"}
-       - {id: 19, cat: TV/HD, desc: "Tv Show 1080p"}
-       - {id: 20, cat: TV/HD, desc: "Tv Show 720"}
+       - {id: 25, cat: Movies/UHD, desc: "Movie UHD"}
+       - {id: 36, cat: Movies, desc: "Movie TNT"}
+       - {id: 24, cat: TV/SD, desc: "TV Show Standard"}
+       - {id: 19, cat: TV/HD, desc: "TV Show 1080p"}
+       - {id: 20, cat: TV/HD, desc: "TV Show 720"}
+       - {id: 50, cat: TV, desc: "TV Show TNT"}
+       - {id: 28, cat: TV/Anime, desc: "Anime"}
+       - {id: 29, cat: TV, desc: "Cartoons"}
+       - {id: 37, cat: TV/Sport, desc: "Sport"}
+       - {id: 35, cat: TV/Documentary, desc: "Documentari"}
+       - {id: 38, cat: Movies, desc: "Commedia"}
+       - {id: 46, cat: Movies, desc: "Movie Parodie"}
       # Various
        - {id: 4, cat: Other, desc: "Other"}
-       - {id: 7, cat: PC, desc: "Windows"}
-       - {id: 8, cat: Other, desc: "Linux"}
-       - {id: 9, cat: PC/Mac, desc: "Mac"}
        - {id: 23, cat: Other, desc: "Archive"}
+       - {id: 42, cat: Other, desc: "Disegni e Modelli"}
+       - {id: 16, cat: Other, desc: "V.I.P."}
+       - {id: 32, cat: Other, desc: "Premium"}
 
     modes:
       search: [q]
@@ -148,26 +174,31 @@
       size:
         selector: td:nth-last-child(2)
       date:
-        selector: td:nth-last-child(6):contains('ago')
+        selector: td:nth-last-child(7):contains('ago')
         optional: true
         filters:
           - name: timeago
       date:
-        selector: td:nth-last-child(6):contains('/')
+        selector: td:nth-last-child(7):contains('/')
         optional: true
         filters:
           - name: dateparse
             args: "02/01/2006"
       grabs:
-        selector: td:nth-last-child(3)
+        selector: td:nth-last-child(4)
         filters:
           - name: replace
             args: ["---", "0"]
       seeders:
-        selector: td:nth-last-child(5)
+        selector: td:nth-last-child(6)
       leechers:
-        selector: td:nth-last-child(4)
+        selector: td:nth-last-child(5)
       downloadvolumefactor:
+#        case:
+#          img[src="images/gold.gif"]: "0"
+#          img[src="images/silver.gif"]: "0.5"
+#          img[src="images/bronze.gif"]: "0.75"
+#          "*": "1"
         text: "0"
       uploadvolumefactor:
         text: "1"

src/Jackett.Common/Definitions/iloveclassics.yml

@@ -1,107 +0,0 @@
----
-  site: iloveclassics
-  name: I Love Classics
-  description: "iLoveClassics (iLC) is a Private Torrent Tracker for CLASSIC MOVIES / TV"
-  language: en-us
-  type: private
-  encoding: UTF-8
-  links:
-    - http://www.iloveclassics.com/
-
-  caps:
-    categorymappings:
-      - {id: 1, cat: Movies, desc: "Action/Adventure"}
-      - {id: 22, cat: Movies, desc: "Animation"}
-      - {id: 18, cat: Movies, desc: "Audio"}
-      - {id: 2, cat: Movies, desc: "Comedy"}
-      - {id: 12, cat: Movies, desc: "Crime/Mystery"}
-      - {id: 4, cat: Movies, desc: "Documentary"}
-      - {id: 3, cat: Movies, desc: "Drama"}
-      - {id: 24, cat: Movies, desc: "E-Book"}
-      - {id: 9, cat: Movies, desc: "Family"}
-      - {id: 23, cat: Movies, desc: "Fantasy"}
-      - {id: 6, cat: Movies, desc: "Film Noir"}
-      - {id: 7, cat: Movies, desc: "Film Short"}
-      - {id: 8, cat: Movies, desc: "Horror"}
-      - {id: 10, cat: Movies, desc: "Martial Arts"}
-      - {id: 11, cat: Movies, desc: "Musical"}
-      - {id: 20, cat: Movies, desc: "Other"}
-      - {id: 13, cat: Movies, desc: "Romance"}
-      - {id: 5, cat: Movies, desc: "Sci-Fi"}
-      - {id: 14, cat: Movies, desc: "Silent"}
-      - {id: 15, cat: Movies, desc: "Thriller"}
-      - {id: 19, cat: Movies, desc: "TV Shows"}
-      - {id: 16, cat: Movies, desc: "War"}
-      - {id: 17, cat: Movies, desc: "Western"}
-
-    modes:
-      search: [q]
-
-  login:
-    path: takelogin.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: table:contains("Login failed!")
-    test:
-      path: index.php
-
-  download:
-    selector: a[href^="download.php?id="]
-        
-  search:
-    paths:
-      - path: browse.php
-    inputs:
-      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
-    rows:
-      selector: table#hover-over > tbody > tr.table_col1
-      filters:
-        - name: andmatch
-    fields:
-      category:
-        selector: a[href^="browse.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      title:
-        selector: td:nth-child(2) a
-      download:
-        selector: a[href^="details.php?id="]
-        attribute: href
-        filters:
-          - name: replace
-            args: ["details.php?id=", "download.php?id="]
-      details:
-        selector: a[href^="details.php?id="]
-        attribute: href
-      grabs:
-        selector: td:nth-child(9)
-        filters:
-          - name: regexp
-            args: (\d+\s+)(?=x)
-      files:
-        selector: td:nth-child(4)
-      size:
-        selector: td:nth-child(9)
-        filters:
-          - name: regexp
-            args: (\d+.*(MB|GB)+)
-      seeders:
-        selector: td:nth-child(6)
-      leechers:
-        selector: td:nth-child(7)
-      date:
-        selector: td:nth-child(2)
-      downloadvolumefactor:
-        case:
-          "img[title=\"This Torrent is on Free Leech. Download amounts do not count to your ratio\"]": "0"
-          "img[title=\"This Torrent is Free Leech because it has 5 or more seeders. Download amounts do not count to your ratio while 5 seeders remain\"]": "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"

src/Jackett.Common/Definitions/immortuos.yml

@@ -31,17 +31,17 @@
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
-      remember: 1
+      remember: on
     error:
       - selector: script[nonce]:contains("Error")
         message:
           selector: script[nonce]:contains("Error")
     test:
-      path: torrents
+      path: /
       selector: a[href$="/logout"]
 
   ratio:
-    path: torrents
+    path: /
     selector: li:has(i.fa-sync-alt)
     filters:
       - name: regexp
@@ -86,6 +86,9 @@
         filters:
           - name: replace
             args: ["https://via.placeholder.com/600x900", ""]
+      comments:
+         selector: a[href*="#comments"]
+         attribute: href
       size:
         selector: td:nth-last-child(4)
       seeders:
@@ -96,7 +99,7 @@
         selector: td:nth-last-child(1)
         filters:
           - name: regexp
-            args: ([\d\.]+)
+            args: (\d+)
       imdb:
         optional: true
         selector: a[href*="www.imdb.com/title/tt"]
@@ -129,17 +132,18 @@
             args: [" (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
       downloadvolumefactor:
         case:
-          "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"
+          i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
+          i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
+          i[class*="fa-star text-bold"]: 0 # Freeleech From Token
+          i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
+          i[class*="fa-globe text-blue"]: 0 # Global Freeleech
+          i[class*="fa-star text-gold"]: 0 # Freeleech
+          i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
+          "*": 1
       uploadvolumefactor:
         case:
-          "i[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"
+          i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
+          i[class*="fa-globe text-green"]: 2 # Global Double Upload
+          i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
+          "*": 1
 # UNIT3D 1.9.3

src/Jackett.Common/Definitions/isohunt2.yml

@@ -47,11 +47,8 @@
     filters:
       - name: querystring
         args: url
-      - name: urldecode
-      # temp fix for #5372
-      - name: replace
-        args: [" ⭐", ""]
-
+      - name: replace # temp fix for #5372
+        args: ["%E2%AD%90", ""]
   search:
     paths:
       - path: torrents

src/Jackett.Common/Definitions/kapaki.yml

@@ -9,39 +9,110 @@
     - https://kapaki.info/
 
   caps:
-    categories:
-      1: Movies
-      16: Movies
-      17: Movies/SD
-      59: Movies/SD
-      44: Movies
-      84: Movies
-      79: Movies
-
-      58: TV
-      79: TV/SD
-      81: TV
-      84: TV/Documentary
-
-      55: Movies
-      38: Movies
-      39: Movies
-      93: Movies
-      94: Movies
-      45: Movies
-      98: Movies
-      64: Movies
-
-      61: Movies
-      62: Movies/SD
-      67: Movies/WEBDL
-      63: Movies/SD
-      69: Movies/HD
-      77: Movies
+    categorymappings:
+      # TV
+      - {id: 32, cat: TV, desc: "Ελληνική TV - Greek TV"}
+      - {id: 37, cat: TV, desc: "Πακέτα"}
+      - {id: 44, cat: TV, desc: "Θέατρο - Όπερα - Συναυλίες"}
+      - {id: 46, cat: TV, desc: "Σειρές"}
+      - {id: 47, cat: TV, desc: "Talk Shows - News - Info"}
+      - {id: 48, cat: TV, desc: "Ψυχαγωγικά Show"}
+      - {id: 49, cat: TV/Sport, desc: "Αθλητικά"}
+      - {id: 51, cat: TV/Documentary, desc: "Ντοκυμαντέρ"}
+      - {id: 55, cat: TV, desc: "Εκπαιδευτικά"}
+      - {id: 60, cat: TV, desc: "Διάφορα"} 
+      - {id: 58, cat: TV, desc: "Ξένη TV - Foreign TV"}
+      - {id: 79, cat: TV, desc: "Σειρές"}
+      - {id: 81, cat: TV, desc: "Πακέτα"}
+      - {id: 82, cat: TV, desc: "Ψυχαγωγικά Shows"}
+      - {id: 83, cat: TV/Sport, desc: "Αθλητικά"}
+      - {id: 84, cat: TV/Documentary, desc: "Ντοκυμαντέρ"}
+      - {id: 85, cat: TV, desc: "Διάφορα"}
+      # Movies
+      - {id: 1, cat: Movies, desc: "Ξένες Ταινίες από 1971 - Foreign Movies after 1971"}
+      - {id: 16, cat: Movies, desc: "CAM/TS/TC/WP/VHSrip/TVRip"}
+      - {id: 92, cat: Movies, desc: "PDTV/DSR/DTH/VODrip/PPVrip"}
+      - {id: 59, cat: Movies/WEBDL, desc: " SCR/R5/WEBrip/WEBDL/HDrip"}
+      - {id: 90, cat: Movies/HD, desc: " HDTV 404/540/720/1080p"}
+      - {id: 14, cat: Movies/SD, desc: "DVD-R/DVDRip"}
+      - {id: 17, cat: Movies/HD, desc: "BDRip/BRRip"}
+      - {id: 107, cat: Movies/HD, desc: "BDRip/BRRip 720p"}
+      - {id: 104, cat: Movies/HD, desc: "BDRip/BRRip 1080p"}
+      - {id: 102, cat: Movies/UHD, desc: "BDRip/BRRip 4K (2160p)"}
+      - {id: 93, cat: Movies/BluRay, desc: " BD-R (Full Bluray Disc)"}
+      - {id: 76, cat: Movies/3D, desc: "3-D"}
+      - {id: 31, cat: Movies, desc: " Packs/Filmographies/Special Features"}
+      - {id: 61, cat: Movies, desc: "Ελληνικές Ταινίες από 1991 - Greek Movies after 1991"}
+      - {id: 62, cat: Movies, desc: "CAM/TS/TC/WP/VHSrip/TVRip"}
+      - {id: 94, cat: Movies, desc: "PDTV/DSR/DTH/VODrip/PPVrip"}
+      - {id: 67, cat: Movies/WEBDL, desc: "SCR/R5/WEBrip/WEBDL/HDrip "}
+      - {id: 89, cat: Movies/HD, desc: "HDTV 404/540/720/1080p "}
+      - {id: 63, cat: Movies/SD, desc: "DVD-R/DVDRip"}
+      - {id: 69, cat: Movies/HD, desc: "BDRip/BRRip"}
+      - {id: 105, cat: Movies/HD, desc: "BDRip/BRRip 1080p"}
+      - {id: 108, cat: Movies/HD, desc: "BDRip/BRRip 720p"}
+      - {id: 95, cat: Movies/BluRay, desc: "BD-R (Full Bluray Disc) "}
+      - {id: 77, cat: Movies/3D, desc: "3-D"}
+      - {id: 78, cat: Movies, desc: "Packs/Filmographies/Special Features "}
+      - {id: 99, cat: Movies, desc: "Vintage Collectors' Zone"}
+      - {id: 100, cat: Movies, desc: "Ελληνικές Ταινίες έως  και 1990 - GreekMovies upto 1990"}
+      - {id: 101, cat: Movies, desc: "Ξένες Ταινίες έως  και 1970 - Foreign Movies upto 1970"}
+      # Anime
+      - {id: 50, cat: TV/Anime, desc: "Anime - Κινούμενα Σχέδια"}
+      - {id: 64, cat: TV/Anime, desc: "CAM/TS/TC/WP/VHSrip/TVRip "}
+      - {id: 65, cat: TV/Anime, desc: "DVD-R/DVDRip"}
+      - {id: 66, cat: TV/Anime, desc: "SCR/R5/WEBrip/WEBDL/HDrip "}
+      - {id: 68, cat: TV/Anime, desc: "BDRip/BRRip"}
+      - {id: 91, cat: TV/Anime, desc: "HDTV 404/540/720/1080p "}
+      - {id: 96, cat: TV/Anime, desc: "PDTV/DSR/DTH/VODrip/PPVrip "}
+      - {id: 97, cat: TV/Anime, desc: "BD-R (Full Bluray Disc) "}
+      - {id: 98, cat: TV/Anime, desc: "3-D "}
+      - {id: 80, cat: TV/Anime, desc: "Packs/Filmographies/Special Features "}
+      - {id: 103, cat: TV/Anime, desc: "BDRip/BRRip 4K (2160p)"}
+      - {id: 106, cat: TV/Anime, desc: "BDRip/BRRip 1080p"}
+      - {id: 109, cat: TV/Anime, desc: "BDRip/BRRip 720p"}
+      # Music
+      - {id: 35, cat: Audio, desc: "Ελληνική Μουσική - Greek Music"}
+      - {id: 70, cat: Audio/Video, desc: "Video Clips "}
+      - {id: 71, cat: Audio, desc: "Μουσικά CD "}
+      - {id: 72, cat: Audio, desc: "Μουσικά DVD "}
+      - {id: 73, cat: Audio, desc: "Soundtracks - Μουσικά Θέματα Ταινιών"}
+      - {id: 74, cat: Audio, desc: "Δισκογραφίες "}
+      - {id: 86, cat: Audio, desc: "Συλλογές"}
+      - {id: 75, cat: Audio, desc: "DJs Compilation"}
+      - {id: 43, cat: Audio, desc: "Ραδιοφωνικές εκπομπές"}
+      - {id: 7, cat: Audio, desc: "Ξένη Μουσική - Foreign Music"}
+      - {id: 20, cat: Audio/Video, desc: "Video Clips"}
+      - {id: 36, cat: Audio, desc: "Μουσικά CD"}
+      - {id: 45, cat: Audio, desc: "Μουσικά DVD"}
+      - {id: 38, cat: Audio, desc: "Soundtracks - Μουσικά Θέματα Ταινιών"}
+      - {id: 40, cat: Audio, desc: "Δισκογραφίες"}
+      - {id: 87, cat: Audio, desc: "Συλλογές"}
+      - {id: 42, cat: Audio, desc: "DJs Compilation"}
+      # games
+      - {id: 2, cat: Console, desc: "Παιχνίδια - Games"}
+      - {id: 3, cat: Console/PS3, desc: "Sony PS"}
+      - {id: 4, cat: Console/Wii, desc: "Wii"}
+      - {id: 26, cat: Console/Xbox, desc: "XboX"}
+      - {id: 27, cat: PC/Games, desc: "PC"}
+      - {id: 28, cat: Console/NDS, desc: "Nintendo"}
+      # Apps
+      - {id: 6, cat: PC, desc: "Εφαρμογές - Applications"}
+      - {id: 18, cat: PC/0day, desc: "PC / Windows Applications"}
+      - {id: 19, cat: PC/Mac, desc: "Macintosh Applications"}
+      - {id: 34, cat: PC/Phone-Other, desc: "Mobile Applications - Εφαρμογές Κινητών"}
+      # Books
+      - {id: 33, cat: Books, desc: "Βιβλία - Books"}
+      - {id: 53, cat: Books, desc: "Έλληνες Συγγραφείς"}
+      - {id: 39, cat: Books, desc: "Ξένοι Συγγραφείς"}
+      - {id: 88, cat: Books, desc: "Περιοδικά κ.ά. - Magazines etc"}
+      # Other
+      - {id: 54, cat: Other, desc: "Φωτογραφίες - Photos"}
 
     modes:
       search: [q]
       tv-search: [q, season, ep]
+      movie-search: [q]
 
   login:
     path: ?p=home&pid=1
@@ -52,7 +123,7 @@
       action: "login"
       loginbox_membername: "{{ .Config.username }}"
       loginbox_password: "{{ .Config.password }}"
-      loginbox_remember: "true"
+      loginbox_remember: 1
     selectorinputs:
       securitytoken:
         selector: "script:contains(\"stKey: \")"
@@ -101,7 +172,7 @@
         selector: a[href*="?p=torrents&pid=10&action=download"]
         attribute: href
       imdb:
-        selector: a[href^="http://www.imdb.com/title/tt"]
+        selector: a[href*="www.imdb.com/title/tt"]
         attribute: href
       size:
         selector: a[rel="torrent_size"]
@@ -163,5 +234,3 @@
             args: ["Κυριακή", "Sunday"]
           - name: dateparse
             args: "02-01-2006 15:04"
-
-        

src/Jackett.Common/Definitions/katcrs.yml

@@ -1,85 +0,0 @@
----
-  site: katcrs
-  name: KATcrs
-  description: "KATcrs is a Public KickAssTorrent clone for TV / MOVIES / GENERAL"
-  language: en-us
-  type: public
-  encoding: UTF-8
-  followredirect: true
-  links:
-    - http://kickasstvshow.host/
-  legacylinks:
-    - https://kickasskatcr.website/
-    - https://kickasskatcr.stream/
-    - https://kickassextratorrent.xyz/
-    - https://kickassextratorrent.website/
-    - https://kickassextratorrent.club/
-    - https://kickasstvshow.xyz/
-
-  caps:
-    categories:
-      movies: Movies
-      TV: TV
-      Video: TV/WEB-DL
-      Anime: TV/Anime
-      Music: Audio
-      Books: Books
-      Documentary: TV/Documentary
-      Games: Console
-      Apps: PC
-      Applications: PC
-      Other: Other
-      Othero: XXX
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
-
-  settings: []
-
-  search:
-    paths:
-      - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{else}}new/{{end}}"
-    rows:
-      selector: table.data tr.odd
-      filters:
-        - name: andmatch
-    fields:
-      category:
-        selector: span.uploader_block strong a
-        attribute: href
-        filters:
-          - name: trim
-            args: /
-      title:
-        selector: td:nth-child(1) div a.cellMainLink
-        attribute: title
-      details:
-        selector: td:nth-child(1) div a.cellMainLink
-        attribute: href
-      download:
-        selector: td:nth-child(1) div div a[data-download=""]
-        attribute: href
-      magnet:
-        selector: td:nth-child(1) div div a[data-nop=""]
-        attribute: href
-        # temp fix for #5372
-        filters: 
-          - name: urldecode
-          - name: replace
-            args: [" ⭐", ""]
-      size:
-        selector: td:nth-child(2)
-      date:
-        selector: td:nth-child(3)
-        filters:
-          - name: timeago
-      seeders:
-        selector: td:nth-child(4)
-      leechers:
-        selector: td:nth-child(5)
-      downloadvolumefactor:
-        text: "0"
-      uploadvolumefactor:
-        text: "1"

src/Jackett.Common/Definitions/kickasstorrent-kathow.yml

@@ -55,10 +55,8 @@
         filters:
           - name: querystring
             args: url
-          - name: urldecode
-          # temp fix for #5372
-          - name: replace
-            args: [" ⭐", ""]
+          - name: replace # temp fix for #5372
+            args: ["%E2%AD%90", ""]
       size:
         selector: td:nth-child(2)
         filters:

src/Jackett.Common/Definitions/kickasstorrent.yml

@@ -185,7 +185,16 @@
       files:
         selector: td[data-title="Files"]
       date:
-        selector: td[data-title="Age"]
+        selector: td[data-title="Age"]:contains("-")
+        attribute: title
+        optional: true
+        filters:
+          - name: dateparse
+            args: "2006-01-02"
+      date:
+        selector: td[data-title="Age"]:not(:contains("-"))
+        attribute: title
+        optional: true
         filters:
           - name: dateparse
             args: "2006-01-02 15:04:05"

src/Jackett.Common/Definitions/kikibt.yml

@@ -1,74 +0,0 @@
----
-  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://kikibt8.me/
-  legacylinks:
-    -  https://kikibt.me/
-    -  http://kikibt.pw/
-    -  https://kikibt.cc/
-    -  https://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

@@ -178,7 +178,7 @@
           - 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 }}"]
+            args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
           - name: re_replace
             args: ["\\((\\d+p)\\)", "$1"]
           - name: replace

src/Jackett.Common/Definitions/lechaudron.yml

@@ -1,228 +0,0 @@
----
-  site: lechaudron
-  name: LeChaudron
-  description: "Le Chaudron is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
-  language: fr-fr
-  type: private
-  encoding: UTF-8
-  links:
-    - https://lechaudron.nl/
-
-  caps:
-    categorymappings:
-      - {id: 1, cat: XXX, desc: "Adultes - BD Erotique"}
-      - {id: 4, cat: XXX, desc: "Adultes - Doujin (Manga X)"}
-      - {id: 2, cat: XXX, desc: "Adultes - eBook XXX"}
-      - {id: 3, cat: XXX, desc: "Adultes - Film XXX"}
-      - {id: 5, cat: XXX, desc: "Adultes - Hentai"}
-      - {id: 6, cat: TV/Anime, desc: "Animations - 3D"}
-      - {id: 7, cat: TV/Anime, desc: "Animations - 4K Light"}
-      - {id: 8, cat: TV/Anime, desc: "Animations - 4K UHD"}
-      - {id: 9, cat: TV/Anime, desc: "Animations - BDRIP-BRRIP"}
-      - {id: 10, cat: TV/Anime, desc: "Animations - BluRay-R"}
-      - {id: 11, cat: TV/Anime, desc: "Animations - DVD-R"}
-      - {id: 12, cat: TV/Anime, desc: "Animations - DVDRIP"}
-      - {id: 13, cat: TV/Anime, desc: "Animations - Film Jap-Anim"}
-      - {id: 14, cat: TV/Anime, desc: "Animations - HD 1080P"}
-      - {id: 15, cat: TV/Anime, desc: "Animations - HD 720p"}
-      - {id: 16, cat: TV/Anime, desc: "Animations - HDRIP"}
-      - {id: 17, cat: TV/Anime, desc: "Animations - HDTV"}
-      - {id: 18, cat: TV/Anime, desc: "Animations - HDTV 1080p"}
-      - {id: 19, cat: TV/Anime, desc: "Animations - HDTV 720p"}
-      - {id: 20, cat: TV/Anime, desc: "Animations - MHD 1080p"}
-      - {id: 21, cat: TV/Anime, desc: "Animations - MHD 720p"}
-      - {id: 22, cat: TV/Anime, desc: "Animations - REMUX"}
-      - {id: 23, cat: TV/Anime, desc: "Animations - Serie Animee"}
-      - {id: 24, cat: TV/Anime, desc: "Animations - Serie Jap-Anim"}
-      - {id: 25, cat: TV/Anime, desc: "Animations - TVRIP"}
-      - {id: 26, cat: TV/Anime, desc: "Animations - WEB-DL"}
-      - {id: 27, cat: TV/Anime, desc: "Animations - WEB-DL 1080p"}
-      - {id: 28, cat: TV/Anime, desc: "Animations - WEB-DL 720p"}
-      - {id: 29, cat: TV/Anime, desc: "Animations - WEBRIP"}
-      - {id: 31, cat: TV/Documentary, desc: "Documentaires - Emission TV"}
-      - {id: 32, cat: TV/Documentary, desc: "Documentaires - Film Documentaire"}
-      - {id: 33, cat: TV/Documentary, desc: "Documentaires - Spectacle"}
-      - {id: 34, cat: TV/Documentary, desc: "Documentaires - Sport"}
-      - {id: 41, cat: Movies/3D, desc: "Films - 3D"}
-      - {id: 42, cat: Movies/UHD, desc: "Films - 4K Light"}
-      - {id: 43, cat: Movies/UHD, desc: "Films - 4K UHD"}
-      - {id: 44, cat: Movies/BluRay, desc: "Films - BDRIP-BRRIP"}
-      - {id: 45, cat: Movies/BluRay, desc: "Films - BluRay-R"}
-      - {id: 46, cat: Movies, desc: "Films - Coffret"}
-      - {id: 47, cat: Movies/DVD, desc: "Films - DVD-R"}
-      - {id: 48, cat: Movies/DVD, desc: "Films - DVDRIP"}
-      - {id: 49, cat: Movies/HD, desc: "Films - HD 1080P"}
-      - {id: 50, cat: Movies/HD, desc: "Films - HD 720p"}
-      - {id: 51, cat: Movies/HD, desc: "Films - HDRIP"}
-      - {id: 52, cat: Movies/HD, desc: "Films - HDTV"}
-      - {id: 53, cat: Movies/HD, desc: "Films - HDTV 1080p"}
-      - {id: 54, cat: Movies/HD, desc: "Films - HDTV 720p"}
-      - {id: 55, cat: Movies/HD, desc: "Films - MHD 1080p"}
-      - {id: 56, cat: Movies/HD, desc: "Films - MHD 720p"}
-      - {id: 57, cat: Movies, desc: "Films - REMUX"}
-      - {id: 58, cat: Movies, desc: "Films - TVRIP"}
-      - {id: 59, cat: Movies/WEBDL, desc: "Films - WEB-DL"}
-      - {id: 60, cat: Movies/WEBDL, desc: "Films - WEB-DL 1080p"}
-      - {id: 61, cat: Movies/WEBDL, desc: "Films - WEB-DL 720p"}
-      - {id: 62, cat: Movies/WEBDL, desc: "Films - WEBRIP"}
-      - {id: 64, cat: Console/3DS, desc: "Jeux - 3DS-DS"}
-      - {id: 65, cat: PC/Phone-IOS, desc: "Jeux - IOS-OSX"}
-      - {id: 66, cat: PC/Games, desc: "Jeux - PC"}
-      - {id: 67, cat: Console/PSP, desc: "Jeux - PS-PSP-X"}
-      - {id: 68, cat: Console/Wii, desc: "Jeux - Wii - Wii-U"}
-      - {id: 69, cat: Console/Xbox, desc: "Jeux - XBOX"}
-      - {id: 35, cat: Audio/Audiobook, desc: "Livres - Audio-Book"}
-      - {id: 36, cat: Books, desc: "Livres - BD"}
-      - {id: 37, cat: Books/Magazines, desc: "Livres - Magazine"}
-      - {id: 38, cat: Books/Comics, desc: "Livres - MANGAS"}
-      - {id: 39, cat: Books, desc: "Livres - Presse"}
-      - {id: 40, cat: Books/Ebook, desc: "Livres - Roman"}
-      - {id: 70, cat: PC/Phone-Android, desc: "Logiciels - ANDROID"}
-      - {id: 71, cat: PC/Mac, desc: "Logiciels - APPLE"}
-      - {id: 72, cat: PC/Phone-IOS, desc: "Logiciels - IPHONE"}
-      - {id: 73, cat: PC, desc: "Logiciels - LINUX"}
-      - {id: 74, cat: PC/0day, desc: "Logiciels - WINDOWS"}
-      - {id: 75, cat: TV, desc: "Pack - 3D"}
-      - {id: 76, cat: TV/UHD, desc: "Pack - 4K Light"}
-      - {id: 77, cat: TV/UHD, desc: "Pack - 4KUHD"}
-      - {id: 78, cat: TV/HD, desc: "Pack - BDRIP-BRRIP"}
-      - {id: 79, cat: TV/HD, desc: "Pack - BluRay-R"}
-      - {id: 80, cat: TV/SD, desc: "Pack - DVD-R"}
-      - {id: 81, cat: TV/SD, desc: "Pack - DVDRIP"}
-      - {id: 82, cat: TV/HD, desc: "Pack - HD 1080P"}
-      - {id: 83, cat: TV/HD, desc: "Pack - HD 720p"}
-      - {id: 84, cat: TV/HD, desc: "Pack - HDRIP"}
-      - {id: 85, cat: TV/HD, desc: "Pack - HDTV"}
-      - {id: 86, cat: TV/HD, desc: "Pack - HDTV 1080p"}
-      - {id: 87, cat: TV/HD, desc: "Pack - HDTV 720p"}
-      - {id: 88, cat: TV/HD, desc: "Pack - MHD 1080p"}
-      - {id: 89, cat: TV/HD, desc: "Pack - MHD 720p"}
-      - {id: 90, cat: TV, desc: "Pack - REMUX"}
-      - {id: 91, cat: TV, desc: "Pack - TVRIP"}
-      - {id: 92, cat: TV/WEB-DL, desc: "Pack - WEB-DL"}
-      - {id: 93, cat: TV/WEB-DL, desc: "Pack - WEB-DL 1080p"}
-      - {id: 94, cat: TV/WEB-DL, desc: "Pack - WEB-DL 720p"}
-      - {id: 95, cat: TV/WEB-DL, desc: "Pack - WEBRIP"}
-      - {id: 97, cat: TV, desc: "Series - 3D"}
-      - {id: 98, cat: TV/UHD, desc: "Series - 4K Light"}
-      - {id: 99, cat: TV/UHD, desc: "Series - 4KUHD"}
-      - {id: 100, cat: TV/HD, desc: "Series - BDRIP-BRRIP"}
-      - {id: 101, cat: TV/HD, desc: "Series - BluRay-R"}
-      - {id: 102, cat: TV/SD, desc: "Series - DVD-R"}
-      - {id: 103, cat: TV/SD, desc: "Series - DVDRIP"}
-      - {id: 104, cat: TV/HD, desc: "Series - HD 1080P"}
-      - {id: 105, cat: TV/HD, desc: "Series - HD 720p"}
-      - {id: 106, cat: TV/HD, desc: "Series - HDRIP"}
-      - {id: 107, cat: TV/HD, desc: "Series - HDTV"}
-      - {id: 108, cat: TV/HD, desc: "Series - HDTV 1080p"}
-      - {id: 109, cat: TV/HD, desc: "Series - HDTV 720p"}
-      - {id: 110, cat: TV/HD, desc: "Series - MHD 1080p"}
-      - {id: 111, cat: TV/HD, desc: "Series - MHD 720p"}
-      - {id: 112, cat: TV, desc: "Series - REMUX"}
-      - {id: 113, cat: TV, desc: "Series - TVRIP"}
-      - {id: 114, cat: TV/WEB-DL, desc: "Series - WEB-DL"}
-      - {id: 115, cat: TV/WEB-DL, desc: "Series - WEB-DL 1080p"}
-      - {id: 116, cat: TV/WEB-DL, desc: "Series - WEB-DL 720p"}
-      - {id: 117, cat: TV/WEB-DL, desc: "Series - WEBRIP"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
-
-  login:
-    path: TTV3/Connexion
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: font[color="red"]
-    test:
-      path: TTV3/Bienvenue
-      selector: a[href$="/TTV3/Deconnexion"]
-
-  search:
-    paths:
-    # https://lechaudron.nl/TTV3/Torrents/Recherche?recherche=viva+maria&type=exacte&endroit=nomtorrent&langue=0&tl=peuimporte
-    # categories for searching are unsupported
-      - path: TTV3/Torrents/Recherche
-    inputs:
-      recherche: "{{ .Keywords }}"
-      # searchtype un (one word) tout (all words) exacte (exact expression)
-      type: "tout"
-      # searchin  nomtorrent (name) or desctorrent (descr)
-      endroit: "nomtorrent"
-      # language 0 all 2 english 
-      langue: 0
-      # freeleech oui (yes) non (no) peuimporte (ignore)
-      tl: "peuimporte"
-
-    rows:
-      selector: tr.t-row
-    fields:
-      category:
-        selector: a[href*="/SousCategories/"]
-        attribute: href
-        filters:        
-          - name: regexp
-            args: (\d+)$
-      title:
-        selector: a[onmouseover]
-        attribute: onmouseover
-        filters:
-          - name: regexp
-            args: "<b>(.*?)</b>"
-      details:
-        selector: a[onmouseover]
-        attribute: href
-      download:
-        selector: a[href*="/Telechargement/"]
-        attribute: href
-      date:
-        selector: a[onmouseover] font[color="#F2F2F2"]
-        filters:
-          - name: regexp
-            args: "Il y a (.*?)\\s-" 
-          - 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"]
-          - name: replace
-            args: ["Ans", "years"]
-          - name: replace
-            args: ["An", "year"]
-          - name: append
-            args: " ago"
-      banner:
-        selector: a[onmouseover]
-        attribute: onmouseover
-        filters:
-          - name: regexp
-            args: "src= (.*?)><"
-      size:
-        selector: td:nth-last-child(5)
-      grabs:
-        selector: td:nth-last-child(4)
-      seeders:
-        selector: td:nth-last-child(3)
-      leechers:
-        selector: td:nth-last-child(2)
-      downloadvolumefactor:
-        case:
-          img[src$="/images/Torrents/freeleech.png"]: "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
-# TT3.00 FRENCH

src/Jackett.Common/Definitions/magico.yml

@@ -108,7 +108,7 @@
       action: "login"
       loginbox_membername: "{{ .Config.username }}"
       loginbox_password: "{{ .Config.password }}"
-      loginbox_remember: "true"
+      loginbox_remember: 1
     selectorinputs:
       securitytoken:
         selector: "script:contains(\"stKey: \")"
@@ -128,7 +128,7 @@
       - name: replace # use this as a workaround till #893 is implemented
         args: ["Greys Anatomy", "Grey's Anatomy"]
       - name: re_replace
-        args: ["[^a-zA-Z0-9]+", "%25"]
+        args: ["[^\\w\\d]+", "%25"]
     inputs:
       p: "torrents"
       pid: "32"
@@ -162,7 +162,7 @@
         attribute: href
       imdb:
         optional: true
-        selector: a[href^="http://www.imdb.com/title/tt"]
+        selector: a[href*="www.imdb.com/title/tt"]
         attribute: href
       size:
         selector: a[rel="torrent_size"]

src/Jackett.Common/Definitions/majomparade.yml

@@ -120,7 +120,7 @@
         attribute: href
       imdb:
         optional: true
-        selector: a[href^="https://www.imdb.com/title/"]
+        selector: a[href*="www.imdb.com/title/tt"]
         attribute: href
       banner:
         optional: true

src/Jackett.Common/Definitions/megabliz.yml

@@ -1,132 +0,0 @@
----
-  site: megabliz
-  name: Mega-Bliz
-  description: "Mega-Bliz is a Private site for MOVIES / TV / GENERAL"
-  language: en-us
-  type: private
-  encoding: UTF-8
-  links:
-    - https://mega-bliz.nl/
-
-  caps:
-    categorymappings:
-      - {id: 9, cat: TV/Anime, desc: "Anime"}
-      - {id: 1, cat: PC/0day, desc: "Apps"}
-      - {id: 13, cat: PC/0day, desc: "Apps"}
-      - {id: 5, cat: TV, desc: "Episodes"}
-      - {id: 2, cat: PC/Games, desc: "Games"}
-      - {id: 12, cat: PC/Games, desc: "Games/PC Rips"}
-      - {id: 8, cat: Console/Other, desc: "Games/PS2"}
-      - {id: 7, cat: Console/PSP, desc: "Games/PSP"}
-      - {id: 3, cat: Movies, desc: "Movies"}
-      - {id: 11, cat: Movies/SD, desc: "Movies/HDTV"}
-      - {id: 10, cat: Movies/SD, desc: "Movies/XviD"}
-      - {id: 4, cat: Audio, desc: "Music"}
-      - {id: 14, cat: Audio, desc: "Music"}
-      - {id: 6, cat: XXX, desc: "XXX"}
-
-    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: incldead
-      type: select
-      label: "Search Torrents that are:"
-      default: "0"
-      options:
-        "0" : "Active"
-        "1": "Including Dead"
-        "2": "Only Dead"
-    - name: onlyfree
-      type: checkbox
-      label: Show only Free torrents
-      default: false
-    - 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.
-
-  login:
-    path: login.php
-    method: form
-    form: form[action="takelogin.php"]
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      submitme: "X"
-    error:
-      - selector: h2
-        message:
-          selector: table tr td.text
-    test:
-      path: browse.php
-      selector: a[href*="logout.php?hash_please="]
-
-  search:
-    paths:
-      - path: browse.php      
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Keywords }}"
-      searchin: "title"
-      incldead: "{{ .Config.incldead }}"
-      "only_free": "{{ if .Config.onlyfree }}1{{else}}0{{end}}"
-
-    rows:
-      selector: tr.browse_color
-      filters:
-        - name: andmatch
-    fields:
-      category:
-        selector: td:nth-of-type(1) a
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      title:
-        selector: td:nth-of-type(2) a
-        attribute: onmouseover
-        filters:
-          - name: split
-            args: [">", "1"]
-          - name: replace
-            args: ["</b", ""]
-      details:
-        selector: td:nth-of-type(2) a
-        attribute: href
-      download:
-        selector: td:nth-of-type(3) a
-        attribute: href
-      files:
-        selector: td:nth-of-type(5)
-      date:
-        selector: td:nth-of-type(7)
-        filters:
-          - name: dateparse
-            args: "Jan 02 2006 03:04 PM"
-      size:
-        selector: td:nth-of-type(8)
-      grabs:
-        selector: td:nth-of-type(9) a
-        filters:
-          - name: regexp
-            args: "([\\d]+)"
-      seeders:
-        selector: td:nth-of-type(10)
-      leechers:
-        selector: td:nth-of-type(11)
-      downloadvolumefactor:
-        case:
-          "img[title=\"Free Torrent\"]": "0" # torrent specific free leech (icon)?
-          "a.info:contains(\"Free\")": "0" # global freeleech note?
-          "*": "1"
-      uploadvolumefactor:
-        text: "1"

src/Jackett.Common/Definitions/mkvcage.yml

@@ -6,11 +6,12 @@
   type: public
   encoding: UTF-8
   links:
-    - https://www.mkvcage.com/
+    - https://www.mkvcage.nl/
 
   legacylinks:
     - https://www.mkvcage.ws/
     - https://mkvcage.com/
+    - https://www.mkvcage.com/
 
   caps:
     categories:

src/Jackett.Common/Definitions/movcr.yml

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

src/Jackett.Common/Definitions/netlab.yml

@@ -0,0 +1,111 @@
+---
+  site: netlab
+  name: NetLab
+  description: "NetLab is a RUSSIAN Private Torrent Tracker"
+  language: ru-ru
+  type: private
+  encoding: windows-1251
+  links:
+    - https://torrent.e2k.ru/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Movies/DVD, desc: "DVD5"}
+      - {id: 4, cat: Movies/DVD, desc: "DVD9"}
+      - {id: 5, cat: Movies/WEBDL, desc: "MPEG/AVI"}
+      - {id: 6, cat: Audio, desc: "Музыка (Music)"}
+      - {id: 7, cat: PC/Games, desc: "Игры (Games)"}
+      - {id: 9, cat: PC/0day, desc: "Программы (Apps)"}
+      - {id: 10, cat: TV/HD, desc: "HDTV"}
+      - {id: 11, cat: Audio/Audiobook, desc: "Аудио Книги (Audiobooks)"}
+      - {id: 12, cat: Books/Ebook, desc: "Книги (Ebooks)"}
+      - {id: 14, cat: Other, desc: "Разное (Other)"}
+      - {id: 15, cat: Audio/Video, desc: "МузDVD (Music/Video)"}
+
+    modes:
+      search: [q]
+      movie-search: [q]
+      music-search: [q, album, artist, label, year]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: striprussian
+      type: checkbox
+      label: Strip Russian Letters
+      default: false
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      returnto: "/my.php"
+    error:
+      - selector: td.embedded:contains("Ошибка")
+    test:
+      path: my.php
+      selector: a[href="logout.php"]
+
+  search:
+    paths:
+    # https://torrent.e2k.ru/browse.php?c1=1&c4=1&c10=1&incldead=0&search=
+      - path: browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{if .Query.Artist}}{{ .Query.Artist }}{{else}}{{ .Keywords }}{{end}}"
+      # 0 active 1 incldead 2 onlydead
+      incldead: 1
+    rows:
+      selector: table[border="1"][cellspacing="0"][cellpadding="5"] > tbody > tr:has(a[href^="details.php?id="])
+    fields:
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        selector: a[href^="details.php?id="]
+        filters:
+          - name: re_replace
+            args: ["[\\:\\-\\/\\|]", " "]
+          - name: re_replace
+            args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      magnet:
+        selector: a[href^="magnet:?xt="]
+        optional: true
+        attribute: href      
+      files:
+        selector: td:nth-child(3)
+      date:
+        selector: td:nth-child(4)
+        filters:
+          - name: dateparse
+            args: "2006-01-0215:04:05"
+      size:
+        selector: td:nth-child(5)
+      grabs:
+        selector: td:nth-child(6)
+        filters:
+          - name: regexp
+            args: (\d+) 
+      seeders:
+        selector: td:nth-child(7)
+      leechers:
+        selector: td:nth-child(8)
+      downloadvolumefactor:
+          text: 1
+      uploadvolumefactor:
+          text: 1

src/Jackett.Common/Definitions/newstudio.yml

@@ -1,9 +1,9 @@
 ---
   site: newstudio
   name: Newstudio
-  description: "Newstudio is a RUSSIAN Semi-Private site for TV"
+  description: "Newstudio is a RUSSIAN Public site for TV"
   language: ru-ru
-  type: semi-private
+  type: public
   encoding: UTF-8
   links:
     - http://newstudio.tv/
@@ -16,18 +16,7 @@
       search: [q]
       tv-search: [q, season, ep]
 
-  login:
-    path: login.php
-    method: post
-    inputs:
-      login: 1
-      login_username: "{{ .Config.username }}"
-      login_password: "{{ .Config.password }}"
-    error:
-      - selector: div.alert-error
-    test:
-      path: "/"
-      selector: a[href="/login.php?logout=1"]
+  settings: []
 
   search:
     paths:

src/Jackett.Common/Definitions/newstudiol.yml

@@ -0,0 +1,118 @@
+---
+  site: newstudiol
+  name: NewstudioL
+  description: "this is the Newstudio indexer with Login enabled in the config."
+  language: ru-ru
+  type: semi-private
+  encoding: UTF-8
+  links:
+    - http://newstudio.tv/
+
+  caps:
+    categorymappings:
+      - {id: 6, cat: TV, desc: "TV series"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: login.php
+    method: post
+    inputs:
+      login: 1
+      login_username: "{{ .Config.username }}"
+      login_password: "{{ .Config.password }}"
+    error:
+      - selector: div.alert-error
+    test:
+      path: "/"
+      selector: a[href="/login.php?logout=1"]
+
+  search:
+    paths:
+      - path: "tracker.php?nm={{ .Keywords}}"
+      - path: "tracker.php?nm={{ .Keywords}}&start=50"
+      - path: "tracker.php?nm={{ .Keywords}}&start=100"
+      - path: "tracker.php?nm={{ .Keywords}}&start=150"
+    rows:
+      selector: table.well > tbody > tr:has(a[href^="./viewtopic.php?t="])
+      filters:
+        - name: andmatch
+    fields:
+      title:
+        selector: a[href^="./viewtopic.php?t="] > b
+        filters:
+          - name: re_replace
+            args: ["\\b(\\d)\\b", "0$1"]
+          - name: re_replace
+            args: [".+Сезон\\s+(\\d+)(?:.+Серия\\s+(\\d+))*[\\s\\S]*\\/\\s+(.+)\\s+\\(\\d+\\)\\s+(\\S*)\\s*(\\w*\\d*).*", "$3 - S$1E$2 - rus $5 $4 newstudio"]
+          - name: replace
+            args: ["WEBDLRip","WEBDL"]
+          - name: replace
+            args: ["HDTVRip","HDTV"]
+          - name: replace
+            args: ["E -","E01-99 -"]
+      details:
+        selector: a[href^="./viewtopic.php?t="]
+        attribute: href
+      download:
+        selector: a[href^="./download.php?id="]
+        attribute: href
+      banner:
+        selector: td:nth-child(3) > a > img
+        attribute: src
+      size:
+        selector: td:nth-child(5) > a
+      category:
+        # add category for Sonarr
+        text: 6
+      date:
+        # 16-Nov-17, Today 01:34
+        # 16-Ноя-17, Сегодня 12:34
+        # 15-Nov-17, Yesterday 17:20
+        # 15-Ноя-17, Вчера 12:40
+        # 4-Nov-17, 23:50
+        # 14-Ноя-17, 06:11
+        selector: td:nth-child(6)
+        filters:
+            # replace white spaces
+          - name: re_replace
+            args: ["(Сегодня|Вчера|\\s|,|-)+", " "]
+          - name: re_replace
+            args: ["(Today|Yesterday|\\s|,|-)+", " "]
+            # 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: append
+            args: ":00 +05:00"
+          - name: dateparse
+            args: "2 Jan 06 15:04:05 -07:00"
+      downloadvolumefactor:
+        case:
+          img[src="images/tor_gold.gif"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+          text: "1"

src/Jackett.Common/Definitions/nitro.yml

@@ -0,0 +1,80 @@
+---
+  site: nitro
+  name: Nitro
+  description: "Nitro is a POLISH Public Torrent Tracker"
+  language: pl-pl
+  type: public
+  encoding: UTF-8
+  links:
+    - http://nitro.to/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: TV, desc: "Seriale"}
+      - {id: 2, cat: Movies, desc: "Filmy"}
+      - {id: 3, cat: Audio, desc: "Muzyka"}
+      - {id: 4, cat: PC/Games, desc: "Gry"}
+      - {id: 5, cat: TV/Anime, desc: "Anime"}
+      - {id: 6, cat: PC, desc: "Programy"}
+      - {id: 7, cat: Books, desc: "E-Booki/Książki"}
+      - {id: 8, cat: Audio/Audiobook, desc: "Audio Booki"}
+      - {id: 9, cat: PC/Phone-Other, desc: "GSM/PDA"}
+      - {id: 10, cat: Other, desc: "Inne"}
+      - {id: 11, cat: XXX, desc: "XXX"}
+      - {id: 144, cat: Other, desc: "Nieposortowane"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings: []
+
+  search:
+    paths:
+      - path: tags.php
+    inputs:
+      search: "{{ .Keywords }}"
+      # 0 poster 1 list
+      where: 1
+      per: 50
+      # 0 all 1 active 2 dead
+      active: 1
+      order: data
+    rows:
+      selector: table[width="100%"] > tbody > tr:has(a[onclick="getMagnet(this)"])
+    fields:
+      title:
+        selector: a[href^="/torrent/"]
+      details:
+        selector: a[href^="/torrent/"]
+        attribute: href
+      category:
+        selector: a[href^="/tags.php?tags="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: tags
+      magnet:
+        selector: a[onclick="getMagnet(this)"]
+        attribute: title
+        filters:
+          - name: replace
+            args: ["/__DWNMAGNET__?", "download_magnet.php?"]
+          - name: prepend
+            args: "{{ .Config.sitelink }}"
+      date:
+        selector: td:nth-child(1)
+        filters:
+          - name: dateparse
+            args: "02/01/2006"
+      size:
+        selector: td:nth-child(4)
+      seeders:
+        selector: td:nth-child(6)
+      leechers:
+        selector: td:nth-child(7)
+      downloadvolumefactor:
+        text: 0
+      uploadvolumefactor:
+        text: 1

src/Jackett.Common/Definitions/nostalgic.yml

@@ -6,6 +6,8 @@
   type: private
   encoding: UTF-8
   links:
+    - https://nostalgic.is/
+  legacylinks:
     - https://nostalgic.to/
 
   caps:

src/Jackett.Common/Definitions/nyaa-pantsu.yml

@@ -11,6 +11,8 @@
   type: public
   encoding: UTF-8
   links:
+    - https://nyaa.net/
+  legacylinks:
     - https://nyaa.pantsu.cat/
     - https://nyaa.pt/
     

src/Jackett.Common/Definitions/ourbits.yml

@@ -25,7 +25,7 @@
     modes:
       search: [q]
       tv-search: [q, season, ep, imdbid]
-      movie-search: [imdbid]
+      movie-search: [q, imdbid]
 
   login:
     path: takelogin.php
@@ -38,11 +38,11 @@
         message:
           selector: td.text
     test:
-      path: torrents.php
+      path: index.php
       selector: a[href="logout.php"]
 
   ratio:
-    path: torrents.php
+    path: index.php
     selector: span.medium:has(a[href="logout.php"])
     filters:
       - name: replace
@@ -53,7 +53,6 @@
   search:
     paths:
       - path: torrents.php
-        method: get
     inputs:
       $raw: "{{range .Categories}}cat{{.}}=1&{{end}}"
       search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"