Norbits: fix login error handling

Improvements

.gitattributes

@@ -0,0 +1,15 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+
+# Declare files that will always have LF line endings on checkout.
+*.yml text eol=lf
+
+# Declare files that will always have CRLF line endings on checkout.
+*.cs text eol=crlf
+
+# Denote all files that are truly binary and should not be modified.
+*.png binary
+*.jpg binary

README.md

@@ -35,6 +35,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  
 ### Supported Private Trackers
  * 2 Fast 4 You
+ * 3D Torrents
  * 7tor
  * Abnormal
  * Acid-Lounge
@@ -52,6 +53,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * bB
  * Best Friends
  * BeyondHD
+ * BIGTorrent
  * Bit-City Reloaded
  * BIT-HDTV
  * BitHQ
@@ -66,7 +68,10 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * BTNext
  * Carpathians
  * CHDBits
+ * Cinematik
+ * Cinemageddon
  * CinemaZ
+ * Classix
  * CZTeam
  * DanishBits
  * DataScene
@@ -98,16 +103,20 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * HD4Free
  * HD-Space
  * HD-Torrents
+ * HD-Bits.com
+ * HDBits
+ * HDChina
  * HDClub
  * HDHome
- * HDPter
  * HDSky
+ * HDTorrents.it
  * Hebits
  * Hon3y HD
  * Hounddawgs
  * House-of-Torrents
  * Hyperay
  * ICE Torrent
+ * I Love Classics
  * Immortalseed
  * Infinity-T
  * inPeril
@@ -115,6 +124,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * IPTorrents
  * JPopsuki
  * Kapaki
+ * Karagarga
  * Le Paradis Du Net
  * LinkoManija
  * LosslessClub
@@ -133,6 +143,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * NextGen
  * Norbits  [![(invite needed)][inviteneeded]](#) <!-- added by DiseaseNO but no longer maintained? -->
  * notwhat.cd
+ * Ourbits
  * Passione Torrent <!-- maintained by bonny1992 -->
  * PassThePopcorn  [![(invite needed)][inviteneeded]](#)
  * PirateTheNet
@@ -150,6 +161,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * RoDVD
  * RuTracker
  * SceneAccess
+ * SceneFZ
  * SceneTime
  * SDBits
  * Secret Cinema
@@ -159,6 +171,8 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Shellife
  * SpeedCD
  * Superbits
+ * Tasmanit
+ * The Empire
  * The Horror Charnel
  * The New Retro
  * The Shinning
@@ -168,6 +182,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Torrent Network
  * Torrent Sector Crew
  * Torrent411
+ * Torrent9
  * TorrentBD
  * TorrentBytes
  * TorrentCCF  [![(invite needed)][inviteneeded]](#)
@@ -187,6 +202,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * UHDBits
  * Ultimate Gamer Club
  * ULTRAHDCLUB
+ * Waffles
  * World-In-HD  [![(invite needed)][inviteneeded]](#)
  * WorldOfP2P
  * x264

src/Jackett.Console/Program.cs

@@ -1,236 +1,236 @@
-using CommandLine;
-using CommandLine.Text;
-using Jackett;
-using Jackett.Console;
-using Jackett.Indexers;
-using Jackett.Utils;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Reflection;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace JackettConsole
-{
-    public class Program
-    {
-        static void Main(string[] args)
-        {
-            try
-            {
-                var options = new ConsoleOptions();
-                if (!Parser.Default.ParseArguments(args, options) || options.ShowHelp == true)
-                {
-                    if (options.LastParserState != null && options.LastParserState.Errors.Count > 0)
-                    {
-                        var help = new HelpText();
-                        var errors = help.RenderParsingErrorsText(options, 2); // indent with two spaces
-                        Console.WriteLine("Jackett v" + Engine.ConfigService.GetVersion());
-                        Console.WriteLine("Switch error: " + errors);
-                        Console.WriteLine("See --help for further details on switches.");
-                        Environment.ExitCode = 1;
-                        return;
-                    }
-                    else
-                    {
-
-                        var text = HelpText.AutoBuild(options, (HelpText current) => HelpText.DefaultParsingErrorsHandler(options, current));
-                        text.Copyright = " ";
-                        text.Heading = "Jackett v" + Engine.ConfigService.GetVersion() + " options:";
-                        Console.WriteLine(text);
-                        Environment.ExitCode = 1;
-                        return;
-                    }
-                }
-                else
-                {
-
-                    if (options.ListenPublic && options.ListenPrivate)
-                    {
-                        Console.WriteLine("You can only use listen private OR listen publicly.");
-                        Environment.ExitCode = 1;
-                        return;
-                    }
-                    /*  ======     Options    =====  */
-
-                    // SSL Fix
-                    Startup.DoSSLFix = options.SSLFix;
-
-                    // Use curl
-                    if (options.Client != null)
-                        Startup.ClientOverride = options.Client.ToLowerInvariant();
-
-                    // Use Proxy
-                    if (options.ProxyConnection != null)
-                    {
-                        Startup.ProxyConnection = options.ProxyConnection.ToLowerInvariant();
-                        Engine.Logger.Info("Proxy enabled. " + Startup.ProxyConnection);
-                    }
-                    // Logging
-                    if (options.Logging)
-                        Startup.LogRequests = true;
-
-                    // Tracing
-                    if (options.Tracing)
-                        Startup.TracingEnabled = true;
-
-                    // Log after the fact as using the logger will cause the options above to be used
-
-                    if (options.Logging)
-                        Engine.Logger.Info("Logging enabled.");
-
-                    if (options.Tracing)
-                        Engine.Logger.Info("Tracing enabled.");
-
-                    if (options.SSLFix == true)
-                        Engine.Logger.Info("SSL ECC workaround enabled.");
-                    else if (options.SSLFix == false)
-                        Engine.Logger.Info("SSL ECC workaround has been disabled.");
-
-                    // Ignore SSL errors on Curl
-                    Startup.IgnoreSslErrors = options.IgnoreSslErrors;
-                    if (options.IgnoreSslErrors == true)
-                    {
-                        Engine.Logger.Info("Jackett will ignore SSL certificate errors.");
-                    }
-
-                    // Choose Data Folder
-                    if (!string.IsNullOrWhiteSpace(options.DataFolder))
-                    {
-                        Startup.CustomDataFolder = options.DataFolder.Replace("\"", string.Empty).Replace("'", string.Empty).Replace(@"\\", @"\");
-                        Engine.Logger.Info("Jackett Data will be stored in: " + Startup.CustomDataFolder);
-                    }
-
-                    /*  ======     Actions    =====  */
-
-                    // Install service
-                    if (options.Install)
-                    {
-                        Engine.ServiceConfig.Install();
-                        return;
-                    }
-
-                    // Uninstall service
-                    if (options.Uninstall)
-                    {
-                        Engine.Server.ReserveUrls(doInstall: false);
-                        Engine.ServiceConfig.Uninstall();
-                        return;
-                    }
-
-                    // Reserve urls
-                    if (options.ReserveUrls)
-                    {
-                        Engine.Server.ReserveUrls(doInstall: true);
-                        return;
-                    }
-
-                    // Start Service
-                    if (options.StartService)
-                    {
-                        if (!Engine.ServiceConfig.ServiceRunning())
-                        {
-                            Engine.ServiceConfig.Start();
-                        }
-                        return;
-                    }
-
-                    // Stop Service
-                    if (options.StopService)
-                    {
-                        if (Engine.ServiceConfig.ServiceRunning())
-                        {
-                            Engine.ServiceConfig.Stop();
-                        }
-                        return;
-                    }
-
-                    // Migrate settings
-                    if (options.MigrateSettings)
-                    {
-                        Engine.ConfigService.PerformMigration();
-                        return;
-                    }
-
-
-                    // Show Version
-                    if (options.ShowVersion)
-                    {
-                        Console.WriteLine("Jackett v" + Engine.ConfigService.GetVersion());
-                        return;
-                    }
-
-                    /*  ======     Overrides    =====  */
-
-                    // Override listen public
-                    if (options.ListenPublic || options.ListenPrivate)
-                    {
-                        if (Engine.Server.Config.AllowExternal != options.ListenPublic)
-                        {
-                            Engine.Logger.Info("Overriding external access to " + options.ListenPublic);
-                            Engine.Server.Config.AllowExternal = options.ListenPublic;
-                            if (System.Environment.OSVersion.Platform != PlatformID.Unix)
-                            {
-                                if (ServerUtil.IsUserAdministrator())
-                                {
-                                    Engine.Server.ReserveUrls(doInstall: true);
-                                }
-                                else
-                                {
-                                    Engine.Logger.Error("Unable to switch to public listening without admin rights.");
-                                    Environment.ExitCode = 1;
-                                    return;
-                                }
-                            }
-
-                            Engine.Server.SaveConfig();
-                        }
-                    }
-
-                    // Override port
-                    if (options.Port != 0)
-                    {
-                        if (Engine.Server.Config.Port != options.Port)
-                        {
-                            Engine.Logger.Info("Overriding port to " + options.Port);
-                            Engine.Server.Config.Port = options.Port;
-                            if (System.Environment.OSVersion.Platform != PlatformID.Unix)
-                            {
-                                if (ServerUtil.IsUserAdministrator())
-                                {
-                                    Engine.Server.ReserveUrls(doInstall: true);
-                                }
-                                else
-                                {
-                                    Engine.Logger.Error("Unable to switch ports when not running as administrator");
-                                    Environment.ExitCode = 1;
-                                    return;
-                                }
-                            }
-
-                            Engine.Server.SaveConfig();
-                        }
-                    }
-
-                    Startup.NoRestart = options.NoRestart;
-                }
-
-                Engine.Server.Initalize();
-                Engine.Server.Start();
-                Engine.RunTime.Spin();
-                Engine.Logger.Info("Server thread exit");
-            }
-            catch (Exception e)
-            {
-                Engine.Logger.Error(e, "Top level exception");
-            }
-        }
-    }
-}
-
+using CommandLine;
+using CommandLine.Text;
+using Jackett;
+using Jackett.Console;
+using Jackett.Indexers;
+using Jackett.Utils;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Reflection;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace JackettConsole
+{
+    public class Program
+    {
+        static void Main(string[] args)
+        {
+            try
+            {
+                var options = new ConsoleOptions();
+                if (!Parser.Default.ParseArguments(args, options) || options.ShowHelp == true)
+                {
+                    if (options.LastParserState != null && options.LastParserState.Errors.Count > 0)
+                    {
+                        var help = new HelpText();
+                        var errors = help.RenderParsingErrorsText(options, 2); // indent with two spaces
+                        Console.WriteLine("Jackett v" + Engine.ConfigService.GetVersion());
+                        Console.WriteLine("Switch error: " + errors);
+                        Console.WriteLine("See --help for further details on switches.");
+                        Environment.ExitCode = 1;
+                        return;
+                    }
+                    else
+                    {
+
+                        var text = HelpText.AutoBuild(options, (HelpText current) => HelpText.DefaultParsingErrorsHandler(options, current));
+                        text.Copyright = " ";
+                        text.Heading = "Jackett v" + Engine.ConfigService.GetVersion() + " options:";
+                        Console.WriteLine(text);
+                        Environment.ExitCode = 1;
+                        return;
+                    }
+                }
+                else
+                {
+
+                    if (options.ListenPublic && options.ListenPrivate)
+                    {
+                        Console.WriteLine("You can only use listen private OR listen publicly.");
+                        Environment.ExitCode = 1;
+                        return;
+                    }
+                    /*  ======     Options    =====  */
+
+                    // SSL Fix
+                    Startup.DoSSLFix = options.SSLFix;
+
+                    // Use curl
+                    if (options.Client != null)
+                        Startup.ClientOverride = options.Client.ToLowerInvariant();
+
+                    // Use Proxy
+                    if (options.ProxyConnection != null)
+                    {
+                        Startup.ProxyConnection = options.ProxyConnection.ToLowerInvariant();
+                        Engine.Logger.Info("Proxy enabled. " + Startup.ProxyConnection);
+                    }
+                    // Logging
+                    if (options.Logging)
+                        Startup.LogRequests = true;
+
+                    // Tracing
+                    if (options.Tracing)
+                        Startup.TracingEnabled = true;
+
+                    // Log after the fact as using the logger will cause the options above to be used
+
+                    if (options.Logging)
+                        Engine.Logger.Info("Logging enabled.");
+
+                    if (options.Tracing)
+                        Engine.Logger.Info("Tracing enabled.");
+
+                    if (options.SSLFix == true)
+                        Engine.Logger.Info("SSL ECC workaround enabled.");
+                    else if (options.SSLFix == false)
+                        Engine.Logger.Info("SSL ECC workaround has been disabled.");
+
+                    // Ignore SSL errors on Curl
+                    Startup.IgnoreSslErrors = options.IgnoreSslErrors;
+                    if (options.IgnoreSslErrors == true)
+                    {
+                        Engine.Logger.Info("Jackett will ignore SSL certificate errors.");
+                    }
+
+                    // Choose Data Folder
+                    if (!string.IsNullOrWhiteSpace(options.DataFolder))
+                    {
+                        Startup.CustomDataFolder = options.DataFolder.Replace("\"", string.Empty).Replace("'", string.Empty).Replace(@"\\", @"\");
+                        Engine.Logger.Info("Jackett Data will be stored in: " + Startup.CustomDataFolder);
+                    }
+
+                    /*  ======     Actions    =====  */
+
+                    // Install service
+                    if (options.Install)
+                    {
+                        Engine.ServiceConfig.Install();
+                        return;
+                    }
+
+                    // Uninstall service
+                    if (options.Uninstall)
+                    {
+                        Engine.Server.ReserveUrls(doInstall: false);
+                        Engine.ServiceConfig.Uninstall();
+                        return;
+                    }
+
+                    // Reserve urls
+                    if (options.ReserveUrls)
+                    {
+                        Engine.Server.ReserveUrls(doInstall: true);
+                        return;
+                    }
+
+                    // Start Service
+                    if (options.StartService)
+                    {
+                        if (!Engine.ServiceConfig.ServiceRunning())
+                        {
+                            Engine.ServiceConfig.Start();
+                        }
+                        return;
+                    }
+
+                    // Stop Service
+                    if (options.StopService)
+                    {
+                        if (Engine.ServiceConfig.ServiceRunning())
+                        {
+                            Engine.ServiceConfig.Stop();
+                        }
+                        return;
+                    }
+
+                    // Migrate settings
+                    if (options.MigrateSettings)
+                    {
+                        Engine.ConfigService.PerformMigration();
+                        return;
+                    }
+
+
+                    // Show Version
+                    if (options.ShowVersion)
+                    {
+                        Console.WriteLine("Jackett v" + Engine.ConfigService.GetVersion());
+                        return;
+                    }
+
+                    /*  ======     Overrides    =====  */
+
+                    // Override listen public
+                    if (options.ListenPublic || options.ListenPrivate)
+                    {
+                        if (Engine.Server.Config.AllowExternal != options.ListenPublic)
+                        {
+                            Engine.Logger.Info("Overriding external access to " + options.ListenPublic);
+                            Engine.Server.Config.AllowExternal = options.ListenPublic;
+                            if (System.Environment.OSVersion.Platform != PlatformID.Unix)
+                            {
+                                if (ServerUtil.IsUserAdministrator())
+                                {
+                                    Engine.Server.ReserveUrls(doInstall: true);
+                                }
+                                else
+                                {
+                                    Engine.Logger.Error("Unable to switch to public listening without admin rights.");
+                                    Environment.ExitCode = 1;
+                                    return;
+                                }
+                            }
+
+                            Engine.Server.SaveConfig();
+                        }
+                    }
+
+                    // Override port
+                    if (options.Port != 0)
+                    {
+                        if (Engine.Server.Config.Port != options.Port)
+                        {
+                            Engine.Logger.Info("Overriding port to " + options.Port);
+                            Engine.Server.Config.Port = options.Port;
+                            if (System.Environment.OSVersion.Platform != PlatformID.Unix)
+                            {
+                                if (ServerUtil.IsUserAdministrator())
+                                {
+                                    Engine.Server.ReserveUrls(doInstall: true);
+                                }
+                                else
+                                {
+                                    Engine.Logger.Error("Unable to switch ports when not running as administrator");
+                                    Environment.ExitCode = 1;
+                                    return;
+                                }
+                            }
+
+                            Engine.Server.SaveConfig();
+                        }
+                    }
+
+                    Startup.NoRestart = options.NoRestart;
+                }
+
+                Engine.Server.Initalize();
+                Engine.Server.Start();
+                Engine.RunTime.Spin();
+                Engine.Logger.Info("Server thread exit");
+            }
+            catch (Exception e)
+            {
+                Engine.Logger.Error(e, "Top level exception");
+            }
+        }
+    }
+}
+

src/Jackett.Test/TestWebClient.cs

@@ -1,6 +1,6 @@
-using Jackett.Services;
+using Jackett.Services;
 using Jackett.Utils.Clients;
-using NLog;
+using NLog;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -14,10 +14,10 @@ namespace JackettTest
         private Dictionary<WebRequest, Func<WebRequest, WebClientByteResult>> byteCallbacks = new Dictionary<WebRequest, Func<WebRequest, WebClientByteResult>>();
         private Dictionary<WebRequest, Func<WebRequest, WebClientStringResult>> stringCallbacks = new Dictionary<WebRequest, Func<WebRequest, WebClientStringResult>>();
 
-        public TestWebClient(IProcessService p, Logger l, IConfigurationService c)
+        public TestWebClient(IProcessService p, Logger l, IConfigurationService c)
             : base(p: p,
                    l: l,
-                   c: c)
+                   c: c)
         {
         }
 

src/Jackett.Updater/Program.cs

@@ -1,258 +1,259 @@
-using CommandLine;
-using Jackett.Services;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Web;
-/*
-// no supported by appveyor, disabeling for now
-#if __MonoCS__
-using Mono.Unix.Native;
-#endif
-*/
-
-namespace Jackett.Updater
-{
-    class Program
-    {
-        static void Main(string[] args)
-        {
-            new Program().Run(args);
-        }
-
-        private void Run(string[] args)
-        {
-            Engine.SetupLogging(null, "updater.txt");
-            Engine.Logger.Info("Jackett Updater v" + GetCurrentVersion());
-            Engine.Logger.Info("Options \"" + string.Join("\" \"", args) + "\"");
-            try {
-                var options = new UpdaterConsoleOptions();
-                if (Parser.Default.ParseArguments(args, options))
-                {
-                    ProcessUpdate(options);
-                }
-                else
-                {
-                    Engine.Logger.Error("Failed to process update arguments!");
-                    Console.ReadKey();
-                }
-            }
-            catch (Exception e)
-            {
-                Engine.Logger.Error(e, "Exception applying update!");
-            }
-        }
-
-        private string GetCurrentVersion()
-        {
-            var assembly = System.Reflection.Assembly.GetExecutingAssembly();
-            var fvi = FileVersionInfo.GetVersionInfo(assembly.Location);
-            return fvi.FileVersion;
-        }
-
-        private void KillPids(int[] pids)
-        {
-            foreach (var pid in pids)
-            {
-                try
-                {
-                    var proc = Process.GetProcessById(pid);
-                    Engine.Logger.Info("Killing process " + proc.Id);
-                    proc.Kill();
-                    var exited = proc.WaitForExit(5000);
-                    if (!exited)
-                        Engine.Logger.Info("Process " + pid.ToString() + " didn't exit within 5 seconds");
-/*
-// no supported by appveyor, disabeling for now
-#if __MonoCS__
-                    Engine.Logger.Info("Sending SIGKILL to process " + pid.ToString());
-                    Syscall.kill(proc.Id, Signum.SIGKILL);
-#endif
-*/
-                }
-                catch (ArgumentException e)
-                {
-                    Engine.Logger.Info("Process " + pid.ToString() + " is already dead");
-                }
-                catch (Exception e)
-                {
-                    Engine.Logger.Info("Error killing process " + pid.ToString());
-                    Engine.Logger.Info(e);
-                }
-            }
-        }
-
-        private void ProcessUpdate(UpdaterConsoleOptions options)
-        {
-            var updateLocation = GetUpdateLocation();
-            if(!(updateLocation.EndsWith("\\") || updateLocation.EndsWith("/")))
-            {
-                updateLocation += Path.DirectorySeparatorChar;
-            }
-
-            var pids = new int[] { };
-            if (options.KillPids != null)
-            {
-                var pidsStr = options.KillPids.Split(',').Where(pid => !string.IsNullOrWhiteSpace(pid)).ToArray();
-                pids = Array.ConvertAll(pidsStr, pid => int.Parse(pid));
-            }
-
-            var isWindows = System.Environment.OSVersion.Platform != PlatformID.Unix;
-            var trayRunning = false;
-            var trayProcesses = Process.GetProcessesByName("JackettTray");
-            if (isWindows)
-            {
-                if (trayProcesses.Count() > 0)
-                {  
-                    foreach (var proc in trayProcesses)
-                    {
-                        try
-                        {
-                            Engine.Logger.Info("Killing tray process " + proc.Id);
-                            proc.Kill();
-                            trayRunning = true;
-                        }
-                        catch { }
-                    }
-                }
-
-                // on unix we don't have to wait (we can overwrite files which are in use)
-                // On unix we kill the PIDs after the update so e.g. systemd can automatically restart the process
-                KillPids(pids);
-            }
-            Engine.Logger.Info("Finding files in: " + updateLocation);
-            var files = Directory.GetFiles(updateLocation, "*.*", SearchOption.AllDirectories);
-            foreach(var file in files)
-            {
-                var fileName = Path.GetFileName(file).ToLowerInvariant();
-
-                if (fileName.EndsWith(".zip") ||
-                    fileName.EndsWith(".tar") ||
-                    fileName.EndsWith(".gz"))
-                {
-                    continue;
-                }
-                try {
-                    Engine.Logger.Info("Copying " + fileName);
-                    var dest = Path.Combine(options.Path, file.Substring(updateLocation.Length));
-                    var destDir = Path.GetDirectoryName(dest);
-                    if (!Directory.Exists(destDir))
-                    {
-                        Engine.Logger.Info("Creating directory " + destDir);
-                        Directory.CreateDirectory(destDir);
-                    }
-                    File.Copy(file, dest, true);
-                }
-                catch(Exception e)
-                {
-                    Engine.Logger.Error(e);
-                }
-            }
-
-            // delete old dirs
-            string[] oldDirs = new string[] { "Content/logos" };
-
-            foreach (var oldDir in oldDirs)
-            {
-                try
-                {
-                    var deleteDir = Path.Combine(options.Path, oldDir);
-                    if (Directory.Exists(deleteDir))
-                    {
-                        Engine.Logger.Info("Deleting directory " + deleteDir);
-                        Directory.Delete(deleteDir, true);
-                    }
-                }
-                catch (Exception e)
-                {
-                    Engine.Logger.Error(e);
-                }
-            }
-
-
-            // delete old files
-            string[] oldFiles = new string[] {
-                "Content/css/jquery.dataTables.css",
-                "Content/css/jquery.dataTables_themeroller.css",
-                "Definitions/tspate.yml",
-                "Definitions/freakstrackingsystem.yml",
-                "Definitions/rarbg.yml",
-                "Definitions/t411.yml",
-            };
-
-            foreach (var oldFIle in oldFiles)
-            {
-                try
-                {
-                    var deleteFile = Path.Combine(options.Path, oldFIle);
-                    if (File.Exists(deleteFile))
-                    {
-                        Engine.Logger.Info("Deleting file " + deleteFile);
-                        File.Delete(deleteFile);
-                    }
-                }
-                catch (Exception e)
-                {
-                    Engine.Logger.Error(e);
-                }
-            }
-
-            // kill pids after the update on UNIX
-            if (!isWindows)
-                KillPids(pids);
-
-            if (options.NoRestart == false)
-            {
-                if (trayRunning)
-                {
-                    var startInfo = new ProcessStartInfo()
-                    {
-                        Arguments = options.Args,
-                        FileName = Path.Combine(options.Path, "JackettTray.exe"),
-                        UseShellExecute = true
-                    };
-
-                    Process.Start(startInfo);
-                }
-
-                if(string.Equals(options.Type, "JackettService.exe", StringComparison.InvariantCultureIgnoreCase))
-                {
-                    var serviceHelper = new ServiceConfigService(null, null);
-                    if (serviceHelper.ServiceExists())
-                    {
-                        serviceHelper.Start();
-                    }
-                } else
-                {
-                    var startInfo = new ProcessStartInfo()
-                    {
-                        Arguments = options.Args,
-                        FileName = Path.Combine(options.Path, "JackettConsole.exe"),
-                        UseShellExecute = true
-                    };
-
-                    if (!isWindows)
-                    {
-                        startInfo.Arguments = startInfo.FileName + " " + startInfo.Arguments;
-                        startInfo.FileName = "mono";
-                    }
-
-                    Engine.Logger.Info("Starting Jackett: " + startInfo.FileName + " " + startInfo.Arguments);
-                    Process.Start(startInfo);
-                }
-            }
-        }
-
-        private string GetUpdateLocation()
-        {
-            var location = new Uri(Assembly.GetEntryAssembly().GetName().CodeBase);
-            return new FileInfo(HttpUtility.UrlDecode(location.AbsolutePath)).DirectoryName;
-        }
-    }
-}
+using CommandLine;
+using Jackett.Services;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Web;
+/*
+// no supported by appveyor, disabeling for now
+#if __MonoCS__
+using Mono.Unix.Native;
+#endif
+*/
+
+namespace Jackett.Updater
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            new Program().Run(args);
+        }
+
+        private void Run(string[] args)
+        {
+            Engine.SetupLogging(null, "updater.txt");
+            Engine.Logger.Info("Jackett Updater v" + GetCurrentVersion());
+            Engine.Logger.Info("Options \"" + string.Join("\" \"", args) + "\"");
+            try {
+                var options = new UpdaterConsoleOptions();
+                if (Parser.Default.ParseArguments(args, options))
+                {
+                    ProcessUpdate(options);
+                }
+                else
+                {
+                    Engine.Logger.Error("Failed to process update arguments!");
+                    Console.ReadKey();
+                }
+            }
+            catch (Exception e)
+            {
+                Engine.Logger.Error(e, "Exception applying update!");
+            }
+        }
+
+        private string GetCurrentVersion()
+        {
+            var assembly = System.Reflection.Assembly.GetExecutingAssembly();
+            var fvi = FileVersionInfo.GetVersionInfo(assembly.Location);
+            return fvi.FileVersion;
+        }
+
+        private void KillPids(int[] pids)
+        {
+            foreach (var pid in pids)
+            {
+                try
+                {
+                    var proc = Process.GetProcessById(pid);
+                    Engine.Logger.Info("Killing process " + proc.Id);
+                    proc.Kill();
+                    var exited = proc.WaitForExit(5000);
+                    if (!exited)
+                        Engine.Logger.Info("Process " + pid.ToString() + " didn't exit within 5 seconds");
+/*
+// no supported by appveyor, disabeling for now
+#if __MonoCS__
+                    Engine.Logger.Info("Sending SIGKILL to process " + pid.ToString());
+                    Syscall.kill(proc.Id, Signum.SIGKILL);
+#endif
+*/
+                }
+                catch (ArgumentException e)
+                {
+                    Engine.Logger.Info("Process " + pid.ToString() + " is already dead");
+                }
+                catch (Exception e)
+                {
+                    Engine.Logger.Info("Error killing process " + pid.ToString());
+                    Engine.Logger.Info(e);
+                }
+            }
+        }
+
+        private void ProcessUpdate(UpdaterConsoleOptions options)
+        {
+            var updateLocation = GetUpdateLocation();
+            if(!(updateLocation.EndsWith("\\") || updateLocation.EndsWith("/")))
+            {
+                updateLocation += Path.DirectorySeparatorChar;
+            }
+
+            var pids = new int[] { };
+            if (options.KillPids != null)
+            {
+                var pidsStr = options.KillPids.Split(',').Where(pid => !string.IsNullOrWhiteSpace(pid)).ToArray();
+                pids = Array.ConvertAll(pidsStr, pid => int.Parse(pid));
+            }
+
+            var isWindows = System.Environment.OSVersion.Platform != PlatformID.Unix;
+            var trayRunning = false;
+            var trayProcesses = Process.GetProcessesByName("JackettTray");
+            if (isWindows)
+            {
+                if (trayProcesses.Count() > 0)
+                {  
+                    foreach (var proc in trayProcesses)
+                    {
+                        try
+                        {
+                            Engine.Logger.Info("Killing tray process " + proc.Id);
+                            proc.Kill();
+                            trayRunning = true;
+                        }
+                        catch { }
+                    }
+                }
+
+                // on unix we don't have to wait (we can overwrite files which are in use)
+                // On unix we kill the PIDs after the update so e.g. systemd can automatically restart the process
+                KillPids(pids);
+            }
+            Engine.Logger.Info("Finding files in: " + updateLocation);
+            var files = Directory.GetFiles(updateLocation, "*.*", SearchOption.AllDirectories);
+            foreach(var file in files)
+            {
+                var fileName = Path.GetFileName(file).ToLowerInvariant();
+
+                if (fileName.EndsWith(".zip") ||
+                    fileName.EndsWith(".tar") ||
+                    fileName.EndsWith(".gz"))
+                {
+                    continue;
+                }
+                try {
+                    Engine.Logger.Info("Copying " + fileName);
+                    var dest = Path.Combine(options.Path, file.Substring(updateLocation.Length));
+                    var destDir = Path.GetDirectoryName(dest);
+                    if (!Directory.Exists(destDir))
+                    {
+                        Engine.Logger.Info("Creating directory " + destDir);
+                        Directory.CreateDirectory(destDir);
+                    }
+                    File.Copy(file, dest, true);
+                }
+                catch(Exception e)
+                {
+                    Engine.Logger.Error(e);
+                }
+            }
+
+            // delete old dirs
+            string[] oldDirs = new string[] { "Content/logos" };
+
+            foreach (var oldDir in oldDirs)
+            {
+                try
+                {
+                    var deleteDir = Path.Combine(options.Path, oldDir);
+                    if (Directory.Exists(deleteDir))
+                    {
+                        Engine.Logger.Info("Deleting directory " + deleteDir);
+                        Directory.Delete(deleteDir, true);
+                    }
+                }
+                catch (Exception e)
+                {
+                    Engine.Logger.Error(e);
+                }
+            }
+
+
+            // delete old files
+            string[] oldFiles = new string[] {
+                "Content/css/jquery.dataTables.css",
+                "Content/css/jquery.dataTables_themeroller.css",
+                "Definitions/tspate.yml",
+                "Definitions/freakstrackingsystem.yml",
+                "Definitions/rarbg.yml",
+                "Definitions/t411.yml",
+                "Definitions/hdbc.yml", // renamed to hdbitscom
+            };
+
+            foreach (var oldFIle in oldFiles)
+            {
+                try
+                {
+                    var deleteFile = Path.Combine(options.Path, oldFIle);
+                    if (File.Exists(deleteFile))
+                    {
+                        Engine.Logger.Info("Deleting file " + deleteFile);
+                        File.Delete(deleteFile);
+                    }
+                }
+                catch (Exception e)
+                {
+                    Engine.Logger.Error(e);
+                }
+            }
+
+            // kill pids after the update on UNIX
+            if (!isWindows)
+                KillPids(pids);
+
+            if (options.NoRestart == false)
+            {
+                if (trayRunning)
+                {
+                    var startInfo = new ProcessStartInfo()
+                    {
+                        Arguments = options.Args,
+                        FileName = Path.Combine(options.Path, "JackettTray.exe"),
+                        UseShellExecute = true
+                    };
+
+                    Process.Start(startInfo);
+                }
+
+                if(string.Equals(options.Type, "JackettService.exe", StringComparison.InvariantCultureIgnoreCase))
+                {
+                    var serviceHelper = new ServiceConfigService(null, null);
+                    if (serviceHelper.ServiceExists())
+                    {
+                        serviceHelper.Start();
+                    }
+                } else
+                {
+                    var startInfo = new ProcessStartInfo()
+                    {
+                        Arguments = options.Args,
+                        FileName = Path.Combine(options.Path, "JackettConsole.exe"),
+                        UseShellExecute = true
+                    };
+
+                    if (!isWindows)
+                    {
+                        startInfo.Arguments = startInfo.FileName + " " + startInfo.Arguments;
+                        startInfo.FileName = "mono";
+                    }
+
+                    Engine.Logger.Info("Starting Jackett: " + startInfo.FileName + " " + startInfo.Arguments);
+                    Process.Start(startInfo);
+                }
+            }
+        }
+
+        private string GetUpdateLocation()
+        {
+            var location = new Uri(Assembly.GetEntryAssembly().GetName().CodeBase);
+            return new FileInfo(HttpUtility.UrlDecode(location.AbsolutePath)).DirectoryName;
+        }
+    }
+}

src/Jackett.Updater/UpdaterConsoleOptions.cs

@@ -13,8 +13,8 @@ namespace Jackett.Updater
         public string Path { get; set; }
 
         [Option('t', "Type", HelpText = "Install type")]
-        public string Type { get; set; }
-
+        public string Type { get; set; }
+
         [Option('a', "Args", HelpText = "Launch arguments")]
         public string Args { get; set; }
 

src/Jackett/Content/index.html

@@ -28,7 +28,7 @@
     <script src="../libs/handlebarsmoment.js"></script>
     <script src="../bootstrap/bootstrap.min.js"></script>
     <script src="../libs/bootstrap-notify.js"></script>
-    <script src="https://www.google.com/recaptcha/api.js?onload=onloadCallback&render=explicit" async defer></script>
+    <script src="https://www.google.com/recaptcha/api.js?render=explicit" async defer></script>
 
     <link href="../bootstrap/bootstrap.min.css" rel="stylesheet">
     <link href="../animate.css" rel="stylesheet">
@@ -149,7 +149,7 @@
 
     <script id="setup-item-nonlocalrecaptcha" type="text/x-handlebars-template">
         <div class="setup-item-recaptcha">
-            <p>This site requires you to enter a ReCaptcha however this only works when accessing Jackett via 127.0.0.1 (localhost doesn't work). If you cannot access Jackett using that hostname then alternatively you can enter the cookie for the site manually.  <a href="https://github.com/zone117x/Jackett/wiki/Finding-cookies" target="_blank">See here</a> on how get the cookies.</p>
+            <p>This site requires you to enter a ReCaptcha however this only works when accessing Jackett via 127.0.0.1 (localhost doesn't work). If you cannot access Jackett using that hostname then alternatively you can enter the cookie for the site manually.  <a href="https://github.com/Jackett/Jackett/wiki/Finding-cookies" target="_blank">See here</a> on how get the cookies.</p>
             <div class="setup-item-label">Full cookie header</div>
             <input class="form-control" type="text" value="" />
         </div>
@@ -443,7 +443,7 @@
                     <td>{{PublishDate}}</td>
                     <td>{{jacketTimespan PublishDate}}</td>
                     <td>{{Tracker}}</td>
-                    <td class="Title"><a href="{{Comments}}">{{Title}}</a> <span class="release-labels"></span></td>
+                    <td class="Title"><a href="{{Comments}}" target="_blank">{{Title}}</a> <span class="release-labels"></span></td>
                     <td>{{Size}}</td>
                     <td class="fit">{{jacketSize Size}}</td>
                     <td>{{Files}}</td>

src/Jackett/Controllers/PotatoController.cs

@@ -1,173 +1,173 @@
-using AutoMapper;
-using Jackett.Models;
-using Jackett.Services;
-using Jackett.Utils;
-using Jackett.Utils.Clients;
-using Newtonsoft.Json.Linq;
-using NLog;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Text;
-using System.Threading.Tasks;
-using System.Web;
-using System.Web.Http;
-
-namespace Jackett.Controllers
-{
-    [AllowAnonymous]
-    [JackettAPINoCache]
-    public class PotatoController : ApiController
-    {
-        private IIndexerManagerService indexerService;
-        private Logger logger;
-        private IServerService serverService;
-        private ICacheService cacheService;
-        private IWebClient webClient;
-
-        public static int[] MOVIE_CATS
-        {
-            get
-            {
-                var torznabQuery = new TorznabQuery()
-                {
-                    Categories = new int[1] { TorznabCatType.Movies.ID },
-                };
-
-                torznabQuery.ExpandCatsToSubCats();
-                    return torznabQuery.Categories;
-            }
-        }
-
-        public PotatoController(IIndexerManagerService i, Logger l, IServerService s, ICacheService c, IWebClient w)
-        {
-            indexerService = i;
-            logger = l;
-            serverService = s;
-            cacheService = c;
-            webClient = w;
-        }
-
-        [HttpGet]
-        public async Task<HttpResponseMessage> Call(string indexerID, [FromUri]TorrentPotatoRequest request)
-        {
-            var indexer = indexerService.GetIndexer(indexerID);
-          
-            var allowBadApiDueToDebug = false;
-#if DEBUG
-            allowBadApiDueToDebug = Debugger.IsAttached;
-#endif
-
-            if (!allowBadApiDueToDebug && !string.Equals(request.passkey, serverService.Config.APIKey, StringComparison.InvariantCultureIgnoreCase))
-            {
-                logger.Warn(string.Format("A request from {0} was made with an incorrect API key.", Request.GetOwinContext().Request.RemoteIpAddress));
-                return Request.CreateResponse(HttpStatusCode.Forbidden, "Incorrect API key");
-            }
-
-            if (!indexer.IsConfigured)
-            {
-                logger.Warn(string.Format("Rejected a request to {0} which is unconfigured.", indexer.DisplayName));
-                return Request.CreateResponse(HttpStatusCode.Forbidden, "This indexer is not configured.");
-            }
-
-            if (!indexer.TorznabCaps.Categories.Select(c => c.ID).Any(i => MOVIE_CATS.Contains(i))){
-                logger.Warn(string.Format("Rejected a request to {0} which does not support searching for movies.", indexer.DisplayName));
-                return Request.CreateResponse(HttpStatusCode.Forbidden, "This indexer does not support movies.");
-            }
-
-            var year = 0;
-
-            if (string.IsNullOrWhiteSpace(request.search))
-            {
-                // We are searching by IMDB id so look up the name
-                var omdbapiRequest = new Utils.Clients.WebRequest("http://www.omdbapi.com/?type=movie&i=" + request.imdbid);
-                omdbapiRequest.Encoding = Encoding.UTF8;
-                var response = await webClient.GetString(omdbapiRequest);
-                if (response.Status == HttpStatusCode.OK)
-                {
-                    JObject result = JObject.Parse(response.Content);
-                    if (result["Title"] != null)
-                    {
-                        request.search = result["Title"].ToString();
-                        year = ParseUtil.CoerceInt(result["Year"].ToString());
-                    }
-                }
-            }
-
-            var torznabQuery = new TorznabQuery()
-            {
-                ApiKey =  request.passkey,
-                Categories = MOVIE_CATS,
-                SearchTerm = request.search,
-                ImdbID = request.imdbid,
-                QueryType = "TorrentPotato"
-            };
-
-            IEnumerable<ReleaseInfo> releases = new List<ReleaseInfo>();
-
-            if (!string.IsNullOrWhiteSpace(torznabQuery.SanitizedSearchTerm))
-            {
-                releases = await indexer.PerformQuery(torznabQuery);
-                releases = indexer.CleanLinks(releases);
-            }
-
-            // Cache non query results
-            if (string.IsNullOrEmpty(torznabQuery.SanitizedSearchTerm))
-            {
-                cacheService.CacheRssResults(indexer, releases);
-            }
-
-            releases = indexer.FilterResults(torznabQuery, releases);
-            var serverUrl = string.Format("{0}://{1}:{2}{3}", Request.RequestUri.Scheme, Request.RequestUri.Host, Request.RequestUri.Port, serverService.BasePath());
-            var potatoResponse = new TorrentPotatoResponse();
-
-            releases = TorznabUtil.FilterResultsToTitle(releases, torznabQuery.SanitizedSearchTerm, year);
-            releases = TorznabUtil.FilterResultsToImdb(releases, request.imdbid);
-
-            foreach (var r in releases)
-            {
-                var release = Mapper.Map<ReleaseInfo>(r);
-                release.Link = serverService.ConvertToProxyLink(release.Link, serverUrl, indexerID, "dl", release.Title + ".torrent");
-
-                // Only accept torrent links, magnet is not supported
-                // This seems to be no longer the case, allowing magnet URIs for now
-                if (release.Link != null || release.MagnetUri != null)
-                {
-                    potatoResponse.results.Add(new TorrentPotatoResponseItem()
-                    {
-                        release_name = release.Title + "[" + indexer.DisplayName + "]", // Suffix the indexer so we can see which tracker we are using in CPS as it just says torrentpotato >.>
-                        torrent_id = release.Guid.ToString(),
-                        details_url = release.Comments.ToString(),
-                        download_url = (release.Link != null ? release.Link.ToString() : release.MagnetUri.ToString()),
-                        imdb_id = release.Imdb.HasValue ? "tt" + release.Imdb : null,
-                        freeleech = (release.DownloadVolumeFactor == 0 ? true : false),
-                        type = "movie",
-                        size = (long)release.Size / (1024 * 1024), // This is in MB
-                        leechers = (int)release.Peers - (int)release.Seeders,
-                        seeders = (int)release.Seeders,
-                        publish_date = r.PublishDate == DateTime.MinValue ? null : release.PublishDate.ToUniversalTime().ToString("s")
-                    });
-                }
-            }
-
-            // Log info
-            if (string.IsNullOrWhiteSpace(torznabQuery.SanitizedSearchTerm))
-            {
-                logger.Info(string.Format("Found {0} torrentpotato releases from {1}", releases.Count(), indexer.DisplayName));
-            }
-            else
-            {
-                logger.Info(string.Format("Found {0} torrentpotato releases from {1} for: {2}", releases.Count(), indexer.DisplayName, torznabQuery.GetQueryString()));
-            }
-
-            // Force the return as Json
-            return new HttpResponseMessage()
-            {
-                Content = new JsonContent(potatoResponse)
-            };
-        }
-    }
-}
+using AutoMapper;
+using Jackett.Models;
+using Jackett.Services;
+using Jackett.Utils;
+using Jackett.Utils.Clients;
+using Newtonsoft.Json.Linq;
+using NLog;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web;
+using System.Web.Http;
+
+namespace Jackett.Controllers
+{
+    [AllowAnonymous]
+    [JackettAPINoCache]
+    public class PotatoController : ApiController
+    {
+        private IIndexerManagerService indexerService;
+        private Logger logger;
+        private IServerService serverService;
+        private ICacheService cacheService;
+        private IWebClient webClient;
+
+        public static int[] MOVIE_CATS
+        {
+            get
+            {
+                var torznabQuery = new TorznabQuery()
+                {
+                    Categories = new int[1] { TorznabCatType.Movies.ID },
+                };
+
+                torznabQuery.ExpandCatsToSubCats();
+                    return torznabQuery.Categories;
+            }
+        }
+
+        public PotatoController(IIndexerManagerService i, Logger l, IServerService s, ICacheService c, IWebClient w)
+        {
+            indexerService = i;
+            logger = l;
+            serverService = s;
+            cacheService = c;
+            webClient = w;
+        }
+
+        [HttpGet]
+        public async Task<HttpResponseMessage> Call(string indexerID, [FromUri]TorrentPotatoRequest request)
+        {
+            var indexer = indexerService.GetIndexer(indexerID);
+          
+            var allowBadApiDueToDebug = false;
+#if DEBUG
+            allowBadApiDueToDebug = Debugger.IsAttached;
+#endif
+
+            if (!allowBadApiDueToDebug && !string.Equals(request.passkey, serverService.Config.APIKey, StringComparison.InvariantCultureIgnoreCase))
+            {
+                logger.Warn(string.Format("A request from {0} was made with an incorrect API key.", Request.GetOwinContext().Request.RemoteIpAddress));
+                return Request.CreateResponse(HttpStatusCode.Forbidden, "Incorrect API key");
+            }
+
+            if (!indexer.IsConfigured)
+            {
+                logger.Warn(string.Format("Rejected a request to {0} which is unconfigured.", indexer.DisplayName));
+                return Request.CreateResponse(HttpStatusCode.Forbidden, "This indexer is not configured.");
+            }
+
+            if (!indexer.TorznabCaps.Categories.Select(c => c.ID).Any(i => MOVIE_CATS.Contains(i))){
+                logger.Warn(string.Format("Rejected a request to {0} which does not support searching for movies.", indexer.DisplayName));
+                return Request.CreateResponse(HttpStatusCode.Forbidden, "This indexer does not support movies.");
+            }
+
+            var year = 0;
+
+            if (string.IsNullOrWhiteSpace(request.search))
+            {
+                // We are searching by IMDB id so look up the name
+                var omdbapiRequest = new Utils.Clients.WebRequest("http://www.omdbapi.com/?type=movie&i=" + request.imdbid);
+                omdbapiRequest.Encoding = Encoding.UTF8;
+                var response = await webClient.GetString(omdbapiRequest);
+                if (response.Status == HttpStatusCode.OK)
+                {
+                    JObject result = JObject.Parse(response.Content);
+                    if (result["Title"] != null)
+                    {
+                        request.search = result["Title"].ToString();
+                        year = ParseUtil.CoerceInt(result["Year"].ToString());
+                    }
+                }
+            }
+
+            var torznabQuery = new TorznabQuery()
+            {
+                ApiKey =  request.passkey,
+                Categories = MOVIE_CATS,
+                SearchTerm = request.search,
+                ImdbID = request.imdbid,
+                QueryType = "TorrentPotato"
+            };
+
+            IEnumerable<ReleaseInfo> releases = new List<ReleaseInfo>();
+
+            if (!string.IsNullOrWhiteSpace(torznabQuery.SanitizedSearchTerm))
+            {
+                releases = await indexer.PerformQuery(torznabQuery);
+                releases = indexer.CleanLinks(releases);
+            }
+
+            // Cache non query results
+            if (string.IsNullOrEmpty(torznabQuery.SanitizedSearchTerm))
+            {
+                cacheService.CacheRssResults(indexer, releases);
+            }
+
+            releases = indexer.FilterResults(torznabQuery, releases);
+            var serverUrl = string.Format("{0}://{1}:{2}{3}", Request.RequestUri.Scheme, Request.RequestUri.Host, Request.RequestUri.Port, serverService.BasePath());
+            var potatoResponse = new TorrentPotatoResponse();
+
+            releases = TorznabUtil.FilterResultsToTitle(releases, torznabQuery.SanitizedSearchTerm, year);
+            releases = TorznabUtil.FilterResultsToImdb(releases, request.imdbid);
+
+            foreach (var r in releases)
+            {
+                var release = Mapper.Map<ReleaseInfo>(r);
+                release.Link = serverService.ConvertToProxyLink(release.Link, serverUrl, indexerID, "dl", release.Title + ".torrent");
+
+                // Only accept torrent links, magnet is not supported
+                // This seems to be no longer the case, allowing magnet URIs for now
+                if (release.Link != null || release.MagnetUri != null)
+                {
+                    potatoResponse.results.Add(new TorrentPotatoResponseItem()
+                    {
+                        release_name = release.Title + "[" + indexer.DisplayName + "]", // Suffix the indexer so we can see which tracker we are using in CPS as it just says torrentpotato >.>
+                        torrent_id = release.Guid.ToString(),
+                        details_url = release.Comments.ToString(),
+                        download_url = (release.Link != null ? release.Link.ToString() : release.MagnetUri.ToString()),
+                        imdb_id = release.Imdb.HasValue ? "tt" + release.Imdb : null,
+                        freeleech = (release.DownloadVolumeFactor == 0 ? true : false),
+                        type = "movie",
+                        size = (long)release.Size / (1024 * 1024), // This is in MB
+                        leechers = (int)release.Peers - (int)release.Seeders,
+                        seeders = (int)release.Seeders,
+                        publish_date = r.PublishDate == DateTime.MinValue ? null : release.PublishDate.ToUniversalTime().ToString("s")
+                    });
+                }
+            }
+
+            // Log info
+            if (string.IsNullOrWhiteSpace(torznabQuery.SanitizedSearchTerm))
+            {
+                logger.Info(string.Format("Found {0} torrentpotato releases from {1}", releases.Count(), indexer.DisplayName));
+            }
+            else
+            {
+                logger.Info(string.Format("Found {0} torrentpotato releases from {1} for: {2}", releases.Count(), indexer.DisplayName, torznabQuery.GetQueryString()));
+            }
+
+            // Force the return as Json
+            return new HttpResponseMessage()
+            {
+                Content = new JsonContent(potatoResponse)
+            };
+        }
+    }
+}

src/Jackett/Controllers/TorznabController.cs

@@ -1,7 +1,7 @@
 using AutoMapper;
 using Jackett.Models;
 using Jackett.Services;
-using Jackett.Utils;
+using Jackett.Utils;
 using NLog;
 using System;
 using System.Collections.Generic;
@@ -13,8 +13,8 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Web;
 using System.Web.Http;
-using System.Xml.Linq;
-
+using System.Xml.Linq;
+
 namespace Jackett.Controllers
 {
     [AllowAnonymous]
@@ -34,8 +34,8 @@ namespace Jackett.Controllers
             cacheService = c;
         }
 
-        public HttpResponseMessage GetErrorXML(int code, string description)
-        {
+        public HttpResponseMessage GetErrorXML(int code, string description)
+        {
             var xdoc = new XDocument(
                 new XDeclaration("1.0", "UTF-8", null),
                 new XElement("error",
@@ -46,10 +46,10 @@ namespace Jackett.Controllers
 
             var xml = xdoc.Declaration.ToString() + Environment.NewLine + xdoc.ToString();
 
-            return new HttpResponseMessage()
-            {
+            return new HttpResponseMessage()
+            {
                 Content = new StringContent(xml, Encoding.UTF8, "application/xml")
-            };
+            };
         }
 
         [HttpGet]
@@ -82,33 +82,33 @@ namespace Jackett.Controllers
             {
                 logger.Warn(string.Format("Rejected a request to {0} which is unconfigured.", indexer.DisplayName));
                 return Request.CreateResponse(HttpStatusCode.Forbidden, "This indexer is not configured.");
-            }
-
+            }
+
             if (torznabQuery.ImdbID != null)
             {
-                if (torznabQuery.QueryType != "movie")
-                {
-                    logger.Warn(string.Format("A non movie request with an imdbid was made from {0}.", Request.GetOwinContext().Request.RemoteIpAddress));
-                    return GetErrorXML(201, "Incorrect parameter: only movie-search supports the imdbid parameter");
+                if (torznabQuery.QueryType != "movie")
+                {
+                    logger.Warn(string.Format("A non movie request with an imdbid was made from {0}.", Request.GetOwinContext().Request.RemoteIpAddress));
+                    return GetErrorXML(201, "Incorrect parameter: only movie-search supports the imdbid parameter");
                 }
 
-                if (!string.IsNullOrEmpty(torznabQuery.SearchTerm))
-                {
-                    logger.Warn(string.Format("A movie-search request from {0} was made contining q and imdbid.", Request.GetOwinContext().Request.RemoteIpAddress));
-                    return GetErrorXML(201, "Incorrect parameter: please specify either imdbid or q");
+                if (!string.IsNullOrEmpty(torznabQuery.SearchTerm))
+                {
+                    logger.Warn(string.Format("A movie-search request from {0} was made contining q and imdbid.", Request.GetOwinContext().Request.RemoteIpAddress));
+                    return GetErrorXML(201, "Incorrect parameter: please specify either imdbid or q");
                 }
 
                 torznabQuery.ImdbID = ParseUtil.GetFullImdbID(torznabQuery.ImdbID); // normalize ImdbID
-                if (torznabQuery.ImdbID == null)
+                if (torznabQuery.ImdbID == null)
                 {
                     logger.Warn(string.Format("A movie-search request from {0} was made with an invalid imdbid.", Request.GetOwinContext().Request.RemoteIpAddress));
-                    return GetErrorXML(201, "Incorrect parameter: invalid imdbid format");
+                    return GetErrorXML(201, "Incorrect parameter: invalid imdbid format");
                 }
 
-                if (!indexer.TorznabCaps.SupportsImdbSearch)
+                if (!indexer.TorznabCaps.SupportsImdbSearch)
                 {
                     logger.Warn(string.Format("A movie-search request with imdbid from {0} was made but the indexer {1} doesn't support it.", Request.GetOwinContext().Request.RemoteIpAddress, indexer.DisplayName));
-                    return GetErrorXML(203, "Function Not Available: imdbid is not supported by this indexer");
+                    return GetErrorXML(203, "Function Not Available: imdbid is not supported by this indexer");
                 }
             }
 

src/Jackett/CurlHelper.cs

@@ -92,16 +92,16 @@ namespace Jackett
                     easy.BufferSize = 64 * 1024;
                     easy.UserAgent = BrowserUtil.ChromeUserAgent;
                     easy.FollowLocation = false;
-                    easy.ConnectTimeout = 20;
-                    if(curlRequest.Headers != null)
-                    {
-                        CurlSlist curlHeaders = new CurlSlist();
-                        foreach (var header in curlRequest.Headers)
-                        {
-                            curlHeaders.Append(header.Key + ": " + header.Value);
-                        }
-                        easy.SetOpt(CurlOption.HttpHeader, curlHeaders);
-                    }
+                    easy.ConnectTimeout = 20;
+                    if(curlRequest.Headers != null)
+                    {
+                        CurlSlist curlHeaders = new CurlSlist();
+                        foreach (var header in curlRequest.Headers)
+                        {
+                            curlHeaders.Append(header.Key + ": " + header.Value);
+                        }
+                        easy.SetOpt(CurlOption.HttpHeader, curlHeaders);
+                    }
 
                     easy.WriteFunction = (byte[] buf, int size, int nmemb, object data) =>
                     {
@@ -151,8 +151,8 @@ namespace Jackett
                     {
                         easy.SetOpt(CurlOption.SslVerifyhost, false);
                         easy.SetOpt(CurlOption.SslVerifyPeer, false);
-                    }
-
+                    }
+
                     if (Startup.ProxyConnection != null)
                     {
                         easy.SetOpt(CurlOption.HttpProxyTunnel, 1);
@@ -173,14 +173,14 @@ namespace Jackett
 
                 var headerBytes = Combine(headerBuffers.ToArray());
                 var headerString = Encoding.UTF8.GetString(headerBytes);
-                if (Startup.ProxyConnection != null)
-                {
-                    var firstcrlf = headerString.IndexOf("\r\n\r\n");
-                    var secondcrlf = headerString.IndexOf("\r\n\r\n", firstcrlf + 1);
-                    if (secondcrlf > 0)
-                    {
-                        headerString = headerString.Substring(firstcrlf + 4, secondcrlf - (firstcrlf));
-                    }
+                if (Startup.ProxyConnection != null)
+                {
+                    var firstcrlf = headerString.IndexOf("\r\n\r\n");
+                    var secondcrlf = headerString.IndexOf("\r\n\r\n", firstcrlf + 1);
+                    if (secondcrlf > 0)
+                    {
+                        headerString = headerString.Substring(firstcrlf + 4, secondcrlf - (firstcrlf));
+                    }
                 }
                 var headerParts = headerString.Split(new char[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries);
                 var headers = new List<string[]>();
@@ -231,28 +231,28 @@ namespace Jackett
                 }
 
                 // add some debug output to track down the problem causing people getting InternalServerError results
-                if (status == HttpStatusCode.NotImplemented || status == HttpStatusCode.InternalServerError)
-                {
-                    try
-                    {
-                        OnErrorMessage("got NotImplemented/InternalServerError");
-                        OnErrorMessage("request.Method: " + curlRequest.Method);
-                        OnErrorMessage("request.Url: " + curlRequest.Url);
-                        OnErrorMessage("request.Cookies: " + curlRequest.Cookies);
-                        OnErrorMessage("request.Referer: " + curlRequest.Referer);
-                        OnErrorMessage("request.RawPOSTDdata: " + curlRequest.RawPOSTDdata);
-                        OnErrorMessage("cookies: "+ cookieBuilder.ToString().Trim());
-                        OnErrorMessage("headerString:\n" + headerString);
-                    
-                        foreach (var headerPart in headerParts)
-                        {
-                            OnErrorMessage("headerParts: "+headerPart);
-                        }
+                if (status == HttpStatusCode.NotImplemented || status == HttpStatusCode.InternalServerError)
+                {
+                    try
+                    {
+                        OnErrorMessage("got NotImplemented/InternalServerError");
+                        OnErrorMessage("request.Method: " + curlRequest.Method);
+                        OnErrorMessage("request.Url: " + curlRequest.Url);
+                        OnErrorMessage("request.Cookies: " + curlRequest.Cookies);
+                        OnErrorMessage("request.Referer: " + curlRequest.Referer);
+                        OnErrorMessage("request.RawPOSTDdata: " + curlRequest.RawPOSTDdata);
+                        OnErrorMessage("cookies: "+ cookieBuilder.ToString().Trim());
+                        OnErrorMessage("headerString:\n" + headerString);
+                    
+                        foreach (var headerPart in headerParts)
+                        {
+                            OnErrorMessage("headerParts: "+headerPart);
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        OnErrorMessage(string.Format("CurlHelper: error while handling NotImplemented/InternalServerError:\n{0}", ex));
                     }
-                    catch (Exception ex)
-                    {
-                        OnErrorMessage(string.Format("CurlHelper: error while handling NotImplemented/InternalServerError:\n{0}", ex));
-                    }
                 }
                 
                 var contentBytes = Combine(contentBuffers.ToArray());

src/Jackett/Definitions/2fast4you.yml

@@ -1,139 +1,139 @@
----
-  site: 2fast4you
-  name: 2 Fast 4 You
-  language: fr-fr
-  type: private
-  encoding: UTF-8
-  links:
-    - http://www.2f4y.me/
-
-  caps:
-    categorymappings:
-      - {id: 10, cat: TV/Anime, desc: "Animation: HD720P"}
-      - {id: 11, cat: TV/Anime, desc: "Animation: HD1080P"}
-      - {id: 56, cat: TV/Anime, desc: "Animation: DVDRip"}
-      - {id: 13, cat: TV/Anime, desc: "Animation: DVD"}
-      - {id: 18, cat: PC/0day, desc: "Applications: PC"}
-      - {id: 16, cat: PC/Games, desc: "Applications: Jeux"}
-      - {id: 19, cat: PC/Phone-Android, desc: "Applications: Android"}
-      - {id: 38, cat: PC/Phone-IOS, desc: "Applications: Mobile Phone"}
-      - {id: 17, cat: PC/0day, desc: "Applications: Autres"}
-      - {id: 67, cat: TV, desc: "Autres: Emission TV"}
-      - {id: 68, cat: TV/Sport, desc: "Autres: Sport"}
-      - {id: 40, cat: Other, desc: "Autres: Autres"}
-      - {id: 14, cat: TV/Documentary, desc: "Documentaires: DivX"}
-      - {id: 15, cat: TV/Documentary, desc: "Documentaires: HD"}
-      - {id: 76, cat: TV/Documentary, desc: "Documentaires: TVRip"}
-      - {id: 62, cat: Audio/Audiobook, desc: "E-Books: E-Books Audio"}
-      - {id: 50, cat: Books, desc: "E-Books: Manuel Français"}
-      - {id: 49, cat: Books, desc: "E-Books: Manuel Anglais"}
-      - {id: 36, cat: Books, desc: "E-Books: Livres Français"}
-      - {id: 53, cat: Books, desc: "E-Books: Livre Anglais"}
-      - {id: 52, cat: Books, desc: "E-Books: Revue - Journaux"}
-      - {id: 51, cat: Books, desc: "E-Books: BD"}
-      - {id: 66, cat: Movies, desc: "Films: VOSTFR"}
-      - {id: 71, cat: Movies/WEBDL, desc: "Films: WEB-DL"}
-      - {id: 65, cat: Movies, desc: "Films: VO"}
-      - {id: 72, cat: Movies/SD, desc: "Films: TVRip/HDTV"}
-      - {id: 70, cat: Movies/HD, desc: "Films: MHD X265"}
-      - {id: 57, cat: Movies/SD, desc: "Films: TS/CAM"}
-      - {id: 59, cat: Movies, desc: "Films: Spectacle"}
-      - {id: 55, cat: Movies/HD, desc: "Films: MHD 720P"}
-      - {id: 54, cat: Movies/HD, desc: "Films: MHD 1080P"}
-      - {id: 1, cat: Movies/HD, desc: "Films: HD720P"}
-      - {id: 2, cat: Movies/HD, desc: "Films: HD1080P"}
-      - {id: 90, cat: Movies/HD, desc: "Films: HD X265"}
-      - {id: 92, cat: Movies/HD, desc: "Films: 4K"}
-      - {id: 69, cat: Movies/3D, desc: "Films: Film 3D"}
-      - {id: 3, cat: Movies/DVD, desc: "Films: DVDRIP"}
-      - {id: 4, cat: Movies/DVD, desc: "Films: DVD5"}
-      - {id: 5, cat: Movies/DVD, desc: "Films: DVD9"}
-      - {id: 91, cat: Movies/HD, desc: "Films: RemuX"}
-      - {id: 89, cat: Movies/HD, desc: "Films: BD/BR Rip"}
-      - {id: 88, cat: Movies/BluRay, desc: "Films: Full BD/BR"}
-      - {id: 77, cat: Other, desc: "GPS: Cartes"}
-      - {id: 78, cat: Other, desc: "GPS: Radars"}
-      - {id: 79, cat: TV/Anime, desc: "Mangas: HD"}
-      - {id: 80, cat: TV/Anime, desc: "Mangas: HD VO"}
-      - {id: 81, cat: TV/Anime, desc: "Mangas: HD VOSTFR"}
-      - {id: 82, cat: TV/Anime, desc: "Mangas: DVDRIP"}
-      - {id: 83, cat: TV/Anime, desc: "Mangas: DVDRIP VO"}
-      - {id: 84, cat: TV/Anime, desc: "Mangas: DVDRIP VOSTFR"}
-      - {id: 85, cat: TV/Anime, desc: "Mangas: Web-DL"}
-      - {id: 86, cat: TV/Anime, desc: "Mangas: TV-RIP"}
-      - {id: 75, cat: Audio, desc: "Musique: Concert TVRip"}
-      - {id: 25, cat: Audio/MP3, desc: "Musique: Single MP3"}
-      - {id: 24, cat: Audio/Lossless, desc: "Musique: Single Flac"}
-      - {id: 22, cat: Audio/MP3, desc: "Musique: Album MP3"}
-      - {id: 23, cat: Audio/Lossless, desc: "Musique: Album Flac"}
-      - {id: 64, cat: Audio, desc: "Musique: Mégamix Maison"}
-      - {id: 58, cat: Audio, desc: "Musique: Concert"}
-      - {id: 61, cat: TV, desc: "Serie TV: Episode VOSTFR"}
-      - {id: 63, cat: TV, desc: "Serie TV: Episode VO"}
-      - {id: 12, cat: TV/Anime, desc: "Serie TV: Animation"}
-      - {id: 74, cat: TV, desc: "Serie TV: TVRip"}
-      - {id: 73, cat: TV/WEB-DL, desc: "Serie TV: WEB-DL"}
-      - {id: 7, cat: TV, desc: "Serie TV: Episode FR"}
-      - {id: 6, cat: TV, desc: "Serie TV: Saison FR"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: account-login.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: form:contains("Erreur")
-        message:
-          selector: form
-          remove: table
-    test:
-      path: torrents-search.php
-
-  search:
-    path: torrents-search.php
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
-      incldead: "1"
-
-    rows:
-      selector: table.ttable_headinner > tbody > tr[class^="t-row"]
-    fields:
-      download:
-        selector: a[href^="torrents-details.php?id="]
-        attribute: href
-        filters:
-          - name: replace
-            args: ["torrents-details.php", "download.php"]
-      title:
-        selector: a[href^="torrents-details.php?id="]
-      category:
-        selector: a[href^="torrents.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      details:
-        selector: a[href^="torrents-details.php?id="]
-        attribute: href
-      banner:
-        selector: img.rounded-img
-        attribute: src
-      size:
-        selector: td:nth-child(5)
-      seeders:
-        selector: td:nth-child(6)
-      leechers:
-        selector: td:nth-child(7)
-      downloadvolumefactor:
-        case:
-          img[title="freeleech"]: "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
+---
+  site: 2fast4you
+  name: 2 Fast 4 You
+  language: fr-fr
+  type: private
+  encoding: UTF-8
+  links:
+    - http://www.2f4y.me/
+
+  caps:
+    categorymappings:
+      - {id: 10, cat: TV/Anime, desc: "Animation: HD720P"}
+      - {id: 11, cat: TV/Anime, desc: "Animation: HD1080P"}
+      - {id: 56, cat: TV/Anime, desc: "Animation: DVDRip"}
+      - {id: 13, cat: TV/Anime, desc: "Animation: DVD"}
+      - {id: 18, cat: PC/0day, desc: "Applications: PC"}
+      - {id: 16, cat: PC/Games, desc: "Applications: Jeux"}
+      - {id: 19, cat: PC/Phone-Android, desc: "Applications: Android"}
+      - {id: 38, cat: PC/Phone-IOS, desc: "Applications: Mobile Phone"}
+      - {id: 17, cat: PC/0day, desc: "Applications: Autres"}
+      - {id: 67, cat: TV, desc: "Autres: Emission TV"}
+      - {id: 68, cat: TV/Sport, desc: "Autres: Sport"}
+      - {id: 40, cat: Other, desc: "Autres: Autres"}
+      - {id: 14, cat: TV/Documentary, desc: "Documentaires: DivX"}
+      - {id: 15, cat: TV/Documentary, desc: "Documentaires: HD"}
+      - {id: 76, cat: TV/Documentary, desc: "Documentaires: TVRip"}
+      - {id: 62, cat: Audio/Audiobook, desc: "E-Books: E-Books Audio"}
+      - {id: 50, cat: Books, desc: "E-Books: Manuel Français"}
+      - {id: 49, cat: Books, desc: "E-Books: Manuel Anglais"}
+      - {id: 36, cat: Books, desc: "E-Books: Livres Français"}
+      - {id: 53, cat: Books, desc: "E-Books: Livre Anglais"}
+      - {id: 52, cat: Books, desc: "E-Books: Revue - Journaux"}
+      - {id: 51, cat: Books, desc: "E-Books: BD"}
+      - {id: 66, cat: Movies, desc: "Films: VOSTFR"}
+      - {id: 71, cat: Movies/WEBDL, desc: "Films: WEB-DL"}
+      - {id: 65, cat: Movies, desc: "Films: VO"}
+      - {id: 72, cat: Movies/SD, desc: "Films: TVRip/HDTV"}
+      - {id: 70, cat: Movies/HD, desc: "Films: MHD X265"}
+      - {id: 57, cat: Movies/SD, desc: "Films: TS/CAM"}
+      - {id: 59, cat: Movies, desc: "Films: Spectacle"}
+      - {id: 55, cat: Movies/HD, desc: "Films: MHD 720P"}
+      - {id: 54, cat: Movies/HD, desc: "Films: MHD 1080P"}
+      - {id: 1, cat: Movies/HD, desc: "Films: HD720P"}
+      - {id: 2, cat: Movies/HD, desc: "Films: HD1080P"}
+      - {id: 90, cat: Movies/HD, desc: "Films: HD X265"}
+      - {id: 92, cat: Movies/HD, desc: "Films: 4K"}
+      - {id: 69, cat: Movies/3D, desc: "Films: Film 3D"}
+      - {id: 3, cat: Movies/DVD, desc: "Films: DVDRIP"}
+      - {id: 4, cat: Movies/DVD, desc: "Films: DVD5"}
+      - {id: 5, cat: Movies/DVD, desc: "Films: DVD9"}
+      - {id: 91, cat: Movies/HD, desc: "Films: RemuX"}
+      - {id: 89, cat: Movies/HD, desc: "Films: BD/BR Rip"}
+      - {id: 88, cat: Movies/BluRay, desc: "Films: Full BD/BR"}
+      - {id: 77, cat: Other, desc: "GPS: Cartes"}
+      - {id: 78, cat: Other, desc: "GPS: Radars"}
+      - {id: 79, cat: TV/Anime, desc: "Mangas: HD"}
+      - {id: 80, cat: TV/Anime, desc: "Mangas: HD VO"}
+      - {id: 81, cat: TV/Anime, desc: "Mangas: HD VOSTFR"}
+      - {id: 82, cat: TV/Anime, desc: "Mangas: DVDRIP"}
+      - {id: 83, cat: TV/Anime, desc: "Mangas: DVDRIP VO"}
+      - {id: 84, cat: TV/Anime, desc: "Mangas: DVDRIP VOSTFR"}
+      - {id: 85, cat: TV/Anime, desc: "Mangas: Web-DL"}
+      - {id: 86, cat: TV/Anime, desc: "Mangas: TV-RIP"}
+      - {id: 75, cat: Audio, desc: "Musique: Concert TVRip"}
+      - {id: 25, cat: Audio/MP3, desc: "Musique: Single MP3"}
+      - {id: 24, cat: Audio/Lossless, desc: "Musique: Single Flac"}
+      - {id: 22, cat: Audio/MP3, desc: "Musique: Album MP3"}
+      - {id: 23, cat: Audio/Lossless, desc: "Musique: Album Flac"}
+      - {id: 64, cat: Audio, desc: "Musique: Mégamix Maison"}
+      - {id: 58, cat: Audio, desc: "Musique: Concert"}
+      - {id: 61, cat: TV, desc: "Serie TV: Episode VOSTFR"}
+      - {id: 63, cat: TV, desc: "Serie TV: Episode VO"}
+      - {id: 12, cat: TV/Anime, desc: "Serie TV: Animation"}
+      - {id: 74, cat: TV, desc: "Serie TV: TVRip"}
+      - {id: 73, cat: TV/WEB-DL, desc: "Serie TV: WEB-DL"}
+      - {id: 7, cat: TV, desc: "Serie TV: Episode FR"}
+      - {id: 6, cat: TV, desc: "Serie TV: Saison FR"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: account-login.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: form:contains("Erreur")
+        message:
+          selector: form
+          remove: table
+    test:
+      path: torrents-search.php
+
+  search:
+    path: torrents-search.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      incldead: "1"
+
+    rows:
+      selector: table.ttable_headinner > tbody > tr[class^="t-row"]
+    fields:
+      download:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: href
+        filters:
+          - name: replace
+            args: ["torrents-details.php", "download.php"]
+      title:
+        selector: a[href^="torrents-details.php?id="]
+      category:
+        selector: a[href^="torrents.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      details:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: href
+      banner:
+        selector: img.rounded-img
+        attribute: src
+      size:
+        selector: td:nth-child(5)
+      seeders:
+        selector: td:nth-child(6)
+      leechers:
+        selector: td:nth-child(7)
+      downloadvolumefactor:
+        case:
+          img[title="freeleech"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
           "*": "1"

src/Jackett/Definitions/3dtorrents.yml

@@ -0,0 +1,102 @@
+---
+  site: 3dtorrents
+  name: 3D Torrents
+  description: "3D Movie tracker"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - http://www.3dtorrents.org/
+
+  caps:
+    categorymappings:
+      - {id: 14, cat: Movies, desc: "Movies XviD"}
+      - {id: 34, cat: Movies, desc: "Movies UltraHD"}
+      - {id: 15, cat: Movies, desc: "Movies DVD-R"}
+      - {id: 11, cat: Movies, desc: "Movies 720p"}
+      - {id: 13, cat: Movies, desc: "Movies 1080p"}
+      - {id: 16, cat: Movies, desc: "Movies 3DTV"}
+      - {id: 17, cat: Movies, desc: "Movies Blu-ray"}
+      - {id: 27, cat: Movies, desc: "Movies BD25 Encode"}
+      - {id: 33, cat: Movies, desc: "Movies BD9 AVCHD"}
+      - {id: 22, cat: Movies, desc: "Movies 2D to 3D Conv"}
+      - {id: 32, cat: Movies, desc: "Bluray MKV Remux"}
+      - {id: 23, cat: Movies, desc: "Movies Evo 3D"}
+      - {id: 21, cat: PC, desc: "3D Software"}
+      - {id: 2, cat: Audio, desc: "Music"}
+      - {id: 28, cat: XXX, desc: "Adult 720p"}
+      - {id: 29, cat: XXX, desc: "Adult 1080p"}
+      - {id: 30, cat: XXX, desc: "Adult Blu-ray"}
+      - {id: 31, cat: Other, desc: "Misc"}
+      - {id: 19, cat: Audio, desc: "Audio Packs"}
+
+    modes:
+      search: [q]
+
+  login:
+    path: index.php?page=login&returnto=index.php
+    method: form
+    form: form
+    inputs:
+      uid: "{{ .Config.username }}"
+      pwd: "{{ .Config.password }}"
+    captcha:
+      type: image
+      image: img.captcha
+      input: private_key
+    error:
+      - selector: span.errormsg
+    test:
+      path: index.php
+
+  download:
+    selector: a[href^="download.php?id="]
+        
+  search:
+    path: index.php
+    inputs:
+      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      page: torrents
+      category: 0
+      3dformat: 0
+      active: 1
+    rows:
+      selector: table[cellspacing!="1"].lista > tbody > tr:has(a[href^="index.php?page=torrents&category="])
+    fields:
+      category:
+        selector: a[href^="index.php?page=torrents&category="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: category
+      title:
+        remove: span
+        selector: td:nth-child(2)
+      download:
+        selector: a[href^="index.php?page=torrent-details&id="]
+        attribute: href
+        filters:
+          - name: replace
+            args: ["index.php?page=torrent-details&id=", "download.php?id="]
+      details:
+        selector: a[href^="index.php?page=torrent-details&id="]
+        attribute: href
+      size:
+        selector: td:nth-last-child(4)
+      seeders:
+        selector: td:nth-last-child(3)
+      # leechers:
+      #   selector: td:nth-last-child(2)
+      date:
+        selector: td:nth-last-child(5)
+        filters:
+          - name: dateparse
+            args: "02/01/2006"
+      downloadvolumefactor:
+        case:
+          img[title^="You get 50% off download count on this torrent"]: "0.5"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett/Definitions/aox.yml

@@ -1,124 +1,124 @@
----
-  site: aox
-  name: AOX
-  language: en-us
-  type: private
-  encoding: UTF-8
-  links:
-    - https://aox.to/
-
-  caps:
-    categorymappings:
-      # Japanese
-      - {id: 1, cat: Movies, desc: "jMovies"}
-      - {id: 2, cat: TV, desc: "TV Shows"}
-      - {id: 3, cat: TV/Other, desc: "Variety Shows"}
-
-      # Korean
-      - {id: 6, cat: Movies, desc: "kMovies"}
-      - {id: 4, cat: TV, desc: "TV Shows"}
-      - {id: 14, cat: TV/Other, desc: "Variety Shows"}
-
-      # Chinese
-      - {id: 8, cat: Movies, desc: "cMovies"}
-      - {id: 9, cat: TV, desc: "TV Shows"}
-      - {id: 13, cat: TV/Other, desc: "Variety Shows"}
-      
-      # Adult
-      - {id: 13, 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
-
-  download:
-    selector: a[href^="download.php?id="]
-
-  search:
-    path: index.php
-    inputs:
-      search: "{{ .Query.Keywords }}"
-      page: "torrents"
-      category: "{{range .Categories}}{{.}};{{end}}"
-      options: "0"
-      active: "0"
-    rows:
-      selector: table > tbody > tr > td > table.lista > tbody > tr:has(a[href^="index.php?page=torrent-details&id="])
-    fields:
-      download:
-        selector: a[href^="index.php?page=downloadcheck&id="]
-        attribute: href
-      title:
-        selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-      banner:
-        selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-        attribute: onmouseover
-        filters:
-          - name: regexp
-            args: "src=(.*?) "
-      category:
-        selector: a[href^="index.php?page=torrents&category="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: category
-      details:
-        selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-        attribute: href
-      size:
-        selector: td:nth-child(12)
-      date:
-        selector: td:nth-child(7)
-        filters:
-          - name: append
-            args: " +01:00"
-          - name: dateparse
-            args: "02/01/2006 -07:00"
-      grabs:
-        selector: td:nth-child(10)
-        filters:
-          - name: replace
-            args: ["---", "0"]
-      seeders:
-        selector: td:nth-child(8)
-      leechers:
-        selector: td:nth-child(9)
-      downloadvolumefactor:
-        case:
-          img[alt="Full Star 100% Free"]: "0"
-          img[alt="Half Star 50% Free"]: "0.5"
-          img[alt="Empty Star 25% Free"]: "0.75"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
-      description:
-        selector: td:nth-child(2)
-        remove: a
-      description|append:
-        selector: td:nth-child(3) > img
-        attribute: title
-        filters:
-          - name: prepend
-            args: "<br>Language: "
-        
+---
+  site: aox
+  name: AOX
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://aox.to/
+
+  caps:
+    categorymappings:
+      # Japanese
+      - {id: 1, cat: Movies, desc: "jMovies"}
+      - {id: 2, cat: TV, desc: "TV Shows"}
+      - {id: 3, cat: TV/Other, desc: "Variety Shows"}
+
+      # Korean
+      - {id: 6, cat: Movies, desc: "kMovies"}
+      - {id: 4, cat: TV, desc: "TV Shows"}
+      - {id: 14, cat: TV/Other, desc: "Variety Shows"}
+
+      # Chinese
+      - {id: 8, cat: Movies, desc: "cMovies"}
+      - {id: 9, cat: TV, desc: "TV Shows"}
+      - {id: 13, cat: TV/Other, desc: "Variety Shows"}
+      
+      # Adult
+      - {id: 13, 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
+
+  download:
+    selector: a[href^="download.php?id="]
+
+  search:
+    path: index.php
+    inputs:
+      search: "{{ .Query.Keywords }}"
+      page: "torrents"
+      category: "{{range .Categories}}{{.}};{{end}}"
+      options: "0"
+      active: "0"
+    rows:
+      selector: table > tbody > tr > td > table.lista > tbody > tr:has(a[href^="index.php?page=torrent-details&id="])
+    fields:
+      download:
+        selector: a[href^="index.php?page=downloadcheck&id="]
+        attribute: href
+      title:
+        selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
+      banner:
+        selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "src=(.*?) "
+      category:
+        selector: a[href^="index.php?page=torrents&category="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: category
+      details:
+        selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
+        attribute: href
+      size:
+        selector: td:nth-child(12)
+      date:
+        selector: td:nth-child(7)
+        filters:
+          - name: append
+            args: " +01:00"
+          - name: dateparse
+            args: "02/01/2006 -07:00"
+      grabs:
+        selector: td:nth-child(10)
+        filters:
+          - name: replace
+            args: ["---", "0"]
+      seeders:
+        selector: td:nth-child(8)
+      leechers:
+        selector: td:nth-child(9)
+      downloadvolumefactor:
+        case:
+          img[alt="Full Star 100% Free"]: "0"
+          img[alt="Half Star 50% Free"]: "0.5"
+          img[alt="Empty Star 25% Free"]: "0.75"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"
+      description:
+        selector: td:nth-child(2)
+        remove: a
+      description|append:
+        selector: td:nth-child(3) > img
+        attribute: title
+        filters:
+          - name: prepend
+            args: "<br>Language: "
+        
         

src/Jackett/Definitions/apollo.yml

@@ -1,95 +1,95 @@
----
-  site: apollo
-  name: Apollo
-  description: "A music tracker"
-  language: en-us
-  type: private
-  encoding: UTF-8
-  links:
-    - https://apollo.rip
-
-  caps:
-    categorymappings:
-      - {id: 1, cat: Audio, desc: "Music"}
-      - {id: 2, cat: PC, desc: "Applications"}
-      - {id: 3, cat: Books, desc: "E-Books"}
-      - {id: 4, cat: Audio/Audiobook, desc: "Audiobooks"}
-      - {id: 5, cat: Movies, desc: "E-Learning Videos"}
-      - {id: 6, cat: TV, desc: "Comedy"}
-      - {id: 7, cat: Books/Comics, desc: "Comics"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: login.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      keeplogged: 1
-      login: "Log in"
-    error:
-      - selector: form#loginform > span.warning
-    test:
-      path: torrents.php
-
-  ratio:
-    path: torrents.php
-    selector: li#stats_ratio > span
-
-  search:
-    path: torrents.php
-    inputs:
-      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
-      searchstr: "{{ .Query.Keywords }}"
-      order_by: time
-      order_way: desc
-      action: basic
-      searchsubmit: 1
-    rows:
-      selector: table#torrent_table > tbody > tr.torrent
-    fields:
-      download:
-        selector: a[href^="torrents.php?action=download&id="]
-        attribute: href
-      description:
-        selector: div.group_info
-        remove: span
-      title:
-        selector: div.group_info
-        remove: span, div.tags
-      category:
-        selector: td.cats_col
-        case:
-          div.cats_music: 1
-          div.cats_applications: 2
-          div.cats_ebooks: 3
-          div.cats_audiobooks: 4
-          div.cats_elearningvideos: 5
-          div.cats_comedy: 6
-          div.cats_comics: 7
-      comments:
-        selector: a[href^="torrents.php?id="]
-        attribute: href
-      files:
-        selector: td:nth-child(3)
-      date:
-        selector: td:nth-child(4)
-      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:
-          ":root div.alertbar:contains(\"freeleech\")": "0"
-          ":root div.alertbar:contains(\"FREELEECH\")": "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
+---
+  site: apollo
+  name: Apollo
+  description: "A music tracker"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://apollo.rip
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Audio, desc: "Music"}
+      - {id: 2, cat: PC, desc: "Applications"}
+      - {id: 3, cat: Books, desc: "E-Books"}
+      - {id: 4, cat: Audio/Audiobook, desc: "Audiobooks"}
+      - {id: 5, cat: Movies, desc: "E-Learning Videos"}
+      - {id: 6, cat: TV, desc: "Comedy"}
+      - {id: 7, cat: Books/Comics, desc: "Comics"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: login.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      keeplogged: 1
+      login: "Log in"
+    error:
+      - selector: form#loginform > span.warning
+    test:
+      path: torrents.php
+
+  ratio:
+    path: torrents.php
+    selector: li#stats_ratio > span
+
+  search:
+    path: torrents.php
+    inputs:
+      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+      searchstr: "{{ .Query.Keywords }}"
+      order_by: time
+      order_way: desc
+      action: basic
+      searchsubmit: 1
+    rows:
+      selector: table#torrent_table > tbody > tr.torrent
+    fields:
+      download:
+        selector: a[href^="torrents.php?action=download&id="]
+        attribute: href
+      description:
+        selector: div.group_info
+        remove: span
+      title:
+        selector: div.group_info
+        remove: span, div.tags
+      category:
+        selector: td.cats_col
+        case:
+          div.cats_music: 1
+          div.cats_applications: 2
+          div.cats_ebooks: 3
+          div.cats_audiobooks: 4
+          div.cats_elearningvideos: 5
+          div.cats_comedy: 6
+          div.cats_comics: 7
+      comments:
+        selector: a[href^="torrents.php?id="]
+        attribute: href
+      files:
+        selector: td:nth-child(3)
+      date:
+        selector: td:nth-child(4)
+      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:
+          ":root div.alertbar:contains(\"freeleech\")": "0"
+          ":root div.alertbar:contains(\"FREELEECH\")": "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
           "*": "1"

src/Jackett/Definitions/arabafenice.yml

@@ -1,164 +1,164 @@
----
-  site: arabafenice
-  name: ArabaFenice
-  language: it-it
-  type: private
-  encoding: UTF-8
-  links:
-    - http://www.arabafenice.me/
-
-  caps:
-    categorymappings:
-      # HRS
-      - {id: 34, cat: Movies/HD, desc: "1080p HRS x264"}
-      - {id: 47, cat: Movies/HD, desc: "2160p 4k UltraHD HRS"}
-      - {id: 35, cat: TV, desc: "Serie TV HRS"}
-      - {id: 36, cat: Movies/SD, desc: "DVDRip HRS"}
-      - {id: 41, cat: Movies/SD, desc: "BDRip 576p HRS"}
-      - {id: 39, cat: Movies/HD, desc: "1080p HRS x265 HEVC"}
-
-      # VIDEO
-      - {id: 1, cat: Movies, desc: "News Cinema"}
-      - {id: 2, cat: Movies/SD, desc: "BD-DVDRip"}
-      - {id: 3, cat: Movies/DVD, desc: "DVD 5"}
-      - {id: 5, cat: Movies/DVD, desc: "DVD 9"}
-      - {id: 6, cat: Movies/BluRay, desc: "BluRay Full"}
-      - {id: 4, cat: Movies/HD, desc: "1080p 3D x264"}
-      - {id: 7, cat: Movies/HD, desc: "1080p x264"}
-      - {id: 46, cat: Movies/HD, desc: "1080p Video Untouch"}
-      - {id: 44, cat: Movies/HD, desc: "1080p x265"}
-      - {id: 9, cat: TV/Anime, desc: "Cartoons"}
-      - {id: 8, cat: TV/Anime, desc: "720p x264"}
-      - {id: 12, cat: TV, desc: "He concluded seasons"}
-      - {id: 13, cat: TV, desc: "Seasons in Onda"}
-      - {id: 14, cat: TV, desc: "TV Show"}
-      - {id: 42, cat: TV, desc: "Serie Tv Sub Ita"}
-      - {id: 15, cat: TV/Documentary, desc: "documentaries"}
-      - {id: 33, cat: TV, desc: "mp4"}
-      - {id: 40, cat: TV/HD, desc: "2160p 4K UltraHD"}
-      - {id: 38, cat: XXX, desc: "xXx"}
-      - {id: 43, cat: Other, desc: "Arabic for social"}
-
-      # MUSICA
-      - {id: 17, cat: Audio, desc: "Italian music"}
-      - {id: 45, cat: Audio, desc: "Discography"}
-      - {id: 18, cat: Audio, desc: "MusicaInternazionale"}
-      - {id: 19, cat: Audio, desc: "Compilation"}
-
-      # PDF
-      - {id: 21, cat: Books, desc: "Ebook"}
-      - {id: 22, cat: Books/Comics, desc: "Comics"}
-      - {id: 23, cat: Books, desc: "Newsstand"}
-
-      # GAMES
-      - {id: 25, cat: Console/PS4, desc: "Sony Games"}
-      - {id: 26, cat: Console/Xbox, desc: "XboX Games"}
-      - {id: 27, cat: Console/Other, desc: "Nintendo Games"}
-      - {id: 28, cat: PC/Games, desc: "PC Games"}
-
-      # SOFTWARE
-      - {id: 30, cat: PC/ISO, desc: "Windows APP"}
-      - {id: 31, cat: PC/Phone-IOS, desc: "Apple APP"}
-      - {id: 32, cat: PC/Phone-Android, desc: "Android APP"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep, imdbid]
-      movie-search: [q, imdbid]
-
-  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
-
-  download:
-    before:
-      path: "thanks.php"
-      method: "post"
-      inputs:
-        infohash: "{{ .DownloadUri.Query.id }}"
-        thanks: "1"
-        rndval: "1487013827343"
-    selector: a[href^="download.php?id="]
-
-  search:
-    path: index.php
-    inputs:
-      search: "{{if .Query.IMDBID}}{{ .Query.IMDBIDShort }}{{else}}{{ .Keywords }}{{end}}"
-      page: "torrents"
-      category: "{{range .Categories}}{{.}};{{end}}"
-      options: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
-      active: "0"
-    rows:
-      selector: table > tbody > tr > td > table.lista > tbody > tr:has(a[href^="index.php?page=torrent-details&id="])
-    fields:
-      download:
-        selector: a[href^="index.php?page=downloadcheck&id="]
-        attribute: href
-      title:
-        selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-      banner:
-        selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-        attribute: onmouseover
-        filters:
-          - name: regexp
-            args: "src=(.*?) "
-      category:
-        selector: a[href^="index.php?page=torrents&category="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: category
-      details:
-        selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-        attribute: href
-      size:
-        selector: td:nth-last-child(4)
-      date:
-        selector: td:nth-last-child(9)
-        filters:
-          - name: append
-            args: " +01:00"
-          - name: dateparse
-            args: "02/01/2006 -07:00"
-      grabs:
-        selector: td:nth-last-child(6)
-        filters:
-          - name: replace
-            args: ["---", "0"]
-      seeders:
-        selector: td:nth-last-child(8)
-      leechers:
-        selector: td:nth-last-child(7)
-      downloadvolumefactor:
-        case:
-          img[alt="Gold 100% Free"]: "0"
-          img[alt="Silver 50% Free"]: "0.5"
-          img[alt="Bronze 25% Free"]: "0.75"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          img[alt="2x Upload Multiplier"]: "2"
-          img[alt="3x Upload Multiplier"]: "3"
-          img[alt="4x Upload Multiplier"]: "4"
-          img[alt="5x Upload Multiplier"]: "5"
-          img[alt="6x Upload Multiplier"]: "6"
-          img[alt="7x Upload Multiplier"]: "7"
-          img[alt="8x Upload Multiplier"]: "8"
-          img[alt="9x Upload Multiplier"]: "9"
-          img[alt="10x Upload Multiplier"]: "10"
-          "*": "1"
+---
+  site: arabafenice
+  name: ArabaFenice
+  language: it-it
+  type: private
+  encoding: UTF-8
+  links:
+    - http://www.arabafenice.me/
+
+  caps:
+    categorymappings:
+      # HRS
+      - {id: 34, cat: Movies/HD, desc: "1080p HRS x264"}
+      - {id: 47, cat: Movies/HD, desc: "2160p 4k UltraHD HRS"}
+      - {id: 35, cat: TV, desc: "Serie TV HRS"}
+      - {id: 36, cat: Movies/SD, desc: "DVDRip HRS"}
+      - {id: 41, cat: Movies/SD, desc: "BDRip 576p HRS"}
+      - {id: 39, cat: Movies/HD, desc: "1080p HRS x265 HEVC"}
+
+      # VIDEO
+      - {id: 1, cat: Movies, desc: "News Cinema"}
+      - {id: 2, cat: Movies/SD, desc: "BD-DVDRip"}
+      - {id: 3, cat: Movies/DVD, desc: "DVD 5"}
+      - {id: 5, cat: Movies/DVD, desc: "DVD 9"}
+      - {id: 6, cat: Movies/BluRay, desc: "BluRay Full"}
+      - {id: 4, cat: Movies/HD, desc: "1080p 3D x264"}
+      - {id: 7, cat: Movies/HD, desc: "1080p x264"}
+      - {id: 46, cat: Movies/HD, desc: "1080p Video Untouch"}
+      - {id: 44, cat: Movies/HD, desc: "1080p x265"}
+      - {id: 9, cat: TV/Anime, desc: "Cartoons"}
+      - {id: 8, cat: TV/Anime, desc: "720p x264"}
+      - {id: 12, cat: TV, desc: "He concluded seasons"}
+      - {id: 13, cat: TV, desc: "Seasons in Onda"}
+      - {id: 14, cat: TV, desc: "TV Show"}
+      - {id: 42, cat: TV, desc: "Serie Tv Sub Ita"}
+      - {id: 15, cat: TV/Documentary, desc: "documentaries"}
+      - {id: 33, cat: TV, desc: "mp4"}
+      - {id: 40, cat: TV/HD, desc: "2160p 4K UltraHD"}
+      - {id: 38, cat: XXX, desc: "xXx"}
+      - {id: 43, cat: Other, desc: "Arabic for social"}
+
+      # MUSICA
+      - {id: 17, cat: Audio, desc: "Italian music"}
+      - {id: 45, cat: Audio, desc: "Discography"}
+      - {id: 18, cat: Audio, desc: "MusicaInternazionale"}
+      - {id: 19, cat: Audio, desc: "Compilation"}
+
+      # PDF
+      - {id: 21, cat: Books, desc: "Ebook"}
+      - {id: 22, cat: Books/Comics, desc: "Comics"}
+      - {id: 23, cat: Books, desc: "Newsstand"}
+
+      # GAMES
+      - {id: 25, cat: Console/PS4, desc: "Sony Games"}
+      - {id: 26, cat: Console/Xbox, desc: "XboX Games"}
+      - {id: 27, cat: Console/Other, desc: "Nintendo Games"}
+      - {id: 28, cat: PC/Games, desc: "PC Games"}
+
+      # SOFTWARE
+      - {id: 30, cat: PC/ISO, desc: "Windows APP"}
+      - {id: 31, cat: PC/Phone-IOS, desc: "Apple APP"}
+      - {id: 32, cat: PC/Phone-Android, desc: "Android APP"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
+
+  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
+
+  download:
+    before:
+      path: "thanks.php"
+      method: "post"
+      inputs:
+        infohash: "{{ .DownloadUri.Query.id }}"
+        thanks: "1"
+        rndval: "1487013827343"
+    selector: a[href^="download.php?id="]
+
+  search:
+    path: index.php
+    inputs:
+      search: "{{if .Query.IMDBID}}{{ .Query.IMDBIDShort }}{{else}}{{ .Keywords }}{{end}}"
+      page: "torrents"
+      category: "{{range .Categories}}{{.}};{{end}}"
+      options: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
+      active: "0"
+    rows:
+      selector: table > tbody > tr > td > table.lista > tbody > tr:has(a[href^="index.php?page=torrent-details&id="])
+    fields:
+      download:
+        selector: a[href^="index.php?page=downloadcheck&id="]
+        attribute: href
+      title:
+        selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
+      banner:
+        selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "src=(.*?) "
+      category:
+        selector: a[href^="index.php?page=torrents&category="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: category
+      details:
+        selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
+        attribute: href
+      size:
+        selector: td:nth-last-child(4)
+      date:
+        selector: td:nth-last-child(9)
+        filters:
+          - name: append
+            args: " +01:00"
+          - name: dateparse
+            args: "02/01/2006 -07:00"
+      grabs:
+        selector: td:nth-last-child(6)
+        filters:
+          - name: replace
+            args: ["---", "0"]
+      seeders:
+        selector: td:nth-last-child(8)
+      leechers:
+        selector: td:nth-last-child(7)
+      downloadvolumefactor:
+        case:
+          img[alt="Gold 100% Free"]: "0"
+          img[alt="Silver 50% Free"]: "0.5"
+          img[alt="Bronze 25% Free"]: "0.75"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          img[alt="2x Upload Multiplier"]: "2"
+          img[alt="3x Upload Multiplier"]: "3"
+          img[alt="4x Upload Multiplier"]: "4"
+          img[alt="5x Upload Multiplier"]: "5"
+          img[alt="6x Upload Multiplier"]: "6"
+          img[alt="7x Upload Multiplier"]: "7"
+          img[alt="8x Upload Multiplier"]: "8"
+          img[alt="9x Upload Multiplier"]: "9"
+          img[alt="10x Upload Multiplier"]: "10"
+          "*": "1"

src/Jackett/Definitions/audiobooktorrents.yml

@@ -1,136 +1,136 @@
----
-  site: audiobooktorrents
-  name: Audiobook Torrents
-  language: en-us
-  type: private
-  encoding: UTF-8
-  links:
-    - https://abtorrents.me
-
-  caps:
-    categorymappings:
-      - {id: 10, cat: Audio/Audiobook, desc: "Adventure"}
-      - {id: 20, cat: Audio/Audiobook, desc: "Biographies & Memoirs"}
-      - {id: 30, cat: Audio/Audiobook, desc: "Business "}
-      - {id: 40, cat: Audio/Audiobook, desc: "Childrens"}
-      - {id: 50, cat: Audio/Audiobook, desc: "Comedy"}
-      - {id: 60, cat: Audio/Audiobook, desc: "Comics"}
-      - {id: 70, cat: Audio/Audiobook, desc: "Computers "}
-      - {id: 80, cat: Audio/Audiobook, desc: "Erotica"}
-      - {id: 90, cat: Audio/Audiobook, desc: "Fantasy-General"}
-      - {id: 100, cat: Audio/Audiobook, desc: "Fantasy-Youth"}
-      - {id: 110, cat: Audio/Audiobook, desc: "Files"}
-      - {id: 120, cat: Audio/Audiobook, desc: "Foreign Language"}
-      - {id: 130, cat: Audio/Audiobook, desc: "General Fiction"}
-      - {id: 140, cat: Audio/Audiobook, desc: "Historical Fiction"}
-      - {id: 150, cat: Audio/Audiobook, desc: "History"}
-      - {id: 160, cat: Audio/Audiobook, desc: "Horror"}
-      - {id: 170, cat: Audio/Audiobook, desc: "Literature "}
-      - {id: 180, cat: Audio/Audiobook, desc: "Mystery "}
-      - {id: 190, cat: Audio/Audiobook, desc: "Non-Fiction"}
-      - {id: 200, cat: Audio/Audiobook, desc: "Radio Drama"}
-      - {id: 210, cat: Audio/Audiobook, desc: "Romance"}
-      - {id: 235, cat: Audio/Audiobook, desc: "Sci-Fi Apocalypse"}
-      - {id: 220, cat: Audio/Audiobook, desc: "Science"}
-      - {id: 230, cat: Audio/Audiobook, desc: "Science Fiction "}
-      - {id: 240, cat: Audio/Audiobook, desc: "Self Improvement"}
-      - {id: 250, cat: Audio/Audiobook, desc: "Suspense"}
-      - {id: 260, cat: Audio/Audiobook, desc: "Talk Radio"}
-      - {id: 245, cat: Audio/Audiobook, desc: "Thriller"}
-      - {id: 270, cat: Audio/Audiobook, desc: "Urban Fantasy"}
-      - {id: 280, cat: Audio/Audiobook, desc: "Western"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
-
-  login:
-    path: takelogin.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      use_ssl: "1"
-      perm_ssl: "1"
-      submitme: "X"
-    error:
-      - selector: td.embedded:has(h2:contains("Oops"))
-      - selector: td.embedded:has(h2:contains("failed"))
-    test:
-      path: /browse.php
-
-  search:
-    path: /browse.php
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Keywords }}"
-      searchin: "title"
-      incldead: "1"
-    rows:
-      selector: tr.browse_color, tr.freeleech_color, tr[id^="kdescr"]
-      after: 1
-    fields:
-      banner:
-        selector: a[href^="details.php?id="][onmouseover]
-        attribute: onmouseover
-        filters:
-          - name: regexp
-            args: src=\'(.*?)\'
-      title:
-        selector: a[href^="details.php?id="][onmouseover]
-        attribute: onmouseover
-        filters:
-          - name: regexp
-            args: Tip\('<b>(.*?)</b>
-      category:
-        selector: a[href^="browse.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      details:
-        selector: a[href^="details.php?id="][onmouseover]
-        attribute: href
-      download:
-        selector: a[href^="download.php"]
-        attribute: href
-      files:
-        selector: td:nth-child(4)
-      size:
-        selector: td:nth-child(7)
-      grabs:
-        selector: td:nth-child(8)
-        filters:
-          - name: regexp
-            args: ([\d,]+)
-      seeders:
-        selector: td:nth-child(9)
-      leechers:
-        selector: td:nth-child(10)
-      date:
-        selector: td:nth-child(6)
-      downloadvolumefactor:
-        case:
-          "a.info > b:contains(\"[FREE]\")": "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
-      description:
-        selector: a[href^="details.php?id="][onmouseover]
-        attribute: onmouseover
-        filters:
-          - name: regexp
-            args: <br /><b>(.*?)</b><br />
-      description:
-        selector: td:nth-child(2) > i
-        optional: true
-        filters:
-          - name: prepend
-            args: "{{ .Result.description }}<br>\n"
-      description:
-        selector: td[colspan=13]
-        filters:
-          - name: prepend
+---
+  site: audiobooktorrents
+  name: Audiobook Torrents
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://abtorrents.me
+
+  caps:
+    categorymappings:
+      - {id: 10, cat: Audio/Audiobook, desc: "Adventure"}
+      - {id: 20, cat: Audio/Audiobook, desc: "Biographies & Memoirs"}
+      - {id: 30, cat: Audio/Audiobook, desc: "Business "}
+      - {id: 40, cat: Audio/Audiobook, desc: "Childrens"}
+      - {id: 50, cat: Audio/Audiobook, desc: "Comedy"}
+      - {id: 60, cat: Audio/Audiobook, desc: "Comics"}
+      - {id: 70, cat: Audio/Audiobook, desc: "Computers "}
+      - {id: 80, cat: Audio/Audiobook, desc: "Erotica"}
+      - {id: 90, cat: Audio/Audiobook, desc: "Fantasy-General"}
+      - {id: 100, cat: Audio/Audiobook, desc: "Fantasy-Youth"}
+      - {id: 110, cat: Audio/Audiobook, desc: "Files"}
+      - {id: 120, cat: Audio/Audiobook, desc: "Foreign Language"}
+      - {id: 130, cat: Audio/Audiobook, desc: "General Fiction"}
+      - {id: 140, cat: Audio/Audiobook, desc: "Historical Fiction"}
+      - {id: 150, cat: Audio/Audiobook, desc: "History"}
+      - {id: 160, cat: Audio/Audiobook, desc: "Horror"}
+      - {id: 170, cat: Audio/Audiobook, desc: "Literature "}
+      - {id: 180, cat: Audio/Audiobook, desc: "Mystery "}
+      - {id: 190, cat: Audio/Audiobook, desc: "Non-Fiction"}
+      - {id: 200, cat: Audio/Audiobook, desc: "Radio Drama"}
+      - {id: 210, cat: Audio/Audiobook, desc: "Romance"}
+      - {id: 235, cat: Audio/Audiobook, desc: "Sci-Fi Apocalypse"}
+      - {id: 220, cat: Audio/Audiobook, desc: "Science"}
+      - {id: 230, cat: Audio/Audiobook, desc: "Science Fiction "}
+      - {id: 240, cat: Audio/Audiobook, desc: "Self Improvement"}
+      - {id: 250, cat: Audio/Audiobook, desc: "Suspense"}
+      - {id: 260, cat: Audio/Audiobook, desc: "Talk Radio"}
+      - {id: 245, cat: Audio/Audiobook, desc: "Thriller"}
+      - {id: 270, cat: Audio/Audiobook, desc: "Urban Fantasy"}
+      - {id: 280, cat: Audio/Audiobook, desc: "Western"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      use_ssl: "1"
+      perm_ssl: "1"
+      submitme: "X"
+    error:
+      - selector: td.embedded:has(h2:contains("Oops"))
+      - selector: td.embedded:has(h2:contains("failed"))
+    test:
+      path: /browse.php
+
+  search:
+    path: /browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      searchin: "title"
+      incldead: "1"
+    rows:
+      selector: tr.browse_color, tr.freeleech_color, tr[id^="kdescr"]
+      after: 1
+    fields:
+      banner:
+        selector: a[href^="details.php?id="][onmouseover]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: src=\'(.*?)\'
+      title:
+        selector: a[href^="details.php?id="][onmouseover]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: Tip\('<b>(.*?)</b>
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      details:
+        selector: a[href^="details.php?id="][onmouseover]
+        attribute: href
+      download:
+        selector: a[href^="download.php"]
+        attribute: href
+      files:
+        selector: td:nth-child(4)
+      size:
+        selector: td:nth-child(7)
+      grabs:
+        selector: td:nth-child(8)
+        filters:
+          - name: regexp
+            args: ([\d,]+)
+      seeders:
+        selector: td:nth-child(9)
+      leechers:
+        selector: td:nth-child(10)
+      date:
+        selector: td:nth-child(6)
+      downloadvolumefactor:
+        case:
+          "a.info > b:contains(\"[FREE]\")": "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"
+      description:
+        selector: a[href^="details.php?id="][onmouseover]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: <br /><b>(.*?)</b><br />
+      description:
+        selector: td:nth-child(2) > i
+        optional: true
+        filters:
+          - name: prepend
+            args: "{{ .Result.description }}<br>\n"
+      description:
+        selector: td[colspan=13]
+        filters:
+          - name: prepend
             args: "{{ .Result.description }}<br>\n"

src/Jackett/Definitions/bigtorrent.yml

@@ -0,0 +1,97 @@
+---
+  site: bigtorrent
+  name: BIGTorrent
+  description: "ratio-free Hungarian tracker"
+  language: hu
+  type: private
+  encoding: UTF-8
+  links:
+    - http://www.bigtorrent.eu/
+
+  caps:
+    categorymappings:
+      - {id: 24533, cat: Movies/3D, desc: "3D"}
+      - {id: 47, cat: Other, desc: "Other"}
+      - {id: 24541, cat: Movies/DVD, desc: "Film DVD English"}
+      - {id: 24540, cat: Movies/DVD, desc: "Film DVD Hungarian"}
+      - {id: 24539, cat: Movies/HD, desc: "Film HD English"}
+      - {id: 24538, cat: Movies/HD, desc: "Film HD Hungarian"}
+      - {id: 24537, cat: Movies/SD, desc: "Film SD English"}
+      - {id: 24536, cat: Movies/SD, desc: "Film SD Hungarian"}
+      - {id: 69, cat: PC/Games, desc: "Games ISO"}
+      - {id: 67, cat: PC/Games, desc: "Games Rip"}
+      - {id: 24534, cat: Audio/Audiobook, desc: "Audiobooks"}
+      - {id: 65, cat: Other, desc: "Picture"}
+      - {id: 64, cat: Other, desc: "Video"}
+      - {id: 68, cat: Console/Xbox360, desc: "Video Game Console"}
+      - {id: 63, cat: Books, desc: "English Books"}
+      - {id: 62, cat: Books, desc: "Hungarian Books"}
+      - {id: 74, cat: Audio/Lossless, desc: "Lossless"}
+      - {id: 56, cat: PC/Phone-Other, desc: "Mobile"}
+      - {id: 57, cat: PC, desc: "Programs"}
+      - {id: 24545, cat: TV/HD, desc: "English HD Series"}
+      - {id: 24544, cat: TV/HD, desc: "Hungarian HD Series"}
+      - {id: 24543, cat: TV/SD, desc: "English SD Series"}
+      - {id: 24542, cat: TV/SD, desc: "Hungarian SD Series"}
+      - {id: 24535, cat: XXX, desc: "XXX"}
+      - {id: 59, cat: Audio, desc: "Music"}
+      - {id: 58, cat: Audio, desc: "Hungarian Music"}
+
+    modes:
+      search: [q]
+
+  login:
+    path: /login.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      sent: "yes"
+      returnto: "/"
+    error:
+      - selector: table:contains("Login failed!")
+    test:
+      path: index.php
+
+  download:
+    selector: a[href^="download.php?id="]
+        
+  search:
+    path: browse.php
+    inputs:
+      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+    rows:
+      selector: table#torrent_table > tbody > tr:has(a[href^="browse.php?cat="])
+    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
+      size:
+        selector: td:nth-child(7)
+      seeders:
+        selector: td:nth-child(8)
+      leechers:
+        selector: td:nth-child(9)
+      date:
+        selector: td:nth-child(4)
+      downloadvolumefactor:
+        case:
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett/Definitions/bitspyder.yml

@@ -1,133 +1,133 @@
----
-  site: bitspyder
-  name: Bitspyder
-  language: en-us
-  type: private
-  encoding: windows-1252
-  links:
-    - http://bitspyder.net/
-
-  caps:
-    categorymappings:
-      - {id: 61, cat: Books, desc: "3D"}
-      - {id: 69, cat: Books, desc: "Anim|GFX"}
-      - {id: 56, cat: Books, desc: "Art"}
-      - {id: 40, cat: Audio/Audiobook, desc: "Audio Books"}
-      - {id: 55, cat: Books, desc: "Business"}
-      - {id: 46, cat: Books, desc: "Career"}
-      - {id: 2, cat: Books, desc: "CBTs"}
-      - {id: 39, cat: Books, desc: "Cert QA"}
-      - {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: 65, cat: Books, desc: "Engineering"}
-      - {id: 54, cat: Books, desc: "Health-Fitness"}
-      - {id: 64, cat: Books, desc: "Kids"}
-      - {id: 47, cat: Books, desc: "Languages"}
-      - {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: 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: 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"}
-
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: processid.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: td.msg_info > font > b
-    test:
-      path: /browse.php
-
-  search:
-    path: /browse.php
-    method: post
-    inputs:
-      search: "{{ .Query.Keywords }}"
-      incldead: "1"
-    rows:
-      selector: table > tbody > tr[class]
-      filters:
-        - name: andmatch
-    fields:
-      # there are two styles, we support both
-      title:
-        selector: a[href^="details.php?id="]
-      category:
-        selector: a[href^="browse.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      details:
-        selector: a[href^="details.php?id="]
-        attribute: href    
-      download:
-        selector: a[href^="details.php?id="]
-        attribute: href
-        filters:
-          - name: replace
-            args: ["details.php?id=", "download.php/"]
-          - name: replace
-            args: ["&hit=1", "/dummy.torrent"]
-      size:
-        selector: td.rowcol:nth-child(6):has(br), font:contains("Size:") + font
-      files:
-        selector: a[href*="&filelist=1"]
-      grabs:
-        selector: td.rowcol:nth-child(7):contains("times"), font:contains("Snatches:")
-        filters:
-          - name: regexp
-            args: ([\d\,]+)
-      seeders:
-        selector: td.rowcol:nth-last-child(3)
-      leechers:
-        selector: td.rowcol:nth-last-child(2)
-      date|optional|1:
-        selector: font[color="5F5F5F"]
-        filters:
-          - name: split
-            args: [" (", 0]
-          - name: replace
-            args: ["\xA0", " "]
-          - name: append
-            args: " +00:00"
-          - name: dateparse 
-            args: "2006-01-02 15:04:05 -07:00"
-      date|optional|2:
-        selector: a[title^="Upploaded at"]
-        attribute: title
-        filters:
-          - name: replace
-            args: ["Upploaded at - ", ""]
-          - name: append
-            args: " +00:00"
-          - name: dateparse 
-            args: "2006-01-02 15:04:05 -07:00"
-      downloadvolumefactor:
-        case:
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
-      description|optional:
-        selector: font[color="#990000"]
+---
+  site: bitspyder
+  name: Bitspyder
+  language: en-us
+  type: private
+  encoding: windows-1252
+  links:
+    - http://bitspyder.net/
+
+  caps:
+    categorymappings:
+      - {id: 61, cat: Books, desc: "3D"}
+      - {id: 69, cat: Books, desc: "Anim|GFX"}
+      - {id: 56, cat: Books, desc: "Art"}
+      - {id: 40, cat: Audio/Audiobook, desc: "Audio Books"}
+      - {id: 55, cat: Books, desc: "Business"}
+      - {id: 46, cat: Books, desc: "Career"}
+      - {id: 2, cat: Books, desc: "CBTs"}
+      - {id: 39, cat: Books, desc: "Cert QA"}
+      - {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: 65, cat: Books, desc: "Engineering"}
+      - {id: 54, cat: Books, desc: "Health-Fitness"}
+      - {id: 64, cat: Books, desc: "Kids"}
+      - {id: 47, cat: Books, desc: "Languages"}
+      - {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: 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: 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"}
+
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: processid.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: td.msg_info > font > b
+    test:
+      path: /browse.php
+
+  search:
+    path: /browse.php
+    method: post
+    inputs:
+      search: "{{ .Query.Keywords }}"
+      incldead: "1"
+    rows:
+      selector: table > tbody > tr[class]
+      filters:
+        - name: andmatch
+    fields:
+      # there are two styles, we support both
+      title:
+        selector: a[href^="details.php?id="]
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href    
+      download:
+        selector: a[href^="details.php?id="]
+        attribute: href
+        filters:
+          - name: replace
+            args: ["details.php?id=", "download.php/"]
+          - name: replace
+            args: ["&hit=1", "/dummy.torrent"]
+      size:
+        selector: td.rowcol:nth-child(6):has(br), font:contains("Size:") + font
+      files:
+        selector: a[href*="&filelist=1"]
+      grabs:
+        selector: td.rowcol:nth-child(7):has(br)
+        filters:
+          - name: regexp
+            args: ([\d,]+)
+      seeders:
+        selector: td.rowcol:nth-last-child(3)
+      leechers:
+        selector: td.rowcol:nth-last-child(2)
+      date|optional|1:
+        selector: font[color="5F5F5F"]
+        filters:
+          - name: split
+            args: [" (", 0]
+          - name: replace
+            args: ["\xA0", " "]
+          - name: append
+            args: " +00:00"
+          - name: dateparse 
+            args: "2006-01-02 15:04:05 -07:00"
+      date|optional|2:
+        selector: a[title^="Upploaded at"]
+        attribute: title
+        filters:
+          - name: replace
+            args: ["Upploaded at - ", ""]
+          - name: append
+            args: " +00:00"
+          - name: dateparse 
+            args: "2006-01-02 15:04:05 -07:00"
+      downloadvolumefactor:
+        case:
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"
+      description|optional:
+        selector: font[color="#990000"]

src/Jackett/Definitions/blubits.yml

@@ -1,148 +1,148 @@
----
-  site: blubits
-  name: Blu-bits
-  description: "A HD tracker"
-  language: en-us
-  type: private
-  encoding: UTF-8
-  links:
-    - https://blu-bits.com/
-
-  caps:
-    categorymappings:
-      # Movies
-      - {id: 14, cat: Movies/BluRay, desc: "Full Blu-ray"}
-      - {id: 54, cat: Movies/HD, desc: "HD-DVD"}
-      - {id: 16, cat: Movies/HD, desc: "Remux"}
-      - {id: 55, cat: Movies/HD, desc: "2160p"}
-      - {id: 15, cat: Movies/HD, desc: "1080p"}
-      - {id: 19, cat: Movies/HD, desc: "1080i"}
-      - {id: 18, cat: Movies/HD, desc: "720p"}
-
-      # Documentaries
-      - {id: 21, cat: Movies/BluRay, desc: "Full Blu-ray"}
-      - {id: 39, cat: Movies/HD, desc: "Remux"}
-      - {id: 56, cat: Movies/HD, desc: "2160p"}
-      - {id: 23, cat: Movies/HD, desc: "1080p"}
-      - {id: 24, cat: Movies/HD, desc: "1080i"}
-      - {id: 25, cat: Movies/HD, desc: "720p"}
-
-      # TV Series
-      - {id: 27, cat: TV/HD, desc: "Full Blu-ray"}
-      - {id: 40, cat: TV/HD, desc: "Remux"}
-      - {id: 28, cat: TV/HD, desc: "1080p"}
-      - {id: 29, cat: TV/HD, desc: "1080i"}
-      - {id: 30, cat: TV/HD, desc: "720p"}
-
-      # HDTV
-      - {id: 35, cat: TV/HD, desc: "1080i"}
-      - {id: 36, cat: TV/HD, desc: "720p"}
-
-      # XXX
-      - {id: 59, cat: XXX, desc: "Full Blu-ray"}
-      - {id: 46, cat: XXX, desc: "1080p"}
-      - {id: 51, cat: XXX, desc: "720p"}
-
-      # Music
-      - {id: 53, cat: Audio/Video, desc: "Full Blu-ray"}
-      - {id: 57, cat: Audio/Video, desc: "Remux"}
-      - {id: 45, cat: Audio/Video, desc: "1080p"}
-      - {id: 58, cat: Audio/Video, desc: "720p"}
-      - {id: 38, cat: Audio/Lossless, desc: "Flac"}
-
-      - {id: 41, cat: TV/Sport, desc: "Sports"}
-      - {id: 42, cat: TV/Anime, desc: "Anime"}
-      - {id: 44, cat: PC, desc: "Windows Apps"}
-
-    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: table.lista > tbody > tr > td.lista > span[style="color:#FF0000;"]
-    test:
-      path: index.php
-      selector: ul#navlist
-
-  ratio:
-    path: index.php
-    selector: "ul#navlist > li:contains(\"Ratio: \")"
-    filters:
-      - name: split
-        args: ["\u00a0", 1]
-      - name: replace
-        args: ["---", "0"]
-
-  search:
-    path: index.php
-    inputs:
-      search: "{{ .Query.Keywords }}"
-      page: torrents
-      options: 0
-      active: 0
-    rows:
-      selector: div.b-content > table.lista > tbody > tr:has(a[href^="index.php?page=torrents&category="])
-    fields:
-      download:
-        selector: a[href^="download.php?id="]
-        attribute: href
-      title:
-        selector: a[href^="index.php?page=torrent-details&id="]
-        attribute: title
-        filters:
-          - name: replace
-            args: ["View details: ", ""]
-      category:
-        selector: a[href^="index.php?page=torrents&category="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: category
-      comments:
-        selector: a[href^="index.php?page=torrent-details&id="]
-        attribute: href
-      size:
-        selector: p
-        filters:
-          - name: replace
-            args: ["\u00a0", ""]
-          - name: regexp
-            args: "\\|\\s+Size:\\s+([\\w\\d\\.,]+ \\w\\w)\\s+\\|"
-      date:
-        selector: a[href^="index.php?page=torrent-details&id="]
-        attribute: onmouseover
-        filters:
-          - name: regexp
-            args: "<center>Added:(.*?)</center>"
-      grabs:
-        selector: a[href^="index.php?page=torrent_history&id="]
-        filters:
-          - name: replace
-            args: ["---", "0"]
-      seeders:
-        selector: a[title="Click here to view peers details"]:nth-child(1)
-      leechers:
-        selector: a[title="Click here to view peers details"]:nth-child(2)
-      downloadvolumefactor:
-        case:
-          img[alt="gold"]: "0"
-          img[alt="silver"]: "0.5"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          img[alt="2x Upload Multiplier"]: "2"
-          img[alt="3x Upload Multiplier"]: "3"
-          img[alt="4x Upload Multiplier"]: "4"
-          img[alt="5x Upload Multiplier"]: "5"
-          img[alt="6x Upload Multiplier"]: "6"
-          img[alt="7x Upload Multiplier"]: "7"
-          img[alt="8x Upload Multiplier"]: "8"
-          img[alt="9x Upload Multiplier"]: "9"
-          img[alt="10x Upload Multiplier"]: "10"
+---
+  site: blubits
+  name: Blu-bits
+  description: "A HD tracker"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://blu-bits.com/
+
+  caps:
+    categorymappings:
+      # Movies
+      - {id: 14, cat: Movies/BluRay, desc: "Full Blu-ray"}
+      - {id: 54, cat: Movies/HD, desc: "HD-DVD"}
+      - {id: 16, cat: Movies/HD, desc: "Remux"}
+      - {id: 55, cat: Movies/HD, desc: "2160p"}
+      - {id: 15, cat: Movies/HD, desc: "1080p"}
+      - {id: 19, cat: Movies/HD, desc: "1080i"}
+      - {id: 18, cat: Movies/HD, desc: "720p"}
+
+      # Documentaries
+      - {id: 21, cat: Movies/BluRay, desc: "Full Blu-ray"}
+      - {id: 39, cat: Movies/HD, desc: "Remux"}
+      - {id: 56, cat: Movies/HD, desc: "2160p"}
+      - {id: 23, cat: Movies/HD, desc: "1080p"}
+      - {id: 24, cat: Movies/HD, desc: "1080i"}
+      - {id: 25, cat: Movies/HD, desc: "720p"}
+
+      # TV Series
+      - {id: 27, cat: TV/HD, desc: "Full Blu-ray"}
+      - {id: 40, cat: TV/HD, desc: "Remux"}
+      - {id: 28, cat: TV/HD, desc: "1080p"}
+      - {id: 29, cat: TV/HD, desc: "1080i"}
+      - {id: 30, cat: TV/HD, desc: "720p"}
+
+      # HDTV
+      - {id: 35, cat: TV/HD, desc: "1080i"}
+      - {id: 36, cat: TV/HD, desc: "720p"}
+
+      # XXX
+      - {id: 59, cat: XXX, desc: "Full Blu-ray"}
+      - {id: 46, cat: XXX, desc: "1080p"}
+      - {id: 51, cat: XXX, desc: "720p"}
+
+      # Music
+      - {id: 53, cat: Audio/Video, desc: "Full Blu-ray"}
+      - {id: 57, cat: Audio/Video, desc: "Remux"}
+      - {id: 45, cat: Audio/Video, desc: "1080p"}
+      - {id: 58, cat: Audio/Video, desc: "720p"}
+      - {id: 38, cat: Audio/Lossless, desc: "Flac"}
+
+      - {id: 41, cat: TV/Sport, desc: "Sports"}
+      - {id: 42, cat: TV/Anime, desc: "Anime"}
+      - {id: 44, cat: PC, desc: "Windows Apps"}
+
+    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: table.lista > tbody > tr > td.lista > span[style="color:#FF0000;"]
+    test:
+      path: index.php
+      selector: ul#navlist
+
+  ratio:
+    path: index.php
+    selector: "ul#navlist > li:contains(\"Ratio: \")"
+    filters:
+      - name: split
+        args: ["\u00a0", 1]
+      - name: replace
+        args: ["---", "0"]
+
+  search:
+    path: index.php
+    inputs:
+      search: "{{ .Query.Keywords }}"
+      page: torrents
+      options: 0
+      active: 0
+    rows:
+      selector: div.b-content > table.lista > tbody > tr:has(a[href^="index.php?page=torrents&category="])
+    fields:
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      title:
+        selector: a[href^="index.php?page=torrent-details&id="]
+        attribute: title
+        filters:
+          - name: replace
+            args: ["View details: ", ""]
+      category:
+        selector: a[href^="index.php?page=torrents&category="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: category
+      comments:
+        selector: a[href^="index.php?page=torrent-details&id="]
+        attribute: href
+      size:
+        selector: p
+        filters:
+          - name: replace
+            args: ["\u00a0", ""]
+          - name: regexp
+            args: "\\|\\s+Size:\\s+([\\w\\d\\.,]+ \\w\\w)\\s+\\|"
+      date:
+        selector: a[href^="index.php?page=torrent-details&id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "<center>Added:(.*?)</center>"
+      grabs:
+        selector: a[href^="index.php?page=torrent_history&id="]
+        filters:
+          - name: replace
+            args: ["---", "0"]
+      seeders:
+        selector: a[title="Click here to view peers details"]:nth-child(1)
+      leechers:
+        selector: a[title="Click here to view peers details"]:nth-child(2)
+      downloadvolumefactor:
+        case:
+          img[alt="gold"]: "0"
+          img[alt="silver"]: "0.5"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          img[alt="2x Upload Multiplier"]: "2"
+          img[alt="3x Upload Multiplier"]: "3"
+          img[alt="4x Upload Multiplier"]: "4"
+          img[alt="5x Upload Multiplier"]: "5"
+          img[alt="6x Upload Multiplier"]: "6"
+          img[alt="7x Upload Multiplier"]: "7"
+          img[alt="8x Upload Multiplier"]: "8"
+          img[alt="9x Upload Multiplier"]: "9"
+          img[alt="10x Upload Multiplier"]: "10"
           "*": "1"

src/Jackett/Definitions/bluebird.yml

@@ -1,89 +1,89 @@
----
-  site: bluebirdhd
-  name: BlueBird
-  language: ru-ru
-  type: private
-  encoding: windows-1251
-  links:
-    - https://bluebird-hd.org/
-
-  caps:
-    categorymappings:
-      - {id: 1, cat: Movies, desc: "Films"}
-      - {id: 2, cat: TV/Anime, desc: "Cartoons"}
-      - {id: 3, cat: TV/Documentary, desc: "documentary"}
-      - {id: 4, cat: Audio, desc: "Show / Music"}
-      - {id: 5, cat: TV/Sport, desc: "Sport"}
-      - {id: 6, cat: TV, desc: "TV series"}
-      - {id: 7, cat: XXX, desc: "erotica"}
-      - {id: 8, cat: Other, desc: "Demo / Misc"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: /takelogin.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: div.error
-    test:
-      path: /browse.php
-
-  search:
-    path: /browse.php
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
-      incldead: "1"
-    rows:
-      selector: table > tbody > tr:has(a[href^="details.php?id="])
-    fields:
-      title:
-        selector: a[href^="details.php?id="]
-      details:
-        selector: a[href^="details.php?id="]
-        attribute: href
-      category:
-        selector: a[href^="browse.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      download:
-        selector: a[href^="download.php?id="]
-        attribute: href
-      grabs:
-        selector: a[href*="&snatched=1#snatched"]
-        filters:
-          - name: regexp
-            args: (\d+)
-      size:
-        selector: td:nth-child(7)
-        remove: a
-      date:
-        selector: div#cleft > font
-      seeders:
-        selector: td:nth-child(5)
-      leechers:
-        selector: td:nth-child(6)
-      banner:
-        selector: a.tname
-        attribute: onmouseover
-        filters:
-          - name: regexp
-            args: src=([^\s]+)
-      downloadvolumefactor:
-        case:
-          img[src="pic/diamond.png"]: "0"
-          img[src="pic/freedownload.gif"]: "0"
-          img[src="pic/silver.gif"]: "0.5"
-          img[src="pic/bronze.gif"]: "0.75"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          img[src="pic/diamond.png"]: "2"
-          "*": "1"
+---
+  site: bluebirdhd
+  name: BlueBird
+  language: ru-ru
+  type: private
+  encoding: windows-1251
+  links:
+    - https://bluebird-hd.org/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Movies, desc: "Films"}
+      - {id: 2, cat: TV/Anime, desc: "Cartoons"}
+      - {id: 3, cat: TV/Documentary, desc: "documentary"}
+      - {id: 4, cat: Audio, desc: "Show / Music"}
+      - {id: 5, cat: TV/Sport, desc: "Sport"}
+      - {id: 6, cat: TV, desc: "TV series"}
+      - {id: 7, cat: XXX, desc: "erotica"}
+      - {id: 8, cat: Other, desc: "Demo / Misc"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: /takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: div.error
+    test:
+      path: /browse.php
+
+  search:
+    path: /browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      incldead: "1"
+    rows:
+      selector: table > tbody > tr:has(a[href^="details.php?id="])
+    fields:
+      title:
+        selector: a[href^="details.php?id="]
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      grabs:
+        selector: a[href*="&snatched=1#snatched"]
+        filters:
+          - name: regexp
+            args: (\d+)
+      size:
+        selector: td:nth-child(7)
+        remove: a
+      date:
+        selector: div#cleft > font
+      seeders:
+        selector: td:nth-child(5)
+      leechers:
+        selector: td:nth-child(6)
+      banner:
+        selector: a.tname
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: src=([^\s]+)
+      downloadvolumefactor:
+        case:
+          img[src="pic/diamond.png"]: "0"
+          img[src="pic/freedownload.gif"]: "0"
+          img[src="pic/silver.gif"]: "0.5"
+          img[src="pic/bronze.gif"]: "0.75"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          img[src="pic/diamond.png"]: "2"
+          "*": "1"

src/Jackett/Definitions/chdbits.yml

@@ -1,104 +1,104 @@
----
-  site: chdbits
-  name: CHDBits
-  description: "A general tracker"
-  language: zh-cn
-  type: private
-  encoding: UTF-8
-  links:
-    - https://chdbits.co
-
-  caps:
-    categorymappings:
-      - {id: 401, cat: Movies, desc: "Movies"}
-      - {id: 404, cat: TV/Documentary, desc: "Documentaries"}
-      - {id: 405, cat: TV/Anime, desc: "Animations"}
-      - {id: 402, cat: TV, desc: "TV Series"}
-      - {id: 403, cat: TV, desc: "TV Shows"}
-      - {id: 406, cat: Audio/Video, desc: "Music Videos"}
-      - {id: 407, cat: TV/Sport, desc: "Sports"}
-      - {id: 409, cat: Other, desc: "Misc"}
-      - {id: 408, cat: Audio, desc: "HQ Audio"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: /takelogin.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: td.embedded:has(h2:contains("failed"))
-    test:
-      path: /torrents.php
-
-  ratio:
-    path: /torrents.php
-    selector: table#info_block
-    filters:
-      - name: regexp
-        args: "Ratio:\\s(.*?)\\s\\s"
-
-  search:
-    path: /torrents.php
-    method: post
-    inputs:
-      $raw: "{{range .Categories}}cat{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
-      incldead: "1"
-    rows:
-      selector: table.torrents > tbody > tr:has(table.torrentname)
-    fields:
-      title:
-        selector: a[href^="details.php?id="]
-      title|optional:
-        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
-      size:
-        selector: td:nth-child(5)
-      grabs:
-        selector: td:nth-child(8)
-      seeders:
-        selector: td:nth-child(6)
-      leechers:
-        selector: td:nth-child(7)
-      date:
-        selector: td:nth-child(4) > span[title]
-        attribute: title
-        filters:
-          - name: append
-            args: " +08:00"
-          - name: dateparse
-            args: "2006-01-02 15:04:05 -07:00"
-      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
+---
+  site: chdbits
+  name: CHDBits
+  description: "A general tracker"
+  language: zh-cn
+  type: private
+  encoding: UTF-8
+  links:
+    - https://chdbits.co
+
+  caps:
+    categorymappings:
+      - {id: 401, cat: Movies, desc: "Movies"}
+      - {id: 404, cat: TV/Documentary, desc: "Documentaries"}
+      - {id: 405, cat: TV/Anime, desc: "Animations"}
+      - {id: 402, cat: TV, desc: "TV Series"}
+      - {id: 403, cat: TV, desc: "TV Shows"}
+      - {id: 406, cat: Audio/Video, desc: "Music Videos"}
+      - {id: 407, cat: TV/Sport, desc: "Sports"}
+      - {id: 409, cat: Other, desc: "Misc"}
+      - {id: 408, cat: Audio, desc: "HQ Audio"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: /takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: td.embedded:has(h2:contains("failed"))
+    test:
+      path: /torrents.php
+
+  ratio:
+    path: /torrents.php
+    selector: table#info_block
+    filters:
+      - name: regexp
+        args: "Ratio:\\s(.*?)\\s\\s"
+
+  search:
+    path: /torrents.php
+    method: post
+    inputs:
+      $raw: "{{range .Categories}}cat{{.}}=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      incldead: "1"
+    rows:
+      selector: table.torrents > tbody > tr:has(table.torrentname)
+    fields:
+      title:
+        selector: a[href^="details.php?id="]
+      title|optional:
+        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
+      size:
+        selector: td:nth-child(5)
+      grabs:
+        selector: td:nth-child(8)
+      seeders:
+        selector: td:nth-child(6)
+      leechers:
+        selector: td:nth-child(7)
+      date:
+        selector: td:nth-child(4) > span[title]
+        attribute: title
+        filters:
+          - name: append
+            args: " +08:00"
+          - name: dateparse
+            args: "2006-01-02 15:04:05 -07:00"
+      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/Definitions/cinemageddon.yml

@@ -0,0 +1,99 @@
+---
+  site: cinemageddon
+  name: Cinemageddon
+  description: "B-movie tracker"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - http://cinemageddon.net/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Movies, desc: "Action"}
+      - {id: 2, cat: Movies, desc: "Horror"}
+      - {id: 3, cat: Movies, desc: "Martial Arts"}
+      - {id: 4, cat: Movies, desc: "Comedy"}
+      - {id: 5, cat: Movies, desc: "Other"}
+      - {id: 6, cat: Movies, desc: "Hidden Gems"}
+      - {id: 7, cat: Movies, desc: "Sci-Fi"}
+      - {id: 8, cat: Movies, desc: "Gore"}
+      - {id: 9, cat: Movies, desc: "Exploitation"}
+      - {id: 11, cat: Movies, desc: "OST"}
+      - {id: 12, cat: Movies, desc: "XXX"}
+      - {id: 13, cat: Movies, desc: "Thriller"}
+      - {id: 14, cat: Movies, desc: "Adventure"}
+      - {id: 15, cat: Movies, desc: "Documentary"}
+      - {id: 16, cat: Movies, desc: "Western"}
+      - {id: 17, cat: Movies, desc: "Family"}
+      - {id: 18, cat: Movies, desc: "Drama"}
+      - {id: 19, cat: Movies, desc: "Ebooks"}
+      - {id: 20, cat: Movies, desc: "Softcore"}
+      - {id: 21, cat: Movies, desc: "Tinfoil Hat"}
+      - {id: 22, cat: Movies, desc: "Trailers"}
+
+    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:
+    path: browse.php
+    inputs:
+      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+    rows:
+      selector: table.torrenttable > tbody > tr:has(a[href^="browse.php?cat="])
+    fields:
+      category:
+        text: 1
+      title:
+        selector: td:nth-child(2)
+      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(6)
+      files:
+        selector: td:nth-child(5)
+        filters:
+          - name: regexp
+            args: (\d+)\s+file
+      size:
+        selector: td:nth-child(5)
+        filters:
+          - name: regexp
+            args: (\d+.*(MB|GB)+)
+      seeders:
+        selector: td:nth-child(7)
+      leechers:
+        selector: td:nth-child(8)
+      date:
+        selector: td:nth-child(4)
+        filters:
+          - name: regexp
+            args: (\d{4}-\d{2}-\d{2})
+      downloadvolumefactor:
+        case:
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett/Definitions/cinematik.yml

@@ -0,0 +1,94 @@
+---
+  site: cinematik
+  name: Cinematik
+  description: "Non-Hollywood movie tracker"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://www.cinematik.net
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Movies, desc: "Comedy"}
+      - {id: 4, cat: Movies, desc: "Action"}
+      - {id: 6, cat: Movies, desc: "Drama"}
+      - {id: 7, cat: Movies, desc: "Documentary"}
+      - {id: 9, cat: Movies, desc: "Crime"}
+      - {id: 12, cat: Movies, desc: "Sci-Fi"}
+      - {id: 17, cat: Movies, desc: "War"}
+      - {id: 21, cat: Movies, desc: "Silent Films"}
+      - {id: 23, cat: Movies, desc: "TV-Series"}
+      - {id: 24, cat: Movies, desc: "Animation"}
+      - {id: 25, cat: Movies, desc: "Exploitation"}
+      - {id: 26, cat: Movies, desc: "Experimental"}
+      - {id: 27, cat: Movies, desc: "Fantasy"}
+      - {id: 29, cat: Movies, desc: "Short"}
+      - {id: 30, cat: Movies, desc: "Western"}
+      - {id: 32, cat: Movies, desc: "Foreign Languages"}
+      - {id: 33, cat: Movies, desc: "Thriller"}
+      - {id: 34, cat: Movies, desc: "Opera and Musical"}
+
+    modes:
+      search: [q]
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: table:contains("Login failed!")
+    test:
+      path: my.php
+
+  download:
+    selector: a[href^="download.php?id="]
+        
+  search:
+    path: browse.php
+    inputs:
+      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+    rows:
+      selector: table[border="1"] tr:not(:first-child)
+    fields:
+      category:
+        text: 1
+      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(8)
+        filters:
+          - name: regexp
+            args: ([\d,]+)
+      files:
+        selector: td:nth-child(5)
+      size:
+        selector: td:nth-child(7)
+      seeders:
+        selector: td:nth-child(9)
+      leechers:
+        selector: td:nth-child(10)
+      date:
+        selector: td:nth-child(11) div.addedtor
+      downloadvolumefactor:
+        case:
+          "img[title=\"Golden Torrent: No Download Stats are Recorded\"]": "0"
+          "img[title=\"Silver Torrent: Download Stats are 25% Recorded\"]": "0.25"
+          "img[title=\"Platinum Torrent: No Download Stats are Recorded, Upload Stats are Doubled!\"]": "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "img[title=\"Platinum Torrent: No Download Stats are Recorded, Upload Stats are Doubled!\"]": "2"
+          "*": "1"

src/Jackett/Definitions/classix.yml

@@ -0,0 +1,64 @@
+---
+  site: classix
+  name: Classix
+  description: "Classic movie tracker"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - http://classix-unlimited.co.uk/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Movies, desc: "Movies"}
+
+    modes:
+      search: [q]
+
+  login:
+    path: account-login.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: div.myContent:contains("Access Denied")
+    test:
+      path: index.php
+
+  download:
+    selector: a[href^="download.php?id="]
+        
+  search:
+    path: torrents-search.php
+    inputs:
+      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+    rows:
+      selector: table > tbody > tr:has(a[href^="torrents.php?cat="])
+    fields:
+      category:
+        text: 1
+      title:
+        selector: td:nth-child(3)
+      download:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: href
+        filters:
+          - name: replace
+            args: ["torrents-details.php?id=", "download.php?id="]
+      details:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: href
+      size:
+        selector: td:nth-child(7)
+      seeders:
+        selector: td:nth-child(8)
+      leechers:
+        selector: td:nth-child(9)
+      downloadvolumefactor:
+        case:
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett/Definitions/czteam.yml

@@ -1,94 +1,94 @@
----
-  site: czteam
-  name: CZTeam
-  language: cs-cz
-  type: private
-  encoding: UTF-8
-  links:
-    - https://czteam.club/
-
-  caps:
-    categorymappings:
-      - {id: 1, cat: Movies, desc: "Movies"}
-      - {id: 2, cat: TV, desc: "TV-Eps"}
-      - {id: 3, cat: Audio, desc: "Music"}
-      - {id: 4, cat: PC/Games, desc: "Games"}
-      - {id: 5, cat: PC/ISO, desc: "Software"}
-      - {id: 6, cat: XXX, desc: "XxX"}
-      - {id: 7, cat: Other, desc: "Other"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: login.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      keeplogged: 1
-      login: "Log in"
-    error:
-      - selector: form#loginform > span.warning
-    test:
-      path: torrents.php
-
-  search:
-    path: torrents.php
-    inputs:
-      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
-      searchstr: "{{ .Query.Keywords }}"
-      order_by: time
-      order_way: desc
-      action: basic
-      searchsubmit: 1
-    rows:
-      selector: table#torrent_table > tbody > tr.torrent
-    fields:
-      download:
-        selector: a[href^="torrents.php?action=download&id="]
-        attribute: href
-      title:
-        selector: a.torrent_name
-      category:
-        selector: td.cats_col
-        case:
-          div.cats_movies: 1
-          div.cats_tveps: 2
-          div.cats_music: 3
-          div.cats_games: 4
-          div.cats_software: 5
-          div.cats_xxx: 6
-          div.cats_other: 7
-      details:
-        selector: a.torrent_name
-        attribute: href
-      banner:
-        selector: a.torrent_name
-        optional: true
-        attribute: cover
-      files:
-        selector: td:nth-child(3)
-      date:
-        selector: td:nth-child(4)
-      size:
-        selector: td:nth-child(5)
-      grabs:
-        selector: td:nth-child(6)
-      seeders:
-        selector: td:nth-child(7)
-      leechers:
-        selector: td:nth-child(8)
-      downloadvolumefactor:
-        case:
-          "strong.tl_free": "0"
-          "strong.tl_neutral": "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "strong.tl_neutral": "0"
-          "*": "1"
-      description:
-        selector: div.torrent_info
+---
+  site: czteam
+  name: CZTeam
+  language: cs-cz
+  type: private
+  encoding: UTF-8
+  links:
+    - https://czteam.club/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Movies, desc: "Movies"}
+      - {id: 2, cat: TV, desc: "TV-Eps"}
+      - {id: 3, cat: Audio, desc: "Music"}
+      - {id: 4, cat: PC/Games, desc: "Games"}
+      - {id: 5, cat: PC/ISO, desc: "Software"}
+      - {id: 6, cat: XXX, desc: "XxX"}
+      - {id: 7, cat: Other, desc: "Other"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: login.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      keeplogged: 1
+      login: "Log in"
+    error:
+      - selector: form#loginform > span.warning
+    test:
+      path: torrents.php
+
+  search:
+    path: torrents.php
+    inputs:
+      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+      searchstr: "{{ .Query.Keywords }}"
+      order_by: time
+      order_way: desc
+      action: basic
+      searchsubmit: 1
+    rows:
+      selector: table#torrent_table > tbody > tr.torrent
+    fields:
+      download:
+        selector: a[href^="torrents.php?action=download&id="]
+        attribute: href
+      title:
+        selector: a.torrent_name
+      category:
+        selector: td.cats_col
+        case:
+          div.cats_movies: 1
+          div.cats_tveps: 2
+          div.cats_music: 3
+          div.cats_games: 4
+          div.cats_software: 5
+          div.cats_xxx: 6
+          div.cats_other: 7
+      details:
+        selector: a.torrent_name
+        attribute: href
+      banner:
+        selector: a.torrent_name
+        optional: true
+        attribute: cover
+      files:
+        selector: td:nth-child(3)
+      date:
+        selector: td:nth-child(4)
+      size:
+        selector: td:nth-child(5)
+      grabs:
+        selector: td:nth-child(6)
+      seeders:
+        selector: td:nth-child(7)
+      leechers:
+        selector: td:nth-child(8)
+      downloadvolumefactor:
+        case:
+          "strong.tl_free": "0"
+          "strong.tl_neutral": "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "strong.tl_neutral": "0"
+          "*": "1"
+      description:
+        selector: div.torrent_info
         remove: strong

src/Jackett/Definitions/datascene.yml

@@ -1,119 +1,119 @@
----
-  site: datascene
-  name: DataScene
-  language: ro-ro
-  type: private
-  encoding: windows-1252
-  links:
-    - http://datascene.net/
-
-  caps:
-    categorymappings:
-      - {id: 3, cat: TV/Anime, desc: "Anime | Cartoon"}
-      - {id: 15, cat: PC/0day, desc: "Appz | Win"}
-      - {id: 4, cat: PC/0day, desc: "Appz | Linux"}
-      - {id: 6, cat: Books, desc: "E-Book"}
-      - {id: 10, cat: PC/Games, desc: "Games | PC Iso"}
-      - {id: 9, cat: PC/Games, desc: "Games | PC Rips"}
-      - {id: 11, cat: Console, desc: "Games | Pack"}
-      - {id: 43, cat: Console, desc: "Games | Console"}
-      - {id: 29, cat: Other, desc: "Images"}
-      - {id: 2, cat: Other, desc: "MiSC"}
-      - {id: 5, cat: PC/Phone-Other, desc: "Mobile"}
-      - {id: 27, cat: Movies, desc: "Movies | Pack"}
-      - {id: 46, cat: Movies/3D, desc: "Movies | 3D"}
-      - {id: 26, cat: Movies/SD, desc: "Movies | Cam"}
-      - {id: 25, cat: Movies, desc: "Movies | Documentary"}
-      - {id: 24, cat: Movies/DVD, desc: "Movies | DVD-R"}
-      - {id: 32, cat: Movies/DVD, desc: "Movies | DVD-RO"}
-      - {id: 23, cat: Movies/HD, desc: "Movies | HD"}
-      - {id: 31, cat: Movies/HD, desc: "Movies | HD-Ro"}
-      - {id: 34, cat: Movies/Foreign, desc: "Movies | Hindi"}
-      - {id: 30, cat: Movies/SD, desc: "Movies | Xvid"}
-      - {id: 36, cat: Movies/SD, desc: "Movies | Xvid-Ro"}
-      - {id: 21, cat: Audio/Video, desc: "Music | Video"}
-      - {id: 19, cat: Audio , desc: "Music | Mp3/Flac"}
-      - {id: 18, cat: Other, desc: "Other"}
-      - {id: 42, cat: Other, desc: "Premiera | DsT"}
-      - {id: 14, cat: TV/Sport, desc: "Sport"}
-      - {id: 47, cat: TV/SD, desc: "Tv | Episodes"}
-      - {id: 28, cat: TV/HD, desc: "Tv-HD | Episodes"}
-      - {id: 13, cat: Other, desc: "Tutoriale"}
-      - {id: 12, cat: XXX, desc: "XxX"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: /takelogin.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: td.embedded:has(h2:contains("failed"))
-    test:
-      path: /browse.php
-      
-  ratio:
-    path: /browse.php
-    selector: font:contains("Ratio:") > span
-
-  search:
-    path: /browse.php
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
-      incldead: 1
-    rows:
-      selector: tr:has(a.tname)
-    fields:
-      title:
-        selector: a.tname
-        attribute: title
-      details:
-        selector: a.tname
-        attribute: href
-      category:
-        selector: a[href^="browse.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      download:
-        selector: a[href^="/download.php/"]
-        attribute: href
-      grabs:
-        selector: td:nth-child(7)
-        filters:
-          - name: regexp
-            args: (\d+)
-      size:
-        selector: td:nth-child(6)
-      date:
-        selector: td:nth-child(2) > right > div:has(font:contains("Uploaded"))
-        remove: div > font
-        filters:
-          - name: trim
-            args: ":"
-      seeders:
-        selector: td:nth-child(8)
-      leechers:
-        selector: td:nth-child(9)
-      banner:
-        selector: a.tname
-        attribute: onmouseover
-        filters:
-          - name: regexp
-            args: src=([^\s]+)
-      downloadvolumefactor:
-        case:
-          "img[src=\"pic/free.gif\"]": "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
-      description:
-        selector: td:nth-child(2) > right
+---
+  site: datascene
+  name: DataScene
+  language: ro-ro
+  type: private
+  encoding: windows-1252
+  links:
+    - http://datascene.net/
+
+  caps:
+    categorymappings:
+      - {id: 3, cat: TV/Anime, desc: "Anime | Cartoon"}
+      - {id: 15, cat: PC/0day, desc: "Appz | Win"}
+      - {id: 4, cat: PC/0day, desc: "Appz | Linux"}
+      - {id: 6, cat: Books, desc: "E-Book"}
+      - {id: 10, cat: PC/Games, desc: "Games | PC Iso"}
+      - {id: 9, cat: PC/Games, desc: "Games | PC Rips"}
+      - {id: 11, cat: Console, desc: "Games | Pack"}
+      - {id: 43, cat: Console, desc: "Games | Console"}
+      - {id: 29, cat: Other, desc: "Images"}
+      - {id: 2, cat: Other, desc: "MiSC"}
+      - {id: 5, cat: PC/Phone-Other, desc: "Mobile"}
+      - {id: 27, cat: Movies, desc: "Movies | Pack"}
+      - {id: 46, cat: Movies/3D, desc: "Movies | 3D"}
+      - {id: 26, cat: Movies/SD, desc: "Movies | Cam"}
+      - {id: 25, cat: Movies, desc: "Movies | Documentary"}
+      - {id: 24, cat: Movies/DVD, desc: "Movies | DVD-R"}
+      - {id: 32, cat: Movies/DVD, desc: "Movies | DVD-RO"}
+      - {id: 23, cat: Movies/HD, desc: "Movies | HD"}
+      - {id: 31, cat: Movies/HD, desc: "Movies | HD-Ro"}
+      - {id: 34, cat: Movies/Foreign, desc: "Movies | Hindi"}
+      - {id: 30, cat: Movies/SD, desc: "Movies | Xvid"}
+      - {id: 36, cat: Movies/SD, desc: "Movies | Xvid-Ro"}
+      - {id: 21, cat: Audio/Video, desc: "Music | Video"}
+      - {id: 19, cat: Audio , desc: "Music | Mp3/Flac"}
+      - {id: 18, cat: Other, desc: "Other"}
+      - {id: 42, cat: Other, desc: "Premiera | DsT"}
+      - {id: 14, cat: TV/Sport, desc: "Sport"}
+      - {id: 47, cat: TV/SD, desc: "Tv | Episodes"}
+      - {id: 28, cat: TV/HD, desc: "Tv-HD | Episodes"}
+      - {id: 13, cat: Other, desc: "Tutoriale"}
+      - {id: 12, cat: XXX, desc: "XxX"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: /takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: td.embedded:has(h2:contains("failed"))
+    test:
+      path: /browse.php
+      
+  ratio:
+    path: /browse.php
+    selector: font:contains("Ratio:") > span
+
+  search:
+    path: /browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      incldead: 1
+    rows:
+      selector: tr:has(a.tname)
+    fields:
+      title:
+        selector: a.tname
+        attribute: title
+      details:
+        selector: a.tname
+        attribute: href
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      download:
+        selector: a[href^="/download.php/"]
+        attribute: href
+      grabs:
+        selector: td:nth-child(7)
+        filters:
+          - name: regexp
+            args: (\d+)
+      size:
+        selector: td:nth-child(6)
+      date:
+        selector: td:nth-child(2) > right > div:has(font:contains("Uploaded"))
+        remove: div > font
+        filters:
+          - name: trim
+            args: ":"
+      seeders:
+        selector: td:nth-child(8)
+      leechers:
+        selector: td:nth-child(9)
+      banner:
+        selector: a.tname
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: src=([^\s]+)
+      downloadvolumefactor:
+        case:
+          "img[src=\"pic/free.gif\"]": "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"
+      description:
+        selector: td:nth-child(2) > right
         remove: div

src/Jackett/Definitions/dragonworld.yml

@@ -1,154 +1,154 @@
----
-  site: dragonworld
-  name: Dragon World (DTW)
-  language: de-de
-  type: private
-  encoding: UTF-8
-  links:
-    - http://dtw.sytes.net/
-
-  caps:
-    categorymappings:
-      # Dokumentation
-      - {id: 46, cat: TV/Documentary, desc: "Dokumentation"}
-      - {id: 55, cat: TV/Documentary, desc: "Dokumentation/HD"}
-      - {id: 56, cat: TV/Documentary, desc: "Dokumentation/SD"}
-      # Ebooks
-      - {id: 36, cat: Books, desc: "Ebooks"}
-      - {id: 37, cat: Books, desc: "Ebooks"}
-      - {id: 38, cat: Books, desc: "Ebooks/Hoerspiele/Hoerbuecher"}
-      # Games
-      - {id: 21, cat: Console, desc: "Games"}
-      - {id: 24, cat: Console/Other, desc: "Games/Nintendo"}
-      - {id: 22, cat: PC/Games, desc: "Games/PC"}
-      - {id: 23, cat: Console/PS4, desc: "Games/Playstation"}
-      - {id: 25, cat: Console/Xbox, desc: "Games/Xbox"}
-      # Kinder
-      - {id: 10, cat: Other, desc: "Kinder"}
-      - {id: 14, cat: Other, desc: "Kinder/Diverses"}
-      - {id: 12, cat: Movies, desc: "Kinder/Filme"}
-      - {id: 11, cat: PC/Games, desc: "Kinder/Games"}
-      - {id: 13, cat: Audio, desc: "Kinder/Musik"}
-      # Movies
-      - {id: 15, cat: Movies, desc: "Movies"}
-      - {id: 50, cat: Movies/3D, desc: "Movies/3D"}
-      - {id: 48, cat: Movies/HD, desc: "Movies/HD"}
-      - {id: 53, cat: Movies/HD, desc: "Movies/HD Pack"}
-      - {id: 45, cat: Movies/HD, desc: "Movies/Remuxe"}
-      - {id: 17, cat: Movies/SD, desc: "Movies/SD"}
-      - {id: 54, cat: Movies/SD, desc: "Movies/SD Pack"}
-      # Musik
-      - {id: 4, cat: Audio, desc: "Musik"}
-      - {id: 57, cat: Audio, desc: "Musik/Album"}
-      - {id: 8, cat: Audio/Lossless, desc: "Musik/Flac"}
-      - {id: 7, cat: Audio/MP3, desc: "Musik/Mp3"}
-      - {id: 9, cat: Audio/Video, desc: "Musik/Video"}
-      # Serien
-      - {id: 26, cat: TV, desc: "Serien"}
-      - {id: 27, cat: TV/HD, desc: "Serien/HD"}
-      - {id: 28, cat: TV/SD, desc: "Serien/SD"}
-      # Software
-      - {id: 29, cat: PC/0day, desc: "Software"}
-      - {id: 32, cat: PC/0day, desc: "Software/Diverses"}
-      - {id: 31, cat: PC/Mac, desc: "Software/Mac"}
-      - {id: 30, cat: PC/0day, desc: "Software/Windows"}
-      # Sport
-      - {id: 39, cat: TV/Sport, desc: "Sport"}
-      - {id: 40, cat: TV/Sport, desc: "Sport HD"}
-      - {id: 58, cat: TV/Sport, desc: "Sport SD"}
-      # XXX
-      - {id: 33, cat: XXX, desc: "XXX"}
-      - {id: 34, cat: XXX, desc: "XXX/HD"}
-      - {id: 35, cat: XXX, desc: "XXX/SD"}
-
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
-  
-  login:
-    path: takelogin.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: table:has(td:contains("Ein Fehler ist aufgetreten"))
-    test:
-      path: browse.php
-      selector: a[href*="/logout.php"]
-
-  download:
-    before:
-      path: "takethanks.php"
-      method: "post"
-      inputs:
-        torrentid: "{{ .DownloadUri.Query.id }}"
-      
-  search:
-    path: browse.php
-    keywordsfilters:
-      - name: re_replace
-        args: ["[^a-zA-Z0-9]+", "%"]
-    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
-      magnet:
-        selector: a[href^="magnet:"]
-        attribute: href
-      title:
-        selector: a[href*="/details.php?id="]
-      title:
-        selector: div.tooltip-content > div
-        optional: true
-      details:
-        selector: a[href*="/details.php?id="]
-        attribute: href
-      category:
-        selector: a[href*="/browse.php?category="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: category
-      banner:
-        selector: div.tooltip-content > img
-        attribute: src
-        optional: true
-      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^="OnlyUp Torrent"]: "0"
-          img[alt^="50% "]: "0.5"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          img[alt^="multi2 Torrent"]: "2"
-          "*": "1"
-      date:
-        selector: "td:nth-child(2) > div:has(span[style=\"float: right;\"])"
-        remove: span
-        filters:
-          - name: append
-            args: " +01:00"
-          - name: dateparse
-            args: "02-01-2006 15:04 -07:00"
+---
+  site: dragonworld
+  name: Dragon World (DTW)
+  language: de-de
+  type: private
+  encoding: UTF-8
+  links:
+    - http://dtw.sytes.net/
+
+  caps:
+    categorymappings:
+      # Dokumentation
+      - {id: 46, cat: TV/Documentary, desc: "Dokumentation"}
+      - {id: 55, cat: TV/Documentary, desc: "Dokumentation/HD"}
+      - {id: 56, cat: TV/Documentary, desc: "Dokumentation/SD"}
+      # Ebooks
+      - {id: 36, cat: Books, desc: "Ebooks"}
+      - {id: 37, cat: Books, desc: "Ebooks"}
+      - {id: 38, cat: Books, desc: "Ebooks/Hoerspiele/Hoerbuecher"}
+      # Games
+      - {id: 21, cat: Console, desc: "Games"}
+      - {id: 24, cat: Console/Other, desc: "Games/Nintendo"}
+      - {id: 22, cat: PC/Games, desc: "Games/PC"}
+      - {id: 23, cat: Console/PS4, desc: "Games/Playstation"}
+      - {id: 25, cat: Console/Xbox, desc: "Games/Xbox"}
+      # Kinder
+      - {id: 10, cat: Other, desc: "Kinder"}
+      - {id: 14, cat: Other, desc: "Kinder/Diverses"}
+      - {id: 12, cat: Movies, desc: "Kinder/Filme"}
+      - {id: 11, cat: PC/Games, desc: "Kinder/Games"}
+      - {id: 13, cat: Audio, desc: "Kinder/Musik"}
+      # Movies
+      - {id: 15, cat: Movies, desc: "Movies"}
+      - {id: 50, cat: Movies/3D, desc: "Movies/3D"}
+      - {id: 48, cat: Movies/HD, desc: "Movies/HD"}
+      - {id: 53, cat: Movies/HD, desc: "Movies/HD Pack"}
+      - {id: 45, cat: Movies/HD, desc: "Movies/Remuxe"}
+      - {id: 17, cat: Movies/SD, desc: "Movies/SD"}
+      - {id: 54, cat: Movies/SD, desc: "Movies/SD Pack"}
+      # Musik
+      - {id: 4, cat: Audio, desc: "Musik"}
+      - {id: 57, cat: Audio, desc: "Musik/Album"}
+      - {id: 8, cat: Audio/Lossless, desc: "Musik/Flac"}
+      - {id: 7, cat: Audio/MP3, desc: "Musik/Mp3"}
+      - {id: 9, cat: Audio/Video, desc: "Musik/Video"}
+      # Serien
+      - {id: 26, cat: TV, desc: "Serien"}
+      - {id: 27, cat: TV/HD, desc: "Serien/HD"}
+      - {id: 28, cat: TV/SD, desc: "Serien/SD"}
+      # Software
+      - {id: 29, cat: PC/0day, desc: "Software"}
+      - {id: 32, cat: PC/0day, desc: "Software/Diverses"}
+      - {id: 31, cat: PC/Mac, desc: "Software/Mac"}
+      - {id: 30, cat: PC/0day, desc: "Software/Windows"}
+      # Sport
+      - {id: 39, cat: TV/Sport, desc: "Sport"}
+      - {id: 40, cat: TV/Sport, desc: "Sport HD"}
+      - {id: 58, cat: TV/Sport, desc: "Sport SD"}
+      # XXX
+      - {id: 33, cat: XXX, desc: "XXX"}
+      - {id: 34, cat: XXX, desc: "XXX/HD"}
+      - {id: 35, cat: XXX, desc: "XXX/SD"}
+
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+  
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: table:has(td:contains("Ein Fehler ist aufgetreten"))
+    test:
+      path: browse.php
+      selector: a[href*="/logout.php"]
+
+  download:
+    before:
+      path: "takethanks.php"
+      method: "post"
+      inputs:
+        torrentid: "{{ .DownloadUri.Query.id }}"
+      
+  search:
+    path: browse.php
+    keywordsfilters:
+      - name: re_replace
+        args: ["[^a-zA-Z0-9]+", "%"]
+    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
+      magnet:
+        selector: a[href^="magnet:"]
+        attribute: href
+      title:
+        selector: a[href*="/details.php?id="]
+      title:
+        selector: div.tooltip-content > div
+        optional: true
+      details:
+        selector: a[href*="/details.php?id="]
+        attribute: href
+      category:
+        selector: a[href*="/browse.php?category="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: category
+      banner:
+        selector: div.tooltip-content > img
+        attribute: src
+        optional: true
+      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^="OnlyUp Torrent"]: "0"
+          img[alt^="50% "]: "0.5"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          img[alt^="multi2 Torrent"]: "2"
+          "*": "1"
+      date:
+        selector: "td:nth-child(2) > div:has(span[style=\"float: right;\"])"
+        remove: span
+        filters:
+          - name: append
+            args: " +01:00"
+          - name: dateparse
+            args: "02-01-2006 15:04 -07:00"

src/Jackett/Definitions/dragonworldreloaded.yml

@@ -1,238 +1,238 @@
----
-  site: dragonworldreloaded
-  name: Dragonworld Reloaded
-  language: de-de
-  type: private
-  encoding: UTF-8
-  links:
-    - https://dragonworld-reloaded.net/
-
-  caps:
-    categorymappings:
-      # Kino
-      - {id: 118, cat: Movies/HD, desc: "Kino - HD"}
-      - {id: 4, cat: Movies/SD, desc: "Kino - SD"}
-      # Movies
-      - {id: 18, cat: Movies/SD, desc: "Movies - x264/XviD"}
-      - {id: 2, cat: Movies, desc: "Movies - Pack SD/HD"}
-      - {id: 22, cat: Movies/DVD, desc: "Movies - DVD/HD2"}
-      - {id: 52, cat: Movies, desc: "Movies - Kids"}
-      - {id: 19, cat: Movies/HD, desc: "Movies - HD"}
-      - {id: 25, cat: Movies/3D, desc: "Movies - 3D"}
-      - {id: 26, cat: Movies/BluRay, desc: "Movies - Blu-Ray"}
-      # Serien
-      - {id: 40, cat: TV/SD, desc: "Serien - SD"}
-      - {id: 41, cat: TV/HD, desc: "Serien - HD"}
-      - {id: 42, cat: TV/SD, desc: "Serien - Pack SD"}
-      - {id: 80, cat: TV/HD, desc: "Serien - Pack HD"}
-      # Musik
-      - {id: 119, cat: Audio, desc: "Musik - ALBEN"}
-      - {id: 5, cat: Audio/MP3, desc: "Musik - Mp3"}
-      - {id: 6, cat: Audio, desc: "Musik - Mixe"}
-      - {id: 92, cat: Audio, desc: "Musik - Discography"}
-      - {id: 114, cat: Audio, desc: "Musik - Musik Pack"}
-      - {id: 48, cat: Audio/Video, desc: "Musik - Video"}
-      # Doku
-      - {id: 37, cat: TV/Documentary, desc: "Doku - SD"}
-      - {id: 38, cat: TV/Documentary, desc: "Doku - HD"}
-      - {id: 81, cat: TV/Documentary, desc: "Doku - Pack "}
-      # Anime
-      - {id: 73, cat: TV/Anime, desc: "Anime - Movies"}
-      - {id: 74, cat: TV/Anime, desc: "Anime - Serien"}
-      # Games
-      - {id: 16, cat: PC/Games, desc: "Games - PC"}
-      - {id: 14, cat: Console/Other, desc: "Games - Wimmelbild"}
-      - {id: 7, cat: Console/PSP, desc: "Games - PSP"}
-      - {id: 17, cat: Console/PS3, desc: "Games - PS2/PS3"}
-      - {id: 29, cat: Console/NDS, desc: "Games - NDS/3DS"}
-      - {id: 15, cat: Console/Wii, desc: "Games - Wii"}
-      - {id: 8, cat: Console/Xbox, desc: "Games - XboX "}
-      # Appz
-      - {id: 30, cat: PC/0day, desc: "Appz - Windows"}
-      - {id: 31, cat: PC/0day, desc: "Appz - Linux"}
-      - {id: 32, cat: PC/Mac, desc: "Appz - Mac"}
-      - {id: 106, cat: PC/Phone-Android, desc: "Appz - Android"}
-      # Sport
-      - {id: 43, cat: TV/Sport, desc: "Sport - SD"}
-      - {id: 50, cat: TV/Sport, desc: "Sport - HD"}
-      # Sonstiges
-      - {id: 34, cat: Books, desc: "Sonstiges - E-Books"}
-      - {id: 35, cat: Audio/Audiobook, desc: "Sonstiges - Audiobook"}
-      - {id: 36, cat: Other, desc: "Sonstiges - Diverses"}
-      # XXX
-      - {id: 46, cat: XXX, desc: "XXX - SD"}
-      - {id: 47, cat: XXX, desc: "XXX - HD"}
-      - {id: 45, cat: XXX, desc: "XXX - Pack"}
-      - {id: 49, cat: XXX, desc: "XXX - Sonstiges"}
-      - {id: 110, cat: XXX, desc: "XXX - Hentai Serie"}
-      - {id: 111, cat: XXX, desc: "XXX - Hentai Movie"}
-      - {id: 116, cat: XXX, desc: "XXX - SexBooks"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
-  
-  login:
-    path: /login.php
-    method: form
-    form: form[action="/login.php"]
-    cookies: ["JAVA=OK"] # avoid jscheck redirect
-    captcha:
-      type: image
-      image: img[src^="cap/captcha_math.php"]
-      input: stringCaptcha
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      loggiin: "einloggen"
-    error:
-      - selector: div#login_error
-    test:
-      path: selection.php
-
-  download:
-    before:
-      path: "ajax_det_poll.php"
-      method: "post"
-      inputs:
-        set_thanks: "thanks"
-        det_id: "{{ .DownloadUri.Query.torrent }}"
-        ajax: "yes"
-
-  search:
-    path: selection.php
-    inputs:
-      search: "{{ .Keywords }}"
-      blah: "0"
-      orderby: "added"
-      sort: "desc"
-    rows:
-      selector: div.selection_wrap
-    fields:
-      download:
-        selector: a.selection_a
-        attribute: href
-        filters:
-          - name: replace
-            args: ["details.php?id=", "download.php?torrent="]
-      title:
-        selector: a.selection_a
-      details:
-        selector: a.selection_a
-        attribute: href
-      category:
-        selector: div.kat_cat_pic
-        case:
-          # Kino
-          ":has(div.kat_cat_pic_name:contains(\"Kino\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "118"
-          ":has(div.kat_cat_pic_name:contains(\"Kino\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "4"
-          # Movies
-          ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"x264/XviD\"))": "18"
-          ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"Pack SD/HD\"))": "2"
-          ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"DVD/HD2\"))": "22"
-          ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"Kids\"))": "52"
-          ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "19"
-          ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"3D\"))": "25"
-          ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"Blu-Ray\"))": "26"
-          # Serien
-          ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "40"
-          ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "41"
-          ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack SD\"))": "42"
-          ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack HD\"))": "80"
-          # Musik
-          ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"ALBEN\"))": "119"
-          ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Mp3\"))": "5"
-          ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Mixe\"))": "6"
-          ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Discography\"))": "92"
-          ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Musik Pack\"))": "114"
-          ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Video\"))": "48"
-          # Doku
-          ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "37"
-          ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "38"
-          ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"Pack \"))": "81"
-          # Anime
-          ":has(div.kat_cat_pic_name:contains(\"Anime\")):has(div.kat_cat_pic_name_b:contains(\"Movies\"))": "73"
-          ":has(div.kat_cat_pic_name:contains(\"Anime\")):has(div.kat_cat_pic_name_b:contains(\"Serien\"))": "74"
-          # Games
-          ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": "16"
-          ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"Wimmelbild\"))": "14"
-          ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"PSP\"))": "7"
-          ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"PS2/PS3\"))": "17"
-          ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"NDS/3DS\"))": "29"
-          ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"Wii\"))": "15"
-          ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"XboX \"))": "8"
-          # Appz
-          ":has(div.kat_cat_pic_name:contains(\"Appz\")):has(div.kat_cat_pic_name_b:contains(\"Windows\"))": "30"
-          ":has(div.kat_cat_pic_name:contains(\"Appz\")):has(div.kat_cat_pic_name_b:contains(\"Linux\"))": "31"
-          ":has(div.kat_cat_pic_name:contains(\"Appz\")):has(div.kat_cat_pic_name_b:contains(\"Mac\"))": "32"
-          ":has(div.kat_cat_pic_name:contains(\"Appz\")):has(div.kat_cat_pic_name_b:contains(\"Android\"))": "106"
-          # Sport
-          ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "43"
-          ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "50"
-          # Sonstiges
-          ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"E-Books\"))": "34"
-          ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Audiobook\"))": "35"
-          ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Diverses\"))": "36"
-          # XXX
-          ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "46"
-          ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "47"
-          ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "45"
-          ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Sonstiges\"))": "49"
-          ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Hentai Serie\"))": "110"
-          ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Hentai Movie\"))": "111"
-          ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"SexBooks\"))": "116"
-      banner:
-        selector: div[id^="details"] img
-        attribute: src
-      size:
-        selector: div.selection_unter_ad
-        filters:
-          - name: replace
-            args: [".", ""]
-          - name: replace
-            args: [",", "."]
-      grabs:
-        selector: div.selection_unter_ae
-        filters:
-          - name: trim
-            args: "x"
-          - name: replace
-            args: [".", ""]
-          - name: replace
-            args: [",", "."]
-      seeders:
-        selector: div.selection_unter_aa
-        filters:
-          - name: replace
-            args: [".", ""]
-          - name: replace
-            args: [",", "."]
-      leechers:
-        selector: div.selection_unter_aaa
-        filters:
-          - name: replace
-            args: [".", ""]
-          - name: replace
-            args: [",", "."]
-      downloadvolumefactor:
-        case:
-          ":root:has(div.onlyup)": "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
-      date:
-        selector: div.selection_unter_ab
-        filters:
-          - name: replace
-            args: ["Heute", "Today"]
-          - name: replace
-            args: ["Gestern", "Yesterday"]
-          - name: replace
-            args: [" um", ""]
-          - name: dateparse
-            args: "02.01.2006 15:04:05"
-      description:
-        selector: selection_unter_af
-        optional: true
+---
+  site: dragonworldreloaded
+  name: Dragonworld Reloaded
+  language: de-de
+  type: private
+  encoding: UTF-8
+  links:
+    - https://dragonworld-reloaded.net/
+
+  caps:
+    categorymappings:
+      # Kino
+      - {id: 118, cat: Movies/HD, desc: "Kino - HD"}
+      - {id: 4, cat: Movies/SD, desc: "Kino - SD"}
+      # Movies
+      - {id: 18, cat: Movies/SD, desc: "Movies - x264/XviD"}
+      - {id: 2, cat: Movies, desc: "Movies - Pack SD/HD"}
+      - {id: 22, cat: Movies/DVD, desc: "Movies - DVD/HD2"}
+      - {id: 52, cat: Movies, desc: "Movies - Kids"}
+      - {id: 19, cat: Movies/HD, desc: "Movies - HD"}
+      - {id: 25, cat: Movies/3D, desc: "Movies - 3D"}
+      - {id: 26, cat: Movies/BluRay, desc: "Movies - Blu-Ray"}
+      # Serien
+      - {id: 40, cat: TV/SD, desc: "Serien - SD"}
+      - {id: 41, cat: TV/HD, desc: "Serien - HD"}
+      - {id: 42, cat: TV/SD, desc: "Serien - Pack SD"}
+      - {id: 80, cat: TV/HD, desc: "Serien - Pack HD"}
+      # Musik
+      - {id: 119, cat: Audio, desc: "Musik - ALBEN"}
+      - {id: 5, cat: Audio/MP3, desc: "Musik - Mp3"}
+      - {id: 6, cat: Audio, desc: "Musik - Mixe"}
+      - {id: 92, cat: Audio, desc: "Musik - Discography"}
+      - {id: 114, cat: Audio, desc: "Musik - Musik Pack"}
+      - {id: 48, cat: Audio/Video, desc: "Musik - Video"}
+      # Doku
+      - {id: 37, cat: TV/Documentary, desc: "Doku - SD"}
+      - {id: 38, cat: TV/Documentary, desc: "Doku - HD"}
+      - {id: 81, cat: TV/Documentary, desc: "Doku - Pack "}
+      # Anime
+      - {id: 73, cat: TV/Anime, desc: "Anime - Movies"}
+      - {id: 74, cat: TV/Anime, desc: "Anime - Serien"}
+      # Games
+      - {id: 16, cat: PC/Games, desc: "Games - PC"}
+      - {id: 14, cat: Console/Other, desc: "Games - Wimmelbild"}
+      - {id: 7, cat: Console/PSP, desc: "Games - PSP"}
+      - {id: 17, cat: Console/PS3, desc: "Games - PS2/PS3"}
+      - {id: 29, cat: Console/NDS, desc: "Games - NDS/3DS"}
+      - {id: 15, cat: Console/Wii, desc: "Games - Wii"}
+      - {id: 8, cat: Console/Xbox, desc: "Games - XboX "}
+      # Appz
+      - {id: 30, cat: PC/0day, desc: "Appz - Windows"}
+      - {id: 31, cat: PC/0day, desc: "Appz - Linux"}
+      - {id: 32, cat: PC/Mac, desc: "Appz - Mac"}
+      - {id: 106, cat: PC/Phone-Android, desc: "Appz - Android"}
+      # Sport
+      - {id: 43, cat: TV/Sport, desc: "Sport - SD"}
+      - {id: 50, cat: TV/Sport, desc: "Sport - HD"}
+      # Sonstiges
+      - {id: 34, cat: Books, desc: "Sonstiges - E-Books"}
+      - {id: 35, cat: Audio/Audiobook, desc: "Sonstiges - Audiobook"}
+      - {id: 36, cat: Other, desc: "Sonstiges - Diverses"}
+      # XXX
+      - {id: 46, cat: XXX, desc: "XXX - SD"}
+      - {id: 47, cat: XXX, desc: "XXX - HD"}
+      - {id: 45, cat: XXX, desc: "XXX - Pack"}
+      - {id: 49, cat: XXX, desc: "XXX - Sonstiges"}
+      - {id: 110, cat: XXX, desc: "XXX - Hentai Serie"}
+      - {id: 111, cat: XXX, desc: "XXX - Hentai Movie"}
+      - {id: 116, cat: XXX, desc: "XXX - SexBooks"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+  
+  login:
+    path: /login.php
+    method: form
+    form: form[action="/login.php"]
+    cookies: ["JAVA=OK"] # avoid jscheck redirect
+    captcha:
+      type: image
+      image: img[src^="cap/captcha_math.php"]
+      input: stringCaptcha
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      loggiin: "einloggen"
+    error:
+      - selector: div#login_error
+    test:
+      path: selection.php
+
+  download:
+    before:
+      path: "ajax_det_poll.php"
+      method: "post"
+      inputs:
+        set_thanks: "thanks"
+        det_id: "{{ .DownloadUri.Query.torrent }}"
+        ajax: "yes"
+
+  search:
+    path: selection.php
+    inputs:
+      search: "{{ .Keywords }}"
+      blah: "0"
+      orderby: "added"
+      sort: "desc"
+    rows:
+      selector: div.selection_wrap
+    fields:
+      download:
+        selector: a.selection_a
+        attribute: href
+        filters:
+          - name: replace
+            args: ["details.php?id=", "download.php?torrent="]
+      title:
+        selector: a.selection_a
+      details:
+        selector: a.selection_a
+        attribute: href
+      category:
+        selector: div.kat_cat_pic
+        case:
+          # Kino
+          ":has(div.kat_cat_pic_name:contains(\"Kino\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "118"
+          ":has(div.kat_cat_pic_name:contains(\"Kino\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "4"
+          # Movies
+          ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"x264/XviD\"))": "18"
+          ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"Pack SD/HD\"))": "2"
+          ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"DVD/HD2\"))": "22"
+          ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"Kids\"))": "52"
+          ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "19"
+          ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"3D\"))": "25"
+          ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"Blu-Ray\"))": "26"
+          # Serien
+          ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "40"
+          ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "41"
+          ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack SD\"))": "42"
+          ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack HD\"))": "80"
+          # Musik
+          ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"ALBEN\"))": "119"
+          ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Mp3\"))": "5"
+          ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Mixe\"))": "6"
+          ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Discography\"))": "92"
+          ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Musik Pack\"))": "114"
+          ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Video\"))": "48"
+          # Doku
+          ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "37"
+          ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "38"
+          ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"Pack \"))": "81"
+          # Anime
+          ":has(div.kat_cat_pic_name:contains(\"Anime\")):has(div.kat_cat_pic_name_b:contains(\"Movies\"))": "73"
+          ":has(div.kat_cat_pic_name:contains(\"Anime\")):has(div.kat_cat_pic_name_b:contains(\"Serien\"))": "74"
+          # Games
+          ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": "16"
+          ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"Wimmelbild\"))": "14"
+          ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"PSP\"))": "7"
+          ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"PS2/PS3\"))": "17"
+          ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"NDS/3DS\"))": "29"
+          ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"Wii\"))": "15"
+          ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"XboX \"))": "8"
+          # Appz
+          ":has(div.kat_cat_pic_name:contains(\"Appz\")):has(div.kat_cat_pic_name_b:contains(\"Windows\"))": "30"
+          ":has(div.kat_cat_pic_name:contains(\"Appz\")):has(div.kat_cat_pic_name_b:contains(\"Linux\"))": "31"
+          ":has(div.kat_cat_pic_name:contains(\"Appz\")):has(div.kat_cat_pic_name_b:contains(\"Mac\"))": "32"
+          ":has(div.kat_cat_pic_name:contains(\"Appz\")):has(div.kat_cat_pic_name_b:contains(\"Android\"))": "106"
+          # Sport
+          ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "43"
+          ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "50"
+          # Sonstiges
+          ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"E-Books\"))": "34"
+          ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Audiobook\"))": "35"
+          ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Diverses\"))": "36"
+          # XXX
+          ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "46"
+          ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "47"
+          ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "45"
+          ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Sonstiges\"))": "49"
+          ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Hentai Serie\"))": "110"
+          ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Hentai Movie\"))": "111"
+          ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"SexBooks\"))": "116"
+      banner:
+        selector: div[id^="details"] img
+        attribute: src
+      size:
+        selector: div.selection_unter_ad
+        filters:
+          - name: replace
+            args: [".", ""]
+          - name: replace
+            args: [",", "."]
+      grabs:
+        selector: div.selection_unter_ae
+        filters:
+          - name: trim
+            args: "x"
+          - name: replace
+            args: [".", ""]
+          - name: replace
+            args: [",", "."]
+      seeders:
+        selector: div.selection_unter_aa
+        filters:
+          - name: replace
+            args: [".", ""]
+          - name: replace
+            args: [",", "."]
+      leechers:
+        selector: div.selection_unter_aaa
+        filters:
+          - name: replace
+            args: [".", ""]
+          - name: replace
+            args: [",", "."]
+      downloadvolumefactor:
+        case:
+          ":root:has(div.onlyup)": "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"
+      date:
+        selector: div.selection_unter_ab
+        filters:
+          - name: replace
+            args: ["Heute", "Today"]
+          - name: replace
+            args: ["Gestern", "Yesterday"]
+          - name: replace
+            args: [" um", ""]
+          - name: dateparse
+            args: "02.01.2006 15:04:05"
+      description:
+        selector: selection_unter_af
+        optional: true

src/Jackett/Definitions/dreamteam.yml

@@ -1,320 +1,320 @@
----
-  site: dreamteam
-  name: Dream Team
-  language: el-gr
-  type: private
-  encoding: UTF-8
-  links:
-    - 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: 130, cat: , desc: ""}
-#      - {id: 131, cat: , desc: ""}
-#      - {id: 132, cat: , desc: ""}
-#      - {id: 133, cat: , desc: ""}
-#      - {id: 134, cat: , desc: ""}
-#      - {id: 135, cat: , desc: ""}
-#      - {id: 136, cat: , desc: ""}
-#      - {id: 137, cat: , desc: ""}
-#      - {id: 138, cat: , desc: ""}
-#      - {id: 139, cat: , desc: ""}
-#      - {id: 140, cat: , desc: ""}
-#      - {id: 141, cat: , desc: ""}
-#      - {id: 142, cat: , desc: ""}
-#      - {id: 144, cat: , desc: ""}
-#      - {id: 145, cat: , desc: ""}
-#      - {id: 143, cat: , desc: ""}
-#      - {id: 116, cat: , desc: ""}
-      - {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: 242, cat: , desc: ""}
-      - {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: 146, cat: , desc: ""}
-#      - {id: 147, cat: , desc: ""}
-#      - {id: 148, cat: , desc: ""}
-#      - {id: 149, cat: , desc: ""}
-#      - {id: 150, cat: , desc: ""}
-#      - {id: 151, cat: , desc: ""}
-#      - {id: 152, cat: , desc: ""}
-#      - {id: 242, cat: , desc: ""}
-#      - {id: 153, cat: , desc: ""}
-#      - {id: 154, cat: , desc: ""}
-#      - {id: 243, cat: , desc: ""}
-#      - {id: 244, cat: , desc: ""}
-#      - {id: 117, cat: , desc: ""}
-      - {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: 155, cat: , desc: ""}
-#      - {id: 156, cat: , desc: ""}
-#      - {id: 157, cat: , desc: ""}
-#      - {id: 158, cat: , desc: ""}
-#      - {id: 159, cat: , desc: ""}
-#      - {id: 160, cat: , desc: ""}
-#      - {id: 161, cat: , desc: ""}
-#      - {id: 162, cat: , desc: ""}
-#      - {id: 163, cat: , desc: ""}
-#      - {id: 164, cat: , desc: ""}
-#      - {id: 165, cat: , desc: ""}
-#      - {id: 118, cat: , desc: ""}
-      - {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: 166, cat: , desc: ""}
-#      - {id: 167, cat: , desc: ""}
-#      - {id: 168, cat: , desc: ""}
-#      - {id: 169, cat: , desc: ""}
-#      - {id: 170, cat: , desc: ""}
-#      - {id: 171, cat: , desc: ""}
-#      - {id: 119, cat: , desc: ""}
-      - {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: 172, cat: , desc: ""}
-#      - {id: 173, cat: , desc: ""}
-#      - {id: 174, cat: , desc: ""}
-#      - {id: 175, cat: , desc: ""}
-#      - {id: 176, cat: , desc: ""}
-#      - {id: 177, cat: , desc: ""}
-#      - {id: 178, cat: , desc: ""}
-#      - {id: 120, cat: , desc: ""}
-      - {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: 179, cat: , desc: ""}
-#      - {id: 180, cat: , desc: ""}
-#      - {id: 181, cat: , desc: ""}
-#      - {id: 182, cat: , desc: ""}
-#      - {id: 183, cat: , desc: ""}
-#      - {id: 184, cat: , desc: ""}
-#      - {id: 185, cat: , desc: ""}
-#      - {id: 122, cat: , desc: ""}
-      - {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: , desc: ""}
-      - {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: , desc: ""}
-      - {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: 186, cat: , desc: ""}
-#      - {id: 187, cat: , desc: ""}
-#      - {id: 188, cat: , desc: ""}
-#      - {id: 189, cat: , desc: ""}
-#      - {id: 190, cat: , desc: ""}
-#      - {id: 191, cat: , desc: ""}
-#      - {id: 192, cat: , desc: ""}
-#      - {id: 193, cat: , desc: ""}
-#      - {id: 194, cat: , desc: ""}
-#      - {id: 128, cat: , desc: ""}
-      - {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: , desc: ""}
-      - {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: 203, cat: , desc: ""}
-#      - {id: 204, cat: , desc: ""}
-#      - {id: 205, cat: , desc: ""}
-#      - {id: 126, cat: , desc: ""}
-      - {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: 206, cat: , desc: ""}
-#      - {id: 207, cat: , desc: ""}
-#      - {id: 208, cat: , desc: ""}
-#      - {id: 125, cat: , desc: ""}
-      - {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: 209, cat: , desc: ""}
-#      - {id: 210, cat: , desc: ""}
-#      - {id: 211, cat: , desc: ""}
-#      - {id: 212, cat: , desc: ""}
-#      - {id: 213, cat: , desc: ""}
-#      - {id: 127, cat: , desc: ""}
-      - {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: 214, cat: , desc: ""}
-#      - {id: 215, cat: , desc: ""}
-#      - {id: 129, cat: , desc: ""}
-      - {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^="http://dream-team.ml/logout.php"]
-
-  download:
-    before:
-      path: "takethanks.php"
-      method: "post"
-      inputs:
-        torrentid: "{{ .DownloadUri.Query.id }}"
-      
-  search:
-    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^="http://dream-team.ml/details.php?id="])
-      filters:
-        - name: andmatch
-          args: 66
-    fields:
-      download:
-        selector: a[href^="http://dream-team.ml/download.php?id="]
-        attribute: href
-      title:
-        selector: a[href^="http://dream-team.ml/details.php?id="]
-      title|optional:
-        selector: div.tooltip-content > div
-      details:
-        selector: a[href^="http://dream-team.ml/details.php?id="]
-        attribute: href
-      category:
-        selector: a[href^="http://dream-team.ml/browse.php?category="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: category
-      banner|optional:
-        selector: div.tooltip-content > img
-      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"
+---
+  site: dreamteam
+  name: Dream Team
+  language: el-gr
+  type: private
+  encoding: UTF-8
+  links:
+    - 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: 130, cat: , desc: ""}
+#      - {id: 131, cat: , desc: ""}
+#      - {id: 132, cat: , desc: ""}
+#      - {id: 133, cat: , desc: ""}
+#      - {id: 134, cat: , desc: ""}
+#      - {id: 135, cat: , desc: ""}
+#      - {id: 136, cat: , desc: ""}
+#      - {id: 137, cat: , desc: ""}
+#      - {id: 138, cat: , desc: ""}
+#      - {id: 139, cat: , desc: ""}
+#      - {id: 140, cat: , desc: ""}
+#      - {id: 141, cat: , desc: ""}
+#      - {id: 142, cat: , desc: ""}
+#      - {id: 144, cat: , desc: ""}
+#      - {id: 145, cat: , desc: ""}
+#      - {id: 143, cat: , desc: ""}
+#      - {id: 116, cat: , desc: ""}
+      - {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: 242, cat: , desc: ""}
+      - {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: 146, cat: , desc: ""}
+#      - {id: 147, cat: , desc: ""}
+#      - {id: 148, cat: , desc: ""}
+#      - {id: 149, cat: , desc: ""}
+#      - {id: 150, cat: , desc: ""}
+#      - {id: 151, cat: , desc: ""}
+#      - {id: 152, cat: , desc: ""}
+#      - {id: 242, cat: , desc: ""}
+#      - {id: 153, cat: , desc: ""}
+#      - {id: 154, cat: , desc: ""}
+#      - {id: 243, cat: , desc: ""}
+#      - {id: 244, cat: , desc: ""}
+#      - {id: 117, cat: , desc: ""}
+      - {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: 155, cat: , desc: ""}
+#      - {id: 156, cat: , desc: ""}
+#      - {id: 157, cat: , desc: ""}
+#      - {id: 158, cat: , desc: ""}
+#      - {id: 159, cat: , desc: ""}
+#      - {id: 160, cat: , desc: ""}
+#      - {id: 161, cat: , desc: ""}
+#      - {id: 162, cat: , desc: ""}
+#      - {id: 163, cat: , desc: ""}
+#      - {id: 164, cat: , desc: ""}
+#      - {id: 165, cat: , desc: ""}
+#      - {id: 118, cat: , desc: ""}
+      - {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: 166, cat: , desc: ""}
+#      - {id: 167, cat: , desc: ""}
+#      - {id: 168, cat: , desc: ""}
+#      - {id: 169, cat: , desc: ""}
+#      - {id: 170, cat: , desc: ""}
+#      - {id: 171, cat: , desc: ""}
+#      - {id: 119, cat: , desc: ""}
+      - {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: 172, cat: , desc: ""}
+#      - {id: 173, cat: , desc: ""}
+#      - {id: 174, cat: , desc: ""}
+#      - {id: 175, cat: , desc: ""}
+#      - {id: 176, cat: , desc: ""}
+#      - {id: 177, cat: , desc: ""}
+#      - {id: 178, cat: , desc: ""}
+#      - {id: 120, cat: , desc: ""}
+      - {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: 179, cat: , desc: ""}
+#      - {id: 180, cat: , desc: ""}
+#      - {id: 181, cat: , desc: ""}
+#      - {id: 182, cat: , desc: ""}
+#      - {id: 183, cat: , desc: ""}
+#      - {id: 184, cat: , desc: ""}
+#      - {id: 185, cat: , desc: ""}
+#      - {id: 122, cat: , desc: ""}
+      - {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: , desc: ""}
+      - {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: , desc: ""}
+      - {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: 186, cat: , desc: ""}
+#      - {id: 187, cat: , desc: ""}
+#      - {id: 188, cat: , desc: ""}
+#      - {id: 189, cat: , desc: ""}
+#      - {id: 190, cat: , desc: ""}
+#      - {id: 191, cat: , desc: ""}
+#      - {id: 192, cat: , desc: ""}
+#      - {id: 193, cat: , desc: ""}
+#      - {id: 194, cat: , desc: ""}
+#      - {id: 128, cat: , desc: ""}
+      - {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: , desc: ""}
+      - {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: 203, cat: , desc: ""}
+#      - {id: 204, cat: , desc: ""}
+#      - {id: 205, cat: , desc: ""}
+#      - {id: 126, cat: , desc: ""}
+      - {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: 206, cat: , desc: ""}
+#      - {id: 207, cat: , desc: ""}
+#      - {id: 208, cat: , desc: ""}
+#      - {id: 125, cat: , desc: ""}
+      - {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: 209, cat: , desc: ""}
+#      - {id: 210, cat: , desc: ""}
+#      - {id: 211, cat: , desc: ""}
+#      - {id: 212, cat: , desc: ""}
+#      - {id: 213, cat: , desc: ""}
+#      - {id: 127, cat: , desc: ""}
+      - {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: 214, cat: , desc: ""}
+#      - {id: 215, cat: , desc: ""}
+#      - {id: 129, cat: , desc: ""}
+      - {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^="http://dream-team.ml/logout.php"]
+
+  download:
+    before:
+      path: "takethanks.php"
+      method: "post"
+      inputs:
+        torrentid: "{{ .DownloadUri.Query.id }}"
+      
+  search:
+    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^="http://dream-team.ml/details.php?id="])
+      filters:
+        - name: andmatch
+          args: 66
+    fields:
+      download:
+        selector: a[href^="http://dream-team.ml/download.php?id="]
+        attribute: href
+      title:
+        selector: a[href^="http://dream-team.ml/details.php?id="]
+      title|optional:
+        selector: div.tooltip-content > div
+      details:
+        selector: a[href^="http://dream-team.ml/details.php?id="]
+        attribute: href
+      category:
+        selector: a[href^="http://dream-team.ml/browse.php?category="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: category
+      banner|optional:
+        selector: div.tooltip-content > img
+      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/Definitions/eotforum.yml

@@ -1,180 +1,180 @@
----
-  site: eotforum
-  name: EoT-Forum
-  description: "A German gerneral tracker"
-  language: de-de
-  type: private
-  encoding: windows-1252
-  links:
-    - http://eot-forum.net
-
-  caps:
-    categorymappings:
-      # Filme
-      - {id: 14, cat: Movies/SD, desc: "SD XviD"}
-      - {id: 15, cat: Movies/SD, desc: "SD x264"}
-      - {id: 16, cat: Movies/HD, desc: "HD"}
-      - {id: 68, cat: Movies/HD, desc: "UHD"}
-      - {id: 17, cat: Movies/3D, desc: "3D"}
-      - {id: 18, cat: Movies/DVD, desc: "DVD-R"}
-      - {id: 19, cat: Movies, desc: "Pack"}
-      - {id: 20, cat: Movies, desc: "International"}
-      - {id: 21, cat: XXX, desc: "XXX"}
-
-      # Serien/TV
-      - {id: 23, cat: TV/SD, desc: "SD XviD"}
-      - {id: 24, cat: TV/SD, desc: "SD x264"}
-      - {id: 25, cat: TV/HD, desc: "HD"}
-      - {id: 26, cat: TV/SD, desc: "DVD-R"}
-      - {id: 27, cat: TV, desc: "Pack"}
-      - {id: 28, cat: TV, desc: "International"}
-      - {id: 29, cat: TV/Sport, desc: "Sport"}
-
-      # Dokus
-      - {id: 31, cat: TV/Documentary, desc: "SD XviD"}
-      - {id: 32, cat: TV/Documentary, desc: "SD x264"}
-      - {id: 33, cat: TV/Documentary, desc: "HD"}
-      - {id: 34, cat: TV/Documentary, desc: "3D"}
-      - {id: 35, cat: TV/Documentary, desc: "Pack"}
-      - {id: 67, cat: TV/Documentary, desc: "DVD-R"}
-      - {id: 36, cat: TV/Documentary, desc: "International"}
-
-      # Audio
-      - {id: 38, cat: Audio, desc: "Charts"}
-      - {id: 39, cat: Audio/MP3, desc: "MP3"}
-      - {id: 40, cat: Audio/Lossless, desc: "Flac"}
-      - {id: 41, cat: Audio, desc: "Pack"}
-      - {id: 42, cat: Audio/Video, desc: "MusikVideo"}
-      - {id: 43, cat: Audio/Audiobook, desc: "Hörbücher"}
-
-      # Spiele
-      - {id: 45, cat: PC/Games, desc: "Windows"}
-      - {id: 46, cat: PC/Mac, desc: "MacOS"}
-      - {id: 47, cat: Console/PS4, desc: "Sony PS"}
-      - {id: 48, cat: Console/Xbox , desc: "Microsoft XBox"}
-      - {id: 49, cat: Console/NDS, desc: "Nintendo"}
-      - {id: 50, cat: PC/Games, desc: "Linux"}
-      - {id: 51, cat: Console, desc: "Andere"}
-
-      # Software
-      - {id: 53, cat: PC, desc: "Windows"}
-      - {id: 54, cat: PC/Mac, desc: "MacOS"}
-      - {id: 55, cat: PC, desc: "Linux"}
-      - {id: 56, cat: PC/Phone-Android, desc: "Android"}
-      - {id: 57, cat: PC/Phone-IOS, desc: "Apple IOS"}
-      - {id: 58, cat: PC/Phone-Other, desc: "Andere"}
-
-      # Sonstiges
-      - {id: 60, cat: Books, desc: "EBooks"}
-      - {id: 61, cat: Other, desc: "Bilder"}
-      - {id: 62, cat: TV/Anime, desc: "Anime"}
-      - {id: 63, cat: Other, desc: "MISC"}
-      - {id: 64, cat: XXX, desc: "XXX-Bilder/EBooks/Audio"}
-
-      # EOT-Specials
-      - {id: 66, cat: Other, desc: "Special"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: index.php?page=login
-    method: post
-    inputs:
-      uid: "{{ .Config.username }}"
-      pwd: "{{ .Config.password }}"
-      rememberme: "forever"
-      submit: "Login"
-    error:
-    - selector: td.lista[align="center"][colspan="2"] > span
-    test:
-      path: index.php
-      selector: img[alt="Ratio"]
-
-  ratio:
-    path: index.php
-    selector: img[alt="Ratio"] + font
-
-  search:
-    path: index.php
-    inputs:
-      page: "torrents"
-      search: "{{ .Query.Keywords }}"
-      options: "0"
-      active: "0"
-      gold: "0"
-    rows:
-      selector: table.lista > tbody > tr:has(a[href^="index.php?page=torrent-details&id="])
-      dateheaders:
-        selector: ":has(td.header > b)"
-        filters:
-          - name: replace
-            args: ["Torrents vom ", ""]
-          - name: replace
-            args: ["Januar", "January"]
-          - name: replace
-            args: ["Februar", "February"]
-          - name: replace
-            args: ["März", "March"]
-          - name: replace
-            args: ["Mai", "May"]
-          - name: replace
-            args: ["Juni", "June"]
-          - name: replace
-            args: ["Juli", "July"]
-          - name: replace
-            args: ["Oktober", "October"]
-          - name: replace
-            args: ["Dezember", "December"]
-          - name: dateparse
-            args: "02.January.2006"
-    fields:
-      download:
-        selector: a[href^="download.php?id="]
-        attribute: href
-      title:
-        selector: a[href^="index.php?page=torrent-details&id="]
-        attribute: title
-        filters:
-          - name: replace
-            args: ["Details anzeigen: ", ""]
-      category:
-        selector: a[href^="index.php?page=torrents&category="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: category
-      comments:
-        selector: a[href*="#comments"]
-        attribute: href
-      size:
-        selector: td:nth-child(3)
-      grabs:
-        selector: td:nth-child(5)
-        filters:
-          - name: split
-            args: ["♦", 2]
-          - name: replace
-            args: ["---", "0"]
-      seeders:
-        selector: td:nth-child(5) > a:nth-child(1)
-      leechers:
-        selector: td:nth-child(5) > a:nth-child(2)
-      downloadvolumefactor:
-        case:
-          img[alt="gold"]: "0"
-          img[alt="silver"]: "0.5"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          img[alt="2x Upload Multiplier"]: "2"
-          img[alt="3x Upload Multiplier"]: "3"
-          img[alt="4x Upload Multiplier"]: "4"
-          img[alt="5x Upload Multiplier"]: "5"
-          img[alt="6x Upload Multiplier"]: "6"
-          img[alt="7x Upload Multiplier"]: "7"
-          img[alt="8x Upload Multiplier"]: "8"
-          img[alt="9x Upload Multiplier"]: "9"
-          img[alt="10x Upload Multiplier"]: "10"
-          "*": "1"
+---
+  site: eotforum
+  name: EoT-Forum
+  description: "A German gerneral tracker"
+  language: de-de
+  type: private
+  encoding: windows-1252
+  links:
+    - http://eot-forum.net
+
+  caps:
+    categorymappings:
+      # Filme
+      - {id: 14, cat: Movies/SD, desc: "SD XviD"}
+      - {id: 15, cat: Movies/SD, desc: "SD x264"}
+      - {id: 16, cat: Movies/HD, desc: "HD"}
+      - {id: 68, cat: Movies/HD, desc: "UHD"}
+      - {id: 17, cat: Movies/3D, desc: "3D"}
+      - {id: 18, cat: Movies/DVD, desc: "DVD-R"}
+      - {id: 19, cat: Movies, desc: "Pack"}
+      - {id: 20, cat: Movies, desc: "International"}
+      - {id: 21, cat: XXX, desc: "XXX"}
+
+      # Serien/TV
+      - {id: 23, cat: TV/SD, desc: "SD XviD"}
+      - {id: 24, cat: TV/SD, desc: "SD x264"}
+      - {id: 25, cat: TV/HD, desc: "HD"}
+      - {id: 26, cat: TV/SD, desc: "DVD-R"}
+      - {id: 27, cat: TV, desc: "Pack"}
+      - {id: 28, cat: TV, desc: "International"}
+      - {id: 29, cat: TV/Sport, desc: "Sport"}
+
+      # Dokus
+      - {id: 31, cat: TV/Documentary, desc: "SD XviD"}
+      - {id: 32, cat: TV/Documentary, desc: "SD x264"}
+      - {id: 33, cat: TV/Documentary, desc: "HD"}
+      - {id: 34, cat: TV/Documentary, desc: "3D"}
+      - {id: 35, cat: TV/Documentary, desc: "Pack"}
+      - {id: 67, cat: TV/Documentary, desc: "DVD-R"}
+      - {id: 36, cat: TV/Documentary, desc: "International"}
+
+      # Audio
+      - {id: 38, cat: Audio, desc: "Charts"}
+      - {id: 39, cat: Audio/MP3, desc: "MP3"}
+      - {id: 40, cat: Audio/Lossless, desc: "Flac"}
+      - {id: 41, cat: Audio, desc: "Pack"}
+      - {id: 42, cat: Audio/Video, desc: "MusikVideo"}
+      - {id: 43, cat: Audio/Audiobook, desc: "Hörbücher"}
+
+      # Spiele
+      - {id: 45, cat: PC/Games, desc: "Windows"}
+      - {id: 46, cat: PC/Mac, desc: "MacOS"}
+      - {id: 47, cat: Console/PS4, desc: "Sony PS"}
+      - {id: 48, cat: Console/Xbox , desc: "Microsoft XBox"}
+      - {id: 49, cat: Console/NDS, desc: "Nintendo"}
+      - {id: 50, cat: PC/Games, desc: "Linux"}
+      - {id: 51, cat: Console, desc: "Andere"}
+
+      # Software
+      - {id: 53, cat: PC, desc: "Windows"}
+      - {id: 54, cat: PC/Mac, desc: "MacOS"}
+      - {id: 55, cat: PC, desc: "Linux"}
+      - {id: 56, cat: PC/Phone-Android, desc: "Android"}
+      - {id: 57, cat: PC/Phone-IOS, desc: "Apple IOS"}
+      - {id: 58, cat: PC/Phone-Other, desc: "Andere"}
+
+      # Sonstiges
+      - {id: 60, cat: Books, desc: "EBooks"}
+      - {id: 61, cat: Other, desc: "Bilder"}
+      - {id: 62, cat: TV/Anime, desc: "Anime"}
+      - {id: 63, cat: Other, desc: "MISC"}
+      - {id: 64, cat: XXX, desc: "XXX-Bilder/EBooks/Audio"}
+
+      # EOT-Specials
+      - {id: 66, cat: Other, desc: "Special"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: index.php?page=login
+    method: post
+    inputs:
+      uid: "{{ .Config.username }}"
+      pwd: "{{ .Config.password }}"
+      rememberme: "forever"
+      submit: "Login"
+    error:
+    - selector: td.lista[align="center"][colspan="2"] > span
+    test:
+      path: index.php
+      selector: img[alt="Ratio"]
+
+  ratio:
+    path: index.php
+    selector: img[alt="Ratio"] + font
+
+  search:
+    path: index.php
+    inputs:
+      page: "torrents"
+      search: "{{ .Query.Keywords }}"
+      options: "0"
+      active: "0"
+      gold: "0"
+    rows:
+      selector: table.lista > tbody > tr:has(a[href^="index.php?page=torrent-details&id="])
+      dateheaders:
+        selector: ":has(td.header > b)"
+        filters:
+          - name: replace
+            args: ["Torrents vom ", ""]
+          - name: replace
+            args: ["Januar", "January"]
+          - name: replace
+            args: ["Februar", "February"]
+          - name: replace
+            args: ["März", "March"]
+          - name: replace
+            args: ["Mai", "May"]
+          - name: replace
+            args: ["Juni", "June"]
+          - name: replace
+            args: ["Juli", "July"]
+          - name: replace
+            args: ["Oktober", "October"]
+          - name: replace
+            args: ["Dezember", "December"]
+          - name: dateparse
+            args: "02.January.2006"
+    fields:
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      title:
+        selector: a[href^="index.php?page=torrent-details&id="]
+        attribute: title
+        filters:
+          - name: replace
+            args: ["Details anzeigen: ", ""]
+      category:
+        selector: a[href^="index.php?page=torrents&category="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: category
+      comments:
+        selector: a[href*="#comments"]
+        attribute: href
+      size:
+        selector: td:nth-child(3)
+      grabs:
+        selector: td:nth-child(5)
+        filters:
+          - name: split
+            args: ["♦", 2]
+          - name: replace
+            args: ["---", "0"]
+      seeders:
+        selector: td:nth-child(5) > a:nth-child(1)
+      leechers:
+        selector: td:nth-child(5) > a:nth-child(2)
+      downloadvolumefactor:
+        case:
+          img[alt="gold"]: "0"
+          img[alt="silver"]: "0.5"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          img[alt="2x Upload Multiplier"]: "2"
+          img[alt="3x Upload Multiplier"]: "3"
+          img[alt="4x Upload Multiplier"]: "4"
+          img[alt="5x Upload Multiplier"]: "5"
+          img[alt="6x Upload Multiplier"]: "6"
+          img[alt="7x Upload Multiplier"]: "7"
+          img[alt="8x Upload Multiplier"]: "8"
+          img[alt="9x Upload Multiplier"]: "9"
+          img[alt="10x Upload Multiplier"]: "10"
+          "*": "1"

src/Jackett/Definitions/estone.yml

@@ -1,119 +1,119 @@
----
-  site: estone
-  name: eStone
-  language: hu-hu
-  type: private
-  encoding: UTF-8
-  links:
-    - http://estone.cc/
-
-  caps:
-    categorymappings:
-      - {id: 24, cat: Movies/SD, desc: "Film/XviD/Hun"}
-      - {id: 38, cat: Movies/SD, desc: "Film/XviD/Eng"}
-      - {id: 51, cat: Movies/SD, desc: "Film/SD/Hun"}
-      - {id: 52, cat: Movies/SD, desc: "Film/SD/Eng"}
-      - {id: 25, cat: Movies/DVD, desc: "Film/DVD/Hun"}
-      - {id: 26, cat: Movies/DVD, desc: "Film/DVD/Eng"}
-      - {id: 42, cat: Movies/HD, desc: "Film/HD/Hun"}
-      - {id: 50, cat: Movies/HD, desc: "Film/HD/Eng"}
-      - {id: 36, cat: TV, desc: "Sorozat/Hun"}
-      - {id: 47, cat: TV, desc: "Sorozat/Eng"}
-      - {id: 41, cat: Audio/MP3, desc: "Mp3/Hun"}
-      - {id: 40, cat: Audio/MP3, desc: "Mp3/Eng"}
-      - {id: 35, cat: PC/0day, desc: "Program"}
-      - {id: 28, cat: PC/Games, desc: "Játék/ISO"}
-      - {id: 30, cat: PC/Games, desc: "Játék/Rip"}
-      - {id: 32, cat: Console, desc: "Konzol"}
-      - {id: 34, cat: PC/Phone-Other, desc: "Mobil"}
-      - {id: 44, cat: Books, desc: "Könyv/Hun"}
-      - {id: 33, cat: Books, desc: "Könyv/Eng"}
-      - {id: 31, cat: Other, desc: "Képek"}
-      - {id: 39, cat: XXX, desc: "XXX/Film"}
-      - {id: 49, cat: XXX/Imageset, desc: "XXX/Kép"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: login.php
-    method: post
-    inputs:
-      login_username: "{{ .Config.username }}"
-      login_password: "{{ .Config.password }}"
-    error:
-      - selector: script:contains("hiba(\"")
-        message:
-          selector: script:contains("hiba(\"")
-          filters:
-            - name: replace
-              args: ["hiba(\"", ""]
-            - name: replace
-              args: ["\");", ""]
-    test:
-      path: /letoltes.php
-
-  search:
-    path: /letoltes.php
-    method: get
-    inputs:
-      $raw: "{{range .Categories}}kat[]={{.}}&{{end}}"
-      kereses_nev: "{{ .Query.Keywords }}"
-    rows:
-      selector: body > div[id^="torrent_"]
-    fields:
-      title:
-        selector: a[title]
-        attribute: title
-      category:
-        selector: div#kategoria_torrent > a
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      details:
-        attribute: id
-        filters:
-          - name: replace
-            args: ["torrent_", "adatlap.php?id="]
-      download:
-        attribute: id
-        filters:
-          - name: replace
-            args: ["torrent_", "download.php?id="]
-      banner:
-        selector: img[onmouseover]
-        attribute: onmouseover
-        filters:
-          - name: regexp
-            args: borito\("(.*?) +?",
-      size:
-        selector: input[id^="meret_"]
-        attribute: value
-      grabs:
-        selector: div:nth-child(8) > div
-      seeders:
-        selector: div:nth-child(6) > div > a
-      leechers:
-        selector: div:nth-child(7) > div > a
-      date:
-        selector: div:nth-child(4)
-        filters:
-          - name: split
-            args: ["(", 0]
-          - name: append
-            args: "+01:00"
-          - name: dateparse
-            args: "2006-01-02 15:04:05 -07:00"
-      downloadvolumefactor:
-        case:
-          img[src="pic/free.png"]: "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          img[src="pic/dupla_up.png"]: "2"
-          "*": "1"
-      description:
-        selector: div:nth-child(2)
-        remove: a
+---
+  site: estone
+  name: eStone
+  language: hu-hu
+  type: private
+  encoding: UTF-8
+  links:
+    - http://estone.cc/
+
+  caps:
+    categorymappings:
+      - {id: 24, cat: Movies/SD, desc: "Film/XviD/Hun"}
+      - {id: 38, cat: Movies/SD, desc: "Film/XviD/Eng"}
+      - {id: 51, cat: Movies/SD, desc: "Film/SD/Hun"}
+      - {id: 52, cat: Movies/SD, desc: "Film/SD/Eng"}
+      - {id: 25, cat: Movies/DVD, desc: "Film/DVD/Hun"}
+      - {id: 26, cat: Movies/DVD, desc: "Film/DVD/Eng"}
+      - {id: 42, cat: Movies/HD, desc: "Film/HD/Hun"}
+      - {id: 50, cat: Movies/HD, desc: "Film/HD/Eng"}
+      - {id: 36, cat: TV, desc: "Sorozat/Hun"}
+      - {id: 47, cat: TV, desc: "Sorozat/Eng"}
+      - {id: 41, cat: Audio/MP3, desc: "Mp3/Hun"}
+      - {id: 40, cat: Audio/MP3, desc: "Mp3/Eng"}
+      - {id: 35, cat: PC/0day, desc: "Program"}
+      - {id: 28, cat: PC/Games, desc: "Játék/ISO"}
+      - {id: 30, cat: PC/Games, desc: "Játék/Rip"}
+      - {id: 32, cat: Console, desc: "Konzol"}
+      - {id: 34, cat: PC/Phone-Other, desc: "Mobil"}
+      - {id: 44, cat: Books, desc: "Könyv/Hun"}
+      - {id: 33, cat: Books, desc: "Könyv/Eng"}
+      - {id: 31, cat: Other, desc: "Képek"}
+      - {id: 39, cat: XXX, desc: "XXX/Film"}
+      - {id: 49, cat: XXX/Imageset, desc: "XXX/Kép"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: login.php
+    method: post
+    inputs:
+      login_username: "{{ .Config.username }}"
+      login_password: "{{ .Config.password }}"
+    error:
+      - selector: script:contains("hiba(\"")
+        message:
+          selector: script:contains("hiba(\"")
+          filters:
+            - name: replace
+              args: ["hiba(\"", ""]
+            - name: replace
+              args: ["\");", ""]
+    test:
+      path: /letoltes.php
+
+  search:
+    path: /letoltes.php
+    method: get
+    inputs:
+      $raw: "{{range .Categories}}kat[]={{.}}&{{end}}"
+      kereses_nev: "{{ .Query.Keywords }}"
+    rows:
+      selector: body > div[id^="torrent_"]
+    fields:
+      title:
+        selector: a[title]
+        attribute: title
+      category:
+        selector: div#kategoria_torrent > a
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      details:
+        attribute: id
+        filters:
+          - name: replace
+            args: ["torrent_", "adatlap.php?id="]
+      download:
+        attribute: id
+        filters:
+          - name: replace
+            args: ["torrent_", "download.php?id="]
+      banner:
+        selector: img[onmouseover]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: borito\("(.*?) +?",
+      size:
+        selector: input[id^="meret_"]
+        attribute: value
+      grabs:
+        selector: div:nth-child(8) > div
+      seeders:
+        selector: div:nth-child(6) > div > a
+      leechers:
+        selector: div:nth-child(7) > div > a
+      date:
+        selector: div:nth-child(4)
+        filters:
+          - name: split
+            args: ["(", 0]
+          - name: append
+            args: "+01:00"
+          - name: dateparse
+            args: "2006-01-02 15:04:05 -07:00"
+      downloadvolumefactor:
+        case:
+          img[src="pic/free.png"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          img[src="pic/dupla_up.png"]: "2"
+          "*": "1"
+      description:
+        selector: div:nth-child(2)
+        remove: a

src/Jackett/Definitions/ethor.yml

@@ -1,119 +1,119 @@
----
-  site: ethor
-  name: Ethor.net (Thor's Land)
-  description: "A French gerneral tracker"
-  language: fr-fr
-  type: private
-  encoding: UTF-8
-  links:
-    - https://ethor.net/
-
-  caps:
-    categorymappings:
-      - {id: 22, cat: PC, desc: "Applications/Divers"}
-      - {id: 1, cat: PC, desc: "Applications/PC ISO"}
-      - {id: 44, cat: PC, desc: "Applications/Portable"}
-      - {id: 47, cat: Movies/BluRay, desc: "Films/Bluray"}
-      - {id: 20, cat: Movies/DVD, desc: "Films/DVDr"}
-      - {id: 42, cat: Movies/HD, desc: "Films/HD Rip"}
-      - {id: 19, cat: Movies/SD, desc: "Films/SD Rip"}
-      - {id: 5, cat: Movies/SD, desc: "Films/VCD"}
-      - {id: 4, cat: PC/Games, desc: "Jeux/PC"}
-      - {id: 41, cat: Console, desc: "Jeux/Portable"}
-      - {id: 34, cat: Console/PS4, desc: "Jeux/PS2-PS3"}
-      - {id: 38, cat: Console/Wii, desc: "Jeux/Wii-GC"}
-      - {id: 40, cat: Console/Xbox, desc: "Jeux/Xbox360"}
-      - {id: 6, cat: Audio, desc: "Musique"}
-      - {id: 37, cat: Audio/Video, desc: "Musique/Video"}
-      - {id: 48, cat: TV/HD, desc: "Série-Télé/Bluray"}
-      - {id: 45, cat: TV/SD, desc: "Série-Télé/DVDr"}
-      - {id: 43, cat: TV/HD, desc: "Série-Télé/HD Rip"}
-      - {id: 7, cat: TV/SD, desc: "Série-Télé/SD Rip"}
-      - {id: 23, cat: Books, desc: "E-Books"}
-      - {id: 46, cat: Other, desc: "Évé. sportif"}
-      - {id: 36, cat: Other, desc: "Kidz"}
-      - {id: 25, cat: Other, desc: "Misc"}
-      - {id: 9, cat: XXX, desc: "XXX"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q, imdbid]
-
-  login:
-    path: login3.php
-    method: form
-    form: form[action="login3.php?takelogin=1"]
-    captcha:
-      type: image
-      image: img#validationimage
-      input: validationcode
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      secure_cookie: "0"
-    test:
-      path: browse.php
-
-  ratio:
-    path: browse.php
-    selector: span#ratioRatio
-
-  search:
-    path: browse.php
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Query.Keywords }}{{end}}"
-      advcat: "0"
-      incldead: "1"
-      stype: "b"
-      dp: "0"
-      isUserClick: "0"
-    rows:
-      selector: p + table > tbody > tr:has(a[href^="/details.php"])
-    fields:
-      download:
-        selector: a[href^="/details.php"]:has(b)
-        attribute: href
-        filters:
-          - name: replace
-            args: ["/details.php", "/download.php"]
-      title:
-        selector: a[href^="/details.php"]:has(b)
-      category:
-        selector: a[href^="/browse.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      comments:
-        selector: a[href^="/details.php"]:has(b)
-        attribute: href
-      files:
-        selector: a[href*="#filelist"]
-      size:
-        selector: td:nth-child(6)
-      grabs:
-        selector: td:nth-child(7)
-        filters:
-          - name: regexp
-            args: "(\\d+)"
-      seeders:
-        selector: td:nth-child(8)
-      leechers:
-        selector: td:nth-child(9)
-      date:
-        selector: td:nth-child(5)
-        filters:
-          - name: append
-            args: " -05:00" # timezone offset
-          - name: dateparse
-            args: "2006-01-0215:04:05 -07:00"
-      downloadvolumefactor:
-        case:
-          "img[title^=\"Freeleech: \"]": "0"
-          "img[title^=\"Half Freeleech: \"]": "0.5"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
+---
+  site: ethor
+  name: Ethor.net (Thor's Land)
+  description: "A French gerneral tracker"
+  language: fr-fr
+  type: private
+  encoding: UTF-8
+  links:
+    - https://ethor.net/
+
+  caps:
+    categorymappings:
+      - {id: 22, cat: PC, desc: "Applications/Divers"}
+      - {id: 1, cat: PC, desc: "Applications/PC ISO"}
+      - {id: 44, cat: PC, desc: "Applications/Portable"}
+      - {id: 47, cat: Movies/BluRay, desc: "Films/Bluray"}
+      - {id: 20, cat: Movies/DVD, desc: "Films/DVDr"}
+      - {id: 42, cat: Movies/HD, desc: "Films/HD Rip"}
+      - {id: 19, cat: Movies/SD, desc: "Films/SD Rip"}
+      - {id: 5, cat: Movies/SD, desc: "Films/VCD"}
+      - {id: 4, cat: PC/Games, desc: "Jeux/PC"}
+      - {id: 41, cat: Console, desc: "Jeux/Portable"}
+      - {id: 34, cat: Console/PS4, desc: "Jeux/PS2-PS3"}
+      - {id: 38, cat: Console/Wii, desc: "Jeux/Wii-GC"}
+      - {id: 40, cat: Console/Xbox, desc: "Jeux/Xbox360"}
+      - {id: 6, cat: Audio, desc: "Musique"}
+      - {id: 37, cat: Audio/Video, desc: "Musique/Video"}
+      - {id: 48, cat: TV/HD, desc: "Série-Télé/Bluray"}
+      - {id: 45, cat: TV/SD, desc: "Série-Télé/DVDr"}
+      - {id: 43, cat: TV/HD, desc: "Série-Télé/HD Rip"}
+      - {id: 7, cat: TV/SD, desc: "Série-Télé/SD Rip"}
+      - {id: 23, cat: Books, desc: "E-Books"}
+      - {id: 46, cat: Other, desc: "Évé. sportif"}
+      - {id: 36, cat: Other, desc: "Kidz"}
+      - {id: 25, cat: Other, desc: "Misc"}
+      - {id: 9, cat: XXX, desc: "XXX"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q, imdbid]
+
+  login:
+    path: login3.php
+    method: form
+    form: form[action="login3.php?takelogin=1"]
+    captcha:
+      type: image
+      image: img#validationimage
+      input: validationcode
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      secure_cookie: "0"
+    test:
+      path: browse.php
+
+  ratio:
+    path: browse.php
+    selector: span#ratioRatio
+
+  search:
+    path: browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Query.Keywords }}{{end}}"
+      advcat: "0"
+      incldead: "1"
+      stype: "b"
+      dp: "0"
+      isUserClick: "0"
+    rows:
+      selector: p + table > tbody > tr:has(a[href^="/details.php"])
+    fields:
+      download:
+        selector: a[href^="/details.php"]:has(b)
+        attribute: href
+        filters:
+          - name: replace
+            args: ["/details.php", "/download.php"]
+      title:
+        selector: a[href^="/details.php"]:has(b)
+      category:
+        selector: a[href^="/browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      comments:
+        selector: a[href^="/details.php"]:has(b)
+        attribute: href
+      files:
+        selector: a[href*="#filelist"]
+      size:
+        selector: td:nth-child(6)
+      grabs:
+        selector: td:nth-child(7)
+        filters:
+          - name: regexp
+            args: "(\\d+)"
+      seeders:
+        selector: td:nth-child(8)
+      leechers:
+        selector: td:nth-child(9)
+      date:
+        selector: td:nth-child(5)
+        filters:
+          - name: append
+            args: " -05:00" # timezone offset
+          - name: dateparse
+            args: "2006-01-0215:04:05 -07:00"
+      downloadvolumefactor:
+        case:
+          "img[title^=\"Freeleech: \"]": "0"
+          "img[title^=\"Half Freeleech: \"]": "0.5"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett/Definitions/freedomhd.yml

@@ -1,130 +1,130 @@
----
-  site: freedomhd
-  name: Freedom-HD
-  language: fr-fr
-  type: private
-  encoding: UTF-8
-  links:
-    - http://freedom-paradise.eu/
-
-  caps:
-    categorymappings:
-      # ANIMES
-      - {id: 105, cat: TV/Anime, desc: "1080p"}
-      - {id: 104, cat: TV/Anime, desc: "720p"}
-      - {id: 90, cat: TV/Anime, desc: "HDRIP-720p"}
-      - {id: 93, cat: TV/Anime, desc: "HDRIP1080p"}
-      - {id: 131, cat: TV/Anime, desc: "SD"}
-      - {id: 120, cat: TV/Anime, desc: "X265-1080p"}
-      - {id: 119, cat: TV/Anime, desc: "X265-720p"}
-      - {id: 107, cat: TV/Anime, desc: "1080p"}
-      - {id: 106, cat: TV/Anime, desc: "720p"}
-      - {id: 94, cat: TV/Anime, desc: "HDRIP1080p"}
-      - {id: 91, cat: TV/Anime, desc: "HDRIP720p"}
-
-      # EBOOK
-      - {id: 124, cat: Books, desc: "Livres et Magazines"}
-
-      # FILMS
-      - {id: 97, cat: Movies/HD, desc: "1080p"}
-      - {id: 103, cat: Movies/3D, desc: "3D"}
-      - {id: 111, cat: Movies/HD, desc: "4K"}
-      - {id: 96, cat: Movies/HD, desc: "720p"}
-      - {id: 127, cat: Movies/HD, desc: "BDrip"}
-      - {id: 128, cat: Movies/HD, desc: "BRrip"}
-      - {id: 126, cat: Movies/SD, desc: "DVDrip"}
-      - {id: 89, cat: Movies/HD, desc: "HDRIP-720p"}
-      - {id: 92, cat: Movies/HD, desc: "HDRIP1080p"}
-      - {id: 112, cat: Movies/SD, desc: "Team-Hush"}
-      - {id: 129, cat: Movies/HD, desc: "Team-Romkent"}
-      - {id: 125, cat: Movies/Other, desc: "WEBrip"}
-      - {id: 110, cat: Movies/HD, desc: "X265-1080p"}
-      - {id: 109, cat: Movies/HD, desc: "X265-720p"}
-
-      # MUSIQUES
-      - {id: 114, cat: Audio/Lossless, desc: "Flac"}
-      - {id: 113, cat: Audio/MP3, desc: "MP3"}
-      - {id: 132, cat: Audio, desc: "Musiques-HQ"}
-      - {id: 130, cat: Audio/Video, desc: "video clip"}
-
-      # SERIE-sd
-      - {id: 121, cat: TV/SD, desc: "SD"}
-
-      # SERIES-HD
-      - {id: 102, cat: TV/HD, desc: "1080p"}
-      - {id: 101, cat: TV/HD, desc: "720p"}
-      - {id: 100, cat: TV/HD, desc: "HDrip1080p"}
-      - {id: 99, cat: TV/HD, desc: "HDrip720p"}
-
-      # SPECTACLES
-      - {id: 118, cat: TV/Sport, desc: "HDRIP1080p"}
-      - {id: 117, cat: TV/Sport, desc: "HDRIP720p"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: account-login.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      remember: "yes"
-      returnto: "/"
-    error:
-      - selector: div.myFrame:has(font.error)
-    test:
-      path: torrents-search.php
-
-  search:
-    path: torrents-search.php
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
-      incldead: "1"
-
-    rows:
-      selector: table.ttable_headinner > tbody > tr[class^="t-row"]
-      filters:
-        - name: andmatch
-      after: 1
-    fields:
-      download:
-        selector: a[href^="torrents-details.php?id="]
-        attribute: href
-        filters:
-          - name: replace
-            args: ["torrents-details.php", "download.php"]
-      title:
-        selector: a[href^="torrents-details.php?id="]
-        attribute: title
-      category:
-        selector: a[href^="torrents.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      details:
-        selector: a[href^="torrents-details.php?id="]
-        attribute: href
-      description:
-        selector: ul
-      banner:
-        selector: img.rounded-img
-        attribute: src
-      size:
-        selector: td:nth-child(3)
-      grabs:
-        selector: td:nth-child(6)
-      seeders:
-        selector: td:nth-child(4)
-      leechers:
-        selector: td:nth-child(5)
-      downloadvolumefactor:
-        case:
-          img[alt="freeleech"]: "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
+---
+  site: freedomhd
+  name: Freedom-HD
+  language: fr-fr
+  type: private
+  encoding: UTF-8
+  links:
+    - http://freedom-paradise.eu/
+
+  caps:
+    categorymappings:
+      # ANIMES
+      - {id: 105, cat: TV/Anime, desc: "1080p"}
+      - {id: 104, cat: TV/Anime, desc: "720p"}
+      - {id: 90, cat: TV/Anime, desc: "HDRIP-720p"}
+      - {id: 93, cat: TV/Anime, desc: "HDRIP1080p"}
+      - {id: 131, cat: TV/Anime, desc: "SD"}
+      - {id: 120, cat: TV/Anime, desc: "X265-1080p"}
+      - {id: 119, cat: TV/Anime, desc: "X265-720p"}
+      - {id: 107, cat: TV/Anime, desc: "1080p"}
+      - {id: 106, cat: TV/Anime, desc: "720p"}
+      - {id: 94, cat: TV/Anime, desc: "HDRIP1080p"}
+      - {id: 91, cat: TV/Anime, desc: "HDRIP720p"}
+
+      # EBOOK
+      - {id: 124, cat: Books, desc: "Livres et Magazines"}
+
+      # FILMS
+      - {id: 97, cat: Movies/HD, desc: "1080p"}
+      - {id: 103, cat: Movies/3D, desc: "3D"}
+      - {id: 111, cat: Movies/HD, desc: "4K"}
+      - {id: 96, cat: Movies/HD, desc: "720p"}
+      - {id: 127, cat: Movies/HD, desc: "BDrip"}
+      - {id: 128, cat: Movies/HD, desc: "BRrip"}
+      - {id: 126, cat: Movies/SD, desc: "DVDrip"}
+      - {id: 89, cat: Movies/HD, desc: "HDRIP-720p"}
+      - {id: 92, cat: Movies/HD, desc: "HDRIP1080p"}
+      - {id: 112, cat: Movies/SD, desc: "Team-Hush"}
+      - {id: 129, cat: Movies/HD, desc: "Team-Romkent"}
+      - {id: 125, cat: Movies/Other, desc: "WEBrip"}
+      - {id: 110, cat: Movies/HD, desc: "X265-1080p"}
+      - {id: 109, cat: Movies/HD, desc: "X265-720p"}
+
+      # MUSIQUES
+      - {id: 114, cat: Audio/Lossless, desc: "Flac"}
+      - {id: 113, cat: Audio/MP3, desc: "MP3"}
+      - {id: 132, cat: Audio, desc: "Musiques-HQ"}
+      - {id: 130, cat: Audio/Video, desc: "video clip"}
+
+      # SERIE-sd
+      - {id: 121, cat: TV/SD, desc: "SD"}
+
+      # SERIES-HD
+      - {id: 102, cat: TV/HD, desc: "1080p"}
+      - {id: 101, cat: TV/HD, desc: "720p"}
+      - {id: 100, cat: TV/HD, desc: "HDrip1080p"}
+      - {id: 99, cat: TV/HD, desc: "HDrip720p"}
+
+      # SPECTACLES
+      - {id: 118, cat: TV/Sport, desc: "HDRIP1080p"}
+      - {id: 117, cat: TV/Sport, desc: "HDRIP720p"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: account-login.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      remember: "yes"
+      returnto: "/"
+    error:
+      - selector: div.myFrame:has(font.error)
+    test:
+      path: torrents-search.php
+
+  search:
+    path: torrents-search.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      incldead: "1"
+
+    rows:
+      selector: table.ttable_headinner > tbody > tr[class^="t-row"]
+      filters:
+        - name: andmatch
+      after: 1
+    fields:
+      download:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: href
+        filters:
+          - name: replace
+            args: ["torrents-details.php", "download.php"]
+      title:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: title
+      category:
+        selector: a[href^="torrents.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      details:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: href
+      description:
+        selector: ul
+      banner:
+        selector: img.rounded-img
+        attribute: src
+      size:
+        selector: td:nth-child(3)
+      grabs:
+        selector: td:nth-child(6)
+      seeders:
+        selector: td:nth-child(4)
+      leechers:
+        selector: td:nth-child(5)
+      downloadvolumefactor:
+        case:
+          img[alt="freeleech"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
           "*": "1"

src/Jackett/Definitions/gfxpeers.yml

@@ -1,80 +1,80 @@
----
-  site: gfxpeers
-  name: GFXPeers
-  language: en-us
-  type: private
-  encoding: UTF-8
-  links:
-    - https://gfxpeers.net/
-
-  caps:
-    categorymappings:
-      - {id: 1, cat: PC/0day, desc: "Applications"}
-      - {id: 2, cat: PC/0day, desc: "Plug-ins"}
-      - {id: 3, cat: Other, desc: "Tutorials"}
-      - {id: 4, cat: Other, desc: "Textures"}
-      - {id: 5, cat: Other, desc: "3D Models"}
-      - {id: 6, cat: Other, desc: "Game-Dev"}
-      - {id: 7, cat: Other, desc: "Miscellaneous"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: /login.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      keeplogged: "1"
-    error:
-      - selector: .auth_form > .warning
-    test:
-      path: /torrents.php
-
-  search:
-    path: /torrents.php
-    inputs:
-      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
-      searchstr: "{{ .Query.Keywords }}"
-      order_by: "time"
-      order_way: "desc"
-      action: "advanced"
-      searchsubmit: "1"
-
-    rows:
-      selector: table#torrent_table > tbody > tr.torrent
-    fields:
-      download:
-        selector: a[href^="torrents.php?action=download&id="]
-        attribute: href
-      title:
-        selector: a[href^="torrents.php?id="]
-      downloadvolumefactor:
-        case:
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
-      category:
-        selector: a[href^="torrents.php?filter_cat"]
-        attribute: href
-        filters:
-          - name: regexp
-            args: "\\[(\\d+?)\\]"
-      details:
-        selector: a[href^="torrents.php?id="]
-        attribute: href
-      size:
-        selector: td:nth-child(5)
-      grabs:
-        selector: td:nth-child(6)
-      files:
-        selector: td:nth-child(3)
-      seeders:
-        selector: td:nth-child(7)
-      leechers:
-        selector: td:nth-child(8)
-      date:
-        selector: td:nth-child(4)
+---
+  site: gfxpeers
+  name: GFXPeers
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://gfxpeers.net/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: PC/0day, desc: "Applications"}
+      - {id: 2, cat: PC/0day, desc: "Plug-ins"}
+      - {id: 3, cat: Other, desc: "Tutorials"}
+      - {id: 4, cat: Other, desc: "Textures"}
+      - {id: 5, cat: Other, desc: "3D Models"}
+      - {id: 6, cat: Other, desc: "Game-Dev"}
+      - {id: 7, cat: Other, desc: "Miscellaneous"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: /login.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      keeplogged: "1"
+    error:
+      - selector: .auth_form > .warning
+    test:
+      path: /torrents.php
+
+  search:
+    path: /torrents.php
+    inputs:
+      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+      searchstr: "{{ .Query.Keywords }}"
+      order_by: "time"
+      order_way: "desc"
+      action: "advanced"
+      searchsubmit: "1"
+
+    rows:
+      selector: table#torrent_table > tbody > tr.torrent
+    fields:
+      download:
+        selector: a[href^="torrents.php?action=download&id="]
+        attribute: href
+      title:
+        selector: a[href^="torrents.php?id="]
+      downloadvolumefactor:
+        case:
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"
+      category:
+        selector: a[href^="torrents.php?filter_cat"]
+        attribute: href
+        filters:
+          - name: regexp
+            args: "\\[(\\d+?)\\]"
+      details:
+        selector: a[href^="torrents.php?id="]
+        attribute: href
+      size:
+        selector: td:nth-child(5)
+      grabs:
+        selector: td:nth-child(6)
+      files:
+        selector: td:nth-child(3)
+      seeders:
+        selector: td:nth-child(7)
+      leechers:
+        selector: td:nth-child(8)
+      date:
+        selector: td:nth-child(4)

src/Jackett/Definitions/gods.yml

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

src/Jackett/Definitions/gormogon.yml

@@ -1,193 +1,193 @@
----
-  site: gormogon
-  name: Gormogon
-  language: en-us
-  type: private
-  encoding: UTF-8
-  links:
-    - http://www.gormogon.com
-
-  caps:
-    categorymappings:
-      # Movies:
-      - {id: 1, cat: Movies/DVD, desc: "DVD-R"}
-      - {id: 2, cat: Movies, desc: "Action"}
-      - {id: 14, cat: Movies, desc: "Adventure"}
-      - {id: 15, cat: Movies, desc: "Animation"}
-      - {id: 16, cat: Movies, desc: "Biography"}
-      - {id: 17, cat: Movies, desc: "Comedy"}
-      - {id: 18, cat: Movies, desc: "Crime"}
-      - {id: 19, cat: Movies, desc: "Disney"}
-      - {id: 92, cat: Movies, desc: "Documentary"}
-      - {id: 20, cat: Movies, desc: "Drama"}
-      - {id: 21, cat: Movies, desc: "Family"}
-      - {id: 22, cat: Movies, desc: "Fantasy"}
-      - {id: 23, cat: Movies, desc: "Film Noir"}
-      - {id: 97, cat: Movies, desc: "History"}
-      - {id: 24, cat: Movies, desc: "Horror"}
-      - {id: 25, cat: Movies, desc: "Martial Arts"}
-      - {id: 26, cat: Movies, desc: "Musicals"}
-      - {id: 27, cat: Movies, desc: "Mystery"}
-      - {id: 28, cat: Movies, desc: "Romance"}
-      - {id: 29, cat: Movies, desc: "Sci-Fi"}
-      - {id: 30, cat: Movies, desc: "Thriller"}
-      - {id: 31, cat: Movies, desc: "War"}
-      - {id: 32, cat: Movies, desc: "Western"}
-      - {id: 33, cat: Movies, desc: "Other"}
-
-      # Classic TV:
-      - {id: 34, cat: TV, desc: "Action"}
-      - {id: 35, cat: TV, desc: "Adventure"}
-      - {id: 36, cat: TV, desc: "Animation"}
-      - {id: 37, cat: TV, desc: "Biography"}
-      - {id: 38, cat: TV, desc: "Comedy"}
-      - {id: 39, cat: TV, desc: "Crime"}
-      - {id: 40, cat: TV, desc: "Disney"}
-      - {id: 41, cat: TV, desc: "Documentary"}
-      - {id: 42, cat: TV, desc: "Drama"}
-      - {id: 43, cat: TV, desc: "Family"}
-      - {id: 44, cat: TV, desc: "Fantasy"}
-      - {id: 45, cat: TV, desc: "TV Noir"}
-      - {id: 46, cat: TV, desc: "Horror"}
-      - {id: 47, cat: TV, desc: "Martial Arts"}
-      - {id: 49, cat: TV, desc: "Musicals"}
-      - {id: 50, cat: TV, desc: "Mystery"}
-      - {id: 51, cat: TV, desc: "Romance"}
-      - {id: 52, cat: TV, desc: "Sci-Fi"}
-      - {id: 48, cat: TV, desc: "Shows"}
-      - {id: 53, cat: TV, desc: "Thriller"}
-      - {id: 54, cat: TV, desc: "War"}
-      - {id: 55, cat: TV, desc: "Western"}
-      - {id: 56, cat: TV, desc: "Other"}
-      - {id: 90, cat: TV, desc: "TV Movies"}
-
-      # Old Time Radio
-      - {id: 57, cat: Audio, desc: "Action"}
-      - {id: 58, cat: Audio, desc: "Adventure"}
-      - {id: 59, cat: Audio, desc: "Biography"}
-      - {id: 60, cat: Audio, desc: "Comedy"}
-      - {id: 61, cat: Audio, desc: "Crime"}
-      - {id: 62, cat: Audio, desc: "Documentary"}
-      - {id: 63, cat: Audio, desc: "Drama"}
-      - {id: 64, cat: Audio, desc: "Family"}
-      - {id: 65, cat: Audio, desc: "Fantasy"}
-      - {id: 66, cat: Audio, desc: "Radio Noir"}
-      - {id: 67, cat: Audio, desc: "Horror"}
-      - {id: 68, cat: Audio, desc: "Musicals"}
-      - {id: 69, cat: Audio, desc: "Mystery"}
-      - {id: 70, cat: Audio, desc: "Romance"}
-      - {id: 71, cat: Audio, desc: "Sci-Fi"}
-      - {id: 72, cat: Audio, desc: "Shows"}
-      - {id: 73, cat: Audio, desc: "Thriller"}
-      - {id: 74, cat: Audio, desc: "War"}
-      - {id: 75, cat: Audio, desc: "Western"}
-      - {id: 76, cat: Audio, desc: "Other"}
-
-      # Music:
-      - {id: 77, cat: Audio, desc: "Official Sountracks"}
-      - {id: 78, cat: Audio, desc: "Theme Tunes"}
-      - {id: 79, cat: Audio, desc: "Music 30s"}
-      - {id: 80, cat: Audio, desc: "Music 40s"}
-      - {id: 81, cat: Audio, desc: "Music 50s"}
-      - {id: 85, cat: Audio, desc: "Music 60s"}
-      - {id: 86, cat: Audio, desc: "Music 70s"}
-      - {id: 87, cat: Audio, desc: "Music '80 - '84"}
-
-      # Printed:
-      - {id: 82, cat: Books, desc: "Books"}
-      - {id: 91, cat: Books, desc: "Newspaper"}
-      - {id: 83, cat: Books, desc: "Scripts"}
-      - {id: 84, cat: Books, desc: "Posters"}
-      - {id: 88, cat: Books, desc: "Comics"}
-      - {id: 89, cat: Books, desc: "Magazines"}
-
-      # Software:
-      - {id: 94, cat: Other, desc: "Screensavers"}
-      - {id: 95, cat: PC, desc: "Programs"}
-      - {id: 96, cat: Other, desc: "Other"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: index.php?page=login&returnto=index.php
-    method: post
-    inputs:
-      uid: "{{ .Config.username }}"
-      pwd: "{{ .Config.password }}"
-    error:
-      - selector: td.lista > span[style="color:#FF0000;"]
-    test:
-      path: index.php
-      selector: form[name="jump1"]
-
-  ratio:
-    path: index.php
-    selector: form[name="jump1"] > table > tbody > tr > td:contains("SR ")
-    filters:
-      - name: trim
-        args: ")"
-      - name: split
-        args: [" ", 1]
-
-  download:
-    selector: a[href^="download.php?id="]
-        
-  search:
-    path: index.php
-    inputs:
-      search: "{{ .Query.Keywords }}"
-      category: "{{range .Categories}}{{.}};{{end}}"
-      page: torrents
-      active: 0
-    rows:
-      selector: table.lista > tbody > tr:has(a[href^="index.php?page=torrents&category="])
-    fields:
-      download:
-        selector: a[href^="index.php?page=downloadcheck&id="]
-        attribute: href
-      title:
-        selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-      category:
-        selector: a[href^="index.php?page=torrents&category="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: category
-      details:
-        selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-        attribute: href
-      size:
-        selector: td:nth-child(10)
-      date:
-        selector: td:nth-child(5)
-        filters:
-          - name: dateparse
-            args: "02/01/2006"
-      grabs:
-        selector: td:nth-child(8)
-        filters:
-          - name: replace
-            args: ["---", "0"]
-      seeders:
-        selector: td:nth-child(6)
-      leechers:
-        selector: td:nth-child(7)
-      downloadvolumefactor:
-        case:
-          img[alt="gold"]: "0"
-          img[alt="silver"]: "0.5"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          img[alt="2x Upload Multiplier"]: "2"
-          img[alt="3x Upload Multiplier"]: "3"
-          img[alt="4x Upload Multiplier"]: "4"
-          img[alt="5x Upload Multiplier"]: "5"
-          img[alt="6x Upload Multiplier"]: "6"
-          img[alt="7x Upload Multiplier"]: "7"
-          img[alt="8x Upload Multiplier"]: "8"
-          img[alt="9x Upload Multiplier"]: "9"
-          img[alt="10x Upload Multiplier"]: "10"
+---
+  site: gormogon
+  name: Gormogon
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - http://www.gormogon.com
+
+  caps:
+    categorymappings:
+      # Movies:
+      - {id: 1, cat: Movies/DVD, desc: "DVD-R"}
+      - {id: 2, cat: Movies, desc: "Action"}
+      - {id: 14, cat: Movies, desc: "Adventure"}
+      - {id: 15, cat: Movies, desc: "Animation"}
+      - {id: 16, cat: Movies, desc: "Biography"}
+      - {id: 17, cat: Movies, desc: "Comedy"}
+      - {id: 18, cat: Movies, desc: "Crime"}
+      - {id: 19, cat: Movies, desc: "Disney"}
+      - {id: 92, cat: Movies, desc: "Documentary"}
+      - {id: 20, cat: Movies, desc: "Drama"}
+      - {id: 21, cat: Movies, desc: "Family"}
+      - {id: 22, cat: Movies, desc: "Fantasy"}
+      - {id: 23, cat: Movies, desc: "Film Noir"}
+      - {id: 97, cat: Movies, desc: "History"}
+      - {id: 24, cat: Movies, desc: "Horror"}
+      - {id: 25, cat: Movies, desc: "Martial Arts"}
+      - {id: 26, cat: Movies, desc: "Musicals"}
+      - {id: 27, cat: Movies, desc: "Mystery"}
+      - {id: 28, cat: Movies, desc: "Romance"}
+      - {id: 29, cat: Movies, desc: "Sci-Fi"}
+      - {id: 30, cat: Movies, desc: "Thriller"}
+      - {id: 31, cat: Movies, desc: "War"}
+      - {id: 32, cat: Movies, desc: "Western"}
+      - {id: 33, cat: Movies, desc: "Other"}
+
+      # Classic TV:
+      - {id: 34, cat: TV, desc: "Action"}
+      - {id: 35, cat: TV, desc: "Adventure"}
+      - {id: 36, cat: TV, desc: "Animation"}
+      - {id: 37, cat: TV, desc: "Biography"}
+      - {id: 38, cat: TV, desc: "Comedy"}
+      - {id: 39, cat: TV, desc: "Crime"}
+      - {id: 40, cat: TV, desc: "Disney"}
+      - {id: 41, cat: TV, desc: "Documentary"}
+      - {id: 42, cat: TV, desc: "Drama"}
+      - {id: 43, cat: TV, desc: "Family"}
+      - {id: 44, cat: TV, desc: "Fantasy"}
+      - {id: 45, cat: TV, desc: "TV Noir"}
+      - {id: 46, cat: TV, desc: "Horror"}
+      - {id: 47, cat: TV, desc: "Martial Arts"}
+      - {id: 49, cat: TV, desc: "Musicals"}
+      - {id: 50, cat: TV, desc: "Mystery"}
+      - {id: 51, cat: TV, desc: "Romance"}
+      - {id: 52, cat: TV, desc: "Sci-Fi"}
+      - {id: 48, cat: TV, desc: "Shows"}
+      - {id: 53, cat: TV, desc: "Thriller"}
+      - {id: 54, cat: TV, desc: "War"}
+      - {id: 55, cat: TV, desc: "Western"}
+      - {id: 56, cat: TV, desc: "Other"}
+      - {id: 90, cat: TV, desc: "TV Movies"}
+
+      # Old Time Radio
+      - {id: 57, cat: Audio, desc: "Action"}
+      - {id: 58, cat: Audio, desc: "Adventure"}
+      - {id: 59, cat: Audio, desc: "Biography"}
+      - {id: 60, cat: Audio, desc: "Comedy"}
+      - {id: 61, cat: Audio, desc: "Crime"}
+      - {id: 62, cat: Audio, desc: "Documentary"}
+      - {id: 63, cat: Audio, desc: "Drama"}
+      - {id: 64, cat: Audio, desc: "Family"}
+      - {id: 65, cat: Audio, desc: "Fantasy"}
+      - {id: 66, cat: Audio, desc: "Radio Noir"}
+      - {id: 67, cat: Audio, desc: "Horror"}
+      - {id: 68, cat: Audio, desc: "Musicals"}
+      - {id: 69, cat: Audio, desc: "Mystery"}
+      - {id: 70, cat: Audio, desc: "Romance"}
+      - {id: 71, cat: Audio, desc: "Sci-Fi"}
+      - {id: 72, cat: Audio, desc: "Shows"}
+      - {id: 73, cat: Audio, desc: "Thriller"}
+      - {id: 74, cat: Audio, desc: "War"}
+      - {id: 75, cat: Audio, desc: "Western"}
+      - {id: 76, cat: Audio, desc: "Other"}
+
+      # Music:
+      - {id: 77, cat: Audio, desc: "Official Sountracks"}
+      - {id: 78, cat: Audio, desc: "Theme Tunes"}
+      - {id: 79, cat: Audio, desc: "Music 30s"}
+      - {id: 80, cat: Audio, desc: "Music 40s"}
+      - {id: 81, cat: Audio, desc: "Music 50s"}
+      - {id: 85, cat: Audio, desc: "Music 60s"}
+      - {id: 86, cat: Audio, desc: "Music 70s"}
+      - {id: 87, cat: Audio, desc: "Music '80 - '84"}
+
+      # Printed:
+      - {id: 82, cat: Books, desc: "Books"}
+      - {id: 91, cat: Books, desc: "Newspaper"}
+      - {id: 83, cat: Books, desc: "Scripts"}
+      - {id: 84, cat: Books, desc: "Posters"}
+      - {id: 88, cat: Books, desc: "Comics"}
+      - {id: 89, cat: Books, desc: "Magazines"}
+
+      # Software:
+      - {id: 94, cat: Other, desc: "Screensavers"}
+      - {id: 95, cat: PC, desc: "Programs"}
+      - {id: 96, cat: Other, desc: "Other"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: index.php?page=login&returnto=index.php
+    method: post
+    inputs:
+      uid: "{{ .Config.username }}"
+      pwd: "{{ .Config.password }}"
+    error:
+      - selector: td.lista > span[style="color:#FF0000;"]
+    test:
+      path: index.php
+      selector: form[name="jump1"]
+
+  ratio:
+    path: index.php
+    selector: form[name="jump1"] > table > tbody > tr > td:contains("SR ")
+    filters:
+      - name: trim
+        args: ")"
+      - name: split
+        args: [" ", 1]
+
+  download:
+    selector: a[href^="download.php?id="]
+        
+  search:
+    path: index.php
+    inputs:
+      search: "{{ .Query.Keywords }}"
+      category: "{{range .Categories}}{{.}};{{end}}"
+      page: torrents
+      active: 0
+    rows:
+      selector: table.lista > tbody > tr:has(a[href^="index.php?page=torrents&category="])
+    fields:
+      download:
+        selector: a[href^="index.php?page=downloadcheck&id="]
+        attribute: href
+      title:
+        selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
+      category:
+        selector: a[href^="index.php?page=torrents&category="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: category
+      details:
+        selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
+        attribute: href
+      size:
+        selector: td:nth-child(10)
+      date:
+        selector: td:nth-child(5)
+        filters:
+          - name: dateparse
+            args: "02/01/2006"
+      grabs:
+        selector: td:nth-child(8)
+        filters:
+          - name: replace
+            args: ["---", "0"]
+      seeders:
+        selector: td:nth-child(6)
+      leechers:
+        selector: td:nth-child(7)
+      downloadvolumefactor:
+        case:
+          img[alt="gold"]: "0"
+          img[alt="silver"]: "0.5"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          img[alt="2x Upload Multiplier"]: "2"
+          img[alt="3x Upload Multiplier"]: "3"
+          img[alt="4x Upload Multiplier"]: "4"
+          img[alt="5x Upload Multiplier"]: "5"
+          img[alt="6x Upload Multiplier"]: "6"
+          img[alt="7x Upload Multiplier"]: "7"
+          img[alt="8x Upload Multiplier"]: "8"
+          img[alt="9x Upload Multiplier"]: "9"
+          img[alt="10x Upload Multiplier"]: "10"
           "*": "1"

src/Jackett/Definitions/hdbits.yml

@@ -0,0 +1,83 @@
+---
+  site: hdbits
+  name: HDBits
+  description: "Best HD Tracker"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://hdbits.org
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: "Movies", desc: "Movie"}
+      - {id: 2, cat: "TV", desc: "TV"}
+      - {id: 3, cat: "TV/Documentary", desc: "Documentary"}
+      - {id: 4, cat: "Audio", desc: "Music"}
+      - {id: 5, cat: "TV/Sport", desc: "Sport"}
+      - {id: 6, cat: "Audio", desc: "Audio Track"}
+      - {id: 7, cat: "XXX", desc: "XXX"}
+      - {id: 8, cat: "Other", desc: "Misc/Demo"}
+
+    modes:
+      search: [q]
+
+  login:
+    path: /login
+    method: form
+    form: form
+    inputs:
+      uname: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: table.main:contains("Login Failed!")
+    test:
+      path: my.php
+
+  download:
+    selector: a[href^="/download.php"]
+        
+  search:
+    path: browse.php
+    inputs:
+      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+    rows:
+      selector: table#torrent-list > tbody > tr:has(a[href^="/details.php?id="])
+    fields:
+      category:
+        selector: a[href^="?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        selector: td:nth-child(3) a
+      download:
+        selector: a[href^="/download.php"]
+        attribute: href
+      details:
+        selector: a[href^="/details.php?id="]
+        attribute: href
+      grabs:
+        selector: td:nth-child(7) a
+      size:
+        selector: td:nth-child(6)
+      seeders:
+        selector: td:nth-child(8)
+      leechers:
+        selector: td:nth-child(9)
+      date:
+        selector: td:nth-child(5)
+        filters:
+          - name: append
+            args: " ago"
+      downloadvolumefactor:
+        case:
+          "a[title=\"25% Free Leech: only 75% of the download is counted.\"]": "0.25"
+          "a[title=\"50% Free Leech: only half the download is counted.\"]": "0.5"
+          "a[title=\"100% FL: no download is counted.\"]": "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett/Definitions/hdbitscom.yml

@@ -0,0 +1,97 @@
+---
+  site: hdbitscom
+  name: HD-Bits.com
+  description: "HD tracker"
+  language: en-us
+  encoding: UTF-8
+  type: private
+  links:
+    - https://www.hd-bits.com
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Audio, desc: "Music"}
+      - {id: 2, cat: Movies, desc: "Movies"}
+      - {id: 3, cat: TV, desc: "TV-Series"}
+      - {id: 4, cat: PC, desc: "Applications"}
+      - {id: 5, cat: XXX, desc: "Adult"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  login:
+    path: login.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      keeplogged: 1
+      login: "Log in"
+    error:
+      - selector: form#loginform > span.warning
+    test:
+      path: torrents.php
+
+  ratio:
+    path: torrents.php
+    selector: li#stats_ratio > span
+
+  search:
+    path: torrents.php
+    inputs:
+      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+      searchstr: "{{ .Query.Keywords }}"
+      order_by: time
+      order_way: desc
+      action: basic
+      searchsubmit: 1
+    rows:
+      selector: table#torrent_table > tbody > tr.torrent
+    fields:
+      download:
+        selector: a[href^="torrents.php?action=download&id="]
+        attribute: href
+      description:
+        selector: div.group_info div.tags
+      title:
+        selector: div.group_info a[href^="torrents.php?id="]
+      category:
+        selector: td.cats_col
+        case:
+          div.cats_music: 1
+          div.cats_movies: 2
+          div.cats_tvseries: 3
+          div.cats_applications: 4
+          div.cats_xxx: 5
+      comments:
+        selector: a[href^="torrents.php?id="]
+        attribute: href
+      imdb:
+        selector: a[href*="http://www.imdb.com/title/"]
+        optional: true
+        attribute: href
+      banner:
+        selector: img[alt="Cover"]
+        optional: true
+        attribute: src
+      files:
+        selector: td:nth-child(3)
+      date:
+        selector: td:nth-child(4)
+      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:
+          "div.freeleech:contains('Freeleech!')": "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett/Definitions/hdchina.yml

@@ -0,0 +1,121 @@
+---
+  site: hdchina
+  name: HDChina
+  description: "A chinese tracker"
+  language: zh-cn
+  type: private
+  encoding: UTF-8
+  links:
+    - https://hdchina.club/
+
+  caps:
+    categorymappings:
+      - {id: 20, cat: Movies/BluRay, desc: "Movie Full BD"}
+      - {id: 17, cat: Movies/HD, desc: "Movie 1080p"}
+      - {id: 16, cat: Movies/HD, desc: "Movie 1080i"}
+      - {id: 9, cat: Movies/HD, desc: "Movie 720p"}
+      - {id: 13, cat: TV, desc: "EU/US TV series"}
+      - {id: 25, cat: TV, desc: "Chinese TV series"}
+      - {id: 26, cat: TV, desc: "Kor Drama"}
+      - {id: 24, cat: TV, desc: "Jpn Drama"}
+      - {id: 21, cat: TV, desc: "EU/US TV series pack"}
+      - {id: 22, cat: TV, desc: "Chinese TV series pack"}
+      - {id: 23, cat: TV, desc: "JPN/KOR drama pack"}
+      - {id: 27, cat: Movies/SD, desc: "iPad Video"}
+      - {id: 5, cat: TV/Documentary, desc: "Documentary"}
+      - {id: 15, cat: TV/Sport, desc: "Sports"}
+      - {id: 14, cat: TV/Anime, desc: "Animation"}
+      - {id: 401, cat: TV, desc: "TV Shows"}
+      - {id: 402, cat: Audio, desc: "Vocal Concert"}
+      - {id: 406, cat: Audio, desc: "Music Video"}
+      - {id: 408, cat: Audio, desc: "Music"}
+      - {id: 19, cat: Audio, desc: "Audio Track"}
+      - {id: 405, cat: Audio, desc: "Drama"}
+      - {id: 404, cat: Books, desc: "Book"}
+      - {id: 409, cat: Other, desc: "Other"}
+      - {id: 410, cat: Movies/HD, desc: "4K UltraHD"}
+      - {id: 411, cat: TV, desc: "Travel"}
+      - {id: 412, cat: TV, desc: "Food"}
+
+    modes:
+      search: [q]
+
+  login:
+    path: login.php
+    method: form
+    form: form[action="takelogin.php"]
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    captcha:
+      type: image
+      image: img[alt="CAPTCHA"]
+      input: imagestring
+    error:
+      - selector: td.embedded:has(h2:contains("failed"))
+    test:
+      path: /torrents.php
+
+  search:
+    path: /torrents.php
+    method: post
+    inputs:
+      $raw: "{{range .Categories}}cat{{.}}=1&{{end}}"
+      search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+      incldead: "0"
+      spstate: "0"
+      inclbookmarked: "0"
+      search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
+      search_mode: "0"
+    rows:
+      selector: table.torrent_list > tbody > tr:has(a[href^="?cat="])
+    fields:
+      title:
+        selector: td:nth-child(2) a
+      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^="details.php?id="]
+        attribute: href
+        filters:
+          - name: replace
+            args: ["details.php", "download.php"]
+      size:
+        selector: td.t_size
+      grabs:
+        selector: td.t_completed
+      seeders:
+        selector: td.t_torrents
+      leechers:
+        selector: td.t_leech
+      date:
+        selector: td.t_time
+        filters:
+          - name: replace
+            args: ["时", " hours"]
+          - name: replace
+            args: ["分", " minutes"]
+          - name: replace
+            args: ["天", " days"]
+          - name: replace
+            args: ["年", " year"]
+          - name: replace
+            args: ["月", " months"]
+          - name: append
+            args: " ago"
+      downloadvolumefactor:
+        case:
+          img.pro_50pctdown: ".5"
+          img.pro_30pctdown: ".3"
+          img.pro_free: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett/Definitions/hdhome.yml

@@ -1,142 +1,142 @@
----
-  site: hdhome
-  name: HDHome
-  language: zh-cn
-  type: private
-  encoding: UTF-8
-  links:
-    - https://hdhome.org
-
-  caps:
-    categorymappings:
-      - {id: 411, cat: Movies/SD, desc: "Movies SD"}
-      - {id: 412, cat: Movies/SD, desc: "Movies IPad"}
-      - {id: 413, cat: Movies/HD, desc: "Movies 720p"}
-      - {id: 414, cat: Movies/HD, desc: "Movies 1080p"}
-      - {id: 415, cat: Movies/HD, desc: "Movies REMUX"}
-      - {id: 450, cat: Movies/BluRay, desc: "Movies Bluray"}
-      - {id: 416, cat: Movies/HD, 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: 422, cat: TV/Documentary, desc: "Doc 2160p"}
-      - {id: 423, cat: TV/HD, desc: "TVMusic 720p"}
-      - {id: 424, cat: TV/HD, desc: "TVMusic 1080i"}
-      - {id: 425, cat: TV/SD, desc: "TVShow SD"}
-      - {id: 426, cat: TV/SD, desc: "TVShow IPad"}
-      - {id: 427, 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/HD, desc: "TVShow REMUX"}
-      - {id: 452, cat: TV/HD, desc: "TVShows Bluray"}
-      - {id: 431, cat: TV/HD, desc: "TVShow 2160p"}
-      - {id: 432, cat: TV/SD, desc: "TVSeries SD"}
-      - {id: 433, cat: TV/SD, 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/HD, desc: "TVSeries REMUX"}
-      - {id: 453, cat: TV/HD, desc: "TVSereis Bluray"}
-      - {id: 438, cat: TV/HD, desc: "TVSeries 2160p"}
-      - {id: 439, cat: Audio/Other, desc: "Musics APE"}
-      - {id: 440, cat: Audio/Lossless, desc: "Musics FLAC"}
-      - {id: 441, cat: Audio/Video, desc: "Musics 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"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep, imdbid]
-      movie-search: [q, imdbid]
-
-  login:
-    path: login.php
-    method: form
-    form: form[action="takelogin.php"]
-    captcha:
-      type: image
-      image: img[alt="CAPTCHA"]
-      input: imagestring
-    inputs:
-      logintype: "username"
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: td.embedded:has(h2:contains("姿势不正确"))
-      - selector: td.embedded:has(h2:contains("失败"))
-    test:
-      path: /torrents.php
-        
-  search:
-    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:has(table.torrentname)
-    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
-      size:
-        selector: td.rowfollow:nth-child(5)
-      grabs:
-        selector: td.rowfollow:nth-child(8)
-      seeders:
-        selector: td.rowfollow:nth-child(6)
-      leechers:
-        selector: td.rowfollow:nth-child(7)
-      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"
-      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)
+---
+  site: hdhome
+  name: HDHome
+  language: zh-cn
+  type: private
+  encoding: UTF-8
+  links:
+    - https://hdhome.org
+
+  caps:
+    categorymappings:
+      - {id: 411, cat: Movies/SD, desc: "Movies SD"}
+      - {id: 412, cat: Movies/SD, desc: "Movies IPad"}
+      - {id: 413, cat: Movies/HD, desc: "Movies 720p"}
+      - {id: 414, cat: Movies/HD, desc: "Movies 1080p"}
+      - {id: 415, cat: Movies/HD, desc: "Movies REMUX"}
+      - {id: 450, cat: Movies/BluRay, desc: "Movies Bluray"}
+      - {id: 416, cat: Movies/HD, 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: 422, cat: TV/Documentary, desc: "Doc 2160p"}
+      - {id: 423, cat: TV/HD, desc: "TVMusic 720p"}
+      - {id: 424, cat: TV/HD, desc: "TVMusic 1080i"}
+      - {id: 425, cat: TV/SD, desc: "TVShow SD"}
+      - {id: 426, cat: TV/SD, desc: "TVShow IPad"}
+      - {id: 427, 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/HD, desc: "TVShow REMUX"}
+      - {id: 452, cat: TV/HD, desc: "TVShows Bluray"}
+      - {id: 431, cat: TV/HD, desc: "TVShow 2160p"}
+      - {id: 432, cat: TV/SD, desc: "TVSeries SD"}
+      - {id: 433, cat: TV/SD, 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/HD, desc: "TVSeries REMUX"}
+      - {id: 453, cat: TV/HD, desc: "TVSereis Bluray"}
+      - {id: 438, cat: TV/HD, desc: "TVSeries 2160p"}
+      - {id: 439, cat: Audio/Other, desc: "Musics APE"}
+      - {id: 440, cat: Audio/Lossless, desc: "Musics FLAC"}
+      - {id: 441, cat: Audio/Video, desc: "Musics 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"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
+
+  login:
+    path: login.php
+    method: form
+    form: form[action="takelogin.php"]
+    captcha:
+      type: image
+      image: img[alt="CAPTCHA"]
+      input: imagestring
+    inputs:
+      logintype: "username"
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: td.embedded:has(h2:contains("姿势不正确"))
+      - selector: td.embedded:has(h2:contains("失败"))
+    test:
+      path: /torrents.php
+        
+  search:
+    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:has(table.torrentname)
+    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
+      size:
+        selector: td.rowfollow:nth-child(5)
+      grabs:
+        selector: td.rowfollow:nth-child(8)
+      seeders:
+        selector: td.rowfollow:nth-child(6)
+      leechers:
+        selector: td.rowfollow:nth-child(7)
+      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"
+      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/Definitions/hdsky.yml

@@ -1,119 +1,119 @@
----
-  site: hdsky
-  name: HDSky
-  description: "A chinese tracker"
-  language: zh-cn
-  type: private
-  encoding: UTF-8
-  links:
-    - https://hdsky.me
-
-  caps:
-    categorymappings:
-      - {id: 401, cat: Movies, desc: "Movies/电影"}
-      - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
-      - {id: 410, cat: Movies, desc: "iPad/iPad影视"}
-      - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
-      - {id: 402, cat: TV, desc: "TV Series/剧集"}
-      - {id: 403, cat: TV, desc: "TV Shows/综艺"}
-      - {id: 406, cat: Audio/Video, desc: "Music Videos/音乐MV"}
-      - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
-      - {id: 408, cat: Audio, desc: "HQ Audio/无损音乐"}
-      - {id: 409, cat: Other, desc: "Misc/其他"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep, imdbid]
-      movie-search: [q, imdbid]
-
-  login:
-    path: login.php
-    method: form
-    form: form[action="takelogin.php"]
-    captcha:
-      type: image
-      image: img[alt="CAPTCHA"]
-      input: imagestring
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: td.embedded:has(h2:contains("failed"))
-    test:
-      path: /torrents.php
-
-  ratio:
-    path: /torrents.php
-    selector: table#info_block
-    filters:
-      - name: regexp
-        args: "Ratio:\\s(.*?)\\s\\s"
-        
-  download:
-    method: post
-
-  search:
-    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:has(table.torrentname)
-    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: form[action^="download.php?id="]
-        attribute: action
-      imdb:
-        selector: a[href^="http://www.imdb.com/title/tt"]
-        attribute: href
-      size:
-        selector: td.rowfollow:nth-child(5)
-      grabs:
-        selector: td.rowfollow:nth-child(8)
-      seeders:
-        selector: td.rowfollow:nth-child(6)
-      leechers:
-        selector: td.rowfollow:nth-child(7)
-      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"
-      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)
+---
+  site: hdsky
+  name: HDSky
+  description: "A chinese tracker"
+  language: zh-cn
+  type: private
+  encoding: UTF-8
+  links:
+    - https://hdsky.me
+
+  caps:
+    categorymappings:
+      - {id: 401, cat: Movies, desc: "Movies/电影"}
+      - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
+      - {id: 410, cat: Movies, desc: "iPad/iPad影视"}
+      - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
+      - {id: 402, cat: TV, desc: "TV Series/剧集"}
+      - {id: 403, cat: TV, desc: "TV Shows/综艺"}
+      - {id: 406, cat: Audio/Video, desc: "Music Videos/音乐MV"}
+      - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
+      - {id: 408, cat: Audio, desc: "HQ Audio/无损音乐"}
+      - {id: 409, cat: Other, desc: "Misc/其他"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
+
+  login:
+    path: login.php
+    method: form
+    form: form[action="takelogin.php"]
+    captcha:
+      type: image
+      image: img[alt="CAPTCHA"]
+      input: imagestring
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: td.embedded:has(h2:contains("failed"))
+    test:
+      path: /torrents.php
+
+  ratio:
+    path: /torrents.php
+    selector: table#info_block
+    filters:
+      - name: regexp
+        args: "Ratio:\\s(.*?)\\s\\s"
+        
+  download:
+    method: post
+
+  search:
+    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:has(table.torrentname)
+    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: form[action^="download.php?id="]
+        attribute: action
+      imdb:
+        selector: a[href^="http://www.imdb.com/title/tt"]
+        attribute: href
+      size:
+        selector: td.rowfollow:nth-child(5)
+      grabs:
+        selector: td.rowfollow:nth-child(8)
+      seeders:
+        selector: td.rowfollow:nth-child(6)
+      leechers:
+        selector: td.rowfollow:nth-child(7)
+      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"
+      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/Definitions/hdtorrentsit.yml

@@ -0,0 +1,98 @@
+---
+  site: hdtorrentsit
+  name: HDTorrents.it
+  language: it-it
+  type: private
+  encoding: UTF-8
+  links:
+    - http://hdtorrents.it/
+
+  caps:
+    categorymappings:
+      - {id: 2040, cat: Movies/HD}
+      - {id: 5040, cat: TV/HD}
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+       - selector: div.error
+    test:
+      path: browse.php
+
+  search:
+    paths:
+      - path: browse.php
+        method: post
+    inputs:
+      ajax: false
+      search: "{{ .Query.Keywords }}"
+      incldead: 0
+    rows:
+      selector: tbody#highlighted tr
+    fields:
+      title-no-filters:
+        selector: td:nth-child(2) a:nth-child(1)
+      title:
+        selector: td:nth-child(2) a:nth-child(1)
+        filters:
+          - name: re_replace
+            args: ["Stagione (\\d{0,1})", "S0$1"]
+          - name: re_replace
+            args: ["Stagione (\\d{2})", "S$1"]
+          - name: re_replace
+            args: ["Episodio{0,1} \\[(\\d{0,1})", "E0$1"]
+          - name: re_replace
+            args: ["Episodio{0,1} \\[(\\d{2})", "E$1"]
+          - name: re_replace
+            args: ["-(\\d{0,1}) ", "-0$1 "]
+          - name: re_replace
+            args: ["-(\\d{2}) ", "-$1 "]
+          - name: re_replace
+            args: ["(\\d) *\\/ *(E)", "$1$2"]
+          - name: replace
+            args: ["]", ""]
+      details:
+        selector: td:nth-child(2) a:nth-child(1)
+        attribute: href
+      banner:
+        selector: td:nth-child(2)[onmousemove]
+        attribute: onmousemove
+        filters:
+          - name: regexp
+            args: ".*\\(.*,.*,.*,'(.*?)'\\)"
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      size:
+        selector: td:nth-child(3)
+      seeders:
+        selector: td:nth-child(4)
+        filters:
+          - name: re_replace
+            args: ["(\\d*) \\(\\+\\d*\\)\n? \\| (\\d*) \\(\\+\\d*\\)", "$1"]
+      leechers:
+        selector: td:nth-child(4)
+        filters:
+          - name: re_replace
+            args: ["(\\d*) \\(\\+\\d*\\)\n? \\| (\\d*) \\(\\+\\d*\\)", "$2"]
+      date:
+        selector: td:nth-child(2) i
+        filters:
+          - name: dateparse
+            args: "2006-02-01 15:04:05"
+      category:
+        case:
+          "a[href^=\"details.php\"]:contains(\"Stagione\")": 5040 # TV/HD
+          "*": 2040 # default to Movies/HD
+      downloadvolumefactor:
+        text: "1"
+      uploadvolumefactor:
+        text: "1"

src/Jackett/Definitions/hon3yhd.yml

@@ -69,6 +69,7 @@
     inputs:
       $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
       search: "{{ .Query.Keywords }}"
+      searchin: "title"
       incldead: "1"
     rows:
       selector: table > tbody > tr.tt

src/Jackett/Definitions/hyperay.yml

@@ -1,107 +1,107 @@
----
-  site: hyperay
-  name: Hyperay
-  language: zh-cn
-  type: private
-  encoding: UTF-8
-  links:
-    - 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:
-    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]
-    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"
+---
+  site: hyperay
+  name: Hyperay
+  language: zh-cn
+  type: private
+  encoding: UTF-8
+  links:
+    - 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:
+    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]
+    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/Definitions/icetorrent.yml

@@ -1,151 +1,151 @@
----
-  site: icetorrent
-  name: ICE Torrent
-  language: ro-ro
-  type: private
-  encoding: UTF-8
-  links:
-    - https://www.icetorrent.org
-
-  caps:
-    categorymappings:
-      - {id: 1, cat: PC/0day , desc: "Appz"}
-      - {id: 85, cat: Audio/Audiobook, desc: "AudioBooks"}
-      - {id: 68, cat: Books, desc: "Carti/Reviste"}
-      - {id: 23, cat: Books, desc: "Cartoons"}
-      - {id: 73, cat: Audio/Video, desc: "Concert/Videoclip"}
-      - {id: 75, cat: Other, desc: "Diverse"}
-      - {id: 69, cat: Books, desc: "Documentare"}
-      - {id: 51, cat: TV/Documentary, desc: "Documentaries"}
-      - {id: 43, cat: Books, desc: "eBooks"}
-      - {id: 63, cat: Movies/DVD, desc: "Filme DVD"}
-      - {id: 65, cat: Movies/HD, desc: "Filme HD"}
-      - {id: 64, cat: Movies/SD, desc: "Filme Xvid"}
-      - {id: 40, cat: Console, desc: "Games/Console"}
-      - {id: 26, cat: PC/Games, desc: "Games/PC"}
-      - {id: 38, cat: PC/Phone-Other, desc: "Mobile"}
-      - {id: 59, cat: Movies/3D, desc: "Movies/3D"}
-      - {id: 92, cat: Movies/HD, desc: "Movies/4K-UHD"}
-      - {id: 32, cat: Movies/BluRay, desc: "Movies/Blu-Ray"}
-      - {id: 28, cat: Movies/DVD, desc: "Movies/DVD"}
-      - {id: 42, cat: Movies/HD, desc: "Movies/HD-x264"}
-      - {id: 91, cat: Movies/HD, desc: "Movies/HEVC-x265"}
-      - {id: 79, cat: Movies/HD, desc: "Movies/microHD"}
-      - {id: 29, cat: Movies/SD, desc: "Movies/SD"}
-      - {id: 72, cat: Audio/Lossless, desc: "Music/FLAC"}
-      - {id: 6, cat: Audio/MP3, desc: "Music/MP3"}
-      - {id: 37, cat: Audio/Video, desc: "Music/Video"}
-      - {id: 70, cat: Audio/Lossless, desc: "Muzica FLAC"}
-      - {id: 71, cat: Audio/MP3, desc: "Muzica MP3"}
-      - {id: 74, cat: Other, desc: "Other"}
-      - {id: 41, cat: Other, desc: "Pictures"}
-      - {id: 67, cat: TV, desc: "Seriale TV"}
-      - {id: 48, cat: TV/Sport, desc: "Sports"}
-      - {id: 87, cat: Other, desc: "TUTS"}
-      - {id: 33, cat: TV/SD, desc: "TV Episodes"}
-      - {id: 34, cat: TV/HD, desc: "TVHD Episodes"}
-      - {id: 9, cat: XXX, desc: "XXX"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep, imdbid]
-      movie-search: [q, imdbid]
-
-  login:
-    path: /login.php
-    method: form
-    form: form
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: font:contains("failed") + table
-    test:
-      path: /browse.php
-      
-  ratio:
-    text: -1
-
-  search:
-    paths:
-    - path: browse.php
-      categorymappings: ["!", 9]
-    - path: browseadult.php
-      categorymappings: [9]
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{if .Query.IMDBID}}{{ .Query.IMDBIDShort }}{{else}}{{ .Keywords }}{{end}}"
-      incldead: 1
-      search_by: "{{ if .Query.IMDBID }}imdb{{else}}name{{end}}"
-    rows:
-      selector: .torrenttable table[class!="ice"] > tbody > tr:has(a[title][href^="details.php?id="])
-    fields:
-      title:
-        selector: a[title][href^="details.php?id="]
-        attribute: title
-      details:
-        selector: a[title][href^="details.php?id="]
-        attribute: href
-      category:
-        selector: a[href*=".php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      imdb:
-        selector: a[title="IMDB"]
-        attribute: href
-      banner:
-        attribute: rel
-      imdb:
-        selector: a[href^="http://www.imdb.com/title/"]
-        optional: true
-        attribute: href
-      download:
-        selector: a[href^="download.php"]
-        attribute: href
-      files:
-        selector: td:nth-child(5) > a
-        filters:
-          - name: regexp
-            args: (\d+)
-      size:
-        selector: td:nth-child(5)
-        remove: a
-      date:
-        selector: td:nth-child(2) > div
-        remove: b
-        filters:
-          - name: replace
-            args: ["\xA0", " "]
-          - name: replace
-            args: ["Added on ", ""]
-          - name: replace
-            args: ["st ", " "]
-          - name: replace
-            args: ["nd ", " "]
-          - name: replace
-            args: ["rd ", " "]  
-          - name: replace
-            args: ["th ", " "]
-          - name: replace
-            args: [" by", ""]
-          - name: append
-            args: " +02:00"
-          - name: dateparse
-            args: "2 Jan 2006 15:04:05 -07:00"
-      grabs:
-        selector: td:nth-child(6)
-      downloadvolumefactor:
-        case:
-          "*": "0"
-      uploadvolumefactor:
-        case:
-          "*": "1"
-      description:
-        selector: td:nth-child(2)
-        remove: a[title][href^="details.php?id="], div
-      seeders:
-        text: "9999"
-      leechers:
-        text: "9999"
+---
+  site: icetorrent
+  name: ICE Torrent
+  language: ro-ro
+  type: private
+  encoding: UTF-8
+  links:
+    - https://www.icetorrent.org
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: PC/0day , desc: "Appz"}
+      - {id: 85, cat: Audio/Audiobook, desc: "AudioBooks"}
+      - {id: 68, cat: Books, desc: "Carti/Reviste"}
+      - {id: 23, cat: Books, desc: "Cartoons"}
+      - {id: 73, cat: Audio/Video, desc: "Concert/Videoclip"}
+      - {id: 75, cat: Other, desc: "Diverse"}
+      - {id: 69, cat: Books, desc: "Documentare"}
+      - {id: 51, cat: TV/Documentary, desc: "Documentaries"}
+      - {id: 43, cat: Books, desc: "eBooks"}
+      - {id: 63, cat: Movies/DVD, desc: "Filme DVD"}
+      - {id: 65, cat: Movies/HD, desc: "Filme HD"}
+      - {id: 64, cat: Movies/SD, desc: "Filme Xvid"}
+      - {id: 40, cat: Console, desc: "Games/Console"}
+      - {id: 26, cat: PC/Games, desc: "Games/PC"}
+      - {id: 38, cat: PC/Phone-Other, desc: "Mobile"}
+      - {id: 59, cat: Movies/3D, desc: "Movies/3D"}
+      - {id: 92, cat: Movies/HD, desc: "Movies/4K-UHD"}
+      - {id: 32, cat: Movies/BluRay, desc: "Movies/Blu-Ray"}
+      - {id: 28, cat: Movies/DVD, desc: "Movies/DVD"}
+      - {id: 42, cat: Movies/HD, desc: "Movies/HD-x264"}
+      - {id: 91, cat: Movies/HD, desc: "Movies/HEVC-x265"}
+      - {id: 79, cat: Movies/HD, desc: "Movies/microHD"}
+      - {id: 29, cat: Movies/SD, desc: "Movies/SD"}
+      - {id: 72, cat: Audio/Lossless, desc: "Music/FLAC"}
+      - {id: 6, cat: Audio/MP3, desc: "Music/MP3"}
+      - {id: 37, cat: Audio/Video, desc: "Music/Video"}
+      - {id: 70, cat: Audio/Lossless, desc: "Muzica FLAC"}
+      - {id: 71, cat: Audio/MP3, desc: "Muzica MP3"}
+      - {id: 74, cat: Other, desc: "Other"}
+      - {id: 41, cat: Other, desc: "Pictures"}
+      - {id: 67, cat: TV, desc: "Seriale TV"}
+      - {id: 48, cat: TV/Sport, desc: "Sports"}
+      - {id: 87, cat: Other, desc: "TUTS"}
+      - {id: 33, cat: TV/SD, desc: "TV Episodes"}
+      - {id: 34, cat: TV/HD, desc: "TVHD Episodes"}
+      - {id: 9, cat: XXX, desc: "XXX"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
+
+  login:
+    path: /login.php
+    method: form
+    form: form
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: font:contains("failed") + table
+    test:
+      path: /browse.php
+      
+  ratio:
+    text: -1
+
+  search:
+    paths:
+    - path: browse.php
+      categorymappings: ["!", 9]
+    - path: browseadult.php
+      categorymappings: [9]
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{if .Query.IMDBID}}{{ .Query.IMDBIDShort }}{{else}}{{ .Keywords }}{{end}}"
+      incldead: 1
+      search_by: "{{ if .Query.IMDBID }}imdb{{else}}name{{end}}"
+    rows:
+      selector: table.torrenttable > tbody > tr:has(a[title][href^="details.php?id="])
+    fields:
+      title:
+        selector: a[title][href^="details.php?id="]
+        attribute: title
+      details:
+        selector: a[title][href^="details.php?id="]
+        attribute: href
+      category:
+        selector: a[href*=".php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      imdb:
+        selector: a[title="IMDB"]
+        attribute: href
+      banner:
+        attribute: rel
+      imdb:
+        selector: a[href^="http://www.imdb.com/title/"]
+        optional: true
+        attribute: href
+      download:
+        selector: a[href^="download.php"]
+        attribute: href
+      files:
+        selector: td:nth-child(5) > a
+        filters:
+          - name: regexp
+            args: (\d+)
+      size:
+        selector: td:nth-child(5)
+        remove: a
+      date:
+        selector: td:nth-child(2) > div
+        remove: b
+        filters:
+          - name: replace
+            args: ["\xA0", " "]
+          - name: replace
+            args: ["Added on ", ""]
+          - name: replace
+            args: ["st ", " "]
+          - name: replace
+            args: ["nd ", " "]
+          - name: replace
+            args: ["rd ", " "]  
+          - name: replace
+            args: ["th ", " "]
+          - name: replace
+            args: [" by", ""]
+          - name: append
+            args: " +02:00"
+          - name: dateparse
+            args: "2 Jan 2006 15:04:05 -07:00"
+      grabs:
+        selector: td:nth-child(6)
+      downloadvolumefactor:
+        case:
+          "*": "0"
+      uploadvolumefactor:
+        case:
+          "*": "1"
+      description:
+        selector: td:nth-child(2)
+        remove: a[title][href^="details.php?id="], div
+      seeders:
+        text: "9999"
+      leechers:
+        text: "9999"

src/Jackett/Definitions/iloveclassics.yml

@@ -0,0 +1,106 @@
+---
+  site: iloveclassics
+  name: I Love Classics
+  description: "Classics movie tracker"
+  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:
+    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/Definitions/infinityt.yml

@@ -1,106 +1,106 @@
----
-  site: infinityt
-  name: Infinity-T
-  language: da-dk
-  type: private
-  encoding: UTF-8
-  links:
-    - https://infinity-t.org/
-
-  caps:
-    categorymappings:
-      - {id: 22, cat: Audio/Audiobook, desc: "aBook"}
-      - {id: 13, cat: PC/Phone-Android, desc: "Appz/Android"}
-      - {id: 14, cat: PC/Phone-IOS, desc: "Appz/iPhone"}
-      - {id: 12, cat: PC/Mac, desc: "Appz/Mac"}
-      - {id: 11, cat: PC/0day, desc: "Appz/Win"}
-      - {id: 19, cat: Movies, desc: "AU/NEED"}
-      - {id: 20, cat: Books, desc: "eBook"}
-      - {id: 17, cat: Console, desc: "Games/Console"}
-      - {id: 16, cat: PC/Mac, desc: "Games/Mac"}
-      - {id: 15, cat: PC/Games, desc: "Games/PC"}
-      - {id: 8, cat: Movies, desc: "Movie/Boxset"}
-      - {id: 7, cat: Movies/DVD, desc: "Movie/DVD"}
-      - {id: 5, cat: Movies/HD, desc: "Movie/HD"}
-      - {id: 6, cat: Movies/SD, desc: "Movie/SD"}
-      - {id: 10, cat: Audio/Lossless, desc: "Music/FLAC"}
-      - {id: 9, cat: Audio/MP3, desc: "Music/MP3"}
-      - {id: 21, cat: Movies/Bluray, desc: "REMUX/Bluray"}
-      - {id: 4, cat: TV, desc: "TV/Boxset"}
-      - {id: 3, cat: TV, desc: "TV/DVD"}
-      - {id: 1, cat: TV/HD, desc: "TV/HD"}
-      - {id: 2, cat: TV/SD, desc: "TV/SD"}
-      - {id: 18, cat: XXX, desc: "XXX"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: login.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: td.embedded:has(h2:contains("failed"))
-    test:
-      path: /browse.php
-
-  search:
-    path: /browse.php
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
-      incldead: 1
-    rows:
-      selector: td.outer > table > tbody > tr[id]
-    fields:
-      imdb:
-        selector: a[href^="https://www.nullrefer.com/?http://imdb.com/title/"]
-        attribute: href
-      banner:
-        selector: a[rel]
-        attribute: rel
-        filters:
-          - name: replace
-            args: ["pic/noposter.jpg", ""]
-      title:
-        selector: a[href^="details.php?id="]
-      category:
-        selector: a[href^="browse.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      details:
-        selector: a[href^="details.php?id="]
-        attribute: href
-      download:
-        selector: a[href^="download.php"]
-        attribute: href
-      files:
-        selector: td:nth-child(3)
-      size:
-        selector: td:nth-child(6)
-      seeders:
-        selector: td:nth-child(9)
-      leechers:
-        selector: td:nth-child(10)
-      date:
-        selector: td:nth-child(5)
-        filters:
-          - name: replace
-            args: ["I Dag", "Today"]
-          - name: replace
-            args: ["I Går", "Yesterday"]
-            
-      grabs:
-        selector: td:nth-child(8)
-      downloadvolumefactor:
-        case:
-          td[style*="/pic/free.png"]: "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
+---
+  site: infinityt
+  name: Infinity-T
+  language: da-dk
+  type: private
+  encoding: UTF-8
+  links:
+    - https://infinity-t.org/
+
+  caps:
+    categorymappings:
+      - {id: 22, cat: Audio/Audiobook, desc: "aBook"}
+      - {id: 13, cat: PC/Phone-Android, desc: "Appz/Android"}
+      - {id: 14, cat: PC/Phone-IOS, desc: "Appz/iPhone"}
+      - {id: 12, cat: PC/Mac, desc: "Appz/Mac"}
+      - {id: 11, cat: PC/0day, desc: "Appz/Win"}
+      - {id: 19, cat: Movies, desc: "AU/NEED"}
+      - {id: 20, cat: Books, desc: "eBook"}
+      - {id: 17, cat: Console, desc: "Games/Console"}
+      - {id: 16, cat: PC/Mac, desc: "Games/Mac"}
+      - {id: 15, cat: PC/Games, desc: "Games/PC"}
+      - {id: 8, cat: Movies, desc: "Movie/Boxset"}
+      - {id: 7, cat: Movies/DVD, desc: "Movie/DVD"}
+      - {id: 5, cat: Movies/HD, desc: "Movie/HD"}
+      - {id: 6, cat: Movies/SD, desc: "Movie/SD"}
+      - {id: 10, cat: Audio/Lossless, desc: "Music/FLAC"}
+      - {id: 9, cat: Audio/MP3, desc: "Music/MP3"}
+      - {id: 21, cat: Movies/Bluray, desc: "REMUX/Bluray"}
+      - {id: 4, cat: TV, desc: "TV/Boxset"}
+      - {id: 3, cat: TV, desc: "TV/DVD"}
+      - {id: 1, cat: TV/HD, desc: "TV/HD"}
+      - {id: 2, cat: TV/SD, desc: "TV/SD"}
+      - {id: 18, cat: XXX, desc: "XXX"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: login.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: td.embedded:has(h2:contains("failed"))
+    test:
+      path: /browse.php
+
+  search:
+    path: /browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      incldead: 1
+    rows:
+      selector: td.outer > table > tbody > tr[id]
+    fields:
+      imdb:
+        selector: a[href^="https://www.nullrefer.com/?http://imdb.com/title/"]
+        attribute: href
+      banner:
+        selector: a[rel]
+        attribute: rel
+        filters:
+          - name: replace
+            args: ["pic/noposter.jpg", ""]
+      title:
+        selector: a[href^="details.php?id="]
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="download.php"]
+        attribute: href
+      files:
+        selector: td:nth-child(3)
+      size:
+        selector: td:nth-child(6)
+      seeders:
+        selector: td:nth-child(9)
+      leechers:
+        selector: td:nth-child(10)
+      date:
+        selector: td:nth-child(5)
+        filters:
+          - name: replace
+            args: ["I Dag", "Today"]
+          - name: replace
+            args: ["I Går", "Yesterday"]
+            
+      grabs:
+        selector: td:nth-child(8)
+      downloadvolumefactor:
+        case:
+          td[style*="/pic/free.png"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
           "*": "1"

src/Jackett/Definitions/inperil.yml

@@ -1,104 +1,104 @@
----
-  site: inperil
-  name: inPeril
-  type: private
-  language: lv-lv
-  type: private
-  encoding: UTF-8
-  links:
-    - http://www.inperil.net/
-
-  caps:
-    categorymappings:
-      - {id: 34, cat: TV/Anime, desc: "Animation"}
-      - {id: 22, cat: PC/0day, desc: "Appz"}
-      - {id: 25, cat: PC/Games, desc: "Games/Console"}
-      - {id: 4, cat: PC/Games, desc: "Games/PC"}
-      - {id: 27, cat: Other/Misc, desc: "Misc"}
-      - {id: 35, cat: Movies/HD, desc: "Movies/HD"}
-      - {id: 37, cat: Movies/Foreign, desc: "Movies/LAT"}
-      - {id: 42, cat: Movies, desc: "Movies/Pack"}
-      - {id: 38, cat: Movies, desc: "Movies/Retro"}
-      - {id: 36, cat: Movies/Foreign, desc: "Movies/RUS"}
-      - {id: 19, cat: Movies/SD, desc: "Movies/SD"}
-      - {id: 6, cat: Audio, desc: "Music"}
-      - {id: 26, cat: Audio/Video, desc: "Music Videos"}
-      - {id: 31, cat: Audio/Lossless, desc: "Music/FLAC"}
-      - {id: 39, cat: TV/HD, desc: "TV/HD"}
-      - {id: 43, cat: TV, desc: "TV/Pack"}
-      - {id: 7, cat: TV/SD, desc: "TV/SD"}
-      - {id: 40, cat: XXX, desc: "XXX/HD"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: /takelogin.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: font.logintext
-    test:
-      path: /browse.php
-      
-  search:
-    path: /browse.php
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
-      incldead: 1
-    rows:
-      selector: table > tbody > tr:has(a[href^="details.php?id="])
-    fields:
-      title:
-        selector: a[href^="details.php?id="][title]
-        attribute: title
-      details:
-        selector: a[href^="details.php?id="]
-        attribute: href
-      category:
-        selector: a[href^="browse.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      download:
-        selector: a[href^="download.php/"]
-        attribute: href
-      files:
-        selector: td:nth-child(3)
-      size:
-        selector: td:nth-child(6)
-      date:
-        selector: td:nth-child(5)
-        filters:
-          - name: append
-            args: " +02:00"
-          - name: dateparse
-            args: "2006-01-0215:04:05 -07:00"
-      grabs:
-        selector: td:nth-child(7)
-        filters:
-          - name: regexp
-            args: ([,\d]+)
-      seeders:
-        selector: td:nth-child(8)
-      leechers:
-        selector: td:nth-child(9)
-      banner:
-        selector: a[onmouseover][href^="details.php?id="]
-        attribute: onmouseover
-        filters:
-          - name: regexp
-            args: src=([^\s]+)
-      downloadvolumefactor:
-        case:
-          "img[alt=\"Zelta Torrents\"]": "0"
-          "img[alt=\"Sudraba Torrents\"]": "0.5"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
+---
+  site: inperil
+  name: inPeril
+  type: private
+  language: lv-lv
+  type: private
+  encoding: UTF-8
+  links:
+    - http://www.inperil.net/
+
+  caps:
+    categorymappings:
+      - {id: 34, cat: TV/Anime, desc: "Animation"}
+      - {id: 22, cat: PC/0day, desc: "Appz"}
+      - {id: 25, cat: PC/Games, desc: "Games/Console"}
+      - {id: 4, cat: PC/Games, desc: "Games/PC"}
+      - {id: 27, cat: Other/Misc, desc: "Misc"}
+      - {id: 35, cat: Movies/HD, desc: "Movies/HD"}
+      - {id: 37, cat: Movies/Foreign, desc: "Movies/LAT"}
+      - {id: 42, cat: Movies, desc: "Movies/Pack"}
+      - {id: 38, cat: Movies, desc: "Movies/Retro"}
+      - {id: 36, cat: Movies/Foreign, desc: "Movies/RUS"}
+      - {id: 19, cat: Movies/SD, desc: "Movies/SD"}
+      - {id: 6, cat: Audio, desc: "Music"}
+      - {id: 26, cat: Audio/Video, desc: "Music Videos"}
+      - {id: 31, cat: Audio/Lossless, desc: "Music/FLAC"}
+      - {id: 39, cat: TV/HD, desc: "TV/HD"}
+      - {id: 43, cat: TV, desc: "TV/Pack"}
+      - {id: 7, cat: TV/SD, desc: "TV/SD"}
+      - {id: 40, cat: XXX, desc: "XXX/HD"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: /takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: font.logintext
+    test:
+      path: /browse.php
+      
+  search:
+    path: /browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      incldead: 1
+    rows:
+      selector: table > tbody > tr:has(a[href^="details.php?id="])
+    fields:
+      title:
+        selector: a[href^="details.php?id="][title]
+        attribute: title
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      download:
+        selector: a[href^="download.php/"]
+        attribute: href
+      files:
+        selector: td:nth-child(3)
+      size:
+        selector: td:nth-child(6)
+      date:
+        selector: td:nth-child(5)
+        filters:
+          - name: append
+            args: " +02:00"
+          - name: dateparse
+            args: "2006-01-0215:04:05 -07:00"
+      grabs:
+        selector: td:nth-child(7)
+        filters:
+          - name: regexp
+            args: ([,\d]+)
+      seeders:
+        selector: td:nth-child(8)
+      leechers:
+        selector: td:nth-child(9)
+      banner:
+        selector: a[onmouseover][href^="details.php?id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: src=([^\s]+)
+      downloadvolumefactor:
+        case:
+          "img[alt=\"Zelta Torrents\"]": "0"
+          "img[alt=\"Sudraba Torrents\"]": "0.5"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett/Definitions/insanetracker.yml

@@ -1,140 +1,140 @@
----
-  site: insanetracker
-  name: Insane Tracker
-  language: hu-hu
-  type: private
-  encoding: UTF-8
-  links:
-    - https://newinsane.info/
-
-  caps:
-    categorymappings:
-      - {id: 8, cat: TV/SD, desc: "Sorozat/Hun"}
-      - {id: 40, cat: TV/HD, desc: "Sorozat/Hun/HD"}
-      - {id: 41, cat: Movies/SD, desc: "Film/Hun/SD"}
-      - {id: 15, cat: Movies/DVD, desc: "Film/Hun/DVD-R"}
-      - {id: 27, cat: Movies/HD, desc: "Film/Hun/HD"}
-      - {id: 44, cat: Movies/HD, desc: "Film/Hun/UHD"}
-      - {id: 2, cat: Books, desc: "eBook/Hun"}
-      - {id: 7, cat: TV/SD, desc: "Sorozat/Eng"}
-      - {id: 39, cat: TV/HD, desc: "Sorozat/Eng/HD"}
-      - {id: 42, cat: Movies/SD, desc: "Film/Eng/SD"}
-      - {id: 14, cat: Movies/DVD, desc: "Film/Eng/DVD-R"}
-      - {id: 25, cat: Movies/HD, desc: "Film/Eng/HD"}
-      - {id: 45, cat: Movies/HD, desc: "Film/Eng/UHD"}
-      - {id: 1, cat: Books, desc: "eBook/Eng"}
-      - {id: 38, cat: Audio/Audiobook, desc: "Hangoskönyv"}
-      - {id: 21, cat: XXX, desc: "XXX"}
-      - {id: 4, cat: PC/ISO, desc: "Program/ISO"}
-      - {id: 19, cat: Audio/Other, desc: "Zene/Hun"}
-      - {id: 37, cat: Audio/Lossless, desc: "Lossless/Hun"}
-      - {id: 9, cat: PC/Games, desc: "Játék/ISO"}
-      - {id: 43, cat: Console, desc: "Játék/Konzol"}
-      - {id: 29, cat: Other, desc: "Képek"}
-      - {id: 28, cat: XXX/Imageset, desc: "XXX Képek"}
-      - {id: 3, cat: PC/0day, desc: "Program/Egyéb"}
-      - {id: 18, cat: Audio/Other, desc: "Zene/Eng"}
-      - {id: 26, cat: Audio/Lossless, desc: "Lossless/Eng"}
-      - {id: 11, cat: PC/Games, desc: "Játék/Rip"}
-      - {id: 13, cat: PC/Phone-Other, desc: "Mobil"}
-
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q, imdbid]
-
-  login:
-    path: takelogin.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      notsecure: "1"
-    error:
-      - selector: div.login_error_content
-    test:
-      path: /browse.php
-        
-  search:
-    path: /browse.php
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Query.Keywords }}{{end}}"
-      t: "all"
-    rows:
-      selector: table.torrentable > tbody > tr:has(td.maintd)
-    fields:
-      title:
-        selector: div.tortitle > a
-        attribute: title
-      category:
-        selector: a[href^="browse.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      details:
-        selector: div.tortitle > a
-        attribute: href
-      download:
-        selector: a[href^="download.php/"]
-        attribute: href
-      imdb|optional:
-        selector: a[title="IMDb link"]
-        attribute: href
-      banner|optional|1:
-        selector: img[alt="offer"]
-        attribute: src
-      banner|optional|2:
-        selector: a.cover
-        attribute: href
-      files:
-        selector: td:nth-child(6)
-        filters:
-          - name: replace
-            args: [".", ""]
-      size:
-        selector: td:nth-child(8)
-        filters:
-          - name: replace
-            args: [".", ""]
-          - name: replace
-            args: [",", "."]
-      grabs:
-        selector: td:nth-child(9) > div:first-child
-        filters:
-          - name: replace
-            args: [".", ""]
-          - name: regexp
-            args: "^([\\d]+)"
-      seeders:
-        selector: td:nth-child(9) > div:first-child
-        filters:
-          - name: replace
-            args: [".", ""]
-          - name: regexp
-            args: "\\|\\s*([\\d]+)\\s*\\|"
-      leechers:
-        selector: td:nth-child(9) > div:first-child
-        filters:
-          - name: replace
-            args: [".", ""]
-          - name: regexp
-            args: "([\\d]+)$"
-      date:
-        selector: td.date
-        filters:
-          - name: dateparse
-            args: "2006.01.02 15:04:05"
-      downloadvolumefactor:
-        text: "0"
-      uploadvolumefactor:
-        case:
-          img[src^="pic/4x.gif"]: "4"
-          img[src^="pic/3x.gif"]: "3"
-          img[src^="pic/2x.gif"]: "2"
-          "*": "1"
-      description:
-        selector: td.maintd
-        remove: div.tortitle, div.markcont, div.tablebuttons, div.tablebigbuttons
+---
+  site: insanetracker
+  name: Insane Tracker
+  language: hu-hu
+  type: private
+  encoding: UTF-8
+  links:
+    - https://newinsane.info/
+
+  caps:
+    categorymappings:
+      - {id: 8, cat: TV/SD, desc: "Sorozat/Hun"}
+      - {id: 40, cat: TV/HD, desc: "Sorozat/Hun/HD"}
+      - {id: 41, cat: Movies/SD, desc: "Film/Hun/SD"}
+      - {id: 15, cat: Movies/DVD, desc: "Film/Hun/DVD-R"}
+      - {id: 27, cat: Movies/HD, desc: "Film/Hun/HD"}
+      - {id: 44, cat: Movies/HD, desc: "Film/Hun/UHD"}
+      - {id: 2, cat: Books, desc: "eBook/Hun"}
+      - {id: 7, cat: TV/SD, desc: "Sorozat/Eng"}
+      - {id: 39, cat: TV/HD, desc: "Sorozat/Eng/HD"}
+      - {id: 42, cat: Movies/SD, desc: "Film/Eng/SD"}
+      - {id: 14, cat: Movies/DVD, desc: "Film/Eng/DVD-R"}
+      - {id: 25, cat: Movies/HD, desc: "Film/Eng/HD"}
+      - {id: 45, cat: Movies/HD, desc: "Film/Eng/UHD"}
+      - {id: 1, cat: Books, desc: "eBook/Eng"}
+      - {id: 38, cat: Audio/Audiobook, desc: "Hangoskönyv"}
+      - {id: 21, cat: XXX, desc: "XXX"}
+      - {id: 4, cat: PC/ISO, desc: "Program/ISO"}
+      - {id: 19, cat: Audio/Other, desc: "Zene/Hun"}
+      - {id: 37, cat: Audio/Lossless, desc: "Lossless/Hun"}
+      - {id: 9, cat: PC/Games, desc: "Játék/ISO"}
+      - {id: 43, cat: Console, desc: "Játék/Konzol"}
+      - {id: 29, cat: Other, desc: "Képek"}
+      - {id: 28, cat: XXX/Imageset, desc: "XXX Képek"}
+      - {id: 3, cat: PC/0day, desc: "Program/Egyéb"}
+      - {id: 18, cat: Audio/Other, desc: "Zene/Eng"}
+      - {id: 26, cat: Audio/Lossless, desc: "Lossless/Eng"}
+      - {id: 11, cat: PC/Games, desc: "Játék/Rip"}
+      - {id: 13, cat: PC/Phone-Other, desc: "Mobil"}
+
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q, imdbid]
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      notsecure: "1"
+    error:
+      - selector: div.login_error_content
+    test:
+      path: /browse.php
+        
+  search:
+    path: /browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Query.Keywords }}{{end}}"
+      t: "all"
+    rows:
+      selector: table.torrentable > tbody > tr:has(td.maintd)
+    fields:
+      title:
+        selector: div.tortitle > a
+        attribute: title
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      details:
+        selector: div.tortitle > a
+        attribute: href
+      download:
+        selector: a[href^="download.php/"]
+        attribute: href
+      imdb|optional:
+        selector: a[title="IMDb link"]
+        attribute: href
+      banner|optional|1:
+        selector: img[alt="offer"]
+        attribute: src
+      banner|optional|2:
+        selector: a.cover
+        attribute: href
+      files:
+        selector: td:nth-child(6)
+        filters:
+          - name: replace
+            args: [".", ""]
+      size:
+        selector: td:nth-child(8)
+        filters:
+          - name: replace
+            args: [".", ""]
+          - name: replace
+            args: [",", "."]
+      grabs:
+        selector: td:nth-child(9) > div:first-child
+        filters:
+          - name: replace
+            args: [".", ""]
+          - name: regexp
+            args: "^([\\d]+)"
+      seeders:
+        selector: td:nth-child(9) > div:first-child
+        filters:
+          - name: replace
+            args: [".", ""]
+          - name: regexp
+            args: "\\|\\s*([\\d]+)\\s*\\|"
+      leechers:
+        selector: td:nth-child(9) > div:first-child
+        filters:
+          - name: replace
+            args: [".", ""]
+          - name: regexp
+            args: "([\\d]+)$"
+      date:
+        selector: td.date
+        filters:
+          - name: dateparse
+            args: "2006.01.02 15:04:05"
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        case:
+          img[src^="pic/4x.gif"]: "4"
+          img[src^="pic/3x.gif"]: "3"
+          img[src^="pic/2x.gif"]: "2"
+          "*": "1"
+      description:
+        selector: td.maintd
+        remove: div.tortitle, div.markcont, div.tablebuttons, div.tablebigbuttons

src/Jackett/Definitions/jpopsuki.yml

@@ -1,105 +1,105 @@
----
-  site: jpopsuki
-  name: JPopsuki
-  language: en-us
-  type: private
-  encoding: UTF-8
-  links:
-    - https://jpopsuki.eu/
-
-  caps:
-    categorymappings:
-      - {id: 1, cat: Audio, desc: "Album"}
-      - {id: 2, cat: Audio, desc: "Single"}
-      - {id: 3, cat: Movies, desc: "PV"}
-      - {id: 4, cat: Movies/DVD, desc: "DVD"}
-      - {id: 5, cat: TV, desc: "TV-Music"}
-      - {id: 6, cat: TV, desc: "TV-Variety"}
-      - {id: 7, cat: TV, desc: "TV-Drama"}
-      - {id: 8, cat: Other, desc: "Fansubs"}
-      - {id: 9, cat: Other, desc: "Pictures"}
-      - {id: 10, cat: Other/Misc, desc: "Misc"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: login.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      keeplogged: 1
-      login: "Log in"
-    error:
-      - selector: form#loginform > span.warning
-    test:
-      path: torrents.php
-
-  ratio:
-    path: torrents.php
-    selector: li#stats_ratio > span
-
-  search:
-    path: torrents.php
-    inputs:
-      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
-      searchstr: "{{ .Query.Keywords }}"
-      order_by: time
-      order_way: desc
-      action: basic
-      searchsubmit: 1
-    rows:
-      selector: table#torrent_table > tbody > tr[class^="torrent"]
-    fields:
-      download:
-        selector: a[href^="torrents.php?action=download&id="]
-        attribute: href
-      description:
-        selector: div.tags
-      title:
-        selector: td:nth-child(4)
-        remove: span, div.tags, a[title="View Comments"]
-        filters:
-          - name: replace
-            args: [" ()", ""]
-          - name: replace
-            args: [" / Freeleech!", ""]
-      category:
-        selector: a[href*="filter_cat"]
-        attribute: href
-        filters:
-          - name: regexp
-            args: "%5B(\\d+?)%5D"
-      details:
-        selector: a[href^="torrents.php?id="]
-        attribute: href
-      banner:
-        selector: td:nth-child(3) img
-        attribute: src
-      files:
-        selector: td:nth-child(5)
-      date:
-        selector: td:nth-child(6)
-        attribute: title
-        filters:
-          - name: append
-            args: " +00:00"
-          - name: dateparse
-            args: "Jan 02 2006, 15:04 -07:00"
-      size:
-        selector: td:nth-child(7)
-      grabs:
-        selector: td:nth-child(8)
-      seeders:
-        selector: td:nth-child(9)
-      leechers:
-        selector: td:nth-child(10)
-      downloadvolumefactor:
-        case:
-          "strong:contains(\"Freeleech!\")": "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
+---
+  site: jpopsuki
+  name: JPopsuki
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://jpopsuki.eu/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Audio, desc: "Album"}
+      - {id: 2, cat: Audio, desc: "Single"}
+      - {id: 3, cat: Movies, desc: "PV"}
+      - {id: 4, cat: Movies/DVD, desc: "DVD"}
+      - {id: 5, cat: TV, desc: "TV-Music"}
+      - {id: 6, cat: TV, desc: "TV-Variety"}
+      - {id: 7, cat: TV, desc: "TV-Drama"}
+      - {id: 8, cat: Other, desc: "Fansubs"}
+      - {id: 9, cat: Other, desc: "Pictures"}
+      - {id: 10, cat: Other/Misc, desc: "Misc"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: login.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      keeplogged: 1
+      login: "Log in"
+    error:
+      - selector: form#loginform > span.warning
+    test:
+      path: torrents.php
+
+  ratio:
+    path: torrents.php
+    selector: li#stats_ratio > span
+
+  search:
+    path: torrents.php
+    inputs:
+      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+      searchstr: "{{ .Query.Keywords }}"
+      order_by: time
+      order_way: desc
+      action: basic
+      searchsubmit: 1
+    rows:
+      selector: table#torrent_table > tbody > tr[class^="torrent"]
+    fields:
+      download:
+        selector: a[href^="torrents.php?action=download&id="]
+        attribute: href
+      description:
+        selector: div.tags
+      title:
+        selector: td:nth-child(4)
+        remove: span, div.tags, a[title="View Comments"]
+        filters:
+          - name: replace
+            args: [" ()", ""]
+          - name: replace
+            args: [" / Freeleech!", ""]
+      category:
+        selector: a[href*="filter_cat"]
+        attribute: href
+        filters:
+          - name: regexp
+            args: "%5B(\\d+?)%5D"
+      details:
+        selector: a[href^="torrents.php?id="]
+        attribute: href
+      banner:
+        selector: td:nth-child(3) img
+        attribute: src
+      files:
+        selector: td:nth-child(5)
+      date:
+        selector: td:nth-child(6)
+        attribute: title
+        filters:
+          - name: append
+            args: " +00:00"
+          - name: dateparse
+            args: "Jan 02 2006, 15:04 -07:00"
+      size:
+        selector: td:nth-child(7)
+      grabs:
+        selector: td:nth-child(8)
+      seeders:
+        selector: td:nth-child(9)
+      leechers:
+        selector: td:nth-child(10)
+      downloadvolumefactor:
+        case:
+          "strong:contains(\"Freeleech!\")": "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
           "*": "1"

src/Jackett/Definitions/karagarga.yml

@@ -0,0 +1,83 @@
+---
+  site: karagarga
+  name: Karagarga
+  description: "Rare and obscure movie tracker"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://karagarga.in/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Movies, desc: "Movies"}
+
+    modes:
+      search: [q]
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    captcha:
+      type: image
+      image: img#captcha_img
+      input: imagestring
+    error:
+      - selector: table:contains("Login failed!")
+    test:
+      path: index.php
+
+  download:
+    selector: a[href^="download.php?id="]
+        
+  search:
+    path: browse.php
+    inputs:
+      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+      search: "\"{{ .Query.Keywords }}\""
+      search_type: "title"
+    rows:
+      selector: table#browse > tbody > tr:has(a[href^="browse.php?genre="])
+    fields:
+      category:
+        text: 1
+      title:
+        selector: td:nth-child(2) span
+      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(12)
+        filters:
+          - name: regexp
+            args: ([\d,]+)
+      files:
+        selector: td:nth-child(10)
+      size:
+        selector: td:nth-child(11)
+      seeders:
+        selector: td:nth-child(13)
+      leechers:
+        selector: td:nth-child(14)
+      date:
+        selector: td:nth-child(9)
+        filters:
+          - name: replace
+            args: ["'", ""]
+          - name: dateparse
+            args: "Jan 02 06"
+      downloadvolumefactor:
+        case:
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett/Definitions/leparadisdunet.yml

@@ -1,163 +1,163 @@
----
-  site: leparadisdunet
-  name: Le Paradis Du Net
-  language: fr-fr
-  type: semi-private
-  encoding: UTF-8
-  links:
-    - https://le-paradis-du-net.com/
-
-  caps:
-    categorymappings:
-      - {id: 10, cat: Movies/3D, desc: "3D"}
-      - {id: 9, cat: XXX, desc: "Adultes"}
-      - {id: 1, cat: PC, desc: "APPLICATION"}
-      - {id: 33, cat: PC/Phone-Other, desc: "  Iphone/Ipod/Android"}
-      - {id: 3, cat: PC/0day, desc: "  Linux"}
-      - {id: 32, cat: PC/Mac, desc: "  Mac"}
-      - {id: 4, cat: PC/0day, desc: "  Windows"}
-      - {id: 70, cat: Movies/HD, desc: "BDRIP"}
-      - {id: 69, cat: Movies/BluRay, desc: "Blueray"}
-      - {id: 73, cat: Movies/HD, desc: "BRRIP"}
-      - {id: 22, cat: Movies/SD, desc: "CAM TS SCREENER"}
-      - {id: 39, cat: Movies/DVD, desc: "  R5"}
-      - {id: 13, cat: TV/Anime, desc: "DESSINS ANIMES"}
-      - {id: 48, cat: TV/Anime, desc: "  Animations"}
-      - {id: 47, cat: TV/Anime, desc: "  Mangas"}
-      - {id: 14, cat: TV/Documentary, desc: "DOCUMENTAIRE"}
-      - {id: 52, cat: TV/Documentary, desc: "  EmissionsTV"}
-      - {id: 49, cat: TV/Documentary, desc: "  Tv docs"}
-      - {id: 15, cat: Movies/DVD, desc: "DVDR"}
-      - {id: 16, cat: Movies/SD, desc: "DVDRIP"}
-      - {id: 35, cat: Movies, desc: "  Action"}
-      - {id: 64, cat: Movies, desc: "  Autres"}
-      - {id: 36, cat: Movies, desc: "  Aventure"}
-      - {id: 55, cat: Movies, desc: "  Comédie"}
-      - {id: 37, cat: Movies, desc: "  Drame"}
-      - {id: 38, cat: Movies, desc: "  Fantastique"}
-      - {id: 63, cat: Movies, desc: "  Guerre"}
-      - {id: 72, cat: Movies, desc: "  Historique/Biopic"}
-      - {id: 67, cat: Movies, desc: "  Horreur"}
-      - {id: 65, cat: Movies, desc: "  Thriller"}
-      - {id: 71, cat: Movies, desc: "  Werstern"}
-      - {id: 17, cat: Movies/SD, desc: "DVDRIP VOSTFR"}
-      - {id: 19, cat: Books, desc: "EBOOK"}
-      - {id: 54, cat: Books, desc: "  Journaux"}
-      - {id: 81, cat: Books, desc: "  Magazines"}
-      - {id: 82, cat: Books, desc: "  People"}
-      - {id: 40, cat: Movies/HD, desc: "HD"}
-      - {id: 41, cat: Movies/HD, desc: "  1080p"}
-      - {id: 42, cat: Movies/HD, desc: "  720P"}
-      - {id: 77, cat: Movies/HD, desc: "  HD LIGHT"}
-      - {id: 86, cat: TV/SD, desc: "  HDTV"}
-      - {id: 20, cat: Console/Other, desc: "JEUX"}
-      - {id: 56, cat: Console/NDS, desc: "  DS"}
-      - {id: 57, cat: PC/Games, desc: "  Pc"}
-      - {id: 26, cat: Console/PS3, desc: "  PS3"}
-      - {id: 58, cat: Console/PSP, desc: "  PSP"}
-      - {id: 25, cat: Console/Wii, desc: "  Wii"}
-      - {id: 24, cat: Console/Xbox360, desc: "  Xbox360"}
-      - {id: 21, cat: Audio, desc: "MUSIQUES"}
-      - {id: 29, cat: Audio/Video, desc: "  Clip"}
-      - {id: 68, cat: Audio/Video, desc: "  Concert"}
-      - {id: 31, cat: Audio/Lossless, desc: "  FLAC"}
-      - {id: 30, cat: Audio/MP3, desc: "  mp3"}
-      - {id: 28, cat: Audio/Lossless, desc: "  wave"}
-      - {id: 27, cat: Audio/Other, desc: "  wma"}
-      - {id: 5, cat: TV, desc: "SERIES"}
-      - {id: 79, cat: TV/HD, desc: "  SERIES HD 1080P"}
-      - {id: 80, cat: TV/HD, desc: "  SERIES HD 720p"}
-      - {id: 75, cat: TV, desc: "  TV pack"}
-      - {id: 8, cat: TV, desc: "  vf"}
-      - {id: 6, cat: TV, desc: "  vo"}
-      - {id: 7, cat: TV, desc: "  vost"}
-      - {id: 12, cat: TV/Sport, desc: "SPORTS"}
-      - {id: 61, cat: TV/Sport, desc: "  Autres "}
-      - {id: 45, cat: TV/Sport, desc: "  Catch VF"}
-      - {id: 59, cat: TV/Sport, desc: "  Catch VO"}
-      - {id: 44, cat: TV/Sport, desc: "  Football"}
-      - {id: 60, cat: TV/Sport, desc: "  UFC/MMA"}
-      - {id: 76, cat: TV, desc: "Télévision"}
-      - {id: 78, cat: Movies/WEBDL, desc: "WEBRIP"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: /takelogin.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: table:has(td:contains("Une erreur est survenue"))
-    test:
-      path: browse.php
-
-  download:
-    before:
-      path: "/takethanks.php"
-      method: "post"
-      inputs:
-        torrentid: "{{ re_replace .DownloadUri.AbsolutePath \"^.*download-torrent-(\\d+)/.*$\" \"$1\" }}"
-
-  search:
-    path: browse.php
-    inputs:
-      do: "chercher"
-      keywords: "{{ .Query.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*="/torrent-details-"])
-    fields:
-      download:
-        selector: a[href*="/torrent-details-"]
-        attribute: href
-        filters:
-          - name: replace
-            args: ["torrent-details-", "download-torrent-"]
-      title:
-        selector: a[href*="/torrent-details-"]
-      details:
-        selector: a[href*="/torrent-details-"]
-        attribute: href
-      category:
-        selector: a[href*="/torrent-category-"]
-        attribute: href
-        filters:
-          - name: regexp
-            args: torrent-category-(\d+)
-      size:
-        selector: td:nth-child(4)
-      date:
-        selector: td:nth-child(2) > div > font[color="white"]
-        filters:
-          - name: replace
-            args: ["le ", ""]
-          - name: replace
-            args: [" à ", " "]
-          - name: trim
-            args: "\t"
-          - name: trim
-            args: "\n"
-          - name: append
-            args: " +01:00"
-          - name: dateparse
-            args: "02-01-2006 15:04 -07:00"
-      grabs:
-        selector: td:nth-child(5)
-      seeders:
-        selector: td:nth-child(6)
-      leechers:
-        selector: td:nth-child(7)
-      downloadvolumefactor:
-        case:
-          img[alt^="Free Torrent "]: "0"
-          img[alt^="Silver Torrent "]: "0.5"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
+---
+  site: leparadisdunet
+  name: Le Paradis Du Net
+  language: fr-fr
+  type: semi-private
+  encoding: UTF-8
+  links:
+    - https://le-paradis-du-net.com/
+
+  caps:
+    categorymappings:
+      - {id: 10, cat: Movies/3D, desc: "3D"}
+      - {id: 9, cat: XXX, desc: "Adultes"}
+      - {id: 1, cat: PC, desc: "APPLICATION"}
+      - {id: 33, cat: PC/Phone-Other, desc: "  Iphone/Ipod/Android"}
+      - {id: 3, cat: PC/0day, desc: "  Linux"}
+      - {id: 32, cat: PC/Mac, desc: "  Mac"}
+      - {id: 4, cat: PC/0day, desc: "  Windows"}
+      - {id: 70, cat: Movies/HD, desc: "BDRIP"}
+      - {id: 69, cat: Movies/BluRay, desc: "Blueray"}
+      - {id: 73, cat: Movies/HD, desc: "BRRIP"}
+      - {id: 22, cat: Movies/SD, desc: "CAM TS SCREENER"}
+      - {id: 39, cat: Movies/DVD, desc: "  R5"}
+      - {id: 13, cat: TV/Anime, desc: "DESSINS ANIMES"}
+      - {id: 48, cat: TV/Anime, desc: "  Animations"}
+      - {id: 47, cat: TV/Anime, desc: "  Mangas"}
+      - {id: 14, cat: TV/Documentary, desc: "DOCUMENTAIRE"}
+      - {id: 52, cat: TV/Documentary, desc: "  EmissionsTV"}
+      - {id: 49, cat: TV/Documentary, desc: "  Tv docs"}
+      - {id: 15, cat: Movies/DVD, desc: "DVDR"}
+      - {id: 16, cat: Movies/SD, desc: "DVDRIP"}
+      - {id: 35, cat: Movies, desc: "  Action"}
+      - {id: 64, cat: Movies, desc: "  Autres"}
+      - {id: 36, cat: Movies, desc: "  Aventure"}
+      - {id: 55, cat: Movies, desc: "  Comédie"}
+      - {id: 37, cat: Movies, desc: "  Drame"}
+      - {id: 38, cat: Movies, desc: "  Fantastique"}
+      - {id: 63, cat: Movies, desc: "  Guerre"}
+      - {id: 72, cat: Movies, desc: "  Historique/Biopic"}
+      - {id: 67, cat: Movies, desc: "  Horreur"}
+      - {id: 65, cat: Movies, desc: "  Thriller"}
+      - {id: 71, cat: Movies, desc: "  Werstern"}
+      - {id: 17, cat: Movies/SD, desc: "DVDRIP VOSTFR"}
+      - {id: 19, cat: Books, desc: "EBOOK"}
+      - {id: 54, cat: Books, desc: "  Journaux"}
+      - {id: 81, cat: Books, desc: "  Magazines"}
+      - {id: 82, cat: Books, desc: "  People"}
+      - {id: 40, cat: Movies/HD, desc: "HD"}
+      - {id: 41, cat: Movies/HD, desc: "  1080p"}
+      - {id: 42, cat: Movies/HD, desc: "  720P"}
+      - {id: 77, cat: Movies/HD, desc: "  HD LIGHT"}
+      - {id: 86, cat: TV/SD, desc: "  HDTV"}
+      - {id: 20, cat: Console/Other, desc: "JEUX"}
+      - {id: 56, cat: Console/NDS, desc: "  DS"}
+      - {id: 57, cat: PC/Games, desc: "  Pc"}
+      - {id: 26, cat: Console/PS3, desc: "  PS3"}
+      - {id: 58, cat: Console/PSP, desc: "  PSP"}
+      - {id: 25, cat: Console/Wii, desc: "  Wii"}
+      - {id: 24, cat: Console/Xbox360, desc: "  Xbox360"}
+      - {id: 21, cat: Audio, desc: "MUSIQUES"}
+      - {id: 29, cat: Audio/Video, desc: "  Clip"}
+      - {id: 68, cat: Audio/Video, desc: "  Concert"}
+      - {id: 31, cat: Audio/Lossless, desc: "  FLAC"}
+      - {id: 30, cat: Audio/MP3, desc: "  mp3"}
+      - {id: 28, cat: Audio/Lossless, desc: "  wave"}
+      - {id: 27, cat: Audio/Other, desc: "  wma"}
+      - {id: 5, cat: TV, desc: "SERIES"}
+      - {id: 79, cat: TV/HD, desc: "  SERIES HD 1080P"}
+      - {id: 80, cat: TV/HD, desc: "  SERIES HD 720p"}
+      - {id: 75, cat: TV, desc: "  TV pack"}
+      - {id: 8, cat: TV, desc: "  vf"}
+      - {id: 6, cat: TV, desc: "  vo"}
+      - {id: 7, cat: TV, desc: "  vost"}
+      - {id: 12, cat: TV/Sport, desc: "SPORTS"}
+      - {id: 61, cat: TV/Sport, desc: "  Autres "}
+      - {id: 45, cat: TV/Sport, desc: "  Catch VF"}
+      - {id: 59, cat: TV/Sport, desc: "  Catch VO"}
+      - {id: 44, cat: TV/Sport, desc: "  Football"}
+      - {id: 60, cat: TV/Sport, desc: "  UFC/MMA"}
+      - {id: 76, cat: TV, desc: "Télévision"}
+      - {id: 78, cat: Movies/WEBDL, desc: "WEBRIP"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: /takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: table:has(td:contains("Une erreur est survenue"))
+    test:
+      path: browse.php
+
+  download:
+    before:
+      path: "/takethanks.php"
+      method: "post"
+      inputs:
+        torrentid: "{{ re_replace .DownloadUri.AbsolutePath \"^.*download-torrent-(\\d+)/.*$\" \"$1\" }}"
+
+  search:
+    path: browse.php
+    inputs:
+      do: "chercher"
+      keywords: "{{ .Query.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*="/torrent-details-"])
+    fields:
+      download:
+        selector: a[href*="/torrent-details-"]
+        attribute: href
+        filters:
+          - name: replace
+            args: ["torrent-details-", "download-torrent-"]
+      title:
+        selector: a[href*="/torrent-details-"]
+      details:
+        selector: a[href*="/torrent-details-"]
+        attribute: href
+      category:
+        selector: a[href*="/torrent-category-"]
+        attribute: href
+        filters:
+          - name: regexp
+            args: torrent-category-(\d+)
+      size:
+        selector: td:nth-child(4)
+      date:
+        selector: td:nth-child(2) > div > font[color="white"]
+        filters:
+          - name: replace
+            args: ["le ", ""]
+          - name: replace
+            args: [" à ", " "]
+          - name: trim
+            args: "\t"
+          - name: trim
+            args: "\n"
+          - name: append
+            args: " +01:00"
+          - name: dateparse
+            args: "02-01-2006 15:04 -07:00"
+      grabs:
+        selector: td:nth-child(5)
+      seeders:
+        selector: td:nth-child(6)
+      leechers:
+        selector: td:nth-child(7)
+      downloadvolumefactor:
+        case:
+          img[alt^="Free Torrent "]: "0"
+          img[alt^="Silver Torrent "]: "0.5"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett/Definitions/losslessclub.yml

@@ -1,82 +1,82 @@
----
-  site: losslessclub
-  name: LosslessClub
-  language: ru-ru
-  type: private
-  encoding: windows-1251
-  links:
-    - https://losslessclub.com/
-
-  caps:
-    categories:
-      1: Audio/Lossless
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: takelogin.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: td.embedded > div.error
-    test:
-      path: /browse.php
-      selector: span.bar_user_welcome
-        
-  search:
-    path: /browse.php
-    inputs:
-      search: "{{ .Query.Keywords }}"
-      t: "all"
-    rows:
-      selector: div#releases-table > table > tbody > tr:has(a.browselink)
-    fields:
-      title:
-        selector: a.browselink
-      category:
-        text: "1"
-      details:
-        selector: a.browselink
-        attribute: href
-      download:
-        selector: a[href^="download.php?id="]
-        attribute: href
-      banner|optional:
-        selector: img.thumbnail
-        attribute: src
-      size:
-        selector: td:nth-child(5)
-      grabs|optional:
-        selector: td:nth-child(6) br + span
-      seeders:
-        selector: td:nth-child(6)
-        remove: br + span
-        filters:
-          - name: regexp
-            args: "([\\.\\d]+)\\s+\\|"
-      leechers:
-        selector: td:nth-child(6)
-        remove: br + span
-        filters:
-          - name: regexp
-            args: "\\|\\s*([\\.\\d]+)"
-      date:
-        selector: td:nth-child(7)
-        remove: a, i
-        filters:
-          - name: replace
-            args: ["by", ""]
-          - name: dateparse
-            args: "2/01/06"
-      downloadvolumefactor:
-        case:
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
-      description:
-        selector: div.tag_list_browse
+---
+  site: losslessclub
+  name: LosslessClub
+  language: ru-ru
+  type: private
+  encoding: windows-1251
+  links:
+    - https://losslessclub.com/
+
+  caps:
+    categories:
+      1: Audio/Lossless
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: td.embedded > div.error
+    test:
+      path: /browse.php
+      selector: span.bar_user_welcome
+        
+  search:
+    path: /browse.php
+    inputs:
+      search: "{{ .Query.Keywords }}"
+      t: "all"
+    rows:
+      selector: div#releases-table > table > tbody > tr:has(a.browselink)
+    fields:
+      title:
+        selector: a.browselink
+      category:
+        text: "1"
+      details:
+        selector: a.browselink
+        attribute: href
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      banner|optional:
+        selector: img.thumbnail
+        attribute: src
+      size:
+        selector: td:nth-child(5)
+      grabs|optional:
+        selector: td:nth-child(6) br + span
+      seeders:
+        selector: td:nth-child(6)
+        remove: br + span
+        filters:
+          - name: regexp
+            args: "([\\.\\d]+)\\s+\\|"
+      leechers:
+        selector: td:nth-child(6)
+        remove: br + span
+        filters:
+          - name: regexp
+            args: "\\|\\s*([\\.\\d]+)"
+      date:
+        selector: td:nth-child(7)
+        remove: a, i
+        filters:
+          - name: replace
+            args: ["by", ""]
+          - name: dateparse
+            args: "2/01/06"
+      downloadvolumefactor:
+        case:
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"
+      description:
+        selector: div.tag_list_browse

src/Jackett/Definitions/mteamtp.yml

@@ -1,132 +1,132 @@
----
-  site: mteamtp
-  name: M-Team - TP
-  description: "A chinese tracker"
-  language: zh-cn
-  type: private
-  encoding: UTF-8
-  links:
-    - https://tp.m-team.cc
-
-  caps:
-    categorymappings:
-      - {id: 401, cat: Movies/SD, desc: "Movie(電影)/SD"}
-      - {id: 419, cat: Movies/HD, desc: "Movie(電影)/HD"}
-      - {id: 420, cat: Movies/DVD, desc: "Movie(電影)/DVDiSo"}
-      - {id: 421, cat: Movies/BluRay, desc: "Movie(電影)/Blu-Ray"}
-      - {id: 439, cat: Movies/Other, desc: "Movie(電影)/Remux"}
-      - {id: 403, cat: TV/SD, desc: "TV Series(影劇/綜藝)/SD"}
-      - {id: 402, cat: TV/HD, desc: "TV Series(影劇/綜藝)/HD"}
-      - {id: 435, cat: TV/SD, desc: "TV Series(影劇/綜藝)/DVDiSo"}
-      - {id: 438, cat: TV/HD, desc: "TV Series(影劇/綜藝)/BD"}
-      - {id: 404, cat: TV/Documentary, desc: "紀錄教育"}
-      - {id: 405, cat: TV/Anime, desc: "Anime(動畫)"}
-      - {id: 406, cat: Audio/Video, desc: "MV(演唱)"}
-      - {id: 408, cat: Audio/Other, desc: "Music(AAC/ALAC)"}
-      - {id: 434, cat: Audio, desc: "Music(無損)"}
-      - {id: 407, cat: TV/Sport, desc: "Sports(運動)"}
-      - {id: 422, cat: PC/0day, desc: "Software(軟體)"}
-      - {id: 423, cat: PC/Games, desc: "PCGame(PC遊戲)"}
-      - {id: 427, cat: Books, desc: "eBook(電子書)"}
-      - {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 }}"
-    error:
-      - selector: td.embedded:has(h2:contains("failed"))
-    test:
-      path: /torrents.php
-
-  ratio:
-    path: /torrents.php
-    selector: table#info_block
-    filters:
-      - name: regexp
-        args: "Ratio:\\s(.*?)\\s\\s"
-
-  search:
-    path: /torrents.php
-    method: post
-    inputs:
-      $raw: "{{range .Categories}}cat{{.}}=1&{{end}}"
-      search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-      incldead: "0"
-      spstate: "0"
-      inclbookmarked: "0"
-      search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
-      search_mode: "0"
-    rows:
-      selector: table.torrents > tbody > tr:has(table.torrentname)
-    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
-      banner:
-        selector: img[alt="torrent thumbnail"]
-        attribute: src
-        filters:
-          - name: replace
-            args: ["pic/nopic.jpg", ""]
-      size:
-        selector: td.rowfollow:nth-child(5)
-      grabs:
-        selector: td.rowfollow:nth-child(8)
-      seeders:
-        selector: td.rowfollow:nth-child(6)
-      leechers:
-        selector: td.rowfollow:nth-child(7)
-      date:
-        selector: td.rowfollow:nth-child(4):not(:has(span))
-        optional: true
-        filters:
-          - name: append
-            args: " +08:00"
-          - name: dateparse
-            args: "2006-01-0215:04:05 -07:00"
-      date:
-        selector: td.rowfollow:nth-child(4) > span[title]
-        optional: true
-        attribute: title
-        filters:
-          - name: append
-            args: " +08:00"
-          - name: dateparse
-            args: "2006-01-02 15:04:05 -07:00"
-      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)
+---
+  site: mteamtp
+  name: M-Team - TP
+  description: "A chinese tracker"
+  language: zh-cn
+  type: private
+  encoding: UTF-8
+  links:
+    - https://tp.m-team.cc
+
+  caps:
+    categorymappings:
+      - {id: 401, cat: Movies/SD, desc: "Movie(電影)/SD"}
+      - {id: 419, cat: Movies/HD, desc: "Movie(電影)/HD"}
+      - {id: 420, cat: Movies/DVD, desc: "Movie(電影)/DVDiSo"}
+      - {id: 421, cat: Movies/BluRay, desc: "Movie(電影)/Blu-Ray"}
+      - {id: 439, cat: Movies/Other, desc: "Movie(電影)/Remux"}
+      - {id: 403, cat: TV/SD, desc: "TV Series(影劇/綜藝)/SD"}
+      - {id: 402, cat: TV/HD, desc: "TV Series(影劇/綜藝)/HD"}
+      - {id: 435, cat: TV/SD, desc: "TV Series(影劇/綜藝)/DVDiSo"}
+      - {id: 438, cat: TV/HD, desc: "TV Series(影劇/綜藝)/BD"}
+      - {id: 404, cat: TV/Documentary, desc: "紀錄教育"}
+      - {id: 405, cat: TV/Anime, desc: "Anime(動畫)"}
+      - {id: 406, cat: Audio/Video, desc: "MV(演唱)"}
+      - {id: 408, cat: Audio/Other, desc: "Music(AAC/ALAC)"}
+      - {id: 434, cat: Audio, desc: "Music(無損)"}
+      - {id: 407, cat: TV/Sport, desc: "Sports(運動)"}
+      - {id: 422, cat: PC/0day, desc: "Software(軟體)"}
+      - {id: 423, cat: PC/Games, desc: "PCGame(PC遊戲)"}
+      - {id: 427, cat: Books, desc: "eBook(電子書)"}
+      - {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 }}"
+    error:
+      - selector: td.embedded:has(h2:contains("failed"))
+    test:
+      path: /torrents.php
+
+  ratio:
+    path: /torrents.php
+    selector: table#info_block
+    filters:
+      - name: regexp
+        args: "Ratio:\\s(.*?)\\s\\s"
+
+  search:
+    path: /torrents.php
+    method: post
+    inputs:
+      $raw: "{{range .Categories}}cat{{.}}=1&{{end}}"
+      search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+      incldead: "0"
+      spstate: "0"
+      inclbookmarked: "0"
+      search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
+      search_mode: "0"
+    rows:
+      selector: table.torrents > tbody > tr:has(table.torrentname)
+    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
+      banner:
+        selector: img[alt="torrent thumbnail"]
+        attribute: src
+        filters:
+          - name: replace
+            args: ["pic/nopic.jpg", ""]
+      size:
+        selector: td.rowfollow:nth-child(5)
+      grabs:
+        selector: td.rowfollow:nth-child(8)
+      seeders:
+        selector: td.rowfollow:nth-child(6)
+      leechers:
+        selector: td.rowfollow:nth-child(7)
+      date:
+        selector: td.rowfollow:nth-child(4):not(:has(span))
+        optional: true
+        filters:
+          - name: append
+            args: " +08:00"
+          - name: dateparse
+            args: "2006-01-0215:04:05 -07:00"
+      date:
+        selector: td.rowfollow:nth-child(4) > span[title]
+        optional: true
+        attribute: title
+        filters:
+          - name: append
+            args: " +08:00"
+          - name: dateparse
+            args: "2006-01-02 15:04:05 -07:00"
+      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/Definitions/myspleen.yml

@@ -1,99 +1,99 @@
----
-  site: myspleen
-  name: MySpleen
-  language: en-us
-  type: private
-  encoding: UTF-8
-  links:
-    - https://www.myspleen.org
-
-  caps:
-    categorymappings:
-      - {id: 31, cat: TV, desc: "Adult Swim"}
-      - {id: 30, cat: TV, desc: "Animation"}
-      - {id: 25, cat: TV, desc: "Cartoon Network"}
-      - {id: 3, cat: TV, desc: "Comedy"}
-      - {id: 26, cat: TV, desc: "Comedy Central"}
-      - {id: 24, cat: TV, desc: "MST3K"}
-      - {id: 28, cat: TV, desc: "MTV"}
-      - {id: 29, cat: TV, desc: "Nick"}
-      - {id: 20, cat: Other, desc: "Other"}
-      - {id: 32, cat: TV, desc: "Star Wars"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: /takelogin.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      returnto: "/"
-    error:
-      - selector: div#content:has(h2:contains("Login Failed"))
-    test:
-      path: /browse.php
-      selector: span.key:contains("Ratio") + span.value
-
-  ratio:
-    path: /browse.php
-    selector: span.key:contains("Ratio") + span.value
-
-  search:
-    path: /browse.php
-    method: post
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
-      incldead: "1"
-      title: "0"
-    rows:
-      selector: table#main-torrents > tbody > tr
-    fields:
-      title:
-        selector: td.tor-name > a
-        attribute: title
-      category:
-        selector: td[class^="cat-"] > a
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      details:
-        selector: td.tor-name > a
-        attribute: href      
-      download:
-        selector: td.tor-down > a
-        attribute: href
-      files:
-        selector: td:nth-child(5)
-      size:
-        selector: td:nth-child(8)
-      grabs:
-        selector: td:nth-child(9)
-        filters:
-        - name: regexp
-          args: "(\\d+)"
-      seeders:
-        selector: td:nth-child(10)
-        filters:
-        - name: regexp
-          args: "^(\\d+)"
-      leechers:
-        selector: td:nth-child(11)
-        filters:
-        - name: regexp
-          args: "^(\\d+)"
-      date:
-        selector: td:nth-child(7)
-      downloadvolumefactor:
-        case:
-          span.star: "0"
-          span.fltime: "0"
-          ":root li[id=\"alert-fl\"][class=\"alert\"]:contains(\"Freeleech ends in \")": 0
-          "*": "1"
-      uploadvolumefactor:
-        case:
+---
+  site: myspleen
+  name: MySpleen
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://www.myspleen.org
+
+  caps:
+    categorymappings:
+      - {id: 31, cat: TV, desc: "Adult Swim"}
+      - {id: 30, cat: TV, desc: "Animation"}
+      - {id: 25, cat: TV, desc: "Cartoon Network"}
+      - {id: 3, cat: TV, desc: "Comedy"}
+      - {id: 26, cat: TV, desc: "Comedy Central"}
+      - {id: 24, cat: TV, desc: "MST3K"}
+      - {id: 28, cat: TV, desc: "MTV"}
+      - {id: 29, cat: TV, desc: "Nick"}
+      - {id: 20, cat: Other, desc: "Other"}
+      - {id: 32, cat: TV, desc: "Star Wars"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: /takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      returnto: "/"
+    error:
+      - selector: div#content:has(h2:contains("Login Failed"))
+    test:
+      path: /browse.php
+      selector: span.key:contains("Ratio") + span.value
+
+  ratio:
+    path: /browse.php
+    selector: span.key:contains("Ratio") + span.value
+
+  search:
+    path: /browse.php
+    method: post
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      incldead: "1"
+      title: "0"
+    rows:
+      selector: table#main-torrents > tbody > tr
+    fields:
+      title:
+        selector: td.tor-name > a
+        attribute: title
+      category:
+        selector: td[class^="cat-"] > a
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      details:
+        selector: td.tor-name > a
+        attribute: href      
+      download:
+        selector: td.tor-down > a
+        attribute: href
+      files:
+        selector: td:nth-child(5)
+      size:
+        selector: td:nth-child(8)
+      grabs:
+        selector: td:nth-child(9)
+        filters:
+        - name: regexp
+          args: "(\\d+)"
+      seeders:
+        selector: td:nth-child(10)
+        filters:
+        - name: regexp
+          args: "^(\\d+)"
+      leechers:
+        selector: td:nth-child(11)
+        filters:
+        - name: regexp
+          args: "^(\\d+)"
+      date:
+        selector: td:nth-child(7)
+      downloadvolumefactor:
+        case:
+          span.star: "0"
+          span.fltime: "0"
+          ":root li[id=\"alert-fl\"][class=\"alert\"]:contains(\"Freeleech ends in \")": 0
+          "*": "1"
+      uploadvolumefactor:
+        case:
           "*": "1"

src/Jackett/Definitions/nachtwerk.yml

@@ -1,152 +1,152 @@
----
-  site: nachtwerk
-  name: Nachtwerk
-  language: de-de
-  type: private
-  encoding: ISO-8859-15
-  links:
-    - https://nwtracker.com/
-
-  caps:
-    categorymappings:
-      - {id: 75, cat: Movies/3D, desc: "Filme - 3D"}
-      - {id: 34, cat: Movies, desc: "Filme - Xvid / x264"}
-      - {id: 55, cat: Movies/BluRay, desc: "Filme - Blu-Ray"}
-      - {id: 20, cat: Movies/DVD, desc: "Filme - DVD-R"}
-      - {id: 71, cat: Movies/HD, desc: "Filme - HD 1080p"}
-      - {id: 70, cat: Movies/HD, desc: "Filme - HD 720p"}
-      - {id: 35, cat: Movies/Foreign, desc: "Filme - Inter"}
-      - {id: 104, cat: Movies/HD, desc: "Filme - UHD"}
-      - {id: 107, cat: Movies/Other, desc: "Filme - Remux"}
-      - {id: 7, cat: TV/SD, desc: "Serien - Xvid / x264"}
-      - {id: 72, cat: TV/HD, desc: "Serien - HD"}
-      - {id: 82, cat: TV/Foreign, desc: "Serien - Inter"}
-      - {id: 69, cat: TV, desc: "Serien - Pack's"}
-      - {id: 42, cat: TV, desc: "Serien - TV Show"}
-      - {id: 105, cat: TV/HD, desc: "Serien - UHD"}
-      - {id: 51, cat: XXX, desc: "XXX - Xvid / x264"}
-      - {id: 73, cat: XXX, desc: "XXX - HD"}
-      - {id: 84, cat: XXX, desc: "XXX - Pack's"}
-      - {id: 85, cat: XXX, desc: "XXX - Sonstiges"}
-      - {id: 102, cat: XXX, desc: "XXX - Hentai"}
-      - {id: 103, cat: XXX, desc: "XXX - UHD"}
-      - {id: 6, cat: Audio/MP3, desc: "Audio - MP3"}
-      - {id: 74, cat: Audio/Lossless, desc: "Audio - Flac"}
-      - {id: 86, cat: Audio/Video, desc: "Audio - Videos"}
-      - {id: 24, cat: Audio/Audiobook, desc: "Audio - Hörspiel/Hörbuch"}
-      - {id: 93, cat: PC/Mac, desc: "Appz - Mac"}
-      - {id: 67, cat: PC/0day, desc: "Appz - Windows"}
-      - {id: 31, cat: PC/Phone-Other, desc: "Appz - Handy"}
-      - {id: 81, cat: PC, desc: "Appz - Sonstiges"}
-      - {id: 25, cat: TV/Documentary, desc: "Dokus - Xvid / x264"}
-      - {id: 76, cat: TV/Documentary, desc: "Dokus - HD"}
-      - {id: 99, cat: TV/Documentary, desc: "Dokus - Pack's"}
-      - {id: 100, cat: TV/Documentary, desc: "Dokus - 3D"}
-      - {id: 106, cat: TV/Documentary, desc: "Dokus - UHD"}
-      - {id: 90, cat: Console/PS3, desc: "Games - PSX"}
-      - {id: 56, cat: Console/Wii, desc: "Games - WII"}
-      - {id: 43, cat: Console/Xbox, desc: "Games - XboX"}
-      - {id: 4, cat: PC/Games, desc: "Games - PC"}
-      - {id: 88, cat: Console/NDS, desc: "Games - xDS"}
-      - {id: 91, cat: PC/Mac, desc: "Games - Mac"}
-      - {id: 92, cat: Console, desc: "Games - Sonstiges"}
-      - {id: 23, cat: TV/Anime, desc: "Anime - Xvid / x264"}
-      - {id: 80, cat: TV/Anime, desc: "Anime - HD"}
-      - {id: 98, cat: TV/Anime, desc: "Anime - Serien"}
-      - {id: 94, cat: Books/Magazines, desc: "eBooks - Magazine/Zeitungen"}
-      - {id: 95, cat: Books/Comics, desc: "eBooks - Comics"}
-      - {id: 30, cat: Books, desc: "eBooks - Bücher"}
-      - {id: 96, cat: TV/Sport, desc: "Sport - Wrestling"}
-      - {id: 97, cat: TV/Sport, desc: "Sport - Fussball"}
-      - {id: 45, cat: TV/Sport, desc: "Sport - Sonstiges"}
-      - {id: 9, cat: Other, desc: "Diverses - Sonstiges"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: takelogin.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: td.embedded:has(h2:contains("failed"))
-    test:
-      path: /browse.php
-
-  download:
-    selector: a[href^="download.php?torrent="]
-      
-  search:
-    path: /browse.php
-    method: post
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
-      incldead: "1"
-      spstate: "0"
-      inclbookmarked: "0"
-      search_area: "0"
-      search_mode: "0"
-    rows:
-      selector: table.tableinborder[cellspacing="1"][cellpadding="0"] > tbody > tr
-    fields:
-      title:
-        selector: a[href^="details.php?id="]
-        filters:
-          - name: replace
-            args: ["[NW] ", ""]
-      category:
-        selector: a[href^="browse.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      details:
-        selector: a[href^="details.php?id="]
-        attribute: href    
-      download:
-        selector: a[href^="details.php?id="]
-        attribute: href
-        filters:  
-          - name: replace
-            args: ["details.php?id=", "thanks1.php?torrentid="]
-      banner:
-        selector: a[onmouseover][href^="details.php?id="]
-        attribute: onmouseover
-        filters:
-          - name: regexp
-            args: "src=.*'\\);"
-      size:
-        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(1) > b:nth-child(1)
-        filters:
-          - name: replace
-            args: [".", ""]
-          - name: replace
-            args: [",", "."]
-      files:
-        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(1) > b:nth-child(2)
-      grabs:
-        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(3) > b:nth-child(1)
-      seeders:
-        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(2) > b:nth-child(1)
-      leechers:
-        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(2) > b:nth-child(3)
-      date:
-        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(5)
-        filters:
-          - name: replace
-            args: ["\xA0", " "]
-          - name: append
-            args: " +01:00"
-          - name: dateparse
-            args: "02.01.2006 15:04:05 -07:00"
-      downloadvolumefactor:
-        case:
-          img[src="pic/onlyuploadd.gif"]: "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
+---
+  site: nachtwerk
+  name: Nachtwerk
+  language: de-de
+  type: private
+  encoding: ISO-8859-15
+  links:
+    - https://nwtracker.com/
+
+  caps:
+    categorymappings:
+      - {id: 75, cat: Movies/3D, desc: "Filme - 3D"}
+      - {id: 34, cat: Movies, desc: "Filme - Xvid / x264"}
+      - {id: 55, cat: Movies/BluRay, desc: "Filme - Blu-Ray"}
+      - {id: 20, cat: Movies/DVD, desc: "Filme - DVD-R"}
+      - {id: 71, cat: Movies/HD, desc: "Filme - HD 1080p"}
+      - {id: 70, cat: Movies/HD, desc: "Filme - HD 720p"}
+      - {id: 35, cat: Movies/Foreign, desc: "Filme - Inter"}
+      - {id: 104, cat: Movies/HD, desc: "Filme - UHD"}
+      - {id: 107, cat: Movies/Other, desc: "Filme - Remux"}
+      - {id: 7, cat: TV/SD, desc: "Serien - Xvid / x264"}
+      - {id: 72, cat: TV/HD, desc: "Serien - HD"}
+      - {id: 82, cat: TV/Foreign, desc: "Serien - Inter"}
+      - {id: 69, cat: TV, desc: "Serien - Pack's"}
+      - {id: 42, cat: TV, desc: "Serien - TV Show"}
+      - {id: 105, cat: TV/HD, desc: "Serien - UHD"}
+      - {id: 51, cat: XXX, desc: "XXX - Xvid / x264"}
+      - {id: 73, cat: XXX, desc: "XXX - HD"}
+      - {id: 84, cat: XXX, desc: "XXX - Pack's"}
+      - {id: 85, cat: XXX, desc: "XXX - Sonstiges"}
+      - {id: 102, cat: XXX, desc: "XXX - Hentai"}
+      - {id: 103, cat: XXX, desc: "XXX - UHD"}
+      - {id: 6, cat: Audio/MP3, desc: "Audio - MP3"}
+      - {id: 74, cat: Audio/Lossless, desc: "Audio - Flac"}
+      - {id: 86, cat: Audio/Video, desc: "Audio - Videos"}
+      - {id: 24, cat: Audio/Audiobook, desc: "Audio - Hörspiel/Hörbuch"}
+      - {id: 93, cat: PC/Mac, desc: "Appz - Mac"}
+      - {id: 67, cat: PC/0day, desc: "Appz - Windows"}
+      - {id: 31, cat: PC/Phone-Other, desc: "Appz - Handy"}
+      - {id: 81, cat: PC, desc: "Appz - Sonstiges"}
+      - {id: 25, cat: TV/Documentary, desc: "Dokus - Xvid / x264"}
+      - {id: 76, cat: TV/Documentary, desc: "Dokus - HD"}
+      - {id: 99, cat: TV/Documentary, desc: "Dokus - Pack's"}
+      - {id: 100, cat: TV/Documentary, desc: "Dokus - 3D"}
+      - {id: 106, cat: TV/Documentary, desc: "Dokus - UHD"}
+      - {id: 90, cat: Console/PS3, desc: "Games - PSX"}
+      - {id: 56, cat: Console/Wii, desc: "Games - WII"}
+      - {id: 43, cat: Console/Xbox, desc: "Games - XboX"}
+      - {id: 4, cat: PC/Games, desc: "Games - PC"}
+      - {id: 88, cat: Console/NDS, desc: "Games - xDS"}
+      - {id: 91, cat: PC/Mac, desc: "Games - Mac"}
+      - {id: 92, cat: Console, desc: "Games - Sonstiges"}
+      - {id: 23, cat: TV/Anime, desc: "Anime - Xvid / x264"}
+      - {id: 80, cat: TV/Anime, desc: "Anime - HD"}
+      - {id: 98, cat: TV/Anime, desc: "Anime - Serien"}
+      - {id: 94, cat: Books/Magazines, desc: "eBooks - Magazine/Zeitungen"}
+      - {id: 95, cat: Books/Comics, desc: "eBooks - Comics"}
+      - {id: 30, cat: Books, desc: "eBooks - Bücher"}
+      - {id: 96, cat: TV/Sport, desc: "Sport - Wrestling"}
+      - {id: 97, cat: TV/Sport, desc: "Sport - Fussball"}
+      - {id: 45, cat: TV/Sport, desc: "Sport - Sonstiges"}
+      - {id: 9, cat: Other, desc: "Diverses - Sonstiges"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: td.embedded:has(h2:contains("failed"))
+    test:
+      path: /browse.php
+
+  download:
+    selector: a[href^="download.php?torrent="]
+      
+  search:
+    path: /browse.php
+    method: post
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      incldead: "1"
+      spstate: "0"
+      inclbookmarked: "0"
+      search_area: "0"
+      search_mode: "0"
+    rows:
+      selector: table.tableinborder[cellspacing="1"][cellpadding="0"] > tbody > tr
+    fields:
+      title:
+        selector: a[href^="details.php?id="]
+        filters:
+          - name: replace
+            args: ["[NW] ", ""]
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href    
+      download:
+        selector: a[href^="details.php?id="]
+        attribute: href
+        filters:  
+          - name: replace
+            args: ["details.php?id=", "thanks1.php?torrentid="]
+      banner:
+        selector: a[onmouseover][href^="details.php?id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "src=.*'\\);"
+      size:
+        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(1) > b:nth-child(1)
+        filters:
+          - name: replace
+            args: [".", ""]
+          - name: replace
+            args: [",", "."]
+      files:
+        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(1) > b:nth-child(2)
+      grabs:
+        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(3) > b:nth-child(1)
+      seeders:
+        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(2) > b:nth-child(1)
+      leechers:
+        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(2) > b:nth-child(3)
+      date:
+        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(5)
+        filters:
+          - name: replace
+            args: ["\xA0", " "]
+          - name: append
+            args: " +01:00"
+          - name: dateparse
+            args: "02.01.2006 15:04:05 -07:00"
+      downloadvolumefactor:
+        case:
+          img[src="pic/onlyuploadd.gif"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett/Definitions/nethd.yml

@@ -1,99 +1,99 @@
----
-  site: nethd
-  name: NetHD
-  description: "A vietnamese tracker"
-  language: vi-vn
-  type: semi-private
-  encoding: UTF-8
-  links:
-    - http://nethd.org/
-
-  caps:
-    categorymappings:
-      - {id: 401, cat: Movies, desc: "Movies"}
-      - {id: 402, cat: Audio, desc: "Music"}
-      - {id: 403, cat: PC/Games, desc: "Game"}
-      - {id: 404, cat: PC, desc: "Software"}
-      - {id: 405, cat: Other, desc: "Image"}
-      - {id: 406, cat: Books, desc: "Book"}
-
-    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: form#loginform > span.warning
-    test:
-      path: /torrents.php
-
-  ratio:
-    path: /torrents.php
-    selector: div.user-info-extend > dl > dt:contains("Ratio:") + dd
-  search:
-    path: /torrents.php
-    method: post
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-      search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
-      search_mode: 0
-      spstate: 0
-      inclbookmarked: 0
-      incldead: 1
-    rows:
-      selector: tr:has(td.name)
-    fields:
-      title:
-        selector: td.name > div > a.poster-preview[title]
-        attribute: title
-      category:
-        selector: td.category > a
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      details:
-        selector: td.name > div > a.poster-preview[title]
-        attribute: href
-      comments:
-        selector: a[href*="#comments"]
-        attribute: href
-      download:
-        selector: a.bookmark[onclick]
-        attribute: onclick
-        filters:
-          - name: replace
-            args: [",false)", ""]
-          - name: replace
-            args: ["return bookmark(", "download.php?id="]
-      size:
-        selector: td:nth-child(5)
-      seeders:
-        selector: td:nth-child(6)
-      leechers:
-        selector: td:nth-child(7)
-      grabs:
-        selector: td:nth-child(8)
-      date:
-        selector: td:nth-child(4)
-        filters:
-          - name: append
-            args: " +0700"
-          - name: dateparse
-            args: "2006-01-0215:04:05 -0700"
-      downloadvolumefactor:
-        case:
-          "span.label:contains(\"Free\")": "0"
-          "span.label:contains(\"50%\")": "0.5"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "span.label:contains(\"2X\")": "2"
+---
+  site: nethd
+  name: NetHD
+  description: "A vietnamese tracker"
+  language: vi-vn
+  type: semi-private
+  encoding: UTF-8
+  links:
+    - http://nethd.org/
+
+  caps:
+    categorymappings:
+      - {id: 401, cat: Movies, desc: "Movies"}
+      - {id: 402, cat: Audio, desc: "Music"}
+      - {id: 403, cat: PC/Games, desc: "Game"}
+      - {id: 404, cat: PC, desc: "Software"}
+      - {id: 405, cat: Other, desc: "Image"}
+      - {id: 406, cat: Books, desc: "Book"}
+
+    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: form#loginform > span.warning
+    test:
+      path: /torrents.php
+
+  ratio:
+    path: /torrents.php
+    selector: div.user-info-extend > dl > dt:contains("Ratio:") + dd
+  search:
+    path: /torrents.php
+    method: post
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+      search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
+      search_mode: 0
+      spstate: 0
+      inclbookmarked: 0
+      incldead: 1
+    rows:
+      selector: tr:has(td.name)
+    fields:
+      title:
+        selector: td.name > div > a.poster-preview[title]
+        attribute: title
+      category:
+        selector: td.category > a
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      details:
+        selector: td.name > div > a.poster-preview[title]
+        attribute: href
+      comments:
+        selector: a[href*="#comments"]
+        attribute: href
+      download:
+        selector: a.bookmark[onclick]
+        attribute: onclick
+        filters:
+          - name: replace
+            args: [",false)", ""]
+          - name: replace
+            args: ["return bookmark(", "download.php?id="]
+      size:
+        selector: td:nth-child(5)
+      seeders:
+        selector: td:nth-child(6)
+      leechers:
+        selector: td:nth-child(7)
+      grabs:
+        selector: td:nth-child(8)
+      date:
+        selector: td:nth-child(4)
+        filters:
+          - name: append
+            args: " +0700"
+          - name: dateparse
+            args: "2006-01-0215:04:05 -0700"
+      downloadvolumefactor:
+        case:
+          "span.label:contains(\"Free\")": "0"
+          "span.label:contains(\"50%\")": "0.5"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "span.label:contains(\"2X\")": "2"
           "*": "1"

src/Jackett/Definitions/newretro.yml

@@ -1,121 +1,121 @@
----
-  site: newretro
-  name: The New Retro
-  description: "A German gerneral tracker"
-  language: de-de
-  type: private
-  encoding: windows-1252
-  links:
-    - http://new-retro.eu/
-
-  caps:
-    categorymappings:
-      - {id: 101, cat: TV/Anime, desc: "Filme - Animie"}
-      - {id: 102, cat: Movies/BluRay, desc: "Filme - Bluray"}
-      - {id: 131, cat: Movies/Other, desc: "Filme - Bollywood"}
-      - {id: 103, cat: Movies/DVD, desc: "Filme - DVD"}
-      - {id: 104, cat: Movies/DVD, desc: "Filme - DVD-R"}
-      - {id: 132, cat: Movies/DVD, desc: "Filme - HD2DVD"}
-      - {id: 130, cat: Movies, desc: "Filme - Klassiker"}
-      - {id: 105, cat: Movies, desc: "Filme - x264"}
-      - {id: 106, cat: Movies, desc: "Filme - XviD / DivX"}
-      - {id: 69, cat: XXX, desc: " XXX"}
-      - {id: 124, cat: Audio, desc: "Musik - Alben"}
-      - {id: 122, cat: Audio/Audiobook, desc: "Musik - Hörbuch"}
-      - {id: 123, cat: Audio, desc: "Musik - Mixe"}
-      - {id: 133, cat: Audio/MP3, desc: "Musik - MP3"}
-      - {id: 125, cat: Audio/Video, desc: "Musik - Video"}
-      - {id: 113, cat: PC, desc: "Programme - Linux"}
-      - {id: 114, cat: PC/Mac, desc: "Programme - Mac"}
-      - {id: 115, cat: PC, desc: "Programme - Windows"}
-      - {id: 117, cat: TV, desc: "Allgemein - Serien"}
-      - {id: 116, cat: TV/Documentary, desc: "Serien - Dokus"}
-      - {id: 118, cat: TV/Sport, desc: "Serien - Sport"}
-      - {id: 119, cat: Other, desc: "Bilder"}
-      - {id: 120, cat: Books, desc: "Ebook"}
-      - {id: 127, cat: Other, desc: "Für Unsere kleinsten"}
-      - {id: 121, cat: Other, desc: "Handy Stuff"}
-      - {id: 129, cat: Other, desc: "Sonstiges"}
-      - {id: 109, cat: Other, desc: "Spiele - Handy"}
-      - {id: 112, cat: Console, desc: "Spiele - Konsolen"}
-      - {id: 111, cat: PC/Games, desc: "Spiele - Mac / Linux"}
-      - {id: 110, cat: PC/Games, desc: "Spiele - PC"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: /takelogin.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      returnto: "/"
-    error:
-    - selector: table.tableinborder:contains("Anmeldung Gescheitert!") > tbody > tr > td.tablea
-    test:
-      path: /usercp.php
-
-  ratio:
-    path: /usercp.php
-    selector: div#lmtd table > tbody > tr:contains("Ratio:") > td:nth-child(2)
-    filters:
-      - name: replace
-        args: [".", ""]
-      - name: replace
-        args: [",", "."]
-
-  search:
-    path: /browse.php
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
-      showsearch: "1"
-      orderby: "added"
-      sort: "desc"
-      incldead: "1"
-
-    rows:
-      selector: table.tableinborder[summary] > tbody > tr
-      filters:
-        - name: andmatch
-    fields:
-      download:
-        selector: a[href^="download.php?torrent="]
-        attribute: href
-      title:
-        selector: a[href^="details.php?id="]:has(b)
-      category:
-        selector: a[href^="browse.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      comments:
-        selector: td.tablea > table > tbody > tr:nth-child(2) > td:nth-child(4) > a
-        attribute: href
-      size:
-        selector: td.tablea > table > tbody > tr:nth-child(2) > td:nth-child(1) > b:nth-child(1)
-      grabs:
-        selector: td.tablea > table > tbody > tr:nth-child(2) > td:nth-child(3) > b
-      files:
-        selector: td.tablea > table > tbody > tr:nth-child(2) > td:nth-child(1) > b:nth-child(2)
-      seeders:
-        selector: td.tablea > table > tbody > tr:nth-child(2) > td:nth-child(2) > b:nth-child(1)
-      leechers:
-        selector: td.tablea > table > tbody > tr:nth-child(2) > td:nth-child(2) > b:nth-child(3)
-      date:
-        selector: td.tablea > table > tbody > tr:nth-child(2) > td:nth-child(5)
-        filters:
-          - name: replace
-            args: ["\u00a0", " "]
-          - name: dateparse
-            args: "02.01.2006 15:04:05"
-      downloadvolumefactor:
-        case:
-          "font[color=\"red\"]:contains(\"Only Upload\")": "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
+---
+  site: newretro
+  name: The New Retro
+  description: "A German gerneral tracker"
+  language: de-de
+  type: private
+  encoding: windows-1252
+  links:
+    - http://new-retro.eu/
+
+  caps:
+    categorymappings:
+      - {id: 101, cat: TV/Anime, desc: "Filme - Animie"}
+      - {id: 102, cat: Movies/BluRay, desc: "Filme - Bluray"}
+      - {id: 131, cat: Movies/Other, desc: "Filme - Bollywood"}
+      - {id: 103, cat: Movies/DVD, desc: "Filme - DVD"}
+      - {id: 104, cat: Movies/DVD, desc: "Filme - DVD-R"}
+      - {id: 132, cat: Movies/DVD, desc: "Filme - HD2DVD"}
+      - {id: 130, cat: Movies, desc: "Filme - Klassiker"}
+      - {id: 105, cat: Movies, desc: "Filme - x264"}
+      - {id: 106, cat: Movies, desc: "Filme - XviD / DivX"}
+      - {id: 69, cat: XXX, desc: " XXX"}
+      - {id: 124, cat: Audio, desc: "Musik - Alben"}
+      - {id: 122, cat: Audio/Audiobook, desc: "Musik - Hörbuch"}
+      - {id: 123, cat: Audio, desc: "Musik - Mixe"}
+      - {id: 133, cat: Audio/MP3, desc: "Musik - MP3"}
+      - {id: 125, cat: Audio/Video, desc: "Musik - Video"}
+      - {id: 113, cat: PC, desc: "Programme - Linux"}
+      - {id: 114, cat: PC/Mac, desc: "Programme - Mac"}
+      - {id: 115, cat: PC, desc: "Programme - Windows"}
+      - {id: 117, cat: TV, desc: "Allgemein - Serien"}
+      - {id: 116, cat: TV/Documentary, desc: "Serien - Dokus"}
+      - {id: 118, cat: TV/Sport, desc: "Serien - Sport"}
+      - {id: 119, cat: Other, desc: "Bilder"}
+      - {id: 120, cat: Books, desc: "Ebook"}
+      - {id: 127, cat: Other, desc: "Für Unsere kleinsten"}
+      - {id: 121, cat: Other, desc: "Handy Stuff"}
+      - {id: 129, cat: Other, desc: "Sonstiges"}
+      - {id: 109, cat: Other, desc: "Spiele - Handy"}
+      - {id: 112, cat: Console, desc: "Spiele - Konsolen"}
+      - {id: 111, cat: PC/Games, desc: "Spiele - Mac / Linux"}
+      - {id: 110, cat: PC/Games, desc: "Spiele - PC"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: /takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      returnto: "/"
+    error:
+    - selector: table.tableinborder:contains("Anmeldung Gescheitert!") > tbody > tr > td.tablea
+    test:
+      path: /usercp.php
+
+  ratio:
+    path: /usercp.php
+    selector: div#lmtd table > tbody > tr:contains("Ratio:") > td:nth-child(2)
+    filters:
+      - name: replace
+        args: [".", ""]
+      - name: replace
+        args: [",", "."]
+
+  search:
+    path: /browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      showsearch: "1"
+      orderby: "added"
+      sort: "desc"
+      incldead: "1"
+
+    rows:
+      selector: table.tableinborder[summary] > tbody > tr
+      filters:
+        - name: andmatch
+    fields:
+      download:
+        selector: a[href^="download.php?torrent="]
+        attribute: href
+      title:
+        selector: a[href^="details.php?id="]:has(b)
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      comments:
+        selector: td.tablea > table > tbody > tr:nth-child(2) > td:nth-child(4) > a
+        attribute: href
+      size:
+        selector: td.tablea > table > tbody > tr:nth-child(2) > td:nth-child(1) > b:nth-child(1)
+      grabs:
+        selector: td.tablea > table > tbody > tr:nth-child(2) > td:nth-child(3) > b
+      files:
+        selector: td.tablea > table > tbody > tr:nth-child(2) > td:nth-child(1) > b:nth-child(2)
+      seeders:
+        selector: td.tablea > table > tbody > tr:nth-child(2) > td:nth-child(2) > b:nth-child(1)
+      leechers:
+        selector: td.tablea > table > tbody > tr:nth-child(2) > td:nth-child(2) > b:nth-child(3)
+      date:
+        selector: td.tablea > table > tbody > tr:nth-child(2) > td:nth-child(5)
+        filters:
+          - name: replace
+            args: ["\u00a0", " "]
+          - name: dateparse
+            args: "02.01.2006 15:04:05"
+      downloadvolumefactor:
+        case:
+          "font[color=\"red\"]:contains(\"Only Upload\")": "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
           "*": "1"

src/Jackett/Definitions/nyaa.yml

@@ -6,6 +6,8 @@
   encoding: UTF-8
   links:
     - https://www.nyaa.se/
+    
+  settings: []
 
   caps:
     categorymappings:
@@ -27,7 +29,7 @@
 
     modes:
       search: [q]
-      tv-search: [q, season, ep, imdbid]
+      tv-search: [q, season, ep]
 
 
   search:
@@ -49,6 +51,9 @@
       details:
         selector: td.tlistname a
         attribute: href
+      download:
+        selector: a[title="Download"]
+        attribute: href
       size:
         selector: td.tlistsize
       seeders:

src/Jackett/Definitions/ourbits.yml

@@ -1,109 +1,109 @@
----
-  site: hdpter
-  name: HDPter
-  language: zh-cn
-  type: private
-  encoding: UTF-8
-  links:
-    - https://www.hdpter.net/
-
-  caps:
-    categorymappings:
-      - {id: 401, cat: Movies/BluRay, desc: "Movies Blu-ray"}
-      - {id: 402, cat: Movies/HD, desc: "Movies REMUX"}
-      - {id: 419, cat: Movies/HD, desc: "Movies 1080p"}
-      - {id: 404, cat: Movies/HD, desc: "Movies 720p"}
-      - {id: 405, cat: Movies/3D, desc: "Movies 3D"}
-      - {id: 406, cat: Movies/DVD, desc: "Movies DVD"}
-      - {id: 407, cat: Movies/WEBDL, desc: "Movies WEB-DL"}
-      - {id: 408, cat: Movies/SD, desc: "Movies HDTV"}
-      - {id: 409, cat: Movies/Other, desc: "Movies iPad"}
-      - {id: 410, cat: TV/Documentary, desc: "Documentaries"}
-      - {id: 411, cat: TV/Anime, desc: "Animations"}
-      - {id: 412, cat: TV, desc: "TV Series"}
-      - {id: 413, cat: TV, desc: "TV Shows"}
-      - {id: 414, cat: Audio/Video, desc: "Music Videos"}
-      - {id: 415, cat: TV/Sport, desc: "Sports"}
-      - {id: 416, cat: Audio, desc: "Music"}
-      - {id: 420, cat: Other, desc: "Other"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep, imdbid]
-      movie-search: [imdbid]
-
-  login:
-    path: /takelogin.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: td.embedded:has(h2:contains("登录失败"))
-    test:
-      path: /torrents.php
-
-  search:
-    path: /torrents.php
-    method: get
-    inputs:
-      $raw: "{{range .Categories}}cat{{.}}=1&{{end}}"
-      search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-      incldead: "1"
-      search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
-    rows:
-      selector: table.torrents > tbody > tr:has(table.torrentname)
-    fields:
-      title:
-        selector: a[href^="details.php?id="]
-      title|optional:
-        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
-      imdb|optional:
-        selector: div.imdb_100 > a
-        attribute: href
-      size:
-        selector: td:nth-child(5)
-      grabs:
-        selector: td:nth-child(8)
-      seeders:
-        selector: td:nth-child(6)
-      leechers:
-        selector: td:nth-child(7)
-      date:
-        selector: td:nth-child(4) > span[title]
-        attribute: title
-        filters:
-          - name: append
-            args: " +08:00"
-          - name: dateparse
-            args: "2006-01-02 15:04:05 -07:00"
-      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
+---
+  site: ourbits
+  name: Ourbits
+  language: zh-cn
+  type: private
+  encoding: UTF-8
+  links:
+    - https://ourbits.club/
+
+  caps:
+    categorymappings:
+      - {id: 401, cat: Movies/BluRay, desc: "Movies Blu-ray"}
+      - {id: 402, cat: Movies/HD, desc: "Movies REMUX"}
+      - {id: 419, cat: Movies/HD, desc: "Movies 1080p"}
+      - {id: 404, cat: Movies/HD, desc: "Movies 720p"}
+      - {id: 405, cat: Movies/3D, desc: "Movies 3D"}
+      - {id: 406, cat: Movies/DVD, desc: "Movies DVD"}
+      - {id: 407, cat: Movies/WEBDL, desc: "Movies WEB-DL"}
+      - {id: 408, cat: Movies/SD, desc: "Movies HDTV"}
+      - {id: 409, cat: Movies/Other, desc: "Movies iPad"}
+      - {id: 410, cat: TV/Documentary, desc: "Documentaries"}
+      - {id: 411, cat: TV/Anime, desc: "Animations"}
+      - {id: 412, cat: TV, desc: "TV Series"}
+      - {id: 413, cat: TV, desc: "TV Shows"}
+      - {id: 414, cat: Audio/Video, desc: "Music Videos"}
+      - {id: 415, cat: TV/Sport, desc: "Sports"}
+      - {id: 416, cat: Audio, desc: "Music"}
+      - {id: 420, cat: Other, desc: "Other"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [imdbid]
+
+  login:
+    path: /takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: td.embedded:has(h2:contains("登录失败"))
+    test:
+      path: /torrents.php
+
+  search:
+    path: /torrents.php
+    method: get
+    inputs:
+      $raw: "{{range .Categories}}cat{{.}}=1&{{end}}"
+      search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+      incldead: "1"
+      search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
+    rows:
+      selector: table.torrents > tbody > tr:has(table.torrentname)
+    fields:
+      title:
+        selector: a[href^="details.php?id="]
+      title|optional:
+        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
+      imdb|optional:
+        selector: div.imdb_100 > a
+        attribute: href
+      size:
+        selector: td:nth-child(5)
+      grabs:
+        selector: td:nth-child(8)
+      seeders:
+        selector: td:nth-child(6)
+      leechers:
+        selector: td:nth-child(7)
+      date:
+        selector: td:nth-child(4) > span[title]
+        attribute: title
+        filters:
+          - name: append
+            args: " +08:00"
+          - name: dateparse
+            args: "2006-01-02 15:04:05 -07:00"
+      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/Definitions/passionetorrent.yml

@@ -1,158 +1,158 @@
----
-  site: passionetorrent
-  name: Passione Torrent
-  language: it-it
-  type: private
-  encoding: UTF-8
-  links:
-    - http://www.passionetorrent.info/
-
-  caps:
-    categorymappings:
-      # VIDEO
-      - {id: 1, cat: Movies, desc: "News Cinema"}
-      - {id: 2, cat: Movies/SD, desc: "BDRip"}
-      - {id: 17, cat: Movies/SD, desc: "DVDRip"}
-      - {id: 21, cat: TV, desc: "TV"}
-      - {id: 22, cat: Movies/HD, desc: "720p/1080p"}
-      - {id: 23, cat: Movies/HD, desc: "1080p HRS x265 HEVC"}
-      - {id: 42, cat: Movies/HD, desc: "2160p 4k UltraHD HRS"}
-      - {id: 30, cat: TV/Anime, desc: "Cartoons"}
-      - {id: 38, cat: Movies/SD, desc: "BD-BR-DvdRip sub ita"}
-      - {id: 39, cat: Movies/SD, desc: "Introvabili"}
-      - {id: 40, cat: TV/Documentary, desc: "documentaries"}
-      - {id: 24, cat: Movies/SD, desc: "Filmografie"}
-
-      # MUSICA
-      - {id: 32, cat: Audio, desc: "Italian music"}
-      - {id: 41, cat: Audio, desc: "Discography"}
-      - {id: 33, cat: Audio, desc: "MusicaInternazionale"}
-      - {id: 34, cat: Audio, desc: "Compilation"}
-
-      # PDF
-      - {id: 28, cat: Books, desc: "Ebook"}
-
-      # GAMES
-      - {id: 14, cat: PC/Games, desc: "PC Games"}
-
-      # SOFTWARE
-      - {id: 7, cat: PC/ISO, desc: "Sistemi operativi"}
-      - {id: 36, cat: PC/ISO, desc: "Windows APP"}
-      - {id: 9, cat: PC/Phone-IOS, desc: "Apple APP"}
-      - {id: 37, cat: PC/Phone-Android, desc: "Android APP"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep, imdbid]
-      movie-search: [q, imdbid]
-
-  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
-
-  download:
-    before:
-      path: "thanks.php"
-      method: "post"
-      inputs:
-        infohash: "{{ .DownloadUri.Query.id }}"
-        thanks: "1"
-        rndval: "1487013827343"
-    selector: a[href^="download.php?id="]
-
-  search:
-    path: index.php
-    keywordsfilters:
-      # most ITA TV torrents are in XXxYY format, so we search without S/E prefixes and filter later
-      - name: re_replace
-        args: ["S0?(\\d{1,2})", " $1 "]
-      - name: re_replace
-        args: ["E(\\d{2,3})", " $1 "]
-      - name: replace
-        args: ["-", ""]
-    inputs:
-      search: "{{if .Query.IMDBID}}{{ .Query.IMDBIDShort }}{{else}}{{ .Keywords }}{{end}}"
-      page: "torrents"
-      category: "{{range .Categories}}{{.}};{{end}}"
-      options: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
-      active: "0"
-    rows:
-      selector: table > tbody > tr > td > table.lista > tbody > tr:has(a[href^="index.php?page=torrent-details&id="])
-    fields:
-      download:
-        selector: a[href^="index.php?page=downloadcheck&id="]
-        attribute: href
-      title:
-        selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-        filters:
-          # normalize to SXXEYY format
-          - name: re_replace
-            args: ["(\\d{2})x(\\d{2})", "S$1E$2"]
-          - name: re_replace
-            args: ["(\\d{1})x(\\d{2})", "S0$1E$2"]
-      banner:
-        selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-        attribute: onmouseover
-        filters:
-          - name: regexp
-            args: "src=(.*?) "
-      category:
-        selector: a[href^="index.php?page=torrents&category="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: category
-      details:
-        selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-        attribute: href
-      size:
-        selector: td:nth-last-child(4)
-      date:
-        selector: td:nth-last-child(8)
-        filters:
-          - name: append
-            args: " +01:00"
-          - name: dateparse
-            args: "02/01/2006 -07:00"
-      grabs:
-        selector: td:nth-last-child(7)
-        filters:
-          - name: replace
-            args: ["---", "0"]
-      seeders:
-        selector: td:nth-last-child(5)
-      leechers:
-        selector: td:nth-last-child(6)
-      downloadvolumefactor:
-        case:
-          img[alt="Gold 100% Free"]: "0"
-          img[alt="Silver 50% Free"]: "0.5"
-          img[alt="Bronze 25% Free"]: "0.75"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          img[alt="2x Upload Multiplier"]: "2"
-          img[alt="3x Upload Multiplier"]: "3"
-          img[alt="4x Upload Multiplier"]: "4"
-          img[alt="5x Upload Multiplier"]: "5"
-          img[alt="6x Upload Multiplier"]: "6"
-          img[alt="7x Upload Multiplier"]: "7"
-          img[alt="8x Upload Multiplier"]: "8"
-          img[alt="9x Upload Multiplier"]: "9"
-          img[alt="10x Upload Multiplier"]: "10"
+---
+  site: passionetorrent
+  name: Passione Torrent
+  language: it-it
+  type: private
+  encoding: UTF-8
+  links:
+    - http://www.passionetorrent.info/
+
+  caps:
+    categorymappings:
+      # VIDEO
+      - {id: 1, cat: Movies, desc: "News Cinema"}
+      - {id: 2, cat: Movies/SD, desc: "BDRip"}
+      - {id: 17, cat: Movies/SD, desc: "DVDRip"}
+      - {id: 21, cat: TV, desc: "TV"}
+      - {id: 22, cat: Movies/HD, desc: "720p/1080p"}
+      - {id: 23, cat: Movies/HD, desc: "1080p HRS x265 HEVC"}
+      - {id: 42, cat: Movies/HD, desc: "2160p 4k UltraHD HRS"}
+      - {id: 30, cat: TV/Anime, desc: "Cartoons"}
+      - {id: 38, cat: Movies/SD, desc: "BD-BR-DvdRip sub ita"}
+      - {id: 39, cat: Movies/SD, desc: "Introvabili"}
+      - {id: 40, cat: TV/Documentary, desc: "documentaries"}
+      - {id: 24, cat: Movies/SD, desc: "Filmografie"}
+
+      # MUSICA
+      - {id: 32, cat: Audio, desc: "Italian music"}
+      - {id: 41, cat: Audio, desc: "Discography"}
+      - {id: 33, cat: Audio, desc: "MusicaInternazionale"}
+      - {id: 34, cat: Audio, desc: "Compilation"}
+
+      # PDF
+      - {id: 28, cat: Books, desc: "Ebook"}
+
+      # GAMES
+      - {id: 14, cat: PC/Games, desc: "PC Games"}
+
+      # SOFTWARE
+      - {id: 7, cat: PC/ISO, desc: "Sistemi operativi"}
+      - {id: 36, cat: PC/ISO, desc: "Windows APP"}
+      - {id: 9, cat: PC/Phone-IOS, desc: "Apple APP"}
+      - {id: 37, cat: PC/Phone-Android, desc: "Android APP"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
+
+  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
+
+  download:
+    before:
+      path: "thanks.php"
+      method: "post"
+      inputs:
+        infohash: "{{ .DownloadUri.Query.id }}"
+        thanks: "1"
+        rndval: "1487013827343"
+    selector: a[href^="download.php?id="]
+
+  search:
+    path: index.php
+    keywordsfilters:
+      # most ITA TV torrents are in XXxYY format, so we search without S/E prefixes and filter later
+      - name: re_replace
+        args: ["S0?(\\d{1,2})", " $1 "]
+      - name: re_replace
+        args: ["E(\\d{2,3})", " $1 "]
+      - name: replace
+        args: ["-", ""]
+    inputs:
+      search: "{{if .Query.IMDBID}}{{ .Query.IMDBIDShort }}{{else}}{{ .Keywords }}{{end}}"
+      page: "torrents"
+      category: "{{range .Categories}}{{.}};{{end}}"
+      options: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
+      active: "0"
+    rows:
+      selector: table > tbody > tr > td > table.lista > tbody > tr:has(a[href^="index.php?page=torrent-details&id="])
+    fields:
+      download:
+        selector: a[href^="index.php?page=downloadcheck&id="]
+        attribute: href
+      title:
+        selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
+        filters:
+          # normalize to SXXEYY format
+          - name: re_replace
+            args: ["(\\d{2})x(\\d{2})", "S$1E$2"]
+          - name: re_replace
+            args: ["(\\d{1})x(\\d{2})", "S0$1E$2"]
+      banner:
+        selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "src=(.*?) "
+      category:
+        selector: a[href^="index.php?page=torrents&category="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: category
+      details:
+        selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
+        attribute: href
+      size:
+        selector: td:nth-last-child(4)
+      date:
+        selector: td:nth-last-child(8)
+        filters:
+          - name: append
+            args: " +01:00"
+          - name: dateparse
+            args: "02/01/2006 -07:00"
+      grabs:
+        selector: td:nth-last-child(7)
+        filters:
+          - name: replace
+            args: ["---", "0"]
+      seeders:
+        selector: td:nth-last-child(5)
+      leechers:
+        selector: td:nth-last-child(6)
+      downloadvolumefactor:
+        case:
+          img[alt="Gold 100% Free"]: "0"
+          img[alt="Silver 50% Free"]: "0.5"
+          img[alt="Bronze 25% Free"]: "0.75"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          img[alt="2x Upload Multiplier"]: "2"
+          img[alt="3x Upload Multiplier"]: "3"
+          img[alt="4x Upload Multiplier"]: "4"
+          img[alt="5x Upload Multiplier"]: "5"
+          img[alt="6x Upload Multiplier"]: "6"
+          img[alt="7x Upload Multiplier"]: "7"
+          img[alt="8x Upload Multiplier"]: "8"
+          img[alt="9x Upload Multiplier"]: "9"
+          img[alt="10x Upload Multiplier"]: "10"
           "*": "1"

src/Jackett/Definitions/polishsource.yml

@@ -1,115 +1,115 @@
----
-  site: polishsource
-  name: PolishSource
-  language: pl-pl
-  type: private
-  encoding: ISO-8859-2
-  links:
-    - https://polishsource.cz/
-
-  caps:
-    categorymappings:
-      - {id: 12, cat: Movies/SD, desc: "Movies/SD"}
-      - {id: 11, cat: Movies/HD, desc: "Movies/HD"}
-      - {id: 45, cat: Movies/3D, desc: "Movies/3D"}
-      - {id: 4, cat: Movies/DVD, desc: "Movies/DVD"}
-      - {id: 43, cat: Movies/BluRay, desc: "Movies/BD"}
-      - {id: 10, cat: TV/SD, desc: "TV/SD"}
-      - {id: 39, cat: TV/HD, desc: "TV/HD"}
-      - {id: 8, cat: PC/Games, desc: "Games/PC"}
-      - {id: 3, cat: Console, desc: "Games/Consoles"}
-      - {id: 5, cat: Books, desc: "E-Books"}
-      - {id: 42, cat: Audio, desc: "Music"}
-      - {id: 18, cat: PC/0day, desc: "Apps"}
-      - {id: 13, cat: XXX, desc: "XXX"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
-
-  login:
-    path: login.php
-    method: form
-    form: form[action="takelogin.php"]
-    captcha:
-      type: image
-      image: img[src="img.php"]
-      input: vImageCodP
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: td.embedded:has(h2:contains("failed"))
-      - selector: td.embedded:has(h2:contains("Error"))
-    test:
-      path: /browse.php
-        
-  search:
-    path: /browse.php
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
-      incldead: "1"
-      scene: "0"
-      pl: "0"
-      sub: ""
-      search_in: "title"
-    rows:
-      selector: table#restable > tbody > tr:has(a[href^="details.php?id="])
-    fields:
-      title:
-        selector: a[href^="details.php?id="]
-      details:
-        selector: a[href^="details.php?id="]
-        attribute: href
-      category:
-        selector: a[href^="?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      download:
-        selector: a[href^="downloadssl.php?id="]
-        attribute: href
-      description|optional:
-        selector: td:nth-child(2) > small
-        filters:
-          - name: prepend
-            args: "Genre: "
-          - name: append
-            args: "\n<br>"
-      description|optional|append|1:
-        selector: img[src="pic/pl.png"]
-        filters:
-          - name: append
-            args: "Language: polish\n<br>"
-      description|optional|append|2:
-        selector: img[src="pic/napisy.png"]
-        filters:
-          - name: append
-            args: "Subbed\n<br>"
-      imdb|optional:
-        selector: a[href^="http://www.imdb.com/title/tt"]
-      grabs:
-        selector: td:nth-child(6)
-        filters:
-          - name: regexp
-            args: (\d+)
-      size:
-        selector: td:nth-child(5)
-      date:
-        selector: td:nth-child(4)
-        filters:
-          - name: append
-            args: " +00:00"
-          - name: dateparse
-            args: "2006-01-0215:04:05 -07:00"
-      seeders:
-        selector: td:nth-child(7)
-      leechers:
-        selector: td:nth-child(8)
-      downloadvolumefactor:
-        text: "0"
-      uploadvolumefactor:
-        text: "1"
+---
+  site: polishsource
+  name: PolishSource
+  language: pl-pl
+  type: private
+  encoding: ISO-8859-2
+  links:
+    - https://polishsource.cz/
+
+  caps:
+    categorymappings:
+      - {id: 12, cat: Movies/SD, desc: "Movies/SD"}
+      - {id: 11, cat: Movies/HD, desc: "Movies/HD"}
+      - {id: 45, cat: Movies/3D, desc: "Movies/3D"}
+      - {id: 4, cat: Movies/DVD, desc: "Movies/DVD"}
+      - {id: 43, cat: Movies/BluRay, desc: "Movies/BD"}
+      - {id: 10, cat: TV/SD, desc: "TV/SD"}
+      - {id: 39, cat: TV/HD, desc: "TV/HD"}
+      - {id: 8, cat: PC/Games, desc: "Games/PC"}
+      - {id: 3, cat: Console, desc: "Games/Consoles"}
+      - {id: 5, cat: Books, desc: "E-Books"}
+      - {id: 42, cat: Audio, desc: "Music"}
+      - {id: 18, cat: PC/0day, desc: "Apps"}
+      - {id: 13, cat: XXX, desc: "XXX"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  login:
+    path: login.php
+    method: form
+    form: form[action="takelogin.php"]
+    captcha:
+      type: image
+      image: img[src="img.php"]
+      input: vImageCodP
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: td.embedded:has(h2:contains("failed"))
+      - selector: td.embedded:has(h2:contains("Error"))
+    test:
+      path: /browse.php
+        
+  search:
+    path: /browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      incldead: "1"
+      scene: "0"
+      pl: "0"
+      sub: ""
+      search_in: "title"
+    rows:
+      selector: table#restable > tbody > tr:has(a[href^="details.php?id="])
+    fields:
+      title:
+        selector: a[href^="details.php?id="]
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      category:
+        selector: a[href^="?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      download:
+        selector: a[href^="downloadssl.php?id="]
+        attribute: href
+      description|optional:
+        selector: td:nth-child(2) > small
+        filters:
+          - name: prepend
+            args: "Genre: "
+          - name: append
+            args: "\n<br>"
+      description|optional|append|1:
+        selector: img[src="pic/pl.png"]
+        filters:
+          - name: append
+            args: "Language: polish\n<br>"
+      description|optional|append|2:
+        selector: img[src="pic/napisy.png"]
+        filters:
+          - name: append
+            args: "Subbed\n<br>"
+      imdb|optional:
+        selector: a[href^="http://www.imdb.com/title/tt"]
+      grabs:
+        selector: td:nth-child(6)
+        filters:
+          - name: regexp
+            args: (\d+)
+      size:
+        selector: td:nth-child(5)
+      date:
+        selector: td:nth-child(4)
+        filters:
+          - name: append
+            args: " +00:00"
+          - name: dateparse
+            args: "2006-01-0215:04:05 -07:00"
+      seeders:
+        selector: td:nth-child(7)
+      leechers:
+        selector: td:nth-child(8)
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"

src/Jackett/Definitions/qctorrent.yml

@@ -1,107 +1,107 @@
----
-  site: qctorrent
-  name: QcTorrent
-  description: "A French gerneral tracker"
-  language: fr-fr
-  type: private
-  encoding: UTF-8
-  links:
-    - http://www.qctorrent.net/
-
-  caps:
-    categorymappings:
-      - {id: 30, cat: PC, desc: "++ Applications"}
-      - {id: 1, cat: PC, desc: "Applications/Divers"}
-      - {id: 2, cat: PC, desc: "Applications/PC ISO"}
-      - {id: 3, cat: PC, desc: "Applications/Portable"}
-      - {id: 31, cat: Movies, desc: "++ Films"}
-      - {id: 4, cat: Movies/BluRay, desc: "Films/Bluray"}
-      - {id: 5, cat: Movies/DVD, desc: "Films/DVDr"}
-      - {id: 6, cat: Movies/HD, desc: "Films/HD Rip"}
-      - {id: 7, cat: Movies/SD, desc: "Films/SD Rip"}
-      - {id: 8, cat: Movies/SD, desc: "Films/VCD"}
-      - {id: 32, cat: Console, desc: "++ Jeux"}
-      - {id: 9, cat: PC/Games, desc: "Jeux/PC"}
-      - {id: 10, cat: Console, desc: "Jeux/Portable"}
-      - {id: 11, cat: Console/PS4, desc: "Jeux/PS"}
-      - {id: 12, cat: Console/Wii, desc: "Jeux/Wii"}
-      - {id: 13, cat: Console/Xbox, desc: "Jeux/Xbox"}
-      - {id: 33, cat: Audio, desc: "++ Musique"}
-      - {id: 14, cat: Audio, desc: "Musique"}
-      - {id: 15, cat: Audio/Video, desc: "Musique/Video"}
-      - {id: 34, cat: TV, desc: "++ Série-Télé"}
-      - {id: 16, cat: TV/HD, desc: "Série-Télé/Bluray"}
-      - {id: 17, cat: TV/SD, desc: "Série-Télé/DVDr"}
-      - {id: 18, cat: TV/HD, desc: "Série-Télé/HD Rip"}
-      - {id: 19, cat: TV/SD, desc: "Série-Télé/SD Rip"}
-      - {id: 20, cat: Books, desc: "E-Books"}
-      - {id: 21, cat: XXX, desc: "XXX"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: login.php
-    method: post
-    inputs:
-      login-username: "{{ .Config.username }}"
-      login-password: "{{ .Config.password }}"
-      login-remember-me: "on"
-      login: ""
-    error:
-      - selector: "script[type=\"text/javascript\"]:contains(\"$.ambiance({message: \")"
-    test:
-      path: search.php
-      selector: div.top-bar > div.container > div.textleft > div.hidden-sm > font:contains("Ratio:") > font
-
-  ratio:
-    path: search.php
-    selector: div.top-bar > div.container > div.textleft > div.hidden-sm > font:contains("Ratio:") > font
-
-  search:
-    path: search.php
-    inputs:
-      category: "{{range .Categories}}{{.}};{{end}}"
-      title: "{{ .Query.Keywords }}"
-      search: "Recherche"
-    rows:
-      selector: tr[data-snatches]
-    fields:
-      download:
-        selector: td.name > a
-        attribute: href
-        filters:
-          - name: replace
-            args: ["/torrent/", "/dl/"]
-      title:
-        selector: td.name > a
-      category:
-        selector: td.coll-0 > a
-        attribute: href
-        filters:
-          - name: querystring
-            args: category
-      details:
-        selector: td.name > a
-        attribute: href
-      grabs:
-        attribute: data-snatches
-      seeders:
-        selector: td.seeds
-      leechers:
-        selector: td.leeches
-      date:
-        selector: td[data-date]
-        attribute: data-date
-      downloadvolumefactor:
-        case:
-          span[title^="Freeleech:"]: "0"
-          span[title^="Half Freeleech:"]: "0.5"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
-      size:
-        selector: td.size
+---
+  site: qctorrent
+  name: QcTorrent
+  description: "A French gerneral tracker"
+  language: fr-fr
+  type: private
+  encoding: UTF-8
+  links:
+    - http://www.qctorrent.net/
+
+  caps:
+    categorymappings:
+      - {id: 30, cat: PC, desc: "++ Applications"}
+      - {id: 1, cat: PC, desc: "Applications/Divers"}
+      - {id: 2, cat: PC, desc: "Applications/PC ISO"}
+      - {id: 3, cat: PC, desc: "Applications/Portable"}
+      - {id: 31, cat: Movies, desc: "++ Films"}
+      - {id: 4, cat: Movies/BluRay, desc: "Films/Bluray"}
+      - {id: 5, cat: Movies/DVD, desc: "Films/DVDr"}
+      - {id: 6, cat: Movies/HD, desc: "Films/HD Rip"}
+      - {id: 7, cat: Movies/SD, desc: "Films/SD Rip"}
+      - {id: 8, cat: Movies/SD, desc: "Films/VCD"}
+      - {id: 32, cat: Console, desc: "++ Jeux"}
+      - {id: 9, cat: PC/Games, desc: "Jeux/PC"}
+      - {id: 10, cat: Console, desc: "Jeux/Portable"}
+      - {id: 11, cat: Console/PS4, desc: "Jeux/PS"}
+      - {id: 12, cat: Console/Wii, desc: "Jeux/Wii"}
+      - {id: 13, cat: Console/Xbox, desc: "Jeux/Xbox"}
+      - {id: 33, cat: Audio, desc: "++ Musique"}
+      - {id: 14, cat: Audio, desc: "Musique"}
+      - {id: 15, cat: Audio/Video, desc: "Musique/Video"}
+      - {id: 34, cat: TV, desc: "++ Série-Télé"}
+      - {id: 16, cat: TV/HD, desc: "Série-Télé/Bluray"}
+      - {id: 17, cat: TV/SD, desc: "Série-Télé/DVDr"}
+      - {id: 18, cat: TV/HD, desc: "Série-Télé/HD Rip"}
+      - {id: 19, cat: TV/SD, desc: "Série-Télé/SD Rip"}
+      - {id: 20, cat: Books, desc: "E-Books"}
+      - {id: 21, cat: XXX, desc: "XXX"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: login.php
+    method: post
+    inputs:
+      login-username: "{{ .Config.username }}"
+      login-password: "{{ .Config.password }}"
+      login-remember-me: "on"
+      login: ""
+    error:
+      - selector: "script[type=\"text/javascript\"]:contains(\"$.ambiance({message: \")"
+    test:
+      path: search.php
+      selector: div.top-bar > div.container > div.textleft > div.hidden-sm > font:contains("Ratio:") > font
+
+  ratio:
+    path: search.php
+    selector: div.top-bar > div.container > div.textleft > div.hidden-sm > font:contains("Ratio:") > font
+
+  search:
+    path: search.php
+    inputs:
+      category: "{{range .Categories}}{{.}};{{end}}"
+      title: "{{ .Query.Keywords }}"
+      search: "Recherche"
+    rows:
+      selector: tr[data-snatches]
+    fields:
+      download:
+        selector: td.name > a
+        attribute: href
+        filters:
+          - name: replace
+            args: ["/torrent/", "/dl/"]
+      title:
+        selector: td.name > a
+      category:
+        selector: td.coll-0 > a
+        attribute: href
+        filters:
+          - name: querystring
+            args: category
+      details:
+        selector: td.name > a
+        attribute: href
+      grabs:
+        attribute: data-snatches
+      seeders:
+        selector: td.seeds
+      leechers:
+        selector: td.leeches
+      date:
+        selector: td[data-date]
+        attribute: data-date
+      downloadvolumefactor:
+        case:
+          span[title^="Freeleech:"]: "0"
+          span[title^="Half Freeleech:"]: "0.5"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"
+      size:
+        selector: td.size
         remove: span

src/Jackett/Definitions/redacted-scrape.yml

@@ -1,103 +1,103 @@
----
-  site: redacted-scrape
-  name: Redacted (scrape)
-  description: "A music tracker"
-  language: en-us
-  type: private
-  encoding: UTF-8
-  links:
-    - https://redacted.ch/
-
-  caps:
-    categorymappings:
-      - {id: 1, cat: Audio, desc: "Music"}
-      - {id: 2, cat: PC, desc: "Applications"}
-      - {id: 3, cat: Books, desc: "E-Books"}
-      - {id: 4, cat: Audio/Audiobook, desc: "Audiobooks"}
-      - {id: 5, cat: Movies, desc: "E-Learning Videos"}
-      - {id: 6, cat: TV, desc: "Comedy"}
-      - {id: 7, cat: Books/Comics, desc: "Comics"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: login.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      keeplogged: 1
-      login: "Log in"
-    error:
-      - selector: form#loginform > span.warning
-    test:
-      path: torrents.php
-
-  ratio:
-    path: torrents.php
-    selector: li#stats_ratio > span
-
-  search:
-    path: torrents.php
-    inputs:
-      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
-      searchstr: "{{ .Query.Keywords }}"
-      order_by: time
-      order_way: desc
-      action: basic
-      searchsubmit: 1
-    rows:
-      selector: table#torrent_table > tbody > tr.torrent
-    fields:
-      download:
-        selector: a[href^="torrents.php?action=download&id="]
-        attribute: href
-      description:
-        selector: div.group_info
-        remove: span
-      title:
-        selector: div.group_info
-        remove: span, div.tags
-        filters:
-          - name: replace
-            args: [" / Neutral Leech!", ""]
-          - name: replace
-            args: [" / Freeleech!", ""]
-      category:
-        selector: td.cats_col
-        case:
-          div.cats_music: 1
-          div.cats_applications: 2
-          div.cats_ebooks: 3
-          div.cats_audiobooks: 4
-          div.cats_elearningvideos: 5
-          div.cats_comedy: 6
-          div.cats_comics: 7
-      comments:
-        selector: a[href^="torrents.php?id="]
-        attribute: href
-      files:
-        selector: td:nth-child(3)
-      date:
-        selector: td:nth-child(4)
-      size:
-        selector: td:nth-child(5)
-      grabs:
-        selector: td:nth-child(6)
-      seeders:
-        selector: td:nth-child(7)
-      leechers:
-        selector: td:nth-child(8)
-      downloadvolumefactor:
-        case:
-          "strong.tl_free": "0"
-          "strong.tl_neutral": "0"
-          ":root div.alertbar:contains(\"freeleech\")": "0"
-          ":root div.alertbar:contains(\"FREELEECH\")": "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "strong.tl_neutral": "0"
+---
+  site: redacted-scrape
+  name: Redacted (scrape)
+  description: "A music tracker"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://redacted.ch/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Audio, desc: "Music"}
+      - {id: 2, cat: PC, desc: "Applications"}
+      - {id: 3, cat: Books, desc: "E-Books"}
+      - {id: 4, cat: Audio/Audiobook, desc: "Audiobooks"}
+      - {id: 5, cat: Movies, desc: "E-Learning Videos"}
+      - {id: 6, cat: TV, desc: "Comedy"}
+      - {id: 7, cat: Books/Comics, desc: "Comics"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: login.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      keeplogged: 1
+      login: "Log in"
+    error:
+      - selector: form#loginform > span.warning
+    test:
+      path: torrents.php
+
+  ratio:
+    path: torrents.php
+    selector: li#stats_ratio > span
+
+  search:
+    path: torrents.php
+    inputs:
+      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+      searchstr: "{{ .Query.Keywords }}"
+      order_by: time
+      order_way: desc
+      action: basic
+      searchsubmit: 1
+    rows:
+      selector: table#torrent_table > tbody > tr.torrent
+    fields:
+      download:
+        selector: a[href^="torrents.php?action=download&id="]
+        attribute: href
+      description:
+        selector: div.group_info
+        remove: span
+      title:
+        selector: div.group_info
+        remove: span, div.tags
+        filters:
+          - name: replace
+            args: [" / Neutral Leech!", ""]
+          - name: replace
+            args: [" / Freeleech!", ""]
+      category:
+        selector: td.cats_col
+        case:
+          div.cats_music: 1
+          div.cats_applications: 2
+          div.cats_ebooks: 3
+          div.cats_audiobooks: 4
+          div.cats_elearningvideos: 5
+          div.cats_comedy: 6
+          div.cats_comics: 7
+      comments:
+        selector: a[href^="torrents.php?id="]
+        attribute: href
+      files:
+        selector: td:nth-child(3)
+      date:
+        selector: td:nth-child(4)
+      size:
+        selector: td:nth-child(5)
+      grabs:
+        selector: td:nth-child(6)
+      seeders:
+        selector: td:nth-child(7)
+      leechers:
+        selector: td:nth-child(8)
+      downloadvolumefactor:
+        case:
+          "strong.tl_free": "0"
+          "strong.tl_neutral": "0"
+          ":root div.alertbar:contains(\"freeleech\")": "0"
+          ":root div.alertbar:contains(\"FREELEECH\")": "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "strong.tl_neutral": "0"
           "*": "1"

src/Jackett/Definitions/rockhardlossless.yml

@@ -1,80 +1,80 @@
----
-  site: rockhardlossless
-  name: Rockhard Lossless
-  language: en-us
-  type: private
-  encoding: UTF-8
-  links:
-    - https://rockhard-lossless.org
-
-  caps:
-    categories:
-      1: Audio
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: login.php
-    method: form
-    form: form[action="takelogin.php"]
-    inputs:
-      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
-
-  search:
-    path: /browse.php
-    method: post
-    inputs:
-      search: "{{ .Query.Keywords }}"
-      incldead: "1"
-      searchin: "title"
-    rows:
-      selector: table > tbody tr.tt
-      filters:
-        - name: andmatch
-    fields:
-      title:
-        selector: a[href^="details.php?id="]
-      category:
-        text: "1"
-      details:
-        selector: a[href^="details.php?id="]
-        attribute: href    
-      download:
-        selector: a[href^="download.php?torrent="]
-        attribute: href
-      banner:
-        selector: td:nth-child(2) > img
-        attribute: src
-      size:
-        selector: td:nth-child(8)
-      files:
-        selector: td:nth-child(5)
-      grabs:
-        selector: td:nth-child(9)
-        filters:
-          - name: regexp
-            args: ([\d\.]+)
-      seeders:
-        selector: td:nth-child(10)
-      leechers:
-        selector: td:nth-child(11)
-      date:
-        selector: td:nth-child(7)
-      downloadvolumefactor:
-        case:
-          "a.info > b:contains(\"Free\")": "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
-      description:
-        selector: td:nth-child(3)
-        remove: a, div, font:contains("NEW!")
+---
+  site: rockhardlossless
+  name: Rockhard Lossless
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://rockhard-lossless.org
+
+  caps:
+    categories:
+      1: Audio
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: login.php
+    method: form
+    form: form[action="takelogin.php"]
+    inputs:
+      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
+
+  search:
+    path: /browse.php
+    method: post
+    inputs:
+      search: "{{ .Query.Keywords }}"
+      incldead: "1"
+      searchin: "title"
+    rows:
+      selector: table > tbody tr.tt
+      filters:
+        - name: andmatch
+    fields:
+      title:
+        selector: a[href^="details.php?id="]
+      category:
+        text: "1"
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href    
+      download:
+        selector: a[href^="download.php?torrent="]
+        attribute: href
+      banner:
+        selector: td:nth-child(2) > img
+        attribute: src
+      size:
+        selector: td:nth-child(8)
+      files:
+        selector: td:nth-child(5)
+      grabs:
+        selector: td:nth-child(9)
+        filters:
+          - name: regexp
+            args: ([\d\.]+)
+      seeders:
+        selector: td:nth-child(10)
+      leechers:
+        selector: td:nth-child(11)
+      date:
+        selector: td:nth-child(7)
+      downloadvolumefactor:
+        case:
+          "a.info > b:contains(\"Free\")": "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"
+      description:
+        selector: td:nth-child(3)
+        remove: a, div, font:contains("NEW!")

src/Jackett/Definitions/rodvd.yml

@@ -1,125 +1,125 @@
----
-  site: rodvd
-  name: RoDVD
-  language: ro-ro
-  type: private
-  encoding: windows-1252
-  links:
-    - http://rodvd.net/
-
-  caps:
-    categorymappings:
-      - {id: 48, cat: Movies/3D, desc: "3D"}
-      - {id: 1, cat: PC/0day, desc: "Appz"}
-      - {id: 3, cat: Other, desc: "Cartoons"}
-      - {id: 42, cat: TV/Documentary, desc: "Documentaries"}
-      - {id: 6, cat: Books, desc: "eBooks"}
-      - {id: 11, cat: PC/Games, desc: "Games | PC"}
-      - {id: 12, cat: Console/PS3, desc: "Games | PS2"}
-      - {id: 36, cat: Console/PS3, desc: "Games | PS3"}
-      - {id: 40, cat: Console/PSP, desc: "Games | PSP"}
-      - {id: 25, cat: Console/Wii, desc: "Games | Wii"}
-      - {id: 16, cat: Console/Xbox, desc: "Games | XBOX"}
-      - {id: 19, cat: PC/Phone-Other, desc: "Mobile"}
-      - {id: 43, cat: Movies/BluRay, desc: "Movies | Blu-Ray"}
-      - {id: 49, cat: Movies/BluRay, desc: "Movies | Blu-Ray-RO"}
-      - {id: 7, cat: Movies/DVD, desc: "Movies | DVD-R"}
-      - {id: 2, cat: Movies/DVD, desc: "Movies | DVD-RO"}
-      - {id: 17, cat: Movies/HD, desc: "Movies | HD"}
-      - {id: 45, cat: Movies/HD, desc: "Movies | HD-RO"}
-      - {id: 21, cat: Movies, desc: "Movies | Oldies"}
-      - {id: 38, cat: Movies, desc: "Movies | Packs"}
-      - {id: 8, cat: Movies/SD, desc: "Movies | x264"}
-      - {id: 4, cat: Movies/SD, desc: "Movies | x264-RO"}
-      - {id: 10, cat: Movies/SD, desc: "Movies | XviD"}
-      - {id: 44, cat: Movies/SD, desc: "Movies | XviD-RO"}
-      - {id: 5, cat: Audio/MP3, desc: "Music | Mp3"}
-      - {id: 39, cat: Audio, desc: "Music | Packs"}
-      - {id: 23, cat: Audio/Video, desc: "Music | Videos"}
-      - {id: 18, cat: Other, desc: "Pictures"}
-      - {id: 46, cat: XXX/Imageset, desc: "Pictures | xxx"}
-      - {id: 22, cat: TV/Sport, desc: "Sport"}
-      - {id: 50, cat: TV, desc: "STAR"}
-      - {id: 20, cat: TV/SD, desc: "TV | Episodes"}
-      - {id: 47, cat: TV/HD, desc: "TV | Episodes HD"}
-      - {id: 41, cat: TV, desc: "TV | Packs"}
-      - {id: 15, cat: XXX, desc: "xXx"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q, imdbid]
-
-  login:
-    path: login.php
-    method: form
-    form: form
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: td.loginerr
-    test:
-      path: browse.php
-      
-  ratio:
-    path: browse.php
-    selector: a#link14
-
-  search:
-    path: browse.php
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Query.Keywords }}{{end}}"
-      key: 9
-    rows:
-      selector: table.torrents > tbody > tr:has(a[href^="details.php?id="])
-      filters:
-        - name: andmatch
-      dateheaders:
-        selector: "td.days > font > b"
-        filters:
-          - name: replace
-            args: ["Torrents Added: ", ""]
-          - name: dateparse
-            args: "2.1.2006"
-    fields:
-      title:
-        selector: a[href^="details.php?id="] font
-      details:
-        selector: a[href^="details.php?id="]
-        attribute: href
-      category:
-        selector: a[href^="browse.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      download:
-        selector: a[href^="download.php"]
-        attribute: href
-      imdb|optional:
-        selector: a[href*="http://www.imdb.com/title/tt"]
-        attribute: href
-      size:
-        selector: td:nth-child(6)
-      seeders:
-        text: 9999
-      leechers:
-        text: 0
-      banner:
-        selector: a[onmouseover][href^="details.php?id="]
-        attribute: onmouseover
-        filters:
-          - name: regexp
-            args: "src=\"([^\"]+)"
-      downloadvolumefactor:
-        case:
-          "font.small[color]:contains(\"Free\")": "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
-      description:
-        selector: td:nth-child(2)
-        remove: a[href^="details.php?id="]
+---
+  site: rodvd
+  name: RoDVD
+  language: ro-ro
+  type: private
+  encoding: windows-1252
+  links:
+    - http://rodvd.net/
+
+  caps:
+    categorymappings:
+      - {id: 48, cat: Movies/3D, desc: "3D"}
+      - {id: 1, cat: PC/0day, desc: "Appz"}
+      - {id: 3, cat: Other, desc: "Cartoons"}
+      - {id: 42, cat: TV/Documentary, desc: "Documentaries"}
+      - {id: 6, cat: Books, desc: "eBooks"}
+      - {id: 11, cat: PC/Games, desc: "Games | PC"}
+      - {id: 12, cat: Console/PS3, desc: "Games | PS2"}
+      - {id: 36, cat: Console/PS3, desc: "Games | PS3"}
+      - {id: 40, cat: Console/PSP, desc: "Games | PSP"}
+      - {id: 25, cat: Console/Wii, desc: "Games | Wii"}
+      - {id: 16, cat: Console/Xbox, desc: "Games | XBOX"}
+      - {id: 19, cat: PC/Phone-Other, desc: "Mobile"}
+      - {id: 43, cat: Movies/BluRay, desc: "Movies | Blu-Ray"}
+      - {id: 49, cat: Movies/BluRay, desc: "Movies | Blu-Ray-RO"}
+      - {id: 7, cat: Movies/DVD, desc: "Movies | DVD-R"}
+      - {id: 2, cat: Movies/DVD, desc: "Movies | DVD-RO"}
+      - {id: 17, cat: Movies/HD, desc: "Movies | HD"}
+      - {id: 45, cat: Movies/HD, desc: "Movies | HD-RO"}
+      - {id: 21, cat: Movies, desc: "Movies | Oldies"}
+      - {id: 38, cat: Movies, desc: "Movies | Packs"}
+      - {id: 8, cat: Movies/SD, desc: "Movies | x264"}
+      - {id: 4, cat: Movies/SD, desc: "Movies | x264-RO"}
+      - {id: 10, cat: Movies/SD, desc: "Movies | XviD"}
+      - {id: 44, cat: Movies/SD, desc: "Movies | XviD-RO"}
+      - {id: 5, cat: Audio/MP3, desc: "Music | Mp3"}
+      - {id: 39, cat: Audio, desc: "Music | Packs"}
+      - {id: 23, cat: Audio/Video, desc: "Music | Videos"}
+      - {id: 18, cat: Other, desc: "Pictures"}
+      - {id: 46, cat: XXX/Imageset, desc: "Pictures | xxx"}
+      - {id: 22, cat: TV/Sport, desc: "Sport"}
+      - {id: 50, cat: TV, desc: "STAR"}
+      - {id: 20, cat: TV/SD, desc: "TV | Episodes"}
+      - {id: 47, cat: TV/HD, desc: "TV | Episodes HD"}
+      - {id: 41, cat: TV, desc: "TV | Packs"}
+      - {id: 15, cat: XXX, desc: "xXx"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q, imdbid]
+
+  login:
+    path: login.php
+    method: form
+    form: form
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: td.loginerr
+    test:
+      path: browse.php
+      
+  ratio:
+    path: browse.php
+    selector: a#link14
+
+  search:
+    path: browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Query.Keywords }}{{end}}"
+      key: 9
+    rows:
+      selector: table.torrents > tbody > tr:has(a[href^="details.php?id="])
+      filters:
+        - name: andmatch
+      dateheaders:
+        selector: "td.days > font > b"
+        filters:
+          - name: replace
+            args: ["Torrents Added: ", ""]
+          - name: dateparse
+            args: "2.1.2006"
+    fields:
+      title:
+        selector: a[href^="details.php?id="] font
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      download:
+        selector: a[href^="download.php"]
+        attribute: href
+      imdb|optional:
+        selector: a[href*="http://www.imdb.com/title/tt"]
+        attribute: href
+      size:
+        selector: td:nth-child(6)
+      seeders:
+        text: 9999
+      leechers:
+        text: 0
+      banner:
+        selector: a[onmouseover][href^="details.php?id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "src=\"([^\"]+)"
+      downloadvolumefactor:
+        case:
+          "font.small[color]:contains(\"Free\")": "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"
+      description:
+        selector: td:nth-child(2)
+        remove: a[href^="details.php?id="]

src/Jackett/Definitions/sdbits.yml

@@ -1,94 +1,94 @@
----
-  site: sdbits
-  name: SDBits
-  description: "SDBits is a small tracker that focuses on SD movies and tv."
-  language: en-us
-  type: private
-  encoding: UTF-8
-  links:
-    - http://sdbits.org
-
-  caps:
-    categorymappings:
-      - {id: 6, cat: Audio, desc: "Audio"}
-      - {id: 3, cat: TV/Documentary, desc: "Documentary"}
-      - {id: 1, cat: Movies, desc: "Movies"}
-      - {id: 4, cat: Audio, desc: "Music"}
-      - {id: 5, cat: TV/Sport, desc: "Sports"}
-      - {id: 2, cat: TV, desc: "TV"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: /takeloginn3.php
-    method: post
-    inputs:
-      uname: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      returnto: "/"
-    error:
-      - selector: td.embedded:has(h2:contains("failed")+table)
-    test:
-      path: /browse.php
-      selector: span.smallfont:has(a[href="logout.php"])
-
-  ratio:
-    path: /browse.php
-    selector: span.smallfont:has(a[href="logout.php"])
-    filters:
-      - name: regexp
-        args: "Ratio:[ \u00a0](.*?)\u00a0"
-
-  search:
-    path: /browse.php
-    method: post
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
-      incldead: "1"
-      descriptions: "0"
-    rows:
-      selector: table#torrent-list > tbody > tr[id]
-    fields:
-      title:
-        selector: td:nth-child(3) > b > a
-      category:
-        selector: a[href^="?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      details:
-        selector: td:nth-child(3) > b > a
-        attribute: href      
-      download:
-        selector: a[href^="download.php?id="]
-        attribute: href
-      size:
-        selector: td:nth-child(6)
-      grabs:
-        selector: td:nth-child(7)
-        filters:
-        - name: regexp
-          args: "(\\d+)"
-      seeders:
-        selector: td:nth-child(8)
-      leechers:
-        selector: td:nth-child(9)
-      date:
-        selector: td:nth-child(5)
-        filters:
-          - name: append
-            args: " ago"
-      imdb:
-        selector: a[href^="http://www.imdb.com/"]
-        attribute: href
-      downloadvolumefactor:
-        case:
-          "a[style=\"color:#000099\"][href^=\"details.php?\"]": "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
+---
+  site: sdbits
+  name: SDBits
+  description: "SDBits is a small tracker that focuses on SD movies and tv."
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - http://sdbits.org
+
+  caps:
+    categorymappings:
+      - {id: 6, cat: Audio, desc: "Audio"}
+      - {id: 3, cat: TV/Documentary, desc: "Documentary"}
+      - {id: 1, cat: Movies, desc: "Movies"}
+      - {id: 4, cat: Audio, desc: "Music"}
+      - {id: 5, cat: TV/Sport, desc: "Sports"}
+      - {id: 2, cat: TV, desc: "TV"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: /takeloginn3.php
+    method: post
+    inputs:
+      uname: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      returnto: "/"
+    error:
+      - selector: td.embedded:has(h2:contains("failed")+table)
+    test:
+      path: /browse.php
+      selector: span.smallfont:has(a[href="logout.php"])
+
+  ratio:
+    path: /browse.php
+    selector: span.smallfont:has(a[href="logout.php"])
+    filters:
+      - name: regexp
+        args: "Ratio:[ \u00a0](.*?)\u00a0"
+
+  search:
+    path: /browse.php
+    method: post
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      incldead: "1"
+      descriptions: "0"
+    rows:
+      selector: table#torrent-list > tbody > tr[id]
+    fields:
+      title:
+        selector: td:nth-child(3) > b > a
+      category:
+        selector: a[href^="?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      details:
+        selector: td:nth-child(3) > b > a
+        attribute: href      
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      size:
+        selector: td:nth-child(6)
+      grabs:
+        selector: td:nth-child(7)
+        filters:
+        - name: regexp
+          args: "(\\d+)"
+      seeders:
+        selector: td:nth-child(8)
+      leechers:
+        selector: td:nth-child(9)
+      date:
+        selector: td:nth-child(5)
+        filters:
+          - name: append
+            args: " ago"
+      imdb:
+        selector: a[href^="http://www.imdb.com/"]
+        attribute: href
+      downloadvolumefactor:
+        case:
+          "a[style=\"color:#000099\"][href^=\"details.php?\"]": "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
           "*": "1"

src/Jackett/Definitions/secretcinema.yml

@@ -1,130 +1,130 @@
----
-  site: secretcinema
-  name: Secret Cinema
-  description: "A tracker for rare movies."
-  language: en-us
-  type: private
-  encoding: "UTF-8"
-  links:
-    - http://www.secret-cinema.net
-
-  caps:
-    categorymappings:
-      - {id: 1, cat: TV/Anime, desc: "Animation"}
-      - {id: 2, cat: Movies, desc: "Arthouse"}
-      - {id: 3, cat: Movies, desc: "Asian"}
-      - {id: 19, cat: Audio/Audiobook, desc: "Audiobooks"}
-      - {id: 29, cat: Movies, desc: "Badfilm"}
-      - {id: 18, cat: Books, desc: "Books"}
-      - {id: 4, cat: Movies, desc: "Classics"}
-      - {id: 5, cat: Movies, desc: "Comedy"}
-      - {id: 20, cat: Books/Comics, desc: "Comix"}
-      - {id: 6, cat: Movies, desc: "Cult"}
-      - {id: 7, cat: TV/Documentary, desc: "Documentary"}
-      - {id: 8, cat: Movies, desc: "Fantasy & SF"}
-      - {id: 9, cat: Movies, desc: "Horror"}
-      - {id: 22, cat: Movies, desc: "Noir"}
-      - {id: 17, cat: Audio, desc: "OST"}
-      - {id: 10, cat: Other, desc: "Other"}
-      - {id: 15, cat: TV, desc: "Other TV"}
-      - {id: 16, cat: Audio, desc: "Radio"}
-      - {id: 11, cat: Movies, desc: "Silent"}
-      - {id: 12, cat: TV, desc: "Talent Show!"}
-      - {id: 14, cat: Movies, desc: "TV Movies"}
-      - {id: 13, cat: TV, desc: "TV Series"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: /takelogin.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      returnto: "index.php"
-    test:
-      path: /browse.php
-      selector: div.Userstats
-
-  ratio:
-    path: /browse.php
-    selector: div.Userstats
-    filters:
-      - name: regexp
-        args: "\n\u00a0(.*) \u00a0"
-
-  search:
-    path: /browse.php
-    inputs:
-      $raw: "{{range .Categories}}cat{{.}}=on&{{end}}"
-      search: "{{ .Query.Keywords }}"
-      incldead: "1"
-      tpp: "100"
-      dirty: "1"
-    rows:
-      selector: td > table[id="large"] > tbody > tr:has(div.browsing)
-      filters:
-        - name: andmatch
-      dateheaders:
-        selector: ":has(td.colhead[title] > b)"
-        filters:
-          - name: dateparse
-            args: "Mon 02 Jan"
-    fields:
-      title:
-        selector: a[href^="viewtopic.php?id="]
-      description:
-        selector: table > tbody > tr:nth-child(2) > td:nth-child(2)
-      category:
-        selector: a[href^="browse.php?cat"]
-        attribute: href
-        filters:
-          - name: replace
-            args: ["browse.php?cat", ""]
-          - name: replace
-            args: ["=on", ""]
-      details:
-        selector: a[href^="viewtopic.php?id="]
-        attribute: href      
-      download:
-        selector: a[href^="download.php/"]
-        attribute: href
-      size:
-        selector: table > tbody > tr:nth-child(2) > td:nth-child(4)
-      files:
-        selector: table > tbody > tr:nth-child(2) > td:nth-child(3)
-        filters:
-        - name: regexp
-          args: "(\\d+)"
-      grabs:
-        selector: table > tbody > tr:nth-child(2) > td:nth-child(5)
-        filters:
-        - name: regexp
-          args: "(\\d+)"
-      seeders:
-        selector: table > tbody > tr:nth-child(2) > td:nth-child(6)
-        filters:
-          - name: regexp
-            args: "(\\d+)"
-      leechers:
-        selector: table > tbody > tr:nth-child(2) > td:nth-child(7)
-        filters:
-          - name: regexp
-            args: "(\\d+)"
-      date:
-        selector: td:nth-child(1) > div > table > tbody > tr:nth-child(2) > td:nth-child(1)
-        filters:
-          - name: replace
-            args: ["'", ""]
-          - name: replace
-            args: ["\xA0", ""]
-          - name: dateparse
-            args: "02 Jan 0615:04"
-      downloadvolumefactor:
-        case:
-          "*": "1"
-      uploadvolumefactor:
-        case:
+---
+  site: secretcinema
+  name: Secret Cinema
+  description: "A tracker for rare movies."
+  language: en-us
+  type: private
+  encoding: "UTF-8"
+  links:
+    - http://www.secret-cinema.net
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: TV/Anime, desc: "Animation"}
+      - {id: 2, cat: Movies, desc: "Arthouse"}
+      - {id: 3, cat: Movies, desc: "Asian"}
+      - {id: 19, cat: Audio/Audiobook, desc: "Audiobooks"}
+      - {id: 29, cat: Movies, desc: "Badfilm"}
+      - {id: 18, cat: Books, desc: "Books"}
+      - {id: 4, cat: Movies, desc: "Classics"}
+      - {id: 5, cat: Movies, desc: "Comedy"}
+      - {id: 20, cat: Books/Comics, desc: "Comix"}
+      - {id: 6, cat: Movies, desc: "Cult"}
+      - {id: 7, cat: TV/Documentary, desc: "Documentary"}
+      - {id: 8, cat: Movies, desc: "Fantasy & SF"}
+      - {id: 9, cat: Movies, desc: "Horror"}
+      - {id: 22, cat: Movies, desc: "Noir"}
+      - {id: 17, cat: Audio, desc: "OST"}
+      - {id: 10, cat: Other, desc: "Other"}
+      - {id: 15, cat: TV, desc: "Other TV"}
+      - {id: 16, cat: Audio, desc: "Radio"}
+      - {id: 11, cat: Movies, desc: "Silent"}
+      - {id: 12, cat: TV, desc: "Talent Show!"}
+      - {id: 14, cat: Movies, desc: "TV Movies"}
+      - {id: 13, cat: TV, desc: "TV Series"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: /takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      returnto: "index.php"
+    test:
+      path: /browse.php
+      selector: div.Userstats
+
+  ratio:
+    path: /browse.php
+    selector: div.Userstats
+    filters:
+      - name: regexp
+        args: "\n\u00a0(.*) \u00a0"
+
+  search:
+    path: /browse.php
+    inputs:
+      $raw: "{{range .Categories}}cat{{.}}=on&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      incldead: "1"
+      tpp: "100"
+      dirty: "1"
+    rows:
+      selector: td > table[id="large"] > tbody > tr:has(div.browsing)
+      filters:
+        - name: andmatch
+      dateheaders:
+        selector: ":has(td.colhead[title] > b)"
+        filters:
+          - name: dateparse
+            args: "Mon 02 Jan"
+    fields:
+      title:
+        selector: a[href^="viewtopic.php?id="]
+      description:
+        selector: table > tbody > tr:nth-child(2) > td:nth-child(2)
+      category:
+        selector: a[href^="browse.php?cat"]
+        attribute: href
+        filters:
+          - name: replace
+            args: ["browse.php?cat", ""]
+          - name: replace
+            args: ["=on", ""]
+      details:
+        selector: a[href^="viewtopic.php?id="]
+        attribute: href      
+      download:
+        selector: a[href^="download.php/"]
+        attribute: href
+      size:
+        selector: table > tbody > tr:nth-child(2) > td:nth-child(4)
+      files:
+        selector: table > tbody > tr:nth-child(2) > td:nth-child(3)
+        filters:
+        - name: regexp
+          args: "(\\d+)"
+      grabs:
+        selector: table > tbody > tr:nth-child(2) > td:nth-child(5)
+        filters:
+        - name: regexp
+          args: "(\\d+)"
+      seeders:
+        selector: table > tbody > tr:nth-child(2) > td:nth-child(6)
+        filters:
+          - name: regexp
+            args: "(\\d+)"
+      leechers:
+        selector: table > tbody > tr:nth-child(2) > td:nth-child(7)
+        filters:
+          - name: regexp
+            args: "(\\d+)"
+      date:
+        selector: td:nth-child(1) > div > table > tbody > tr:nth-child(2) > td:nth-child(1)
+        filters:
+          - name: replace
+            args: ["'", ""]
+          - name: replace
+            args: ["\xA0", ""]
+          - name: dateparse
+            args: "02 Jan 0615:04"
+      downloadvolumefactor:
+        case:
+          "*": "1"
+      uploadvolumefactor:
+        case:
           "*": "1"

src/Jackett/Definitions/shareisland.yml

@@ -1,170 +1,170 @@
----
-  site: shareisland
-  name: Shareisland
-  description: "A general italian tracker"
-  language: it-it
-  type: private
-  encoding: UTF-8
-  links:
-    - http://shareisland.org
-
-  caps:
-    categorymappings:
-       - {id: 32, cat: Other, desc: "Vip"}
-       - {id: 45, cat: XXX, desc: "Vip XXX"}
-       - {id: 33, cat: Other, desc: "ex Vip"}
-       - {id: 1, cat: Movies, desc: "Movies"}
-       - {id: 49, cat: Movies/HD, desc: "H-264"}
-       - {id: 51, cat: Movies/HD, desc: "H-265"}
-       - {id: 41, cat: Movies/Other, desc: "Cartoons"}
-       - {id: 14, cat: Movies/SD, desc: "DivX"}
-       - {id: 16, cat: Movies/Other, desc: "Cine News"}
-       - {id: 39, cat: Movies/HD, desc: "720p"}
-       - {id: 40, cat: Movies/HD, desc: "1080p"}
-       - {id: 46, cat: Movies/BluRay, desc: "Blu Ray Disk"}
-       - {id: 31, cat: Movies/HD, desc: "BDRip"}
-       - {id: 17, cat: Movies/DVD, desc: "DVD"}
-       - {id: 43, cat: Movies/SD, desc: "DVDRip"}
-       - {id: 6, cat: PC, desc: "Applications"}
-       - {id: 18, cat: PC/0day, desc: "PC Applications"}
-       - {id: 19, cat: PC/Mac, desc: "Macintosh Applications"}
-       - {id: 44, cat: PC/Phone-Android, desc: "Android applications"}
-       - {id: 7, cat: Audio, desc: "Music"}
-       - {id: 20, cat: Audio/Video, desc: "Video"}
-       - {id: 21, cat: Audio/MP3, desc: "Mp3"}
-       - {id: 2, cat: Console, desc: "Games"}
-       - {id: 3, cat: Console/PS4, 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"}
-       - {id: 34, cat: Books, desc: "Edicola"}
-       - {id: 52, cat: Books, desc: "Quotidiani"}
-       - {id: 53, cat: Books, desc: "Libreria"}
-       - {id: 35, cat: TV, desc: "SerieTV"}
-       - {id: 55, cat: TV/HD, desc: "Serie Tv HD"}
-       - {id: 36, cat: Other, desc: "Rip By ShareIsland"}
-       - {id: 47, cat: Other, desc: "Disclaimer"}
-       - {id: 48, cat: Other, desc: "P2P network "}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: /ajax/login.php
-    method: post
-    form: form
-    inputs:
-      loginbox_membername: "{{ .Config.username }}"
-      loginbox_password: "{{ .Config.password }}"
-      action: "login"
-      loginbox_remember: "true"
-    error:
-      - selector: div.error
-    test:
-      path: /?p=home&pid=1
-      selector: div#member_info_bar
-
-  ratio:
-    path: /?p=home&pid=1
-    selector: img[title="Ratio"] + span
-
-  search:
-    path: /
-    keywordsfilters:
-      # most ITA TV torrents are in XXxYY format, so we search without S/E prefixes and filter later
-      - name: re_replace
-        args: ["S0?(\\d{1,2})", " $1 "]
-      - name: re_replace
-        args: ["E(\\d{2,3})", " $1 "]
-      - name: re_replace
-        args: ["[^a-zA-Z0-9]+", "%25"]
-    inputs:
-      p: "torrents"
-      pid: "32"
-      $raw: "{{range .Categories}}cid[]={{.}}&{{end}}"
-      keywords: "{{ .Keywords }}"
-      search_type: "name"
-      searchin: "title"
-
-    rows:
-      selector: table#torrents_table_classic > tbody > tr:not([id="torrents_table_classic_head"])
-      filters:
-        - name: andmatch
-    fields:
-      title:
-        selector: td.torrent_name > a
-        filters:
-          # normalize to SXXEYY format
-          - name: re_replace
-            args: ["(\\d{2})x(\\d{2})", "S$1E$2"]
-          - name: re_replace
-            args: ["(\\d{1})x(\\d{2})", "S0$1E$2"]
-      category:
-        selector: div.category_image > a
-        attribute: href
-        filters:
-          - name: querystring
-            args: cid
-      comments:
-        selector: td.torrent_name > a
-        attribute: href
-      download:
-        selector: a:has(img[title="Download Torrent"])
-        attribute: href
-      size:
-        selector: td.size
-      seeders:
-        selector: td.seeders
-      leechers:
-        selector: td.leechers
-      grabs:
-        selector: td.completed
-      downloadvolumefactor:
-        case:
-          "img[title=\"FREE!\"]": "0"
-          "img[title=\"Download Multiplier: 0.5\"]": "0.5"
-          "img[title=\"Moltiplicatore Download: 0.5\"]": "0.5"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "img[title=\"Upload Multiplier: 3\"]": "3"
-          "img[title=\"Upload Multiplier: 2\"]": "2"
-          "img[title=\"Upload Multiplier: 1.5\"]": "1.5"
-          "img[title=\"Moltiplicatore Upload: 3\"]": "3"
-          "img[title=\"Moltiplicatore Upload: 2\"]": "2"
-          "img[title=\"Moltiplicatore Upload: 1.5\"]": "1.5"
-          "*": "1"
-      date:
-        selector: td.torrent_name
-        remove: a, span, div, br
-        filters:
-          - name: replace
-            args: ["Uploaded ", ""]
-          - name: replace
-            args: [" by", ""]
-          - name: replace
-            args: [" at", ""]
-          - name: replace
-            args: ["Oggi", "Today"]
-          - name: replace
-            args: ["Ieri", "Yesterday"]
-          - name: replace
-            args: ["lunedì", "Monday"]
-          - name: replace
-            args: ["martedì", "Tuesday"]
-          - name: replace
-            args: ["Mercoledì", "Wednesday"]
-          - name: replace
-            args: ["Giovedì", "Thursday"]
-          - name: replace
-            args: ["Venerdì", "Friday"]
-          - name: replace
-            args: ["Sabato", "Saturday"]
-          - name: replace
-            args: ["Domenica", "Sunday"]
-          - name: replace
-            args: [" alle", ""]
-          - name: dateparse
-            args: "02-01-2006 15:04"
+---
+  site: shareisland
+  name: Shareisland
+  description: "A general italian tracker"
+  language: it-it
+  type: private
+  encoding: UTF-8
+  links:
+    - http://shareisland.org
+
+  caps:
+    categorymappings:
+       - {id: 32, cat: Other, desc: "Vip"}
+       - {id: 45, cat: XXX, desc: "Vip XXX"}
+       - {id: 33, cat: Other, desc: "ex Vip"}
+       - {id: 1, cat: Movies, desc: "Movies"}
+       - {id: 49, cat: Movies/HD, desc: "H-264"}
+       - {id: 51, cat: Movies/HD, desc: "H-265"}
+       - {id: 41, cat: Movies/Other, desc: "Cartoons"}
+       - {id: 14, cat: Movies/SD, desc: "DivX"}
+       - {id: 16, cat: Movies/Other, desc: "Cine News"}
+       - {id: 39, cat: Movies/HD, desc: "720p"}
+       - {id: 40, cat: Movies/HD, desc: "1080p"}
+       - {id: 46, cat: Movies/BluRay, desc: "Blu Ray Disk"}
+       - {id: 31, cat: Movies/HD, desc: "BDRip"}
+       - {id: 17, cat: Movies/DVD, desc: "DVD"}
+       - {id: 43, cat: Movies/SD, desc: "DVDRip"}
+       - {id: 6, cat: PC, desc: "Applications"}
+       - {id: 18, cat: PC/0day, desc: "PC Applications"}
+       - {id: 19, cat: PC/Mac, desc: "Macintosh Applications"}
+       - {id: 44, cat: PC/Phone-Android, desc: "Android applications"}
+       - {id: 7, cat: Audio, desc: "Music"}
+       - {id: 20, cat: Audio/Video, desc: "Video"}
+       - {id: 21, cat: Audio/MP3, desc: "Mp3"}
+       - {id: 2, cat: Console, desc: "Games"}
+       - {id: 3, cat: Console/PS4, 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"}
+       - {id: 34, cat: Books, desc: "Edicola"}
+       - {id: 52, cat: Books, desc: "Quotidiani"}
+       - {id: 53, cat: Books, desc: "Libreria"}
+       - {id: 35, cat: TV, desc: "SerieTV"}
+       - {id: 55, cat: TV/HD, desc: "Serie Tv HD"}
+       - {id: 36, cat: Other, desc: "Rip By ShareIsland"}
+       - {id: 47, cat: Other, desc: "Disclaimer"}
+       - {id: 48, cat: Other, desc: "P2P network "}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: /ajax/login.php
+    method: post
+    form: form
+    inputs:
+      loginbox_membername: "{{ .Config.username }}"
+      loginbox_password: "{{ .Config.password }}"
+      action: "login"
+      loginbox_remember: "true"
+    error:
+      - selector: div.error
+    test:
+      path: /?p=home&pid=1
+      selector: div#member_info_bar
+
+  ratio:
+    path: /?p=home&pid=1
+    selector: img[title="Ratio"] + span
+
+  search:
+    path: /
+    keywordsfilters:
+      # most ITA TV torrents are in XXxYY format, so we search without S/E prefixes and filter later
+      - name: re_replace
+        args: ["S0?(\\d{1,2})", " $1 "]
+      - name: re_replace
+        args: ["E(\\d{2,3})", " $1 "]
+      - name: re_replace
+        args: ["[^a-zA-Z0-9]+", "%25"]
+    inputs:
+      p: "torrents"
+      pid: "32"
+      $raw: "{{range .Categories}}cid[]={{.}}&{{end}}"
+      keywords: "{{ .Keywords }}"
+      search_type: "name"
+      searchin: "title"
+
+    rows:
+      selector: table#torrents_table_classic > tbody > tr:not([id="torrents_table_classic_head"])
+      filters:
+        - name: andmatch
+    fields:
+      title:
+        selector: td.torrent_name > a
+        filters:
+          # normalize to SXXEYY format
+          - name: re_replace
+            args: ["(\\d{2})x(\\d{2})", "S$1E$2"]
+          - name: re_replace
+            args: ["(\\d{1})x(\\d{2})", "S0$1E$2"]
+      category:
+        selector: div.category_image > a
+        attribute: href
+        filters:
+          - name: querystring
+            args: cid
+      comments:
+        selector: td.torrent_name > a
+        attribute: href
+      download:
+        selector: a:has(img[title="Download Torrent"])
+        attribute: href
+      size:
+        selector: td.size
+      seeders:
+        selector: td.seeders
+      leechers:
+        selector: td.leechers
+      grabs:
+        selector: td.completed
+      downloadvolumefactor:
+        case:
+          "img[title=\"FREE!\"]": "0"
+          "img[title=\"Download Multiplier: 0.5\"]": "0.5"
+          "img[title=\"Moltiplicatore Download: 0.5\"]": "0.5"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "img[title=\"Upload Multiplier: 3\"]": "3"
+          "img[title=\"Upload Multiplier: 2\"]": "2"
+          "img[title=\"Upload Multiplier: 1.5\"]": "1.5"
+          "img[title=\"Moltiplicatore Upload: 3\"]": "3"
+          "img[title=\"Moltiplicatore Upload: 2\"]": "2"
+          "img[title=\"Moltiplicatore Upload: 1.5\"]": "1.5"
+          "*": "1"
+      date:
+        selector: td.torrent_name
+        remove: a, span, div, br
+        filters:
+          - name: replace
+            args: ["Uploaded ", ""]
+          - name: replace
+            args: [" by", ""]
+          - name: replace
+            args: [" at", ""]
+          - name: replace
+            args: ["Oggi", "Today"]
+          - name: replace
+            args: ["Ieri", "Yesterday"]
+          - name: replace
+            args: ["lunedì", "Monday"]
+          - name: replace
+            args: ["martedì", "Tuesday"]
+          - name: replace
+            args: ["Mercoledì", "Wednesday"]
+          - name: replace
+            args: ["Giovedì", "Thursday"]
+          - name: replace
+            args: ["Venerdì", "Friday"]
+          - name: replace
+            args: ["Sabato", "Saturday"]
+          - name: replace
+            args: ["Domenica", "Sunday"]
+          - name: replace
+            args: [" alle", ""]
+          - name: dateparse
+            args: "02-01-2006 15:04"

src/Jackett/Definitions/sharespacedb.yml

@@ -1,156 +1,156 @@
----
-  site: sharespacedb
-  name: ShareSpaceDB
-  description: "A French gerneral tracker"
-  language: fr-fr
-  type: private
-  encoding: UTF-8
-  links:
-    - https://www.sharespacedb.me/
-
-  caps:
-    categorymappings:
-      - {id: 50, cat: TV/Anime, desc: "Anime: Tout"}
-      - {id: 40, cat: PC, desc: "Apps: Windows"}
-      - {id: 41, cat: PC/Mac, desc: "Apps: Mac"}
-      - {id: 42, cat: PC/Phone-Android, desc: "Apps: Android"}
-      - {id: 43, cat: PC/Phone-IOS, desc: "Apps: Ipod/Iphone"}
-      - {id: 44, cat: PC, desc: "Apps: Autres"}
-      - {id: 45, cat: PC, desc: "Apps: Linux"}
-      - {id: 27, cat: Books, desc: "E-Books: Livres"}
-      - {id: 28, cat: Books, desc: "E-Books: Audio"}
-      - {id: 29, cat: Books/Comics, desc: "E-Books: Comics"}
-      - {id: 30, cat: Books, desc: "E-Books: Mangas"}
-      - {id: 32, cat: Books, desc: "E-Books: Bds"}
-      - {id: 31, cat: Books, desc: "E-Books: Presse"}
-      - {id: 63, cat: Books, desc: "E-Books: ePUB"}
-      - {id: 1, cat: Movies/SD, desc: "Films: DVDRip"}
-      - {id: 2, cat: Movies/SD, desc: "Films: DVDRip VOSTFR"}
-      - {id: 3, cat: Movies/DVD, desc: "Films: DVD-R"}
-      - {id: 4, cat: Movies/HD, desc: "Films: 720p"}
-      - {id: 5, cat: Movies/HD, desc: "Films: 1080p"}
-      - {id: 6, cat: Movies/BluRay, desc: "Films: BluRay x264 et x265"}
-      - {id: 7, cat: Movies/3D, desc: "Films: BluRay-3D"}
-      - {id: 11, cat: Movies/HD, desc: "Films: BDRip"}
-      - {id: 9, cat: Movies/DVD, desc: "Films: R5"}
-      - {id: 10, cat: Movies/SD, desc: "Films: DVDSCR"}
-      - {id: 56, cat: Movies/HD, desc: "Films: mHD"}
-      - {id: 12, cat: Movies/HD, desc: "Films: BRRip"}
-      - {id: 13, cat: Movies/HD, desc: "Films: WEBRip"}
-      - {id: 58, cat: Movies/HD, desc: "Films: WEBRip 720p"}
-      - {id: 59, cat: Movies/HD, desc: "Films: WEBRip 1080p"}
-      - {id: 8, cat: Movies/SD, desc: "Films: Cam / TS"}
-      - {id: 62, cat: Movies/HD, desc: "Films: Uhd4k"}
-      - {id: 35, cat: Console/Xbox, desc: "Jeux: XBOX"}
-      - {id: 36, cat: Console/Wii, desc: "Jeux: WII"}
-      - {id: 37, cat: Console/PSP, desc: "Jeux: PSP"}
-      - {id: 38, cat: Console/NDS, desc: "Jeux: DS"}
-      - {id: 39, cat: PC/Phone-Android, desc: "Jeux: Android"}
-      - {id: 34, cat: Console/PS3, desc: "Jeux: PS3"}
-      - {id: 55, cat: PC/Mac, desc: "Jeux: Mac"}
-      - {id: 33, cat: PC/Games, desc: "Jeux: PC"}
-      - {id: 46, cat: Audio/MP3, desc: "Musiques: MP3"}
-      - {id: 47, cat: Audio/Lossless, desc: "Musiques: FLAC"}
-      - {id: 48, cat: Audio, desc: "Musiques: WMA"}
-      - {id: 49, cat: Audio, desc: "Musiques: Autres"}
-      - {id: 14, cat: TV/SD, desc: "Series: HDTV"}
-      - {id: 15, cat: TV, desc: "Series: TV VOSTFR"}
-      - {id: 16, cat: TV, desc: "Series: TV VOSTA"}
-      - {id: 17, cat: TV, desc: "Series: TV PACK"}
-      - {id: 18, cat: TV/HD, desc: "Series: HDTV 1080p"}
-      - {id: 57, cat: TV/HD, desc: "Series: TVHD VOSTFR"}
-      - {id: 20, cat: TV, desc: "Series: TV VO"}
-      - {id: 19, cat: TV/HD, desc: "Series: HDTV 720p"}
-      - {id: 64, cat: TV/SD, desc: "Series: WEBRip"}
-      - {id: 60, cat: TV/HD, desc: "Series: WEBRip 720p"}
-      - {id: 61, cat: TV/HD, desc: "Series: WEBRip 1080p"}
-      - {id: 21, cat: TV/SD, desc: "Series: DVD-R TV"}
-      - {id: 26, cat: TV, desc: "Television: Television"}
-      - {id: 24, cat: TV, desc: "Television: Spectacles"}
-      - {id: 23, cat: TV/Sport, desc: "Television: Sports"}
-      - {id: 25, cat: TV/Anime, desc: "Television: Animes"}
-      - {id: 22, cat: TV/Documentary, desc: "Television: Documentaires"}
-      - {id: 51, cat: XXX, desc: "XXX: Tous"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: account-login.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      remember: "yes"
-      returnto: "/"
-    error:
-    - selector: div#nfobar > p#msgError
-    test:
-      path: torrents-search.php
-
-  ratio:
-    path: torrents-search.php
-    selector: div#infobar0 > ul > li:nth-child(1) > font:last-child
-
-  search:
-    path: torrents-search.php
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
-      incldead: "1"
-
-    rows:
-      selector: table.ttable_headinner > tbody > tr.t-row
-      filters:
-        - name: andmatch
-      after: 1
-    fields:
-      download:
-        selector: a[href^="download.php?id="]
-        attribute: href
-      title:
-        selector: a[href^="torrents-details.php?id="]
-        attribute: title
-      category:
-        selector: a[href^="torrents.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      details:
-        selector: a[href^="torrents-details.php?id="]
-        attribute: href
-      comments:
-        selector: a[href^="comments.php"]
-        attribute: href
-      banner:
-        selector: a[onmouseover][href^="torrents-details.php?id="]
-        attribute: onmouseover
-        filters:
-          - name: regexp
-            args: <td align=left><img src=(.*?) width
-      size:
-        selector: td:nth-child(7)
-      grabs:
-        selector: td:nth-child(8)
-      seeders:
-        selector: td:nth-child(9)
-      leechers:
-        selector: td:nth-child(10)
-      date:
-        selector: small > i
-        filters:
-          - name: replace
-            args: ["Date: ", ""]
-          - name: replace
-            args: ["le ", ""]
-          - name: dateparse
-            args: "15:04:05 02-01-2006"
-      downloadvolumefactor:
-        case:
-          img[src="images/free.gif"]: "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
+---
+  site: sharespacedb
+  name: ShareSpaceDB
+  description: "A French gerneral tracker"
+  language: fr-fr
+  type: private
+  encoding: UTF-8
+  links:
+    - https://ssdb.me/
+
+  caps:
+    categorymappings:
+      - {id: 50, cat: TV/Anime, desc: "Anime: Tout"}
+      - {id: 40, cat: PC, desc: "Apps: Windows"}
+      - {id: 41, cat: PC/Mac, desc: "Apps: Mac"}
+      - {id: 42, cat: PC/Phone-Android, desc: "Apps: Android"}
+      - {id: 43, cat: PC/Phone-IOS, desc: "Apps: Ipod/Iphone"}
+      - {id: 44, cat: PC, desc: "Apps: Autres"}
+      - {id: 45, cat: PC, desc: "Apps: Linux"}
+      - {id: 27, cat: Books, desc: "E-Books: Livres"}
+      - {id: 28, cat: Books, desc: "E-Books: Audio"}
+      - {id: 29, cat: Books/Comics, desc: "E-Books: Comics"}
+      - {id: 30, cat: Books, desc: "E-Books: Mangas"}
+      - {id: 32, cat: Books, desc: "E-Books: Bds"}
+      - {id: 31, cat: Books, desc: "E-Books: Presse"}
+      - {id: 63, cat: Books, desc: "E-Books: ePUB"}
+      - {id: 1, cat: Movies/SD, desc: "Films: DVDRip"}
+      - {id: 2, cat: Movies/SD, desc: "Films: DVDRip VOSTFR"}
+      - {id: 3, cat: Movies/DVD, desc: "Films: DVD-R"}
+      - {id: 4, cat: Movies/HD, desc: "Films: 720p"}
+      - {id: 5, cat: Movies/HD, desc: "Films: 1080p"}
+      - {id: 6, cat: Movies/BluRay, desc: "Films: BluRay x264 et x265"}
+      - {id: 7, cat: Movies/3D, desc: "Films: BluRay-3D"}
+      - {id: 11, cat: Movies/HD, desc: "Films: BDRip"}
+      - {id: 9, cat: Movies/DVD, desc: "Films: R5"}
+      - {id: 10, cat: Movies/SD, desc: "Films: DVDSCR"}
+      - {id: 56, cat: Movies/HD, desc: "Films: mHD"}
+      - {id: 12, cat: Movies/HD, desc: "Films: BRRip"}
+      - {id: 13, cat: Movies/HD, desc: "Films: WEBRip"}
+      - {id: 58, cat: Movies/HD, desc: "Films: WEBRip 720p"}
+      - {id: 59, cat: Movies/HD, desc: "Films: WEBRip 1080p"}
+      - {id: 8, cat: Movies/SD, desc: "Films: Cam / TS"}
+      - {id: 62, cat: Movies/HD, desc: "Films: Uhd4k"}
+      - {id: 35, cat: Console/Xbox, desc: "Jeux: XBOX"}
+      - {id: 36, cat: Console/Wii, desc: "Jeux: WII"}
+      - {id: 37, cat: Console/PSP, desc: "Jeux: PSP"}
+      - {id: 38, cat: Console/NDS, desc: "Jeux: DS"}
+      - {id: 39, cat: PC/Phone-Android, desc: "Jeux: Android"}
+      - {id: 34, cat: Console/PS3, desc: "Jeux: PS3"}
+      - {id: 55, cat: PC/Mac, desc: "Jeux: Mac"}
+      - {id: 33, cat: PC/Games, desc: "Jeux: PC"}
+      - {id: 46, cat: Audio/MP3, desc: "Musiques: MP3"}
+      - {id: 47, cat: Audio/Lossless, desc: "Musiques: FLAC"}
+      - {id: 48, cat: Audio, desc: "Musiques: WMA"}
+      - {id: 49, cat: Audio, desc: "Musiques: Autres"}
+      - {id: 14, cat: TV/SD, desc: "Series: HDTV"}
+      - {id: 15, cat: TV, desc: "Series: TV VOSTFR"}
+      - {id: 16, cat: TV, desc: "Series: TV VOSTA"}
+      - {id: 17, cat: TV, desc: "Series: TV PACK"}
+      - {id: 18, cat: TV/HD, desc: "Series: HDTV 1080p"}
+      - {id: 57, cat: TV/HD, desc: "Series: TVHD VOSTFR"}
+      - {id: 20, cat: TV, desc: "Series: TV VO"}
+      - {id: 19, cat: TV/HD, desc: "Series: HDTV 720p"}
+      - {id: 64, cat: TV/SD, desc: "Series: WEBRip"}
+      - {id: 60, cat: TV/HD, desc: "Series: WEBRip 720p"}
+      - {id: 61, cat: TV/HD, desc: "Series: WEBRip 1080p"}
+      - {id: 21, cat: TV/SD, desc: "Series: DVD-R TV"}
+      - {id: 26, cat: TV, desc: "Television: Television"}
+      - {id: 24, cat: TV, desc: "Television: Spectacles"}
+      - {id: 23, cat: TV/Sport, desc: "Television: Sports"}
+      - {id: 25, cat: TV/Anime, desc: "Television: Animes"}
+      - {id: 22, cat: TV/Documentary, desc: "Television: Documentaires"}
+      - {id: 51, cat: XXX, desc: "XXX: Tous"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: account-login.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      remember: "yes"
+      returnto: "/"
+    error:
+    - selector: div#nfobar > p#msgError
+    test:
+      path: torrents-search.php
+
+  ratio:
+    path: torrents-search.php
+    selector: div#infobar0 > ul > li:nth-child(1) > font:last-child
+
+  search:
+    path: torrents-search.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      incldead: "1"
+
+    rows:
+      selector: table.ttable_headinner > tbody > tr.t-row
+      filters:
+        - name: andmatch
+      after: 1
+    fields:
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      title:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: title
+      category:
+        selector: a[href^="torrents.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      details:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: href
+      comments:
+        selector: a[href^="comments.php"]
+        attribute: href
+      banner:
+        selector: a[onmouseover][href^="torrents-details.php?id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: <td align=left><img src=(.*?) width
+      size:
+        selector: td:nth-child(7)
+      grabs:
+        selector: td:nth-child(8)
+      seeders:
+        selector: td:nth-child(9)
+      leechers:
+        selector: td:nth-child(10)
+      date:
+        selector: small > i
+        filters:
+          - name: replace
+            args: ["Date: ", ""]
+          - name: replace
+            args: ["le ", ""]
+          - name: dateparse
+            args: "15:04:05 02-01-2006"
+      downloadvolumefactor:
+        case:
+          img[src="images/free.gif"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
           "*": "1"

src/Jackett/Definitions/shellife.yml

@@ -1,81 +1,81 @@
----
-  site: shellife
-  name: Shellife
-  language: en-us
-  type: private
-  encoding: UTF-8
-  links:
-    - https://shellife.eu/
-
-  caps:
-    categories:
-      1: Audio
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: takelogin.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: td:has(h2:contains("failed"))
-    test:
-      path: browse.php
-
-  search:
-    path: browse.php
-    inputs:
-      search: "{{ .Query.Keywords }}"
-      incldead: 1
-    rows:
-      selector: table#ct > tbody > tr.torrent_row
-      filters:
-        - name: andmatch
-    fields:
-      download:
-        selector: a[href^="download.php?id="]
-        attribute: href
-      title:
-        selector: a.altlink
-      title|append|1:
-        text: " - "
-      title|append|2:
-        selector: a[name]
-      details:
-        selector: a[name]
-        attribute: href
-        filters:
-          - name: replace
-            args: ["#", "/details.php?id="]
-      category:
-        text: 1
-      seeders:
-        selector: td:nth-child(7)
-      leechers:
-        selector: td:nth-child(8)
-      grabs:
-        selector: td:nth-child(6)
-      size:
-        selector: td:nth-child(5)
-      downloadvolumefactor:
-        case:
-          img[alt="Freeleech"]: "0"
-          img[alt="Free"]: "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
-      description:
-        selector: td:nth-child(2)
-        remove: a.altlink, a[name], div[id^="news"]
-        filters:
-          - name: trim
-            args: "-"
-          - name: trim
-            args: " "
-          
+---
+  site: shellife
+  name: Shellife
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://shellife.eu/
+
+  caps:
+    categories:
+      1: Audio
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: td:has(h2:contains("failed"))
+    test:
+      path: browse.php
+
+  search:
+    path: browse.php
+    inputs:
+      search: "{{ .Query.Keywords }}"
+      incldead: 1
+    rows:
+      selector: table#ct > tbody > tr.torrent_row
+      filters:
+        - name: andmatch
+    fields:
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      title:
+        selector: a.altlink
+      title|append|1:
+        text: " - "
+      title|append|2:
+        selector: a[name]
+      details:
+        selector: a[name]
+        attribute: href
+        filters:
+          - name: replace
+            args: ["#", "/details.php?id="]
+      category:
+        text: 1
+      seeders:
+        selector: td:nth-child(7)
+      leechers:
+        selector: td:nth-child(8)
+      grabs:
+        selector: td:nth-child(6)
+      size:
+        selector: td:nth-child(5)
+      downloadvolumefactor:
+        case:
+          img[alt="Freeleech"]: "0"
+          img[alt="Free"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"
+      description:
+        selector: td:nth-child(2)
+        remove: a.altlink, a[name], div[id^="news"]
+        filters:
+          - name: trim
+            args: "-"
+          - name: trim
+            args: " "
+          
       

src/Jackett/Definitions/skytorrents.yml

@@ -1,58 +1,58 @@
----
-  site: skytorrents
-  name: Sky torrents
-  language: en-us
-  type: public
-  encoding: UTF-8
-  links:
-    - https://www.skytorrents.in/
-
-  caps:
-    categories:
-      TV: TV
-      Movies: Movies
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  settings: []
-  
-  search:
-    path: "search/all/{{if .Query.Keywords}}ed{{else}}ad{{end}}/1/{{ .Query.Keywords}}"
-    rows:
-      selector: "table > tbody > tr"
-      filters:
-        - name: andmatch
-    fields:
-      title:
-        selector: td:nth-child(1) > a:first-child[title]
-        attribute: title
-      details:
-        selector: td:nth-child(1) > a:first-child
-        attribute: href
-      size:
-        selector: td:nth-child(2)
-      files:
-        selector: td:nth-child(3)
-      seeders:
-        selector: td:nth-child(5)
-      leechers:
-        selector: td:nth-child(6)
-      description:
-        selector: td:nth-child(1)
-        case:
-          img[title="Verified and marked"]: "Verified and marked"
-          "*": ""
-      date:
-        selector: td:nth-child(4)
-        filters:
-          - name: dateparse
-            args: "01-02-2006"
-      download:
-        selector: td > a[href^="/file"]
-        attribute: href
-      downloadvolumefactor:
-        text: "0"
-      uploadvolumefactor:
+---
+  site: skytorrents
+  name: Sky torrents
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    - https://www.skytorrents.in/
+
+  caps:
+    categories:
+      TV: TV
+      Movies: Movies
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  settings: []
+  
+  search:
+    path: "search/all/{{if .Query.Keywords}}ed{{else}}ad{{end}}/1/{{ .Query.Keywords}}"
+    rows:
+      selector: "table > tbody > tr"
+      filters:
+        - name: andmatch
+    fields:
+      title:
+        selector: td:nth-child(1) > a:first-child[title]
+        attribute: title
+      details:
+        selector: td:nth-child(1) > a:first-child
+        attribute: href
+      size:
+        selector: td:nth-child(2)
+      files:
+        selector: td:nth-child(3)
+      seeders:
+        selector: td:nth-child(5)
+      leechers:
+        selector: td:nth-child(6)
+      description:
+        selector: td:nth-child(1)
+        case:
+          img[title="Verified and marked"]: "Verified and marked"
+          "*": ""
+      date:
+        selector: td:nth-child(4)
+        filters:
+          - name: dateparse
+            args: "01-02-2006"
+      download:
+        selector: td > a[href^="/file"]
+        attribute: href
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
         text: "1"

src/Jackett/Definitions/tasmanit.yml

@@ -0,0 +1,109 @@
+---
+  site: tasmanit
+  name: Tasmanit
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://tasmanit.es
+
+  caps:
+    categorymappings:
+      - {id: 72, cat: TV, desc: "All Australian TV"}
+      - {id: 23, cat: TV, desc: "AU-AUTOGEN"}
+      - {id: 8, cat: TV, desc: "Australian Comedy"}
+      - {id: 18, cat: TV, desc: "Australian Crime Shows"}
+      - {id: 14, cat: TV, desc: "Australian Documentaries"}
+      - {id: 9, cat: TV, desc: "Australian Dramas"}
+      - {id: 10, cat: TV, desc: "Australian Game/Quiz Shows"}
+      - {id: 12, cat: TV, desc: "Australian Kids Shows"}
+      - {id: 21, cat: TV, desc: "Australian Lifestyle TV"}
+      - {id: 11, cat: TV, desc: "Aussie News and Current Affairs"}
+      - {id: 76, cat: TV/Other, desc: "Australian TV Other"}
+      - {id: 15, cat: TV, desc: "Australian Real Crime"}
+      - {id: 13, cat: TV, desc: "Australian Reality TV"}
+      - {id: 17, cat: TV, desc: "Australian Science Shows"}
+      - {id: 80, cat: TV, desc: "Australian Soaps"}
+      - {id: 16, cat: TV, desc: "Australian Talkshows"}
+      - {id: 22, cat: TV, desc: "Australian Movies"}
+      - {id: 73, cat: TV, desc: "New Zealand TV"}
+      - {id: 61, cat: TV, desc: "NZ-AUTOGEN"}
+      - {id: 47, cat: TV, desc: "New Zealand Comedy"}
+      - {id: 58, cat: TV, desc: "New Zealand Crime Shows"}
+      - {id: 53, cat: TV, desc: "New Zealand Documentaries"}
+      - {id: 48, cat: TV, desc: "New Zealand Dramas"}
+      - {id: 49, cat: TV, desc: "New Zealand Game/Quiz Shows"}
+      - {id: 51, cat: TV, desc: "New Zealand Kids Shows"}
+      - {id: 56, cat: TV, desc: "New Zealand Lifestyle TV"}
+      - {id: 50, cat: TV, desc: "New Zealand News and Current Affairs"}
+      - {id: 60, cat: TV, desc: "New Zealand Real Crime"}
+      - {id: 52, cat: TV, desc: "New Zealand Reality TV"}
+      - {id: 54, cat: TV, desc: "New Zealand Science Shows"}
+      - {id: 81, cat: TV, desc: "New Zealand Soaps"}
+      - {id: 57, cat: TV, desc: "New Zealand Talkshows"}
+      - {id: 59, cat: TV, desc: "New Zealand Movies"}
+      - {id: 36, cat: TV, desc: "New Zealand TV"}
+      - {id: 55, cat: TV, desc: "SATV - All"}
+      - {id: 55, cat: TV, desc: "South African TV"}
+      - {id: 7, cat: TV/Other, desc: "New Zealand TV Other"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: login.php
+    method: form
+    form: form[action="takelogin.php"]
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: div#content:has(h2:contains("Login Failed"))
+    test:
+      path: browse.php
+
+  search:
+    path: browse.php
+    method: post
+    inputs:
+      do: "search"
+      keywords: "{{ .Keywords }}"
+      search_type: "t_name"
+      include_dead_torrents: "yes"
+    rows:
+      selector: table#sortabletable > tbody > tr:has(a[href])
+    fields:
+      title:
+        selector: td:nth-child(2) a
+      category:
+        selector: a[href^="https://tasmanit.es/browse.php?category="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: category
+      details:
+        selector: a[href^="https://tasmanit.es/details.php?id="]
+        attribute: href    
+      download:
+        selector: a[href^="https://tasmanit.es/details.php?id="]
+        attribute: href
+        filters:
+          - name: replace
+            args: ["details.php", "download.php"]
+      size:
+        selector: td:nth-child(5)
+      grabs:
+        selector: td:nth-child(6)
+      seeders:
+        selector: td:nth-child(7)
+      leechers:
+        selector: td:nth-child(8)
+      date:
+        selector: td:nth-child(2)
+      downloadvolumefactor:
+        case:
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett/Definitions/tenyardtracker.yml

@@ -1,74 +1,74 @@
----
-  site: tenyardtracker
-  name: TenYardTracker
-  description: "An American football tracker"
-  language: en-us
-  type: private
-  encoding: UTF-8
-  links:
-    - http://tenyardtracker.com/
-
-  caps:
-    categories:
-      1: TV # Sports
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: members.php?action=takelogin
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: div:contains("Login Failed")
-    test:
-      path: my.php
-    #error:
-      #- path: members.php?action=takelogin
-    test:
-      path: my.php
-      #selector: a[href="members.php?action=logout"]
-      
-  ratio:
-    path: browse.php
-    selector: #status_bar
-
-  search:
-    path: browse.php
-    inputs:
-      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
-    rows:
-      selector: table[border="1"] tr:not(:first-child)
-    fields:
-      category:
-        text: 1
-      title:
-        selector: td:nth-child(2)
-      download:
-        selector: a[href^="details.php?id="]
-        attribute: href
-        filters:
-          - name: replace
-            args: ["details.php?id=", "download.php?torrent="]
-      details:
-        selector: a[href^="details.php?id="]
-        attribute: href
-      files:
-        selector: td:nth-child(3)
-      date:
-        selector: td:nth-child(5)
-      size:
-        selector: td:nth-child(6)
-      seeders:
-        selector: td:nth-child(8)
-      leechers:
-        selector: td:nth-child(9)
-      downloadvolumefactor:
-        case:
-          "*": "1"
-      uploadvolumefactor:
-        case:
+---
+  site: tenyardtracker
+  name: TenYardTracker
+  description: "An American football tracker"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - http://tenyardtracker.com/
+
+  caps:
+    categories:
+      1: TV # Sports
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: members.php?action=takelogin
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: div:contains("Login Failed")
+    test:
+      path: my.php
+    #error:
+      #- path: members.php?action=takelogin
+    test:
+      path: my.php
+      #selector: a[href="members.php?action=logout"]
+      
+  ratio:
+    path: browse.php
+    selector: #status_bar
+
+  search:
+    path: browse.php
+    inputs:
+      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+    rows:
+      selector: table[border="1"] tr:not(:first-child)
+    fields:
+      category:
+        text: 1
+      title:
+        selector: td:nth-child(2)
+      download:
+        selector: a[href^="details.php?id="]
+        attribute: href
+        filters:
+          - name: replace
+            args: ["details.php?id=", "download.php?torrent="]
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      files:
+        selector: td:nth-child(3)
+      date:
+        selector: td:nth-child(5)
+      size:
+        selector: td:nth-child(6)
+      seeders:
+        selector: td:nth-child(8)
+      leechers:
+        selector: td:nth-child(9)
+      downloadvolumefactor:
+        case:
+          "*": "1"
+      uploadvolumefactor:
+        case:
           "*": "1"

src/Jackett/Definitions/theempire.yml

@@ -0,0 +1,121 @@
+---
+  site: theempire
+  name: The Empire
+  description: "Commonwealth television"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - http://www.theempire.bz/
+
+  caps:
+    categorymappings:
+      - {id: 55, cat: TV, desc: "Adverts"}
+      - {id: 60, cat: TV, desc: "Educational"}
+      - {id: 63, cat: TV, desc: "Game Shows"}
+      - {id: 67, cat: TV, desc: "Music"}
+      - {id: 72, cat: TV, desc: "QuizComedy"}
+      - {id: 77, cat: TV, desc: "Special Events"}
+      - {id: 81, cat: TV, desc: "Trains & Planes"}
+      - {id: 54, cat: TV, desc: "Arts & Culture"}
+      - {id: 61, cat: TV, desc: "Entertainment"}
+      - {id: 53, cat: TV, desc: "Gardening"}
+      - {id: 68, cat: TV, desc: "Mystery & Crime Fiction"}
+      - {id: 73, cat: TV, desc: "Radio"}
+      - {id: 78, cat: TV, desc: "Special Interest"}
+      - {id: 82, cat: TV, desc: "Travel"}
+      - {id: 56, cat: TV, desc: "Comedy"}
+      - {id: 85, cat: TV, desc: "Euro-Noir"}
+      - {id: 64, cat: TV, desc: "Kids"}
+      - {id: 69, cat: TV, desc: "News"}
+      - {id: 74, cat: TV, desc: "Reality"}
+      - {id: 79, cat: TV, desc: "Sport"}
+      - {id: 83, cat: TV, desc: "Wildlife & Nature"}
+      - {id: 58, cat: TV, desc: "Documentary"}
+      - {id: 57, cat: TV, desc: "Fly on the Wall/Lifestyle"}
+      - {id: 65, cat: TV, desc: "Magazine"}
+      - {id: 70, cat: TV, desc: "Occult & Horror"}
+      - {id: 75, cat: TV, desc: "Sci-Fi"}
+      - {id: 84, cat: TV, desc: "Style & Fashion"}
+      - {id: 62, cat: TV, desc: "Food Drink & Cooking"}
+      - {id: 66, cat: TV, desc: "Motoring"}
+      - {id: 71, cat: TV, desc: "Property"}
+      - {id: 76, cat: TV, desc: "Soaps"}
+      - {id: 80, cat: TV, desc: "Talkshow"}
+      - {id: 59, cat: TV, desc: "Drama"}
+
+    modes:
+      search: [q]
+
+  login:
+    path: /login.php
+    method: form
+    form: form
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    captcha:
+      type: image
+      image: img#freecap
+      input: word
+    error:
+      - selector: table:contains("Login failed!")
+    test:
+      path: main.php
+
+  download:
+    selector: a[href^="download.php"]
+        
+  search:
+    path: browse.php
+    inputs:
+      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+    rows:
+      selector: table[border="0"] > tbody > tr.ttable:has(a[href^="browse.php?cat="])
+    fields:
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        filters:
+        selector: td:nth-child(2) b
+      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(8)
+        filters:
+          - name: regexp
+            args: ([\d,]+)
+      files:
+        selector: td:nth-child(4)
+      size:
+        selector: td:nth-child(7)
+      seeders:
+        selector: td:nth-child(9)
+      leechers:
+        selector: td:nth-child(10)
+      date:
+        selector: td:nth-child(6)
+        filters:
+          - name: regexp
+            args: (\d{4}-\d{2}-\d{2})
+      downloadvolumefactor:
+        case:
+          "font[color=\"green\"]": "0"
+          "font[color=\"blue\"]": "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "font[color=\"green\"]": "0"
+          "*": "1"

src/Jackett/Definitions/thehorrorcharnel.yml

@@ -1,105 +1,105 @@
----
-  site: thehorrorcharnel
-  name: The Horror Charnel
-  description: "A Horror, Cult, Sleaze, Sci-Fi & more tracker"
-  language: en-us
-  type: private
-  encoding: UTF-8
-  links:
-    - https://horrorcharnel.org
-
-  caps:
-    categories:
-      1: Movies
-      2: TV
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  settings:
-    - name: username
-      type: text
-      label: Username
-    - name: password
-      type: password
-      label: Password
-
-  login:
-    path: loginto.php
-    method: form
-    form: form
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      use_sslvalue=: "on"
-      perm_ssl: "1"
-      returnto: "/"
-    error:
-      - selector: "div#base_content > table.mainouter > tbody > tr > td.outer > table.main > tbody > tr > td:has(h2)"
-    test:
-      path: usercp.php
-      
-  ratio:
-    path: /my.php
-    selector: td.navi_top:contains("Deine Ratio:")
-    filters:
-      - name: replace
-        args: ["Deine Ratio: ", ""]
-      - name: replace
-        args: [".", ""]
-      - name: replace
-        args: [",", "."]
-
-  search:
-    path: /browse.php
-    inputs:
-      #$raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
-      incldead: 1
-
-    rows:
-      selector: p + table > tbody > tr:has(a[href^="details.php?id="]), p + table > tbody > tr[id^="kdescr"]
-      filters:
-        - name: andmatch
-      after: 1
-    fields:
-      title:
-        selector: a[onmouseover][href^="details.php?id="]
-        attribute: onmouseover
-        filters:
-          - name: regexp
-            args: <b>(.*?)</b>
-      description:
-        selector: td[colspan="13"]
-        remove: a
-      category:
-        text: 1
-      comments:
-        selector: a[onmouseover][href^="details.php"]
-        attribute: href
-      download:
-        selector: a[href^="download.php"]
-        attribute: href
-      files:
-        selector: td:nth-child(6)
-      size:
-        selector: td:nth-child(9)
-      seeders:
-        selector: td:nth-child(11)
-      leechers:
-        selector: td:nth-child(12)
-      date:
-        selector: td:nth-child(8)
-      grabs:
-        selector: td:nth-child(10)
-        filters:
-          - name: regexp
-            args: (\d+)
-      downloadvolumefactor:
-        case:
-          img[src="free.gif"]: "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
+---
+  site: thehorrorcharnel
+  name: The Horror Charnel
+  description: "A Horror, Cult, Sleaze, Sci-Fi & more tracker"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://horrorcharnel.org
+
+  caps:
+    categories:
+      1: Movies
+      2: TV
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+
+  login:
+    path: loginto.php
+    method: form
+    form: form
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      use_sslvalue=: "on"
+      perm_ssl: "1"
+      returnto: "/"
+    error:
+      - selector: "div#base_content > table.mainouter > tbody > tr > td.outer > table.main > tbody > tr > td:has(h2)"
+    test:
+      path: usercp.php
+      
+  ratio:
+    path: /my.php
+    selector: td.navi_top:contains("Deine Ratio:")
+    filters:
+      - name: replace
+        args: ["Deine Ratio: ", ""]
+      - name: replace
+        args: [".", ""]
+      - name: replace
+        args: [",", "."]
+
+  search:
+    path: /browse.php
+    inputs:
+      #$raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      incldead: 1
+
+    rows:
+      selector: p + table > tbody > tr:has(a[href^="details.php?id="]), p + table > tbody > tr[id^="kdescr"]
+      filters:
+        - name: andmatch
+      after: 1
+    fields:
+      title:
+        selector: a[onmouseover][href^="details.php?id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: <b>(.*?)</b>
+      description:
+        selector: td[colspan="13"]
+        remove: a
+      category:
+        text: 1
+      comments:
+        selector: a[onmouseover][href^="details.php"]
+        attribute: href
+      download:
+        selector: a[href^="download.php"]
+        attribute: href
+      files:
+        selector: td:nth-child(6)
+      size:
+        selector: td:nth-child(9)
+      seeders:
+        selector: td:nth-child(11)
+      leechers:
+        selector: td:nth-child(12)
+      date:
+        selector: td:nth-child(8)
+      grabs:
+        selector: td:nth-child(10)
+        filters:
+          - name: regexp
+            args: (\d+)
+      downloadvolumefactor:
+        case:
+          img[src="free.gif"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
           "*": "1"

src/Jackett/Definitions/thepiratebay.yml

@@ -10,17 +10,62 @@
     - https://tproxy.pro/
 
   caps:
-    categories:
-      201: Movies
-      202: Movies/DVD
-      203: Audio/Video  # Music videos
-      204: Movies/Other # Movie clips
-      205: TV
-      206: TV/Other     # Handheld
-      207: Movies/HD
-      208: TV/HD
-      209: Movies/3D
-      299: Movies/Other
+    categorymappings:
+      #Audio
+      - {id: 101, cat: Audio, desc: "Music"}
+      - {id: 102, cat: Audio/Audiobook, desc: "Audio books"}
+      - {id: 103, cat: Audio, desc: "Sound clips"}
+      - {id: 104, cat: Audio/Lossless, desc: "FLAC"}
+      - {id: 199, cat: Audio/Other, desc: "Audio Other"}
+
+      #Video
+      - {id: 201, cat: Movies, desc: "Movies"}
+      - {id: 202, cat: Movies/DVD, desc: "Movies DVDR"}
+      - {id: 203, cat: Audio/Video, desc: "Music videos"}
+      - {id: 204, cat: Movies/Other, desc: "Movie clips"}
+      - {id: 205, cat: TV, desc: "TV shows"}
+      - {id: 206, cat: TV/Other, desc: "Handheld"}
+      - {id: 207, cat: Movies/HD, desc: "HD - Movies"}
+      - {id: 208, cat: TV/HD, desc: "HD - TV shows"}
+      - {id: 209, cat: Movies/3D, desc: "3D"}
+      - {id: 299, cat: Movies/Other, desc: "Video Other"}
+
+      #Applications
+      - {id: 301, cat: PC, desc: "Windows"}
+      - {id: 302, cat: PC/Mac, desc: "Mac"}
+      - {id: 303, cat: PC, desc: "UNIX"}
+      - {id: 304, cat: PC/Phone-Other, desc: "Handheld"}
+      - {id: 305, cat: PC/Phone-IOS, desc: "IOS (iPad/iPhone)"}
+      - {id: 306, cat: PC/Phone-Android, desc: "Android"}
+      - {id: 399, cat: PC, desc: "Other OS"}
+
+      #Games
+      - {id: 401, cat: PC/Games, desc: "PC"}
+      - {id: 402, cat: PC/Mac, desc: "Mac"}
+      - {id: 403, cat: Console/PS4, desc: "PSx"}
+      - {id: 404, cat: Console/Xbox, desc: "XBOX360"}
+      - {id: 405, cat: Console/Wii, desc: "Wii"}
+      - {id: 406, cat: Console/Other, desc: "Handheld"}
+      - {id: 407, cat: Console/Other, desc: "IOS (iPad/iPhone)"}
+      - {id: 408, cat: Console/Other, desc: "Android"}
+      - {id: 499, cat: Console/Other, desc: "Games Other"}
+
+      #Porn
+      - {id: 501, cat: XXX, desc: "Movies"}
+      - {id: 502, cat: XXX/DVD, desc: "Movies DVDR"}
+      - {id: 503, cat: XXX/Imageset, desc: "Pictures"}
+      - {id: 504, cat: XXX, desc: "Games"}
+      - {id: 505, cat: XXX, desc: "HD - Movies"}
+      - {id: 506, cat: XXX, desc: "Movie clips"}
+      - {id: 599, cat: XXX/Other, desc: "Porn Other"}
+
+      #Other
+      - {id: 601, cat: Books, desc: "E-books"}
+      - {id: 602, cat: Books/Comics, desc: "Comics"}
+      - {id: 603, cat: Books, desc: "Pictures"}
+      - {id: 604, cat: Books, desc: "Covers"}
+      - {id: 605, cat: Books, desc: "Physibles"}
+      - {id: 699, cat: Books/Other, desc: "Other Other"}
 
     modes:
       tv-search: [q, season, ep]
@@ -28,7 +73,7 @@
   settings: []
   
   search:
-    path: "{{if .Query.Keywords}}search/{{ .Query.Keywords}}/0/99/0{{else}}/recent{{end}}"
+    path: "{{if .Query.Keywords}}/search/{{ .Query.Keywords}}/0/99/{{range .Categories }}{{.}}{{end}}{{else}}/recent{{end}}"
     rows:
       selector: "#searchResult tbody tr:has(td.vertTh)"
     fields:

src/Jackett/Definitions/theshinning.yml

@@ -1,157 +1,157 @@
----
-  site: theshinning
-  name: The Shinning
-  description: "A German gerneral tracker"
-  language: de-de
-  type: private
-  encoding: windows-1252
-  links:
-    - https://theshinning.org
-
-  caps:
-    categorymappings:
-      # Filme
-      - {id: 28, cat: Movies/SD, desc: "HORROR"}
-      - {id: 25, cat: Movies/DVD, desc: "SD|DVD"}
-      - {id: 99, cat: Movies/SD, desc: "SD|SPORT"}
-      - {id: 24, cat: Movies/SD, desc: "SD|x264"}
-      - {id: 22, cat: Movies/SD, desc: "SD|XVID"}
-      - {id: 26, cat: XXX, desc: "SD|XxX"}
-
-      # High Definition
-      - {id: 29, cat: Movies/BluRay, desc: "BLURAY"}
-      - {id: 19, cat: Movies/HD, desc: "HD|1080p"}
-      - {id: 21, cat: Movies/3D, desc: "HD|3D"}
-      - {id: 107, cat: Movies/HD, desc: "HD|4K"}
-      - {id: 20, cat: Movies/HD, desc: "HD|720p"}
-      - {id: 101, cat: Movies/HD, desc: "HD|REMUX"}
-      - {id: 100, cat: Movies/HD, desc: "HD|SPORT"}
-      - {id: 27, cat: XXX, desc: "HD|XxX"}
-      - {id: 102, cat: Movies/HD, desc: "SMALL|HD"}
-
-      # Musik
-      - {id: 13, cat: Audio, desc: "CHARTS"}
-      - {id: 31, cat: Audio/Lossless, desc: "FLAC"}
-      - {id: 97, cat: Audio/Audiobook, desc: "HOERSPIELE"}
-      - {id: 30, cat: Audio/MP3, desc: "MP3"}
-      - {id: 106, cat: Audio, desc: "SAMPLER"}
-
-      # Releaser
-      - {id: 18, cat: Movies, desc: "CR3WHD"}
-      - {id: 16, cat: Movies, desc: "ONKEL JENS"}
-      - {id: 17, cat: Movies, desc: "xTM|XviD"}
-
-      # Serie
-      - {id: 11, cat: TV/SD, desc: "DVD|SERIEN"}
-      - {id: 9, cat: TV/HD, desc: "HD|SERIEN"}
-      - {id: 32, cat: TV, desc: "MIXED|SERIEN"}
-      - {id: 10, cat: TV, desc: "PACK|SERIEN"}
-      - {id: 8, cat: TV/SD, desc: "SD|SERIEN"}
-      - {id: 105, cat: TV, desc: "SMALL|SERIE"}
-      - {id: 12, cat: TV, desc: "US|SERIEN"}
-
-      # Sonstige
-      - {id: 98, cat: PC, desc: "APPS"}
-      - {id: 90, cat: TV/Documentary, desc: "DOKUS"}
-      - {id: 91, cat: Books, desc: "EBOOKS"}
-      - {id: 14, cat: Movies, desc: "KINOHITS"}
-      - {id: 15, cat: Other, desc: "REQUEST"}
-      - {id: 23, cat: Other , desc: "SONSTIGES"}
-      - {id: 104, cat: XXX/Imageset, desc: "XXX|IMAGE"}
-
-      # Spiele
-      - {id: 96, cat: Console/NDS, desc: "GAMES|NDS"}
-      - {id: 92, cat: PC/Games, desc: "GAMES|PC"}
-      - {id: 94, cat: Console/PS4, desc: "GAMES|PS"}
-      - {id: 95, cat: Console/Wii, desc: "GAMES|WII"}
-      - {id: 93, cat: Console/Xbox, desc: "GAMES|XBOX"}
-
-      # Wrestling
-      - {id: 3, cat: TV/Sport, desc: "HD|RAW"}
-      - {id: 1, cat: TV/Sport, desc: "HD|SMACKD"}
-      - {id: 6, cat: TV/Sport, desc: "NXT"}
-      - {id: 7, cat: TV/Sport, desc: "PPV"}
-      - {id: 4, cat: TV/Sport, desc: "SD|RAW"}
-      - {id: 2, cat: TV/Sport, desc: "SD|SMACKD"}
-      - {id: 5, cat: TV/Sport, desc: "TNA"}
-
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: /login.php
-    method: form
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: div.stderr_info_wrap
-    test:
-      path: /browse.php
-      selector: img[title="Ratio"] + i
-
-  ratio:
-    path: /browse.php
-    selector: img[title="Ratio"] + i
-
-  search:
-    path: /browse.php
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
-      showsearch: "1"
-      incldead: "1"
-      orderby: "added"
-      sort: "desc"
-    rows:
-      selector: table.main > tbody > tr:contains("Alle Torrents") + tr > td > table.tableinborder > tbody > tr
-      filters:
-        - name: andmatch
-    fields:
-      download:
-        selector: a[href^="download-ssl.php?torrent="]
-        attribute: href
-      title:
-        selector: div.title_wrap
-        attribute: title
-        filters:
-          - name: replace
-            args: ["[TsH]", ""]
-      category:
-        selector: a[href^="browse.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      details:
-        selector: div.title_wrap > a
-        attribute: href
-      size:
-        selector: div.bro_right_ad > b
-        filters:
-          - name: replace
-            args: [".", ""]
-          - name: replace
-            args: [",", "."]
-      grabs:
-        selector: div.bro_right_ae > b
-      seeders:
-        selector: div.bro_box1_aa > b
-      leechers:
-        selector: div.bro_box_aaa > b
-      date:
-        selector: div.bro_box_date > span
-        filters:
-          - name: replace
-            args: ["\u00a0", " "]
-          - name: dateparse
-            args: "02.01.2006 15:04:05"
-      downloadvolumefactor:
-        case:
-          span[title="OnlyUp"]: "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
+---
+  site: theshinning
+  name: The Shinning
+  description: "A German gerneral tracker"
+  language: de-de
+  type: private
+  encoding: windows-1252
+  links:
+    - https://theshinning.org
+
+  caps:
+    categorymappings:
+      # Filme
+      - {id: 28, cat: Movies/SD, desc: "HORROR"}
+      - {id: 25, cat: Movies/DVD, desc: "SD|DVD"}
+      - {id: 99, cat: Movies/SD, desc: "SD|SPORT"}
+      - {id: 24, cat: Movies/SD, desc: "SD|x264"}
+      - {id: 22, cat: Movies/SD, desc: "SD|XVID"}
+      - {id: 26, cat: XXX, desc: "SD|XxX"}
+
+      # High Definition
+      - {id: 29, cat: Movies/BluRay, desc: "BLURAY"}
+      - {id: 19, cat: Movies/HD, desc: "HD|1080p"}
+      - {id: 21, cat: Movies/3D, desc: "HD|3D"}
+      - {id: 107, cat: Movies/HD, desc: "HD|4K"}
+      - {id: 20, cat: Movies/HD, desc: "HD|720p"}
+      - {id: 101, cat: Movies/HD, desc: "HD|REMUX"}
+      - {id: 100, cat: Movies/HD, desc: "HD|SPORT"}
+      - {id: 27, cat: XXX, desc: "HD|XxX"}
+      - {id: 102, cat: Movies/HD, desc: "SMALL|HD"}
+
+      # Musik
+      - {id: 13, cat: Audio, desc: "CHARTS"}
+      - {id: 31, cat: Audio/Lossless, desc: "FLAC"}
+      - {id: 97, cat: Audio/Audiobook, desc: "HOERSPIELE"}
+      - {id: 30, cat: Audio/MP3, desc: "MP3"}
+      - {id: 106, cat: Audio, desc: "SAMPLER"}
+
+      # Releaser
+      - {id: 18, cat: Movies, desc: "CR3WHD"}
+      - {id: 16, cat: Movies, desc: "ONKEL JENS"}
+      - {id: 17, cat: Movies, desc: "xTM|XviD"}
+
+      # Serie
+      - {id: 11, cat: TV/SD, desc: "DVD|SERIEN"}
+      - {id: 9, cat: TV/HD, desc: "HD|SERIEN"}
+      - {id: 32, cat: TV, desc: "MIXED|SERIEN"}
+      - {id: 10, cat: TV, desc: "PACK|SERIEN"}
+      - {id: 8, cat: TV/SD, desc: "SD|SERIEN"}
+      - {id: 105, cat: TV, desc: "SMALL|SERIE"}
+      - {id: 12, cat: TV, desc: "US|SERIEN"}
+
+      # Sonstige
+      - {id: 98, cat: PC, desc: "APPS"}
+      - {id: 90, cat: TV/Documentary, desc: "DOKUS"}
+      - {id: 91, cat: Books, desc: "EBOOKS"}
+      - {id: 14, cat: Movies, desc: "KINOHITS"}
+      - {id: 15, cat: Other, desc: "REQUEST"}
+      - {id: 23, cat: Other , desc: "SONSTIGES"}
+      - {id: 104, cat: XXX/Imageset, desc: "XXX|IMAGE"}
+
+      # Spiele
+      - {id: 96, cat: Console/NDS, desc: "GAMES|NDS"}
+      - {id: 92, cat: PC/Games, desc: "GAMES|PC"}
+      - {id: 94, cat: Console/PS4, desc: "GAMES|PS"}
+      - {id: 95, cat: Console/Wii, desc: "GAMES|WII"}
+      - {id: 93, cat: Console/Xbox, desc: "GAMES|XBOX"}
+
+      # Wrestling
+      - {id: 3, cat: TV/Sport, desc: "HD|RAW"}
+      - {id: 1, cat: TV/Sport, desc: "HD|SMACKD"}
+      - {id: 6, cat: TV/Sport, desc: "NXT"}
+      - {id: 7, cat: TV/Sport, desc: "PPV"}
+      - {id: 4, cat: TV/Sport, desc: "SD|RAW"}
+      - {id: 2, cat: TV/Sport, desc: "SD|SMACKD"}
+      - {id: 5, cat: TV/Sport, desc: "TNA"}
+
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: /login.php
+    method: form
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: div.stderr_info_wrap
+    test:
+      path: /browse.php
+      selector: img[title="Ratio"] + i
+
+  ratio:
+    path: /browse.php
+    selector: img[title="Ratio"] + i
+
+  search:
+    path: /browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      showsearch: "1"
+      incldead: "1"
+      orderby: "added"
+      sort: "desc"
+    rows:
+      selector: table.main > tbody > tr:contains("Alle Torrents") + tr > td > table.tableinborder > tbody > tr
+      filters:
+        - name: andmatch
+    fields:
+      download:
+        selector: a[href^="download-ssl.php?torrent="]
+        attribute: href
+      title:
+        selector: div.title_wrap
+        attribute: title
+        filters:
+          - name: replace
+            args: ["[TsH]", ""]
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      details:
+        selector: div.title_wrap > a
+        attribute: href
+      size:
+        selector: div.bro_right_ad > b
+        filters:
+          - name: replace
+            args: [".", ""]
+          - name: replace
+            args: [",", "."]
+      grabs:
+        selector: div.bro_right_ae > b
+      seeders:
+        selector: div.bro_box1_aa > b
+      leechers:
+        selector: div.bro_box_aaa > b
+      date:
+        selector: div.bro_box_date > span
+        filters:
+          - name: replace
+            args: ["\u00a0", " "]
+          - name: dateparse
+            args: "02.01.2006 15:04:05"
+      downloadvolumefactor:
+        case:
+          span[title="OnlyUp"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett/Definitions/tntvillage.yml

@@ -1,64 +1,69 @@
----
-  site: tntvillage
-  name: TNTVillage
-  language: it-it
-  type: public
-  encoding: UTF-8
-  links:
-    - http://www.tntvillage.scambioetico.org/
-
-  caps:
-    categorymappings:
-      - {id: 4, cat: Movies, desc: "Movies category"}
-      - {id: 2, cat: Audio, desc: "Music videos"}
-      - {id: 29, cat: TV, desc: "TV Series"}
-      - {id: 7, cat: TV/Anime, desc: "Animes"}
-      - {id: 8, cat: TV/Anime, desc: "Cartoons"}
-      - {id: 14, cat: TV/Documentary, desc: "Documentaries"}
-      - {id: 30, cat: Books/Comics, desc: "Comics"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
-
-  settings: []
-
-  search:
-    paths:
-      - path: /src/releaselist.php
-        method: post
-    inputs:
-      cat: 0
-      page: 1
-      srcrel: "{{ .Keywords }}"
-    rows:
-      selector: div.showrelease_tb table tbody tr:not(tr:nth-child(1))
-    fields:
-      title:
-        selector: td:nth-child(7)
-      category:
-        selector: td:nth-child(3) a
-        attribute: href
-        filters:
-          - name: split
-            args: ["=", "-1"]
-      details:
-        selector: td:nth-child(7) a
-        attribute: href
-      download:
-        selector: td:nth-child(1) a
-        attribute: href
-      magnet:
-        selector: td:nth-child(2) a
-        attribute: href
-      seeders:
-        selector: td:nth-child(5)
-      leechers:
-        selector: td:nth-child(4)
-      downloadvolumefactor:
-        text: "0"
-      uploadvolumefactor:
-        text: "1"
-      size:
-        text: "5G"
+---
+  site: tntvillage
+  name: TNTVillage
+  language: it-it
+  type: public
+  encoding: UTF-8
+  links:
+    - http://www.tntvillage.scambioetico.org/
+
+  caps:
+    categorymappings:
+      - {id: 4, cat: Movies, desc: "Movies category"}
+      - {id: 2, cat: Audio, desc: "Music videos"}
+      - {id: 29, cat: TV, desc: "TV Series"}
+      - {id: 7, cat: TV/Anime, desc: "Animes"}
+      - {id: 8, cat: TV/Anime, desc: "Cartoons"}
+      - {id: 14, cat: TV/Documentary, desc: "Documentaries"}
+      - {id: 30, cat: Books/Comics, desc: "Comics"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings: []
+
+  search:
+    paths:
+      - path: /src/releaselist.php
+        method: post
+    inputs:
+      cat: 0
+      page: 1
+      srcrel: "{{ .Keywords }}"
+    rows:
+      selector: div.showrelease_tb table tbody tr:not(tr:nth-child(1))
+    fields:
+      title:
+        selector: td:nth-child(7)
+      category:
+        selector: td:nth-child(3) a
+        attribute: href
+        filters:
+          - name: split
+            args: ["=", "-1"]
+      details:
+        selector: td:nth-child(7) a
+        attribute: href
+      download:
+        selector: td:nth-child(1) a
+        attribute: href
+      magnet:
+        selector: td:nth-child(2) a
+        attribute: href
+      seeders:
+        selector: td:nth-child(5)
+      leechers:
+        selector: td:nth-child(4)
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"
+      size:
+        selector: td:nth-child(3) a
+        case:
+          a[href*="&cat=4"]: "5GB"
+          a[href*="&cat=2"]: "100MB"
+          a[href*="&cat=30"]: "100MB"
+          "*": "2GB"

src/Jackett/Definitions/torrent9.yml

@@ -0,0 +1,78 @@
+---
+  site: torrent9
+  name: Torrent9
+  language: fr-fr
+  type: public
+  encoding: UTF-8
+  links:
+    - http://www.torrent9.biz/
+
+  caps:
+    categorymappings:
+      - {id: films, cat: Movies, desc: "Movies"}
+      - {id: series, cat: TV, desc: "TV"}
+      - {id: musique, cat: Audio, desc: "Music"}
+      - {id: ebook, cat: Books, desc: "Books"}
+      - {id: logiciels, cat: PC, desc: "Software"}
+      - {id: jeux-pc, cat: PC/Games, desc: "PC Games"}
+      - {id: jeux-consoles, cat: Console/Xbox360, desc: "Console Games"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  settings: []
+
+  search:
+    path: "{{if .Query.Keywords}}/search_torrent/{{range .Categories }}{{.}}/{{end}}{{ .Query.Keywords }}/page-0,trie-seeds-d{{else}}/top_torrent.php{{end}}"
+    rows:
+      selector: div.table-responsive > table tbody tr
+    fields:
+      title:
+        selector: td:nth-child(1) a
+      details:
+        selector: td:nth-child(1) a
+        attribute: href
+      download:
+        selector: td:nth-child(1) a
+        attribute: href
+        filters:
+          - name: replace
+            args: [ "/torrent", "/get_torrent"]
+          - name: append
+            args: ".torrent"
+      size:
+        selector: td:nth-child(2)
+        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", "" ]
+      seeders:
+        text: 0
+      seeders:
+        selector: td:nth-child(3) span.seed_ok
+        optional: true
+      leechers:
+        text: 0
+      leechers:
+        selector: td:nth-child(4)
+        optional: true
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"

src/Jackett/Definitions/torrentbd.yml

@@ -1,151 +1,151 @@
----
-  site: torrentbd
-  name: TorrentBD
-  description: "A general tracker"
-  language: en-us
-  type: private
-  encoding: UTF-8
-  links:
-    - http://www.torrentbd.com/torrent
-
-  caps:
-    categorymappings:
-      - {id: 28, cat: TV/Anime, desc: "Anime - All"}
-      - {id: 65, cat: PC/Phone-Android, desc: "Apps - Android"}
-      - {id: 20, cat: PC, desc: "Apps - Linux"}
-      - {id: 19, cat: PC/Mac, desc: "Apps - Mac"}
-      - {id: 18, cat: PC, desc: "Apps - PC"}
-      - {id: 21, cat: Audio, desc: "Bangla - Audio"}
-      - {id: 7, cat: Movies, desc: "Bangla - Movies | Natok"}
-      - {id: 49, cat: TV, desc: "Cartoons - All"}
-      - {id: 9, cat: TV/Documentary, desc: "Documentaries - All"}
-      - {id: 73, cat: Books/Comics, desc: "E-Books - Comics"}
-      - {id: 77, cat: Books, desc: "E-Books - Manga"}
-      - {id: 60, cat: PC/Games, desc: "Games - Cracks | Patches"}
-      - {id: 17, cat: Console, desc: "Games - Other"}
-      - {id: 10, cat: PC, desc: "Games - PC"}
-      - {id: 11, cat: Console/PS3, desc: "Games - PS2"}
-      - {id: 43, cat: Console/PS3, desc: "Games - PS3"}
-      - {id: 12, cat: Console/PSP, desc: "Games - PSP"}
-      - {id: 52, cat: PC/Games, desc: "Games - Updates | DLC"}
-      - {id: 13, cat: Console/Xbox, desc: "Games - Xbox"}
-      - {id: 14, cat: Console/Xbox360, desc: "Games - Xbox360"}
-      - {id: 23, cat: Movies/BluRay, desc: "Hindi - Blu-ray"}
-      - {id: 51, cat: Movies/SD, desc: "Hindi - CAM | TS | TC"}
-      - {id: 27, cat: Movies/DVD, desc: "Hindi - DVDRip"}
-      - {id: 58, cat: Movies/SD, desc: "Hindi - DVDScr | Pre-DVD"}
-      - {id: 68, cat: Movies/SD, desc: "Hindi - HD-Rip"}
-      - {id: 59, cat: Movies, desc: "Hindi - Web-Rip"}
-      - {id: 47, cat: Movies/HD, desc: "Movies - 1080p BluRay"}
-      - {id: 67, cat: Movies/3D, desc: "Movies - 3D"}
-      - {id: 42, cat: Movies/BluRay, desc: "Movies - 720p BluRay"}
-      - {id: 57, cat: Movies, desc: "Movies - Animation"}
-      - {id: 4, cat: Movies/SD, desc: "Movies - CAM | TS | TC"}
-      - {id: 69, cat: Movies, desc: "Movies - Dual Audio"}
-      - {id: 1, cat: Movies/SD, desc: "Movies - DVDRip"}
-      - {id: 56, cat: Movies/SD, desc: "Movies - DVDSCR | R5 | R6"}
-      - {id: 46, cat: Movies/SD, desc: "Movies - HD-Rip"}
-      - {id: 76, cat: Movies/BluRay, desc: "Movies - Lossless BluRay"}
-      - {id: 2, cat: Movies, desc: "Movies - Packs"}
-      - {id: 24, cat: Movies/SD, desc: "Movies - SD BluRay"}
-      - {id: 34, cat: Movies, desc: "Movies - Tamil"}
-      - {id: 3, cat: Movies, desc: "Movies - Unrated"}
-      - {id: 72, cat: Movies, desc: "Movies - WEB Rip"}
-      - {id: 55, cat: Movies, desc: "Movies - WEB-DL"}
-      - {id: 22, cat: Audio, desc: "Music - Audio"}
-      - {id: 64, cat: Audio, desc: "Music - Concerts | Live Shows"}
-      - {id: 71, cat: Audio/Lossless, desc: "Music - FLAC"}
-      - {id: 50, cat: Audio, desc: "Music - OST"}
-      - {id: 26, cat: Audio, desc: "Music - Radio"}
-      - {id: 25, cat: Audio, desc: "Music - Video"}
-      - {id: 78, cat: Audio, desc: "Music - Video 4K"}
-      - {id: 36, cat: Books, desc: "Other - E-Books"}
-      - {id: 37, cat: Other, desc: "Other - Images"}
-      - {id: 38, cat: PC/Phone-Other, desc: "Other - Mobile Phone"}
-      - {id: 40, cat: Other, desc: "Other - Other | Misc"}
-      - {id: 39, cat: Other, desc: "Other - Tutorial"}
-      - {id: 44, cat: Other, desc: "Religious  - Islam"}
-      - {id: 48, cat: TV/Sport, desc: "Sports - All"}
-      - {id: 70, cat: TV/Sport, desc: "Sports - Football"}
-      - {id: 6, cat: TV/Sport, desc: "Sports - Pro Wrestling"}
-      - {id: 33, cat: Other, desc: "Trailers - Movie | Games"}
-      - {id: 66, cat: TV, desc: "TV - Awards | Ceremonies"}
-      - {id: 5, cat: TV/SD, desc: "TV - Episodes"}
-      - {id: 61, cat: TV/HD, desc: "TV - Episodes - 720p | 1080p"}
-      - {id: 41, cat: TV/SD, desc: "TV - Packs"}
-      - {id: 62, cat: TV/HD, desc: "TV - Packs - HD | BRRip"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: account-login.php
-    method: form
-    form: form[action="account-login.php"]
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: div.myFrame:has(div.myF-caption > font.error)
-    test:
-      path: torrents-search.php
-      selector: div.myB-content:contains("Ratio:")
-
-  ratio:
-    path: torrents-search.php
-    selector: div.myB-content:contains("Ratio:")
-    filters:
-      - name: regexp
-        args: "Ratio: (.*?)$"
-
-  search:
-    path: torrents-search.php
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
-      incldead: "1"
-    rows:
-      selector: tr.t-row
-    fields:
-      download:
-        selector: a[href^="download.php?id="]
-        attribute: href
-      title:
-        selector: span.torrname
-        attribute: title
-      category:
-        selector: a[href^="torrents.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      details:
-        selector: a[onmouseover][href^="torrents-details.php?id="]
-        attribute: href
-      comments:
-        selector: a[href*="#comments"]
-        attribute: href
-      size:
-        selector: td:nth-child(6)
-      grabs:
-        selector: td:nth-child(9)
-      seeders:
-        selector: td:nth-child(7)
-      leechers:
-        selector: td:nth-child(8)
-      date:
-        selector: a[onmouseover][href^="torrents-details.php?id="]
-        attribute: onmouseover
-        filters:
-          - name: regexp
-            args: "Date Added: </b>(\\d+-\\d+-\\d+)<br />"
-          - name: dateparse
-            args: "02-01-2006"
-      downloadvolumefactor:
-        case:
-          img[title^="FreeLeech "]: "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
+---
+  site: torrentbd
+  name: TorrentBD
+  description: "A general tracker"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - http://www.torrentbd.com/torrent
+
+  caps:
+    categorymappings:
+      - {id: 28, cat: TV/Anime, desc: "Anime - All"}
+      - {id: 65, cat: PC/Phone-Android, desc: "Apps - Android"}
+      - {id: 20, cat: PC, desc: "Apps - Linux"}
+      - {id: 19, cat: PC/Mac, desc: "Apps - Mac"}
+      - {id: 18, cat: PC, desc: "Apps - PC"}
+      - {id: 21, cat: Audio, desc: "Bangla - Audio"}
+      - {id: 7, cat: Movies, desc: "Bangla - Movies | Natok"}
+      - {id: 49, cat: TV, desc: "Cartoons - All"}
+      - {id: 9, cat: TV/Documentary, desc: "Documentaries - All"}
+      - {id: 73, cat: Books/Comics, desc: "E-Books - Comics"}
+      - {id: 77, cat: Books, desc: "E-Books - Manga"}
+      - {id: 60, cat: PC/Games, desc: "Games - Cracks | Patches"}
+      - {id: 17, cat: Console, desc: "Games - Other"}
+      - {id: 10, cat: PC, desc: "Games - PC"}
+      - {id: 11, cat: Console/PS3, desc: "Games - PS2"}
+      - {id: 43, cat: Console/PS3, desc: "Games - PS3"}
+      - {id: 12, cat: Console/PSP, desc: "Games - PSP"}
+      - {id: 52, cat: PC/Games, desc: "Games - Updates | DLC"}
+      - {id: 13, cat: Console/Xbox, desc: "Games - Xbox"}
+      - {id: 14, cat: Console/Xbox360, desc: "Games - Xbox360"}
+      - {id: 23, cat: Movies/BluRay, desc: "Hindi - Blu-ray"}
+      - {id: 51, cat: Movies/SD, desc: "Hindi - CAM | TS | TC"}
+      - {id: 27, cat: Movies/DVD, desc: "Hindi - DVDRip"}
+      - {id: 58, cat: Movies/SD, desc: "Hindi - DVDScr | Pre-DVD"}
+      - {id: 68, cat: Movies/SD, desc: "Hindi - HD-Rip"}
+      - {id: 59, cat: Movies, desc: "Hindi - Web-Rip"}
+      - {id: 47, cat: Movies/HD, desc: "Movies - 1080p BluRay"}
+      - {id: 67, cat: Movies/3D, desc: "Movies - 3D"}
+      - {id: 42, cat: Movies/BluRay, desc: "Movies - 720p BluRay"}
+      - {id: 57, cat: Movies, desc: "Movies - Animation"}
+      - {id: 4, cat: Movies/SD, desc: "Movies - CAM | TS | TC"}
+      - {id: 69, cat: Movies, desc: "Movies - Dual Audio"}
+      - {id: 1, cat: Movies/SD, desc: "Movies - DVDRip"}
+      - {id: 56, cat: Movies/SD, desc: "Movies - DVDSCR | R5 | R6"}
+      - {id: 46, cat: Movies/SD, desc: "Movies - HD-Rip"}
+      - {id: 76, cat: Movies/BluRay, desc: "Movies - Lossless BluRay"}
+      - {id: 2, cat: Movies, desc: "Movies - Packs"}
+      - {id: 24, cat: Movies/SD, desc: "Movies - SD BluRay"}
+      - {id: 34, cat: Movies, desc: "Movies - Tamil"}
+      - {id: 3, cat: Movies, desc: "Movies - Unrated"}
+      - {id: 72, cat: Movies, desc: "Movies - WEB Rip"}
+      - {id: 55, cat: Movies, desc: "Movies - WEB-DL"}
+      - {id: 22, cat: Audio, desc: "Music - Audio"}
+      - {id: 64, cat: Audio, desc: "Music - Concerts | Live Shows"}
+      - {id: 71, cat: Audio/Lossless, desc: "Music - FLAC"}
+      - {id: 50, cat: Audio, desc: "Music - OST"}
+      - {id: 26, cat: Audio, desc: "Music - Radio"}
+      - {id: 25, cat: Audio, desc: "Music - Video"}
+      - {id: 78, cat: Audio, desc: "Music - Video 4K"}
+      - {id: 36, cat: Books, desc: "Other - E-Books"}
+      - {id: 37, cat: Other, desc: "Other - Images"}
+      - {id: 38, cat: PC/Phone-Other, desc: "Other - Mobile Phone"}
+      - {id: 40, cat: Other, desc: "Other - Other | Misc"}
+      - {id: 39, cat: Other, desc: "Other - Tutorial"}
+      - {id: 44, cat: Other, desc: "Religious  - Islam"}
+      - {id: 48, cat: TV/Sport, desc: "Sports - All"}
+      - {id: 70, cat: TV/Sport, desc: "Sports - Football"}
+      - {id: 6, cat: TV/Sport, desc: "Sports - Pro Wrestling"}
+      - {id: 33, cat: Other, desc: "Trailers - Movie | Games"}
+      - {id: 66, cat: TV, desc: "TV - Awards | Ceremonies"}
+      - {id: 5, cat: TV/SD, desc: "TV - Episodes"}
+      - {id: 61, cat: TV/HD, desc: "TV - Episodes - 720p | 1080p"}
+      - {id: 41, cat: TV/SD, desc: "TV - Packs"}
+      - {id: 62, cat: TV/HD, desc: "TV - Packs - HD | BRRip"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: account-login.php
+    method: form
+    form: form[action="account-login.php"]
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: div.myFrame:has(div.myF-caption > font.error)
+    test:
+      path: torrents-search.php
+      selector: div.myB-content:contains("Ratio:")
+
+  ratio:
+    path: torrents-search.php
+    selector: div.myB-content:contains("Ratio:")
+    filters:
+      - name: regexp
+        args: "Ratio: (.*?)$"
+
+  search:
+    path: torrents-search.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      incldead: "1"
+    rows:
+      selector: tr.t-row
+    fields:
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      title:
+        selector: span.torrname
+        attribute: title
+      category:
+        selector: a[href^="torrents.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      details:
+        selector: a[onmouseover][href^="torrents-details.php?id="]
+        attribute: href
+      comments:
+        selector: a[href*="#comments"]
+        attribute: href
+      size:
+        selector: td:nth-child(6)
+      grabs:
+        selector: td:nth-child(9)
+      seeders:
+        selector: td:nth-child(7)
+      leechers:
+        selector: td:nth-child(8)
+      date:
+        selector: a[onmouseover][href^="torrents-details.php?id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "Date Added: </b>(\\d+-\\d+-\\d+)<br />"
+          - name: dateparse
+            args: "02-01-2006"
+      downloadvolumefactor:
+        case:
+          img[title^="FreeLeech "]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett/Definitions/torrentccf.yml

@@ -1,118 +1,118 @@
----
-  site: torrentccf
-  name: TorrentCCF
-  language: zh-cn
-  type: private
-  encoding: UTF-8
-  links:
-    - https://et8.org/
-
-  caps:
-    categorymappings:
-      - {id: 601, cat: Movies, desc: "Movies"}
-      - {id: 602, cat: TV/Anime, desc: "Animations"}
-      - {id: 603, cat: TV/Sport, desc: "Sports"}
-      - {id: 604, cat: TV/Documentary, desc: "Documentaries"}
-      - {id: 605, cat: Books, desc: "EDU"}
-      - {id: 606, cat: TV, desc: "TV/Cn"}
-      - {id: 607, cat: TV, desc: "TV/Western"}
-      - {id: 608, cat: TV, desc: "TV/hk_tw"}
-      - {id: 609, cat: TV, desc: "TV/Japan_korea"}
-      - {id: 610, cat: TV, desc: "TV Shows"}
-      - {id: 611, cat: Audio, desc: "Music/Cn"}
-      - {id: 612, cat: Audio, desc: "Music/Western"}
-      - {id: 613, cat: Audio, desc: "Music/Asia"}
-      - {id: 614, cat: Audio, desc: "Music/Classic"}
-      - {id: 615, cat: Audio/Video, desc: "MusicVideo"}
-      - {id: 616, cat: PC, desc: "Appz"}
-      - {id: 617, cat: PC/Games, desc: "PC Games"}
-      - {id: 618, cat: Console/PS4, desc: "Playstation"}
-      - {id: 619, cat: Console/Xbox, desc: "Xbox"}
-      - {id: 620, cat: Console/Wii, desc: "Wii"}
-      - {id: 621, cat: Other, desc: "Others"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep, imdbid]
-      movie-search: [imdbid]
-
-  login:
-    path: /login.php
-    method: form
-    form: form[action="takelogin.php"]
-    captcha:
-      type: image
-      image: img[alt="CAPTCHA"]
-      input: imagestring
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: td.embedded:has(h2:contains("登录失败"))
-    test:
-      path: /torrents.php
-
-  search:
-    path: /torrents.php
-    method: get
-    inputs:
-      $raw: "{{range .Categories}}cat{{.}}=1&{{end}}"
-      search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-      incldead: "1"
-      search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
-    rows:
-      selector: table.torrents > tbody > tr:has(table.torrentname)
-    fields:
-      title:
-        selector: a[href^="details.php?id="]
-      title|optional:
-        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
-      imdb|optional:
-        selector: div.imdb_100 > a
-        attribute: href
-      size:
-        selector: td:nth-child(5)
-      grabs:
-        selector: td:nth-child(8)
-      seeders:
-        selector: td:nth-child(6)
-      leechers:
-        selector: td:nth-child(7)
-      date:
-        selector: td:nth-child(4) > span[title]
-        attribute: title
-        filters:
-          - name: append
-            args: " +08:00"
-          - name: dateparse
-            args: "2006-01-02 15:04:05 -07:00"
-      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
+---
+  site: torrentccf
+  name: TorrentCCF
+  language: zh-cn
+  type: private
+  encoding: UTF-8
+  links:
+    - https://et8.org/
+
+  caps:
+    categorymappings:
+      - {id: 601, cat: Movies, desc: "Movies"}
+      - {id: 602, cat: TV/Anime, desc: "Animations"}
+      - {id: 603, cat: TV/Sport, desc: "Sports"}
+      - {id: 604, cat: TV/Documentary, desc: "Documentaries"}
+      - {id: 605, cat: Books, desc: "EDU"}
+      - {id: 606, cat: TV, desc: "TV/Cn"}
+      - {id: 607, cat: TV, desc: "TV/Western"}
+      - {id: 608, cat: TV, desc: "TV/hk_tw"}
+      - {id: 609, cat: TV, desc: "TV/Japan_korea"}
+      - {id: 610, cat: TV, desc: "TV Shows"}
+      - {id: 611, cat: Audio, desc: "Music/Cn"}
+      - {id: 612, cat: Audio, desc: "Music/Western"}
+      - {id: 613, cat: Audio, desc: "Music/Asia"}
+      - {id: 614, cat: Audio, desc: "Music/Classic"}
+      - {id: 615, cat: Audio/Video, desc: "MusicVideo"}
+      - {id: 616, cat: PC, desc: "Appz"}
+      - {id: 617, cat: PC/Games, desc: "PC Games"}
+      - {id: 618, cat: Console/PS4, desc: "Playstation"}
+      - {id: 619, cat: Console/Xbox, desc: "Xbox"}
+      - {id: 620, cat: Console/Wii, desc: "Wii"}
+      - {id: 621, cat: Other, desc: "Others"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [imdbid]
+
+  login:
+    path: /login.php
+    method: form
+    form: form[action="takelogin.php"]
+    captcha:
+      type: image
+      image: img[alt="CAPTCHA"]
+      input: imagestring
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: td.embedded:has(h2:contains("登录失败"))
+    test:
+      path: /torrents.php
+
+  search:
+    path: /torrents.php
+    method: get
+    inputs:
+      $raw: "{{range .Categories}}cat{{.}}=1&{{end}}"
+      search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+      incldead: "1"
+      search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
+    rows:
+      selector: table.torrents > tbody > tr:has(table.torrentname)
+    fields:
+      title:
+        selector: a[href^="details.php?id="]
+      title|optional:
+        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
+      imdb|optional:
+        selector: div.imdb_100 > a
+        attribute: href
+      size:
+        selector: td:nth-child(5)
+      grabs:
+        selector: td:nth-child(8)
+      seeders:
+        selector: td:nth-child(6)
+      leechers:
+        selector: td:nth-child(7)
+      date:
+        selector: td:nth-child(4) > span[title]
+        attribute: title
+        filters:
+          - name: append
+            args: " +08:00"
+          - name: dateparse
+            args: "2006-01-02 15:04:05 -07:00"
+      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/Definitions/torrenthr.yml

@@ -1,129 +1,129 @@
----
-  site: torrenthr
-  name: TorrentHR
-  language: hr-hr
-  type: private
-  encoding: windows-1250
-  links:
-    - https://www.torrenthr.org/
-
-  caps:
-    categorymappings:
-      - {id: 31, cat: TV/Anime, desc: "Anime"}
-      - {id: 4, cat: Movies/SD, desc: "Filmovi/SD"}
-      - {id: 18, cat: Movies/Foreign, desc: "Crtani Filmovi"}
-      - {id: 5, cat: PC/Games, desc: "Igre/PC"}
-      - {id: 7, cat: TV/SD, desc: "Serije/SD"}
-      - {id: 1, cat: PC/0day, desc: "Aplikacije"}
-      - {id: 14, cat: Movies/DVD, desc: "Filmovi/DVD"}
-      - {id: 12, cat: TV/Documentary, desc: "Dokumentarni Filmovi"}
-      - {id: 27, cat: Console/PS4, desc: "Igre/PS"}
-      - {id: 34, cat: TV/HD, desc: "Serije/HD"}
-      - {id: 25, cat: Books, desc: "E-books"}
-      - {id: 17, cat: Movies/HD, desc: "Filmovi/HD"}
-      - {id: 11, cat: Audio, desc: "Koncerti/Spotovi"}
-      - {id: 28, cat: Console/Wii, desc: "Igre/Wii"}
-      - {id: 30, cat: Books/Comics, desc: "Stripovi"}
-      - {id: 38, cat: PC/Phone-Other, desc: "Smartphone"}
-      - {id: 40, cat: Movies/BluRay, desc: "Filmovi/BD"}
-      - {id: 3, cat: Audio/MP3, desc: "Glazba/MP3"}
-      - {id: 26, cat: Console/Xbox, desc: "Igre/Xbox"}
-      - {id: 10, cat: XXX, desc: "XXX/SD"}
-      - {id: 16, cat: TV, desc: "THR Packs"}
-      - {id: 15, cat: TV/Sport, desc: "Sport"}
-      - {id: 29, cat: Audio/Lossless, desc: "Glazba/FLAC"}
-      - {id: 13, cat: Other, desc: "Ostalo"}
-      - {id: 36, cat: XXX, desc: "XXX/HD"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: /takelogin.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      ssl: "yes"
-    error:
-      - selector: div.glavni:has(div.glavni_naslov:contains("Greška"))
-    test:
-      path: /browse.php
-      
-  search:
-    path: /browse.php
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
-      incldead: "1"
-      sort: "4"
-      type: "desc"
-    rows:
-      selector: div.glavni_txt > table > tbody > tr[id^="record-"]
-    fields:
-      title:
-        selector: a[href^="details.php?id="]
-      title|optional|1:
-        selector: a[href^="details.php?id="][title]
-        attribute: title
-      title|optional|2:
-        selector: a[href^="details.php?id="][onmousemove]
-        attribute: onmousemove
-        filters:
-          - name: regexp
-            args: "return overlibImage\\('(.*)','.*'\\);"
-      details:
-        selector: a[href^="details.php?id="]
-        attribute: href
-      category:
-        selector: td.kategorije > a[href^="browse.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      download:
-        selector: a[href^="download.php?id="]
-        attribute: href
-      files:
-        selector: td:nth-child(5)
-      size:
-        selector: td:nth-child(7)
-        filters:
-          - name: replace
-            args: [".", ""]
-          - name: replace
-            args: [",", "."]
-      grabs:
-        selector: td:nth-child(7)
-        filters:
-          - name: regexp
-            args: ([\d,]+)
-          - name: replace
-            args: [",", ""]
-      seeders:
-        selector: td:nth-child(9)
-      leechers:
-        selector: td:nth-child(10)
-      banner|optional:
-        selector: a[href^="details.php?id="][onmousemove]
-        attribute: onmousemove
-        filters:
-          - name: regexp
-            args: "return overlibImage\\('.*','(.*)'\\);"
-      downloadvolumefactor:
-        text: "0"
-      uploadvolumefactor:
-        text: "1"
-      date:
-        selector: td:nth-child(2) > small
-        filters:
-          - name: replace
-            args: [" u ", " "]
-          - name: append
-            args: " +00:00"
-          - name: dateparse
-            args: "02.01.2006 15:04:05 -07:00"
-      description|optional:
-        selector: td:nth-child(2)
+---
+  site: torrenthr
+  name: TorrentHR
+  language: hr-hr
+  type: private
+  encoding: windows-1250
+  links:
+    - https://www.torrenthr.org/
+
+  caps:
+    categorymappings:
+      - {id: 31, cat: TV/Anime, desc: "Anime"}
+      - {id: 4, cat: Movies/SD, desc: "Filmovi/SD"}
+      - {id: 18, cat: Movies/Foreign, desc: "Crtani Filmovi"}
+      - {id: 5, cat: PC/Games, desc: "Igre/PC"}
+      - {id: 7, cat: TV/SD, desc: "Serije/SD"}
+      - {id: 1, cat: PC/0day, desc: "Aplikacije"}
+      - {id: 14, cat: Movies/DVD, desc: "Filmovi/DVD"}
+      - {id: 12, cat: TV/Documentary, desc: "Dokumentarni Filmovi"}
+      - {id: 27, cat: Console/PS4, desc: "Igre/PS"}
+      - {id: 34, cat: TV/HD, desc: "Serije/HD"}
+      - {id: 25, cat: Books, desc: "E-books"}
+      - {id: 17, cat: Movies/HD, desc: "Filmovi/HD"}
+      - {id: 11, cat: Audio, desc: "Koncerti/Spotovi"}
+      - {id: 28, cat: Console/Wii, desc: "Igre/Wii"}
+      - {id: 30, cat: Books/Comics, desc: "Stripovi"}
+      - {id: 38, cat: PC/Phone-Other, desc: "Smartphone"}
+      - {id: 40, cat: Movies/BluRay, desc: "Filmovi/BD"}
+      - {id: 3, cat: Audio/MP3, desc: "Glazba/MP3"}
+      - {id: 26, cat: Console/Xbox, desc: "Igre/Xbox"}
+      - {id: 10, cat: XXX, desc: "XXX/SD"}
+      - {id: 16, cat: TV, desc: "THR Packs"}
+      - {id: 15, cat: TV/Sport, desc: "Sport"}
+      - {id: 29, cat: Audio/Lossless, desc: "Glazba/FLAC"}
+      - {id: 13, cat: Other, desc: "Ostalo"}
+      - {id: 36, cat: XXX, desc: "XXX/HD"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: /takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      ssl: "yes"
+    error:
+      - selector: div.glavni:has(div.glavni_naslov:contains("Greška"))
+    test:
+      path: /browse.php
+      
+  search:
+    path: /browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      incldead: "1"
+      sort: "4"
+      type: "desc"
+    rows:
+      selector: div.glavni_txt > table > tbody > tr[id^="record-"]
+    fields:
+      title:
+        selector: a[href^="details.php?id="]
+      title|optional|1:
+        selector: a[href^="details.php?id="][title]
+        attribute: title
+      title|optional|2:
+        selector: a[href^="details.php?id="][onmousemove]
+        attribute: onmousemove
+        filters:
+          - name: regexp
+            args: "return overlibImage\\('(.*)','.*'\\);"
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      category:
+        selector: td.kategorije > a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      files:
+        selector: td:nth-child(5)
+      size:
+        selector: td:nth-child(7)
+        filters:
+          - name: replace
+            args: [".", ""]
+          - name: replace
+            args: [",", "."]
+      grabs:
+        selector: td:nth-child(7)
+        filters:
+          - name: regexp
+            args: ([\d,]+)
+          - name: replace
+            args: [",", ""]
+      seeders:
+        selector: td:nth-child(9)
+      leechers:
+        selector: td:nth-child(10)
+      banner|optional:
+        selector: a[href^="details.php?id="][onmousemove]
+        attribute: onmousemove
+        filters:
+          - name: regexp
+            args: "return overlibImage\\('.*','(.*)'\\);"
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"
+      date:
+        selector: td:nth-child(2) > small
+        filters:
+          - name: replace
+            args: [" u ", " "]
+          - name: append
+            args: " +00:00"
+          - name: dateparse
+            args: "02.01.2006 15:04:05 -07:00"
+      description|optional:
+        selector: td:nth-child(2)
         remove: a, br, small

src/Jackett/Definitions/torrenting.yml

@@ -69,11 +69,11 @@
       date:
         selector: div.uploaded
       seeders:
-        selector: td:nth-child(7)
+        selector: td:nth-last-child(2)
       leechers:
-        selector: td:nth-child(8)
+        selector: td:nth-last-child(1)
       size:
-        selector: td:nth-child(6)
+        selector: td:nth-last-child(3)
       downloadvolumefactor:
         text: "1"
       downloadvolumefactor:

src/Jackett/Definitions/torrentsectorcrew.yml

@@ -1,177 +1,177 @@
----
-  site: torrentsectorcrew
-  name: Torrent Sector Crew
-  description: "A German general tracker"
-  language: de-de
-  type: private
-  encoding: windows-1252
-  links:
-    - https://tsctracker.net/
-
-  caps:
-    categorymappings:
-      # Apps
-      - {id: 65, cat: PC/Phone-Android, desc: "Android"}
-      - {id: 83, cat: PC/Phone-IOS, desc: "iOS"}
-      - {id: 107, cat: PC/0day, desc: "Linux"}
-      - {id: 48, cat: PC/Mac, desc: "MAC"}
-      - {id: 109, cat: PC, desc: "Sonstige"}
-      - {id: 22, cat: PC/0day, desc: "Win"}
-
-      # Audio
-      - {id: 24, cat: Audio/Audiobook, desc: "aBooks"}
-      - {id: 104, cat: Audio, desc: "Disco's"}
-      - {id: 38, cat: Audio/Audiobook, desc: "Hörspiel"}
-      - {id: 6, cat: Audio, desc: "Musik"}
-      - {id: 82, cat: Audio, desc: "Tracks"}
-      - {id: 29, cat: Audio/Video, desc: "Videos"}
-
-      # Doku
-      - {id: 113, cat: TV/Documentary, desc: "3D"}
-      - {id: 76, cat: TV/Documentary, desc: "HD"}
-      - {id: 78, cat: TV/Documentary, desc: "Packs"}
-      - {id: 75, cat: TV/Documentary, desc: "SD"}
-      - {id: 114, cat: TV/Documentary, desc: "Sonstige"}
-      - {id: 77, cat: TV/Documentary, desc: "Untouched"}
-
-      # Filme
-      - {id: 54, cat: Movies/HD, desc: "1080p"}
-      - {id: 5, cat: Movies/3D, desc: "3D"}
-      - {id: 55, cat: Movies/HD, desc: "720p"}
-      - {id: 111, cat: Movies, desc: "Anime"}
-      - {id: 43, cat: Movies/BluRay, desc: "BluRay"}
-      - {id: 20, cat: Movies/DVD, desc: "DVDR"}
-      - {id: 120, cat: Movies/Foreign, desc: "Int."}
-      - {id: 119, cat: Movies, desc: "Remux"}
-      - {id: 121, cat: Movies/HD, desc: "UHD"}
-      - {id: 36, cat: Movies/HD, desc: "x264"}
-      - {id: 19, cat: Movies/SD, desc: "XviD"}
-
-      # Serien
-      - {id: 112, cat: TV/Anime, desc: "Anime"}
-      - {id: 69, cat: TV/HD, desc: "HD"}
-      - {id: 72, cat: TV/Foreign, desc: "Int."}
-      - {id: 68, cat: TV, desc: "Packs"}
-      - {id: 66, cat: TV/SD, desc: "SD"}
-      - {id: 108, cat: TV, desc: "TV-Shows"}
-
-      # Sonstige
-      - {id: 117, cat: Other, desc: "Diverses"}
-      - {id: 28, cat: Books, desc: "eBooks"}
-      - {id: 42, cat: TV/Sport, desc: "Sport"}
-      - {id: 103, cat: Other, desc: "Tutorials"}
-      - {id: 9, cat: Other, desc: "Wallpaper"}
-      - {id: 64, cat: XXX, desc: "XXX"}
-
-      # Spiele
-      - {id: 115, cat: PC/Mac, desc: "MAC"}
-      - {id: 37, cat: Console/NDS, desc: "Nintendo"}
-      - {id: 4, cat: PC/Games, desc: "PC"}
-      - {id: 58, cat: Console/PS4, desc: "PSX"}
-      - {id: 116, cat: Other, desc: "Sonstige"}
-      - {id: 50, cat: Console/Xbox, desc: "XBOX"}
-
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  settings:
-    - name: pin
-      type: text
-      label: Pin
-    - name: username
-      type: text
-      label: Username
-    - name: password
-      type: password
-      label: Password
-
-  login:
-    path: landing.php
-    method: form
-    form: form
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      pin: "{{ .Config.pin }}"
-    error:
-      - selector: "#login_box_desc"
-    test:
-      path: my.php
-      
-  ratio:
-    path: /my.php
-    selector: td.navi_top:contains("Deine Ratio:")
-    filters:
-      - name: replace
-        args: ["Deine Ratio: ", ""]
-      - name: replace
-        args: [".", ""]
-      - name: replace
-        args: [",", "."]
-
-  search:
-    path: browse.php
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
-      incldead: "1"
-      orderby: "added"
-      sort: desc
-    rows:
-      selector: "h2 +p + br + table.tablebrowse > tbody > tr[style=\"height: 45px;\"], tr:contains(\"Weiter\") > td > table.tablebrowse > tbody > tr[style=\"height: 45px;\"]"
-    fields:
-      title:
-        selector: a[title][href^="details.php"]
-        attribute: title
-      category:
-        selector: a[href*="cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      comments:
-        selector: a[href*="&tocomm="]
-        attribute: href
-      download:
-        selector: a[href^="download_ssl.php"]
-        attribute: href
-      files:
-        selector: td:nth-child(3)
-      grabs:
-        selector: td:nth-child(9)
-        filters:
-          - name: replace
-            args: ["-mal", ""]
-      size:
-        selector: td:nth-child(6)
-        filters:
-          - name: replace
-            args: [".", ""]
-          - name: replace
-            args: [",", "."]
-      seeders:
-        selector: td:nth-child(7)
-        filters:
-          - name: regexp
-            args: "(\\d+)"
-      leechers:
-        selector: td:nth-child(8)
-        filters:
-          - name: regexp
-            args: "(\\d+)"
-      date:
-        selector: td:nth-child(5)
-        remove: br
-        filters:
-          - name: dateparse
-            args: "02.01.200615:04:05"
-      downloadvolumefactor:
-        case:
-          "font:contains(\"[OnlyUpload]\")": "0"
-          "font:contains(\"[-40 Download]\")": "0.6"
-          "*": "1"
-      uploadvolumefactor:
-        case:
+---
+  site: torrentsectorcrew
+  name: Torrent Sector Crew
+  description: "A German general tracker"
+  language: de-de
+  type: private
+  encoding: windows-1252
+  links:
+    - https://tsctracker.net/
+
+  caps:
+    categorymappings:
+      # Apps
+      - {id: 65, cat: PC/Phone-Android, desc: "Android"}
+      - {id: 83, cat: PC/Phone-IOS, desc: "iOS"}
+      - {id: 107, cat: PC/0day, desc: "Linux"}
+      - {id: 48, cat: PC/Mac, desc: "MAC"}
+      - {id: 109, cat: PC, desc: "Sonstige"}
+      - {id: 22, cat: PC/0day, desc: "Win"}
+
+      # Audio
+      - {id: 24, cat: Audio/Audiobook, desc: "aBooks"}
+      - {id: 104, cat: Audio, desc: "Disco's"}
+      - {id: 38, cat: Audio/Audiobook, desc: "Hörspiel"}
+      - {id: 6, cat: Audio, desc: "Musik"}
+      - {id: 82, cat: Audio, desc: "Tracks"}
+      - {id: 29, cat: Audio/Video, desc: "Videos"}
+
+      # Doku
+      - {id: 113, cat: TV/Documentary, desc: "3D"}
+      - {id: 76, cat: TV/Documentary, desc: "HD"}
+      - {id: 78, cat: TV/Documentary, desc: "Packs"}
+      - {id: 75, cat: TV/Documentary, desc: "SD"}
+      - {id: 114, cat: TV/Documentary, desc: "Sonstige"}
+      - {id: 77, cat: TV/Documentary, desc: "Untouched"}
+
+      # Filme
+      - {id: 54, cat: Movies/HD, desc: "1080p"}
+      - {id: 5, cat: Movies/3D, desc: "3D"}
+      - {id: 55, cat: Movies/HD, desc: "720p"}
+      - {id: 111, cat: Movies, desc: "Anime"}
+      - {id: 43, cat: Movies/BluRay, desc: "BluRay"}
+      - {id: 20, cat: Movies/DVD, desc: "DVDR"}
+      - {id: 120, cat: Movies/Foreign, desc: "Int."}
+      - {id: 119, cat: Movies, desc: "Remux"}
+      - {id: 121, cat: Movies/HD, desc: "UHD"}
+      - {id: 36, cat: Movies/HD, desc: "x264"}
+      - {id: 19, cat: Movies/SD, desc: "XviD"}
+
+      # Serien
+      - {id: 112, cat: TV/Anime, desc: "Anime"}
+      - {id: 69, cat: TV/HD, desc: "HD"}
+      - {id: 72, cat: TV/Foreign, desc: "Int."}
+      - {id: 68, cat: TV, desc: "Packs"}
+      - {id: 66, cat: TV/SD, desc: "SD"}
+      - {id: 108, cat: TV, desc: "TV-Shows"}
+
+      # Sonstige
+      - {id: 117, cat: Other, desc: "Diverses"}
+      - {id: 28, cat: Books, desc: "eBooks"}
+      - {id: 42, cat: TV/Sport, desc: "Sport"}
+      - {id: 103, cat: Other, desc: "Tutorials"}
+      - {id: 9, cat: Other, desc: "Wallpaper"}
+      - {id: 64, cat: XXX, desc: "XXX"}
+
+      # Spiele
+      - {id: 115, cat: PC/Mac, desc: "MAC"}
+      - {id: 37, cat: Console/NDS, desc: "Nintendo"}
+      - {id: 4, cat: PC/Games, desc: "PC"}
+      - {id: 58, cat: Console/PS4, desc: "PSX"}
+      - {id: 116, cat: Other, desc: "Sonstige"}
+      - {id: 50, cat: Console/Xbox, desc: "XBOX"}
+
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  settings:
+    - name: pin
+      type: text
+      label: Pin
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+
+  login:
+    path: landing.php
+    method: form
+    form: form
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      pin: "{{ .Config.pin }}"
+    error:
+      - selector: "#login_box_desc"
+    test:
+      path: my.php
+      
+  ratio:
+    path: /my.php
+    selector: td.navi_top:contains("Deine Ratio:")
+    filters:
+      - name: replace
+        args: ["Deine Ratio: ", ""]
+      - name: replace
+        args: [".", ""]
+      - name: replace
+        args: [",", "."]
+
+  search:
+    path: browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      incldead: "1"
+      orderby: "added"
+      sort: desc
+    rows:
+      selector: "h2 +p + br + table.tablebrowse > tbody > tr[style=\"height: 45px;\"], tr:contains(\"Weiter\") > td > table.tablebrowse > tbody > tr[style=\"height: 45px;\"]"
+    fields:
+      title:
+        selector: a[title][href^="details.php"]
+        attribute: title
+      category:
+        selector: a[href*="cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      comments:
+        selector: a[href*="&tocomm="]
+        attribute: href
+      download:
+        selector: a[href^="download_ssl.php"]
+        attribute: href
+      files:
+        selector: td:nth-child(3)
+      grabs:
+        selector: td:nth-child(9)
+        filters:
+          - name: replace
+            args: ["-mal", ""]
+      size:
+        selector: td:nth-child(6)
+        filters:
+          - name: replace
+            args: [".", ""]
+          - name: replace
+            args: [",", "."]
+      seeders:
+        selector: td:nth-child(7)
+        filters:
+          - name: regexp
+            args: "(\\d+)"
+      leechers:
+        selector: td:nth-child(8)
+        filters:
+          - name: regexp
+            args: "(\\d+)"
+      date:
+        selector: td:nth-child(5)
+        remove: br
+        filters:
+          - name: dateparse
+            args: "02.01.200615:04:05"
+      downloadvolumefactor:
+        case:
+          "font:contains(\"[OnlyUpload]\")": "0"
+          "font:contains(\"[-40 Download]\")": "0.6"
+          "*": "1"
+      uploadvolumefactor:
+        case:
           "*": "1"

src/Jackett/Definitions/torrentsmd.yml

@@ -1,94 +1,94 @@
----
-  site: torrentsmd
-  name: Torrents.Md
-  language: ru-mo
-  type: private
-  encoding: UTF-8
-  links:
-    - https://torrentsmd.com/
-
-  caps:
-    categorymappings:
-      - {id: 1, cat: Movies, desc: "Filme"}
-      - {id: 2, cat: Audio, desc: "Muzică"}
-      - {id: 3, cat: PC, desc: "Software"}
-      - {id: 4, cat: Console, desc: "Jocuri"}
-      - {id: 5, cat: TV, desc: "Tv"}
-      - {id: 7, cat: Other, desc: "Alte"}
-      - {id: 8, cat: Books, desc: "Cărţi"}
-      - {id: 9, cat: Audio/Video, desc: "Muzică video"}
-      - {id: 10, cat: TV/Anime, desc: "Anime"}
-      - {id: 11, cat: Movies, desc: "Filme animate"}
-      - {id: 12, cat: Movies/DVD, desc: "DVD"}
-      - {id: 13, cat: Movies, desc: "Filme documentare"}
-      - {id: 14, cat: Audio/Audiobook, desc: "Cărţi audio"}
-      - {id: 15, cat: Other, desc: "Lecţii video"}
-      - {id: 16, cat: Other, desc: "Fotografii"}
-      - {id: 17, cat: TV/Sport, desc: "Sport"}
-      - {id: 18, cat: TV/HD, desc: "HDTV"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: login.php
-    method: form
-    form: form
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: td.embedded:has(h2:contains("eşuată"))
-    test:
-      path: browse.php
-      
-  search:
-    path: "{{if .Query.Keywords}}search.php{{else}}browse.php{{end}}"
-    inputs:
-      search_str: "{{ .Query.Keywords }}"
-    rows:
-      selector: table.tableTorrents > tbody > tr:has(a[href^="/details.php?id="])
-    fields:
-      title:
-        selector: a[href^="/details.php?id="]
-      details:
-        selector: a[href^="/details.php?id="]
-        attribute: href
-      category:
-        selector: a[href^="browse.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      download:
-        selector: a[href^="/details.php?id="]
-        attribute: href
-        filters:
-          - name: replace
-            args: ["/details.php", "/download.php"]
-      files:
-        selector: td:nth-child(3)
-      date:
-        selector: td:nth-child(5)
-        filters:
-          - name: replace
-            args: ["ore", "hours ago"]
-          - name: replace
-            args: ["minute", "minutes ago"]
-          - name: dateparse
-            args: "01-02 2006"
-          - name: dateparse
-            args: "01-02"
-      size:
-        selector: td:nth-child(6)
-      seeders:
-        selector: td:nth-child(7)
-      leechers:
-        selector: td:nth-child(8)
-      downloadvolumefactor:
-        case:
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
+---
+  site: torrentsmd
+  name: Torrents.Md
+  language: ru-mo
+  type: private
+  encoding: UTF-8
+  links:
+    - https://torrentsmd.com/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Movies, desc: "Filme"}
+      - {id: 2, cat: Audio, desc: "Muzică"}
+      - {id: 3, cat: PC, desc: "Software"}
+      - {id: 4, cat: Console, desc: "Jocuri"}
+      - {id: 5, cat: TV, desc: "Tv"}
+      - {id: 7, cat: Other, desc: "Alte"}
+      - {id: 8, cat: Books, desc: "Cărţi"}
+      - {id: 9, cat: Audio/Video, desc: "Muzică video"}
+      - {id: 10, cat: TV/Anime, desc: "Anime"}
+      - {id: 11, cat: Movies, desc: "Filme animate"}
+      - {id: 12, cat: Movies/DVD, desc: "DVD"}
+      - {id: 13, cat: Movies, desc: "Filme documentare"}
+      - {id: 14, cat: Audio/Audiobook, desc: "Cărţi audio"}
+      - {id: 15, cat: Other, desc: "Lecţii video"}
+      - {id: 16, cat: Other, desc: "Fotografii"}
+      - {id: 17, cat: TV/Sport, desc: "Sport"}
+      - {id: 18, cat: TV/HD, desc: "HDTV"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: login.php
+    method: form
+    form: form
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: td.embedded:has(h2:contains("eşuată"))
+    test:
+      path: browse.php
+      
+  search:
+    path: "{{if .Query.Keywords}}search.php{{else}}browse.php{{end}}"
+    inputs:
+      search_str: "{{ .Query.Keywords }}"
+    rows:
+      selector: table.tableTorrents > tbody > tr:has(a[href^="/details.php?id="])
+    fields:
+      title:
+        selector: a[href^="/details.php?id="]
+      details:
+        selector: a[href^="/details.php?id="]
+        attribute: href
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      download:
+        selector: a[href^="/details.php?id="]
+        attribute: href
+        filters:
+          - name: replace
+            args: ["/details.php", "/download.php"]
+      files:
+        selector: td:nth-child(3)
+      date:
+        selector: td:nth-child(5)
+        filters:
+          - name: replace
+            args: ["ore", "hours ago"]
+          - name: replace
+            args: ["minute", "minutes ago"]
+          - name: dateparse
+            args: "01-02 2006"
+          - name: dateparse
+            args: "01-02"
+      size:
+        selector: td:nth-child(6)
+      seeders:
+        selector: td:nth-child(7)
+      leechers:
+        selector: td:nth-child(8)
+      downloadvolumefactor:
+        case:
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett/Definitions/torviet.yml

@@ -1,131 +1,131 @@
----
-  site: torviet
-  name: TorViet
-  language: vi-vn
-  type: private
-  encoding: UTF-8
-  links:
-    - http://torviet.com
-
-  caps:
-    categorymappings:
-      - {id: 1, cat: Console, desc: "Game"}
-      - {id: 7, cat: PC/Games, desc: "PC"}
-      - {id: 133, cat: PC/Phone-Other, desc: "Handheld"}
-      - {id: 132, cat: Console, desc: "Console"}
-
-      - {id: 2, cat: Movies, desc: "Movie"}
-      - {id: 23, cat: Movies/HD, desc: "mHD"}
-      - {id: 24, cat: Movies/SD, desc: "SD"}
-      - {id: 124, cat: Movies/HD, desc: "720p"}
-      - {id: 125, cat: Movies/HD, desc: "1080p"}
-      - {id: 127, cat: Movies/BluRay, desc: "Blu-ray"}
-
-      - {id: 3, cat: TV, desc: "TV"}
-      - {id: 128, cat: TV/HD, desc: "HD"}
-      - {id: 129, cat: TV/SD, desc: "SD"}
-
-      - {id: 4, cat: PC, desc: "Software"}
-      - {id: 76, cat: PC/0day, desc: "Windows"}
-      - {id: 77, cat: PC/Mac, desc: "MAC"}
-      - {id: 78, cat: PC, desc: "Linux"}
-      - {id: 79, cat: PC/Phone-Other, desc: "Handheld"}
-
-      - {id: 5, cat: Audio, desc: "Music"}
-      - {id: 92, cat: Audio/Video, desc: "Music Video"}
-      - {id: 126, cat: Audio/Lossless, desc: "Lossless"}
-      - {id: 130, cat: Audio/MP3, desc: "Lossy"}
-      - {id: 131, cat: Audio, desc: "Surround"}
-
-      - {id: 6, cat: Other, desc: "Misc"}
-      - {id: 112, cat: Books, desc: "Ebook"}
-      - {id: 113, cat: Other, desc: "Training Video"}
-      - {id: 117, cat: Audio/Audiobook, desc: "Audio book"}
-
-    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("failed"))
-    test:
-      path: /torrents.php
-      
-  ratio:
-    path: /torrents.php
-    selector: table#info_block
-    filters:
-      - name: regexp
-        args: "Ratio:\\s(.*?)\\s\\s"
-
-  search:
-    path: /torrents.php
-    inputs:
-      search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-      sltCategory: 0
-      sltSubCategory: 0 # can't sepcify multiple categorys so we're useing all always
-      sltGenre: 0
-      incldead: 1
-      spstate: 0
-      inclbookmarked: 0
-      search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
-      search_mode: 0
-
-    rows:
-      selector: div#idtorrent > table.torrents > tbody > tr:has(table.torrentname)
-    fields:
-      title:
-        selector: a[class][title]
-        attribute: title
-      details:
-        selector: a[class][title]
-        attribute: href
-      description:
-        selector: td.embedded:has(a[title])
-        remove: a[title]
-      category: 
-        selector: a[href^="/torrents.php?sltSubCategory="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: sltSubCategory
-      comments:
-        selector: td:nth-child(3) a
-        attribute: href
-      download:
-        selector: a[href^="/download.php?"]
-        attribute: href
-      size:
-        selector: td:nth-child(5)
-      seeders:
-        selector: td:nth-child(6)
-      leechers:
-        selector: td:nth-child(7)
-      date:
-        selector: td:nth-child(4)
-        filters:
-          - name: append
-            args: " ago"
-      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"
+---
+  site: torviet
+  name: TorViet
+  language: vi-vn
+  type: private
+  encoding: UTF-8
+  links:
+    - http://torviet.com
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Console, desc: "Game"}
+      - {id: 7, cat: PC/Games, desc: "PC"}
+      - {id: 133, cat: PC/Phone-Other, desc: "Handheld"}
+      - {id: 132, cat: Console, desc: "Console"}
+
+      - {id: 2, cat: Movies, desc: "Movie"}
+      - {id: 23, cat: Movies/HD, desc: "mHD"}
+      - {id: 24, cat: Movies/SD, desc: "SD"}
+      - {id: 124, cat: Movies/HD, desc: "720p"}
+      - {id: 125, cat: Movies/HD, desc: "1080p"}
+      - {id: 127, cat: Movies/BluRay, desc: "Blu-ray"}
+
+      - {id: 3, cat: TV, desc: "TV"}
+      - {id: 128, cat: TV/HD, desc: "HD"}
+      - {id: 129, cat: TV/SD, desc: "SD"}
+
+      - {id: 4, cat: PC, desc: "Software"}
+      - {id: 76, cat: PC/0day, desc: "Windows"}
+      - {id: 77, cat: PC/Mac, desc: "MAC"}
+      - {id: 78, cat: PC, desc: "Linux"}
+      - {id: 79, cat: PC/Phone-Other, desc: "Handheld"}
+
+      - {id: 5, cat: Audio, desc: "Music"}
+      - {id: 92, cat: Audio/Video, desc: "Music Video"}
+      - {id: 126, cat: Audio/Lossless, desc: "Lossless"}
+      - {id: 130, cat: Audio/MP3, desc: "Lossy"}
+      - {id: 131, cat: Audio, desc: "Surround"}
+
+      - {id: 6, cat: Other, desc: "Misc"}
+      - {id: 112, cat: Books, desc: "Ebook"}
+      - {id: 113, cat: Other, desc: "Training Video"}
+      - {id: 117, cat: Audio/Audiobook, desc: "Audio book"}
+
+    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("failed"))
+    test:
+      path: /torrents.php
+      
+  ratio:
+    path: /torrents.php
+    selector: table#info_block
+    filters:
+      - name: regexp
+        args: "Ratio:\\s(.*?)\\s\\s"
+
+  search:
+    path: /torrents.php
+    inputs:
+      search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+      sltCategory: 0
+      sltSubCategory: 0 # can't sepcify multiple categorys so we're useing all always
+      sltGenre: 0
+      incldead: 1
+      spstate: 0
+      inclbookmarked: 0
+      search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
+      search_mode: 0
+
+    rows:
+      selector: div#idtorrent > table.torrents > tbody > tr:has(table.torrentname)
+    fields:
+      title:
+        selector: a[class][title]
+        attribute: title
+      details:
+        selector: a[class][title]
+        attribute: href
+      description:
+        selector: td.embedded:has(a[title])
+        remove: a[title]
+      category: 
+        selector: a[href^="/torrents.php?sltSubCategory="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: sltSubCategory
+      comments:
+        selector: td:nth-child(3) a
+        attribute: href
+      download:
+        selector: a[href^="/download.php?"]
+        attribute: href
+      size:
+        selector: td:nth-child(5)
+      seeders:
+        selector: td:nth-child(6)
+      leechers:
+        selector: td:nth-child(7)
+      date:
+        selector: td:nth-child(4)
+        filters:
+          - name: append
+            args: " ago"
+      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"

src/Jackett/Definitions/totheglory.yml

@@ -1,146 +1,146 @@
----
-  site: totheglory
-  name: ToTheGlory
-  description: "A chinese tracker"
-  language: zh-cn
-  type: private
-  encoding: UTF-8
-  links:
-    - https://totheglory.im/
-
-  caps:
-    categories:
-      # 电影
-      电影DVDRip: Movies/SD # Movie DVDRip
-      电影720p: Movies/HD # Movie 720p
-      电影1080i/p: Movies/HD # Movie 1080i / p
-      BluRay原盘: Movies/BluRay # BluRay original disc
-
-      # 纪录片
-      纪录片720p: Movies/HD # Documentary 720p
-      纪录片1080i/p: Movies/HD # Documentary 1080i / p
-      纪录片BluRay原盘: Movies/BluRay # Documentary BluRay Original
-
-      # 剧集
-      欧美剧720p: TV/HD # 欧美剧720p
-      欧美剧1080i/p: TV/HD # 欧美剧1080i/p
-      高清日剧: TV/HD # 高清日剧
-      大陆港台剧1080i/p: TV/HD # 大陆港台剧1080i/p
-      大陆港台剧720p: TV/HD # 大陆港台剧720p
-      高清韩剧: TV/HD # 高清韩剧
-
-      # 剧集包
-      欧美剧包: TV/HD # 欧美剧包
-      日剧包: TV/HD # 日剧包
-      韩剧包: TV/HD # 韩剧包
-      华语剧包: TV/HD # 华语剧包
-
-      # 音乐
-      (电影原声&Game)OST: Audio # (电影原声&Game)OST
-      无损音乐FLAC&APE: Audio/Lossless  # 无损音乐FLAC&APE
-      MV&演唱会: Audio/Video # MV&演唱会
-
-      # 其他
-      高清体育节目: TV/Sport # High-definition sports programs
-      高清动漫: TV/Anime # HD animation
-      韩国综艺: TV/HD # South Korea Variety
-      日本综艺: TV/HD # Japanese variety
-      高清综艺: TV/HD # HD Variety
-      MiniVideo: Other # MiniVideo
-      补充音轨: Audio # Supplemental audio tracks
-      iPhone/iPad视频: PC/Phone-Other # IPhone / iPad video
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: /login.php?returnto=
-    method: form
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: form#loginform > span.warning
-    test:
-      path: /my.php
-
-  ratio:
-    path: /my.php
-    selector: span.smallfont:has(span#sp_signed)
-    filters:
-      - name: regexp
-        args: "分享率 : (.*?)\u00a0\u00a0"
-
-  search:
-    path: /browse.php
-    inputs:
-      search_field: "{{range .Categories}}分类:`{{.}}` {{end}}{{ .Query.Keywords }}"
-      c: "M"
-    rows:
-      selector: table#torrent_table > tbody > tr[id]
-    fields:
-      description:
-        selector: div.name_left > a > b
-      title:
-        selector: div.name_left > a > b
-        remove: span
-      category:
-        selector: tr[id] td:nth-child(1) > a
-        attribute: href
-        filters:
-          - name: querystring
-            args: search_field
-          - name: replace
-            args: ["category:", ""]
-          - name: trim
-            args: "\""
-      details:
-        selector: div.name_left > a
-        attribute: href
-      download:
-        selector: a.dl_a
-        attribute: href
-        filters:
-          - name: regexp
-            args: "^(/download.php/\\d+/).*" # cut off download url after ID to avoid bad request errors with curl
-      files:
-        selector: td:nth-child(3)
-      size:
-        selector: td:nth-child(7)
-      seeders:
-        selector: td:nth-child(9)
-        filters:
-          - name: split
-            args: ["/", 0]
-      leechers:
-        selector: td:nth-child(9)
-        filters:
-          - name: split
-            args: ["/", 1]
-          - name: replace
-            args: ["\n", ""]
-      grabs:
-        selector: td:nth-child(8)
-        filters:
-          - name: regexp
-            args: "(\\d+)"
-      date:
-        selector: td:nth-child(5)
-        filters:
-          - name: append
-            args: " +0800"
-          - name: dateparse
-            args: "2006-01-0215:04:05 -0700"
-      imdb:
-        selector: span.imdb_rate > a
-        attribute: href
-      downloadvolumefactor:
-        case:
-          img[alt="free"]: "0"
-          img[alt="50%"]: "0.5"
-          img[alt="30%"]: "0.3"
-          "*": "1"
-      uploadvolumefactor:
-        case:
+---
+  site: totheglory
+  name: ToTheGlory
+  description: "A chinese tracker"
+  language: zh-cn
+  type: private
+  encoding: UTF-8
+  links:
+    - https://totheglory.im/
+
+  caps:
+    categories:
+      # 电影
+      电影DVDRip: Movies/SD # Movie DVDRip
+      电影720p: Movies/HD # Movie 720p
+      电影1080i/p: Movies/HD # Movie 1080i / p
+      BluRay原盘: Movies/BluRay # BluRay original disc
+
+      # 纪录片
+      纪录片720p: Movies/HD # Documentary 720p
+      纪录片1080i/p: Movies/HD # Documentary 1080i / p
+      纪录片BluRay原盘: Movies/BluRay # Documentary BluRay Original
+
+      # 剧集
+      欧美剧720p: TV/HD # 欧美剧720p
+      欧美剧1080i/p: TV/HD # 欧美剧1080i/p
+      高清日剧: TV/HD # 高清日剧
+      大陆港台剧1080i/p: TV/HD # 大陆港台剧1080i/p
+      大陆港台剧720p: TV/HD # 大陆港台剧720p
+      高清韩剧: TV/HD # 高清韩剧
+
+      # 剧集包
+      欧美剧包: TV/HD # 欧美剧包
+      日剧包: TV/HD # 日剧包
+      韩剧包: TV/HD # 韩剧包
+      华语剧包: TV/HD # 华语剧包
+
+      # 音乐
+      (电影原声&Game)OST: Audio # (电影原声&Game)OST
+      无损音乐FLAC&APE: Audio/Lossless  # 无损音乐FLAC&APE
+      MV&演唱会: Audio/Video # MV&演唱会
+
+      # 其他
+      高清体育节目: TV/Sport # High-definition sports programs
+      高清动漫: TV/Anime # HD animation
+      韩国综艺: TV/HD # South Korea Variety
+      日本综艺: TV/HD # Japanese variety
+      高清综艺: TV/HD # HD Variety
+      MiniVideo: Other # MiniVideo
+      补充音轨: Audio # Supplemental audio tracks
+      iPhone/iPad视频: PC/Phone-Other # IPhone / iPad video
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: /login.php?returnto=
+    method: form
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: form#loginform > span.warning
+    test:
+      path: /my.php
+
+  ratio:
+    path: /my.php
+    selector: span.smallfont:has(span#sp_signed)
+    filters:
+      - name: regexp
+        args: "分享率 : (.*?)\u00a0\u00a0"
+
+  search:
+    path: /browse.php
+    inputs:
+      search_field: "{{range .Categories}}分类:`{{.}}` {{end}}{{ .Query.Keywords }}"
+      c: "M"
+    rows:
+      selector: table#torrent_table > tbody > tr[id]
+    fields:
+      description:
+        selector: div.name_left > a > b
+      title:
+        selector: div.name_left > a > b
+        remove: span
+      category:
+        selector: tr[id] td:nth-child(1) > a
+        attribute: href
+        filters:
+          - name: querystring
+            args: search_field
+          - name: replace
+            args: ["category:", ""]
+          - name: trim
+            args: "\""
+      details:
+        selector: div.name_left > a
+        attribute: href
+      download:
+        selector: a.dl_a
+        attribute: href
+        filters:
+          - name: regexp
+            args: "^(/download.php/\\d+/).*" # cut off download url after ID to avoid bad request errors with curl
+      files:
+        selector: td:nth-child(3)
+      size:
+        selector: td:nth-child(7)
+      seeders:
+        selector: td:nth-child(9)
+        filters:
+          - name: split
+            args: ["/", 0]
+      leechers:
+        selector: td:nth-child(9)
+        filters:
+          - name: split
+            args: ["/", 1]
+          - name: replace
+            args: ["\n", ""]
+      grabs:
+        selector: td:nth-child(8)
+        filters:
+          - name: regexp
+            args: "(\\d+)"
+      date:
+        selector: td:nth-child(5)
+        filters:
+          - name: append
+            args: " +0800"
+          - name: dateparse
+            args: "2006-01-0215:04:05 -0700"
+      imdb:
+        selector: span.imdb_rate > a
+        attribute: href
+      downloadvolumefactor:
+        case:
+          img[alt="free"]: "0"
+          img[alt="50%"]: "0.5"
+          img[alt="30%"]: "0.3"
+          "*": "1"
+      uploadvolumefactor:
+        case:
           "*": "1"

src/Jackett/Definitions/uhdbits.yml

@@ -1,134 +1,134 @@
----
-  site: uhdbits
-  name: UHDBits
-  description: "A vietnamese general tracker"
-  language: en-us
-  type: private
-  encoding: UTF-8
-  links:
-    - https://uhdbits.org/
-
-  caps:
-    categories:
-      1: Movies
-      2: Audio
-      3: TV
-      4: Audio
-      5: PC
-      6: Other
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q, imdbid]
-
-  login:
-    path: /login.php
-    form: form.auth_form
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      keeplogged: "1"
-    error:
-    - selector: .auth_form > .warning
-      message:
-        selector: ".auth_form > .warning"
-    test:
-      path: /top10.php
-
-  ratio:
-    path: /top10.php
-    selector: span.r99
-
-  search:
-    path: /torrents.php
-    inputs:
-      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
-      searchstr: "{{if .Query.IMDBID}}{{else}}{{ .Query.Keywords }}{{end}}"
-      imdbid: "{{ .Query.IMDBIDShort }}"
-      tags_type: "1"
-      order_by: "time"
-      order_way: "desc"
-      action: "advanced"
-      searchsubmit: "1"
-
-    rows:
-      selector: table#torrent_table > tbody > tr.torrent
-    fields:
-      # note: there are optinal extra colums
-      download:
-        selector: a[title="Download"]
-        attribute: href
-        filters:
-          - name: replace
-            args: ["\t", " "]
-      title:
-        selector: div.group_info
-        remove: span, div.tags
-        filters:
-          - name: replace
-            args: [" / Free", ""]
-          - name: replace
-            args: [" / ViE", ""]
-          - name: replace
-            args: [" / User", ""]
-          - name: replace
-            args: [" / Exclusive!", ""]
-          - name: replace
-            args: [" / ↓25%", ""]
-          - name: replace
-            args: [" / ↓50%", ""]
-          - name: replace
-            args: [" / ↓75%", ""]
-          - name: replace
-            args: [" / 2x 50%", ""]
-          - name: replace
-            args: [" / 2x Free", ""]
-          - name: replace
-            args: [" / 2x", ""]
-      downloadvolumefactor:
-        case:
-          "strong.blink_me:contains(\"Free\")": "0"
-          "strong.blink_me:contains(\"50\")": "0.5"
-          "strong.blink_me:contains(\"25\")": "0.75"
-          "strong.blink_me:contains(\"75\")": "0.25"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "strong.blink_me:contains(\"2x\")": "2"
-          "*": "1"
-      category:
-        selector: a[href^="torrents.php?filter_cat"]
-        attribute: href
-        filters:
-          - name: regexp
-            args: "\\[(\\d+?)\\]"
-      comments:
-        selector: a.torrent_name
-        attribute: href
-        filters:
-          - name: replace
-            args: ["\t", " "]
-      details:
-        selector: a.torrent_name
-        attribute: href
-        filters:
-          - name: replace
-            args: ["\t", " "]
-          - name: regexp
-            args: (.*)#torrent\d+$
-      size:
-        selector: td[class="number_column nobr"]
-      grabs:
-        selector: td[class="number_column nobr"] ~ td
-      files:
-        selector: td:nth-child(3)
-      seeders:
-        selector: td[class="number_column nobr"] ~ td ~ td
-      leechers:
-        selector: td[class="number_column nobr"] ~ td ~ td ~ td
-      date:
-        selector: td:nth-child(4)
-        filters:
-          - name: append
-            args: " ago"
+---
+  site: uhdbits
+  name: UHDBits
+  description: "A vietnamese general tracker"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://uhdbits.org/
+
+  caps:
+    categories:
+      1: Movies
+      2: Audio
+      3: TV
+      4: Audio
+      5: PC
+      6: Other
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q, imdbid]
+
+  login:
+    path: /login.php
+    form: form.auth_form
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      keeplogged: "1"
+    error:
+    - selector: .auth_form > .warning
+      message:
+        selector: ".auth_form > .warning"
+    test:
+      path: /top10.php
+
+  ratio:
+    path: /top10.php
+    selector: span.r99
+
+  search:
+    path: /torrents.php
+    inputs:
+      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+      searchstr: "{{if .Query.IMDBID}}{{else}}{{ .Query.Keywords }}{{end}}"
+      imdbid: "{{ .Query.IMDBIDShort }}"
+      tags_type: "1"
+      order_by: "time"
+      order_way: "desc"
+      action: "advanced"
+      searchsubmit: "1"
+
+    rows:
+      selector: table#torrent_table > tbody > tr.torrent
+    fields:
+      # note: there are optinal extra colums
+      download:
+        selector: a[title="Download"]
+        attribute: href
+        filters:
+          - name: replace
+            args: ["\t", " "]
+      title:
+        selector: div.group_info
+        remove: span, div.tags
+        filters:
+          - name: replace
+            args: [" / Free", ""]
+          - name: replace
+            args: [" / ViE", ""]
+          - name: replace
+            args: [" / User", ""]
+          - name: replace
+            args: [" / Exclusive!", ""]
+          - name: replace
+            args: [" / ↓25%", ""]
+          - name: replace
+            args: [" / ↓50%", ""]
+          - name: replace
+            args: [" / ↓75%", ""]
+          - name: replace
+            args: [" / 2x 50%", ""]
+          - name: replace
+            args: [" / 2x Free", ""]
+          - name: replace
+            args: [" / 2x", ""]
+      downloadvolumefactor:
+        case:
+          "strong.blink_me:contains(\"Free\")": "0"
+          "strong.blink_me:contains(\"50\")": "0.5"
+          "strong.blink_me:contains(\"25\")": "0.75"
+          "strong.blink_me:contains(\"75\")": "0.25"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "strong.blink_me:contains(\"2x\")": "2"
+          "*": "1"
+      category:
+        selector: a[href^="torrents.php?filter_cat"]
+        attribute: href
+        filters:
+          - name: regexp
+            args: "\\[(\\d+?)\\]"
+      comments:
+        selector: a.torrent_name
+        attribute: href
+        filters:
+          - name: replace
+            args: ["\t", " "]
+      details:
+        selector: a.torrent_name
+        attribute: href
+        filters:
+          - name: replace
+            args: ["\t", " "]
+          - name: regexp
+            args: (.*)#torrent\d+$
+      size:
+        selector: td[class="number_column nobr"]
+      grabs:
+        selector: td[class="number_column nobr"] ~ td
+      files:
+        selector: td:nth-child(3)
+      seeders:
+        selector: td[class="number_column nobr"] ~ td ~ td
+      leechers:
+        selector: td[class="number_column nobr"] ~ td ~ td ~ td
+      date:
+        selector: td:nth-child(4)
+        filters:
+          - name: append
+            args: " ago"

src/Jackett/Definitions/ultimategamerclub.yml

@@ -1,125 +1,125 @@
----
-  site: ultimategamerclub
-  name: Ultimate Gamer Club
-  language: en-us
-  type: private
-  encoding: UTF-8
-  links:
-    - https://ultimategamer.club/
-
-  caps:
-    categorymappings:
-      # Computer
-      - {id: 10, cat: PC/Games, desc: "Windows"}
-      - {id: 11, cat: PC/Mac, desc: "Macintosh"}
-      - {id: 47, cat: PC, desc: "Linux"}
-      - {id: 56, cat: PC, desc: "VR"}
-      # Microsoft
-      - {id: 14, cat: Console/Xbox, desc: "Xbox"}
-      - {id: 61, cat: Console/Xbox360, desc: "Xbox 360"}
-      - {id: 62, cat: Console/XboxOne, desc: "Xbox One"}
-      # Sony
-      - {id: 43, cat: Console/PS3, desc: "Playstation "}
-      - {id: 63, cat: Console/PS3, desc: "Playstation 2"}
-      - {id: 64, cat: Console/PS3, desc: "Playstation 3"}
-      - {id: 67, cat: Console/PS4, desc: "Playstation 4"}
-      - {id: 12, cat: Console/Other, desc: "PSN"}
-      # Nintendo
-      - {id: 57, cat: Console/Other, desc: "Gamecube"}
-      - {id: 44, cat: Console/Wii, desc: "Wii"}
-      - {id: 46, cat: Console/Wii, desc: "Wii U"}
-      # Handheld
-      - {id: 15, cat: Console/NDS, desc: "DS"}
-      - {id: 68, cat: Console/NDS, desc: "3DS"}
-      - {id: 69, cat: Console/PSP, desc: "PSP"}
-      - {id: 70, cat: Console/PSVita, desc: "PSVita"}
-      # Mobile
-      - {id: 65, cat: PC/Phone-IOS, desc: "iOS"}
-      - {id: 49, cat: PC/Phone-Android, desc: "Android"}
-      - {id: 66, cat: PC/Phone-Other, desc: "Windows Mobile"}
-      # Reading
-      - {id: 53, cat: Books, desc: "Books/Mags"}
-      - {id: 60, cat: Books, desc: "Comics"}
-      - {id: 17, cat: Books, desc: "Guides"}
-      # Media
-      - {id: 58, cat: Audio/Video, desc: "Gaming Videos"}
-      - {id: 52, cat: Audio, desc: "OST"}
-      - {id: 55, cat: Other, desc: "Time for a Break"}
-      # Various
-      - {id: 59, cat: Other, desc: "Mods"}
-      - {id: 54, cat: Other, desc: "Updates/Fixes"}
-      - {id: 71, cat: PC/0day, desc: "Applications/Tools"}
-      - {id: 48, cat: Other, desc: "Retro"}
-      - {id: 72, cat: Other, desc: "Board Games"}
-      - {id: 75, cat: Other, desc: "Paper Crafting"}
-
-    modes:
-      search: [q]
-
-  login:
-    path: account-login.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: div.errFrame
-    test:
-      path: torrents-search.php
-
-  search:
-    path: torrents-search.php
-    keywordsfilters: 
-      - name: re_replace
-        args: ["[^a-zA-Z0-9]+", "+"]
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
-      incldead: "1"
-    rows:
-      selector: table.ttable_headinner > tbody > tr[class^="t-row"]
-      filters:
-        - name: andmatch
-    fields:
-      download:
-        selector: a[href^="download.php?id="]
-        attribute: href
-      title:
-        selector: a[href^="torrents-details.php?id="]
-        attribute: title
-      category:
-        selector: a[href^="torrents.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      details:
-        selector: a[href^="torrents-details.php?id="]
-        attribute: href
-      date:
-        selector: td:nth-child(2) span:contains("Added:")
-        filters:
-          - name: replace
-            args: ["Added: ", ""]
-          - name: replace
-            args: [" at", ""]
-          - name: append
-            args: " +00:00"
-          - name: dateparse
-            args: "02/01/2006 15:04:05 -07:00"
-      size:
-        selector: td:nth-child(7)
-      grabs:
-        selector: td:nth-child(8)
-      seeders:
-        selector: td:nth-child(9)
-      leechers:
-        selector: td:nth-child(10)
-      downloadvolumefactor:
-        case:
-          ":root:has(globnfo:contains(\"sitewide freeleech\"))": "0"
-          img[title="freeleech"]: "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
+---
+  site: ultimategamerclub
+  name: Ultimate Gamer Club
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://ultimategamer.club/
+
+  caps:
+    categorymappings:
+      # Computer
+      - {id: 10, cat: PC/Games, desc: "Windows"}
+      - {id: 11, cat: PC/Mac, desc: "Macintosh"}
+      - {id: 47, cat: PC, desc: "Linux"}
+      - {id: 56, cat: PC, desc: "VR"}
+      # Microsoft
+      - {id: 14, cat: Console/Xbox, desc: "Xbox"}
+      - {id: 61, cat: Console/Xbox360, desc: "Xbox 360"}
+      - {id: 62, cat: Console/XboxOne, desc: "Xbox One"}
+      # Sony
+      - {id: 43, cat: Console/PS3, desc: "Playstation "}
+      - {id: 63, cat: Console/PS3, desc: "Playstation 2"}
+      - {id: 64, cat: Console/PS3, desc: "Playstation 3"}
+      - {id: 67, cat: Console/PS4, desc: "Playstation 4"}
+      - {id: 12, cat: Console/Other, desc: "PSN"}
+      # Nintendo
+      - {id: 57, cat: Console/Other, desc: "Gamecube"}
+      - {id: 44, cat: Console/Wii, desc: "Wii"}
+      - {id: 46, cat: Console/Wii, desc: "Wii U"}
+      # Handheld
+      - {id: 15, cat: Console/NDS, desc: "DS"}
+      - {id: 68, cat: Console/NDS, desc: "3DS"}
+      - {id: 69, cat: Console/PSP, desc: "PSP"}
+      - {id: 70, cat: Console/PSVita, desc: "PSVita"}
+      # Mobile
+      - {id: 65, cat: PC/Phone-IOS, desc: "iOS"}
+      - {id: 49, cat: PC/Phone-Android, desc: "Android"}
+      - {id: 66, cat: PC/Phone-Other, desc: "Windows Mobile"}
+      # Reading
+      - {id: 53, cat: Books, desc: "Books/Mags"}
+      - {id: 60, cat: Books, desc: "Comics"}
+      - {id: 17, cat: Books, desc: "Guides"}
+      # Media
+      - {id: 58, cat: Audio/Video, desc: "Gaming Videos"}
+      - {id: 52, cat: Audio, desc: "OST"}
+      - {id: 55, cat: Other, desc: "Time for a Break"}
+      # Various
+      - {id: 59, cat: Other, desc: "Mods"}
+      - {id: 54, cat: Other, desc: "Updates/Fixes"}
+      - {id: 71, cat: PC/0day, desc: "Applications/Tools"}
+      - {id: 48, cat: Other, desc: "Retro"}
+      - {id: 72, cat: Other, desc: "Board Games"}
+      - {id: 75, cat: Other, desc: "Paper Crafting"}
+
+    modes:
+      search: [q]
+
+  login:
+    path: account-login.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: div.errFrame
+    test:
+      path: torrents-search.php
+
+  search:
+    path: torrents-search.php
+    keywordsfilters: 
+      - name: re_replace
+        args: ["[^a-zA-Z0-9]+", "+"]
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      incldead: "1"
+    rows:
+      selector: table.ttable_headinner > tbody > tr[class^="t-row"]
+      filters:
+        - name: andmatch
+    fields:
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      title:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: title
+      category:
+        selector: a[href^="torrents.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      details:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: href
+      date:
+        selector: td:nth-child(2) span:contains("Added:")
+        filters:
+          - name: replace
+            args: ["Added: ", ""]
+          - name: replace
+            args: [" at", ""]
+          - name: append
+            args: " +00:00"
+          - name: dateparse
+            args: "02/01/2006 15:04:05 -07:00"
+      size:
+        selector: td:nth-child(7)
+      grabs:
+        selector: td:nth-child(8)
+      seeders:
+        selector: td:nth-child(9)
+      leechers:
+        selector: td:nth-child(10)
+      downloadvolumefactor:
+        case:
+          ":root:has(globnfo:contains(\"sitewide freeleech\"))": "0"
+          img[title="freeleech"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
           "*": "1"

src/Jackett/Definitions/utorrents.yml

@@ -1,128 +1,128 @@
----
-  site: utorrents
-  name: u-Torrent
-  language: ro-ro
-  type: private
-  encoding: windows-1252
-  links:
-    - http://www.u-torrents.ro/
-
-  caps:
-    categorymappings:
-      - {id: 48, cat: Movies/3D, desc: "3D"}
-      - {id: 1, cat: PC/0day, desc: "Appz"}
-      - {id: 3, cat: Other, desc: "Cartoons"}
-      - {id: 42, cat: TV/Documentary, desc: "Documentaries"}
-      - {id: 6, cat: Books, desc: "eBooks"}
-      - {id: 11, cat: PC/Games, desc: "Games | PC"}
-      - {id: 12, cat: Console/PS3, desc: "Games | PS2"}
-      - {id: 36, cat: Console/PS3, desc: "Games | PS3"}
-      - {id: 40, cat: Console/PSP, desc: "Games | PSP"}
-      - {id: 25, cat: Console/Wii, desc: "Games | Wii"}
-      - {id: 16, cat: Console/Xbox, desc: "Games | XBOX"}
-      - {id: 19, cat: PC/Phone-Other, desc: "Mobile"}
-      - {id: 43, cat: Movies/BluRay, desc: "Movies | Blu-Ray"}
-      - {id: 49, cat: Movies/BluRay, desc: "Movies | Blu-Ray-RO"}
-      - {id: 7, cat: Movies/DVD, desc: "Movies | DVD-R"}
-      - {id: 2, cat: Movies/DVD, desc: "Movies | DVD-RO"}
-      - {id: 17, cat: Movies/HD, desc: "Movies | HD"}
-      - {id: 45, cat: Movies/HD, desc: "Movies | HD-RO"}
-      - {id: 21, cat: Movies, desc: "Movies | Oldies"}
-      - {id: 38, cat: Movies, desc: "Movies | Packs"}
-      - {id: 8, cat: Movies/SD, desc: "Movies | x264"}
-      - {id: 4, cat: Movies/SD, desc: "Movies | x264-RO"}
-      - {id: 10, cat: Movies/SD, desc: "Movies | XviD"}
-      - {id: 44, cat: Movies/SD, desc: "Movies | XviD-RO"}
-      - {id: 5, cat: Audio/MP3, desc: "Music | Mp3"}
-      - {id: 39, cat: Audio, desc: "Music | Packs"}
-      - {id: 23, cat: Audio/Video, desc: "Music | Videos"}
-      - {id: 18, cat: Other, desc: "Pictures"}
-      - {id: 46, cat: XXX/Imageset, desc: "Pictures | xxx"}
-      - {id: 22, cat: TV/Sport, desc: "Sport"}
-      - {id: 50, cat: TV, desc: "STAR"}
-      - {id: 20, cat: TV/SD, desc: "TV | Episodes"}
-      - {id: 47, cat: TV/HD, desc: "TV | Episodes HD"}
-      - {id: 41, cat: TV, desc: "TV | Packs"}
-      - {id: 15, cat: XXX, desc: "xXx"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: /takelogin.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: td.embedded:has(h2:contains("failed"))
-    test:
-      path: /browse.php
-      
-  ratio:
-    path: /browse.php
-    selector: font:contains("Ratio:") > span
-
-  search:
-    path: /browse.php
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
-      incldead: 1
-    rows:
-      selector: td.outer > table > tbody > tr:has(a[href^="details.php?id="])
-    fields:
-      title:
-        selector: a[href^="details.php?id="]
-      details:
-        selector: a[href^="details.php?id="]
-        attribute: href
-      category:
-        selector: a[href^="browse.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      download:
-        selector: a[href^="download2.php"]
-        attribute: href
-      grabs:
-        selector: td:nth-child(7)
-        filters:
-          - name: regexp
-            args: (\d+)
-      files:
-        selector: td:nth-child(3)
-      size:
-        selector: td:nth-child(6)
-      date:
-        selector: td:nth-child(5)
-        filters:
-          - name: trim
-            args: "\xF0"
-          - name: append
-            args: " +02:00"
-          - name: dateparse
-            args: "02-01-200615:04:05 -07:00"
-      seeders:
-        selector: td:nth-child(8)
-      leechers:
-        selector: td:nth-child(9)
-      banner:
-        selector: a[onmouseover][href^="details.php?id="]
-        attribute: onmouseover
-        filters:
-          - name: regexp
-            args: src=([^\s]+)
-      downloadvolumefactor:
-        case:
-          button.btnfree: "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          button.btn2xup: "2"
-          "*": "1"
-      description:
-        selector: td:nth-child(2)
-        remove: a[href^="details.php?id="]
+---
+  site: utorrents
+  name: u-Torrent
+  language: ro-ro
+  type: private
+  encoding: windows-1252
+  links:
+    - http://www.u-torrents.ro/
+
+  caps:
+    categorymappings:
+      - {id: 48, cat: Movies/3D, desc: "3D"}
+      - {id: 1, cat: PC/0day, desc: "Appz"}
+      - {id: 3, cat: Other, desc: "Cartoons"}
+      - {id: 42, cat: TV/Documentary, desc: "Documentaries"}
+      - {id: 6, cat: Books, desc: "eBooks"}
+      - {id: 11, cat: PC/Games, desc: "Games | PC"}
+      - {id: 12, cat: Console/PS3, desc: "Games | PS2"}
+      - {id: 36, cat: Console/PS3, desc: "Games | PS3"}
+      - {id: 40, cat: Console/PSP, desc: "Games | PSP"}
+      - {id: 25, cat: Console/Wii, desc: "Games | Wii"}
+      - {id: 16, cat: Console/Xbox, desc: "Games | XBOX"}
+      - {id: 19, cat: PC/Phone-Other, desc: "Mobile"}
+      - {id: 43, cat: Movies/BluRay, desc: "Movies | Blu-Ray"}
+      - {id: 49, cat: Movies/BluRay, desc: "Movies | Blu-Ray-RO"}
+      - {id: 7, cat: Movies/DVD, desc: "Movies | DVD-R"}
+      - {id: 2, cat: Movies/DVD, desc: "Movies | DVD-RO"}
+      - {id: 17, cat: Movies/HD, desc: "Movies | HD"}
+      - {id: 45, cat: Movies/HD, desc: "Movies | HD-RO"}
+      - {id: 21, cat: Movies, desc: "Movies | Oldies"}
+      - {id: 38, cat: Movies, desc: "Movies | Packs"}
+      - {id: 8, cat: Movies/SD, desc: "Movies | x264"}
+      - {id: 4, cat: Movies/SD, desc: "Movies | x264-RO"}
+      - {id: 10, cat: Movies/SD, desc: "Movies | XviD"}
+      - {id: 44, cat: Movies/SD, desc: "Movies | XviD-RO"}
+      - {id: 5, cat: Audio/MP3, desc: "Music | Mp3"}
+      - {id: 39, cat: Audio, desc: "Music | Packs"}
+      - {id: 23, cat: Audio/Video, desc: "Music | Videos"}
+      - {id: 18, cat: Other, desc: "Pictures"}
+      - {id: 46, cat: XXX/Imageset, desc: "Pictures | xxx"}
+      - {id: 22, cat: TV/Sport, desc: "Sport"}
+      - {id: 50, cat: TV, desc: "STAR"}
+      - {id: 20, cat: TV/SD, desc: "TV | Episodes"}
+      - {id: 47, cat: TV/HD, desc: "TV | Episodes HD"}
+      - {id: 41, cat: TV, desc: "TV | Packs"}
+      - {id: 15, cat: XXX, desc: "xXx"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: /takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: td.embedded:has(h2:contains("failed"))
+    test:
+      path: /browse.php
+      
+  ratio:
+    path: /browse.php
+    selector: font:contains("Ratio:") > span
+
+  search:
+    path: /browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      incldead: 1
+    rows:
+      selector: td.outer > table > tbody > tr:has(a[href^="details.php?id="])
+    fields:
+      title:
+        selector: a[href^="details.php?id="]
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      download:
+        selector: a[href^="download2.php"]
+        attribute: href
+      grabs:
+        selector: td:nth-child(7)
+        filters:
+          - name: regexp
+            args: (\d+)
+      files:
+        selector: td:nth-child(3)
+      size:
+        selector: td:nth-child(6)
+      date:
+        selector: td:nth-child(5)
+        filters:
+          - name: trim
+            args: "\xF0"
+          - name: append
+            args: " +02:00"
+          - name: dateparse
+            args: "02-01-200615:04:05 -07:00"
+      seeders:
+        selector: td:nth-child(8)
+      leechers:
+        selector: td:nth-child(9)
+      banner:
+        selector: a[onmouseover][href^="details.php?id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: src=([^\s]+)
+      downloadvolumefactor:
+        case:
+          button.btnfree: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          button.btn2xup: "2"
+          "*": "1"
+      description:
+        selector: td:nth-child(2)
+        remove: a[href^="details.php?id="]

src/Jackett/Definitions/waffles.yml

@@ -0,0 +1,165 @@
+---
+  site: waffles
+  name: Waffles
+  description: "Music, ebook and software tracker"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://waffles.ch/
+
+  caps:
+    categorymappings:
+      - {id: 2, cat: Audio, desc: "70s"}
+      - {id: 3, cat: Audio, desc: "80s"}
+      - {id: 4, cat: Audio, desc: "90s"}
+      - {id: 82, cat: Audio, desc: "Acoustic"}
+      - {id: 5, cat: Audio, desc: "Alternative"}
+      - {id: 6, cat: Audio, desc: "Ambient"}
+      - {id: 85, cat: PC/ISO, desc: "Apps Linux"}
+      - {id: 84, cat: PC/Mac, desc: "Apps Mac"}
+      - {id: 83, cat: PC, desc: "Apps Win"}
+      - {id: 7, cat: Audio, desc: "Asian"}
+      - {id: 89, cat: Audio/Audiobook, desc: "Audiobook Fiction"}
+      - {id: 90, cat: Audio/Audiobook, desc: "Audiobook Non Fiction"}
+      - {id: 80, cat: Audio, desc: "Avant-Garde"}
+      - {id: 8, cat: Audio, desc: "Bluegrass"}
+      - {id: 9, cat: Audio, desc: "Blues"}
+      - {id: 10, cat: Audio, desc: "Breaks"}
+      - {id: 70, cat: Audio, desc: "Classic Rock"}
+      - {id: 11, cat: Audio, desc: "Classical"}
+      - {id: 72, cat: Audio, desc: "Comedy"}
+      - {id: 88, cat: Audio, desc: "Comics"}
+      - {id: 91, cat: Audio, desc: "Components"}
+      - {id: 12, cat: Audio, desc: "Country"}
+      - {id: 13, cat: Audio, desc: "Dance"}
+      - {id: 81, cat: Audio, desc: "Disco"}
+      - {id: 67, cat: Audio, desc: "Dream Pop"}
+      - {id: 14, cat: Audio, desc: "Drum 'n' Bass"}
+      - {id: 57, cat: Audio, desc: "Dubstep"}
+      - {id: 86, cat: Books, desc: "E-Book Fiction"}
+      - {id: 87, cat: Books, desc: "E-Book Nonfiction"}
+      - {id: 93, cat: Audio, desc: "E-Learning"}
+      - {id: 15, cat: Audio, desc: "Electronic"}
+      - {id: 16, cat: Audio, desc: "Emo"}
+      - {id: 17, cat: Audio, desc: "Experimental"}
+      - {id: 18, cat: Audio, desc: "Folk"}
+      - {id: 19, cat: Audio, desc: "Funk"}
+      - {id: 20, cat: Audio, desc: "Garage"}
+      - {id: 61, cat: Audio, desc: "Goth"}
+      - {id: 66, cat: Audio, desc: "Grime"}
+      - {id: 65, cat: Audio, desc: "Grindcore"}
+      - {id: 73, cat: Audio, desc: "Grunge"}
+      - {id: 21, cat: Audio, desc: "Hardcore"}
+      - {id: 22, cat: Audio, desc: "Hip-Hop/Rap"}
+      - {id: 23, cat: Audio, desc: "House"}
+      - {id: 24, cat: Audio, desc: "IDM"}
+      - {id: 25, cat: Audio, desc: "Indie"}
+      - {id: 26, cat: Audio, desc: "Industrial"}
+      - {id: 27, cat: Audio, desc: "J-Music"}
+      - {id: 28, cat: Audio, desc: "Jazz"}
+      - {id: 29, cat: Audio, desc: "Kids"}
+      - {id: 30, cat: Audio, desc: "Latin"}
+      - {id: 75, cat: Audio, desc: "Lounge"}
+      - {id: 31, cat: Audio, desc: "Metal"}
+      - {id: 32, cat: Audio, desc: "Misc"}
+      - {id: 79, cat: Audio, desc: "Musical"}
+      - {id: 59, cat: Audio, desc: "New Wave"}
+      - {id: 60, cat: Audio, desc: "No Wave"}
+      - {id: 63, cat: Audio, desc: "Noise"}
+      - {id: 64, cat: Audio, desc: "Noiserock"}
+      - {id: 33, cat: Audio, desc: "OST"}
+      - {id: 34, cat: Audio, desc: "Pop"}
+      - {id: 77, cat: Audio, desc: "Pop-Punk"}
+      - {id: 58, cat: Audio, desc: "Post-Punk"}
+      - {id: 35, cat: Audio, desc: "Post-Rock"}
+      - {id: 36, cat: Audio, desc: "Pre-60s"}
+      - {id: 69, cat: Audio, desc: "Progressive Rock"}
+      - {id: 68, cat: Audio, desc: "Protopunk"}
+      - {id: 37, cat: Audio, desc: "Psychedelic"}
+      - {id: 78, cat: Audio, desc: "Psytrance"}
+      - {id: 38, cat: Audio, desc: "Punk"}
+      - {id: 39, cat: Audio, desc: "R 'n' B"}
+      - {id: 40, cat: Audio, desc: "Reggae"}
+      - {id: 62, cat: Audio, desc: "Remixes"}
+      - {id: 41, cat: Audio, desc: "Rock"}
+      - {id: 71, cat: Audio, desc: "Screamo"}
+      - {id: 92, cat: Audio, desc: "Sheet music"}
+      - {id: 42, cat: Audio, desc: "Ska"}
+      - {id: 43, cat: Audio, desc: "Soul"}
+      - {id: 76, cat: Audio, desc: "Synthpop"}
+      - {id: 44, cat: Audio, desc: "Techno"}
+      - {id: 45, cat: Audio, desc: "Trance"}
+      - {id: 46, cat: Audio, desc: "Trip Hop"}
+      - {id: 47, cat: Audio, desc: "UK Garage"}
+      - {id: 74, cat: Audio, desc: "Video Game Music"}
+      - {id: 48, cat: Audio, desc: "World/Ethnic"}
+      - {id: 49, cat: Audio, desc: "Xmas"}
+
+    modes:
+      search: [q]
+
+  login:
+    path: login_check
+    method: post
+    inputs:
+      _username: "{{ .Config.username }}"
+      _password: "{{ .Config.password }}"
+    # error:
+    #   - selector: title:contains("Redirecting to https://waffles.ch/login")
+    test:
+      path: index.php
+
+  download:
+    selector: a[href^="download.php?id="]
+        
+  search:
+    path: browse.php
+    inputs:
+      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+      q: "{{ .Query.Keywords }}"
+    rows:
+      selector: table#browsetable > tbody > tr:has(a[href^="/details.php?id="])
+    fields:
+      category:
+        selector: a[href^="/browse.php?q="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: c
+      title:
+        selector: td:nth-child(2)
+      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(7)
+        filters:
+          - name: regexp
+            args: ([\d,]+)
+      files:
+        selector: td:nth-child(3)
+      size:
+        selector: td:nth-child(6)
+      seeders:
+        selector: td:nth-child(8)
+      leechers:
+        selector: td:nth-child(9)
+      date:
+        selector: td:nth-child(5)
+        filters:
+          - name: dateparse
+            args: "2 April 2017 +05:50"
+      downloadvolumefactor:
+        case:
+          "img[title=\"Free Torrent!\"]": "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett/Definitions/worldofp2p.yml

@@ -1,136 +1,136 @@
----
-  site: worldofp2p
-  name: WorldOfP2P
-  description: "A general tracker"
-  language: en-us
-  type: private
-  encoding: UTF-8
-  links:
-    - https://worldofp2p.net
-
-  caps:
-    categorymappings:
-      - {id: 9, cat: TV/Anime, desc: "Anime"}
-      - {id: 15, cat: PC/0day, desc: "Apps-Linux"}
-      - {id: 16, cat: PC/Mac, desc: "Apps-Macintosh"}
-      - {id: 17, cat: PC/Phone-Other, desc: "Apps-Mobile"}
-      - {id: 1, cat:  PC/0day, desc: "Apps-Windows"}
-      - {id: 49, cat: Audio, desc: "Audio Tracks"}
-      - {id: 51, cat: Audio/Audiobook, desc: "AudioBook"}
-      - {id: 50, cat: Books, desc: "Ebooks"}
-      - {id: 23, cat: Console/Other, desc: "Games-Mixed"}
-      - {id: 32, cat: Console, desc: "Games-Packs"}
-      - {id: 2, cat: PC/Games, desc: "Games-PC"}
-      - {id: 12, cat: PC/Games, desc: "Games-PC Rips"}
-      - {id: 20, cat: Console/Other, desc: "Games-PS1"}
-      - {id: 8, cat: Console/Other, desc: "Games-PS2"}
-      - {id: 21, cat: Console/PS3, desc: "Games-PS3"}
-      - {id: 22, cat: Console/PS4, desc: "Games-PS4"}
-      - {id: 7, cat: Console/PSP, desc: "Games-PSP"}
-      - {id: 14, cat: Console/Wii, desc: "Games-Wii"}
-      - {id: 44, cat: Console/Xbox360, desc: "Games-Xbox 360"}
-      - {id: 45, cat: Console/Xbox, desc: "Games-Xbox One"}
-      - {id: 43, cat: Console/Xbox, desc: "Gamex-Xbox"}
-      - {id: 30, cat: Movies/HD, desc: "Movies-1080p"}
-      - {id: 56, cat: Movies/HD, desc: "Movies-2160p"}
-      - {id: 24, cat: Movies/3D, desc: "Movies-3D"}
-      - {id: 53, cat: Movies/SD, desc: "Movies-480p"}
-      - {id: 52, cat: Movies/SD, desc: "Movies-576p"}
-      - {id: 25, cat: Movies/HD, desc: "Movies-720p"}
-      - {id: 11, cat: Movies/BluRay, desc: "Movies-Bluray"}
-      - {id: 26, cat: Movies/HD, desc: "Movies-BRRip"}
-      - {id: 27, cat: Movies/SD, desc: "Movies-Camera"}
-      - {id: 10, cat: Movies/DVD, desc: "Movies-DVDR"}
-      - {id: 28, cat: Movies/Other, desc: "Movies-Oldies"}
-      - {id: 31, cat: Movies/Other, desc: "Movies-Packs"}
-      - {id: 57, cat: Movies/HD, desc: "Movies-Remux"}
-      - {id: 33, cat: Movies/Other, desc: "Movies-Sport"}
-      - {id: 29, cat: Movies/WEBDL, desc: "Movies-Web/DL"}
-      - {id: 3, cat: Movies/SD, desc: "Movies-XviD"}
-      - {id: 13, cat: Audio/Lossless, desc: "Music-Flac"}
-      - {id: 4, cat: Audio/MP3, desc: "Music-MP3"}
-      - {id: 18, cat: Audio, desc: "Music-Packs"}
-      - {id: 19, cat: Audio/Video, desc: "Music-Videos"}
-      - {id: 37, cat: TV/HD, desc: "TV-1080p"}
-      - {id: 54, cat: TV/HD, desc: "TV-2160p"}
-      - {id: 55, cat: TV/SD, desc: "TV-480p"}
-      - {id: 39, cat: TV/HD, desc: "TV-720p"}
-      - {id: 38, cat: TV/HD, desc: "TV-Bluray"}
-      - {id: 35, cat: TV/SD, desc: "TV-DVDR"}
-      - {id: 36, cat: TV/SD, desc: "TV-DVDRip"}
-      - {id: 41, cat: TV, desc: "TV-Packs"}
-      - {id: 42, cat: TV/WEB-DL, desc: "TV-Web/DL"}
-      - {id: 58, cat: TV/HD, desc: "TV-x264"}
-      - {id: 5, cat:  TV/SD, desc: "TV-XviD"}
-      - {id: 46, cat: XXX, desc: "xXx-HD"}
-      - {id: 47, cat: XXX/Imageset, desc: "xXx-Images"}
-      - {id: 48, cat: XXX/Packs, desc: "xXx-Packs"}
-      - {id: 6, cat: XXX/XviD, desc: "xXx-XviD"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: /takelogin.php
-    method: post
-    form: form
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      login: "Login"
-    error:
-      - selector: td.stdmsg2
-    test:
-      path: /usercp.php?action=default
-
-  search:
-    path: /browse.php
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
-      incldead: "1"
-      searchin: "title"
-
-    rows:
-      selector: table.browsewidth100 > tbody > tr:has(a[href^="download.php?torrent="])
-      filters:
-        - name: andmatch
-    fields:
-      title:
-        selector: a[href^="details.php?id="]
-      category:
-        selector: a[href^="browse.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      comments:
-        selector: a[href^="details.php?id="]
-        attribute: href
-      download:
-        selector: a[href^="download.php?torrent="]
-        attribute: href
-      files:
-        selector: td:nth-child(5)
-      size:
-        selector: td:nth-child(8)
-      seeders:
-        selector: td:nth-child(10)
-      leechers:
-        selector: td:nth-child(11)
-      date:
-        selector: td:nth-child(7)
-      grabs:
-        selector: a[href^="snatches.php?id="]
-        filters:
-          - name: regexp
-            args: "(\\d+)"
-      downloadvolumefactor:
-        case:
-          a.info:contains("Free"): "0"
-          img[src*="/free.png"]: "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
+---
+  site: worldofp2p
+  name: WorldOfP2P
+  description: "A general tracker"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://worldofp2p.net
+
+  caps:
+    categorymappings:
+      - {id: 9, cat: TV/Anime, desc: "Anime"}
+      - {id: 15, cat: PC/0day, desc: "Apps-Linux"}
+      - {id: 16, cat: PC/Mac, desc: "Apps-Macintosh"}
+      - {id: 17, cat: PC/Phone-Other, desc: "Apps-Mobile"}
+      - {id: 1, cat:  PC/0day, desc: "Apps-Windows"}
+      - {id: 49, cat: Audio, desc: "Audio Tracks"}
+      - {id: 51, cat: Audio/Audiobook, desc: "AudioBook"}
+      - {id: 50, cat: Books, desc: "Ebooks"}
+      - {id: 23, cat: Console/Other, desc: "Games-Mixed"}
+      - {id: 32, cat: Console, desc: "Games-Packs"}
+      - {id: 2, cat: PC/Games, desc: "Games-PC"}
+      - {id: 12, cat: PC/Games, desc: "Games-PC Rips"}
+      - {id: 20, cat: Console/Other, desc: "Games-PS1"}
+      - {id: 8, cat: Console/Other, desc: "Games-PS2"}
+      - {id: 21, cat: Console/PS3, desc: "Games-PS3"}
+      - {id: 22, cat: Console/PS4, desc: "Games-PS4"}
+      - {id: 7, cat: Console/PSP, desc: "Games-PSP"}
+      - {id: 14, cat: Console/Wii, desc: "Games-Wii"}
+      - {id: 44, cat: Console/Xbox360, desc: "Games-Xbox 360"}
+      - {id: 45, cat: Console/Xbox, desc: "Games-Xbox One"}
+      - {id: 43, cat: Console/Xbox, desc: "Gamex-Xbox"}
+      - {id: 30, cat: Movies/HD, desc: "Movies-1080p"}
+      - {id: 56, cat: Movies/HD, desc: "Movies-2160p"}
+      - {id: 24, cat: Movies/3D, desc: "Movies-3D"}
+      - {id: 53, cat: Movies/SD, desc: "Movies-480p"}
+      - {id: 52, cat: Movies/SD, desc: "Movies-576p"}
+      - {id: 25, cat: Movies/HD, desc: "Movies-720p"}
+      - {id: 11, cat: Movies/BluRay, desc: "Movies-Bluray"}
+      - {id: 26, cat: Movies/HD, desc: "Movies-BRRip"}
+      - {id: 27, cat: Movies/SD, desc: "Movies-Camera"}
+      - {id: 10, cat: Movies/DVD, desc: "Movies-DVDR"}
+      - {id: 28, cat: Movies/Other, desc: "Movies-Oldies"}
+      - {id: 31, cat: Movies/Other, desc: "Movies-Packs"}
+      - {id: 57, cat: Movies/HD, desc: "Movies-Remux"}
+      - {id: 33, cat: Movies/Other, desc: "Movies-Sport"}
+      - {id: 29, cat: Movies/WEBDL, desc: "Movies-Web/DL"}
+      - {id: 3, cat: Movies/SD, desc: "Movies-XviD"}
+      - {id: 13, cat: Audio/Lossless, desc: "Music-Flac"}
+      - {id: 4, cat: Audio/MP3, desc: "Music-MP3"}
+      - {id: 18, cat: Audio, desc: "Music-Packs"}
+      - {id: 19, cat: Audio/Video, desc: "Music-Videos"}
+      - {id: 37, cat: TV/HD, desc: "TV-1080p"}
+      - {id: 54, cat: TV/HD, desc: "TV-2160p"}
+      - {id: 55, cat: TV/SD, desc: "TV-480p"}
+      - {id: 39, cat: TV/HD, desc: "TV-720p"}
+      - {id: 38, cat: TV/HD, desc: "TV-Bluray"}
+      - {id: 35, cat: TV/SD, desc: "TV-DVDR"}
+      - {id: 36, cat: TV/SD, desc: "TV-DVDRip"}
+      - {id: 41, cat: TV, desc: "TV-Packs"}
+      - {id: 42, cat: TV/WEB-DL, desc: "TV-Web/DL"}
+      - {id: 58, cat: TV/HD, desc: "TV-x264"}
+      - {id: 5, cat:  TV/SD, desc: "TV-XviD"}
+      - {id: 46, cat: XXX, desc: "xXx-HD"}
+      - {id: 47, cat: XXX/Imageset, desc: "xXx-Images"}
+      - {id: 48, cat: XXX/Packs, desc: "xXx-Packs"}
+      - {id: 6, cat: XXX/XviD, desc: "xXx-XviD"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: /takelogin.php
+    method: post
+    form: form
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      login: "Login"
+    error:
+      - selector: td.stdmsg2
+    test:
+      path: /usercp.php?action=default
+
+  search:
+    path: /browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      incldead: "1"
+      searchin: "title"
+
+    rows:
+      selector: table.browsewidth100 > tbody > tr:has(a[href^="download.php?torrent="])
+      filters:
+        - name: andmatch
+    fields:
+      title:
+        selector: a[href^="details.php?id="]
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      comments:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="download.php?torrent="]
+        attribute: href
+      files:
+        selector: td:nth-child(5)
+      size:
+        selector: td:nth-child(8)
+      seeders:
+        selector: td:nth-child(10)
+      leechers:
+        selector: td:nth-child(11)
+      date:
+        selector: td:nth-child(7)
+      grabs:
+        selector: a[href^="snatches.php?id="]
+        filters:
+          - name: regexp
+            args: "(\\d+)"
+      downloadvolumefactor:
+        case:
+          a.info:contains("Free"): "0"
+          img[src*="/free.png"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett/Definitions/xtremezone.yml

@@ -1,118 +1,118 @@
----
-  site: xtremezone
-  name: Xtreme Zone
-  language: ro-ro
-  type: semi-private
-  encoding: UTF-8
-  links:
-    - https://www.myxz.org/
-
-  caps:
-    categorymappings:
-      - {id: 3, cat: TV/Anime, desc: "Anime/Hentai"}
-      - {id: 1, cat: PC/0day, desc: "Appz"}
-      - {id: 9, cat: TV/Documentary, desc: "Documentary"}
-      - {id: 6, cat: Books, desc: "eBooks"}
-      - {id: 52, cat: Console, desc: "Games-Console"}
-      - {id: 11, cat: PC/Games, desc: "Games-PC"}
-      - {id: 18, cat: Other, desc: "Images"}
-      - {id: 14, cat: PC, desc: "Linux"}
-      - {id: 37, cat: PC/Mac, desc: "Mac"}
-      - {id: 19, cat: PC/Phone-Other, desc: "Mobile"}
-      - {id: 17, cat: Movies/BluRay, desc: "Movies-BluRay"}
-      - {id: 24, cat: Movies/BluRay, desc: "Movies-BluRayRO"}
-      - {id: 7, cat: Movies/DVD, desc: "Movies-DVD"}
-      - {id: 2, cat: Movies/DVD, desc: "Movies-DVD-RO"}
-      - {id: 8, cat: Movies/HD, desc: "Movies-HD"}
-      - {id: 29, cat: Movies/HD, desc: "Movies-HD-RO"}
-      - {id: 38, cat: Movies, desc: "Movies-Packs"}
-      - {id: 10, cat: Movies/SD, desc: "Movies-SD"}
-      - {id: 35, cat: Movies/SD, desc: "Movies-SD-RO"}
-      - {id: 5, cat: Audio, desc: "Music"}
-      - {id: 22, cat: TV/Sport, desc: "Sport"}
-      - {id: 43, cat: TV/HD, desc: "TV-HD"}
-      - {id: 44, cat: TV/HD, desc: "TV-HD-RO"}
-      - {id: 41, cat: TV, desc: "TV-Packs"}
-      - {id: 45, cat: TV/SD, desc: "TV-SD"}
-      - {id: 46, cat: TV/SD, desc: "TV-SD-RO"}
-      - {id: 15, cat: XXX, desc: "XXX"}
-      - {id: 47, cat: XXX, desc: "XXX-DVD"}
-      - {id: 48, cat: XXX, desc: "XXX-HD"}
-      - {id: 49, cat: XXX/Imageset, desc: "XXX-IMGSet"}
-      - {id: 50, cat: XXX, desc: "XXX-Packs"}
-      - {id: 51, cat: XXX, desc: "XXX-SD"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: /login.php
-    method: form
-    form: form
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: td.embedded:has(center > h2:contains(failed))
-    test:
-      path: /browse.php
-      
-  ratio:
-    path: /browse.php
-    selector: font:contains("Ratio:")+font
-
-  search:
-    path: /browse.php
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
-      incldead: 1
-    rows:
-      selector: table.browser > tbody > tr.browse[style]
-    fields:
-      title:
-        selector: a[href^="details.php?id="]
-      details:
-        selector: a[href^="details.php?id="]
-        attribute: href
-      category:
-        selector: a[href^="browse.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      download:
-        selector: a[href^="dwn.php"]
-        attribute: href
-      size:
-        selector: td:nth-child(6)
-      date:
-        selector: td:nth-child(5)
-        filters:
-          - name: append
-            args: " +00:00"
-          - name: dateparse
-            args: "02-01-200615:04:05 -07:00"
-      seeders:
-        selector: td:nth-child(7)
-      leechers:
-        selector: td:nth-child(8)
-      banner:
-        selector: a[onmouseover][href^="details.php?id="]
-        attribute: onmouseover
-        filters:
-          - name: regexp
-            args: src=([^\s]+)
-      downloadvolumefactor:
-        case:
-          "img[title^=\"FreeLech: \"]": "0"
-          "img[title^=\"HALF: \"]": "0.5"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "img[title^=\"2xUP: \"]": "2"
-          "*": "1"
-      description:
-        selector: td:nth-child(2)
+---
+  site: xtremezone
+  name: Xtreme Zone
+  language: ro-ro
+  type: semi-private
+  encoding: UTF-8
+  links:
+    - https://www.myxz.org/
+
+  caps:
+    categorymappings:
+      - {id: 3, cat: TV/Anime, desc: "Anime/Hentai"}
+      - {id: 1, cat: PC/0day, desc: "Appz"}
+      - {id: 9, cat: TV/Documentary, desc: "Documentary"}
+      - {id: 6, cat: Books, desc: "eBooks"}
+      - {id: 52, cat: Console, desc: "Games-Console"}
+      - {id: 11, cat: PC/Games, desc: "Games-PC"}
+      - {id: 18, cat: Other, desc: "Images"}
+      - {id: 14, cat: PC, desc: "Linux"}
+      - {id: 37, cat: PC/Mac, desc: "Mac"}
+      - {id: 19, cat: PC/Phone-Other, desc: "Mobile"}
+      - {id: 17, cat: Movies/BluRay, desc: "Movies-BluRay"}
+      - {id: 24, cat: Movies/BluRay, desc: "Movies-BluRayRO"}
+      - {id: 7, cat: Movies/DVD, desc: "Movies-DVD"}
+      - {id: 2, cat: Movies/DVD, desc: "Movies-DVD-RO"}
+      - {id: 8, cat: Movies/HD, desc: "Movies-HD"}
+      - {id: 29, cat: Movies/HD, desc: "Movies-HD-RO"}
+      - {id: 38, cat: Movies, desc: "Movies-Packs"}
+      - {id: 10, cat: Movies/SD, desc: "Movies-SD"}
+      - {id: 35, cat: Movies/SD, desc: "Movies-SD-RO"}
+      - {id: 5, cat: Audio, desc: "Music"}
+      - {id: 22, cat: TV/Sport, desc: "Sport"}
+      - {id: 43, cat: TV/HD, desc: "TV-HD"}
+      - {id: 44, cat: TV/HD, desc: "TV-HD-RO"}
+      - {id: 41, cat: TV, desc: "TV-Packs"}
+      - {id: 45, cat: TV/SD, desc: "TV-SD"}
+      - {id: 46, cat: TV/SD, desc: "TV-SD-RO"}
+      - {id: 15, cat: XXX, desc: "XXX"}
+      - {id: 47, cat: XXX, desc: "XXX-DVD"}
+      - {id: 48, cat: XXX, desc: "XXX-HD"}
+      - {id: 49, cat: XXX/Imageset, desc: "XXX-IMGSet"}
+      - {id: 50, cat: XXX, desc: "XXX-Packs"}
+      - {id: 51, cat: XXX, desc: "XXX-SD"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: /login.php
+    method: form
+    form: form
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: td.embedded:has(center > h2:contains(failed))
+    test:
+      path: /browse.php
+      
+  ratio:
+    path: /browse.php
+    selector: font:contains("Ratio:")+font
+
+  search:
+    path: /browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      incldead: 1
+    rows:
+      selector: table.browser > tbody > tr.browse[style]
+    fields:
+      title:
+        selector: a[href^="details.php?id="]
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      download:
+        selector: a[href^="dwn.php"]
+        attribute: href
+      size:
+        selector: td:nth-child(6)
+      date:
+        selector: td:nth-child(5)
+        filters:
+          - name: append
+            args: " +00:00"
+          - name: dateparse
+            args: "02-01-200615:04:05 -07:00"
+      seeders:
+        selector: td:nth-child(7)
+      leechers:
+        selector: td:nth-child(8)
+      banner:
+        selector: a[onmouseover][href^="details.php?id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: src=([^\s]+)
+      downloadvolumefactor:
+        case:
+          "img[title^=\"FreeLech: \"]": "0"
+          "img[title^=\"HALF: \"]": "0.5"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "img[title^=\"2xUP: \"]": "2"
+          "*": "1"
+      description:
+        selector: td:nth-child(2)
         remove: a, img

src/Jackett/Definitions/ztracker.yml

@@ -1,128 +1,128 @@
----
-  site: ztracker
-  name: Ztracker
-  language: hu-hu
-  type: semi-private
-  encoding: ISO-8859-2
-  links:
-    - http://ztracker.org
-
-  caps:
-    categorymappings:
-      - {id: 30, cat: Movies/SD, desc: "CAM/HUN"}
-      - {id: 29, cat: Movies/SD, desc: "CAM/Külf."}
-      - {id: 3, cat: Books, desc: "Ebook"}
-      - {id: 9, cat: Movies/HD, desc: "Film/HD-DVD/Hun"}
-      - {id: 10, cat: Movies/HD, desc: "Film/HD-DVD/Külf"}
-      - {id: 7, cat: Movies/SD, desc: "Film/Xvid/Hun"}
-      - {id: 8, cat: Movies/SD, desc: "Film/Xvid/Külf."}
-      - {id: 15, cat: XXX, desc: "Film/Xvid/XXX"}
-      - {id: 16, cat: XXX, desc: "Filmek/HD-DVD/XXX"}
-      - {id: 4, cat: PC/Games, desc: "Játék"}
-      - {id: 18, cat: Other, desc: "Képek"}
-      - {id: 17, cat: XXX, desc: "Képek/XXX"}
-      - {id: 27, cat: Books, desc: "Mese/Hun"}
-      - {id: 28, cat: Books, desc: "Mese/Külf."}
-      - {id: 24, cat: PC/Phone-Other, desc: "Program/Mobil"}
-      - {id: 1, cat: PC/0day, desc: "Program/Win"}
-      - {id: 25, cat: TV, desc: "Sorozat/Hun"}
-      - {id: 26, cat: TV, desc: "Sorozat/Külf."}
-      - {id: 11, cat: Audio, desc: "Zene/Hun"}
-      - {id: 12, cat: Audio, desc: "Zene/Külf."}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
-
-  login:
-    path: belepes.php
-    method: form
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: div.error
-      - selector: table:has(img[src="/pic/ts_error/error.jpg"])
-        message:
-          selector: table:has(img[src="/pic/ts_error/error.jpg"])
-          remove: style
-    test:
-      path: browse_old.php
-
-  search:
-    path: browse_old.php
-    keywordsfilters:
-      - name: re_replace
-        args: ["[^a-zA-Z0-9]+", "%"]
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      keywords: "{{ .Keywords }}"
-      search_type: "t_name"
-    rows:
-      selector: table[border="1"] > tbody > tr:has(a[href*="details.php?id="])
-    fields:
-      title:
-        selector: a[href*="details.php?id="][onmouseover]
-        attribute: onmouseover
-        filters:
-          - name: regexp
-            args: <font class=\\'smalltext\\'>(.*?)</font>
-      banner:
-        selector: a[href*="details.php?id="][onmouseover]
-        attribute: onmouseover
-        filters:
-          - name: regexp
-            args: img src=\\'(.*?)\\'
-      details:
-        selector: a[href*="details.php?id="][onmouseover]
-        attribute: href
-      category:
-        selector: a[href^="/browse_old.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      download:
-        selector: a[href*="details.php?id="]
-        attribute: href
-        filters:
-          - name: replace
-            args: ["details.php", "download.php"]
-      seeders:
-        selector: td:nth-child(7)
-      leechers:
-        selector: td:nth-child(8)
-      files:
-        selector: td:nth-child(5)
-      grabs:
-        selector: td:nth-child(11) > b
-        filters:
-          - name: trim
-            args: "x"
-      size:
-        selector: td:nth-child(11)
-        remove: b
-        filters:
-          - name: replace
-            args: ["time", ""]
-      downloadvolumefactor:
-        case:
-          img[src="./pic/freedownload.gif"]: "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          img[src="./pic/x2.gif"]: "2"
-          "*": "1"
-      date:
-        selector: td:nth-child(2)
-        remove: a, img
-        filters:
-          - name: replace
-            args: ["\xA0", " "]
-          - name: replace
-            args: ["Ma", "Today"]
-          - name: replace
-            args: ["Tegnap", "Yesterday"]
-          - name: re_replace
-            args: ["12:(\\d\\d) PM", "00:$1 PM"]
+---
+  site: ztracker
+  name: Ztracker
+  language: hu-hu
+  type: semi-private
+  encoding: ISO-8859-2
+  links:
+    - http://ztracker.org
+
+  caps:
+    categorymappings:
+      - {id: 30, cat: Movies/SD, desc: "CAM/HUN"}
+      - {id: 29, cat: Movies/SD, desc: "CAM/Külf."}
+      - {id: 3, cat: Books, desc: "Ebook"}
+      - {id: 9, cat: Movies/HD, desc: "Film/HD-DVD/Hun"}
+      - {id: 10, cat: Movies/HD, desc: "Film/HD-DVD/Külf"}
+      - {id: 7, cat: Movies/SD, desc: "Film/Xvid/Hun"}
+      - {id: 8, cat: Movies/SD, desc: "Film/Xvid/Külf."}
+      - {id: 15, cat: XXX, desc: "Film/Xvid/XXX"}
+      - {id: 16, cat: XXX, desc: "Filmek/HD-DVD/XXX"}
+      - {id: 4, cat: PC/Games, desc: "Játék"}
+      - {id: 18, cat: Other, desc: "Képek"}
+      - {id: 17, cat: XXX, desc: "Képek/XXX"}
+      - {id: 27, cat: Books, desc: "Mese/Hun"}
+      - {id: 28, cat: Books, desc: "Mese/Külf."}
+      - {id: 24, cat: PC/Phone-Other, desc: "Program/Mobil"}
+      - {id: 1, cat: PC/0day, desc: "Program/Win"}
+      - {id: 25, cat: TV, desc: "Sorozat/Hun"}
+      - {id: 26, cat: TV, desc: "Sorozat/Külf."}
+      - {id: 11, cat: Audio, desc: "Zene/Hun"}
+      - {id: 12, cat: Audio, desc: "Zene/Külf."}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  login:
+    path: belepes.php
+    method: form
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: div.error
+      - selector: table:has(img[src="/pic/ts_error/error.jpg"])
+        message:
+          selector: table:has(img[src="/pic/ts_error/error.jpg"])
+          remove: style
+    test:
+      path: browse_old.php
+
+  search:
+    path: browse_old.php
+    keywordsfilters:
+      - name: re_replace
+        args: ["[^a-zA-Z0-9]+", "%"]
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      keywords: "{{ .Keywords }}"
+      search_type: "t_name"
+    rows:
+      selector: table[border="1"] > tbody > tr:has(a[href*="details.php?id="])
+    fields:
+      title:
+        selector: a[href*="details.php?id="][onmouseover]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: <font class=\\'smalltext\\'>(.*?)</font>
+      banner:
+        selector: a[href*="details.php?id="][onmouseover]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: img src=\\'(.*?)\\'
+      details:
+        selector: a[href*="details.php?id="][onmouseover]
+        attribute: href
+      category:
+        selector: a[href^="/browse_old.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      download:
+        selector: a[href*="details.php?id="]
+        attribute: href
+        filters:
+          - name: replace
+            args: ["details.php", "download.php"]
+      seeders:
+        selector: td:nth-child(7)
+      leechers:
+        selector: td:nth-child(8)
+      files:
+        selector: td:nth-child(5)
+      grabs:
+        selector: td:nth-child(11) > b
+        filters:
+          - name: trim
+            args: "x"
+      size:
+        selector: td:nth-child(11)
+        remove: b
+        filters:
+          - name: replace
+            args: ["time", ""]
+      downloadvolumefactor:
+        case:
+          img[src="./pic/freedownload.gif"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          img[src="./pic/x2.gif"]: "2"
+          "*": "1"
+      date:
+        selector: td:nth-child(2)
+        remove: a, img
+        filters:
+          - name: replace
+            args: ["\xA0", " "]
+          - name: replace
+            args: ["Ma", "Today"]
+          - name: replace
+            args: ["Tegnap", "Yesterday"]
+          - name: re_replace
+            args: ["12:(\\d\\d) PM", "00:$1 PM"]

src/Jackett/Engine.cs

@@ -1,191 +1,191 @@
-using Autofac;
-using Jackett.Services;
-using NLog;
-using NLog.Config;
-using NLog.LayoutRenderers;
-using NLog.Targets;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Jackett
-{
-    public class Engine
-    {
-        private static IContainer container = null;
-
-        static Engine()
-        {
-            BuildContainer();
-
-        }
-
-        public static void BuildContainer()
-        {
-            var builder = new ContainerBuilder();
-            builder.RegisterModule<JackettModule>();
-            container = builder.Build();
-
-            // Register the container in itself to allow for late resolves
-            var secondaryBuilder = new ContainerBuilder();
-            secondaryBuilder.RegisterInstance<IContainer>(container).SingleInstance();
-            SetupLogging(secondaryBuilder);
-            secondaryBuilder.Update(container);
-
-        }
-
-        public static IContainer GetContainer()
-        {
-            return container;
-        }
-
-        public static bool IsWindows
-        {
-            get
-            {
-                return Environment.OSVersion.Platform == PlatformID.Win32NT;
-            }
-        }
-
-        public static IConfigurationService ConfigService
-        {
-            get
-            {
-                return container.Resolve<IConfigurationService>();
-            }
-        }
-
-        public static IProcessService ProcessService
-        {
-            get
-            {
-                return container.Resolve<IProcessService>();
-            }
-        }
-
-        public static IServiceConfigService ServiceConfig
-        {
-            get
-            {
-                return container.Resolve<IServiceConfigService>();
-            }
-        }
-
-        public static ITrayLockService LockService
-        {
-            get
-            {
-                return container.Resolve<ITrayLockService>();
-            }
-        }
-
-        public static IServerService Server
-        {
-            get
-            {
-                return container.Resolve<IServerService>();
-            }
-        }
-
-        public static IRunTimeService RunTime
-        {
-            get
-            {
-                return container.Resolve<IRunTimeService>();
-            }
-        }
-
-        public static Logger Logger
-        {
-            get
-            {
-                return container.Resolve<Logger>();
-            }
-        }
-
-        public static ISecuityService SecurityService
-        {
-            get
-            {
-                return container.Resolve<ISecuityService>();
-            }
-        }
-
-
-        public static void SetupLogging(ContainerBuilder builder = null, string logfile = "log.txt")
-        {
-            var logLevel = Startup.TracingEnabled ? LogLevel.Debug : LogLevel.Info;
-            // Add custom date time format renderer as the default is too long
-            ConfigurationItemFactory.Default.LayoutRenderers.RegisterDefinition("simpledatetime", typeof(SimpleDateTimeRenderer));
-
-            var logConfig = new LoggingConfiguration();
-            var logFile = new FileTarget();
-            logConfig.AddTarget("file", logFile);
-            logFile.Layout = "${longdate} ${level} ${message} ${exception:format=ToString}";
-            logFile.FileName = Path.Combine(ConfigurationService.GetAppDataFolderStatic(), logfile);
-            logFile.ArchiveFileName = "log.{#####}.txt";
-            logFile.ArchiveAboveSize = 500000;
-            logFile.MaxArchiveFiles = 5;
-            logFile.KeepFileOpen = false;
-            logFile.ArchiveNumbering = ArchiveNumberingMode.DateAndSequence;
-            var logFileRule = new LoggingRule("*", logLevel, logFile);
-            logConfig.LoggingRules.Add(logFileRule);
-
-            var logConsole = new ColoredConsoleTarget();
-            logConfig.AddTarget("console", logConsole);
-
-            logConsole.Layout = "${simpledatetime} ${level} ${message} ${exception:format=ToString}";
-            var logConsoleRule = new LoggingRule("*", logLevel, logConsole);
-            logConfig.LoggingRules.Add(logConsoleRule);
-
-            var logService = new LogCacheService();
-            logConfig.AddTarget("service", logService);
-            var serviceRule = new LoggingRule("*", logLevel, logService);
-            logConfig.LoggingRules.Add(serviceRule);
-
-            LogManager.Configuration = logConfig;
-            if (builder != null)
-            {
-                builder.RegisterInstance<Logger>(LogManager.GetCurrentClassLogger()).SingleInstance();
-            }
-        }
-
-        public static void SetLogLevel(LogLevel level)
-        {
-
-            foreach (var rule in LogManager.Configuration.LoggingRules)
-            {
-                if (level == LogLevel.Debug)
-                {
-                    if (!rule.Levels.Contains(LogLevel.Debug))
-                    {
-                        rule.EnableLoggingForLevel(LogLevel.Debug);
-                    }
-                }
-                else
-                {
-                    if (rule.Levels.Contains(LogLevel.Debug))
-                    {
-                        rule.DisableLoggingForLevel(LogLevel.Debug);
-                    }
-                }
-
-            }
-
-            LogManager.ReconfigExistingLoggers();
-        }
-    }
-
-
-    [LayoutRenderer("simpledatetime")]
-    public class SimpleDateTimeRenderer : LayoutRenderer
-    {
-        protected override void Append(StringBuilder builder, LogEventInfo logEvent)
-        {
-            builder.Append(DateTime.Now.ToString("MM-dd HH:mm:ss"));
-        }
-    }
-}
+using Autofac;
+using Jackett.Services;
+using NLog;
+using NLog.Config;
+using NLog.LayoutRenderers;
+using NLog.Targets;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Jackett
+{
+    public class Engine
+    {
+        private static IContainer container = null;
+
+        static Engine()
+        {
+            BuildContainer();
+
+        }
+
+        public static void BuildContainer()
+        {
+            var builder = new ContainerBuilder();
+            builder.RegisterModule<JackettModule>();
+            container = builder.Build();
+
+            // Register the container in itself to allow for late resolves
+            var secondaryBuilder = new ContainerBuilder();
+            secondaryBuilder.RegisterInstance<IContainer>(container).SingleInstance();
+            SetupLogging(secondaryBuilder);
+            secondaryBuilder.Update(container);
+
+        }
+
+        public static IContainer GetContainer()
+        {
+            return container;
+        }
+
+        public static bool IsWindows
+        {
+            get
+            {
+                return Environment.OSVersion.Platform == PlatformID.Win32NT;
+            }
+        }
+
+        public static IConfigurationService ConfigService
+        {
+            get
+            {
+                return container.Resolve<IConfigurationService>();
+            }
+        }
+
+        public static IProcessService ProcessService
+        {
+            get
+            {
+                return container.Resolve<IProcessService>();
+            }
+        }
+
+        public static IServiceConfigService ServiceConfig
+        {
+            get
+            {
+                return container.Resolve<IServiceConfigService>();
+            }
+        }
+
+        public static ITrayLockService LockService
+        {
+            get
+            {
+                return container.Resolve<ITrayLockService>();
+            }
+        }
+
+        public static IServerService Server
+        {
+            get
+            {
+                return container.Resolve<IServerService>();
+            }
+        }
+
+        public static IRunTimeService RunTime
+        {
+            get
+            {
+                return container.Resolve<IRunTimeService>();
+            }
+        }
+
+        public static Logger Logger
+        {
+            get
+            {
+                return container.Resolve<Logger>();
+            }
+        }
+
+        public static ISecuityService SecurityService
+        {
+            get
+            {
+                return container.Resolve<ISecuityService>();
+            }
+        }
+
+
+        public static void SetupLogging(ContainerBuilder builder = null, string logfile = "log.txt")
+        {
+            var logLevel = Startup.TracingEnabled ? LogLevel.Debug : LogLevel.Info;
+            // Add custom date time format renderer as the default is too long
+            ConfigurationItemFactory.Default.LayoutRenderers.RegisterDefinition("simpledatetime", typeof(SimpleDateTimeRenderer));
+
+            var logConfig = new LoggingConfiguration();
+            var logFile = new FileTarget();
+            logConfig.AddTarget("file", logFile);
+            logFile.Layout = "${longdate} ${level} ${message} ${exception:format=ToString}";
+            logFile.FileName = Path.Combine(ConfigurationService.GetAppDataFolderStatic(), logfile);
+            logFile.ArchiveFileName = "log.{#####}.txt";
+            logFile.ArchiveAboveSize = 500000;
+            logFile.MaxArchiveFiles = 5;
+            logFile.KeepFileOpen = false;
+            logFile.ArchiveNumbering = ArchiveNumberingMode.DateAndSequence;
+            var logFileRule = new LoggingRule("*", logLevel, logFile);
+            logConfig.LoggingRules.Add(logFileRule);
+
+            var logConsole = new ColoredConsoleTarget();
+            logConfig.AddTarget("console", logConsole);
+
+            logConsole.Layout = "${simpledatetime} ${level} ${message} ${exception:format=ToString}";
+            var logConsoleRule = new LoggingRule("*", logLevel, logConsole);
+            logConfig.LoggingRules.Add(logConsoleRule);
+
+            var logService = new LogCacheService();
+            logConfig.AddTarget("service", logService);
+            var serviceRule = new LoggingRule("*", logLevel, logService);
+            logConfig.LoggingRules.Add(serviceRule);
+
+            LogManager.Configuration = logConfig;
+            if (builder != null)
+            {
+                builder.RegisterInstance<Logger>(LogManager.GetCurrentClassLogger()).SingleInstance();
+            }
+        }
+
+        public static void SetLogLevel(LogLevel level)
+        {
+
+            foreach (var rule in LogManager.Configuration.LoggingRules)
+            {
+                if (level == LogLevel.Debug)
+                {
+                    if (!rule.Levels.Contains(LogLevel.Debug))
+                    {
+                        rule.EnableLoggingForLevel(LogLevel.Debug);
+                    }
+                }
+                else
+                {
+                    if (rule.Levels.Contains(LogLevel.Debug))
+                    {
+                        rule.DisableLoggingForLevel(LogLevel.Debug);
+                    }
+                }
+
+            }
+
+            LogManager.ReconfigExistingLoggers();
+        }
+    }
+
+
+    [LayoutRenderer("simpledatetime")]
+    public class SimpleDateTimeRenderer : LayoutRenderer
+    {
+        protected override void Append(StringBuilder builder, LogEventInfo logEvent)
+        {
+            builder.Append(DateTime.Now.ToString("MM-dd HH:mm:ss"));
+        }
+    }
+}