Allow CloudFlareUtilities loading to fail (#547)

just updating the demonoid url to the current.

README.md

@@ -4,7 +4,7 @@ This project is a new fork and is recruiting development help.  If you are able
 
 Jackett works as a proxy server: it translates queries from apps (Sonarr, SickRage, CouchPotato, Mylar, etc) into tracker-site-specific http queries, parses the html response, then sends results back to the requesting software. This allows for getting recent uploads (like RSS) and performing searches. Jackett is a single repository of maintained indexer scraping & translation logic - removing the burden from other apps. 
 
-Developer note: The software implements the [Torznab](https://github.com/Sonarr/Sonarr/wiki/Implementing-a-Torznab-indexer) (with [nZEDb](https://github.com/nZEDb/nZEDb/blob/master/docs/newznab_api_specification.txt) category numbering) and [TorrentPotato](https://github.com/RuudBurger/CouchPotatoServer/wiki/Couchpotato-torrent-provider) APIs.
+Developer note: The software implements the [Torznab](https://github.com/Sonarr/Sonarr/wiki/Implementing-a-Torznab-indexer) (with [nZEDb](https://github.com/nZEDb/nZEDb/blob/dev/docs/newznab_api_specification.txt) category numbering) and [TorrentPotato](https://github.com/RuudBurger/CouchPotatoServer/wiki/Couchpotato-torrent-provider) APIs.
 
 
 
@@ -14,40 +14,67 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 
 
 #### Supported Private Trackers
+ * Abnormal
  * AlphaRatio
+ * Andraste
  * AnimeBytes
  * Avistaz
+ * BakaBT
  * bB
+ * Best Friends
  * BeyondHD
+ * Bit-City Reloaded
  * BIT-HDTV
  * BitMeTV
+ * BitSoup
  * BlueTigers
  * BTN
+ * CinemaZ
  * DanishBits
  * Demonoid
- * EuTorrents
  * FileList
  * Freshon
+ * FunFile
+ * Fuzer
+ * Ghost City
  * HD-Space
  * HD-Torrents
+ * Hebits
+ * New Real World
  * Hounddawgs
+ * House-of-Torrents
+ * ILoveTorrents
  * Immortalseed
  * IPTorrents
+ * PassThePopcorn
+ * PirateTheNet
  * MoreThanTV
+ * MyAnonamouse
+ * myAmity
  * NCore
  * NextGen
  * Pretome
  * PrivateHD
+ * RevolutionTT
  * SceneAccess
+ * SceneFZ
  * SceneTime
  * Shazbat
  * SpeedCD
  * TehConnection
+ * Torrent Network
  * TorrentBytes
  * TorrentDay
+ * TorrentHeaven
  * TorrentLeech
  * TorrentShack
+ * Torrent-Syndikat
+ * TransmitheNet
  * TV Chaos UK
+ * World-In-HD
+ * x264
+ * XSpeeds
+ * Xthor
 
 #### Installation on Windows
 
@@ -61,7 +88,7 @@ Jackett can also be run from the command line using JackettConsole.exe if you wo
        * Debian/Ubunutu: apt-get install libcurl-dev
        * Redhat/Fedora: yum install libcurl-devel
        * For other distros see the  [Curl docs](http://curl.haxx.se/dlwiz/?type=devel).
- 3. Download and extract the latest ```.tar.gz``` release from the [releases page](https://github.com/Jackett/Jackett/releases) and run Jackett using mono with the command "mono JackettConsole.exe".
+ 3. Download and extract the latest `Jackett.Binaries.Mono.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases) and run Jackett using mono with the command `mono JackettConsole.exe`.
  
 Detailed instructions for [Ubuntu 14.x](http://www.htpcguides.com/install-jackett-on-ubuntu-14-x-for-custom-torrents-in-sonarr/) and [Ubuntu 15.x](http://www.htpcguides.com/install-jackett-ubuntu-15-x-for-custom-torrents-in-sonarr/)
 
@@ -86,9 +113,9 @@ You can get additional logging with the switches "-t -l".  Please post logs if y
 Please supply as much information about the problem you are experiencing as possible. Your issue has a much greater chance of being resolved if logs are supplied so that we can see what is going on. Creating an issue with '### isn't working' doesn't help anyone to fix the problem.
 
 ### Contributing
-All contributions are welcome just send a pull request.  Jackett's framework allows our team (and any other volunteering dev) to implement new trackers in an hour or two. If you'd like support for a new tracker but are not a developer then feel free to leave a request on the [issues page](https://github.com/zone117x/Jackett/issues).  It is recommended to use Visual studio 2015 when making code changes in this project.  We currently only support private trackers.
+All contributions are welcome just send a pull request.  Jackett's framework allows our team (and any other volunteering dev) to implement new trackers in an hour or two. If you'd like support for a new tracker but are not a developer then feel free to leave a request on the [issues page](https://github.com/Jackett/Jackett/issues).  It is recommended to use Visual studio 2015 when making code changes in this project.  We currently only support private trackers.
 
 
 ### Screenshots
 
-![screenshot](http://i.imgur.com/t1sVva6.png "screenshot")
+![screenshot](https://i.imgur.com/SCGLzFq.png "screenshot")

src/Jackett.Console/App.config

@@ -7,7 +7,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />

src/Jackett.Console/ConsoleOptions.cs

@@ -27,6 +27,9 @@ namespace Jackett.Console
         [Option('c', "UseClient",  HelpText = "Override web client selection. [automatic(Default)/libcurl/safecurl/httpclient]")]
         public string Client { get; set; }
 
+        [Option('j', "ProxyConnection", HelpText = "use proxy - e.g. 127.0.0.1:8888")]
+        public string ProxyConnection { get; set; }
+
         [Option('s', "Start",  HelpText = "Start the Jacket Windows service (Must be admin)")]
         public bool StartService { get; set; }
 
@@ -57,6 +60,9 @@ namespace Jackett.Console
         [Option('n', "IgnoreSslErrors", HelpText = "[true/false] Linux Libcurl - Ignores invalid SSL certificates")]
         public bool? IgnoreSslErrors { get; set; }
 
+        [Option('d', "DataFolder", HelpText = "Specify the location of the data folder (Must be admin on Windows) eg. --DataFolder=\"D:\\Your Data\\Jackett\\\"")]
+        public string DataFolder { get; set; }
+
         [ParserState]
         public IParserState LastParserState { get; set; }
     }

src/Jackett.Console/Jackett.Console.csproj

@@ -94,12 +94,12 @@
       <HintPath>..\packages\Microsoft.Owin.StaticFiles.3.0.1\lib\net45\Microsoft.Owin.StaticFiles.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.2.3\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.3.7\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">

src/Jackett.Console/Program.cs

@@ -1,220 +1,233 @@
-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.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();
-
-                    // 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("Curl will ignore SSL certificate errors.");
-                    }
-
-                    /*  ======     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();
-                        }
-                    }
-                }
-
-                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.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("Curl 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();
+                        }
+                    }
+                }
+
+                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.Console/packages.config

@@ -21,7 +21,7 @@
   <package id="Microsoft.Owin.Host.SystemWeb" version="3.0.1" targetFramework="net45" />
   <package id="Microsoft.Owin.Hosting" version="3.0.1" targetFramework="net45" />
   <package id="Microsoft.Owin.StaticFiles" version="3.0.1" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
-  <package id="NLog" version="4.2.3" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
+  <package id="NLog" version="4.3.7" targetFramework="net45" />
   <package id="Owin" version="1.0" targetFramework="net45" />
 </packages>

src/Jackett.Service/App.config

@@ -23,7 +23,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

src/Jackett.Service/Jackett.Service.csproj

@@ -75,12 +75,12 @@
       <HintPath>..\packages\Microsoft.Owin.StaticFiles.3.0.1\lib\net45\Microsoft.Owin.StaticFiles.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.2.3\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.3.7\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">

src/Jackett.Service/packages.config

@@ -17,7 +17,7 @@
   <package id="Microsoft.Owin.Host.HttpListener" version="3.0.1" targetFramework="net45" />
   <package id="Microsoft.Owin.Hosting" version="3.0.1" targetFramework="net45" />
   <package id="Microsoft.Owin.StaticFiles" version="3.0.1" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
-  <package id="NLog" version="4.2.3" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
+  <package id="NLog" version="4.3.7" targetFramework="net45" />
   <package id="Owin" version="1.0" targetFramework="net45" />
 </packages>

src/Jackett.Test/Jackett.Test.csproj

@@ -62,12 +62,12 @@
       <HintPath>..\packages\CsQuery.1.3.4\lib\net40\CsQuery.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FluentAssertions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.1.1\lib\net45\FluentAssertions.dll</HintPath>
+    <Reference Include="FluentAssertions, Version=4.13.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.13.0\lib\net45\FluentAssertions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FluentAssertions.Core, Version=4.1.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.1.1\lib\net45\FluentAssertions.Core.dll</HintPath>
+    <Reference Include="FluentAssertions.Core, Version=4.13.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.13.0\lib\net45\FluentAssertions.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -87,12 +87,12 @@
       <HintPath>..\packages\Microsoft.Owin.Hosting.3.0.1\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.2.3\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.3.7\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="nunit.core, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
@@ -103,8 +103,8 @@
       <HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.0.5813.39031, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.0.1\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="nunit.util, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">

src/Jackett.Test/app.config

@@ -20,7 +20,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral" />

src/Jackett.Test/packages.config

@@ -6,7 +6,7 @@
   <package id="Autofac.WebApi2.Owin" version="3.3.0" targetFramework="net45" />
   <package id="AutoMapper" version="4.1.1" targetFramework="net45" />
   <package id="CsQuery" version="1.3.4" targetFramework="net45" />
-  <package id="FluentAssertions" version="4.1.1" targetFramework="net45" />
+  <package id="FluentAssertions" version="4.13.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />
@@ -18,9 +18,9 @@
   <package id="Microsoft.Owin" version="3.0.1" targetFramework="net45" />
   <package id="Microsoft.Owin.Host.HttpListener" version="3.0.1" targetFramework="net45" />
   <package id="Microsoft.Owin.Hosting" version="3.0.1" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
-  <package id="NLog" version="4.2.3" targetFramework="net45" />
-  <package id="NUnit" version="3.0.1" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
+  <package id="NLog" version="4.3.7" targetFramework="net45" />
+  <package id="NUnit" version="3.4.1" targetFramework="net45" />
   <package id="NUnitTestAdapter" version="2.0.0" targetFramework="net45" />
   <package id="Owin" version="1.0" targetFramework="net45" />
 </packages>

src/Jackett.Tray/App.config

@@ -23,7 +23,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral" />

src/Jackett.Tray/Jackett.Tray.csproj

@@ -79,12 +79,12 @@
       <HintPath>..\packages\Microsoft.Owin.StaticFiles.3.0.1\lib\net45\Microsoft.Owin.StaticFiles.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.2.3\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.3.7\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">

src/Jackett.Tray/packages.config

@@ -18,7 +18,7 @@
   <package id="Microsoft.Owin.Host.HttpListener" version="3.0.1" targetFramework="net45" />
   <package id="Microsoft.Owin.Hosting" version="3.0.1" targetFramework="net45" />
   <package id="Microsoft.Owin.StaticFiles" version="3.0.1" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
-  <package id="NLog" version="4.2.3" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
+  <package id="NLog" version="4.3.7" targetFramework="net45" />
   <package id="Owin" version="1.0" targetFramework="net45" />
 </packages>

src/Jackett.Updater/App.config

@@ -23,7 +23,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

src/Jackett.Updater/Jackett.Updater.csproj

@@ -39,12 +39,16 @@
     <ApplicationIcon>jackett.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Autofac, Version=3.5.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autofac.3.5.2\lib\net40\Autofac.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="CommandLine, Version=1.9.71.2, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
       <HintPath>..\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.2.3\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.3.7\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

src/Jackett.Updater/Program.cs

@@ -1,149 +1,150 @@
-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;
-
-namespace Jackett.Updater
-{
-    class Program
-    {
-        static void Main(string[] args)
-        {
-            new Program().Run(args);
-        }
-
-        private void Run(string[] args)
-        {
-            Engine.Logger.Info("Jackett Updater v" + GetCurrentVersion());
-
-            try {
-                var options = new UpdaterConsoleOptions();
-                if (Parser.Default.ParseArguments(args, options))
-                {
-                    ProcessUpdate(options);
-                }
-                else
-                {
-                    Engine.Logger.Error("Failed to process update arguments!: " + string.Join(" ", args));
-                    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 ProcessUpdate(UpdaterConsoleOptions options)
-        {
-            var updateLocation = GetUpdateLocation();
-            if(!(updateLocation.EndsWith("\\") || updateLocation.EndsWith("/")))
-            {
-                updateLocation += Path.DirectorySeparatorChar;
-            }
-
-            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 { }
-                    }
-                }
-            }
-
-            Engine.Logger.Info("Waiting for Jackett to close..");
-            Thread.Sleep(2000);
-
-            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));
-                    File.Copy(file, dest, true);
-                }
-                catch(Exception e)
-                {
-                    Engine.Logger.Error(e);
-                }
-            }
-
-            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(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;
+
+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!: " + string.Join(" ", args));
+                    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 ProcessUpdate(UpdaterConsoleOptions options)
+        {
+            var updateLocation = GetUpdateLocation();
+            if(!(updateLocation.EndsWith("\\") || updateLocation.EndsWith("/")))
+            {
+                updateLocation += Path.DirectorySeparatorChar;
+            }
+
+            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 { }
+                    }
+                }
+            }
+
+            Engine.Logger.Info("Waiting for Jackett to close..");
+            Thread.Sleep(2000);
+            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));
+                    File.Copy(file, dest, true);
+                }
+                catch(Exception e)
+                {
+                    Engine.Logger.Error(e);
+                }
+            }
+
+            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(location.AbsolutePath).DirectoryName;
+        }
+    }
+}

src/Jackett.Updater/packages.config

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Autofac" version="3.5.2" targetFramework="net45" />
   <package id="CommandLineParser" version="1.9.71" targetFramework="net45" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net45" />
   <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net45" />
-  <package id="NLog" version="4.2.3" targetFramework="net45" />
+  <package id="NLog" version="4.3.7" targetFramework="net45" />
 </packages>

src/Jackett/App.config

@@ -9,7 +9,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />

src/Jackett/Content/custom.css

@@ -42,14 +42,17 @@
    text-align: center;
 }
 
-    #unconfigured-indexers .card {
-     width: 200px;
-    }
+#unconfigured-indexers .card {
+    width: 200px;
+    position: relative;
+}
 
 .unconfigured-indexer {
-    height: 120px;
+    height: 70px;
 }
 
+
+
 .indexer {
     height: 252px;
 }
@@ -62,16 +65,20 @@
     padding-bottom: 5px;
 }
 
-    .indexer-logo > .hidden-name {
-        position: absolute;
-        color: rgba(255, 255, 255, 0);
-        left: 0;
-    }
+.indexer-logo > .hidden-name {
+    position: absolute;
+    color: rgba(255, 255, 255, 0);
+    left: 0;
+}
 
-    .indexer-logo > img {
-        width: 100%;
-        border-bottom: 1px solid #FFF;
-    }
+.indexer-logo  img {
+    width: 100%;
+    border-bottom: 1px solid #FFF;
+}
+
+#unconfigured-indexers .indexer-logo  img {
+    cursor: pointer;
+}
 
 .indexer-name > h3 {
     margin-top: 13px;
@@ -82,10 +89,9 @@
     text-align: center;
 }
 
-    .indexer-buttons > .btn {
-        margin-bottom: 2px;
-    }
-
+.indexer-buttons > .btn {
+    margin-bottom: 2px;
+}
 
 .indexer-button-test {
     width: 60px;
@@ -287,3 +293,7 @@ pre {
     width: 80px;
 }
 
+.setup-item-displayinfo:empty {
+    display: none;
+}
+

src/Jackett/Content/custom.js

@@ -1,15 +1,17 @@
-$(document).ready(function () {
+var basePath = '';
+
+$(document).ready(function () {
     $.ajaxSetup({ cache: false });
     window.jackettIsLocal = window.location.hostname === 'localhost' ||
                     window.location.hostname === '127.0.0.1';
 
     bindUIButtons();
-    reloadIndexers();
     loadJackettSettings();
+   
 });
 
 function getJackettConfig(callback) {
-    var jqxhr = $.get("/admin/get_jackett_config", function (data) {
+    var jqxhr = $.get("get_jackett_config", function (data) {
 
         callback(data);
     }).fail(function () {
@@ -22,6 +24,12 @@ function loadJackettSettings() {
         $("#api-key-input").val(data.config.api_key);
         $("#app-version").html(data.app_version);
         $("#jackett-port").val(data.config.port);
+        $("#jackett-basepathoverride").val(data.config.basepathoverride);
+        basePath = data.config.basepathoverride;
+        if (basePath === null || basePath === undefined) {
+            basePath = '';
+        }
+       
         $("#jackett-savedir").val(data.config.blackholedir);
         $("#jackett-allowext").attr('checked', data.config.external);
         $("#jackett-allowupdate").attr('checked', data.config.updatedisabled);
@@ -32,6 +40,8 @@ function loadJackettSettings() {
         if (password != null && password != '') {
             $("#logoutBtn").show();
         }
+
+        reloadIndexers();
     });
 }
 
@@ -39,7 +49,7 @@ function reloadIndexers() {
     $('#indexers').hide();
     $('#indexers > .indexer').remove();
     $('#unconfigured-indexers').empty();
-    var jqxhr = $.get("/admin/get_indexers", function (data) {
+    var jqxhr = $.get("get_indexers", function (data) {
         displayIndexers(data.items);
     }).fail(function () {
         doNotify("Error loading indexers, request to Jackett server failed", "danger", "glyphicon glyphicon-alert");
@@ -52,8 +62,8 @@ function displayIndexers(items) {
     $('#unconfigured-indexers-template').empty();
     for (var i = 0; i < items.length; i++) {
         var item = items[i];
-        item.torznab_host = resolveUrl("/torznab/" + item.id);
-        item.potato_host = resolveUrl("/potato/" + item.id);
+        item.torznab_host = resolveUrl(basePath + "/torznab/" + item.id);
+        item.potato_host = resolveUrl(basePath + "/potato/" + item.id);
         if (item.configured)
             $('#indexers').append(indexerTemplate(item));
         else
@@ -72,9 +82,10 @@ function displayIndexers(items) {
         $('.indexer-setup').each(function (i, btn) {
             var $btn = $(btn);
             var id = $btn.data("id");
+            var link = $btn.data("link");
             $btn.click(function () {
                 $('#select-indexer-modal').modal('hide').on('hidden.bs.modal', function (e) {
-                    displayIndexerSetup(id);
+                    displayIndexerSetup(id, link);
                 });
             });
         });
@@ -91,7 +102,7 @@ function prepareDeleteButtons() {
         var $btn = $(btn);
         var id = $btn.data("id");
         $btn.click(function () {
-            var jqxhr = $.post("/admin/delete_indexer", JSON.stringify({ indexer: id }), function (data) {
+            var jqxhr = $.post("delete_indexer", JSON.stringify({ indexer: id }), function (data) {
                 if (data.result == "error") {
                     doNotify("Delete error for " + id + "\n" + data.error, "danger", "glyphicon glyphicon-alert");
                 }
@@ -111,8 +122,9 @@ function prepareSetupButtons() {
     $('.indexer-setup').each(function (i, btn) {
         var $btn = $(btn);
         var id = $btn.data("id");
+        var link = $btn.data("link");
         $btn.click(function () {
-            displayIndexerSetup(id);
+            displayIndexerSetup(id, link);
         });
     });
 }
@@ -123,7 +135,7 @@ function prepareTestButtons() {
         var id = $btn.data("id");
         $btn.click(function () {
             doNotify("Test started for " + id, "info", "glyphicon glyphicon-transfer");
-            var jqxhr = $.post("/admin/test_indexer", JSON.stringify({ indexer: id }), function (data) {
+            var jqxhr = $.post("test_indexer", JSON.stringify({ indexer: id }), function (data) {
                 if (data.result == "error") {
                     doNotify("Test failed for " + id + ": \n" + data.error, "danger", "glyphicon glyphicon-alert");
                 }
@@ -137,15 +149,15 @@ function prepareTestButtons() {
     });
 }
 
-function displayIndexerSetup(id) {
+function displayIndexerSetup(id, link) {
 
-    var jqxhr = $.post("/admin/get_config_form", JSON.stringify({ indexer: id }), function (data) {
+    var jqxhr = $.post("get_config_form", JSON.stringify({ indexer: id }), function (data) {
         if (data.result == "error") {
             doNotify("Error: " + data.error, "danger", "glyphicon glyphicon-alert");
             return;
         }
 
-        populateSetupForm(id, data.name, data.config, data.caps);
+        populateSetupForm(id, data.name, data.config, data.caps, link);
 
     }).fail(function () {
         doNotify("Request to Jackett server failed", "danger", "glyphicon glyphicon-alert");
@@ -188,17 +200,43 @@ function populateConfigItems(configForm, config) {
             var template = setupItemTemplate(item);
             $formItemContainer.append(template);
             if (item.type === 'recaptcha') {
-                grecaptcha.render($('.jackettrecaptcha')[0], {
-                    'sitekey': item.sitekey
-                });
+                var jackettrecaptcha = $('.jackettrecaptcha');
+                jackettrecaptcha.data("version", item.version);
+                switch (item.version) {
+                    case "1":
+                        // The v1 reCAPTCHA code uses document.write() calls to write the CAPTCHA to the location where the script was loaded.
+                        // As it's loaded async this doesn't work.
+                        // We use an iframe to work around this problem.
+                        var html = '<script type="text/javascript" src="https://www.google.com/recaptcha/api/challenge?k='+encodeURIComponent(item.sitekey)+'"></script>';
+                        var frame = document.createElement('iframe');
+                        frame.id = "jackettrecaptchaiframe";
+                        frame.style.height = "145px";
+                        frame.style.weight = "326px";
+                        frame.style.border = "none";
+                        frame.onload = function () {
+                            // auto resize iframe to content
+                            frame.style.height = frame.contentWindow.document.body.scrollHeight + 'px';
+                            frame.style.width = frame.contentWindow.document.body.scrollWidth + 'px';
+                        }
+                        jackettrecaptcha.append(frame);
+                        frame.contentDocument.open();
+                        frame.contentDocument.write(html);
+                        frame.contentDocument.close();
+                        break;
+                    case "2":
+                        grecaptcha.render(jackettrecaptcha[0], {
+                            'sitekey': item.sitekey
+                        });
+                        break;
+                }
             }
         }
     }
 }
 
-function newConfigModal(title, config, caps) {
+function newConfigModal(title, config, caps, link) {
     var configTemplate = Handlebars.compile($("#jackett-config-setup-modal").html());
-    var configForm = $(configTemplate({ title: title, caps: caps }));
+    var configForm = $(configTemplate({ title: title, caps: caps, link:link }));
     $("#modals").append(configForm);
     populateConfigItems(configForm, config);
     return configForm;
@@ -223,7 +261,18 @@ function getConfigModalJson(configForm) {
                 break;
             case "recaptcha":
                 if (window.jackettIsLocal) {
-                    itemEntry.value = $('.g-recaptcha-response').val();
+                    var version = $el.find('.jackettrecaptcha').data("version");
+                    switch (version) {
+                        case "1":
+                            var frameDoc = $("#jackettrecaptchaiframe")[0].contentDocument;
+                            itemEntry.version = version;
+                            itemEntry.challenge = $("#recaptcha_challenge_field", frameDoc).val()
+                            itemEntry.value = $("#recaptcha_response_field", frameDoc).val()
+                            break;
+                        case "2":
+                            itemEntry.value = $('.g-recaptcha-response').val();
+                            break;
+                    }
                 } else {
                     itemEntry.cookie = $el.find(".setup-item-recaptcha input").val();
                 }
@@ -234,8 +283,8 @@ function getConfigModalJson(configForm) {
     return configJson;
 }
 
-function populateSetupForm(indexerId, name, config, caps) {
-    var configForm = newConfigModal(name, config, caps);
+function populateSetupForm(indexerId, name, config, caps, link) {
+    var configForm = newConfigModal(name, config, caps, link);
     var $goButton = configForm.find(".setup-indexer-go");
     $goButton.click(function () {
         var data = { indexer: indexerId, name: name };
@@ -245,7 +294,7 @@ function populateSetupForm(indexerId, name, config, caps) {
         $goButton.prop('disabled', true);
         $goButton.html($('#spinner').html());
 
-        var jqxhr = $.post("/admin/configure_indexer", JSON.stringify(data), function (data) {
+        var jqxhr = $.post("configure_indexer", JSON.stringify(data), function (data) {
             if (data.result == "error") {
                 if (data.config) {
                     populateConfigItems(configForm, data.config);
@@ -319,7 +368,7 @@ function bindUIButtons() {
     });
 
     $("#jackett-show-releases").click(function () {
-        var jqxhr = $.get("/admin/GetCache", function (data) {
+        var jqxhr = $.get("GetCache", function (data) {
             var releaseTemplate = Handlebars.compile($("#jackett-releases").html());
             var item = { releases: data, Title: 'Releases' };
             var releaseDialog = $(releaseTemplate(item));
@@ -401,7 +450,7 @@ function bindUIButtons() {
 
     $("#jackett-show-search").click(function () {
         $('#select-indexer-modal').remove();
-        var jqxhr = $.get("/admin/get_indexers", function (data) {
+        var jqxhr = $.get("get_indexers", function (data) {
             var scope = {
                 items: data.items
             };
@@ -443,6 +492,13 @@ function bindUIButtons() {
                 setCategories(trackerId, this.items);
             }, scope));
 
+            document.getElementById("searchquery")
+            .addEventListener("keyup", function (event) {
+                event.preventDefault();
+                if (event.keyCode == 13) {
+                    document.getElementById("jackett-search-perform").click();
+                }
+            });
 
             $('#jackett-search-perform').click(function () {
                 if ($('#jackett-search-perform').text().trim() !== 'Search trackers') {
@@ -457,7 +513,7 @@ function bindUIButtons() {
                 $('#searchResults').empty();
 
                 $('#jackett-search-perform').html($('#spinner').html());
-                var jqxhr = $.post("/admin/search", queryObj, function (data) {
+                var jqxhr = $.post("search", queryObj, function (data) {
                     $('#jackett-search-perform').html('Search trackers');
                     var resultsTemplate = Handlebars.compile($("#jackett-search-results").html());
                     var results = $('#searchResults');
@@ -532,7 +588,7 @@ function bindUIButtons() {
     });
 
     $("#view-jackett-logs").click(function () {
-        var jqxhr = $.get("/admin/GetLogs", function (data) {
+        var jqxhr = $.get("GetLogs", function (data) {
             var releaseTemplate = Handlebars.compile($("#jackett-logs").html());
             var item = { logs: data };
             var releaseDialog = $(releaseTemplate(item));
@@ -546,6 +602,7 @@ function bindUIButtons() {
 
     $("#change-jackett-port").click(function () {
         var jackett_port = $("#jackett-port").val();
+        var jackett_basepathoverride = $("#jackett-basepathoverride").val();
         var jackett_external = $("#jackett-allowext").is(':checked');
         var jackett_update = $("#jackett-allowupdate").is(':checked'); 
         var jackett_prerelease = $("#jackett-prerelease").is(':checked'); 
@@ -556,21 +613,17 @@ function bindUIButtons() {
             updatedisabled: jackett_update,
             prerelease: jackett_prerelease,
             blackholedir: $("#jackett-savedir").val(),
-            logging: jackett_logging
+            logging: jackett_logging,
+            basepathoverride: jackett_basepathoverride
         };
-        var jqxhr = $.post("/admin/set_config", JSON.stringify(jsonObject), function (data) {
+        var jqxhr = $.post("set_config", JSON.stringify(jsonObject), function (data) {
             if (data.result == "error") {
                 doNotify("Error: " + data.error, "danger", "glyphicon glyphicon-alert");
                 return;
             } else {
                 doNotify("Redirecting you to complete configuration update..", "success", "glyphicon glyphicon-ok");
                 window.setTimeout(function () {
-                    url = window.location.href;
-                    if (data.external) {
-                        window.location.href = url.substr(0, url.lastIndexOf(":") + 1) + data.port;
-                    } else {
-                        window.location.href = 'http://127.0.0.1:' + data.port;
-                    }
+                    window.location.reload(true);
                 }, 3000);
 
             }
@@ -580,7 +633,7 @@ function bindUIButtons() {
     });
 
     $("#trigger-updater").click(function () {
-        var jqxhr = $.get("/admin/trigger_update", function (data) {
+        var jqxhr = $.get("trigger_update", function (data) {
             if (data.result == "error") {
                 doNotify("Error: " + data.error, "danger", "glyphicon glyphicon-alert");
                 return;
@@ -596,7 +649,7 @@ function bindUIButtons() {
         var password = $("#jackett-adminpwd").val();
         var jsonObject = { password: password };
 
-        var jqxhr = $.post("/admin/set_admin_password", JSON.stringify(jsonObject), function (data) {
+        var jqxhr = $.post("set_admin_password", JSON.stringify(jsonObject), function (data) {
 
             if (data.result == "error") {
                 doNotify("Error: " + data.error, "danger", "glyphicon glyphicon-alert");

src/Jackett/Content/index.html

@@ -3,28 +3,28 @@
 <html lang="en" xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta charset="utf-8" />
-    <link rel='shortcut icon' type='image/x-icon' href='/favicon.ico' />
-    <script src="/libs/filesize.min.js"></script>
-    <script src="/libs/jquery.min.js"></script>
-    <script src="/libs/jquery.dataTables.min.js"></script>
-    <script src="/libs/handlebars.min.js"></script>
-    <script src="/libs/moment.min.js"></script>
-    <script src="/libs/handlebarsmoment.js"></script>
-    <script src="/bootstrap/bootstrap.min.js"></script>
-    <script src="/libs/bootstrap-notify.js"></script>
+    <link rel='shortcut icon' type='image/x-icon' href='../favicon.ico' />
+    <script src="../libs/filesize.min.js"></script>
+    <script src="../libs/jquery.min.js"></script>
+    <script src="../libs/jquery.dataTables.min.js"></script>
+    <script src="../libs/handlebars.min.js"></script>
+    <script src="../libs/moment.min.js"></script>
+    <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>
 
-    <link href="/bootstrap/bootstrap.min.css" rel="stylesheet">
-    <link href="/animate.css" rel="stylesheet">
-    <link href="/custom.css" rel="stylesheet">
-    <link href="/css/jquery.dataTables.css" rel="stylesheet">
-    <link rel="stylesheet" href="/css/font-awesome.min.css">
+    <link href="../bootstrap/bootstrap.min.css" rel="stylesheet">
+    <link href="../animate.css" rel="stylesheet">
+    <link href="../custom.css" rel="stylesheet">
+    <link href="../css/jquery.dataTables.css" rel="stylesheet">
+    <link rel="stylesheet" href="../css/font-awesome.min.css">
     <title>Jackett</title>
 </head>
 <body>
     <div id="page">
 
-        <img id="logo" src="/jacket_medium.png" alt="Logo" /><span id="header-title">Jackett</span>
+        <img id="logo" src="../jacket_medium.png" alt="Logo" /><span id="header-title">Jackett</span>
 
         <div class="pull-right jackett-apikey">
             <span class="input-header">API Key: </span>
@@ -48,7 +48,7 @@
             <ol>
                 <li>Go to <b>Settings > Indexers > Add > Torznab > Custom</b>.</li>
                 <li>For <b>URL</b> enter the <b>Torznab Host</b> of one of the indexers.</li>
-                <li>For the <b>API key</b> using the key below.</li>
+                <li>For the <b>API key</b> using the key above.</li>
             </ol>
             <h4>Adding a Jackett indexer in CouchPotato</h4>
             <ol>
@@ -84,10 +84,13 @@
                 Logout
             </a>
         </div>
+        <div class="input-area">
+            <span class="input-header">Base Path Override: </span>
+            <input id="jackett-basepathoverride" class="form-control input-right" type="text" value="" placeholder="/jackett/">
+        </div>
         <div class="input-area">
             <span class="input-header">Server port: </span>
             <input id="jackett-port" class="form-control input-right" type="text" value="" placeholder="9117">
-
         </div>
         <div class="input-area">
             <span class="input-header">Manual download blackhole directory: </span>
@@ -172,10 +175,10 @@
             <div class="indexer-logo">
                 <!-- Make section browser searchable -->
                 <span class="hidden-name">{{name}}</span>
-                <img alt="{{name}}" title="{{name}}" src="/logos/{{id}}.png" />
+                <img alt="{{name}}" title="{{name}}" src="../logos/{{id}}.png" />
             </div>
             <div class="indexer-buttons">
-                <button class="btn btn-primary btn-sm indexer-setup" data-id="{{id}}">
+                <button class="btn btn-primary btn-sm indexer-setup" data-id="{{id}}" data-link="{{site_link}}">
                     <span class="glyphicon glyphicon-wrench" aria-hidden="true"></span>
                 </button>
                 <button class="btn btn-danger btn-sm indexer-button-delete" data-id="{{id}}">
@@ -203,14 +206,11 @@
     </script>
     <script id="unconfigured-indexer" type="text/x-handlebars-template">
         <div class="unconfigured-indexer card">
-            <div class="indexer-logo">
+            <div class="indexer-logo indexer-setup" data-id="{{id}}" data-link="{{site_link}}">
                 <!-- Make section browser searchable -->
                 <span class="hidden-name">{{name}}</span>
-                <img alt="{{name}}" title="{{name}}" src="/logos/{{id}}.png" />
-            </div>
-            <div class="indexer-buttons">
-                <a class="btn btn-info" target="_blank" href="{{site_link}}">Visit <span class="glyphicon glyphicon-new-window" aria-hidden="true"></span></a>
-                <button class="indexer-setup btn btn-success" data-id="{{id}}">Setup <span class="glyphicon glyphicon-ok" aria-hidden="true"></span></button>
+                <img alt="{{name}}" title="{{name}}" src="../logos/{{id}}.png" />
+              
             </div>
         </div>
     </script>
@@ -437,7 +437,7 @@
                 <div class="modal-content">
                     <div class="modal-header">
                         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                        <h4 class="modal-title">{{title}}</h4>
+                            <h4 class="modal-title">{{title}} - <a target="_blank" href="{{link}}">{{link}}</a></h4>
                     </div>
                     <div class="modal-body">
                         <form class="config-setup-form"></form>
@@ -481,6 +481,6 @@
         <span class="spinner glyphicon glyphicon-refresh"></span>
     </script>
 
-    <script src="/custom.js"></script>
+    <script src="../custom.js"></script>
 </body>
 </html>

src/Jackett/Content/login.html

@@ -4,30 +4,30 @@
 <head>
     <meta charset="utf-8" />
 
-    <link rel='shortcut icon' type='image/x-icon' href='/favicon.ico' />
+    <link rel='shortcut icon' type='image/x-icon' href='../favicon.ico' />
 
-    <script src="/libs/jquery.min.js"></script>
-    <script src="/libs/jquery.dataTables.min.js"></script>
-    <script src="/libs/handlebars.min.js"></script>
-    <script src="/libs/moment.min.js"></script>
-    <script src="/libs/handlebarsmoment.js"></script>
-    <script src="/bootstrap/bootstrap.min.js"></script>
-    <script src="/libs/bootstrap-notify.js"></script>
+    <script src="../libs/jquery.min.js"></script>
+    <script src="../libs/jquery.dataTables.min.js"></script>
+    <script src="../libs/handlebars.min.js"></script>
+    <script src="../libs/moment.min.js"></script>
+    <script src="../libs/handlebarsmoment.js"></script>
+    <script src="../bootstrap/bootstrap.min.js"></script>
+    <script src="../libs/bootstrap-notify.js"></script>
 
-    <link href="/bootstrap/bootstrap.min.css" rel="stylesheet">
-    <link href="/animate.css" rel="stylesheet">
-    <link href="/custom.css" rel="stylesheet">
+    <link href="../bootstrap/bootstrap.min.css" rel="stylesheet">
+    <link href="../animate.css" rel="stylesheet">
+    <link href="../custom.css" rel="stylesheet">
 
     <title>Jackett</title>
 </head>
 <body>
     <div id="page">
 
-        <img id="logo" src="/jacket_medium.png" /><span id="header-title">Jackett</span>
+        <img id="logo" src="../jacket_medium.png" /><span id="header-title">Jackett</span>
 
         <hr />
         <h1>Login</h1>
-        <form action="/Admin/Dashboard" method="post">
+        <form action="Dashboard" method="post">
             <div class="input-area">
                 <span class="input-header">Admin password</span>
                 <input id="password" name="password" class="form-control input-right" type="password">
@@ -38,4 +38,4 @@
         </form>
     </div>
 </body>
-</html>
+</html>

src/Jackett/Controllers/AdminController.cs

@@ -80,7 +80,7 @@ namespace Jackett.Controllers
             var ctx = Request.GetOwinContext();
             var authManager = ctx.Authentication;
             authManager.SignOut("ApplicationCookie");
-            return Redirect("/Admin/Dashboard");
+            return Redirect("Admin/Dashboard");
         }
 
         [HttpGet]
@@ -318,6 +318,7 @@ namespace Jackett.Controllers
                 cfg["prerelease"] = serverService.Config.UpdatePrerelease;
                 cfg["password"] = string.IsNullOrEmpty(serverService.Config.AdminPassword) ? string.Empty : serverService.Config.AdminPassword.Substring(0, 10);
                 cfg["logging"] = Startup.TracingEnabled;
+                cfg["basepathoverride"] = serverService.Config.BasePathOverride;
                
 
                 jsonReply["config"] = cfg;
@@ -349,9 +350,12 @@ namespace Jackett.Controllers
                 bool updateDisabled = (bool)postData["updatedisabled"];
                 bool preRelease = (bool)postData["prerelease"];
                 bool logging = (bool)postData["logging"];
+                string basePathOverride = (string)postData["basepathoverride"];
 
                 Engine.Server.Config.UpdateDisabled = updateDisabled;
                 Engine.Server.Config.UpdatePrerelease = preRelease;
+                Engine.Server.Config.BasePathOverride = basePathOverride;
+                Startup.BasePath = Engine.Server.BasePath();
                 Engine.Server.SaveConfig();
 
                 Engine.SetLogLevel(logging ? LogLevel.Debug : LogLevel.Info);
@@ -446,7 +450,7 @@ namespace Jackett.Controllers
 
         private void ConfigureCacheResults(List<TrackerCacheResult> results)
         {
-            var serverUrl = string.Format("{0}://{1}:{2}/", Request.RequestUri.Scheme, Request.RequestUri.Host, Request.RequestUri.Port);
+            var serverUrl = string.Format("{0}://{1}:{2}{3}", Request.RequestUri.Scheme, Request.RequestUri.Host, Request.RequestUri.Port, serverService.BasePath());
             foreach (var result in results)
             {
                 var link = result.Link;

src/Jackett/Controllers/PotatoController.cs

@@ -99,7 +99,9 @@ namespace Jackett.Controllers
             {
                 ApiKey =  request.passkey,
                 Categories = MOVIE_CATS,
-                SearchTerm = request.search
+                SearchTerm = request.search,
+                ImdbID = request.imdbid,
+                QueryType = "TorrentPotato"
             };
 
             IEnumerable<ReleaseInfo> releases = new List<ReleaseInfo>();
@@ -117,7 +119,7 @@ namespace Jackett.Controllers
             }
 
             releases = indexer.FilterResults(torznabQuery, releases);
-            var serverUrl = string.Format("{0}://{1}:{2}/", Request.RequestUri.Scheme, Request.RequestUri.Host, Request.RequestUri.Port);
+            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);

src/Jackett/Controllers/TorznabController.cs

@@ -100,7 +100,7 @@ namespace Jackett.Controllers
 
             logger.Info(logBuilder.ToString());
 
-            var serverUrl = string.Format("{0}://{1}:{2}/", Request.RequestUri.Scheme, Request.RequestUri.Host, Request.RequestUri.Port);
+            var serverUrl = string.Format("{0}://{1}:{2}{3}", Request.RequestUri.Scheme, Request.RequestUri.Host, Request.RequestUri.Port, serverService.BasePath());
             var resultPage = new ResultPage(new ChannelInfo
             {
                 Title = indexer.DisplayName,

src/Jackett/CurlHelper.cs

@@ -85,6 +85,7 @@ namespace Jackett
 
                 using (var easy = new CurlEasy())
                 {
+                    
                     easy.Url = curlRequest.Url;
                     easy.BufferSize = 64 * 1024;
                     easy.UserAgent = BrowserUtil.ChromeUserAgent;
@@ -139,7 +140,12 @@ namespace Jackett
                     {
                         easy.SetOpt(CurlOption.SslVerifyhost, false);
                         easy.SetOpt(CurlOption.SslVerifyPeer, false);
-                    }
+                    }
+
+                    if (Startup.ProxyConnection != null)
+                    {
+                        easy.SetOpt(CurlOption.Proxy, Startup.ProxyConnection);
+                    }                    
 
                     easy.Perform();
 
@@ -155,6 +161,15 @@ 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));
+                    }
+                }
                 var headerParts = headerString.Split(new char[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries);
                 var headers = new List<string[]>();
                 var headerCount = 0;

src/Jackett/Engine.cs

@@ -1,190 +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>();
-            }
-        }
-
-
-        private static void SetupLogging(ContainerBuilder builder)
-        {
-            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(), "log.txt");
-            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;
-            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"));
+        }
+    }
+}

src/Jackett/Indexers/Abnormal.cs

@@ -0,0 +1,870 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Reflection;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using System.Web;
+using CsQuery;
+using Jackett.Models;
+using Jackett.Models.IndexerConfig.Bespoke;
+using Jackett.Services;
+using Jackett.Utils;
+using Jackett.Utils.Clients;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using NLog;
+
+namespace Jackett.Indexers
+{
+    /// <summary>
+    /// Provider for Abnormal Private French Tracker
+    /// </summary>
+    public class Abnormal : BaseIndexer, IIndexer
+    {
+        private string LoginUrl { get { return SiteLink + "login.php"; } }
+        private string SearchUrl { get { return SiteLink + "torrents.php"; } }
+        private string TorrentCommentUrl { get { return TorrentDescriptionUrl; } }
+        private string TorrentDescriptionUrl { get { return SiteLink + "torrents.php?id="; } }
+        private string TorrentDownloadUrl { get { return SiteLink + "torrents.php?action=download&id={id}&authkey={auth_key}&torrent_pass={torrent_pass}"; } }
+        private bool Latency { get { return ConfigData.Latency.Value; } }
+        private bool DevMode { get { return ConfigData.DevMode.Value; } }
+        private bool CacheMode { get { return ConfigData.HardDriveCache.Value; } }
+        private string directory { get { return System.IO.Path.GetTempPath() + "Jackett\\" + MethodBase.GetCurrentMethod().DeclaringType.Name + "\\"; } }
+
+        private Dictionary<string, string> emulatedBrowserHeaders = new Dictionary<string, string>();
+        private CQ fDom = null;
+
+        private ConfigurationDataAbnormal ConfigData
+        {
+            get { return (ConfigurationDataAbnormal)configData; }
+            set { base.configData = value; }
+        }
+
+        public Abnormal(IIndexerManagerService i, IWebClient w, Logger l, IProtectionService ps)
+            : base(
+                name: "Abnormal",
+                description: "General French Private Tracker",
+                link: "https://abnormal.ws/",
+                caps: new TorznabCapabilities(),
+                manager: i,
+                client: w,
+                logger: l,
+                p: ps,
+                downloadBase: "https://abnormal.ws/torrents.php?action=download&id=",
+                configData: new ConfigurationDataAbnormal())
+        {
+            // Clean capabilities
+            TorznabCaps.Categories.Clear();
+
+            // Movies
+            AddCategoryMapping("MOVIE|DVDR", TorznabCatType.MoviesDVD);             // DVDR
+            AddCategoryMapping("MOVIE|DVDRIP", TorznabCatType.MoviesSD);            // DVDRIP
+            AddCategoryMapping("MOVIE|BDRIP", TorznabCatType.MoviesSD);             // BDRIP
+            AddCategoryMapping("MOVIE|VOSTFR", TorznabCatType.MoviesOther);         // VOSTFR
+            AddCategoryMapping("MOVIE|HD|720p", TorznabCatType.MoviesHD);           // HD 720P
+            AddCategoryMapping("MOVIE|HD|1080p", TorznabCatType.MoviesHD);          // HD 1080P
+            AddCategoryMapping("MOVIE|REMUXBR", TorznabCatType.MoviesBluRay);       // REMUX BLURAY
+            AddCategoryMapping("MOVIE|FULLBR", TorznabCatType.MoviesBluRay);        // FULL BLURAY
+
+            // Series
+            AddCategoryMapping("TV|SD|VOSTFR", TorznabCatType.TV);                  // SD VOSTFR
+            AddCategoryMapping("TV|HD|VOSTFR", TorznabCatType.TVHD);                // HD VOSTFR
+            AddCategoryMapping("TV|SD|VF", TorznabCatType.TVSD);                    // SD VF
+            AddCategoryMapping("TV|HD|VF", TorznabCatType.TVHD);                    // HD VF
+            AddCategoryMapping("TV|PACK|FR", TorznabCatType.TVOTHER);               // PACK FR
+            AddCategoryMapping("TV|PACK|VOSTFR", TorznabCatType.TVOTHER);           // PACK VOSTFR
+            AddCategoryMapping("TV|EMISSIONS", TorznabCatType.TVOTHER);             // EMISSIONS
+
+            // Anime
+            AddCategoryMapping("ANIME", TorznabCatType.TVAnime);                    // ANIME
+
+            // Documentaries
+            AddCategoryMapping("DOCS", TorznabCatType.TVDocumentary);               // DOCS
+
+            // Music
+            AddCategoryMapping("MUSIC|FLAC", TorznabCatType.AudioLossless);         // FLAC
+            AddCategoryMapping("MUSIC|MP3", TorznabCatType.AudioMP3);               // MP3
+            AddCategoryMapping("MUSIC|CONCERT", TorznabCatType.AudioVideo);         // CONCERT
+
+            // Other
+            AddCategoryMapping("PC|APP", TorznabCatType.PC);                        // PC
+            AddCategoryMapping("PC|GAMES", TorznabCatType.PCGames);                 // GAMES
+            AddCategoryMapping("EBOOKS", TorznabCatType.BooksEbook);                // EBOOKS
+        }
+
+        /// <summary>
+        /// Configure our WiHD Provider
+        /// </summary>
+        /// <param name="configJson">Our params in Json</param>
+        /// <returns>Configuration state</returns>
+        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        {
+            // Retrieve config values set by Jackett's user
+            ConfigData.LoadValuesFromJson(configJson);
+
+            // Check & Validate Config
+            validateConfig();
+
+            // Setting our data for a better emulated browser (maximum security)
+            // TODO: Encoded Content not supported by Jackett at this time
+            // emulatedBrowserHeaders.Add("Accept-Encoding", "gzip, deflate");
+
+            // If we want to simulate a browser
+            if (ConfigData.Browser.Value) {
+
+                // Clean headers
+                emulatedBrowserHeaders.Clear();
+
+                // Inject headers
+                emulatedBrowserHeaders.Add("Accept", ConfigData.HeaderAccept.Value);
+                emulatedBrowserHeaders.Add("Accept-Language", ConfigData.HeaderAcceptLang.Value);
+                emulatedBrowserHeaders.Add("DNT", Convert.ToInt32(ConfigData.HeaderDNT.Value).ToString());
+                emulatedBrowserHeaders.Add("Upgrade-Insecure-Requests", Convert.ToInt32(ConfigData.HeaderUpgradeInsecure.Value).ToString());
+                emulatedBrowserHeaders.Add("User-Agent", ConfigData.HeaderUserAgent.Value);
+            }
+
+
+            // Getting login form to retrieve CSRF token
+            var myRequest = new Utils.Clients.WebRequest()
+            {
+                Url = LoginUrl
+            };
+
+            // Add our headers to request
+            myRequest.Headers = emulatedBrowserHeaders;
+
+            // Building login form data
+            var pairs = new Dictionary<string, string> {
+                { "username", ConfigData.Username.Value },
+                { "password", ConfigData.Password.Value },
+                { "keeplogged", "1" },
+                { "login", "Connexion" }
+            };
+
+            // Do the login
+            var request = new Utils.Clients.WebRequest(){
+                PostData = pairs,
+                Referer = LoginUrl,
+                Type = RequestType.POST,
+                Url = LoginUrl,
+                Headers = emulatedBrowserHeaders
+            };
+
+            // Perform loggin
+            latencyNow();
+            output("\nPerform loggin.. with " + LoginUrl);
+            var response = await webclient.GetString(request);
+
+            // Test if we are logged in
+            await ConfigureIfOK(response.Cookies, response.Cookies.Contains("session="), () =>
+            {
+                // Parse error page
+                CQ dom = response.Content;
+                string message = dom[".warning"].Text().Split('.').Reverse().Skip(1).First();
+
+                // Try left
+                string left = dom[".info"].Text().Trim();
+
+                // Oops, unable to login
+                output("-> Login failed: \"" + message + "\" and " + left + " tries left before being banned for 6 hours !", "error");
+                throw new ExceptionWithConfigData("Login failed: " + message, configData);
+            });
+
+            output("-> Login Success");
+
+            return IndexerConfigurationStatus.RequiresTesting;
+        }
+
+        /// <summary>
+        /// Execute our search query
+        /// </summary>
+        /// <param name="query">Query</param>
+        /// <returns>Releases</returns>
+        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        {
+            var releases = new List<ReleaseInfo>();
+            var torrentRowList = new List<CQ>();
+            var searchTerm = query.GetQueryString();
+            var searchUrl = SearchUrl;
+            int nbResults = 0;
+            int pageLinkCount = 0;
+
+            // Check cache first so we don't query the server (if search term used or not in dev mode)
+            if(!DevMode && !string.IsNullOrEmpty(searchTerm))
+            {
+                lock (cache)
+                {
+                    // Remove old cache items
+                    CleanCache();
+
+                    // Search in cache
+                    var cachedResult = cache.Where(i => i.Query == searchTerm).FirstOrDefault();
+                    if (cachedResult != null)
+                        return cachedResult.Results.Select(s => (ReleaseInfo)s.Clone()).ToArray();
+                }
+            }
+
+            // Build our query
+            var request = buildQuery(searchTerm, query, searchUrl);
+
+            // Getting results & Store content
+            WebClientStringResult results = await queryExec(request);
+            fDom = results.Content;
+
+            try
+            {
+                // Find torrent rows
+                var firstPageRows = findTorrentRows();
+
+                // Add them to torrents list
+                torrentRowList.AddRange(firstPageRows.Select(fRow => fRow.Cq()));
+
+                // Check if there are pagination links at bottom
+                Boolean pagination = (fDom[".linkbox > a"].Length != 0);
+
+                // If pagination available
+                if (pagination) {
+                    // Calculate numbers of pages available for this search query (Based on number results and number of torrents on first page)
+                    pageLinkCount = ParseUtil.CoerceInt(Regex.Match(fDom[".linkbox > a"].Last().Attr("href").ToString(), @"\d+").Value);
+
+                    // Calculate average number of results (based on torrents rows lenght on first page)
+                    nbResults = firstPageRows.Count() * pageLinkCount;
+                }
+                else {
+                    // Check if we have a minimum of one result
+                    if (firstPageRows.Length >= 1)
+                    {
+                        // Retrieve total count on our alone page
+                        nbResults = firstPageRows.Count();
+                        pageLinkCount = 1;
+                    }
+                    else
+                    {
+                        output("\nNo result found for your query, please try another search term ...\n", "info");
+                        // No result found for this query
+                        return releases;
+                    }
+                }
+                output("\nFound " + nbResults + " result(s) (+/- " + firstPageRows.Length + ") in " + pageLinkCount + " page(s) for this query !");
+                output("\nThere are " + firstPageRows.Length + " results on the first page !");
+
+                // If we have a term used for search and pagination result superior to one
+                if (!string.IsNullOrWhiteSpace(query.GetQueryString()) && pageLinkCount > 1)
+                {
+                    // Starting with page #2
+                    for (int i = 2; i <= Math.Min(Int32.Parse(ConfigData.Pages.Value), pageLinkCount); i++)
+                    {
+                        output("\nProcessing page #" + i);
+
+                        // Request our page
+                        latencyNow();
+
+                        // Build our query
+                        var pageRequest = buildQuery(searchTerm, query, searchUrl, i);
+
+                        // Getting results & Store content
+                        WebClientStringResult pageResults = await queryExec(pageRequest);
+
+                        // Assign response
+                        fDom = pageResults.Content;
+
+                        // Process page results
+                        var additionalPageRows = findTorrentRows();
+
+                        // Add them to torrents list
+                        torrentRowList.AddRange(additionalPageRows.Select(fRow => fRow.Cq()));
+                    }
+                }
+                else
+                {
+                    // No search term, maybe testing... so registring autkey and torrentpass for future uses
+                    string infosData = firstPageRows.First().Find("td:eq(3) > a").Attr("href");
+                    IList<string> infosList = infosData.Split('&').Select(s => s.Trim()).Where(s => s != String.Empty).ToList();
+                    IList<string> infosTracker = infosList.Select(s => s.Split(new[] { '=' }, 2)[1].Trim()).ToList();
+
+                    output("\nStoring Authkey for future uses...");
+                    ConfigData.AuthKey.Value = infosTracker[2];
+
+                    output("\nStoring TorrentPass for future uses...");
+                    ConfigData.TorrentPass.Value = infosTracker[3];
+
+                }
+
+                // Loop on results
+                foreach (CQ tRow in torrentRowList)
+                {
+                    output("\n=>> Torrent #" + (releases.Count + 1));
+
+                    // ID
+                    int id = ParseUtil.CoerceInt(Regex.Match(tRow.Find("td:eq(1) > a").Attr("href").ToString(), @"\d+").Value);
+                    output("ID: " + id);
+
+                    // Release Name
+                    string name = tRow.Find("td:eq(1) > a").Text().ToString();
+                    output("Release: " + name);
+
+                    // Category
+                    string categoryID = tRow.Find("td:eq(0) > a").Attr("href").Replace("torrents.php?cat[]=", String.Empty);
+                    output("Category: " + MapTrackerCatToNewznab(categoryID) + " (" + categoryID + ")");
+
+                    // Seeders
+                    int seeders = ParseUtil.CoerceInt(Regex.Match(tRow.Find("td:eq(6)").Text(), @"\d+").Value);
+                    output("Seeders: " + seeders);
+
+                    // Leechers
+                    int leechers = ParseUtil.CoerceInt(Regex.Match(tRow.Find("td:eq(7)").Text(), @"\d+").Value);
+                    output("Leechers: " + leechers);
+
+                    // Completed
+                    int completed = ParseUtil.CoerceInt(Regex.Match(tRow.Find("td:eq(5)").Text(), @"\d+").Value);
+                    output("Completed: " + completed);
+
+                    // Size
+                    string sizeStr = tRow.Find("td:eq(4)").Text().Replace("Go", "gb").Replace("Mo", "mb").Replace("Ko", "kb");
+                    long size = ReleaseInfo.GetBytes(sizeStr);
+                    output("Size: " + sizeStr + " (" + size + " bytes)");
+
+                    // Publish DateToString
+                    IList<string> clockList = tRow.Find("td:eq(2) > span").Text().Replace("Il y a", "").Split(',').Select(s => s.Trim()).Where(s => s != String.Empty).ToList();
+                    var date = agoToDate(clockList);
+                    output("Released on: " + date.ToLocalTime());
+
+                    // Torrent Details URL
+                    Uri detailsLink = new Uri(TorrentDescriptionUrl + id);
+                    output("Details: " + detailsLink.AbsoluteUri);
+
+                    // Torrent Comments URL
+                    Uri commentsLink = new Uri(TorrentCommentUrl + id);
+                    output("Comments Link: " + commentsLink.AbsoluteUri);
+
+                    // Torrent Download URL
+                    Uri downloadLink = new Uri(TorrentDownloadUrl.Replace("{id}", id.ToString()).Replace("{auth_key}", ConfigData.AuthKey.Value).Replace("{torrent_pass}", ConfigData.TorrentPass.Value));
+                    output("Download Link: " + downloadLink.AbsoluteUri);
+
+                    // Building release infos
+                    var release = new ReleaseInfo();
+                    release.Category = MapTrackerCatToNewznab(categoryID.ToString());
+                    release.Title = name;
+                    release.Seeders = seeders;
+                    release.Peers = seeders + leechers;
+                    release.MinimumRatio = 1;
+                    release.MinimumSeedTime = 172800;
+                    release.PublishDate = date;
+                    release.Size = size;
+                    release.Guid = detailsLink;
+                    release.Comments = commentsLink;
+                    release.Link = downloadLink;
+                    releases.Add(release);
+                }
+
+            }
+            catch (Exception ex)
+            {
+                OnParseError("Error, unable to parse result \n" + ex.StackTrace, ex);
+            }
+
+            // Return found releases
+            return releases;
+        }
+
+        /// <summary>
+        /// Build query to process
+        /// </summary>
+        /// <param name="term">Term to search</param>
+        /// <param name="query">Torznab Query for categories mapping</param>
+        /// <param name="url">Search url for provider</param>
+        /// <param name="page">Page number to request</param>
+        /// <returns>URL to query for parsing and processing results</returns>
+        private string buildQuery(string term, TorznabQuery query, string url, int page = 0)
+        {
+            var parameters = new NameValueCollection();
+            List<string> categoriesList = MapTorznabCapsToTrackers(query);
+            string categories = null;
+
+            // Check if we are processing a new page
+            if (page > 0)
+            {
+                // Adding page number to query
+                parameters.Add("page", page.ToString());
+            }
+
+            // Loop on Categories needed
+            foreach (string category in categoriesList)
+            {
+                // If last, build !
+                if (categoriesList.Last() == category)
+                {
+                    // Adding previous categories to URL with latest category
+                    parameters.Add(Uri.EscapeDataString("cat[]"), HttpUtility.UrlEncode(category) + categories);
+                }
+                else
+                {
+                    // Build categories parameter
+                    categories += "&" + Uri.EscapeDataString("cat[]") + "=" + HttpUtility.UrlEncode(category);
+                }
+            }
+
+            // If search term provided
+            if (!string.IsNullOrWhiteSpace(term))
+            {
+                // Add search term
+                parameters.Add("search", HttpUtility.UrlEncode(term));
+            }
+            else
+            {
+                parameters.Add("search", HttpUtility.UrlEncode("%"));
+                // Showing all torrents (just for output function)
+                term = "all";
+            }
+
+            // Building our query -- Cannot use GetQueryString due to UrlEncode (generating wrong cat[] param)
+            url += "?" + string.Join("&", parameters.AllKeys.Select(a => a + "=" + parameters[a]));
+
+            output("\nBuilded query for \"" + term + "\"... " + url);
+
+            // Return our search url
+            return url;
+        }
+
+        /// <summary>
+        /// Switch Method for Querying
+        /// </summary>
+        /// <param name="request">URL created by Query Builder</param>
+        /// <returns>Results from query</returns>
+        private async Task<WebClientStringResult> queryExec(string request)
+        {
+            WebClientStringResult results = null;
+
+            // Switch in we are in DEV mode with Hard Drive Cache or not
+            if (DevMode && CacheMode)
+            {
+                // Check Cache before querying and load previous results if available
+                results = await queryCache(request);
+            }
+            else
+            {
+                // Querying tracker directly
+                results = await queryTracker(request);
+            }
+            return results;
+        }
+
+        /// <summary>
+        /// Get Torrents Page from Cache by Query Provided
+        /// </summary>
+        /// <param name="request">URL created by Query Builder</param>
+        /// <returns>Results from query</returns>
+        private async Task<WebClientStringResult> queryCache(string request)
+        {
+            WebClientStringResult results = null;
+
+            // Create Directory if not exist
+            System.IO.Directory.CreateDirectory(directory);
+
+            // Clean Storage Provider Directory from outdated cached queries
+            cleanCacheStorage();
+
+            // Create fingerprint for request
+            string file = directory + request.GetHashCode() + ".json";
+
+            // Checking modes states
+            if (System.IO.File.Exists(file))
+            {
+                // File exist... loading it right now !
+                output("Loading results from hard drive cache ..." + request.GetHashCode() + ".json");
+                results = JsonConvert.DeserializeObject<WebClientStringResult>(System.IO.File.ReadAllText(file));
+            }
+            else
+            {
+                // No cached file found, querying tracker directly
+                results = await queryTracker(request);
+
+                // Cached file didn't exist for our query, writing it right now !
+                output("Writing results to hard drive cache ..." + request.GetHashCode() + ".json");
+                System.IO.File.WriteAllText(file, JsonConvert.SerializeObject(results));
+            }
+            return results;
+        }
+
+        /// <summary>
+        /// Get Torrents Page from Tracker by Query Provided
+        /// </summary>
+        /// <param name="request">URL created by Query Builder</param>
+        /// <returns>Results from query</returns>
+        private async Task<WebClientStringResult> queryTracker(string request)
+        {
+            WebClientStringResult results = null;
+
+            // Cache mode not enabled or cached file didn't exist for our query
+            output("\nQuerying tracker for results....");
+
+            // Request our first page
+            latencyNow();
+            results = await RequestStringWithCookiesAndRetry(request, null, null, emulatedBrowserHeaders);
+
+            // Return results from tracker
+            return results;
+        }
+
+        /// <summary>
+        /// Clean Hard Drive Cache Storage
+        /// </summary>
+        /// <param name="force">Force Provider Folder deletion</param>
+        private void cleanCacheStorage(Boolean force = false)
+        {
+            // Check cleaning method
+            if(force)
+            {
+                // Deleting Provider Storage folder and all files recursively
+                output("\nDeleting Provider Storage folder and all files recursively ...");
+                
+                // Check if directory exist
+                if(System.IO.Directory.Exists(directory))
+                {
+                    // Delete storage directory of provider
+                    System.IO.Directory.Delete(directory, true);
+                    output("-> Storage folder deleted successfully.");
+                }
+                else
+                {
+                    // No directory, so nothing to do
+                    output("-> No Storage folder found for this provider !");
+                }
+            }
+            else
+            {
+                int i = 0;
+                // Check if there is file older than ... and delete them
+                output("\nCleaning Provider Storage folder... in progress.");
+                System.IO.Directory.GetFiles(directory)
+                .Select(f => new System.IO.FileInfo(f))
+                .Where(f => f.LastAccessTime < DateTime.Now.AddMilliseconds(-Convert.ToInt32(ConfigData.HardDriveCacheKeepTime.Value)))
+                .ToList()
+                .ForEach(f => {
+                    output("Deleting cached file << " + f.Name + " >> ... done.");
+                    f.Delete();
+                    i++;
+                    });
+
+                // Inform on what was cleaned during process
+                if(i > 0) {
+                    output("-> Deleted " + i + " cached files during cleaning.");
+                }
+                else {
+                    output("-> Nothing deleted during cleaning.");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Generate a random fake latency to avoid detection on tracker side
+        /// </summary>
+        private void latencyNow()
+        {
+            // Need latency ?
+            if(Latency)
+            {
+                // Generate a random value in our range
+                var random = new Random(DateTime.Now.Millisecond);
+                int waiting = random.Next(Convert.ToInt32(ConfigData.LatencyStart.Value), Convert.ToInt32(ConfigData.LatencyEnd.Value));
+                output("\nLatency Faker => Sleeping for " + waiting + " ms...");
+
+                // Sleep now...
+                System.Threading.Thread.Sleep(waiting);
+            }
+        }
+
+        /// <summary>
+        /// Find torrent rows in search pages
+        /// </summary>
+        /// <returns>JQuery Object</returns>
+        private CQ findTorrentRows()
+        {
+            // Return all occurencis of torrents found
+            return fDom[".torrent_table > tbody > tr"].Not(".colhead");
+        }
+
+        /// <summary>
+        /// Convert Ago date to DateTime
+        /// </summary>
+        /// <param name="clockList"></param>
+        /// <returns>A DateTime</returns>
+        private DateTime agoToDate(IList<string> clockList)
+        {
+            DateTime release = DateTime.Now;
+            foreach (var ago in clockList)
+            {
+                // Check for years
+                if (ago.Contains("années") || ago.Contains("année"))
+                {
+                    // Number of years to remove
+                    int years = ParseUtil.CoerceInt(Regex.Match(ago.ToString(), @"\d+").Value);
+                    // Removing
+                    release = release.AddYears(-years);
+
+                    continue;
+                }
+                // Check for months
+                else if (ago.Contains("mois"))
+                {
+                    // Number of months to remove
+                    int months = ParseUtil.CoerceInt(Regex.Match(ago.ToString(), @"\d+").Value);
+                    // Removing
+                    release = release.AddMonths(-months);
+
+                    continue;
+                }
+                // Check for weeks
+                else if (ago.Contains("semaines") || ago.Contains("semaine"))
+                {
+                    // Number of weeks to remove
+                    int weeks = ParseUtil.CoerceInt(Regex.Match(ago.ToString(), @"\d+").Value);
+                    // Removing
+                    release = release.AddDays(-(7 * weeks));
+
+                    continue;
+                }
+                // Check for days
+                else if (ago.Contains("jours") || ago.Contains("jour"))
+                {
+                    // Number of days to remove
+                    int days = ParseUtil.CoerceInt(Regex.Match(ago.ToString(), @"\d+").Value);
+                    // Removing
+                    release = release.AddDays(-days);
+
+                    continue;
+                }
+                // Check for hours
+                else if (ago.Contains("heures") || ago.Contains("heure"))
+                {
+                    // Number of hours to remove
+                    int hours = ParseUtil.CoerceInt(Regex.Match(ago.ToString(), @"\d+").Value);
+                    // Removing
+                    release = release.AddHours(-hours);
+
+                    continue;
+                }
+                // Check for minutes
+                else if (ago.Contains("mins") || ago.Contains("min"))
+                {
+                    // Number of minutes to remove
+                    int minutes = ParseUtil.CoerceInt(Regex.Match(ago.ToString(), @"\d+").Value);
+                    // Removing
+                    release = release.AddMinutes(-minutes);
+
+                    continue;
+                }
+                // Check for seconds
+                else if (ago.Contains("secondes") || ago.Contains("seconde"))
+                {
+                    // Number of seconds to remove
+                    int seconds = ParseUtil.CoerceInt(Regex.Match(ago.ToString(), @"\d+").Value);
+                    // Removing
+                    release = release.AddSeconds(-seconds);
+
+                    continue;
+                }
+                else
+                {
+                    output("Unable to detect release date of torrent", "error");
+                    //throw new Exception("Unable to detect release date of torrent");
+                }
+            }
+            return release;
+        }
+
+        /// <summary>
+        /// Output message for logging or developpment (console)
+        /// </summary>
+        /// <param name="message">Message to output</param>
+        /// <param name="level">Level for Logger</param>
+        private void output(string message, string level = "debug")
+        {
+            // Check if we are in dev mode
+            if(DevMode)
+            {
+                // Output message to console
+                Console.WriteLine(message);
+            }
+            else
+            {
+                // Send message to logger with level
+                switch (level)
+                {
+                    default:
+                        goto case "debug";
+                    case "debug":
+                        // Only if Debug Level Enabled on Jackett
+                        if (Engine.Logger.IsDebugEnabled)
+                        {
+                            logger.Debug(message);
+                        }
+                        break;
+                    case "info":
+                        logger.Info(message);
+                        break;
+                    case "error":
+                        logger.Error(message);
+                        break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Validate Config entered by user on Jackett
+        /// </summary>
+        private void validateConfig()
+        {
+            output("\nValidating Settings ... \n");
+
+            // Check Username Setting
+            if (string.IsNullOrEmpty(ConfigData.Username.Value))
+            {
+                throw new ExceptionWithConfigData("You must provide a username for this tracker to login !", ConfigData);
+            }
+            else
+            {
+                output("Validated Setting -- Username (auth) => " + ConfigData.Username.Value.ToString());
+            }
+
+            // Check Password Setting
+            if (string.IsNullOrEmpty(ConfigData.Password.Value))
+            {
+                throw new ExceptionWithConfigData("You must provide a password with your username for this tracker to login !", ConfigData);
+            }
+            else
+            {
+                output("Validated Setting -- Password (auth) => " + ConfigData.Password.Value.ToString());
+            }
+
+            // Check Max Page Setting
+            if (!string.IsNullOrEmpty(ConfigData.Pages.Value))
+            {
+                try
+                {
+                    output("Validated Setting -- Max Pages => " + Convert.ToInt32(ConfigData.Pages.Value));
+                }
+                catch (Exception)
+                {
+                    throw new ExceptionWithConfigData("Please enter a numeric maximum number of pages to crawl !", ConfigData);
+                }
+            }
+            else
+            {
+                throw new ExceptionWithConfigData("Please enter a maximum number of pages to crawl !", ConfigData);
+            }
+
+            // Check Latency Setting
+            if (ConfigData.Latency.Value)
+            {
+                output("\nValidated Setting -- Latency Simulation enabled");
+
+                // Check Latency Start Setting
+                if (!string.IsNullOrEmpty(ConfigData.LatencyStart.Value))
+                {
+                    try
+                    {
+                        output("Validated Setting -- Latency Start => " + Convert.ToInt32(ConfigData.LatencyStart.Value));
+                    }
+                    catch (Exception)
+                    {
+                        throw new ExceptionWithConfigData("Please enter a numeric latency start in ms !", ConfigData);
+                    }
+                }
+                else
+                {
+                    throw new ExceptionWithConfigData("Latency Simulation enabled, Please enter a start latency !", ConfigData);
+                }
+
+                // Check Latency End Setting
+                if (!string.IsNullOrEmpty(ConfigData.LatencyEnd.Value))
+                {
+                    try
+                    {
+                        output("Validated Setting -- Latency End => " + Convert.ToInt32(ConfigData.LatencyEnd.Value));
+                    }
+                    catch (Exception)
+                    {
+                        throw new ExceptionWithConfigData("Please enter a numeric latency end in ms !", ConfigData);
+                    }
+                }
+                else
+                {
+                    throw new ExceptionWithConfigData("Latency Simulation enabled, Please enter a end latency !", ConfigData);
+                }
+            }
+
+            // Check Browser Setting
+            if (ConfigData.Browser.Value)
+            {
+                output("\nValidated Setting -- Browser Simulation enabled");
+
+                // Check ACCEPT header Setting
+                if (string.IsNullOrEmpty(ConfigData.HeaderAccept.Value))
+                {
+                    throw new ExceptionWithConfigData("Browser Simulation enabled, Please enter an ACCEPT header !", ConfigData);
+                }
+                else
+                {
+                    output("Validated Setting -- ACCEPT (header) => " + ConfigData.HeaderAccept.Value.ToString());
+                }
+
+                // Check ACCEPT-LANG header Setting
+                if (string.IsNullOrEmpty(ConfigData.HeaderAcceptLang.Value))
+                {
+                    throw new ExceptionWithConfigData("Browser Simulation enabled, Please enter an ACCEPT-LANG header !", ConfigData);
+                }
+                else
+                {
+                    output("Validated Setting -- ACCEPT-LANG (header) => " + ConfigData.HeaderAcceptLang.Value.ToString());
+                }
+
+                // Check USER-AGENT header Setting
+                if (string.IsNullOrEmpty(ConfigData.HeaderUserAgent.Value))
+                {
+                    throw new ExceptionWithConfigData("Browser Simulation enabled, Please enter an USER-AGENT header !", ConfigData);
+                }
+                else
+                {
+                    output("Validated Setting -- USER-AGENT (header) => " + ConfigData.HeaderUserAgent.Value.ToString());
+                }
+            }
+
+            // Check Dev Cache Settings
+            if (ConfigData.HardDriveCache.Value == true)
+            {
+                output("\nValidated Setting -- DEV Hard Drive Cache enabled");
+
+                // Check if Dev Mode enabled !
+                if (!ConfigData.DevMode.Value)
+                {
+                    throw new ExceptionWithConfigData("Hard Drive is enabled but not in DEV MODE, Please enable DEV MODE !", ConfigData);
+                }
+
+                // Check Cache Keep Time Setting
+                if (!string.IsNullOrEmpty(ConfigData.HardDriveCacheKeepTime.Value))
+                {
+                    try
+                    {
+                        output("Validated Setting -- Cache Keep Time (ms) => " + Convert.ToInt32(ConfigData.HardDriveCacheKeepTime.Value));
+                    }
+                    catch (Exception)
+                    {
+                        throw new ExceptionWithConfigData("Please enter a numeric hard drive keep time in ms !", ConfigData);
+                    }
+                }
+                else
+                {
+                    throw new ExceptionWithConfigData("Hard Drive Cache enabled, Please enter a maximum keep time for cache !", ConfigData);
+                }
+            }
+            else
+            {
+                // Delete cache if previously existed
+                cleanCacheStorage(true);
+            }
+        }
+    }
+}

src/Jackett/Indexers/Abstract/AvistazTracker.cs

@@ -52,13 +52,13 @@ namespace Jackett.Indexers
         {
             configData.LoadValuesFromJson(configJson);
             var loginPage = await RequestStringWithCookies(LoginUrl, string.Empty);
-            var token = new Regex("Avz.CSRF_TOKEN = '(.*?)';").Match(loginPage.Content).Groups[1].ToString();
+            var token = new Regex("<meta name=\"_token\" content=\"(.*?)\">").Match(loginPage.Content).Groups[1].ToString();
             var pairs = new Dictionary<string, string> {
                 { "_token", token },
-                { "username_email", configData.Username.Value },
+                { "email_username", configData.Username.Value },
                 { "password", configData.Password.Value },
-                { "remember", "on" }
-            };
+                { "remember", "1" }
+            };
 
             var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, loginPage.Cookies, true, null, LoginUrl);
             await ConfigureIfOK(result.Cookies, result.Content != null && result.Content.Contains("auth/logout"), () =>
@@ -91,7 +91,7 @@ namespace Jackett.Indexers
             try
             {
                 CQ dom = response.Content;
-                var rows = dom["table > tbody > tr"];
+                var rows = dom["table:has(thead) > tbody > tr"];
                 foreach (var row in rows)
                 {
                     CQ qRow = row.Cq();
@@ -100,27 +100,29 @@ namespace Jackett.Indexers
                     release.MinimumRatio = 1;
                     release.MinimumSeedTime = 172800;
 
-                    var qLink = row.ChildElements.ElementAt(1).FirstElementChild.Cq();
+                    var qLink = qRow.Find("a.torrent-filename"); ;
                     release.Title = qLink.Text().Trim();
                     release.Comments = new Uri(qLink.Attr("href"));
                     release.Guid = release.Comments;
 
-                    var qDownload = row.ChildElements.ElementAt(3).FirstElementChild.Cq();
+                    var qDownload = qRow.Find("a.torrent-download-icon"); ;
                     release.Link = new Uri(qDownload.Attr("href"));
 
-                    var dateStr = row.ChildElements.ElementAt(5).Cq().Text().Trim();
+                    var dateStr = qRow.Find("td:eq(3) > span").Text().Trim();
                     release.PublishDate = DateTimeUtil.FromTimeAgo(dateStr);
 
-                    var sizeStr = row.ChildElements.ElementAt(6).Cq().Text();
+                    var sizeStr = qRow.Find("td:eq(5) > span").Text().Trim();
                     release.Size = ReleaseInfo.GetBytes(sizeStr);
 
-                    release.Seeders = ParseUtil.CoerceInt(row.ChildElements.ElementAt(8).Cq().Text());
-                    release.Peers = ParseUtil.CoerceInt(row.ChildElements.ElementAt(9).Cq().Text()) + release.Seeders;
+                    release.Seeders = ParseUtil.CoerceInt(qRow.Find("td:eq(6)").Text().Trim());
+                    release.Peers = ParseUtil.CoerceInt(qRow.Find("td:eq(7)").Text().Trim()) + release.Seeders;
 
                     var cat = row.Cq().Find("td:eq(0) i").First().Attr("class")
-                                            .Replace("gi gi-film", "1")
-                                            .Replace("gi gi-tv", "2")
-                                            .Replace("gi gi-music", "3")
+                                            .Replace("torrent-icon", string.Empty)
+                                            .Replace("fa fa-", string.Empty)
+                                            .Replace("film", "1")
+                                            .Replace("tv", "2")
+                                            .Replace("music", "3")
                                             .Replace("text-pink", string.Empty);
                     release.Category = MapTrackerCatToNewznab(cat.Trim());
                     releases.Add(release);

src/Jackett/Indexers/AlphaRatio.cs

@@ -30,7 +30,7 @@ namespace Jackett.Indexers
             : base(name: "AlphaRatio",
                 description: "Legendary",
                 link: "https://alpharatio.cc/",
-                caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
+                caps: new TorznabCapabilities(),
                 manager: i,
                 client: w,
                 logger: l,
@@ -56,13 +56,18 @@ namespace Jackett.Indexers
             AddCategoryMapping(23, TorznabCatType.Audio);
         }
 
+        new ConfigurationDataBasicLogin configData
+        {
+            get { return (ConfigurationDataBasicLogin)base.configData; }
+            set { base.configData = value; }
+        }
+
         public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
         {
-            var incomingConfig = new ConfigurationDataBasicLogin();
-            incomingConfig.LoadValuesFromJson(configJson);
+            configData.LoadValuesFromJson(configJson);
             var pairs = new Dictionary<string, string> {
-                { "username", incomingConfig.Username.Value },
-                { "password", incomingConfig.Password.Value },
+                { "username", configData.Username.Value },
+                { "password", configData.Password.Value },
                 { "login", "Login" },
                 { "keeplogged", "1" }
             };
@@ -74,7 +79,7 @@ namespace Jackett.Indexers
                    CQ dom = response.Content;
                    dom["#loginform > table"].Remove();
                    var errorMessage = dom["#loginform"].Text().Trim().Replace("\n\t", " ");
-                   throw new ExceptionWithConfigData(errorMessage, (ConfigurationData)incomingConfig);
+                   throw new ExceptionWithConfigData(errorMessage, configData);
                });
             return IndexerConfigurationStatus.RequiresTesting;
         }
@@ -88,6 +93,7 @@ namespace Jackett.Indexers
             release.Guid = new Uri(GuidUrl + id);
             release.Comments = release.Guid;
             release.Link = new Uri(DownloadUrl + id);
+            release.Category = MapTrackerCatToNewznab(CategoryReverseMapper((string)r["category"]));
         }
 
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
@@ -159,7 +165,23 @@ namespace Jackett.Indexers
         {
             DateTime unixStart = new DateTime(1970, 1, 1, 0, 0, 0, 0, System.DateTimeKind.Utc);
             long unixTimeStampInTicks = (long)(unixTime * TimeSpan.TicksPerSecond);
-            return new DateTime(unixStart.Ticks + unixTimeStampInTicks);
+            return new DateTime(unixStart.Ticks + unixTimeStampInTicks, DateTimeKind.Utc).ToLocalTime();
+        }
+
+        static string CategoryReverseMapper(string categoryName)
+        {
+            Dictionary<string, string> dictionary = new Dictionary<string, string>();
+
+            dictionary.Add("TvSD", "1");
+            dictionary.Add("TvHD", "2");
+            dictionary.Add("MovieSD", "6");
+            dictionary.Add("MovieHD", "7");
+
+            if (dictionary.ContainsKey(categoryName))
+            {
+                return dictionary[categoryName];
+            }
+            return string.Empty;
         }
     }
 }

src/Jackett/Indexers/Andraste.cs

@@ -0,0 +1,189 @@
+using Jackett.Utils.Clients;
+using NLog;
+using Jackett.Services;
+using Jackett.Utils;
+using Jackett.Models;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using System.Collections.Generic;
+using CsQuery;
+using System;
+using System.Globalization;
+using Jackett.Models.IndexerConfig;
+using System.Collections.Specialized;
+using System.Text;
+using System.Linq;
+
+namespace Jackett.Indexers
+{
+    public class Andraste : BaseIndexer, IIndexer
+    {
+        string LoginUrl { get { return SiteLink + "takelogin.php"; } }
+        string BrowseUrl { get { return SiteLink + "browse.php"; } }
+
+        new ConfigurationDataBasicLoginWithRSSAndDisplay configData
+        {
+            get { return (ConfigurationDataBasicLoginWithRSSAndDisplay)base.configData; }
+            set { base.configData = value; }
+        }
+
+        public Andraste(IIndexerManagerService i, IWebClient wc, Logger l, IProtectionService ps)
+            : base(name: "Andraste",
+                   description: "A German general tracker.",
+                   link: "https://andraste.io/",
+                   caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
+                   manager: i,
+                   client: wc,
+                   logger: l,
+                   p: ps,
+                   configData: new ConfigurationDataBasicLoginWithRSSAndDisplay())
+        {
+            AddCategoryMapping(9,  TorznabCatType.Other); // Anderes
+            AddCategoryMapping(23, TorznabCatType.TVAnime); // Animation - Film &; Serie
+            AddCategoryMapping(1,  TorznabCatType.PC); // Appz
+            AddCategoryMapping(52, TorznabCatType.Other); // Botuploads
+            AddCategoryMapping(25, TorznabCatType.TVDocumentary); // Doku - Alle Formate
+            AddCategoryMapping(27, TorznabCatType.Books); // E-Books
+            AddCategoryMapping(51, TorznabCatType.Movies3D); // Film/3D
+            AddCategoryMapping(20, TorznabCatType.MoviesDVD); // Film/DVDr
+            AddCategoryMapping(37, TorznabCatType.MoviesHD); // Film/HD 1080p++
+            AddCategoryMapping(38, TorznabCatType.MoviesSD); // Film/HD 720p
+            AddCategoryMapping(36, TorznabCatType.Movies); // Film/im Kino
+            AddCategoryMapping(19, TorznabCatType.Movies); // Film/XviD,DivX,x264
+            AddCategoryMapping(4,  TorznabCatType.PCGames); // Games/PC
+            AddCategoryMapping(12, TorznabCatType.ConsolePS4); // Games/Playstation
+            AddCategoryMapping(22, TorznabCatType.ConsoleWii); // Games/Wii & DS
+            AddCategoryMapping(21, TorznabCatType.ConsoleXbox); // Games/Xbox & 360
+            AddCategoryMapping(48, TorznabCatType.PCPhoneAndroid); // Handy & PDA/Android
+            AddCategoryMapping(47, TorznabCatType.PCPhoneIOS); // Handy & PDA/iOS
+            AddCategoryMapping(44, TorznabCatType.PCMac); // Macintosh
+            AddCategoryMapping(41, TorznabCatType.Other); // MegaPack
+            AddCategoryMapping(24, TorznabCatType.AudioAudiobook); // Musik/Hörbuch & Hörspiel
+            AddCategoryMapping(46, TorznabCatType.Audio); // Musik/HQ 320++
+            AddCategoryMapping(6,  TorznabCatType.Audio); // Musik/Musik
+            AddCategoryMapping(26, TorznabCatType.AudioVideo); // Musik/Musikvideos
+            AddCategoryMapping(29, TorznabCatType.TVSD); // Serien/DVDr
+            AddCategoryMapping(35, TorznabCatType.TVHD); // Serien/HD 720p++
+            AddCategoryMapping(7,  TorznabCatType.TV); // Serien/XviD,DivX,x264
+            AddCategoryMapping(45, TorznabCatType.TV); // Shows
+            AddCategoryMapping(40, TorznabCatType.TVSport); // Sport
+            AddCategoryMapping(32, TorznabCatType.XXX); // XXX
+        }
+
+        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        {
+            configData.LoadValuesFromJson(configJson);
+
+            var pairs = new Dictionary<string, string>
+            {
+                { "username", configData.Username.Value },
+                { "password", configData.Password.Value }
+            };
+
+            var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, null, LoginUrl, true);
+            await ConfigureIfOK(result.Cookies, result.Content != null && result.Content.Contains("logout.php"), () =>
+            {
+                CQ dom = result.Content;
+                var errorMessage = dom["table.tableinborder"].Html();
+                errorMessage = result.Content;
+                throw new ExceptionWithConfigData(errorMessage, configData);
+            });
+            return IndexerConfigurationStatus.RequiresTesting;
+        }
+
+        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        {
+            TimeZoneInfo.TransitionTime startTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 3, 0, 0), 3, 5, DayOfWeek.Sunday);
+            TimeZoneInfo.TransitionTime endTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 4, 0, 0), 10, 5, DayOfWeek.Sunday);
+            TimeSpan delta = new TimeSpan(1, 0, 0);
+            TimeZoneInfo.AdjustmentRule adjustment = TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule(new DateTime(1999, 10, 1), DateTime.MaxValue.Date, delta, startTransition, endTransition);
+            TimeZoneInfo.AdjustmentRule[] adjustments = { adjustment };
+            TimeZoneInfo germanyTz = TimeZoneInfo.CreateCustomTimeZone("W. Europe Standard Time", new TimeSpan(1, 0, 0), "(GMT+01:00) W. Europe Standard Time", "W. Europe Standard Time", "W. Europe DST Time", adjustments);
+
+            var releases = new List<ReleaseInfo>();
+            
+            var searchString = query.GetQueryString();
+            var searchUrl = BrowseUrl;
+            var queryCollection = new NameValueCollection();
+            queryCollection.Add("showsearch", "1");
+            queryCollection.Add("incldead", "1");
+            queryCollection.Add("orderby", "added");
+            queryCollection.Add("sort", "desc");
+
+            if (!string.IsNullOrWhiteSpace(searchString))
+            {
+                queryCollection.Add("search", searchString);
+            }
+
+            foreach (var cat in MapTorznabCapsToTrackers(query))
+            {
+                queryCollection.Add("c" + cat, "1");
+            }
+            searchUrl += "?" + queryCollection.GetQueryString();
+
+            var response = await RequestBytesWithCookies(searchUrl);
+            var results = Encoding.GetEncoding("iso-8859-1").GetString(response.Content);
+            try
+            {
+                CQ dom = results;
+                var rows = dom["table.tableinborder > tbody > tr:has(td.tableb)"];
+
+                foreach (var row in rows)
+                {
+                    var release = new ReleaseInfo();
+                    var qRow = row.Cq();
+
+                    var qDetailsLink = qRow.Find("a[href^=details.php?id=]").First();
+                    release.Title = qDetailsLink.Attr("title");
+
+                    var qCatLink = qRow.Find("a[href^=browse.php?cat=]").First();
+                    var qDLLink = qRow.Find("a[href^=download.php?torrent=]").First();
+                    var qSeeders = qRow.Find("span:contains(Seeder) > b:eq(0)");
+                    var qLeechers = qRow.Find("span:contains(Seeder) > b:eq(1)");
+                    var qDateStr = qRow.Find("td > table > tbody > tr > td:eq(7)").First();
+                    var qSize = qRow.Find("span:contains(Volumen) > b:eq(0)").First();
+                    var qOnlyUpload = qRow.Find("img[title=OnlyUpload]");
+
+                    if(qOnlyUpload.Any())
+                    {
+                        release.MinimumRatio = 2;
+                        release.MinimumSeedTime = 144 * 60 * 60;
+                    }
+                    else
+                    {
+                        release.MinimumRatio = 1;
+                        release.MinimumSeedTime = 72 * 60 * 60;
+                    }
+
+                    var catStr = qCatLink.Attr("href").Split('=')[1];
+                    release.Category = MapTrackerCatToNewznab(catStr);
+
+                    release.Link = new Uri(SiteLink + qDLLink.Attr("href"));
+                    release.Comments = new Uri(SiteLink + qDetailsLink.Attr("href"));
+                    release.Guid = release.Link;
+
+                    var sizeStr = qSize.Text();
+                    release.Size = ReleaseInfo.GetBytes(sizeStr);
+
+                    release.Seeders = ParseUtil.CoerceInt(qSeeders.Text());
+                    release.Peers = ParseUtil.CoerceInt(qLeechers.Text()) + release.Seeders;
+
+                    var dateStr = qDateStr.Text().Trim().Replace('\xA0', ' ');
+                    DateTime dateGerman = DateTime.SpecifyKind(DateTime.ParseExact(dateStr, "dd.MM.yyyy HH:mm", CultureInfo.InvariantCulture), DateTimeKind.Unspecified);
+
+                    DateTime pubDateUtc = TimeZoneInfo.ConvertTimeToUtc(dateGerman, germanyTz);
+                    release.PublishDate = pubDateUtc.ToLocalTime();
+
+                    releases.Add(release);
+                }
+            }
+            catch (Exception ex)
+            {
+                OnParseError(results, ex);
+            }
+
+            return releases;
+        }
+    }
+}
+

src/Jackett/Indexers/AnimeBytes.cs

@@ -24,9 +24,17 @@ namespace Jackett.Indexers
 {
     public class AnimeBytes : BaseIndexer, IIndexer
     {
+        enum SearchType
+        {
+            Video,
+            Audio
+        }
+
         private string LoginUrl { get { return SiteLink + "user/login"; } }
         private string SearchUrl { get { return SiteLink + "torrents.php?"; } }
+        private string MusicSearchUrl { get { return SiteLink + "torrents2.php?"; } }
         public bool AllowRaws { get { return configData.IncludeRaw.Value; } }
+        public bool InsertSeason { get { return configData.InsertSeason!=null && configData.InsertSeason.Value; } }
 
         new ConfigurationDataAnimeBytes configData
         {
@@ -45,7 +53,10 @@ namespace Jackett.Indexers
                                               TorznabCatType.BooksComics,
                                               TorznabCatType.ConsolePSP,
                                               TorznabCatType.ConsoleOther,
-                                              TorznabCatType.PCGames),
+                                              TorznabCatType.PCGames,
+                                              TorznabCatType.AudioMP3,
+                                              TorznabCatType.AudioLossless,
+                                              TorznabCatType.AudioOther),
                 logger: l,
                 p: ps,
                 configData: new ConfigurationDataAnimeBytes())
@@ -53,6 +64,13 @@ namespace Jackett.Indexers
 
         }
 
+
+        public override IEnumerable<ReleaseInfo> FilterResults(TorznabQuery query, IEnumerable<ReleaseInfo> input)
+        {
+            // Prevent filtering
+            return input;
+        }
+
         public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
         {
             configData.LoadValuesFromJson(configJson);
@@ -119,12 +137,28 @@ namespace Jackett.Indexers
             base.LoadFromSavedConfiguration(jsonConfig);
         }
 
+        private string StripEpisodeNumber(string term)
+        {
+            // Tracer does not support searching with episode number so strip it if we have one
+            term = Regex.Replace(term, @"\W(\dx)?\d?\d$", string.Empty);
+            term = Regex.Replace(term, @"\W(S\d\d?E)?\d?\d$", string.Empty);
+            return term;
+        }
+
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             // The result list
             var releases = new List<ReleaseInfo>();
+            
+            if (ContainsMusicCategories(query.Categories))
+            {
+                foreach (var result in await GetResults(SearchType.Audio, query.SanitizedSearchTerm))
+                {
+                    releases.Add(result);
+                }
+            }
 
-            foreach (var result in await GetResults(query.SanitizedSearchTerm))
+            foreach (var result in await GetResults(SearchType.Video, StripEpisodeNumber(query.SanitizedSearchTerm)))
             {
                 releases.Add(result);
             }
@@ -132,39 +166,45 @@ namespace Jackett.Indexers
             return releases.ToArray();
         }
 
-        public async Task<IEnumerable<ReleaseInfo>> GetResults(string searchTerm)
+        private bool ContainsMusicCategories(int[] categories)
+        {
+            var music = new[]
+            {
+                TorznabCatType.Audio.ID,
+                TorznabCatType.AudioMP3.ID,
+                TorznabCatType.AudioLossless.ID,
+                TorznabCatType.AudioOther.ID,
+                TorznabCatType.AudioForeign.ID
+            };
+
+            return categories.Length == 0 || music.Any(categories.Contains);
+        }
+
+        private async Task<IEnumerable<ReleaseInfo>> GetResults(SearchType searchType, string searchTerm)
         {
             var cleanSearchTerm = HttpUtility.UrlEncode(searchTerm);
 
-            // This tracker only deals with full seasons so chop off the episode/season number if we have it D:
-            if (!string.IsNullOrWhiteSpace(searchTerm))
-            {
-                var splitindex = searchTerm.LastIndexOf(' ');
-                if (splitindex > -1)
-                    searchTerm = searchTerm.Substring(0, splitindex);
-            }
-
             // The result list
             var releases = new List<ReleaseInfo>();
 
+            var queryUrl = searchType == SearchType.Video ? SearchUrl : MusicSearchUrl;
+            // Only include the query bit if its required as hopefully the site caches the non query page
+            if (!string.IsNullOrWhiteSpace(searchTerm))
+            {
+                queryUrl += string.Format("searchstr={0}&action=advanced&search_type=title&year=&year2=&tags=&tags_type=0&sort=time_added&way=desc&hentai=2&releasegroup=&epcount=&epcount2=&artbooktitle=", cleanSearchTerm);
+            }
+
             // Check cache first so we don't query the server for each episode when searching for each episode in a series.
             lock (cache)
             {
                 // Remove old cache items
                 CleanCache();
 
-                var cachedResult = cache.Where(i => i.Query == searchTerm).FirstOrDefault();
+                var cachedResult = cache.Where(i => i.Query == queryUrl).FirstOrDefault();
                 if (cachedResult != null)
                     return cachedResult.Results.Select(s => (ReleaseInfo)s.Clone()).ToArray();
             }
-
-            var queryUrl = SearchUrl;
-            // Only include the query bit if its required as hopefully the site caches the non query page
-            if (!string.IsNullOrWhiteSpace(searchTerm))
-            {
-                queryUrl += string.Format("searchstr={0}&action=advanced&search_type=title&year=&year2=&tags=&tags_type=0&sort=time_added&way=desc&hentai=2&releasegroup=&epcount=&epcount2=&artbooktitle=", cleanSearchTerm);
-            }
-
+            
             // Get the content from the tracker
             var response = await RequestStringWithCookiesAndRetry(queryUrl);
             CQ dom = response.Content;
@@ -183,7 +223,11 @@ namespace Jackett.Indexers
                     var seriesCq = series.Cq();
 
                     var synonyms = new List<string>();
-                    var mainTitle = seriesCq.Find(".group_title strong a").First().Text().Trim();
+                    string mainTitle;
+                    if (searchType == SearchType.Video)
+                        mainTitle = seriesCq.Find(".group_title strong a").First().Text().Trim();
+                    else
+                        mainTitle = seriesCq.Find(".group_title strong").Text().Trim();
 
                     var yearStr = seriesCq.Find(".group_title strong").First().Text().Trim().Replace("]", "").Trim();
                     int yearIndex = yearStr.LastIndexOf("[");
@@ -244,6 +288,12 @@ namespace Jackett.Indexers
                                 releaseInfo = releaseInfo.Replace("Episode ", "");
                                 releaseInfo = releaseInfo.Replace("Season ", "S");
                                 releaseInfo = releaseInfo.Trim();
+                                int test = 0;
+                                if (InsertSeason && int.TryParse(releaseInfo, out test) && releaseInfo.Length==1)
+                                {
+                                    releaseInfo = "S01E0" + releaseInfo;
+                                }
+
                             }
                             else if (rowCq.HasClass("torrent"))
                             {
@@ -268,33 +318,52 @@ namespace Jackett.Indexers
                                 release.Guid = new Uri(SiteLink + infoLink.Attributes.GetAttribute("href") + "&nh=" + StringUtil.Hash(title)); // Sonarr should dedupe on this url - allow a url per name.
                                 release.Link = new Uri(downloadLink.Attributes.GetAttribute("href"), UriKind.Relative);
 
-                                var category = seriesCq.Find("a[title=\"View Torrent\"]").Text().Trim();
-                                if (category == "TV Series")
-                                    release.Category = TorznabCatType.TVAnime.ID;
-
-                                // Ignore these categories as they'll cause hell with the matcher
-                                // TV Special, OVA, ONA, DVD Special, BD Special
-
-                                if (category == "Movie")
-                                    release.Category = TorznabCatType.Movies.ID;
-
-                                if (category == "Manga" || category == "Oneshot" || category == "Anthology" || category == "Manhwa" || category == "Manhua" || category == "Light Novel")
-                                    release.Category = TorznabCatType.BooksComics.ID;
-
-                                if (category == "Novel" || category == "Artbook")
-                                    release.Category = TorznabCatType.BooksComics.ID;
-
-                                if (category == "Game" || category == "Visual Novel")
+                                string category = null;
+                                if (searchType == SearchType.Video)
                                 {
-                                    var description = rowCq.Find(".torrent_properties a:eq(1)").Text();
-                                    if (description.Contains(" PSP "))
-                                        release.Category = TorznabCatType.ConsolePSP.ID;
-                                    if (description.Contains("PSX"))
-                                        release.Category = TorznabCatType.ConsoleOther.ID;
-                                    if (description.Contains(" NES "))
-                                        release.Category = TorznabCatType.ConsoleOther.ID;
-                                    if (description.Contains(" PC "))
-                                        release.Category = TorznabCatType.PCGames.ID;
+                                    category = seriesCq.Find("a[title=\"View Torrent\"]").Text().Trim();
+                                    if (category == "TV Series")
+                                        release.Category = TorznabCatType.TVAnime.ID;
+
+                                    // Ignore these categories as they'll cause hell with the matcher
+                                    // TV Special, OVA, ONA, DVD Special, BD Special
+
+                                    if (category == "Movie")
+                                        release.Category = TorznabCatType.Movies.ID;
+
+                                    if (category == "Manga" || category == "Oneshot" || category == "Anthology" || category == "Manhwa" || category == "Manhua" || category == "Light Novel")
+                                        release.Category = TorznabCatType.BooksComics.ID;
+
+                                    if (category == "Novel" || category == "Artbook")
+                                        release.Category = TorznabCatType.BooksComics.ID;
+
+                                    if (category == "Game" || category == "Visual Novel")
+                                    {
+                                        var description = rowCq.Find(".torrent_properties a:eq(1)").Text();
+                                        if (description.Contains(" PSP "))
+                                            release.Category = TorznabCatType.ConsolePSP.ID;
+                                        if (description.Contains("PSX"))
+                                            release.Category = TorznabCatType.ConsoleOther.ID;
+                                        if (description.Contains(" NES "))
+                                            release.Category = TorznabCatType.ConsoleOther.ID;
+                                        if (description.Contains(" PC "))
+                                            release.Category = TorznabCatType.PCGames.ID;
+                                    }
+                                }
+
+                                if (searchType == SearchType.Audio)
+                                {
+                                    category = seriesCq.Find(".group_img .cat a").Text();
+                                    if (category == "Single" || category == "Album" || category == "Compilation" || category == "Soundtrack" || category == "Remix CD")
+                                    {
+                                        var description = rowCq.Find(".torrent_properties a:eq(1)").Text();
+                                        if (description.Contains(" Lossless "))
+                                            release.Category = TorznabCatType.AudioLossless.ID;
+                                        else if (description.Contains("MP3"))
+                                            release.Category = TorznabCatType.AudioMP3.ID;
+                                        else
+                                            release.Category = TorznabCatType.AudioOther.ID;
+                                    }
                                 }
 
 
@@ -372,7 +441,7 @@ namespace Jackett.Indexers
             // Add to the cache
             lock (cache)
             {
-                cache.Add(new CachedQueryResult(searchTerm, releases));
+                cache.Add(new CachedQueryResult(queryUrl, releases));
             }
 
             return releases.Select(s => (ReleaseInfo)s.Clone());

src/Jackett/Indexers/BakaBT.cs

@@ -0,0 +1,198 @@
+using CsQuery;
+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.Globalization;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web;
+using Jackett.Models.IndexerConfig;
+
+namespace Jackett.Indexers
+{
+    public class BakaBT : BaseIndexer, IIndexer
+    {
+        public string SearchUrl { get { return SiteLink + "browse.php?only=0&incomplete=1&lossless=1&hd=1&multiaudio=1&bonus=1&reorder=1&q="; } }
+        public string LoginUrl { get { return SiteLink + "login.php"; } }
+        public string id = "bakabt";
+
+        new ConfigurationDataBasicLogin configData
+        {
+            get { return (ConfigurationDataBasicLogin)base.configData; }
+            set { base.configData = value; }
+        }
+
+        public BakaBT(IIndexerManagerService i, IWebClient wc, Logger l, IProtectionService ps)
+            : base(name: "BakaBT",
+                description: "Anime Comunity",
+                link: "https://bakabt.me/",
+                caps: new TorznabCapabilities(TorznabCatType.TVAnime),
+                manager: i,
+                client: wc,
+                logger: l,
+                p: ps,
+                configData: new ConfigurationDataBasicLogin())
+        {
+        }
+
+
+        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        {
+            configData.LoadValuesFromJson(configJson);
+
+            var loginForm = await webclient.GetString(new Utils.Clients.WebRequest()
+                {
+                    Url = LoginUrl,
+                    Type = RequestType.GET
+                });
+
+            var pairs = new Dictionary<string, string> {
+                { "username", configData.Username.Value },
+                { "password", configData.Password.Value },
+                { "returnto", "/index.php" }
+            };
+
+            var response = await RequestLoginAndFollowRedirect(LoginUrl, pairs, loginForm.Cookies, true, null, SiteLink);
+            var responseContent = response.Content;
+            await ConfigureIfOK(response.Cookies, responseContent.Contains("<a href=\"logout.php\">Logout</a>"), () =>
+                {
+                    CQ dom = responseContent;
+                    var messageEl = dom[".error"].First();
+                    var errorMessage = messageEl.Text().Trim();
+                    throw new ExceptionWithConfigData(errorMessage, configData);
+                });
+
+            return IndexerConfigurationStatus.RequiresTesting;
+        }
+
+        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        {
+
+            // This tracker only deals with full seasons so chop off the episode/season number if we have it D:
+            if (!string.IsNullOrWhiteSpace(query.SearchTerm))
+            {
+                var splitindex = query.SearchTerm.LastIndexOf(' ');
+                if (splitindex > -1)
+                    query.SearchTerm = query.SearchTerm.Substring(0, splitindex);
+            }
+
+            var releases = new List<ReleaseInfo>();
+            var searchString = query.SanitizedSearchTerm;
+            var episodeSearchUrl = SearchUrl + HttpUtility.UrlEncode(searchString);
+            var response = await RequestStringWithCookiesAndRetry(episodeSearchUrl);
+
+            try
+            {
+                CQ dom = response.Content;
+                var rows = dom[".torrents tr.torrent"];
+
+                foreach (var row in rows)
+                {
+
+                    var qRow = row.Cq();
+                    var qTitleLink = qRow.Find("a.title").First();
+                    var title = qTitleLink.Text().Trim();
+
+                    // Insert before the release info
+                    var taidx = title.IndexOf('(');
+                    var tbidx = title.IndexOf('[');
+
+                    if (taidx == -1)
+                        taidx = title.Length;
+
+                    if (tbidx == -1)
+                        tbidx = title.Length;
+                    var titleSplit = Math.Min(taidx, tbidx);
+                    var titleSeries = title.Substring(0, titleSplit);
+                    var releaseInfo = title.Substring(titleSplit);
+
+                    // For each over each pipe deliminated name
+                    foreach (var name in titleSeries.Split("|".ToCharArray(), StringSplitOptions.RemoveEmptyEntries))
+                    {
+                        var release = new ReleaseInfo();
+
+                        release.Title = (name + releaseInfo).Trim();
+                        // Ensure the season is defined as this tracker only deals with full seasons
+                        if (release.Title.IndexOf("Season") == -1)
+                        {
+                            // Insert before the release info
+                            var aidx = release.Title.IndexOf('(');
+                            var bidx = release.Title.IndexOf('[');
+
+                            if (aidx == -1)
+                                aidx = release.Title.Length;
+
+                            if (bidx == -1)
+                                bidx = release.Title.Length;
+
+                            var insertPoint = Math.Min(aidx, bidx);
+                            release.Title = release.Title.Substring(0, insertPoint) + "Season 1 " + release.Title.Substring(insertPoint);
+                        }
+
+                        release.Description = release.Title;
+                        release.Guid = new Uri(SiteLink + qTitleLink.Attr("href"));
+                        release.Comments = release.Guid;
+
+                        release.Link = new Uri(SiteLink + qRow.Find(".peers a").First().Attr("href"));
+
+                        release.Seeders = int.Parse(qRow.Find(".peers a").Get(0).InnerText);
+                        release.Peers = release.Seeders + int.Parse(qRow.Find(".peers a").Get(1).InnerText);
+
+                        release.MinimumRatio = 1;
+
+                        var size = qRow.Find(".size").First().Text();
+                        release.Size = ReleaseInfo.GetBytes(size);
+
+                        //22 Jul 15
+                        var dateStr = qRow.Find(".added").First().Text().Replace("'", string.Empty);
+                        if (dateStr.Split(' ')[0].Length == 1)
+                            dateStr = "0" + dateStr;
+
+                        if (string.Equals(dateStr, "yesterday", StringComparison.InvariantCultureIgnoreCase))
+                        {
+                            release.PublishDate = DateTime.Now.AddDays(-1);
+                        }
+                        else if (string.Equals(dateStr, "today", StringComparison.InvariantCultureIgnoreCase))
+                        {
+                            release.PublishDate = DateTime.Now;
+                        }
+                        else
+                        {
+                            release.PublishDate = DateTime.ParseExact(dateStr, "dd MMM yy", CultureInfo.InvariantCulture);
+                        }
+
+                        releases.Add(release);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                OnParseError(response.Content, ex);
+            }
+
+            return releases;
+        }
+
+        public override async Task<byte[]> Download(Uri link)
+        {
+            var downloadPage = await RequestStringWithCookies(link.ToString());
+            CQ dom = downloadPage.Content;
+            var downloadLink = dom.Find(".download_link").First().Attr("href");
+
+            if (string.IsNullOrWhiteSpace(downloadLink))
+            {
+                throw new Exception("Unable to find download link.");
+            }
+
+            var response = await RequestBytesWithCookies(SiteLink + downloadLink);
+            return response.Content;
+        }
+    }
+}

src/Jackett/Indexers/BaseIndexer.cs

@@ -141,43 +141,88 @@ namespace Jackett.Indexers
 
         protected void CleanCache()
         {
-            foreach (var expired in cache.Where(i => i.Created - DateTime.Now > cacheTime).ToList())
+            foreach (var expired in cache.Where(i => DateTime.Now - i.Created > cacheTime).ToList())
             {
                 cache.Remove(expired);
             }
         }
 
-        protected async Task FollowIfRedirect(WebClientStringResult response, string referrer = null, string overrideRedirectUrl = null, string overrideCookies = null)
+        protected async Task FollowIfRedirect(WebClientStringResult response, string referrer = null, string overrideRedirectUrl = null, string overrideCookies = null, bool accumulateCookies = false)
         {
             var byteResult = new WebClientByteResult();
             // Map to byte
             Mapper.Map(response, byteResult);
-            await FollowIfRedirect(byteResult, referrer, overrideRedirectUrl, overrideCookies);
+            await FollowIfRedirect(byteResult, referrer, overrideRedirectUrl, overrideCookies, accumulateCookies);
             // Map to string
             Mapper.Map(byteResult, response);
         }
 
-        protected async Task FollowIfRedirect(WebClientByteResult response, string referrer = null, string overrideRedirectUrl = null, string overrideCookies = null)
+        protected async Task FollowIfRedirect(WebClientByteResult response, string referrer = null, string overrideRedirectUrl = null, string overrideCookies = null, bool accumulateCookies = false)
         {
             // Follow up  to 5 redirects
             for (int i = 0; i < 5; i++)
             {
                 if (!response.IsRedirect)
                     break;
-                await DoFollowIfRedirect(response, referrer, overrideRedirectUrl, overrideCookies);
+                await DoFollowIfRedirect(response, referrer, overrideRedirectUrl, overrideCookies, accumulateCookies);
+                if (accumulateCookies)
+                {
+                    CookieHeader = ResolveCookies((CookieHeader != null && CookieHeader != ""? CookieHeader + " " : "") + (overrideCookies != null && overrideCookies != "" ? overrideCookies + " " : "") + response.Cookies);
+                    overrideCookies = response.Cookies = CookieHeader;
+                }
+                if (overrideCookies != null && response.Cookies == null)
+                {
+                    response.Cookies = overrideCookies;
+                }
             }
         }
 
-        private async Task DoFollowIfRedirect(WebClientByteResult incomingResponse, string referrer = null, string overrideRedirectUrl = null, string overrideCookies = null)
+        private String ResolveCookies(String incomingCookies = "")
+        {
+            var redirRequestCookies = (CookieHeader != null && CookieHeader != "" ? CookieHeader + " " : "") + incomingCookies;
+            System.Text.RegularExpressions.Regex expression = new System.Text.RegularExpressions.Regex(@"([^\s]+)=([^=]+)(?:\s|$)");
+            Dictionary<string, string> cookieDIctionary = new Dictionary<string, string>();
+            var matches = expression.Match(redirRequestCookies);
+            while (matches.Success)
+            {
+                if (matches.Groups.Count > 2) cookieDIctionary[matches.Groups[1].Value] = matches.Groups[2].Value;
+                matches = matches.NextMatch();
+            }
+            return string.Join(" ", cookieDIctionary.Select(kv => kv.Key.ToString() + "=" + kv.Value.ToString()).ToArray());
+            
+        }
+
+        // Update CookieHeader with new cookies and save the config if something changed (e.g. a new CloudFlare clearance cookie was issued)
+        protected void UpdateCookieHeader(string newCookies, string cookieOverride = null)
+        {
+            string newCookieHeader = ResolveCookies((cookieOverride != null && cookieOverride != "" ? cookieOverride + " " : "") + newCookies);
+            if (CookieHeader != newCookieHeader)
+            {
+                logger.Debug(string.Format("updating Cookies {0} => {1}", CookieHeader, newCookieHeader));
+                CookieHeader = newCookieHeader;
+                if (IsConfigured)
+                    SaveConfig();
+            }
+        }
+
+        private async Task DoFollowIfRedirect(WebClientByteResult incomingResponse, string referrer = null, string overrideRedirectUrl = null, string overrideCookies = null, bool accumulateCookies = false)
         {
             if (incomingResponse.IsRedirect)
             {
+                var redirRequestCookies = "";
+                if (accumulateCookies)
+                {
+                    redirRequestCookies = ResolveCookies((CookieHeader != "" ? CookieHeader + " " : "") + (overrideCookies != null ? overrideCookies : ""));
+                } else
+                {
+                    redirRequestCookies = (overrideCookies != null ? overrideCookies : "");
+                }
                 // Do redirect
                 var redirectedResponse = await webclient.GetBytes(new WebRequest()
                 {
                     Url = overrideRedirectUrl ?? incomingResponse.RedirectingTo,
                     Referer = referrer,
-                    Cookies = overrideCookies ?? CookieHeader
+                    Cookies = redirRequestCookies
                 });
                 Mapper.Map(redirectedResponse, incomingResponse);
             }
@@ -233,7 +278,7 @@ namespace Jackett.Indexers
         public async virtual Task<byte[]> Download(Uri link)
         {
             var response = await RequestBytesWithCookiesAndRetry(link.ToString());
-            if(response.Status != System.Net.HttpStatusCode.OK && response.Status != System.Net.HttpStatusCode.Continue && response.Status != System.Net.HttpStatusCode.PartialContent)
+            if (response.Status != System.Net.HttpStatusCode.OK && response.Status != System.Net.HttpStatusCode.Continue && response.Status != System.Net.HttpStatusCode.PartialContent)
             {
                 throw new Exception($"Remote server returned {response.Status.ToString()}");
             }
@@ -269,15 +314,17 @@ namespace Jackett.Indexers
                 Type = RequestType.GET,
                 Cookies = CookieHeader,
                 Referer = referer,
-                 Headers = headers
+                Headers = headers
             };
 
             if (cookieOverride != null)
                 request.Cookies = cookieOverride;
-            return await webclient.GetString(request);
+            WebClientStringResult result = await webclient.GetString(request);
+            UpdateCookieHeader(result.Cookies, cookieOverride);
+            return result;
         }
 
-        protected async Task<WebClientStringResult> RequestStringWithCookiesAndRetry(string url, string cookieOverride = null, string referer = null, Dictionary<string,string> headers = null)
+        protected async Task<WebClientStringResult> RequestStringWithCookiesAndRetry(string url, string cookieOverride = null, string referer = null, Dictionary<string, string> headers = null)
         {
             Exception lastException = null;
             for (int i = 0; i < 3; i++)
@@ -326,7 +373,9 @@ namespace Jackett.Indexers
 
             if (emulateBrowser.HasValue)
                 request.EmulateBrowser = emulateBrowser.Value;
-            return await webclient.GetString(request);
+            WebClientStringResult result = await webclient.GetString(request);
+            UpdateCookieHeader(result.Cookies, cookieOverride);
+            return result;
         }
 
         protected async Task<WebClientStringResult> PostDataWithCookiesAndRetry(string url, IEnumerable<KeyValuePair<string, string>> data, string cookieOverride = null, string referer = null, Dictionary<string, string> headers = null, string rawbody = null, bool? emulateBrowser = null)
@@ -349,7 +398,7 @@ namespace Jackett.Indexers
             throw lastException;
         }
 
-        protected async Task<WebClientStringResult> RequestLoginAndFollowRedirect(string url, IEnumerable<KeyValuePair<string, string>> data, string cookies, bool returnCookiesFromFirstCall, string redirectUrlOverride = null, string referer = null)
+        protected async Task<WebClientStringResult> RequestLoginAndFollowRedirect(string url, IEnumerable<KeyValuePair<string, string>> data, string cookies, bool returnCookiesFromFirstCall, string redirectUrlOverride = null, string referer = null, bool accumulateCookies = false)
         {
             var request = new Utils.Clients.WebRequest()
             {
@@ -360,18 +409,22 @@ namespace Jackett.Indexers
                 PostData = data
             };
             var response = await webclient.GetString(request);
+            if (accumulateCookies)
+            {
+                response.Cookies = ResolveCookies((request.Cookies == null ? "" : request.Cookies + " ") + response.Cookies);
+            }
             var firstCallCookies = response.Cookies;
 
             if (response.IsRedirect)
             {
-                await FollowIfRedirect(response, request.Url, redirectUrlOverride, response.Cookies);
+                await FollowIfRedirect(response, request.Url, redirectUrlOverride, response.Cookies, accumulateCookies);
             }
 
             if (returnCookiesFromFirstCall)
             {
-                response.Cookies = firstCallCookies;
+                response.Cookies = ResolveCookies(firstCallCookies + (accumulateCookies ? " " + response.Cookies : ""));
             }
-
+            
             return response;
         }
 
@@ -400,43 +453,23 @@ namespace Jackett.Indexers
             }
         }
 
-        protected void AddCategoryMapping(string trackerCategory, int newznabCategory)
+        protected void AddCategoryMapping(string trackerCategory, TorznabCategory newznabCategory)
         {
-            categoryMapping.Add(new CategoryMapping(trackerCategory, newznabCategory));
+            categoryMapping.Add(new CategoryMapping(trackerCategory, newznabCategory.ID));
+            if (!TorznabCaps.Categories.Contains(newznabCategory))
+                TorznabCaps.Categories.Add(newznabCategory);
         }
 
         protected void AddCategoryMapping(int trackerCategory, TorznabCategory newznabCategory)
         {
-            categoryMapping.Add(new CategoryMapping(trackerCategory.ToString(), newznabCategory.ID));
-            if (!TorznabCaps.Categories.Contains(newznabCategory))
-                TorznabCaps.Categories.Add(newznabCategory);
-        }
-
-        protected void AddCategoryMapping(string trackerCategory, TorznabCategory newznabCategory)
-        {
-            categoryMapping.Add(new CategoryMapping(trackerCategory.ToString(), newznabCategory.ID));
-            if (!TorznabCaps.Categories.Contains(newznabCategory))
-                TorznabCaps.Categories.Add(newznabCategory);
-        }
-
-        protected void AddCategoryMapping(int trackerCategory, int newznabCategory)
-        {
-            categoryMapping.Add(new CategoryMapping(trackerCategory.ToString(), newznabCategory));
+            AddCategoryMapping(trackerCategory.ToString(), newznabCategory);
         }
 
         protected void AddMultiCategoryMapping(TorznabCategory newznabCategory, params int[] trackerCategories)
         {
             foreach (var trackerCat in trackerCategories)
             {
-                categoryMapping.Add(new CategoryMapping(trackerCat.ToString(), newznabCategory.ID));
-            }
-        }
-
-        protected void AddMultiCategoryMapping(int trackerCategory, params TorznabCategory[] newznabCategories)
-        {
-            foreach (var newznabCat in newznabCategories)
-            {
-                categoryMapping.Add(new CategoryMapping(trackerCategory.ToString(), newznabCat.ID));
+                AddCategoryMapping(trackerCat, newznabCategory);
             }
         }
 

src/Jackett/Indexers/BestFriends.cs

@@ -0,0 +1,211 @@
+using Jackett.Utils.Clients;
+using NLog;
+using Jackett.Services;
+using Jackett.Utils;
+using Jackett.Models;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using System.Collections.Generic;
+using CsQuery;
+using System;
+using System.Globalization;
+using Jackett.Models.IndexerConfig;
+using System.Collections.Specialized;
+
+namespace Jackett.Indexers
+{
+    public class BestFriends : BaseIndexer, IIndexer
+    {
+        string LoginUrl { get { return SiteLink + "login.php"; } }
+        string TakeLoginUrl { get { return SiteLink + "takelogin.php"; } }
+        string BrowseUrl { get { return SiteLink + "browse.php"; } }
+
+        new ConfigurationDataCaptchaLogin configData
+        {
+            get { return (ConfigurationDataCaptchaLogin)base.configData; }
+            set { base.configData = value; }
+        }
+
+        public BestFriends(IIndexerManagerService i, IWebClient wc, Logger l, IProtectionService ps)
+            : base(name: "Best Friends",
+                   description: "A German general tracker.",
+                   link: "http://bf.mine.nu/",
+                   caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
+                   manager: i,
+                   client: wc,
+                   logger: l,
+                   p: ps,
+                   configData: new ConfigurationDataCaptchaLogin())
+        {
+            AddCategoryMapping(18, TorznabCatType.TVAnime); // Anime
+            AddCategoryMapping(8,  TorznabCatType.PCMac); // Appz MAC
+            AddCategoryMapping(9,  TorznabCatType.PC); // Appz other
+            AddCategoryMapping(7,  TorznabCatType.PC); // Appz Windows
+            AddCategoryMapping(23, TorznabCatType.TVDocumentary); // Dokumentationen
+            AddCategoryMapping(32, TorznabCatType.Movies3D); // DVD 3D
+            AddCategoryMapping(15, TorznabCatType.Books); // eBooks
+            AddCategoryMapping(12, TorznabCatType.PCGames); // Games PC
+            AddCategoryMapping(37, TorznabCatType.PCPhoneOther); // Handy_Mobile 
+            AddCategoryMapping(24, TorznabCatType.TVHD); // HDTV
+            AddCategoryMapping(22, TorznabCatType.AudioAudiobook); // Hörbücher
+            AddCategoryMapping(1,  TorznabCatType.MoviesHD); // Movies 1080p/1080i
+            AddCategoryMapping(31, TorznabCatType.Movies3D); // Movies 3D
+            AddCategoryMapping(2,  TorznabCatType.MoviesHD); // Movies 720p/720i
+            AddCategoryMapping(21, TorznabCatType.MoviesBluRay); // Movies BluRay
+            AddCategoryMapping(5,  TorznabCatType.MoviesDVD); // Movies DVD/HDDVD
+            AddCategoryMapping(6,  TorznabCatType.MoviesSD); // Movies M/SVCD/Other
+            AddCategoryMapping(4,  TorznabCatType.MoviesSD); // Movies XVID/DIVX/h.264
+            AddCategoryMapping(10, TorznabCatType.Audio); // Music
+            AddCategoryMapping(25, TorznabCatType.AudioVideo); // Musikvideo
+            AddCategoryMapping(29, TorznabCatType.ConsoleNDS); // Nintendo DS
+            AddCategoryMapping(16, TorznabCatType.Other); // other
+            AddCategoryMapping(13, TorznabCatType.ConsolePS4); // Playstation
+            AddCategoryMapping(28, TorznabCatType.TVHD); // Serien HD
+            AddCategoryMapping(11, TorznabCatType.TVSD); // Serien XviD
+            AddCategoryMapping(33, TorznabCatType.Other); // Specials
+            AddCategoryMapping(30, TorznabCatType.TVSport); // Sport
+            AddCategoryMapping(19, TorznabCatType.TVOTHER); // TVRip
+            AddCategoryMapping(38, TorznabCatType.TVDocumentary); // US Dokus
+            AddCategoryMapping(20, TorznabCatType.MoviesForeign); // US Movies
+            AddCategoryMapping(14, TorznabCatType.TVFOREIGN); // US Serien
+            AddCategoryMapping(36, TorznabCatType.Other); // Wallpaper 
+            AddCategoryMapping(26, TorznabCatType.ConsoleWii); // Wii
+            AddCategoryMapping(27, TorznabCatType.ConsoleXbox360); // Xbox 360
+            AddCategoryMapping(3,  TorznabCatType.XXX); // XXX
+        }
+
+        public override async Task<ConfigurationData> GetConfigurationForSetup()
+        {
+            var loginPage = await RequestStringWithCookies(LoginUrl, string.Empty);
+            CQ dom = loginPage.Content;
+            CQ qCaptchaImg = dom.Find("td.tablea > img").First();
+
+            var CaptchaUrl = SiteLink + qCaptchaImg.Attr("src");
+            var captchaImage = await RequestBytesWithCookies(CaptchaUrl, loginPage.Cookies);
+            configData.CaptchaImage.Value = captchaImage.Content;
+            configData.CaptchaCookie.Value = loginPage.Cookies;
+            return configData;
+        }
+
+        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        {
+            configData.LoadValuesFromJson(configJson);
+
+            var pairs1 = new Dictionary<string, string>
+            {
+                { "proofcode", configData.CaptchaText.Value }
+            };
+            var cookies = configData.CaptchaCookie.Value;
+            var result1 = await RequestLoginAndFollowRedirect(LoginUrl, pairs1, cookies, true, null, LoginUrl, true);
+            if(result1.Content == null || !result1.Content.Contains("takelogin.php"))
+            {
+                CQ dom = result1.Content;
+                var errorMessage = dom["#login_error"].Text().Trim();
+                errorMessage = result1.Content;
+                throw new ExceptionWithConfigData(errorMessage, configData);
+            }
+
+            var pairs2 = new Dictionary<string, string>
+            {
+                { "username", configData.Username.Value },
+                { "password", configData.Password.Value }
+            };
+
+            var result = await RequestLoginAndFollowRedirect(TakeLoginUrl, pairs2, result1.Cookies, true, null, LoginUrl, true);
+            await ConfigureIfOK(result.Cookies, result.Content != null && result.Content.Contains("logout.php"), () =>
+                {
+                    CQ dom = result.Content;
+                    var errorMessage = dom["#login_error"].Text().Trim();
+                    errorMessage = result.Content;
+                    throw new ExceptionWithConfigData(errorMessage, configData);
+                });
+            return IndexerConfigurationStatus.RequiresTesting;
+        }
+
+        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        {
+            TimeZoneInfo.TransitionTime startTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 3, 0, 0), 3, 5, DayOfWeek.Sunday);
+            TimeZoneInfo.TransitionTime endTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 4, 0, 0), 10, 5, DayOfWeek.Sunday);
+            TimeSpan delta = new TimeSpan(1, 0, 0);
+            TimeZoneInfo.AdjustmentRule adjustment = TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule(new DateTime(1999, 10, 1), DateTime.MaxValue.Date, delta, startTransition, endTransition);
+            TimeZoneInfo.AdjustmentRule[] adjustments = { adjustment };
+            TimeZoneInfo germanyTz = TimeZoneInfo.CreateCustomTimeZone("W. Europe Standard Time", new TimeSpan(1, 0, 0), "(GMT+01:00) W. Europe Standard Time", "W. Europe Standard Time", "W. Europe DST Time", adjustments);
+
+            var releases = new List<ReleaseInfo>();
+            
+            var searchString = query.GetQueryString();
+            var searchUrl = BrowseUrl;
+            var queryCollection = new NameValueCollection();
+            queryCollection.Add("showsearch", "1");
+            queryCollection.Add("incldead", "1");
+            queryCollection.Add("blah", "0");
+            queryCollection.Add("orderby", "added");
+            queryCollection.Add("sort", "desc");
+
+            if (!string.IsNullOrWhiteSpace(searchString))
+            {
+                queryCollection.Add("search", searchString);
+            }
+
+            foreach (var cat in MapTorznabCapsToTrackers(query))
+            {
+                queryCollection.Add("c" + cat, "1");
+            }
+            searchUrl += "?" + queryCollection.GetQueryString();
+
+            var response = await RequestStringWithCookiesAndRetry(searchUrl, null, BrowseUrl);
+            var results = response.Content;
+            try
+            {
+                CQ dom = results;
+                var rows = dom["table.tableinborder > tbody > tr:has(td.tableb)"];
+
+                foreach (var row in rows)
+                {
+                    var release = new ReleaseInfo();
+                    release.MinimumRatio = 0.75;
+                    release.MinimumSeedTime = 0;
+                    var qRow = row.Cq();
+
+                    var qDetailsLink = qRow.Find("a[href^=details.php?id=]").First();
+                    release.Title = qDetailsLink.Attr("title");
+
+                    var qCatLink = qRow.Find("a[href^=browse.php?cat=]").First();
+                    var qSeeders = qRow.Find("td:eq(7)");
+                    var qLeechers = qRow.Find("td:eq(8)");
+                    var qDateStr = qRow.Find("td:eq(4)");
+                    var qSize = qRow.Find("td:eq(5)");
+
+                    var torrentId = qDetailsLink.Attr("href").Replace("&hit=1", "").Split('=')[1];
+
+                    var catStr = qCatLink.Attr("href").Split('=')[1];
+                    release.Category = MapTrackerCatToNewznab(catStr);
+
+                    release.Link = new Uri(SiteLink + "download.php?torrent="+torrentId);
+                    release.Comments = new Uri(SiteLink + qDetailsLink.Attr("href"));
+                    release.Guid = release.Link;
+
+                    var sizeStr = qSize.Text();
+                    release.Size = ReleaseInfo.GetBytes(sizeStr.Replace(",", "."));
+
+                    release.Seeders = ParseUtil.CoerceInt(qSeeders.Text());
+                    release.Peers = ParseUtil.CoerceInt(qLeechers.Text()) + release.Seeders;
+
+                    var dateStr = qDateStr.Text();
+                    var dateGerman = DateTime.SpecifyKind(DateTime.ParseExact(dateStr, "dd.MM.yyyyHH:mm:ss", CultureInfo.InvariantCulture), DateTimeKind.Unspecified);
+                    DateTime pubDateUtc = TimeZoneInfo.ConvertTimeToUtc(dateGerman, germanyTz);
+                    release.PublishDate = pubDateUtc;
+
+                    releases.Add(release);
+                }
+            }
+            catch (Exception ex)
+            {
+                OnParseError(results, ex);
+            }
+
+            return releases;
+        }
+    }
+}
+

src/Jackett/Indexers/BeyondHD.cs

@@ -30,7 +30,7 @@ namespace Jackett.Indexers
         public BeyondHD(IIndexerManagerService i, Logger l, IWebClient w, IProtectionService ps)
             : base(name: "BeyondHD",
                 description: "Without BeyondHD, your HDTV is just a TV",
-                link: "https://beyondhd.me/",
+                link: "https://beyond-hd.me/",
                 caps: new TorznabCapabilities(),
                 manager: i,
                 client: w,
@@ -79,7 +79,7 @@ namespace Jackett.Indexers
         public override async Task<ConfigurationData> GetConfigurationForSetup()
         {
             var loginPage = await RequestStringWithCookies(LoginUrl, string.Empty);
-            string recaptchaSiteKey = new Regex(@"loginwidget', \{[\s]{4,30}'sitekey' : '([0-9A-Za-z]{5,60})',[\s]{4,30}'theme'").Match(loginPage.Content).Groups[1].ToString().Trim();
+            string recaptchaSiteKey = new Regex(@"loginwidget', \{[\s]{4,30}'sitekey' : '([0-9A-Za-z-]{5,60})',[\s]{4,30}'theme'").Match(loginPage.Content).Groups[1].ToString().Trim();
             var result = new ConfigurationDataRecaptchaLogin();
             result.CookieHeader.Value = loginPage.Cookies;
             result.Captcha.SiteKey = recaptchaSiteKey;

src/Jackett/Indexers/BitCityReloaded.cs

@@ -0,0 +1,179 @@
+using Jackett.Utils.Clients;
+using NLog;
+using Jackett.Services;
+using Jackett.Utils;
+using Jackett.Models;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using System.Collections.Generic;
+using CsQuery;
+using System.Web;
+using System;
+using System.Globalization;
+using Jackett.Models.IndexerConfig;
+using System.Collections.Specialized;
+
+namespace Jackett.Indexers
+{
+    public class BitCityReloaded : BaseIndexer, IIndexer
+    {
+        string LoginUrl { get { return SiteLink + "login.php"; } }
+        string BrowseUrl { get { return SiteLink + "uebersicht.php"; } }
+        TimeZoneInfo germanyTz = TimeZoneInfo.CreateCustomTimeZone("W. Europe Standard Time", new TimeSpan(1, 0, 0), "W. Europe Standard Time", "W. Europe Standard Time");
+
+        new ConfigurationDataBasicLoginWithRSSAndDisplay configData
+        {
+            get { return (ConfigurationDataBasicLoginWithRSSAndDisplay)base.configData; }
+            set { base.configData = value; }
+        }
+
+        public BitCityReloaded(IIndexerManagerService i, IWebClient wc, Logger l, IProtectionService ps)
+            : base(name: "Bit-City Reloaded",
+                   description: "A German general tracker.",
+                   link: "https://bc-reloaded.net/",
+                   caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
+                   manager: i,
+                   client: wc,
+                   logger: l,
+                   p: ps,
+                   configData: new ConfigurationDataBasicLoginWithRSSAndDisplay())
+        {
+            this.configData.DisplayText.Value = "Only the results from the first search result page are shown, adjust your profile settings to show a reasonable amount (it looks like there's no maximum).";
+            this.configData.DisplayText.Name = "Notice";
+
+            AddCategoryMapping(1,  TorznabCatType.Other); // Anderes
+            AddCategoryMapping(2,  TorznabCatType.TVAnime); // Anime
+            AddCategoryMapping(34, TorznabCatType.PC); // Appz/Linux
+            AddCategoryMapping(35, TorznabCatType.PCMac); // Appz/Mac
+            AddCategoryMapping(36, TorznabCatType.PC); // Appz/Other
+            AddCategoryMapping(20, TorznabCatType.PC); // Appz/Win
+            AddCategoryMapping(3,  TorznabCatType.TVDocumentary); // Doku/Alle Formate
+            AddCategoryMapping(4,  TorznabCatType.Books); // EBooks
+            AddCategoryMapping(12, TorznabCatType.ConsolePS4); // Games PS / PSX
+            AddCategoryMapping(11, TorznabCatType.ConsoleNDS); // Games/Nintendo DS
+            AddCategoryMapping(10, TorznabCatType.PCGames); // Games/PC
+            AddCategoryMapping(13, TorznabCatType.ConsoleWii); // Games/Wii
+            AddCategoryMapping(14, TorznabCatType.ConsoleXbox); // Games/Xbox & 360
+            AddCategoryMapping(15, TorznabCatType.PCPhoneOther); // Handy & PDA
+            AddCategoryMapping(16, TorznabCatType.AudioAudiobook); // Hörspiel/Hörbuch
+            AddCategoryMapping(30, TorznabCatType.Other); // International
+            AddCategoryMapping(17, TorznabCatType.Other); // MegaPack
+            AddCategoryMapping(43, TorznabCatType.Movies3D); // Movie/3D
+            AddCategoryMapping(5,  TorznabCatType.MoviesDVD); // Movie/DVD/R
+            AddCategoryMapping(6,  TorznabCatType.MoviesHD); // Movie/HD 1080p
+            AddCategoryMapping(7,  TorznabCatType.MoviesHD); // Movie/HD 720p
+            AddCategoryMapping(32, TorznabCatType.MoviesOther); // Movie/TVRip
+            AddCategoryMapping(9,  TorznabCatType.MoviesOther); // Movie/XviD,DivX,h264
+            AddCategoryMapping(26, TorznabCatType.XXX); // Movie/XXX
+            AddCategoryMapping(41, TorznabCatType.XXXOther); // Movie/XXX/Other
+            AddCategoryMapping(42, TorznabCatType.XXXPacks); // Movie/XXX/Pack
+            AddCategoryMapping(45, TorznabCatType.MoviesHD); // Movies/4K
+            AddCategoryMapping(33, TorznabCatType.MoviesBluRay); // Movies/BluRay
+            AddCategoryMapping(18, TorznabCatType.Audio); // Musik
+            AddCategoryMapping(19, TorznabCatType.AudioVideo); // Musik Videos
+            AddCategoryMapping(44, TorznabCatType.TVOTHER); // Serie/DVD/R
+            AddCategoryMapping(22, TorznabCatType.TVHD); // Serie/HDTV
+            AddCategoryMapping(38, TorznabCatType.TV); // Serie/Pack
+            AddCategoryMapping(23, TorznabCatType.TVOTHER); // Serie/XviD,DivX,h264
+            AddCategoryMapping(25, TorznabCatType.TVSport); // Sport
+        }
+
+        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        {
+            configData.LoadValuesFromJson(configJson);
+
+            var pairs = new Dictionary<string, string>
+            {
+                { "username", configData.Username.Value },
+                { "password", configData.Password.Value }
+            };
+
+            var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, null, LoginUrl);
+            await ConfigureIfOK(result.Cookies, result.Content != null && result.Content.Contains("logout.php"), () =>
+                {
+                    CQ dom = result.Content;
+                    var errorMessage = dom["#login_error"].Text().Trim();
+                    throw new ExceptionWithConfigData(errorMessage, configData);
+                });
+            return IndexerConfigurationStatus.RequiresTesting;
+        }
+
+        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        {
+            var releases = new List<ReleaseInfo>();
+            
+            var searchString = query.GetQueryString();
+            var searchUrl = BrowseUrl;
+            var queryCollection = new NameValueCollection();
+            queryCollection.Add("showsearch", "0");
+            queryCollection.Add("incldead", "1");
+            queryCollection.Add("blah", "0");
+            queryCollection.Add("team", "0");
+            queryCollection.Add("orderby", "added");
+            queryCollection.Add("sort", "desc");
+
+            if (!string.IsNullOrWhiteSpace(searchString))
+            {
+                queryCollection.Add("search", searchString);
+            }
+
+            foreach (var cat in MapTorznabCapsToTrackers(query))
+            {
+                queryCollection.Add("c" + cat, "1");
+            }
+            searchUrl += "?" + queryCollection.GetQueryString();
+
+            var response = await RequestStringWithCookiesAndRetry(searchUrl, null, BrowseUrl);
+            var results = response.Content;
+            try
+            {
+                CQ dom = results;
+                var rows = dom["table.tableinborder[cellpadding=0] > tbody > tr"];
+
+                foreach (var row in rows)
+                {
+                    var release = new ReleaseInfo();
+                    release.MinimumRatio = 0.7;
+                    release.MinimumSeedTime = 48 * 60 * 60;
+                    var qRow = row.Cq();
+                    var flagImgs = qRow.Find("table tbody tr: eq(0) td > img");
+                    List<string> flags = new List<string>();
+                    flagImgs.Each(flagImg => {
+                        flags.Add(flagImg.GetAttribute("src").Replace("pic/torrent_", "").Replace(".gif", "").ToUpper());
+                    });
+                        
+                    var titleLink = qRow.Find("table tbody tr:eq(0) td a:has(b)").First();
+                    var DLLink = qRow.Find("td.tableb > a:has(img[title=\"Torrent herunterladen\"])").First();
+                    release.Comments = new Uri(SiteLink + titleLink.Attr("href").Replace("&hit=1", ""));
+                    release.Link = new Uri(SiteLink + DLLink.Attr("href"));
+                    release.Title = titleLink.Text().Trim();
+                    release.Description = String.Join(", ", flags);
+                    release.Guid = release.Link;
+
+                    var dateStr = qRow.Find("table tbody tr:eq(1) td:eq(4)").Html().Replace("&nbsp;", " ").Trim();
+                    var dateGerman = DateTime.SpecifyKind(DateTime.ParseExact(dateStr, "dd.MM.yyyy HH:mm:ss", CultureInfo.InvariantCulture), DateTimeKind.Unspecified);
+                    DateTime pubDateUtc = TimeZoneInfo.ConvertTimeToUtc(dateGerman, germanyTz);
+                    release.PublishDate = pubDateUtc.ToLocalTime();
+
+                    var sizeStr = qRow.Find("table tbody tr:eq(1) td b").First().Text().Trim();
+                    release.Size = ReleaseInfo.GetBytes(sizeStr.Replace(",", "."));
+
+                    release.Seeders = ParseUtil.CoerceInt(qRow.Find("table tbody tr:eq(1) td:eq(1) b:eq(0) font").Text().Trim());
+                    release.Peers = ParseUtil.CoerceInt(qRow.Find("table tbody tr:eq(1) td:eq(1) b:eq(1) font").Text().Trim()) + release.Seeders;
+
+                    var catId = qRow.Find("td:eq(0) a").First().Attr("href").Split('=')[1];
+                    release.Category = MapTrackerCatToNewznab(catId);
+
+                    releases.Add(release);
+                }
+            }
+            catch (Exception ex)
+            {
+                OnParseError(results, ex);
+            }
+
+            return releases;
+        }
+    }
+}
+

src/Jackett/Indexers/BitHdtv.cs

@@ -23,7 +23,7 @@ namespace Jackett.Indexers
     {
         private string LoginUrl { get { return SiteLink + "takelogin.php"; } }
         private string SearchUrl { get { return SiteLink + "torrents.php?"; } }
-        private string DownloadUrl { get { return SiteLink + "download.php?/{0}/dl.torrent"; } }
+        private string DownloadUrl { get { return SiteLink + "download.php?id={0}"; } }
 
         new ConfigurationDataBasicLogin configData
         {

src/Jackett/Indexers/BitMeTV.cs

@@ -42,7 +42,7 @@ namespace Jackett.Indexers
                 client: c,
                 logger: l,
                 p: ps,
-                configData: new ConfigurationDataCaptchaLogin())
+                configData: new ConfigurationDataCaptchaLogin("Ensure that you have the 'Force SSL' option set to 'yes' in your profile on the BitMeTv webpage."))
         {
         }
 

src/Jackett/Indexers/BitSoup.cs

@@ -0,0 +1,247 @@
+using CsQuery;
+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.Globalization;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web;
+using Jackett.Models.IndexerConfig;
+using System.Collections.Specialized;
+using System.Text.RegularExpressions;
+
+namespace Jackett.Indexers
+{
+    public class BitSoup : BaseIndexer, IIndexer
+    {
+        private string UseLink { get { return (this.configData.AlternateLink.Value != null && this.configData.AlternateLink.Value != "" ? this.configData.AlternateLink.Value : SiteLink); } }
+        private string BrowseUrl { get { return UseLink + "browse.php"; } }
+        private string LoginUrl { get { return UseLink + "takelogin.php"; } }
+        private string LoginReferer { get { return UseLink + "login.php"; } }
+        private List<String> KnownURLs = new List<String> { "https://www.bitsoup.me/", "https://www.bitsoup.org/" };
+
+        new ConfigurationDataBasicLoginWithAlternateLink configData
+        {
+            get { return (ConfigurationDataBasicLoginWithAlternateLink)base.configData; }
+            set { base.configData = value; }
+        }
+
+        public BitSoup(IIndexerManagerService i, IWebClient wc, Logger l, IProtectionService ps)
+            : base(name: "BitSoup",
+                description: "SoupieBits",
+                link: "https://www.bitsoup.me/",
+                caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
+                manager: i,
+                client: wc,
+                logger: l,
+                p: ps,
+                configData: new ConfigurationDataBasicLoginWithAlternateLink())
+        {
+            this.configData.Instructions.Value = this.DisplayName + " has multiple URLs.  The default (" + this.SiteLink + ") can be changed by entering a new value in the box below.";
+            this.configData.Instructions.Value += "The following are some known URLs for " + this.DisplayName;
+            this.configData.Instructions.Value += "<ul><li>" + String.Join("</li><li>", this.KnownURLs.ToArray()) + "</li></ul>";
+
+            //AddCategoryMapping("624", TorznabCatType.Console);
+            //AddCategoryMapping("307", TorznabCatType.ConsoleNDS);
+            //AddCategoryMapping("308", TorznabCatType.ConsolePSP);
+            AddCategoryMapping("35", TorznabCatType.ConsoleWii);
+            //AddCategoryMapping("309", TorznabCatType.ConsoleXbox);
+            AddCategoryMapping("12", TorznabCatType.ConsoleXbox360);
+            //AddCategoryMapping("305", TorznabCatType.ConsoleWiiwareVC);
+            //AddCategoryMapping("309", TorznabCatType.ConsoleXBOX360DLC);
+            AddCategoryMapping("38", TorznabCatType.ConsolePS3);
+            //AddCategoryMapping("239", TorznabCatType.ConsoleOther);
+            //AddCategoryMapping("245", TorznabCatType.ConsoleOther);
+            //AddCategoryMapping("246", TorznabCatType.ConsoleOther);
+            //AddCategoryMapping("626", TorznabCatType.ConsoleOther);
+            //AddCategoryMapping("628", TorznabCatType.ConsoleOther);
+            //AddCategoryMapping("630", TorznabCatType.ConsoleOther);
+            //AddCategoryMapping("307", TorznabCatType.Console3DS);
+            //AddCategoryMapping("308", TorznabCatType.ConsolePSVita);
+            //AddCategoryMapping("307", TorznabCatType.ConsoleWiiU);
+            //AddCategoryMapping("309", TorznabCatType.ConsoleXboxOne);
+            //AddCategoryMapping("308", TorznabCatType.ConsolePS4);
+            //AddCategoryMapping("631", TorznabCatType.Movies);
+            //AddCategoryMapping("631", TorznabCatType.MoviesForeign);
+            //AddCategoryMapping("455", TorznabCatType.MoviesOther);
+            //AddCategoryMapping("633", TorznabCatType.MoviesOther);
+            AddCategoryMapping("19", TorznabCatType.MoviesSD);
+            AddCategoryMapping("41", TorznabCatType.MoviesHD);
+            AddCategoryMapping("17", TorznabCatType.Movies3D);
+            AddCategoryMapping("80", TorznabCatType.MoviesBluRay);
+            AddCategoryMapping("20", TorznabCatType.MoviesDVD);
+            //AddCategoryMapping("631", TorznabCatType.MoviesWEBDL);
+            AddCategoryMapping("6", TorznabCatType.Audio);
+            //AddCategoryMapping("623", TorznabCatType.AudioMP3);
+            AddCategoryMapping("29", TorznabCatType.AudioVideo);
+            //AddCategoryMapping("402", TorznabCatType.AudioVideo);
+            AddCategoryMapping("5", TorznabCatType.AudioAudiobook);
+            //AddCategoryMapping("1", TorznabCatType.AudioLossless);
+            //AddCategoryMapping("403", TorznabCatType.AudioOther);
+            //AddCategoryMapping("642", TorznabCatType.AudioOther);
+            //AddCategoryMapping("1", TorznabCatType.AudioForeign);
+            //AddCategoryMapping("233", TorznabCatType.PC);
+            //AddCategoryMapping("236", TorznabCatType.PC);
+            //AddCategoryMapping("1", TorznabCatType.PC0day);
+            AddCategoryMapping("1", TorznabCatType.PCISO);
+            //AddCategoryMapping("235", TorznabCatType.PCMac);
+            //AddCategoryMapping("627", TorznabCatType.PCPhoneOther);
+            AddCategoryMapping("21", TorznabCatType.PCGames);
+            AddCategoryMapping("4", TorznabCatType.PCGames);
+            //AddCategoryMapping("625", TorznabCatType.PCPhoneIOS);
+            //AddCategoryMapping("625", TorznabCatType.PCPhoneAndroid);
+            AddCategoryMapping("45", TorznabCatType.TV);
+            //AddCategoryMapping("433", TorznabCatType.TV);
+            //AddCategoryMapping("639", TorznabCatType.TVWEBDL);
+            //AddCategoryMapping("433", TorznabCatType.TVWEBDL);
+            //AddCategoryMapping("639", TorznabCatType.TVFOREIGN);
+            //AddCategoryMapping("433", TorznabCatType.TVFOREIGN);
+            AddCategoryMapping("7", TorznabCatType.TVSD);
+            AddCategoryMapping("49", TorznabCatType.TVSD);
+            AddCategoryMapping("42", TorznabCatType.TVHD);
+            //AddCategoryMapping("433", TorznabCatType.TVHD);
+            //AddCategoryMapping("635", TorznabCatType.TVOTHER);
+            //AddCategoryMapping("636", TorznabCatType.TVSport);
+            AddCategoryMapping("23", TorznabCatType.TVAnime);
+            //AddCategoryMapping("634", TorznabCatType.TVDocumentary);
+            AddCategoryMapping("9", TorznabCatType.XXX);
+            //AddCategoryMapping("1", TorznabCatType.XXXDVD);
+            //AddCategoryMapping("1", TorznabCatType.XXXWMV);
+            //AddCategoryMapping("1", TorznabCatType.XXXXviD);
+            //AddCategoryMapping("1", TorznabCatType.XXXx264);
+            //AddCategoryMapping("1", TorznabCatType.XXXOther);
+            //AddCategoryMapping("1", TorznabCatType.XXXImageset);
+            //AddCategoryMapping("1", TorznabCatType.XXXPacks);
+            //AddCategoryMapping("340", TorznabCatType.Other);
+            //AddCategoryMapping("342", TorznabCatType.Other);
+            //AddCategoryMapping("344", TorznabCatType.Other);
+            //AddCategoryMapping("391", TorznabCatType.Other);
+            //AddCategoryMapping("392", TorznabCatType.Other);
+            //AddCategoryMapping("393", TorznabCatType.Other);
+            //AddCategoryMapping("394", TorznabCatType.Other);
+            //AddCategoryMapping("234", TorznabCatType.Other);
+            //AddCategoryMapping("638", TorznabCatType.Other);
+            //AddCategoryMapping("629", TorznabCatType.Other);
+            //AddCategoryMapping("1", TorznabCatType.OtherMisc);
+            //AddCategoryMapping("1", TorznabCatType.OtherHashed);
+            //AddCategoryMapping("408", TorznabCatType.Books);
+            AddCategoryMapping("24", TorznabCatType.BooksEbook);
+            //AddCategoryMapping("406", TorznabCatType.BooksComics);
+            //AddCategoryMapping("407", TorznabCatType.BooksComics);
+            //AddCategoryMapping("409", TorznabCatType.BooksComics);
+            //AddCategoryMapping("410", TorznabCatType.BooksMagazines);
+            //AddCategoryMapping("1", TorznabCatType.BooksTechnical);
+            //AddCategoryMapping("1", TorznabCatType.BooksOther);
+            //AddCategoryMapping("1", TorznabCatType.BooksForeign);
+        }
+
+        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        {
+            configData.LoadValuesFromJson(configJson);
+            if (configData.AlternateLink.Value != null && configData.AlternateLink.Value != "")
+            {
+                if (!configData.AlternateLink.Value.EndsWith("/"))
+                {
+                    configData.AlternateLink.Value = null;
+                    throw new Exception("AlternateLink must end with a slash.");
+                }
+                var match = Regex.Match(configData.AlternateLink.Value, "^https?:\\/\\/(?:[\\w]+\\.)+(?:[a-zA-Z]+)\\/$");
+                if (!match.Success)
+                {
+                    configData.AlternateLink.Value = null;
+                    throw new Exception("AlternateLink must be a valid url.");
+                }
+            }
+            var pairs = new Dictionary<string, string> {
+                { "username", configData.Username.Value },
+                { "password", configData.Password.Value },
+
+            };
+
+            var loginPage = await RequestStringWithCookies(UseLink, string.Empty);
+
+            var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, loginPage.Cookies, true, null, LoginReferer, true);
+            await ConfigureIfOK(result.Cookies, result.Content != null && result.Content.Contains("logout.php"), () =>
+            {
+                CQ dom = result.Content;
+                var messageEl = dom["body > table.statusbar1 > tbody > tr > td > table > tbody > tr > td > table > tbody > tr > td"].First();
+                var errorMessage = messageEl.Text().Trim();
+                throw new ExceptionWithConfigData(errorMessage, configData);
+            });
+            return IndexerConfigurationStatus.RequiresTesting;
+        }
+
+        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        {
+            var releases = new List<ReleaseInfo>();
+            var searchString = query.GetQueryString();
+            var searchUrl = BrowseUrl;
+            var trackerCats = MapTorznabCapsToTrackers(query);
+            var queryCollection = new NameValueCollection();
+
+
+            queryCollection.Add("search", string.IsNullOrWhiteSpace(searchString) ? "" : searchString);
+            if (trackerCats.Count > 1)
+            {
+                for (var ct = 0; ct < trackerCats.Count; ct++) queryCollection.Add("cat" + (ct + 1), trackerCats.ElementAt(ct));
+            }
+            else
+            {
+                queryCollection.Add("cat", (trackerCats.Count == 1 ? trackerCats.ElementAt(0) : "0"));
+            }
+            //queryCollection.Add("cat", (trackerCats.Count == 1 ? trackerCats.ElementAt(0) : "0"));
+            searchUrl += "?" + queryCollection.GetQueryString();
+            await ProcessPage(releases, searchUrl);
+
+            return releases;
+        }
+
+        private async Task ProcessPage(List<ReleaseInfo> releases, string searchUrl)
+        {
+            var response = await RequestStringWithCookiesAndRetry(searchUrl, null, BrowseUrl);
+            var results = response.Content;
+            try
+            {
+                CQ dom = results;
+
+                var rows = dom["table.koptekst tr"];
+                foreach (var row in rows.Skip(1))
+                {
+                    var release = new ReleaseInfo();
+
+                    release.Title = row.Cq().Find("td:eq(1) a").First().Text().Trim();
+                    release.Comments = new Uri(UseLink + row.Cq().Find("td:eq(1) a").First().Attr("href"));
+
+                    release.Link = new Uri(UseLink + row.Cq().Find("td:eq(2) a").First().Attr("href"));
+                    release.Guid = release.Link;
+                    release.Description = release.Title;
+                    var cat = row.Cq().Find("td:eq(0) a").First().Attr("href").Substring(15);
+                    release.Category = MapTrackerCatToNewznab(cat);
+
+                    var added = row.Cq().Find("td:eq(7)").First().Text().Trim();
+                    release.PublishDate = DateTime.ParseExact(added, "yyyy-MM-ddH:mm:ss", CultureInfo.InvariantCulture);
+
+                    var sizeStr = row.Cq().Find("td:eq(8)").First().Text().Trim();
+                    release.Size = ReleaseInfo.GetBytes(sizeStr);
+
+                    release.Seeders = ParseUtil.CoerceInt(row.Cq().Find("td:eq(10)").First().Text().Trim());
+                    release.Peers = ParseUtil.CoerceInt(row.Cq().Find("td:eq(11)").First().Text().Trim()) + release.Seeders;
+
+                    releases.Add(release);
+                }
+            }
+            catch (Exception ex)
+            {
+                OnParseError(results, ex);
+            }
+        }
+    }
+}

src/Jackett/Indexers/BlueTigers.cs

@@ -78,6 +78,7 @@ namespace Jackett.Indexers
             AddCategoryMapping("25", TorznabCatType.MoviesOther);
             AddCategoryMapping("21", TorznabCatType.MoviesOther);
             AddCategoryMapping("20", TorznabCatType.MoviesDVD);
+            AddCategoryMapping("26", TorznabCatType.MoviesWEBDL);
             AddCategoryMapping("9", TorznabCatType.TVAnime);
             AddCategoryMapping("34", TorznabCatType.Other);
             AddCategoryMapping("35", TorznabCatType.Audio);
@@ -254,4 +255,4 @@ namespace Jackett.Indexers
 
     }
 
-}
+}

src/Jackett/Indexers/CinemaZ.cs

@@ -18,12 +18,12 @@ using Jackett.Models.IndexerConfig;
 
 namespace Jackett.Indexers
 {
-    public class EuTorrents : AvistazTracker, IIndexer
+    public class CinemaZ : AvistazTracker, IIndexer
     {
-        public EuTorrents(IIndexerManagerService indexerManager, IWebClient webClient, Logger logger, IProtectionService protectionService)
-            : base(name: "EuTorrents",
+        public CinemaZ(IIndexerManagerService indexerManager, IWebClient webClient, Logger logger, IProtectionService protectionService)
+            : base(name: "CinemaZ",
                 desc: "Part of the Avistaz network.",
-                link: "https://eutorrents.to/",
+                link: "https://cinemaz.to/",
                 indexerManager: indexerManager,
                 logger: logger,
                 protectionService: protectionService,

src/Jackett/Indexers/DanishBits.cs

@@ -1,8 +1,6 @@
 using CsQuery;
-using Jackett.Indexers;
 using Jackett.Models;
 using Jackett.Services;
-using Jackett.Utils;
 using Jackett.Utils.Clients;
 using Newtonsoft.Json.Linq;
 using NLog;
@@ -10,14 +8,9 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Web;
-using System.Web.UI.WebControls;
 using CsQuery.ExtensionMethods;
 using Jackett.Models.IndexerConfig;
 
@@ -38,7 +31,7 @@ namespace Jackett.Indexers
             : base(name: "DanishBits",
                 description: "A danish closed torrent tracker",
                 link: "https://danishbits.org/",
-                caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
+                caps: new TorznabCapabilities(),
                 manager: i,
                 client: c,
                 logger: l,
@@ -151,6 +144,13 @@ namespace Jackett.Indexers
 
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
+            TimeZoneInfo.TransitionTime startTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 2, 0, 0), 3, 5, DayOfWeek.Sunday);
+            TimeZoneInfo.TransitionTime endTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 3, 0, 0), 10, 5, DayOfWeek.Sunday);
+            TimeSpan delta = new TimeSpan(1, 0, 0);
+            TimeZoneInfo.AdjustmentRule adjustment = TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule(new DateTime(1999, 10, 1), DateTime.MaxValue.Date, delta, startTransition, endTransition);
+            TimeZoneInfo.AdjustmentRule[] adjustments = { adjustment };
+            TimeZoneInfo denmarkTz = TimeZoneInfo.CreateCustomTimeZone("Denmark Time", new TimeSpan(1, 0, 0), "(GMT+01:00) Denmark Time", "Denmark Time", "Denmark DST", adjustments);
+
             var releasesPerPage = 100;
             var releases = new List<ReleaseInfo>();
 
@@ -244,9 +244,8 @@ namespace Jackett.Indexers
 
                     var addedElement = qRow.Find("span.time").FirstElement();
                     var addedStr = addedElement.GetAttribute("title");
-                    release.PublishDate = DateTime.ParseExact(addedStr, "MMM dd yyyy, HH:mm",
-                        CultureInfo.InvariantCulture);
-
+                    release.PublishDate = TimeZoneInfo.ConvertTimeToUtc(DateTime.ParseExact(addedStr, "MMM dd yyyy, HH:mm", CultureInfo.InvariantCulture), denmarkTz).ToLocalTime();
+                    
                     var columns = qRow.Children();
                     var seedersElement = columns.Reverse().Skip(1).First();
                     release.Seeders = int.Parse(seedersElement.InnerText);

src/Jackett/Indexers/Demonoid.cs

@@ -1,134 +1,141 @@
-using CsQuery;
-using Jackett.Models;
-using Jackett.Models.IndexerConfig;
-using Jackett.Services;
-using Jackett.Utils;
-using Jackett.Utils.Clients;
-using Newtonsoft.Json.Linq;
-using NLog;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Web;
-
-namespace Jackett.Indexers
-{
-    public class Demonoid : BaseIndexer, IIndexer
-    {
-        private string LoginUrl { get { return SiteLink + "account_handler.php"; } }
-        private string SearchUrl { get { return SiteLink + "files/?category=3&subcategory=All&quality=All&seeded=0&to=1&query={0}"; } }
-
-        new ConfigurationDataBasicLogin configData
-        {
-            get { return (ConfigurationDataBasicLogin)base.configData; }
-            set { base.configData = value; }
-        }
-
-        public Demonoid(IIndexerManagerService i, Logger l, IWebClient wc, IProtectionService ps)
-            : base(name: "Demonoid",
-                description: "Demonoid",
-                link: "http://www.demonoid.pw/",
-                caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
-                manager: i,
-                client: wc,
-                logger: l,
-                p: ps,
-                configData: new ConfigurationDataBasicLogin())
-        {
-        }
-
-        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
-        {
-            configData.LoadValuesFromJson(configJson);
-            var pairs = new Dictionary<string, string> {
-                { "nickname", configData.Username.Value },
-                { "password", configData.Password.Value },
-                { "returnpath", "/" },
-                { "withq", "0" },
-                { "Submit", "Submit" }
-            };
-
-            var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, null, SiteLink);
-            await ConfigureIfOK(result.Cookies, result.Content != null && result.Content.Contains("user_control_panel.php"), () =>
-            {
-                CQ dom = result.Content;
-                var errorMessage = dom[".red"].ElementAt(1).Cq().Text().Trim();
-                throw new ExceptionWithConfigData(errorMessage, configData);
-            });
-            return IndexerConfigurationStatus.RequiresTesting;
-        }
-
-        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
-        {
-            var releases = new List<ReleaseInfo>();
-            var episodeSearchUrl = string.Format(SearchUrl, HttpUtility.UrlEncode(query.GetQueryString()));
-            var results = await RequestStringWithCookiesAndRetry(episodeSearchUrl);
-
-            if (results.Content.Contains("No torrents found"))
-            {
-                return releases;
-            }
-
-            try
-            {
-                CQ dom = results.Content;
-                var rows = dom[".ctable_content_no_pad > table > tbody > tr"].ToArray();
-                DateTime lastDateTime = default(DateTime);
-                for (var i = 0; i < rows.Length; i++)
-                {
-                    var rowA = rows[i];
-                    var rAlign = rowA.Attributes["align"];
-                    if (rAlign == "right" || rAlign == "center")
-                        continue;
-                    if (rAlign == "left")
-                    {
-                        // ex: "Monday, Jun 01, 2015", "Monday, Aug 03, 2015"
-                        var dateStr = rowA.Cq().Text().Trim().Replace("Added on ", "");
-                        if (dateStr.ToLowerInvariant().Contains("today"))
-                            lastDateTime = DateTime.Now;
-                        else
-                            lastDateTime = DateTime.SpecifyKind(DateTime.ParseExact(dateStr, "dddd, MMM dd, yyyy", CultureInfo.InvariantCulture), DateTimeKind.Utc).ToLocalTime();
-                        continue;
-                    }
-                    if (rowA.ChildElements.Count() < 2)
-                        continue;
-
-                    var rowB = rows[++i];
-
-                    var release = new ReleaseInfo();
-                    release.MinimumRatio = 1;
-                    release.MinimumSeedTime = 172800;
-
-                    release.PublishDate = lastDateTime;
-
-                    var qLink = rowA.ChildElements.ElementAt(1).FirstElementChild.Cq();
-                    release.Title = qLink.Text().Trim();
-                    release.Description = release.Title;
-
-                    release.Comments = new Uri(SiteLink + qLink.Attr("href"));
-                    release.Guid = release.Comments;
-
-                    var qDownload = rowB.ChildElements.ElementAt(2).ChildElements.ElementAt(1).Cq();
-                    release.Link = new Uri(SiteLink + qDownload.Attr("href"));
-
-                    var sizeStr = rowB.ChildElements.ElementAt(3).Cq().Text();
-                    release.Size = ReleaseInfo.GetBytes(sizeStr);
-
-                    release.Seeders = ParseUtil.CoerceInt(rowB.ChildElements.ElementAt(6).Cq().Text());
-                    release.Peers = ParseUtil.CoerceInt(rowB.ChildElements.ElementAt(6).Cq().Text()) + release.Seeders;
-
-                    releases.Add(release);
-                }
-
-            }
-            catch (Exception ex)
-            {
-                OnParseError(results.Content, ex);
-            }
-            return releases;
-        }
-    }
-}
+using CsQuery;
+using Jackett.Models;
+using Jackett.Models.IndexerConfig;
+using Jackett.Services;
+using Jackett.Utils;
+using Jackett.Utils.Clients;
+using Newtonsoft.Json.Linq;
+using NLog;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web;
+
+namespace Jackett.Indexers
+{
+    public class Demonoid : BaseIndexer, IIndexer
+    {
+        private string LoginUrl { get { return SiteLink + "account_handler.php"; } }
+        private string SearchUrl { get { return SiteLink + "files/?category={0}&subcategory=All&quality=All&seeded=0&to=1&query={1}"; } }
+
+        new ConfigurationDataBasicLogin configData
+        {
+            get { return (ConfigurationDataBasicLogin)base.configData; }
+            set { base.configData = value; }
+        }
+
+        public Demonoid(IIndexerManagerService i, Logger l, IWebClient wc, IProtectionService ps)
+            : base(name: "Demonoid",
+                description: "Demonoid",
+                link: "http://www.dnoid.me/",
+                caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
+                manager: i,
+                client: wc,
+                logger: l,
+                p: ps,
+                configData: new ConfigurationDataBasicLogin())
+        {
+            AddCategoryMapping(3, TorznabCatType.TV);
+            AddCategoryMapping(3, TorznabCatType.TVSD);
+            AddCategoryMapping(3, TorznabCatType.TVHD);
+            AddCategoryMapping(1, TorznabCatType.Movies);
+        }
+
+        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        {
+            configData.LoadValuesFromJson(configJson);
+            var pairs = new Dictionary<string, string> {
+                { "nickname", configData.Username.Value },
+                { "password", configData.Password.Value },
+                { "returnpath", "/" },
+                { "withq", "0" },
+                { "Submit", "Submit" }
+            };
+
+            var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, null, SiteLink);
+            await ConfigureIfOK(result.Cookies, result.Content != null && result.Content.Contains("user_control_panel.php"), () =>
+            {
+                CQ dom = result.Content;
+                string errorMessage = dom["form[id='bb_code_form']"].Parent().Find("font[class='red']").Text();
+                throw new ExceptionWithConfigData(errorMessage, configData);
+            });
+            return IndexerConfigurationStatus.RequiresTesting;
+        }
+
+        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        {
+            var releases = new List<ReleaseInfo>();
+            var trackerCats = MapTorznabCapsToTrackers(query);
+            var cat = (trackerCats.Count == 1 ? trackerCats.ElementAt(0) : "0");
+            var episodeSearchUrl = string.Format(SearchUrl, cat, HttpUtility.UrlEncode(query.GetQueryString()));
+            var results = await RequestStringWithCookiesAndRetry(episodeSearchUrl);
+
+            
+            if (results.Content.Contains("No torrents found"))
+            {
+                return releases;
+            }
+
+            try
+            {
+                CQ dom = results.Content;
+                var rows = dom[".ctable_content_no_pad > table > tbody > tr"].ToArray();
+                DateTime lastDateTime = default(DateTime);
+                for (var i = 0; i < rows.Length; i++)
+                {
+                    var rowA = rows[i];
+                    var rAlign = rowA.Attributes["align"];
+                    if (rAlign == "right" || rAlign == "center")
+                        continue;
+                    if (rAlign == "left")
+                    {
+                        // ex: "Monday, Jun 01, 2015", "Monday, Aug 03, 2015"
+                        var dateStr = rowA.Cq().Text().Trim().Replace("Added on ", "");
+                        if (dateStr.ToLowerInvariant().Contains("today"))
+                            lastDateTime = DateTime.Now;
+                        else
+                            lastDateTime = DateTime.SpecifyKind(DateTime.ParseExact(dateStr, "dddd, MMM dd, yyyy", CultureInfo.InvariantCulture), DateTimeKind.Utc).ToLocalTime();
+                        continue;
+                    }
+                    if (rowA.ChildElements.Count() < 2)
+                        continue;
+
+                    var rowB = rows[++i];
+
+                    var release = new ReleaseInfo();
+                    release.MinimumRatio = 1;
+                    release.MinimumSeedTime = 172800;
+
+                    release.PublishDate = lastDateTime;
+
+                    var qLink = rowA.ChildElements.ElementAt(1).FirstElementChild.Cq();
+                    release.Title = qLink.Text().Trim();
+                    release.Description = release.Title;
+
+                    release.Comments = new Uri(SiteLink + qLink.Attr("href"));
+                    release.Guid = release.Comments;
+
+                    var qDownload = rowB.ChildElements.ElementAt(2).ChildElements.ElementAt(0).Cq();
+                    release.Link = new Uri(SiteLink + qDownload.Attr("href"));
+
+                    var sizeStr = rowB.ChildElements.ElementAt(3).Cq().Text();
+                    release.Size = ReleaseInfo.GetBytes(sizeStr);
+
+                    release.Seeders = ParseUtil.CoerceInt(rowB.ChildElements.ElementAt(6).Cq().Text());
+                    release.Peers = ParseUtil.CoerceInt(rowB.ChildElements.ElementAt(6).Cq().Text()) + release.Seeders;
+
+                    releases.Add(release);
+                }
+
+            }
+            catch (Exception ex)
+            {
+                OnParseError(results.Content, ex);
+            }
+            return releases;
+        }
+    }
+}

src/Jackett/Indexers/Freshon.cs

@@ -105,9 +105,9 @@ namespace Jackett.Indexers
                     release.MinimumSeedTime = 172800;
                     release.Title = qLink.Attr("title");
                     release.Description = release.Title;
-                    release.Guid = new Uri(SiteLink + qLink.Attr("href"));
+                    release.Guid = new Uri(SiteLink + qLink.Attr("href").TrimStart('/'));
                     release.Comments = release.Guid;
-                    release.Link = new Uri(SiteLink + qRow.Find("td.table_links > a").First().Attr("href"));
+                    release.Link = new Uri(SiteLink + qRow.Find("td.table_links > a").First().Attr("href").TrimStart('/'));
                     release.Category = TvCategoryParser.ParseTvShowQuality(release.Title);
 
                     release.Seeders = ParseUtil.CoerceInt(qRow.Find("td.table_seeders").Text().Trim());

src/Jackett/Indexers/FunFile.cs

@@ -0,0 +1,142 @@
+using CsQuery;
+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.Threading.Tasks;
+using Jackett.Models.IndexerConfig;
+using System.Collections.Specialized;
+
+namespace Jackett.Indexers
+{
+    public class FunFile : BaseIndexer, IIndexer
+    {
+        private string SearchUrl { get { return SiteLink + "browse.php"; } }
+        private string LoginUrl { get { return SiteLink + "takelogin.php"; } }
+
+        new ConfigurationDataBasicLoginWithRSSAndDisplay configData
+        {
+            get { return (ConfigurationDataBasicLoginWithRSSAndDisplay)base.configData; }
+            set { base.configData = value; }
+        }
+
+        public FunFile(IIndexerManagerService i, Logger l, IWebClient w, IProtectionService ps)
+            : base(name: "FunFile",
+                description: "A general tracker",
+                link: "https://www.funfile.org/",
+                caps: new TorznabCapabilities(),
+                manager: i,
+                client: w,
+                logger: l,
+                p: ps,
+                configData: new ConfigurationDataBasicLoginWithRSSAndDisplay())
+        {
+            AddCategoryMapping(44, TorznabCatType.TVAnime); // Anime
+            AddCategoryMapping(22, TorznabCatType.PC); // Applications
+            AddCategoryMapping(43, TorznabCatType.AudioAudiobook); // Audio Books
+            AddCategoryMapping(27, TorznabCatType.Books); // Ebook
+            AddCategoryMapping(4,  TorznabCatType.PCGames); // Games
+            AddCategoryMapping(40, TorznabCatType.OtherMisc); // Miscellaneous
+            AddCategoryMapping(19, TorznabCatType.Movies); // Movies
+            AddCategoryMapping(6,  TorznabCatType.Audio); // Music
+            AddCategoryMapping(31, TorznabCatType.PCPhoneOther); // Portable
+            AddCategoryMapping(7,  TorznabCatType.TV); // TV
+        }
+
+        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        {
+            configData.LoadValuesFromJson(configJson);
+            var pairs = new Dictionary<string, string> {
+                { "username", configData.Username.Value },
+                { "password", configData.Password.Value },
+                { "login", "Login" },
+            };
+
+            var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, null, LoginUrl);
+            await ConfigureIfOK(result.Cookies, result.Content.Contains("logout.php"), () =>
+            {
+                CQ dom = result.Content;
+                var errorMessage = dom["td.mf_content"].Html();
+                throw new ExceptionWithConfigData(errorMessage, configData);
+            });
+            return IndexerConfigurationStatus.RequiresTesting;
+        }
+
+        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        {
+            List<ReleaseInfo> releases = new List<ReleaseInfo>();
+
+            var searchString = query.GetQueryString();
+            var searchUrl = SearchUrl;
+            var queryCollection = new NameValueCollection();
+            queryCollection.Add("incldead", "1");
+            queryCollection.Add("showspam", "1");
+
+            if (!string.IsNullOrWhiteSpace(searchString))
+            {
+                queryCollection.Add("search", searchString);
+            }
+
+            var cats = MapTorznabCapsToTrackers(query);
+            string cat = "0";
+            if (cats.Count == 1)
+            {
+                cat = cats[0];
+            }
+            queryCollection.Add("cat", cat);
+
+            searchUrl += "?" + queryCollection.GetQueryString();
+
+            var results = await RequestStringWithCookiesAndRetry(searchUrl);
+            try
+            {
+                CQ dom = results.Content;
+                var rows = dom["table[cellpadding=2] > tbody > tr:has(td.row3)"];
+                foreach (var row in rows)
+                {
+                    var release = new ReleaseInfo();
+                    release.MinimumRatio = 1;
+                    release.MinimumSeedTime = 48 * 60 * 60;
+                    
+                    var qRow = row.Cq();
+                    var qCatLink = qRow.Find("a[href^=browse.php?cat=]").First();
+                    var qDetailsLink = qRow.Find("a[href^=details.php?id=]").First();
+                    var qSeeders = qRow.Find("td:eq(9)");
+                    var qLeechers = qRow.Find("td:eq(10)");
+                    var qDownloadLink = qRow.Find("a[href^=download.php]").First();
+                    var qTimeAgo = qRow.Find("td:eq(5)");
+                    var qSize = qRow.Find("td:eq(7)");
+
+                    var catStr = qCatLink.Attr("href").Split('=')[1].Split('&')[0];
+                    release.Category = MapTrackerCatToNewznab(catStr);
+
+                    release.Link = new Uri(SiteLink + qDownloadLink.Attr("href"));
+                    release.Title = qDetailsLink.Attr("title").Trim();
+                    release.Comments = new Uri(SiteLink + qDetailsLink.Attr("href"));
+                    release.Guid = release.Link;
+
+                    var sizeStr = qSize.Text();
+                    release.Size = ReleaseInfo.GetBytes(sizeStr);
+
+                    release.Seeders = ParseUtil.CoerceInt(qSeeders.Text());
+                    release.Peers = ParseUtil.CoerceInt(qLeechers.Text()) + release.Seeders;
+
+                    var dateStr = qTimeAgo.Text();
+                    release.PublishDate = DateTimeUtil.FromTimeAgo(dateStr);
+
+                    releases.Add(release);
+                }
+            }
+            catch (Exception ex)
+            {
+                OnParseError(results.Content, ex);
+            }
+
+            return releases;
+        }
+    }
+}

src/Jackett/Indexers/Fuzer.cs

@@ -0,0 +1,295 @@
+using CsQuery;
+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.Globalization;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web;
+using Jackett.Models.IndexerConfig;
+using System.Collections.Specialized;
+using System.Threading;
+
+namespace Jackett.Indexers
+{
+    public class Fuzer : BaseIndexer, IIndexer
+    {
+        private string SearchUrl { get { return SiteLink + "index.php?name=torrents&"; } }
+        private string LoginUrl { get { return SiteLink + "login.php"; } }
+        private const int MAXPAGES = 3;
+
+        new ConfigurationDataBasicLogin configData
+        {
+            get { return (ConfigurationDataBasicLogin)base.configData; }
+            set { base.configData = value; }
+        }
+
+        public Fuzer(IIndexerManagerService i, Logger l, IWebClient w, IProtectionService ps)
+            : base(name: "Fuzer",
+                description: "Fuzer is a private torrent website with israeli torrents.",
+                link: "https://fuzer.me/",
+                manager: i,
+                client: w,
+                logger: l,
+                p: ps,
+                configData: new ConfigurationDataBasicLogin())
+        {
+            TorznabCaps.Categories.Clear();
+
+            AddMultiCategoryMapping(TorznabCatType.Movies, 7, 9, 58, 59, 60, 61, 83);
+            AddMultiCategoryMapping(TorznabCatType.MoviesSD, 7, 58);
+            AddMultiCategoryMapping(TorznabCatType.MoviesHD, 9, 59, 61);
+            AddMultiCategoryMapping(TorznabCatType.MoviesBluRay, 59);
+            AddMultiCategoryMapping(TorznabCatType.MoviesForeign, 83);
+            AddMultiCategoryMapping(TorznabCatType.MoviesDVD, 58);
+            AddMultiCategoryMapping(TorznabCatType.Movies3D, 9);
+            AddMultiCategoryMapping(TorznabCatType.MoviesWEBDL, 9);
+            AddMultiCategoryMapping(TorznabCatType.TV, 8, 10, 62, 63, 84);
+            AddMultiCategoryMapping(TorznabCatType.TVHD, 10, 63);
+            AddMultiCategoryMapping(TorznabCatType.TVFOREIGN, 62, 84);
+            AddMultiCategoryMapping(TorznabCatType.TVSport, 64);
+            AddMultiCategoryMapping(TorznabCatType.TVAnime, 65);
+            AddMultiCategoryMapping(TorznabCatType.TVWEBDL, 10, 63);
+            AddMultiCategoryMapping(TorznabCatType.TVSD, 8, 62, 84);
+            AddMultiCategoryMapping(TorznabCatType.TVDocumentary, 8, 10, 62, 63);
+            AddMultiCategoryMapping(TorznabCatType.Console, 12, 55, 56, 57);
+            AddMultiCategoryMapping(TorznabCatType.ConsoleXbox, 55);
+            AddMultiCategoryMapping(TorznabCatType.ConsoleXbox360, 55);
+            AddMultiCategoryMapping(TorznabCatType.ConsoleXBOX360DLC, 55);
+            AddMultiCategoryMapping(TorznabCatType.ConsolePS3, 12);
+            AddMultiCategoryMapping(TorznabCatType.ConsolePS4, 12);
+            AddMultiCategoryMapping(TorznabCatType.ConsoleXboxOne, 55);
+            AddMultiCategoryMapping(TorznabCatType.ConsolePS4, 12);
+            AddMultiCategoryMapping(TorznabCatType.ConsoleWii, 56);
+            AddMultiCategoryMapping(TorznabCatType.ConsoleWiiwareVC, 56);
+            AddMultiCategoryMapping(TorznabCatType.ConsolePSP, 57);
+            AddMultiCategoryMapping(TorznabCatType.ConsoleNDS, 57);
+            AddMultiCategoryMapping(TorznabCatType.MoviesOther, 57);
+            AddMultiCategoryMapping(TorznabCatType.PC, 11, 15);
+            AddMultiCategoryMapping(TorznabCatType.PCGames, 11);
+            AddMultiCategoryMapping(TorznabCatType.PCMac, 71);
+            AddMultiCategoryMapping(TorznabCatType.PCPhoneAndroid, 13);
+            AddMultiCategoryMapping(TorznabCatType.PCPhoneIOS, 70);
+            AddMultiCategoryMapping(TorznabCatType.Audio, 14, 66, 67, 68);
+            AddMultiCategoryMapping(TorznabCatType.AudioForeign, 14);
+            AddMultiCategoryMapping(TorznabCatType.AudioLossless, 67);
+            AddMultiCategoryMapping(TorznabCatType.AudioAudiobook, 69);
+            AddMultiCategoryMapping(TorznabCatType.AudioOther, 68);
+            AddMultiCategoryMapping(TorznabCatType.Other, 17);
+            AddMultiCategoryMapping(TorznabCatType.XXX, 16);
+        }
+
+        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        {
+            configData.LoadValuesFromJson(configJson);
+            var loginPage = await RequestStringWithCookies(LoginUrl, string.Empty);
+
+            var pairs = new Dictionary<string, string> {
+                { "vb_login_username", configData.Username.Value },
+                { "vb_login_password", "" },
+                { "securitytoken", "guest" },
+                { "do","login"},
+                { "vb_login_md5password", StringUtil.Hash(configData.Password.Value).ToLower()},
+                { "vb_login_md5password_utf", StringUtil.Hash(configData.Password.Value).ToLower()},
+                { "cookieuser", "1" }
+            };
+
+            var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, loginPage.Cookies, true, null, LoginUrl);
+
+            await ConfigureIfOK(result.Cookies, result.Content != null && result.Content.Contains("images/loading.gif"), () =>
+            {
+                var errorMessage = "Couldn't login";
+                throw new ExceptionWithConfigData(errorMessage, configData);
+            });
+            Thread.Sleep(2);
+            return IndexerConfigurationStatus.RequiresTesting;
+        }
+
+        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        {
+            var results = await performRegularQuery(query);
+            if (results.Count() == 0)
+            {
+                return await performHebrewQuery(query);
+            }
+
+            return results;
+        }
+
+        private async Task<IEnumerable<ReleaseInfo>> performHebrewQuery(TorznabQuery query)
+        {
+            var name = await getHebName(query.SearchTerm);
+
+            if (string.IsNullOrEmpty(name))
+            {
+                return new List<ReleaseInfo>();
+            }
+            else
+            {
+                return await performRegularQuery(query, name);
+            }
+        }
+
+        private async Task<IEnumerable<ReleaseInfo>> performRegularQuery(TorznabQuery query, string hebName = null)
+        {
+            var releases = new List<ReleaseInfo>();
+            var searchurls = new List<string>();
+            var searchUrl = SearchUrl;
+            var queryCollection = new NameValueCollection();
+            var searchString = query.GetQueryString();
+
+            if (hebName != null)
+            {
+                searchString = hebName + " - עונה " + query.Season + " פרק " + query.Episode;
+            }
+
+            int categoryCounter = 1;
+            foreach (var cat in MapTorznabCapsToTrackers(query))
+            {
+                searchUrl += "c" + categoryCounter.ToString() + "=" + cat + "&";
+                categoryCounter++;
+            }
+
+
+            if (string.IsNullOrWhiteSpace(searchString))
+            {
+                searchUrl = SiteLink + "index.php?name=torrents";
+            }
+            else
+            {
+                var strEncoded = HttpUtility.UrlEncode(searchString, Encoding.GetEncoding("Windows-1255"));
+                searchUrl += "text=" + strEncoded + "&category=0&search=1";
+            }
+
+            var data = await RequestBytesWithCookiesAndRetry(searchUrl);
+            var results = Encoding.GetEncoding("Windows-1255").GetString(data.Content);
+            try
+            {
+                CQ dom = results;
+                ReleaseInfo release;
+
+                int rowCount = 0;
+                var rows = dom["#collapseobj_module_17 > tr"];
+                foreach (var row in rows)
+                {
+                    CQ qRow = row.Cq();
+                    if (rowCount < 1 || qRow.Children().Count() != 9) //skip 1 row because there's an empty row 
+                    {
+                        rowCount++;
+                        continue;
+                    }
+
+                    release = new ReleaseInfo();
+                    release.Description = qRow.Find("td:nth-child(2) > a").Text(); ;
+
+                    if (hebName != null)
+                    {
+                        release.Title = query.SearchTerm + " " + release.Description.Substring(release.Description.IndexOf(string.Format("S{0:D2}E{1:D2}", query.Season, int.Parse(query.Episode))));
+                    }
+                    else
+                    {
+                        const string DELIMITER = " | ";
+                        release.Title = release.Description.Substring(release.Description.IndexOf(DELIMITER) + DELIMITER.Length);
+                    }
+
+                    release.MinimumRatio = 1;
+                    release.MinimumSeedTime = 172800;
+
+                    int seeders, peers;
+                    if (ParseUtil.TryCoerceInt(qRow.Find("td:nth-child(7) > div").Text(), out seeders))
+                    {
+                        release.Seeders = seeders;
+                        if (ParseUtil.TryCoerceInt(qRow.Find("td:nth-child(8) > div").Text(), out peers))
+                        {
+                            release.Peers = peers + release.Seeders;
+                        }
+                    }
+
+                    string fullSize = qRow.Find("td:nth-child(5) > div").Text();
+                    release.Size = ReleaseInfo.GetBytes(fullSize);
+
+                    release.Guid = new Uri(qRow.Find("td:nth-child(2) > a").Attr("href"));
+                    release.Link = new Uri(SiteLink + qRow.Find("td:nth-child(3) > a").Attr("href"));
+                    release.Comments = release.Guid;
+
+                    string[] dateSplit = qRow.Find("td:nth-child(2) > span.torrentstime").Text().Split(' ');
+                    string dateString = dateSplit[1] + " " + dateSplit[3];
+                    release.PublishDate = DateTime.ParseExact(dateString, "dd-MM-yy HH:mm", CultureInfo.InvariantCulture);
+
+                    string category = qRow.Find("script:nth-child(1)").Text();
+                    int index = category.IndexOf("category=");
+                    if (index == -1)
+                    {
+                        /// Other type
+                        category = "17";
+                    }
+                    else
+                    {
+                        category = category.Substring(index + "category=".Length, 2);
+                        if (category[1] == '\\')
+                        {
+                            category = category[0].ToString();
+                        }
+                    }
+
+                    release.Category = MapTrackerCatToNewznab(category);
+                    releases.Add(release);
+                }
+            }
+            catch (Exception ex)
+            {
+                OnParseError(results, ex);
+            }
+
+            return releases;
+        }
+
+        private async Task<string> getHebName(string searchTerm)
+        {
+            const string site = "http://thetvdb.com";
+            var url = site + "/index.php?searchseriesid=&tab=listseries&function=Search&";
+            url += "string=" + searchTerm; // eretz + nehedert
+
+
+            var results = await RequestStringWithCookies(url);
+
+            CQ dom = results.Content;
+
+            int rowCount = 0;
+            var rows = dom["#listtable > tbody > tr"];
+
+            foreach (var row in rows)
+            {
+                if (rowCount < 1)
+                {
+                    rowCount++;
+                    continue;
+                }
+
+                CQ qRow = row.Cq();
+                CQ link = qRow.Find("td:nth-child(1) > a");
+                if (link.Text().Trim().ToLower() == searchTerm.Trim().ToLower())
+                {
+                    var address = link.Attr("href");
+                    if (string.IsNullOrEmpty(address)) { continue; }
+
+                    var realAddress = site + address.Replace("lid=7", "lid=24");
+                    var realData = await RequestStringWithCookies(realAddress);
+
+                    CQ realDom = realData.Content;
+                    return realDom["#content:nth-child(1) > h1"].Text();
+                }
+            }
+
+            return string.Empty;
+        }
+    }
+}

src/Jackett/Indexers/GhostCity.cs

@@ -0,0 +1,179 @@
+using CsQuery;
+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.Collections.Specialized;
+using System.Globalization;
+using System.Linq;
+using System.Threading.Tasks;
+using Jackett.Models.IndexerConfig;
+
+namespace Jackett.Indexers
+{
+    public class GhostCity : BaseIndexer, IIndexer
+    {
+        string LoginUrl { get { return SiteLink + "takelogin.php"; } }
+        string BrowsePage { get { return SiteLink + "browse.php"; } }
+
+        new ConfigurationDataBasicLoginWithRSSAndDisplay configData
+        {
+            get { return (ConfigurationDataBasicLoginWithRSSAndDisplay)base.configData; }
+            set { base.configData = value; }
+        }
+
+        public GhostCity(IIndexerManagerService i, IWebClient wc, Logger l, IProtectionService ps)
+                : base(name: "Ghost City",
+                description: "A German general tracker",
+                link: "http://ghostcity.dyndns.info/",
+                caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
+                manager: i,
+                client: wc,
+                logger: l,
+                p: ps,
+                configData: new ConfigurationDataBasicLoginWithRSSAndDisplay())
+        {
+            this.configData.DisplayText.Value = "Only the results from the first search result page are shown, adjust your profile settings to show the maximum.";
+            this.configData.DisplayText.Name = "Notice";
+            AddMultiCategoryMapping(TorznabCatType.TVAnime, 8, 34, 35, 36);
+            AddMultiCategoryMapping(TorznabCatType.TVDocumentary, 12, 44, 106, 45, 46, 47);
+            AddMultiCategoryMapping(TorznabCatType.Console, 92, 93, 95, 96, 97);
+            AddMultiCategoryMapping(TorznabCatType.ConsoleNDS, 92);
+            AddMultiCategoryMapping(TorznabCatType.ConsolePS3, 95);
+            AddMultiCategoryMapping(TorznabCatType.ConsolePS4, 95);
+            AddMultiCategoryMapping(TorznabCatType.ConsolePS4, 95);
+            AddMultiCategoryMapping(TorznabCatType.ConsolePSP, 95);
+            AddMultiCategoryMapping(TorznabCatType.ConsoleXbox, 97);
+            AddMultiCategoryMapping(TorznabCatType.ConsoleXbox360, 97);
+            AddMultiCategoryMapping(TorznabCatType.ConsoleXBOX360DLC, 97);
+            AddMultiCategoryMapping(TorznabCatType.ConsoleXboxOne, 97);
+            AddMultiCategoryMapping(TorznabCatType.ConsoleWii, 96);
+            AddMultiCategoryMapping(TorznabCatType.PC, 20, 94, 40);
+            AddMultiCategoryMapping(TorznabCatType.PCGames, 94);
+            AddMultiCategoryMapping(TorznabCatType.PCMac, 39);
+            AddMultiCategoryMapping(TorznabCatType.PCPhoneOther, 37, 38);
+            AddMultiCategoryMapping(TorznabCatType.TVSport, 22, 98, 99, 100, 101);
+            AddMultiCategoryMapping(TorznabCatType.Movies, 68, 69, 70, 102, 104, 103, 72, 71, 73, 74, 75, 77, 78, 79);
+            AddMultiCategoryMapping(TorznabCatType.MoviesSD, 68, 69, 102, 104, 103, 72, 71, 73, 74);
+            AddMultiCategoryMapping(TorznabCatType.MoviesHD, 75, 76, 77, 78, 79);
+            AddMultiCategoryMapping(TorznabCatType.MoviesOther, 73);
+            AddMultiCategoryMapping(TorznabCatType.MoviesBluRay, 70);
+            AddMultiCategoryMapping(TorznabCatType.MoviesDVD, 102, 104, 103, 72, 71);
+            AddMultiCategoryMapping(TorznabCatType.Movies3D, 69);
+            AddMultiCategoryMapping(TorznabCatType.AudioVideo, 109);
+            AddMultiCategoryMapping(TorznabCatType.TV, 8, 34, 35, 36, 23, 90, 88, 107, 89);
+            AddMultiCategoryMapping(TorznabCatType.TVHD, 107);
+            AddMultiCategoryMapping(TorznabCatType.TVSD, 89);
+            AddMultiCategoryMapping(TorznabCatType.XXX, 25);
+            AddMultiCategoryMapping(TorznabCatType.TVDocumentary, 88);
+            AddMultiCategoryMapping(TorznabCatType.AudioAudiobook, 84);
+            AddMultiCategoryMapping(TorznabCatType.BooksEbook, 83);
+            AddMultiCategoryMapping(TorznabCatType.BooksMagazines, 85);
+            AddMultiCategoryMapping(TorznabCatType.BooksOther, 108);
+            AddMultiCategoryMapping(TorznabCatType.Other, 3, 93, 24);
+        }
+
+        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        {
+            configData.LoadValuesFromJson(configJson);
+
+            var pairs = new Dictionary<string, string> {
+                { "username", configData.Username.Value },
+                { "password", configData.Password.Value }
+            };
+
+            var result1 = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, null, SiteLink);
+            CQ result1Dom = result1.Content;
+            var link = result1Dom[".trow2 a"].First();
+            var result2 = await RequestStringWithCookies(link.Attr("href"), result1.Cookies);
+            CQ result2Dom = result2.Content;
+
+            await ConfigureIfOK(result1.Cookies, result2.Content.Contains("/logout.php"), () =>
+            {
+                var errorMessage = "Login failed.";
+                throw new ExceptionWithConfigData(errorMessage, configData);
+            });
+            return IndexerConfigurationStatus.RequiresTesting;
+        }
+
+        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        {
+            var releases = new List<ReleaseInfo>();
+            var searchString = query.GetQueryString();
+            var searchUrl = BrowsePage;
+            var queryCollection = new NameValueCollection();
+
+            queryCollection.Add("do", "search");
+
+            if (!string.IsNullOrWhiteSpace(searchString))
+            {
+                queryCollection.Add("keywords", searchString);
+            }
+
+            queryCollection.Add("search_type", "t_name");
+
+            // FIXME: Tracker doesn't support multi category search
+            foreach (var cat in MapTorznabCapsToTrackers(query))
+            {
+                queryCollection.Add("category", cat);
+            }
+
+            if (queryCollection.Count > 0)
+            {
+                searchUrl += "?" + queryCollection.GetQueryString();
+            }
+
+            var results = await RequestStringWithCookiesAndRetry(searchUrl);
+
+            try
+            {
+                CQ dom = results.Content;
+
+                var rows = dom["#sortabletable tr"];
+                foreach (var row in rows.Skip(1))
+                {
+                    var release = new ReleaseInfo();
+                    var qRow = row.Cq();
+                    release.Title = qRow.Find(".tooltip-content div").First().Text();
+                    if (string.IsNullOrWhiteSpace(release.Title))
+                        continue;
+                    release.Description = qRow.Find(".tooltip-content div").Get(1).InnerText.Trim();
+
+                    var qLink = row.Cq().Find("td:eq(2) a:eq(0)");
+                    release.Link = new Uri(qLink.Attr("href"));
+                    release.Guid = release.Link;
+                    release.Comments = new Uri(qRow.Find(".tooltip-target a").First().Attr("href"));
+
+                    var dateString = qRow.Find("td:eq(1) div").Last().Children().Remove().End().Text().Trim();
+                    release.PublishDate = DateTime.ParseExact(dateString, "dd-MM-yyyy HH:mm", CultureInfo.InvariantCulture);
+
+                    var sizeStr = qRow.Find("td:eq(4)").Text().Trim();
+                    release.Size = ReleaseInfo.GetBytes(sizeStr);
+
+                    release.Seeders = ParseUtil.CoerceInt(qRow.Find("td:eq(6)").Text().Trim());
+                    release.Peers = ParseUtil.CoerceInt(qRow.Find("td:eq(7)").Text().Trim()) + release.Seeders;
+
+                    var catLink = row.Cq().Find("td:eq(0) a").First().Attr("href");
+                    var catSplit = catLink.IndexOf("category=");
+                    if (catSplit > -1)
+                    {
+                        catLink = catLink.Substring(catSplit + 9);
+                    }
+
+                    release.Category = MapTrackerCatToNewznab(catLink);
+                    releases.Add(release);
+                }
+            }
+            catch (Exception ex)
+            {
+                OnParseError(results.Content, ex);
+            }
+
+            return releases;
+        }
+    }
+}

src/Jackett/Indexers/HDSpace.cs

@@ -39,7 +39,36 @@ namespace Jackett.Indexers
                 p: ps,
                 configData: new ConfigurationDataBasicLogin())
         {
-        }
+            AddCategoryMapping(15, TorznabCatType.MoviesBluRay); // Movie / Blu-ray
+            AddMultiCategoryMapping(TorznabCatType.MoviesHD,
+                19, // Movie / 1080p
+                41, // Movie / 4K UHD
+                18, // Movie / 720p
+                40, // Movie / Remux
+                16 // Movie / HD-DVD
+            );
+
+            AddMultiCategoryMapping(TorznabCatType.TVHD,
+                21, // TV Show / 720p HDTV
+                22 // TV Show / 1080p HDTV
+            );
+
+            AddCategoryMapping(30, TorznabCatType.AudioLossless); // Music / Lossless
+            AddCategoryMapping(31, TorznabCatType.AudioVideo); // Music / Videos
+            
+            AddMultiCategoryMapping(TorznabCatType.TVDocumentary,
+                24, // TV Show / Documentary / 720p
+                25 // TV Show / Documentary / 1080p
+            );
+            
+            AddMultiCategoryMapping(TorznabCatType.XXX,
+                33, // XXX / 720p
+                34 // XXX / 1080p
+            );
+            
+            AddCategoryMapping("37", TorznabCatType.PC);
+            AddCategoryMapping("38", TorznabCatType.Other);
+         }
 
         public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
         {

src/Jackett/Indexers/Hebits.cs

@@ -0,0 +1,151 @@
+using CsQuery;
+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.Globalization;
+using System.Threading.Tasks;
+using System.Web;
+using Jackett.Models.IndexerConfig;
+using System.Text.RegularExpressions;
+using System.Text;
+
+namespace Jackett.Indexers
+{
+    public class Hebits : BaseIndexer, IIndexer
+    {
+        private string LoginUrl { get { return SiteLink + "login.php"; } }
+        private string LoginPostUrl { get { return SiteLink + "takeloginAjax.php"; } }
+        private string SearchUrl { get { return SiteLink + "browse.php?sort=4&type=desc"; } }
+
+        new ConfigurationDataBasicLogin configData
+        {
+            get { return (ConfigurationDataBasicLogin)base.configData; }
+            set { base.configData = value; }
+        }
+
+        public Hebits(IIndexerManagerService i, Logger l, IWebClient wc, IProtectionService ps)
+            : base(name: "Hebits",
+                description: "The Israeli Tracker",
+                link: "https://hebits.net/",
+                caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
+                manager: i,
+                client: wc,
+                logger: l,
+                p: ps,
+                downloadBase: "https://hebits.net/",
+                configData: new ConfigurationDataBasicLogin())
+        {
+
+            AddCategoryMapping(19, TorznabCatType.MoviesSD);
+            AddCategoryMapping(25, TorznabCatType.MoviesOther); // Israeli Content
+            AddCategoryMapping(20, TorznabCatType.MoviesDVD);
+            AddCategoryMapping(36, TorznabCatType.MoviesBluRay);
+            AddCategoryMapping(27, TorznabCatType.MoviesHD);
+
+            AddCategoryMapping(7, TorznabCatType.TVSD); // Israeli SDTV
+            AddCategoryMapping(24, TorznabCatType.TVSD); // English SDTV
+            AddCategoryMapping(1, TorznabCatType.TVHD); // Israel HDTV
+            AddCategoryMapping(37, TorznabCatType.TVHD); // Israel HDTV
+        }
+
+        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        {
+            configData.LoadValuesFromJson(configJson);
+            var pairs = new Dictionary<string, string> {
+                { "username", configData.Username.Value },
+                { "password", configData.Password.Value }
+            };
+
+            // Get inital cookies
+            CookieHeader = string.Empty;
+            var result = await RequestLoginAndFollowRedirect(LoginPostUrl, pairs, CookieHeader, true, null, SiteLink);
+            await ConfigureIfOK(result.Cookies, result.Content != null && result.Content.Contains("OK"), () =>
+            {
+                CQ dom = result.Content;
+                var messageEl = dom["#errorMsg"].Last();
+                var errorMessage = messageEl.Text().Trim();
+                throw new ExceptionWithConfigData(errorMessage, configData);
+            });
+            return IndexerConfigurationStatus.RequiresTesting;
+        }
+
+        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        {
+            var releases = new List<ReleaseInfo>();
+            var searchString = query.GetQueryString();
+            var searchUrl = SearchUrl;
+
+            if (!string.IsNullOrWhiteSpace(searchString))
+            {
+                searchUrl += "&search=" + HttpUtility.UrlEncode(searchString);
+            }
+            string.Format(SearchUrl, HttpUtility.UrlEncode(searchString));
+
+            var cats = MapTorznabCapsToTrackers(query);
+            if (cats.Count > 0)
+            {
+                foreach (var cat in cats)
+                {
+                    searchUrl += "&c" + cat + "=1";
+                }
+            }
+
+            var response = await RequestBytesWithCookies(searchUrl);
+            var results = Encoding.GetEncoding("windows-1255").GetString(response.Content);
+            try
+            {
+                CQ dom = results;
+
+                CQ qRows = dom[".browse > div > div"];
+
+                foreach (var row in qRows)
+                {
+                    var release = new ReleaseInfo();
+
+                    var qRow = row.Cq();
+
+                    var debug = qRow.Html();
+
+                    release.MinimumRatio = 1;
+                    release.MinimumSeedTime = 172800;
+
+                    var titleParts = qRow.Find(".bTitle").Text().Split('/');
+                    if (titleParts.Length >= 2) 
+                        release.Title = titleParts[1].Trim();
+                    else
+                        release.Title = titleParts[0].Trim();
+
+                    release.Link = new Uri(SiteLink + qRow.Find("a").Attr("href"));
+                    release.Guid = release.Link;
+
+                    var dateString = qRow.Find("div:last-child").Text().Trim();
+                    var pattern = "\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}";
+                    var match = Regex.Match(dateString, pattern);
+                    if (match.Success)
+                    {
+                        release.PublishDate = DateTime.ParseExact(match.Value, "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture);
+                    }
+
+                    var sizeStr = qRow.Find(".bSize").Text();
+                    release.Size = ReleaseInfo.GetBytes(sizeStr);
+                    release.Seeders = ParseUtil.CoerceInt(qRow.Find(".bUping").Text().Trim());
+                    release.Peers = release.Seeders + ParseUtil.CoerceInt(qRow.Find(".bDowning").Text().Trim());
+
+                    releases.Add(release);
+                }
+            }
+
+            catch (Exception ex)
+            {
+                OnParseError(results, ex);
+            }
+
+            return releases;
+        }
+    }
+}

src/Jackett/Indexers/HouseOfTorrents.cs

@@ -0,0 +1,210 @@
+using CsQuery;
+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.Linq;
+using System.Threading.Tasks;
+using Jackett.Models.IndexerConfig;
+using System.Collections.Specialized;
+using System.Globalization;
+using System.Text.RegularExpressions;
+
+namespace Jackett.Indexers
+{
+    public class HouseOfTorrents : BaseIndexer, IIndexer
+    {
+        private string SearchUrl { get { return SiteLink + "browse.php"; } }
+        private string LoginUrl { get { return SiteLink + "takelogin.php"; } }
+        private string CaptchaUrl { get { return SiteLink + "simpleCaptcha.php?numImages=1"; } }
+
+        new ConfigurationDataBasicLoginWithRSSAndDisplay configData
+        {
+            get { return (ConfigurationDataBasicLoginWithRSSAndDisplay)base.configData; }
+            set { base.configData = value; }
+        }
+
+        public HouseOfTorrents(IIndexerManagerService i, Logger l, IWebClient w, IProtectionService ps)
+            : base(name: "House-of-Torrents",
+                description: "A general tracker",
+                link: "https://houseoftorrents.me/",
+                caps: new TorznabCapabilities(),
+                manager: i,
+                client: w,
+                logger: l,
+                p: ps,
+                configData: new ConfigurationDataBasicLoginWithRSSAndDisplay())
+        {
+            AddCategoryMapping(42, TorznabCatType.PCMac); // Applications/Mac
+            AddCategoryMapping(34, TorznabCatType.PC); // Applications/PC
+            AddCategoryMapping(66, TorznabCatType.MoviesForeign); // Foreign
+            AddCategoryMapping(38, TorznabCatType.MoviesForeign); // Foreign/French
+            AddCategoryMapping(39, TorznabCatType.MoviesForeign); // Foreign/German
+            AddCategoryMapping(40, TorznabCatType.MoviesForeign); // Foreign/Spanish
+            AddCategoryMapping(41, TorznabCatType.MoviesForeign); // Foreign/Swedish
+            AddCategoryMapping(67, TorznabCatType.ConsoleNDS); // Games/Nintendo
+            AddCategoryMapping(9 , TorznabCatType.PCGames); // Games/PC 
+            AddCategoryMapping(8,  TorznabCatType.ConsolePS3); // Games/PS3
+            AddCategoryMapping(30, TorznabCatType.ConsolePS4); // Games/PS4
+            AddCategoryMapping(7,  TorznabCatType.ConsolePSP); // Games/PSP
+            AddCategoryMapping(29, TorznabCatType.ConsoleWii); // Games/Wii
+            AddCategoryMapping(31, TorznabCatType.ConsoleXbox360); // Games/XBOX360
+            AddCategoryMapping(32, TorznabCatType.ConsoleXboxOne); // Games/XBOXONE
+            AddCategoryMapping(71, TorznabCatType.PCPhoneAndroid); // Mobile/Android
+            AddCategoryMapping(72, TorznabCatType.PCPhoneIOS); // Mobile/iOS
+            AddCategoryMapping(47, TorznabCatType.Movies3D); // Movies/3D
+            AddCategoryMapping(43, TorznabCatType.MoviesBluRay); // Movies/Bluray
+            AddCategoryMapping(84, TorznabCatType.MoviesSD); // Movies/Cam
+            AddCategoryMapping(44, TorznabCatType.MoviesDVD); // Movies/DVD-R
+            AddCategoryMapping(45, TorznabCatType.Movies); // Movies/MP4
+            AddCategoryMapping(69, TorznabCatType.Movies); // Movies/Packs
+            AddCategoryMapping(46, TorznabCatType.MoviesSD); // Movies/SD
+            AddCategoryMapping(11, TorznabCatType.MoviesHD); // Movies/x264
+            AddCategoryMapping(83, TorznabCatType.MoviesHD); // Movies/x265
+            AddCategoryMapping(10, TorznabCatType.MoviesOther); // Movies/XviD
+            AddCategoryMapping(36, TorznabCatType.AudioLossless); // Music/FLAC
+            AddCategoryMapping(12, TorznabCatType.AudioMP3); // Music/MP3
+            AddCategoryMapping(79, TorznabCatType.Audio); // Music/Pack
+            AddCategoryMapping(28, TorznabCatType.AudioVideo); // Music/Video
+            AddCategoryMapping(49, TorznabCatType.TVAnime); // Others/Anime
+            AddCategoryMapping(80, TorznabCatType.AudioAudiobook); // Others/AudioBook
+            AddCategoryMapping(60, TorznabCatType.Other); // Others/Boxsets
+            AddCategoryMapping(65, TorznabCatType.TVDocumentary); // Others/Documentary
+            AddCategoryMapping(61, TorznabCatType.Books); // Others/E-Book
+            AddCategoryMapping(51, TorznabCatType.Other); // Others/RARFIX
+            AddCategoryMapping(74, TorznabCatType.TVSport); // Sports
+            AddCategoryMapping(75, TorznabCatType.TVSport); // Sports/Boxing
+            AddCategoryMapping(76, TorznabCatType.TVSport); // Sports/Racing
+            AddCategoryMapping(77, TorznabCatType.TVSport); // Sports/UFC
+            AddCategoryMapping(78, TorznabCatType.TVSport); // Sports/WWE
+            AddCategoryMapping(68, TorznabCatType.TV); // TV/Packs
+            AddCategoryMapping(53, TorznabCatType.TVSD); // TV/SD
+            AddCategoryMapping(54, TorznabCatType.TVHD); // TV/x264
+            AddCategoryMapping(82, TorznabCatType.TVHD); // TV/x265
+            AddCategoryMapping(55, TorznabCatType.TVOTHER); // Tv/XviD
+            AddCategoryMapping(63, TorznabCatType.XXX); // XXX
+            AddCategoryMapping(57, TorznabCatType.XXX); // XXX/0-DAY
+            AddCategoryMapping(58, TorznabCatType.XXXImageset); // XXX/IMAGESET
+            AddCategoryMapping(81, TorznabCatType.XXXPacks); // XXX/Pack
+        }
+
+        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        {
+            configData.LoadValuesFromJson(configJson);
+
+            var result1 = await RequestStringWithCookies(CaptchaUrl);
+            var json1 = JObject.Parse(result1.Content);
+            var captchaSelection = json1["images"][0]["hash"];
+
+            var pairs = new Dictionary<string, string> {
+                { "username", configData.Username.Value },
+                { "password", configData.Password.Value },
+                { "captchaSelection", (string)captchaSelection },
+                { "submitme", "X" }
+            };
+
+            var result2 = await RequestLoginAndFollowRedirect(LoginUrl, pairs, result1.Cookies, true, null, null, true);
+
+            await ConfigureIfOK(result2.Cookies, result2.Content.Contains("logout.php"), () =>
+            {
+                var errorMessage = result2.Content;
+                throw new ExceptionWithConfigData(errorMessage, configData);
+            });
+            return IndexerConfigurationStatus.RequiresTesting;
+        }
+
+        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        {
+            List<ReleaseInfo> releases = new List<ReleaseInfo>();
+
+            var searchString = query.GetQueryString();
+            var searchUrl = SearchUrl;
+            var queryCollection = new NameValueCollection();
+            queryCollection.Add("searchin", "title");
+            queryCollection.Add("incldead", "1");
+            if (!string.IsNullOrWhiteSpace(searchString))
+            {
+                // use AND+wildcard operator to avoid getting to many useless results
+                var searchStringArray = Regex.Split(searchString.Trim(), "[ _.-]+", RegexOptions.Compiled).ToList();
+                searchStringArray = searchStringArray.Where(x => x.Length >= 3).ToList(); //  remove words with less than 3 characters
+                searchStringArray = searchStringArray.Select(x => "+" + x).ToList(); // add AND operators+wildcards
+                var searchStringFinal = String.Join("", searchStringArray);
+                queryCollection.Add("search", searchStringFinal);
+            }
+
+            foreach (var cat in MapTorznabCapsToTrackers(query))
+            {
+                queryCollection.Add("c" + cat, "1");
+            }
+
+            searchUrl += "?" + queryCollection.GetQueryString();
+
+            var results = await RequestStringWithCookiesAndRetry(searchUrl);
+            try
+            {
+                CQ dom = results.Content;
+                var rows = dom["table.tt > tbody > tr"];
+                foreach (var row in rows.Skip(1))
+                {
+                    var release = new ReleaseInfo();
+                    release.MinimumRatio = 1;
+                    release.MinimumSeedTime = 72 * 60 * 60;
+
+                    var qRow = row.Cq();
+
+                    var qDetailsLink = qRow.Find("a[href^=details.php?id=]").First();
+                    release.Title = qDetailsLink.Text().Trim();
+
+                    // HoT search returns should support AND search but it simply doesn't work, so we AND filter it manualy
+                    if (!query.MatchQueryStringAND(release.Title))
+                        continue;
+
+                    var qCatLink = qRow.Find("a[href^=browse.php?cat=]").First();
+                    var qSeeders = qRow.Find("td:eq(8)");
+                    var qLeechers = qRow.Find("td:eq(9)");
+                    var qDownloadLink = qRow.Find("a[href^=download.php]").First();
+                    var qTimeAgo = qRow.Find("td:eq(5)");
+                    var qSize = qRow.Find("td:eq(6)");
+
+                    var catStr = qCatLink.Attr("href").Split('=')[1];
+                    release.Category = MapTrackerCatToNewznab(catStr);
+
+                    release.Link = new Uri(SiteLink + qDownloadLink.Attr("href"));
+                    release.Comments = new Uri(SiteLink + qDetailsLink.Attr("href"));
+                    release.Guid = release.Link;
+
+                    var sizeStr = qSize.Text();
+                    release.Size = ReleaseInfo.GetBytes(sizeStr);
+
+                    release.Seeders = ParseUtil.CoerceInt(qSeeders.Text());
+                    release.Peers = ParseUtil.CoerceInt(qLeechers.Text()) + release.Seeders;
+
+                    var dateStr = qTimeAgo.Text();
+                    DateTime pubDateUtc;
+                    var Timeparts = dateStr.Split(new char[] { ' ' }, 2)[1];
+                    if (dateStr.StartsWith("Today "))
+                        pubDateUtc = DateTime.SpecifyKind(DateTime.UtcNow.Date, DateTimeKind.Unspecified) + DateTime.ParseExact(dateStr.Split(new char[] { ' ' }, 2)[1], "hh:mm tt", System.Globalization.CultureInfo.InvariantCulture).TimeOfDay;
+                    else if (dateStr.StartsWith("Yesterday "))
+                        pubDateUtc = DateTime.SpecifyKind(DateTime.UtcNow.Date, DateTimeKind.Unspecified) +
+                            DateTime.ParseExact(dateStr.Split(new char[] { ' ' }, 2)[1], "hh:mm tt", System.Globalization.CultureInfo.InvariantCulture).TimeOfDay - TimeSpan.FromDays(1);
+                    else
+                        pubDateUtc = DateTime.SpecifyKind(DateTime.ParseExact(dateStr, "MMM d yyyy hh:mm tt", CultureInfo.InvariantCulture), DateTimeKind.Unspecified);
+
+                    release.PublishDate = pubDateUtc.ToLocalTime();
+
+                    releases.Add(release);
+                }
+            }
+            catch (Exception ex)
+            {
+                OnParseError(results.Content, ex);
+            }
+
+            return releases;
+        }
+    }
+}

src/Jackett/Indexers/ILoveTorrents.cs

@@ -0,0 +1,182 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using CsQuery;
+using CsQuery.ExtensionMethods.Internal;
+using Jackett.Models;
+using Jackett.Models.IndexerConfig;
+using Jackett.Services;
+using Jackett.Utils;
+using Jackett.Utils.Clients;
+using Newtonsoft.Json.Linq;
+using NLog;
+
+namespace Jackett.Indexers
+{
+    // ReSharper disable once InconsistentNaming
+    public class ILoveTorrents : BaseIndexer, IIndexer
+    {
+        private string BrowseUrl => SiteLink + "browse.php";
+        private string LoginUrl => SiteLink + "takelogin.php";
+
+        new ConfigurationDataBasicLogin configData
+        {
+            get { return (ConfigurationDataBasicLogin)base.configData; }
+            set { base.configData = value; }
+        }
+
+        public ILoveTorrents(IIndexerManagerService i, IWebClient wc, Logger l, IProtectionService ps)
+            : base(name: "ILoveTorrents",
+                description: "ILT",
+                link: "https://www.ilovetorrents.me/",
+                caps: new TorznabCapabilities(),
+                manager: i,
+                client: wc,
+                logger: l,
+                p: ps,
+                configData: new ConfigurationDataBasicLogin())
+        {
+
+            AddCategoryMapping(85, TorznabCatType.Movies3D);
+            AddCategoryMapping(23, TorznabCatType.TVAnime);
+            AddCategoryMapping(24, TorznabCatType.BooksEbook);
+            AddCategoryMapping(4, TorznabCatType.PCGames);
+            AddCategoryMapping(38, TorznabCatType.ConsolePS3);
+            AddCategoryMapping(38, TorznabCatType.ConsolePS4);
+            AddCategoryMapping(38, TorznabCatType.ConsolePSP);
+            AddCategoryMapping(43, TorznabCatType.ConsoleWii);
+            AddCategoryMapping(43, TorznabCatType.ConsoleWiiU);
+            AddCategoryMapping(12, TorznabCatType.ConsoleXBOX360DLC);
+            AddCategoryMapping(12, TorznabCatType.ConsoleXbox);
+            AddCategoryMapping(12, TorznabCatType.ConsoleXbox360);
+            AddCategoryMapping(12, TorznabCatType.ConsoleXboxOne);
+            AddCategoryMapping(6, TorznabCatType.Audio);
+
+            AddCategoryMapping(7, TorznabCatType.TV);
+            AddCategoryMapping(40, TorznabCatType.TVSD);
+            AddCategoryMapping(8, TorznabCatType.TVHD);
+
+            AddCategoryMapping(9, TorznabCatType.XXX);
+            AddCategoryMapping(11, TorznabCatType.XXXDVD);
+            AddCategoryMapping(10, TorznabCatType.XXXx264);
+
+            AddCategoryMapping(80, TorznabCatType.MoviesBluRay);
+            AddCategoryMapping(20, TorznabCatType.MoviesDVD);
+            AddCategoryMapping(41, TorznabCatType.MoviesHD);
+            AddCategoryMapping(19, TorznabCatType.Movies);
+        }
+
+        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        {
+            configData.LoadValuesFromJson(configJson);
+            var pairs = new Dictionary<string, string> {
+                { "username", configData.Username.Value },
+                { "password", configData.Password.Value },
+                { "returnto", "/" },
+                { "login", "Log in!" }
+            };
+
+            var loginPage = await RequestStringWithCookies(SiteLink, string.Empty);
+
+            var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, loginPage.Cookies, true, SiteLink, SiteLink);
+            await ConfigureIfOK(result.Cookies, result.Content != null && result.Content.Contains("logout.php"), () =>
+            {
+                CQ dom = result.Content;
+                var messageEl = dom["body > div"].First();
+                var errorMessage = messageEl.Text().Trim();
+                throw new ExceptionWithConfigData(errorMessage, configData);
+            });
+            return IndexerConfigurationStatus.RequiresTesting;
+        }
+
+        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        {
+            var releases = new List<ReleaseInfo>();
+            var searchString = query.GetQueryString();
+            var searchUrl = BrowseUrl;
+            var trackerCats = MapTorznabCapsToTrackers(query);
+            var queryCollection = new NameValueCollection();
+
+            // Tracker can only search OR return things in categories
+            if (!string.IsNullOrWhiteSpace(searchString))
+            {
+                queryCollection.Add("search", searchString);
+                queryCollection.Add("cat", "0");
+            }
+            else
+            {
+                foreach (var cat in MapTorznabCapsToTrackers(query))
+                {
+                    queryCollection.Add("c" + cat, "1");
+                }
+
+                queryCollection.Add("incldead", "0");
+            }
+
+            searchUrl += "?" + queryCollection.GetQueryString();
+
+            await ProcessPage(releases, searchUrl);
+            return releases;
+        }
+
+        private async Task ProcessPage(List<ReleaseInfo> releases, string searchUrl)
+        {
+            var response = await RequestStringWithCookiesAndRetry(searchUrl, null, BrowseUrl);
+            var results = response.Content;
+            try
+            {
+                CQ dom = results;
+
+                var rows = dom[".koptekst tr"];
+                foreach (var row in rows.Skip(1))
+                {
+                    var release = new ReleaseInfo();
+
+                    var link = row.Cq().Find("td:eq(1) a:eq(0)").First();
+                    release.Guid = new Uri(SiteLink + link.Attr("href"));
+                    release.Comments = release.Guid;
+                    release.Title = link.Text().Trim(); 
+                    release.Description = release.Title;
+
+                    // If we search an get no results, we still get a table just with no info.
+                    if (string.IsNullOrWhiteSpace(release.Title))
+                    {
+                        break;
+                    }
+
+                    // Check if the release has been assigned a category
+                    if (row.Cq().Find("td:eq(0) a").Length > 0)
+                    {
+                        var cat = row.Cq().Find("td:eq(0) a").First().Attr("href").Substring(15);
+                        release.Category = MapTrackerCatToNewznab(cat);
+                    }
+
+                    var qLink = row.Cq().Find("td:eq(2) a").First();
+                    release.Link = new Uri(SiteLink + qLink.Attr("href"));
+
+                    var added = row.Cq().Find("td:eq(7)").First().Text().Trim();
+                    var date = added.Substring(0, 10);
+                    var time = added.Substring(12, 8);
+                    var dateTime = date + time;
+                    release.PublishDate = DateTime.ParseExact(dateTime, "yyyy-MM-ddHH:mm:ss", CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal).ToLocalTime();
+
+                    var sizeStr = row.Cq().Find("td:eq(8)").First().Text().Trim();
+                    release.Size = ReleaseInfo.GetBytes(sizeStr);
+
+                    release.Seeders = ParseUtil.CoerceInt(row.Cq().Find("td:eq(10)").First().Text().Trim());
+                    release.Peers = ParseUtil.CoerceInt(row.Cq().Find("td:eq(11)").First().Text().Trim()) + release.Seeders;
+
+                    releases.Add(release);
+                }
+            }
+            catch (Exception ex)
+            {
+                OnParseError(results, ex);
+            }
+        }
+    }
+}

src/Jackett/Indexers/IPTorrents.cs

@@ -21,11 +21,13 @@ namespace Jackett.Indexers
 {
     public class IPTorrents : BaseIndexer, IIndexer
     {
-        private string BrowseUrl { get { return SiteLink + "t"; } }
+        private string UseLink { get { return (!String.IsNullOrEmpty(this.configData.AlternateLink.Value) ? this.configData.AlternateLink.Value : SiteLink); } }
+        private string BrowseUrl { get { return UseLink + "t"; } }
+        private List<String> KnownURLs = new List<String> { "https://nemo.iptorrents.com/", "https://ipt.rocks/" };
 
-        new ConfigurationDataBasicLogin configData
+        new ConfigurationDataBasicLoginWithAlternateLink configData
         {
-            get { return (ConfigurationDataBasicLogin)base.configData; }
+            get { return (ConfigurationDataBasicLoginWithAlternateLink)base.configData; }
             set { base.configData = value; }
         }
 
@@ -38,8 +40,12 @@ namespace Jackett.Indexers
                 client: wc,
                 logger: l,
                 p: ps,
-                configData: new ConfigurationDataBasicLogin())
+                configData: new ConfigurationDataBasicLoginWithAlternateLink())
         {
+            this.configData.Instructions.Value = this.DisplayName + " has multiple URLs.  The default (" + this.SiteLink + ") can be changed by entering a new value in the box below.";
+            this.configData.Instructions.Value += "The following are some known URLs for " + this.DisplayName;
+            this.configData.Instructions.Value += "<ul><li>" + String.Join("</li><li>", this.KnownURLs.ToArray()) + "</li></ul>";
+
             AddCategoryMapping(72, TorznabCatType.Movies);
             AddCategoryMapping(77, TorznabCatType.MoviesSD);
             AddCategoryMapping(89, TorznabCatType.MoviesSD);
@@ -92,9 +98,9 @@ namespace Jackett.Indexers
             };
             var request = new Utils.Clients.WebRequest()
             {
-                Url = SiteLink,
+                Url = UseLink,
                 Type = RequestType.POST,
-                Referer = SiteLink,
+                Referer = UseLink,
                 PostData = pairs
             };
             var response = await webclient.GetString(request);
@@ -141,7 +147,7 @@ namespace Jackett.Indexers
             {
                 CQ dom = results;
 
-                var rows = dom["table.torrents > tbody > tr"];
+                var rows = dom["table[id='torrents'] > tbody > tr"];
                 foreach (var row in rows.Skip(1))
                 {
                     var release = new ReleaseInfo();
@@ -156,7 +162,7 @@ namespace Jackett.Indexers
                     }
 
                     release.Description = release.Title;
-                    release.Guid = new Uri(SiteLink + qTitleLink.Attr("href").Substring(1));
+                    release.Guid = new Uri(UseLink + qTitleLink.Attr("href").Substring(1));
                     release.Comments = release.Guid;
 
                     var descString = qRow.Find(".t_ctime").Text();
@@ -165,7 +171,7 @@ namespace Jackett.Indexers
                     release.PublishDate = DateTimeUtil.FromTimeAgo(dateString);
 
                     var qLink = row.ChildElements.ElementAt(3).Cq().Children("a");
-                    release.Link = new Uri(SiteLink + qLink.Attr("href").TrimStart('/'));
+                    release.Link = new Uri(UseLink + HttpUtility.UrlEncode(qLink.Attr("href").TrimStart('/')));
 
                     var sizeStr = row.ChildElements.ElementAt(5).Cq().Text();
                     release.Size = ReleaseInfo.GetBytes(sizeStr);

src/Jackett/Indexers/MoreThanTV.cs

@@ -1,36 +1,30 @@
-using CsQuery;
-using Jackett.Models;
+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.IO;
+using System.Globalization;
 using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Web;
+using AngleSharp.Dom;
+using AngleSharp.Parser.Html;
+using CsQuery;
 using Jackett.Models.IndexerConfig;
 
 namespace Jackett.Indexers
 {
     public class MoreThanTV : BaseIndexer, IIndexer
     {
-        private string LoginUrl { get { return SiteLink + "login.php"; } }
-        private string SearchUrl { get { return SiteLink + "ajax.php?action=browse&searchstr="; } }
-        private string DownloadUrl { get { return SiteLink + "torrents.php?action=download&id="; } }
-        private string GuidUrl { get { return SiteLink + "torrents.php?torrentid="; } }
+        private string LoginUrl => SiteLink + "login.php";
+        private string SearchUrl => SiteLink + "ajax.php?action=browse&searchstr=";
+        private string DownloadUrl => SiteLink + "torrents.php?action=download&id=";
+        private string GuidUrl => SiteLink + "torrents.php?torrentid=";
 
-        new ConfigurationDataBasicLogin configData
-        {
-            get { return (ConfigurationDataBasicLogin)base.configData; }
-            set { base.configData = value; }
-        }
+        private ConfigurationDataBasicLogin ConfigData => (ConfigurationDataBasicLogin) configData;
 
         public MoreThanTV(IIndexerManagerService i, IWebClient c, Logger l, IProtectionService ps)
             : base(name: "MoreThanTV",
@@ -48,111 +42,231 @@ namespace Jackett.Indexers
 
         public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
         {
-            configData.LoadValuesFromJson(configJson);
+            ConfigData.LoadValuesFromJson(configJson);
             var pairs = new Dictionary<string, string> {
-                { "username", configData.Username.Value },
-                { "password", configData.Password.Value },
+                { "username", ConfigData.Username.Value },
+                { "password", ConfigData.Password.Value },
                 { "login", "Log in" },
                 { "keeplogged", "1" }
             };
 
             var preRequest = await RequestStringWithCookiesAndRetry(LoginUrl, string.Empty);
-
             var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, preRequest.Cookies, true, SearchUrl, SiteLink);
+
             await ConfigureIfOK(result.Cookies, result.Content != null && result.Content.Contains("status\":\"success\""), () =>
             {
                 CQ dom = result.Content;
                 dom["#loginform > table"].Remove();
                 var errorMessage = dom["#loginform"].Text().Trim().Replace("\n\t", " ");
-                throw new ExceptionWithConfigData(errorMessage, configData);
+                throw new ExceptionWithConfigData(errorMessage, ConfigData);
             });
 
             return IndexerConfigurationStatus.RequiresTesting;
         }
 
-        private void FillReleaseInfoFromJson(ReleaseInfo release, JObject r)
-        {
-            var id = r["torrentId"];
-            release.Size = (long)r["size"];
-            release.Seeders = (int)r["seeders"];
-            release.Peers = (int)r["leechers"] + release.Seeders;
-            release.Guid = new Uri(GuidUrl + id);
-            release.Comments = release.Guid;
-
-            if ((string)r["category"] == "TV")
-            {
-                release.Category = TorznabCatType.TV.ID;
-            }
-            else if ((string)r["category"] == "Movies")
-            {
-                release.Category = TorznabCatType.Movies.ID;
-            }
-
-            release.Link = new Uri(DownloadUrl + id);
-        }
-
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
+            var isTv = Array.IndexOf(query.Categories, TorznabCatType.TV.ID) > -1;
             var releases = new List<ReleaseInfo>();
-            string qryString = query.GetQueryString();
+            var searchQuery = query.GetQueryString();
 
-            Match matchQry = new Regex(@".*\s[Ss]{1}\d{2}$").Match(qryString);
-            if (matchQry.Success)
+            await GetReleases(releases, query, searchQuery);
+
+            // Search for torrent groups
+            if (isTv)
             {
-                //If search string ends in S## eg. S03 (season search) add an asterix to search term
-                qryString += "*";
+                var seasonMatch = new Regex(@".*\s[Ss]{1}\d{2}").Match(query.GetQueryString());
+                if (seasonMatch.Success)
+                {
+                    var newSearchQuery = Regex.Replace(searchQuery, @"[Ss]{1}\d{2}", $"Season {query.Season}");
+
+                    await GetReleases(releases, query, newSearchQuery);
+                }
             }
 
-            var episodeSearchUrl = SearchUrl + HttpUtility.UrlEncode(qryString);
-            WebClientStringResult response = await RequestStringWithCookiesAndRetry(episodeSearchUrl);
+            return releases;
+        }
+
+        private string GetTorrentSearchUrl(int[] categories, string searchQuery)
+        {
+            var extra = "";
+
+            if (Array.IndexOf(categories, TorznabCatType.Movies.ID) > -1)
+                extra += "&filter_cat%5B1%5D=1";
+
+            if (Array.IndexOf(categories, TorznabCatType.TV.ID) > -1)
+                extra += "&filter_cat%5B2%5D=1";
+
+            return SiteLink + $"torrents.php?searchstr={HttpUtility.UrlEncode(searchQuery)}&tags_type=1&order_by=time&order_way=desc&group_results=1{extra}&action=basic&searchsubmit=1";
+        }
+
+        private async Task GetReleases(ICollection<ReleaseInfo> releases, TorznabQuery query, string searchQuery)
+        {
+            var searchUrl = GetTorrentSearchUrl(query.Categories, searchQuery);
+            var response = await RequestStringWithCookiesAndRetry(searchUrl);
 
             try
             {
-                string decodedResponse = WebUtility.HtmlDecode(response.Content);
-                var json = JObject.Parse(decodedResponse);
-                foreach (JObject r in json["response"]["results"])
+                var parser = new HtmlParser();
+                var document = parser.Parse(response.Content);
+                var groups = document.QuerySelectorAll(".torrent_table > tbody > tr.group");
+                var torrents = document.QuerySelectorAll(".torrent_table > tbody > tr.torrent");
+
+                // Loop through all torrent (season) groups
+                foreach (var group in groups)
                 {
-                    DateTime pubDate = DateTime.MinValue;
-                    double dateNum;
-                    if (double.TryParse((string)r["groupTime"], out dateNum))
+                    var showName = group.QuerySelector(".tp-showname a").InnerHtml.Replace("(", "").Replace(")", "").Replace(' ', '.');
+                    var season = group.QuerySelector(".big_info a").InnerHtml;
+
+                    // Loop through all group items
+                    var previousElement = group;
+                    var qualityEdition = string.Empty;
+                    while (true)
                     {
-                        pubDate = DateTimeUtil.UnixTimestampToDateTime(dateNum);
-                        pubDate = DateTime.SpecifyKind(pubDate, DateTimeKind.Utc).ToLocalTime();
-                    }
+                        var groupItem = previousElement.NextElementSibling;
 
-                    string groupName = (string)r["groupName"];
+                        if (groupItem == null) break;
 
-                    if (r["torrents"] is JArray)
-                    {
-                        string showName = (string) r["artist"];
+                        if (!groupItem.ClassList[0].Equals("group_torrent") ||
+                            !groupItem.ClassList[1].StartsWith("groupid_")) break;
 
-                        foreach (JObject t in r["torrents"])
+                        // Found a new edition
+                        if (groupItem.ClassList[2].Equals("edition"))
                         {
-                            var release = new ReleaseInfo();
-                            release.PublishDate = pubDate;
-                            release.Title = $"{showName} {groupName}";
-                            release.Description = $"{showName} {groupName}";
-                            FillReleaseInfoFromJson(release, t);
-                            releases.Add(release);
+                            qualityEdition = groupItem.QuerySelector(".edition_info strong").TextContent.Split('/')[1].Trim();
                         }
+                        else if (groupItem.ClassList[2].StartsWith("edition_"))
+                        {
+                            if (qualityEdition.Equals(string.Empty)) break;
+
+                            // Parse required data
+                            var downloadAnchor = groupItem.QuerySelectorAll("td a").Last();
+                            var qualityData = downloadAnchor.InnerHtml.Split('/');
+
+                            if (qualityData.Length < 2)
+                                throw new Exception($"We expected 2 or more quality datas, instead we have {qualityData.Length}.");
+
+                            // Build title
+                            var title = string.Join(".", new List<string>
+                            {
+                                showName,
+                                SeasonToShortSeason(season),
+                                qualityData[1].Trim(),
+                                qualityEdition, // Audio quality should be after this one. Unobtainable at the moment.
+                                $"{qualityData[0].Trim()}-MTV"
+                            });
+                            
+                            releases.Add(GetReleaseInfo(groupItem, downloadAnchor, title, TorznabCatType.TV.ID));
+                        }
+                        else
+                        {
+                            break;
+                        }
+
+                        previousElement = groupItem;
+                    }
+                }
+
+                // Loop through all torrents
+                foreach (var torrent in torrents)
+                {
+                    // Parse required data
+                    var downloadAnchor = torrent.QuerySelector(".big_info > .group_info > a");
+                    var title = downloadAnchor.TextContent;
+
+                    int category;
+                    var categories = torrent.QuerySelector(".cats_col div").ClassList;
+                    if (categories.Contains("cats_tv"))
+                    {
+                        category = TorznabCatType.TV.ID;
+                    }
+                    else if (categories.Contains("cats_movies"))
+                    {
+                        category = TorznabCatType.Movies.ID;
                     }
                     else
                     {
-                        var release = new ReleaseInfo();
-                        release.PublishDate = pubDate;
-                        release.Title = groupName;
-                        release.Description = groupName;
-                        FillReleaseInfoFromJson(release, r);
-                        releases.Add(release);
+                        throw new Exception("Couldn't find category.");
                     }
+
+                    releases.Add(GetReleaseInfo(torrent, downloadAnchor, title, category));
                 }
             }
             catch (Exception ex)
             {
                 OnParseError(response.Content, ex);
             }
-
-            return releases;
         }
+
+        private ReleaseInfo GetReleaseInfo(IElement row, IElement downloadAnchor, string title, int category)
+        {
+            // Parse required data
+            var downloadAnchorHref = downloadAnchor.Attributes["href"].Value;
+            var torrentId = downloadAnchorHref.Substring(downloadAnchorHref.LastIndexOf('=') + 1);
+            var publishDate = DateTime.ParseExact(row.QuerySelector(".time.tooltip").Attributes["title"].Value, "MMM dd yyyy, HH:mm", CultureInfo.InvariantCulture, DateTimeStyles.AssumeLocal);
+            var torrentData = row.QuerySelectorAll(".number_column"); // Size (xx.xx GB[ (Max)]) Snatches (xx) Seeders (xx) Leechers (xx)
+
+            if (torrentData.Length != 4)
+                throw new Exception($"We expected 4 torrent datas, instead we have {torrentData.Length}.");
+
+            if (torrentId.Contains('#'))
+                torrentId = torrentId.Split('#')[0];
+
+            var size = ParseSizeToBytes(torrentData[0].TextContent);
+            var seeders = int.Parse(torrentData[2].TextContent);
+            var guid = new Uri(GuidUrl + torrentId);
+
+            // Build releaseinfo
+            return new ReleaseInfo
+            {
+                Title = title,
+                Description = title,
+                Category = category, // Who seasons movies right
+                Link = new Uri(DownloadUrl + torrentId),
+                PublishDate = publishDate,
+                Seeders = seeders,
+                Peers = seeders,
+                Size = size,
+                Guid = guid,
+                Comments = guid
+            };
+        }
+
+        // Changes "Season 1" to "S01"
+        private static string SeasonToShortSeason(string season)
+        {
+            var seasonMatch = new Regex(@"Season (?<seasonNumber>\d{1,2})").Match(season);
+            if (seasonMatch.Success)
+            {
+                season = $"S{int.Parse(seasonMatch.Groups["seasonNumber"].Value):00}";
+            }
+
+            return season;
+        }
+
+        // Changes "xx.xx GB/MB" to bytes
+        private static long ParseSizeToBytes(string strSize)
+        {
+            var sizeParts = strSize.Split(' ');
+            if (sizeParts.Length != 2)
+                throw new Exception($"We expected 2 size parts, instead we have {sizeParts.Length}.");
+
+            var size = double.Parse(sizeParts[0]);
+
+            switch (sizeParts[1].Trim())
+            {
+                case "GB":
+                    size = size*1000*1000*1000;
+                    break;
+                case "MB":
+                    size = size*1000*1000;
+                    break;
+                default:
+                    throw new Exception($"Unknown size type {sizeParts[1].Trim()}.");
+            }
+
+            return (long) Math.Ceiling(size);
+        }
+
     }
 }

src/Jackett/Indexers/MyAnonamouse.cs

@@ -0,0 +1,242 @@
+using CsQuery;
+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.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using System.Web;
+using Jackett.Models.IndexerConfig;
+using System.Collections.Specialized;
+using System.Globalization;
+
+namespace Jackett.Indexers
+{
+    public class Myanonamouse : BaseIndexer, IIndexer
+    {
+        private string LoginUrl { get { return SiteLink + "takelogin.php"; } }
+        private string SearchUrl { get { return SiteLink + "tor/js/loadSearch2.php"; } }
+
+        new ConfigurationDataBasicLogin configData
+        {
+            get { return (ConfigurationDataBasicLogin)base.configData; }
+            set { base.configData = value; }
+        }
+
+        public Myanonamouse(IIndexerManagerService i, IWebClient c, Logger l, IProtectionService ps)
+            : base(name: "Myanonamouse",
+                description: "Friendliness, Warmth and Sharing",
+                link: "https://www.myanonamouse.net/",
+                caps: new TorznabCapabilities(TorznabCatType.Books,
+                                              TorznabCatType.AudioAudiobook,
+                                              TorznabCatType.BooksComics,
+                                              TorznabCatType.BooksEbook,
+                                              TorznabCatType.BooksMagazines,
+                                              TorznabCatType.BooksTechnical),
+                manager: i,
+                client: c,
+                logger: l,
+                p: ps,
+                configData: new ConfigurationDataBasicLogin())
+        {
+            AddCategoryMapping("61", TorznabCatType.BooksComics);
+            AddCategoryMapping("91", TorznabCatType.BooksTechnical);
+            AddCategoryMapping("80", TorznabCatType.BooksTechnical);
+            AddCategoryMapping("79", TorznabCatType.BooksMagazines);
+            AddCategoryMapping("39", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("49", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("50", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("83", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("51", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("97", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("40", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("41", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("106", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("42", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("52", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("98", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("54", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("55", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("43", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("99", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("84", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("44", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("56", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("137", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("45", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("57", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("85", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("87", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("119", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("88", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("58", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("59", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("46", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("47", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("53", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("89", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("100", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("108", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("48", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("111", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("60", TorznabCatType.BooksEbook);
+            AddCategoryMapping("71", TorznabCatType.BooksEbook);
+            AddCategoryMapping("72", TorznabCatType.BooksEbook);
+            AddCategoryMapping("90", TorznabCatType.BooksEbook);
+            AddCategoryMapping("73", TorznabCatType.BooksEbook);
+            AddCategoryMapping("101", TorznabCatType.BooksEbook);
+            AddCategoryMapping("62", TorznabCatType.BooksEbook);
+            AddCategoryMapping("63", TorznabCatType.BooksEbook);
+            AddCategoryMapping("107", TorznabCatType.BooksEbook);
+            AddCategoryMapping("64", TorznabCatType.BooksEbook);
+            AddCategoryMapping("74", TorznabCatType.BooksEbook);
+            AddCategoryMapping("102", TorznabCatType.BooksEbook);
+            AddCategoryMapping("76", TorznabCatType.BooksEbook);
+            AddCategoryMapping("77", TorznabCatType.BooksEbook);
+            AddCategoryMapping("65", TorznabCatType.BooksEbook);
+            AddCategoryMapping("103", TorznabCatType.BooksEbook);
+            AddCategoryMapping("115", TorznabCatType.BooksEbook);
+            AddCategoryMapping("66", TorznabCatType.BooksEbook);
+            AddCategoryMapping("78", TorznabCatType.BooksEbook);
+            AddCategoryMapping("138", TorznabCatType.BooksEbook);
+            AddCategoryMapping("67", TorznabCatType.BooksEbook);
+            AddCategoryMapping("92", TorznabCatType.BooksEbook);
+            AddCategoryMapping("118", TorznabCatType.BooksEbook);
+            AddCategoryMapping("94", TorznabCatType.BooksEbook);
+            AddCategoryMapping("120", TorznabCatType.BooksEbook);
+            AddCategoryMapping("95", TorznabCatType.BooksEbook);
+            AddCategoryMapping("81", TorznabCatType.BooksEbook);
+            AddCategoryMapping("82", TorznabCatType.BooksEbook);
+            AddCategoryMapping("68", TorznabCatType.BooksEbook);
+            AddCategoryMapping("69", TorznabCatType.BooksEbook);
+            AddCategoryMapping("75", TorznabCatType.BooksEbook);
+            AddCategoryMapping("96", TorznabCatType.BooksEbook);
+            AddCategoryMapping("104", TorznabCatType.BooksEbook);
+            AddCategoryMapping("109", TorznabCatType.BooksEbook);
+            AddCategoryMapping("70", TorznabCatType.BooksEbook);
+            AddCategoryMapping("112", TorznabCatType.BooksEbook);
+
+        }
+
+        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        {
+            configData.LoadValuesFromJson(configJson);
+            var pairs = new Dictionary<string, string> {
+                { "email", configData.Username.Value },
+                { "password", configData.Password.Value },
+                { "returnto", "/" }
+            };
+
+            var preRequest = await RequestStringWithCookiesAndRetry(LoginUrl, string.Empty);
+
+            var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, preRequest.Cookies, true, SearchUrl, SiteLink);
+            await ConfigureIfOK(result.Cookies, result.Content != null && result.Content.Contains("Search Results"), () =>
+            {
+                CQ dom = result.Content;
+                var errorMessage = dom["table.main table td.text"].Text().Trim().Replace("\n\t", " ");
+                throw new ExceptionWithConfigData(errorMessage, configData);
+            });
+
+            return IndexerConfigurationStatus.RequiresTesting;
+        }
+
+        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        {
+            var releases = new List<ReleaseInfo>();
+
+            NameValueCollection qParams = new NameValueCollection();
+            qParams.Add("tor[text]", query.GetQueryString());
+            qParams.Add("tor[srchIn][title]", "true");
+            qParams.Add("tor[srchIn][author]", "true");
+            qParams.Add("tor[searchType]", "all");
+            qParams.Add("tor[searchIn]", "torrents");
+            qParams.Add("tor[hash]", "");
+            qParams.Add("tor[sortType]", "default");
+            qParams.Add("tor[startNumber]", "0");
+
+            List<string> catList = MapTorznabCapsToTrackers(query);
+            if (catList.Any())
+            {
+                foreach (string cat in catList)
+                {
+                    qParams.Add("tor[cat][]", cat);
+                }
+            }
+            else
+            {
+                qParams.Add("tor[cat][]", "0");
+            }
+
+            string urlSearch = SearchUrl;
+            if (qParams.Count > 0)
+            {
+                urlSearch += $"?{qParams.GetQueryString()}";
+            }
+
+            var response = await RequestStringWithCookiesAndRetry(urlSearch);
+
+            try
+            {
+                CQ dom = response.Content;
+                var rows = dom["table[class='newTorTable'] > tbody > tr"];
+
+                foreach (IDomObject row in rows)
+                {
+                    CQ torrentData = row.OuterHTML;
+                    CQ cells = row.Cq().Find("td");
+
+                    if (cells.Any() && torrentData.Find("a[class='directDownload']").Any())
+                    {
+                        string title = torrentData.Find("a[class='title']").First().Text().Trim();
+                        string author = torrentData.Find("a[class='author']").First().Text().Trim();
+                        Uri link = new Uri(SiteLink + torrentData.Find("a[class='directDownload']").First().Attr("href").Trim().TrimStart('/'));
+                        Uri guid = new Uri(SiteLink + torrentData.Find("a[class='directDownload']").First().Attr("href").Trim().TrimStart('/'));
+                        long size = ReleaseInfo.GetBytes(cells.Elements.ElementAt(4).Cq().Text().Split('[')[1].TrimEnd(']'));
+                        int seeders = ParseUtil.CoerceInt(cells.Elements.ElementAt(6).Cq().Find("p").ElementAt(0).Cq().Text());
+                        int leechers = ParseUtil.CoerceInt(cells.Elements.ElementAt(6).Cq().Find("p").ElementAt(1).Cq().Text());
+
+                        string pubDateStr = cells.Elements.ElementAt(5).Cq().Text().Split('[')[0];
+                        DateTime publishDate = DateTime.Parse(pubDateStr).ToLocalTime();
+
+                        long category = 0;
+                        string cat = torrentData.Find("a[class='newCatLink']").First().Attr("href").Remove(0, "/tor/browse.php?tor[cat][]]=".Length);
+                        long.TryParse(cat, out category);
+
+
+                        var release = new ReleaseInfo();
+
+                        release.Title = String.IsNullOrEmpty(author) ? title : String.Format("{0} by {1}", title, author);
+                        release.Guid = guid;
+                        release.Link = link;
+                        release.PublishDate = publishDate;
+                        release.Size = size;
+                        release.Description = release.Title;
+                        release.Seeders = seeders;
+                        release.Peers = seeders + leechers;
+                        release.MinimumRatio = 1;
+                        release.MinimumSeedTime = 172800;
+                        release.Category = MapTrackerCatToNewznab(category.ToString());
+                        release.Comments = guid;
+
+                        releases.Add(release);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                OnParseError(response.Content, ex);
+            }
+
+            return releases;
+        }
+    }
+}

src/Jackett/Indexers/NewRealWorld.cs

@@ -0,0 +1,210 @@
+using Jackett.Utils.Clients;
+using NLog;
+using Jackett.Services;
+using Jackett.Utils;
+using Jackett.Models;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using System.Collections.Generic;
+using CsQuery;
+using System;
+using System.Globalization;
+using Jackett.Models.IndexerConfig;
+using System.Collections.Specialized;
+using System.Text;
+
+namespace Jackett.Indexers
+{
+    public class NewRealWorld : BaseIndexer, IIndexer
+    {
+        string LoginUrl { get { return SiteLink + "login.php"; } }
+        string BrowseUrl { get { return SiteLink + "browse.php"; } }
+
+        new ConfigurationDataBasicLoginWithRSSAndDisplay configData
+        {
+            get { return (ConfigurationDataBasicLoginWithRSSAndDisplay)base.configData; }
+            set { base.configData = value; }
+        }
+
+        public NewRealWorld(IIndexerManagerService i, IWebClient wc, Logger l, IProtectionService ps)
+            : base(name: "New Real World",
+                   description: "A German general tracker.",
+                   link: "http://nrw-tracker.eu/",
+                   caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
+                   manager: i,
+                   client: wc,
+                   logger: l,
+                   p: ps,
+                   configData: new ConfigurationDataBasicLoginWithRSSAndDisplay())
+        {
+            AddCategoryMapping(39, TorznabCatType.TVAnime); // Anime: HD|1080p
+            AddCategoryMapping(38, TorznabCatType.TVAnime); // Anime: HD|720p
+            AddCategoryMapping(1,  TorznabCatType.TVAnime); // Anime: SD
+            AddCategoryMapping(7,  TorznabCatType.PCPhoneOther); // Appz: Handy-PDA
+            AddCategoryMapping(36, TorznabCatType.PCMac); // Appz: Mac
+            AddCategoryMapping(18, TorznabCatType.PC); // Appz: Sonstiges
+            AddCategoryMapping(17, TorznabCatType.PC); // Appz: Win
+            AddCategoryMapping(15, TorznabCatType.Audio); // Audio: DVD-R
+            AddCategoryMapping(49, TorznabCatType.AudioLossless); // Audio: Flac
+            AddCategoryMapping(30, TorznabCatType.AudioAudiobook); // Audio: Hörspiele
+            AddCategoryMapping(14, TorznabCatType.AudioMP3); // Audio: MP3
+            AddCategoryMapping(22, TorznabCatType.AudioVideo); // Audio: Videoclip
+            AddCategoryMapping(19, TorznabCatType.Other); // Diverses: Sonstiges
+            AddCategoryMapping(43, TorznabCatType.TVDocumentary); // Dokus: HD
+            AddCategoryMapping(2,  TorznabCatType.TVDocumentary); // Dokus: SD
+            AddCategoryMapping(3,  TorznabCatType.Books); // Ebooks: Bücher
+            AddCategoryMapping(52, TorznabCatType.BooksComics); // Ebooks: Comics
+            AddCategoryMapping(53, TorznabCatType.BooksMagazines); // Ebooks: Magazine
+            AddCategoryMapping(55, TorznabCatType.BooksOther); // Ebooks: XXX
+            AddCategoryMapping(54, TorznabCatType.BooksOther); // Ebooks: Zeitungen
+            AddCategoryMapping(47, TorznabCatType.PCPhoneOther); // Games: Andere
+            AddCategoryMapping(32, TorznabCatType.PCMac); // Games: Mac
+            AddCategoryMapping(41, TorznabCatType.ConsoleNDS); // Games: NDS/3DS
+            AddCategoryMapping(4,  TorznabCatType.PCGames); // Games: PC
+            AddCategoryMapping(5,  TorznabCatType.ConsolePS3); // Games: PS2
+            AddCategoryMapping(9,  TorznabCatType.ConsolePS3); // Games: PS3
+            AddCategoryMapping(6,  TorznabCatType.ConsolePSP); // Games: PSP
+            AddCategoryMapping(28, TorznabCatType.ConsoleWii); // Games: Wii
+            AddCategoryMapping(31, TorznabCatType.ConsoleXbox); // Games: XboX
+            AddCategoryMapping(51, TorznabCatType.Movies3D); // Movies: 3D
+            AddCategoryMapping(37, TorznabCatType.MoviesBluRay); // Movies: BluRay
+            AddCategoryMapping(25, TorznabCatType.MoviesHD); // Movies: HD|1080p
+            AddCategoryMapping(29, TorznabCatType.MoviesHD); // Movies: HD|720p
+            AddCategoryMapping(11, TorznabCatType.MoviesDVD); // Movies: SD|DVD-R
+            AddCategoryMapping(8,  TorznabCatType.MoviesSD); // Movies: SD|x264
+            AddCategoryMapping(13, TorznabCatType.MoviesSD); // Movies: SD|XviD
+            AddCategoryMapping(40, TorznabCatType.MoviesForeign); // Movies: US Movies
+            AddCategoryMapping(33, TorznabCatType.TV); // Serien: DVD-R
+            AddCategoryMapping(34, TorznabCatType.TVHD); // Serien: HD
+            AddCategoryMapping(56, TorznabCatType.TVHD); // Serien: Packs|HD
+            AddCategoryMapping(44, TorznabCatType.TVSD); // Serien: Packs|SD
+            AddCategoryMapping(16, TorznabCatType.TVSD); // Serien: SD
+            AddCategoryMapping(10, TorznabCatType.TVOTHER); // Serien: TV/Shows
+            AddCategoryMapping(21, TorznabCatType.TVFOREIGN); // Serien: US TV
+            AddCategoryMapping(24, TorznabCatType.TVSport); // Sport: Diverses
+            AddCategoryMapping(23, TorznabCatType.TVSport); // Sport: Wrestling
+            AddCategoryMapping(57, TorznabCatType.Movies); // Tracker - Crew: pmHD
+            AddCategoryMapping(58, TorznabCatType.MoviesHD); // Ultra-HD: 4K
+            AddCategoryMapping(46, TorznabCatType.XXXOther); // XXX: Diverses
+            AddCategoryMapping(50, TorznabCatType.XXX); // XXX: HD
+            AddCategoryMapping(45, TorznabCatType.XXXPacks); // XXX: Packs
+            AddCategoryMapping(27, TorznabCatType.XXX); // XXX: SD
+        }
+
+        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        {
+            configData.LoadValuesFromJson(configJson);
+
+            var pairs = new Dictionary<string, string>
+            {
+                { "username", configData.Username.Value },
+                { "password", configData.Password.Value },
+                { "submit", "Log+in!" }
+            };
+
+            var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, null, LoginUrl, true);
+            await ConfigureIfOK(result.Cookies, result.Content != null && result.Content.Contains("logout.php"), () =>
+                {
+                    CQ dom = result.Content;
+                    var errorMessage = dom["table.tableinborder"].Html();
+                    throw new ExceptionWithConfigData(errorMessage, configData);
+                });
+            return IndexerConfigurationStatus.RequiresTesting;
+        }
+
+        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        {
+            TimeZoneInfo.TransitionTime startTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 3, 0, 0), 3, 5, DayOfWeek.Sunday);
+            TimeZoneInfo.TransitionTime endTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 4, 0, 0), 10, 5, DayOfWeek.Sunday);
+            TimeSpan delta = new TimeSpan(1, 0, 0);
+            TimeZoneInfo.AdjustmentRule adjustment = TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule(new DateTime(1999, 10, 1), DateTime.MaxValue.Date, delta, startTransition, endTransition);
+            TimeZoneInfo.AdjustmentRule[] adjustments = { adjustment };
+            TimeZoneInfo germanyTz = TimeZoneInfo.CreateCustomTimeZone("W. Europe Standard Time", new TimeSpan(1, 0, 0), "(GMT+01:00) W. Europe Standard Time", "W. Europe Standard Time", "W. Europe DST Time", adjustments);
+
+            var releases = new List<ReleaseInfo>();
+            
+            var searchString = query.GetQueryString();
+            var searchUrl = BrowseUrl;
+            var queryCollection = new NameValueCollection();
+            queryCollection.Add("showsearch", "1");
+            queryCollection.Add("incldead", "1");
+            queryCollection.Add("orderby", "added");
+            queryCollection.Add("sort", "desc");
+
+            if (!string.IsNullOrWhiteSpace(searchString))
+            {
+                queryCollection.Add("search", searchString);
+            }
+
+            var cats = MapTorznabCapsToTrackers(query);
+            string cat = "0";
+            if (cats.Count == 1)
+            {
+                cat = cats[0];
+            }
+            queryCollection.Add("cat", cat);
+
+            searchUrl += "?" + queryCollection.GetQueryString();
+
+            var response = await RequestBytesWithCookies(searchUrl);
+            var results = Encoding.GetEncoding("iso-8859-1").GetString(response.Content);
+            try
+            {
+                CQ dom = results;
+                var rows = dom["table.testtable> tbody > tr:has(td.tableb)"];
+
+                foreach (var row in rows)
+                {
+                    var release = new ReleaseInfo();
+                    release.MinimumRatio = 0.75;
+                    release.MinimumSeedTime = 0;
+                    var qRow = row.Cq();
+
+                    var qDetailsLink = qRow.Find("a[href^=details.php?id=]").First();
+                    release.Title = qDetailsLink.Text();
+
+                    var qCatLink = qRow.Find("a[href^=browse.php?cat=]").First();
+                    var qSeeders = qRow.Find("td > table.testtable > tbody > tr > td > strong:eq(3)");
+                    var qLeechers = qRow.Find("td > table.testtable > tbody > tr > td > strong:eq(4)");
+                    var qDateStr = qRow.Find("td > table.testtable > tbody > tr > td:eq(6)");
+                    var qSize = qRow.Find("td > table.testtable > tbody > tr > td > strong:eq(1)");
+                    var qDownloadLink = qRow.Find("a[href*=download]").First();
+
+                    var catStr = qCatLink.Attr("href").Split('=')[1];
+                    release.Category = MapTrackerCatToNewznab(catStr);
+
+                    var dlLink = qDownloadLink.Attr("href");
+                    if(dlLink.Contains("javascript")) // depending on the user agent the DL link is a javascript call
+                    {
+                        var dlLinkParts = dlLink.Split(new char[] { '\'', ',' });
+                        dlLink = SiteLink + "download/" + dlLinkParts[3] + "/" + dlLinkParts[5];
+                    }
+                    release.Link = new Uri(dlLink);
+                    release.Comments = new Uri(SiteLink + qDetailsLink.Attr("href"));
+                    release.Guid = release.Link;
+
+                    var sizeStr = qSize.Text();
+                    logger.Error(sizeStr);
+                    release.Size = ReleaseInfo.GetBytes(sizeStr.Replace(".", "").Replace(",", "."));
+
+                    release.Seeders = ParseUtil.CoerceInt(qSeeders.Text());
+                    release.Peers = ParseUtil.CoerceInt(qLeechers.Text()) + release.Seeders;
+
+                    var dateStr = qDateStr.Text().Replace('\xA0', ' ');
+                    var dateGerman = DateTime.SpecifyKind(DateTime.ParseExact(dateStr, "dd.MM.yyyy HH:mm:ss", CultureInfo.InvariantCulture), DateTimeKind.Unspecified);
+                    DateTime pubDateUtc = TimeZoneInfo.ConvertTimeToUtc(dateGerman, germanyTz);
+                    release.PublishDate = pubDateUtc;
+
+                    releases.Add(release);
+                }
+            }
+            catch (Exception ex)
+            {
+                OnParseError(results, ex);
+            }
+
+            return releases;
+        }
+    }
+}
+

src/Jackett/Indexers/PassThePopcorn.cs

@@ -0,0 +1,167 @@
+using CsQuery;
+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.Globalization;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Web;
+using Jackett.Models.IndexerConfig;
+
+namespace Jackett.Indexers
+{
+    public class PassThePopcorn : BaseIndexer, IIndexer
+    {
+        private string LoginUrl { get { return "https://tls.passthepopcorn.me/ajax.php?action=login"; } }
+        private string indexUrl { get { return "https://tls.passthepopcorn.me/ajax.php?action=login"; } }
+        private string SearchUrl { get { return "https://tls.passthepopcorn.me/torrents.php"; } }
+        private string DetailURL { get { return "https://tls.passthepopcorn.me/torrents.php?torrentid="; } }
+        private string AuthKey { get; set; } 
+        new ConfigurationDataBasicLoginWithFilterAndPasskey configData
+        {
+            get { return (ConfigurationDataBasicLoginWithFilterAndPasskey)base.configData; }
+            set { base.configData = value; }
+        }
+
+        public PassThePopcorn(IIndexerManagerService i, Logger l, IWebClient c, IProtectionService ps)
+            : base(name: "PassThePopcorn",
+                description: "PassThePopcorn",
+                link: "https://passthepopcorn.me/",
+                caps: new TorznabCapabilities(),
+                manager: i,
+                client: c,
+                logger: l,
+                p: ps,
+                configData: new ConfigurationDataBasicLoginWithFilterAndPasskey(@"Enter filter options below to restrict search results. 
+                                                                        Separate options with a space if using more than one option.<br>Filter options available:
+                                                                        <br><code>GoldenPopcorn</code><br><code>Scene</code><br><code>Checked</code>"))
+        {
+            AddCategoryMapping(1, TorznabCatType.Movies);
+            AddCategoryMapping(1, TorznabCatType.MoviesForeign);
+            AddCategoryMapping(1, TorznabCatType.MoviesOther);
+            AddCategoryMapping(1, TorznabCatType.MoviesSD);
+            AddCategoryMapping(1, TorznabCatType.MoviesHD);
+            AddCategoryMapping(1, TorznabCatType.Movies3D);
+            AddCategoryMapping(1, TorznabCatType.MoviesBluRay);
+            AddCategoryMapping(1, TorznabCatType.MoviesDVD);
+            AddCategoryMapping(1, TorznabCatType.MoviesWEBDL);
+        }
+
+        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        {
+            configData.LoadValuesFromJson(configJson);
+
+            await DoLogin();
+
+            return IndexerConfigurationStatus.RequiresTesting;
+        }
+
+        private async Task DoLogin()
+        {
+            var pairs = new Dictionary<string, string> {
+                { "username", configData.Username.Value },
+                { "password", configData.Password.Value },
+                { "passkey", configData.Passkey.Value },
+                { "keeplogged", "1" },
+                { "login", "Log In!" }
+            };
+
+            var response = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, indexUrl, SiteLink);
+            JObject js_response = JObject.Parse(response.Content);
+            await ConfigureIfOK(response.Cookies, response.Content != null && (string)js_response["Result"] != "Error", () =>
+            {
+                // Landing page wil have "Result":"Error" if log in fails
+                string errorMessage = (string)js_response["Message"];
+                throw new ExceptionWithConfigData(errorMessage, configData);
+            });   
+        }
+
+        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        {
+            await DoLogin();
+
+            var releases = new List<ReleaseInfo>();
+            bool configGoldenPopcornOnly = configData.FilterString.Value.ToLowerInvariant().Contains("goldenpopcorn");
+            bool configSceneOnly = configData.FilterString.Value.ToLowerInvariant().Contains("scene");
+            bool configCheckedOnly = configData.FilterString.Value.ToLowerInvariant().Contains("checked");
+            string movieListSearchUrl;
+
+            if (string.IsNullOrEmpty(query.GetQueryString()))
+                movieListSearchUrl = string.Format("{0}?json=noredirect", SearchUrl);
+            else
+            {
+                if (!string.IsNullOrEmpty(query.ImdbID))
+                {
+                    movieListSearchUrl = string.Format("{0}?json=noredirect&searchstr={1}", SearchUrl, HttpUtility.UrlEncode(query.ImdbID));
+                }
+                else
+                {
+                    movieListSearchUrl = string.Format("{0}?json=noredirect&searchstr={1}", SearchUrl, HttpUtility.UrlEncode(query.GetQueryString()));
+                }
+            }
+
+            var results = await RequestStringWithCookiesAndRetry(movieListSearchUrl);
+            try
+            {
+                //Iterate over the releases for each movie
+                JObject js_results = JObject.Parse(results.Content);
+                foreach (var movie in js_results["Movies"])
+                {
+                    string movie_title = (string) movie["Title"];
+                    long movie_imdbid = long.Parse((string)movie["ImdbId"]);
+                    string movie_groupid = (string)movie["GroupId"];
+                    foreach (var torrent in movie["Torrents"])
+                    {
+                        var release = new ReleaseInfo();
+                        release.Title = movie_title;
+                        release.Description = release.Title;
+                        release.Imdb = movie_imdbid;
+                        release.Comments = new Uri(string.Format("{0}?id={1}", SearchUrl, HttpUtility.UrlEncode(movie_groupid)));
+                        release.Guid = release.Comments;
+                        release.Size = long.Parse((string)torrent["Size"]);
+                        release.Seeders = int.Parse((string)torrent["Seeders"]);
+                        release.Peers = int.Parse((string)torrent["Leechers"]);
+                        release.PublishDate = DateTime.ParseExact((string)torrent["UploadTime"], "yyyy-MM-dd HH:mm:ss", 
+                                                CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal).ToLocalTime();
+                        release.Link = new Uri(string.Format("{0}?action=download&id={1}&authkey={2}&torrent_pass={3}", 
+                                                SearchUrl, HttpUtility.UrlEncode((string)torrent["Id"]), HttpUtility.UrlEncode(AuthKey), HttpUtility.UrlEncode(configData.Passkey.Value)));
+                        release.MinimumRatio = 1;
+                        release.MinimumSeedTime = 345600;
+                        release.Category = 2000;
+
+                        bool golden, scene, check;
+                        bool.TryParse((string)torrent["GoldenPopcorn"], out golden);
+                        bool.TryParse((string)torrent["Scene"], out scene);
+                        bool.TryParse((string)torrent["Checked"], out check);
+
+
+                        if (configGoldenPopcornOnly && !golden)
+                        {
+                            continue; //Skip release if user only wants GoldenPopcorn
+                        }
+                        if (configSceneOnly && !scene)
+                        {
+                            continue; //Skip release if user only wants Scene
+                        }
+                        if (configCheckedOnly && !check)
+                        {
+                            continue; //Skip release if user only wants Checked
+                        }
+                        releases.Add(release);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                OnParseError(results.Content, ex);
+            }
+
+            return releases;
+        }
+    }
+}

src/Jackett/Indexers/PirateTheNet.cs

@@ -0,0 +1,212 @@
+using CsQuery;
+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.Linq;
+using System.Threading.Tasks;
+using Jackett.Models.IndexerConfig;
+using System.Collections.Specialized;
+using System.Globalization;
+
+namespace Jackett.Indexers
+{
+    public class PirateTheNet : BaseIndexer, IIndexer
+    {
+        private string SearchUrl { get { return SiteLink + "torrentsutils.php"; } }
+        private string LoginUrl { get { return SiteLink + "takelogin.php"; } }
+        private string CaptchaUrl { get { return SiteLink + "simpleCaptcha.php?numImages=1"; } }
+        TimeZoneInfo germanyTz = TimeZoneInfo.CreateCustomTimeZone("W. Europe Standard Time", new TimeSpan(1, 0, 0), "W. Europe Standard Time", "W. Europe Standard Time");
+        private readonly List<String> categories = new List<string>() { "1080P", "720P", "BDRip", "BluRay", "BRRip", "DVDR", "DVDRip", "FLAC", "MP3", "MP4", "Packs", "R5", "Remux", "TVRip", "WebRip" };
+
+        new ConfigurationDataBasicLoginWithRSSAndDisplay configData
+        {
+            get { return (ConfigurationDataBasicLoginWithRSSAndDisplay)base.configData; }
+            set { base.configData = value; }
+        }
+
+        public PirateTheNet(IIndexerManagerService i, Logger l, IWebClient w, IProtectionService ps)
+            : base(name: "PirateTheNet",
+                description: "A movie tracker",
+                link: "http://piratethe.net/",
+                caps: new TorznabCapabilities(),
+                manager: i,
+                client: w,
+                logger: l,
+                p: ps,
+                configData: new ConfigurationDataBasicLoginWithRSSAndDisplay())
+        {
+            this.configData.DisplayText.Value = "Only the results from the first search result page are shown, adjust your profile settings to show the maximum.";
+            this.configData.DisplayText.Name = "Notice";
+
+            AddCategoryMapping("1080P", TorznabCatType.MoviesHD);
+            AddCategoryMapping("720P", TorznabCatType.MoviesHD);
+            AddCategoryMapping("BDRip", TorznabCatType.MoviesSD);
+            AddCategoryMapping("BluRay", TorznabCatType.MoviesBluRay);
+            AddCategoryMapping("BRRip", TorznabCatType.MoviesSD);
+            AddCategoryMapping("DVDR", TorznabCatType.MoviesDVD);
+            AddCategoryMapping("DVDRip", TorznabCatType.MoviesSD);
+            AddCategoryMapping("FLAC", TorznabCatType.AudioLossless);
+            AddCategoryMapping("MP3", TorznabCatType.AudioMP3);
+            AddCategoryMapping("MP4", TorznabCatType.AudioOther);
+            AddCategoryMapping("Packs", TorznabCatType.Movies);
+            AddCategoryMapping("R5", TorznabCatType.MoviesDVD);
+            AddCategoryMapping("Remux", TorznabCatType.Movies);
+            AddCategoryMapping("TVRip", TorznabCatType.MoviesOther);
+            AddCategoryMapping("WebRip", TorznabCatType.MoviesWEBDL);
+        }
+
+        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        {
+            configData.LoadValuesFromJson(configJson);
+
+            var result1 = await RequestStringWithCookies(CaptchaUrl);
+            var json1 = JObject.Parse(result1.Content);
+            var captchaSelection = json1["images"][0]["hash"];
+
+            var pairs = new Dictionary<string, string> {
+                { "username", configData.Username.Value },
+                { "password", configData.Password.Value },
+                { "captchaSelection", (string)captchaSelection }
+            };
+
+            var result2 = await RequestLoginAndFollowRedirect(LoginUrl, pairs, result1.Cookies, true, null, null, true);
+
+            await ConfigureIfOK(result2.Cookies, result2.Content.Contains("logout.php"), () =>
+            {
+                var errorMessage = "Login Failed";
+                throw new ExceptionWithConfigData(errorMessage, configData);
+            });
+            return IndexerConfigurationStatus.RequiresTesting;
+        }
+
+        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        {
+            List<ReleaseInfo> releases = new List<ReleaseInfo>();
+
+            var searchString = query.GetQueryString();
+            var searchUrl = SearchUrl;
+            var queryCollection = new NameValueCollection();
+            queryCollection.Add("action", "torrentstable");
+            queryCollection.Add("viewtype", "0");
+            queryCollection.Add("visiblecategories", "Action,Adventure,Animation,Biography,Comedy,Crime,Documentary,Drama,Eastern,Family,Fantasy,History,Holiday,Horror,Kids,Musical,Mystery,Romance,Sci-Fi,Short,Sports,Thriller,War,Western");
+            queryCollection.Add("page", "1");
+            queryCollection.Add("visibility", "showall");
+            queryCollection.Add("compression", "showall");
+            queryCollection.Add("sort", "added");
+            queryCollection.Add("order", "DESC");
+            queryCollection.Add("titleonly", "true");
+            queryCollection.Add("packs", "showall");
+            queryCollection.Add("bookmarks", "showall");
+            queryCollection.Add("subscriptions", "showall");
+            queryCollection.Add("skw", "showall");
+            queryCollection.Add("advancedsearchparameters", "");
+
+            if (!string.IsNullOrWhiteSpace(searchString))
+            {
+                // search keywords use OR by default and it seems like there's no way to change it, expect unwanted results
+                queryCollection.Add("searchstring", searchString);
+            }
+
+            var cats = MapTorznabCapsToTrackers(query);
+            var hiddenqualities = "";
+            if (cats.Count > 0)
+            {
+                hiddenqualities = String.Join(",", categories.Where(cat => !cats.Contains(cat)));
+            }
+            queryCollection.Add("hiddenqualities", hiddenqualities);
+
+            searchUrl += "?" + queryCollection.GetQueryString();
+
+            var results = await RequestStringWithCookiesAndRetry(searchUrl);
+            try
+            {
+                CQ dom = results.Content;
+                /*
+                // parse logic for viewtype=1, unfortunately it's missing the release time so we can't use it
+                var movieBlocks = dom["table.main"];
+                foreach (var movieBlock in movieBlocks)
+                {
+                    var qMovieBlock = movieBlock.Cq();
+
+                    var movieLink = qMovieBlock.Find("tr > td[class=colhead] > a").First();
+                    var movieName = movieLink.Text();
+
+                    var qDetailsBlock = qMovieBlock.Find("tr > td.torrentstd > table > tbody > tr");
+                    var qDetailsHeader = qDetailsBlock.ElementAt(0);
+                    var qDetailsTags = qDetailsBlock.ElementAt(1);
+                    var qTorrents = qDetailsBlock.Find("td.moviestorrentstd > table > tbody > tr:eq(0)");
+
+                    foreach (var torrent in qTorrents)
+                    {
+                        var qTorrent = torrent.Cq();
+                        var qCatIcon = qTorrent.Find("td:eq(0) > img");
+                        var qDetailsLink = qTorrent.Find("td:eq(1) > a:eq(0)");
+                        var qSeeders = qTorrent.Find("td:eq(1) > b > a[alt=\"Number of Seeders\"]");
+                        var qLeechers = qTorrent.Find("td:eq(1) > span[alt=\"Number of Leechers\"]");
+                        var qDownloadLink = qTorrent.Find("td:eq(1) > a:has(img[alt=\"Download Torrent\"])");
+                    }
+                }
+                */
+
+                var rows = dom["table.main > tbody > tr"];
+                foreach (var row in rows.Skip(1))
+                {
+                    var release = new ReleaseInfo();
+                    release.MinimumRatio = 1;
+                    release.MinimumSeedTime = 72 * 60 * 60;
+
+                    var qRow = row.Cq();
+
+                    var qDetailsLink = qRow.Find("td:eq(1) > a:eq(0)"); // link to the movie, not the actual torrent
+                    release.Title = qDetailsLink.Attr("alt");
+
+                    var qCatIcon = qRow.Find("td:eq(0) > img");
+                    var qSeeders = qRow.Find("td:eq(8)");
+                    var qLeechers = qRow.Find("td:eq(9)");
+                    var qDownloadLink = qRow.Find("td > a:has(img[alt=\"Download Torrent\"])");
+                    var qPudDate = qRow.Find("td:eq(5) > nobr");
+                    var qSize = qRow.Find("td:eq(6)");
+
+                    var catStr = qCatIcon.Attr("alt");
+                    release.Category = MapTrackerCatToNewznab(catStr);
+                    release.Link = new Uri(SiteLink + qDownloadLink.Attr("href").Substring(1));
+                    release.Title = qDetailsLink.Attr("alt");
+                    release.Comments = new Uri(SiteLink + qDetailsLink.Attr("href"));
+                    release.Guid = release.Link;
+
+                    var dateStr = qPudDate.Text().Trim();
+                    DateTime pubDateUtc;
+                    var Timeparts = dateStr.Split(new char[] { ' ' }, 2)[1];
+                    if (dateStr.StartsWith("Today "))
+                        pubDateUtc = DateTime.SpecifyKind(DateTime.UtcNow.Date, DateTimeKind.Unspecified) + DateTime.ParseExact(dateStr.Split(new char[] { ' ' }, 2)[1], "hh:mm tt", System.Globalization.CultureInfo.InvariantCulture).TimeOfDay;
+                    else if (dateStr.StartsWith("Yesterday "))
+                        pubDateUtc = DateTime.SpecifyKind(DateTime.UtcNow.Date, DateTimeKind.Unspecified) +
+                            DateTime.ParseExact(dateStr.Split(new char[] { ' ' }, 2)[1], "hh:mm tt", System.Globalization.CultureInfo.InvariantCulture).TimeOfDay - TimeSpan.FromDays(1);
+                    else
+                        pubDateUtc = DateTime.SpecifyKind(DateTime.ParseExact(dateStr, "MMM d yyyy hh:mm tt", CultureInfo.InvariantCulture), DateTimeKind.Unspecified);
+
+                    release.PublishDate = pubDateUtc.ToLocalTime();
+
+                    var sizeStr = qSize.Text();
+                    release.Size = ReleaseInfo.GetBytes(sizeStr);
+
+                    release.Seeders = ParseUtil.CoerceInt(qSeeders.Text());
+                    release.Peers = ParseUtil.CoerceInt(qLeechers.Text()) + release.Seeders;
+
+                    releases.Add(release);
+                }
+            }
+            catch (Exception ex)
+            {
+                OnParseError(results.Content, ex);
+            }
+
+            return releases;
+        }
+    }
+}

src/Jackett/Indexers/PrivateHD.cs

@@ -7,29 +7,145 @@ using Jackett.Models;
 using Newtonsoft.Json.Linq;
 using NLog;
 using Jackett.Utils;
-using System.Net;
-using System.Net.Http;
 using CsQuery;
 using System.Web;
 using Jackett.Services;
 using Jackett.Utils.Clients;
-using System.Text.RegularExpressions;
 using Jackett.Models.IndexerConfig;
+using System.Globalization;
 
 namespace Jackett.Indexers
 {
-    public class PrivateHD : AvistazTracker, IIndexer
+    public class PrivateHD : BaseIndexer, IIndexer
     {
-        public PrivateHD(IIndexerManagerService indexerManager, IWebClient webClient, Logger logger, IProtectionService protectionService)
-            : base(name: "PrivateHD",
-                desc: "BitTorrent site for High Quality, High Definition (HD) movies and TV Shows",
-                link: "https://privatehd.to/",
-                indexerManager: indexerManager,
-                logger: logger,
-                protectionService: protectionService,
-                webClient: webClient
-                )
+        private string LoginUrl { get { return SiteLink + "auth/login"; } }
+        private string SearchUrl { get { return SiteLink + "torrents?in=1&type={0}&search={1}"; } }
+
+        new ConfigurationDataBasicLogin configData
         {
+            get { return (ConfigurationDataBasicLogin)base.configData; }
+            set { base.configData = value; }
         }
+
+        public PrivateHD(IIndexerManagerService i, Logger l, IWebClient c, IProtectionService ps)
+            : base(name: "PrivateHD",
+                description: "BitTorrent site for High Quality, High Definition (HD) movies and TV Shows",
+                link: "https://privatehd.to/",
+                caps: new TorznabCapabilities(),
+                manager: i,
+                client: c,
+                logger: l,
+                p: ps,
+                configData: new ConfigurationDataBasicLogin())
+        {
+            AddCategoryMapping(1, TorznabCatType.Movies);
+            AddCategoryMapping(2, TorznabCatType.TV);
+            AddCategoryMapping(2, TorznabCatType.TVSD);
+            AddCategoryMapping(2, TorznabCatType.TVHD);
+            AddCategoryMapping(3, TorznabCatType.Audio);
+        }
+
+        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        {
+            configData.LoadValuesFromJson(configJson);
+            var loginPage = await RequestStringWithCookies(LoginUrl, string.Empty);
+            CQ loginDom = loginPage.Content;
+            string token = loginDom["input[name='_token']"].Val();
+            var pairs = new Dictionary<string, string> {
+                { "_token", token },
+                { "email_username", configData.Username.Value },
+                { "password", configData.Password.Value },
+                { "remember", "1" }
+            };
+
+            var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, loginPage.Cookies, true, null, LoginUrl);
+            await ConfigureIfOK(result.Cookies, result.Content != null && result.Content.Contains("auth/logout"), () =>
+            {
+                CQ dom = result.Content;
+                var messageEl = dom[".form-error"];
+                var errorMessage = messageEl.Text().Trim();
+                throw new ExceptionWithConfigData(errorMessage, configData);
+            });
+
+            return IndexerConfigurationStatus.RequiresTesting;
+        }
+
+        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        {
+            TimeZoneInfo.TransitionTime startTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 2, 0, 0), 3, 2, DayOfWeek.Sunday);
+            TimeZoneInfo.TransitionTime endTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 2, 0, 0), 11, 1, DayOfWeek.Sunday);
+            TimeSpan delta = new TimeSpan(1, 0, 0);
+            TimeZoneInfo.AdjustmentRule adjustment = TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule(new DateTime(1999, 10, 1), DateTime.MaxValue.Date, delta, startTransition, endTransition);
+            TimeZoneInfo.AdjustmentRule[] adjustments = { adjustment };
+            TimeZoneInfo easternTz = TimeZoneInfo.CreateCustomTimeZone("Eastern Time", new TimeSpan(-5, 0, 0), "(GMT-05:00) Eastern Time", "Eastern Standard Time", "Eastern Daylight Time", adjustments);
+
+            var releases = new List<ReleaseInfo>();
+
+            var categoryMapping = MapTorznabCapsToTrackers(query).Distinct();
+            string category = "0"; // Aka all
+            if (categoryMapping.Count() == 1)
+            {
+                category = categoryMapping.First();
+            }
+
+            var episodeSearchUrl = string.Format(SearchUrl, category, HttpUtility.UrlEncode(query.GetQueryString()));
+            var response = await RequestStringWithCookiesAndRetry(episodeSearchUrl);
+
+            try
+            {
+                CQ dom = response.Content;
+                var rows = dom["table.table-condensed.table-striped.table-bordered:first"].Find("tbody > tr");
+
+                foreach (var row in rows)
+                {
+                    CQ qRow = row.Cq();
+                    var release = new ReleaseInfo();
+
+                    release.MinimumRatio = 1;
+                    release.MinimumSeedTime = 172800;
+                    
+                    release.Title = qRow.Find("a[class='torrent-filename']").Text().Trim();
+                    release.Comments = new Uri(qRow.Find("a[class='torrent-filename']").Attr("href"));
+                    release.Guid = release.Comments;
+
+                    release.Link = new Uri(qRow.Find("a[class='torrent-download-icon']").Attr("href"));
+
+                    //05 Aug 2016 01:08
+                    var dateString = row.ChildElements.ElementAt(3).Cq().Find("span").Attr("title");
+                    DateTime pubDateSite = DateTime.SpecifyKind(DateTime.ParseExact(dateString, "dd MMM yyyy HH:mm", CultureInfo.InvariantCulture), DateTimeKind.Unspecified);
+                    release.PublishDate = TimeZoneInfo.ConvertTimeToUtc(pubDateSite, easternTz).ToLocalTime();
+                    
+                    var sizeStr = row.ChildElements.ElementAt(5).Cq().Text().Trim();
+                    release.Size = ReleaseInfo.GetBytes(sizeStr);
+
+                    release.Seeders = ParseUtil.CoerceInt(row.ChildElements.ElementAt(6).Cq().Text().Trim());
+                    release.Peers = ParseUtil.CoerceInt(row.ChildElements.ElementAt(7).Cq().Text().Trim()) + release.Seeders;
+
+                    int cat = 0;
+                    var catElement = qRow.Find("i[class$='torrent-icon']");
+
+                    if (catElement.Length == 1)
+                    {
+                        string catName = catElement.Attr("title").Trim();
+
+                        if (catName.StartsWith("TV"))
+                        {
+                            cat = TvCategoryParser.ParseTvShowQuality(release.Title);
+                        }
+                        if (catName.StartsWith("Music")) { cat = TorznabCatType.Audio.ID; }
+                        if (catName.StartsWith("Movie")) { cat = TorznabCatType.Movies.ID; }
+                    }
+
+                    release.Category = cat;
+                    releases.Add(release);
+                }
+            }
+            catch (Exception ex)
+            {
+                OnParseError(response.Content, ex);
+            }
+            return releases;
+        }
+
     }
 }

src/Jackett/Indexers/RevolutionTT.cs

@@ -0,0 +1,361 @@
+using CsQuery;
+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.Globalization;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web;
+using Jackett.Models.IndexerConfig;
+using System.Text.RegularExpressions;
+using System.Xml.Linq;
+
+namespace Jackett.Indexers
+{
+    public class RevolutionTT : BaseIndexer, IIndexer
+    {        
+        private string LandingPageURL { get { return SiteLink + "login.php"; } }
+        private string LoginUrl { get { return SiteLink + "takelogin.php"; } }
+        private string GetRSSKeyUrl { get { return SiteLink + "getrss.php"; } }
+        private string RSSUrl { get { return SiteLink + "rss.php?feed=dl&passkey="; } }
+        private string SearchUrl { get { return SiteLink + "browse.php"; } }        
+        private string DetailsURL { get { return SiteLink + "details.php?id={0}&hit=1"; } }
+
+
+        new ConfigurationDataBasicLoginWithRSS configData
+        {
+            get { return (ConfigurationDataBasicLoginWithRSS)base.configData; }
+            set { base.configData = value; }
+        }
+
+        public RevolutionTT(IIndexerManagerService i, Logger l, IWebClient wc, IProtectionService ps)
+            : base(name: "RevolutionTT",
+                description: "The Revolution has begun",
+                link: "https://revolutiontt.me/",
+                caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
+                manager: i,
+                client: wc,
+                logger: l,
+                p: ps,
+                downloadBase: "https://revolutiontt.me/download.php/",
+                configData: new ConfigurationDataBasicLoginWithRSS())
+        {
+
+            /* Original RevolutionTT Categories -
+			
+			Anime - 23
+			Appz/Misc - 22
+			Appz/PC-ISO - 1
+			E-Book - 36
+			Games/PC-ISO - 4
+			Games/PC-Rips - 21
+			Games/PS3 - 16
+			Games/Wii - 40
+			Games/XBOX360 - 39
+			Handheld/NDS - 35
+			Handheld/PSP - 34
+			Mac	- 2
+			Movies/BluRay - 10
+			Movies/DVDR - 20
+			Movies/HDx264 - 12
+			Movies/Packs - 44
+			Movies/SDx264 - 11
+			Movies/XviD - 19
+			Music - 6
+			Music/FLAC - 8
+			Music/Packs - 46
+			MusicVideos - 29
+			TV/DVDR - 43
+			TV/HDx264 - 42
+			TV/Packs - 45
+			TV/SDx264 - 41
+			TV/XViD - 7		
+			
+			*/
+
+            //AddCategoryMapping("cat_id", TorznabCatType.Console);
+            AddCategoryMapping("35", TorznabCatType.ConsoleNDS);
+            AddCategoryMapping("34", TorznabCatType.ConsolePSP);
+            AddCategoryMapping("40", TorznabCatType.ConsoleWii);
+            //AddCategoryMapping("cat_id", TorznabCatType.ConsoleXbox);
+            AddCategoryMapping("39", TorznabCatType.ConsoleXbox360);
+            //AddCategoryMapping("cat_id", TorznabCatType.ConsoleWiiwareVC);
+            //AddCategoryMapping("cat_id", TorznabCatType.ConsoleXBOX360DLC);
+            AddCategoryMapping("16", TorznabCatType.ConsolePS3);
+            //AddCategoryMapping("cat_id", TorznabCatType.ConsoleOther);
+            //AddCategoryMapping("cat_id", TorznabCatType.Console3DS);
+            //AddCategoryMapping("cat_id", TorznabCatType.ConsolePSVita);
+            AddCategoryMapping("40", TorznabCatType.ConsoleWiiU);
+            //AddCategoryMapping("cat_id", TorznabCatType.ConsoleXboxOne);
+            //AddCategoryMapping("cat_id", TorznabCatType.ConsolePS4);			
+            AddCategoryMapping("44", TorznabCatType.Movies);
+            //AddCategoryMapping("cat_id", TorznabCatType.MoviesForeign);
+            //AddCategoryMapping("cat_id", TorznabCatType.MoviesOther);
+            //Movies/DVDR, Movies/SDx264, Movies/XviD
+            AddMultiCategoryMapping(TorznabCatType.MoviesSD, 20, 11, 19);
+            //Movies/BluRay, Movies/HDx264
+            AddMultiCategoryMapping(TorznabCatType.MoviesHD, 10, 12);
+            //AddCategoryMapping("cat_id", TorznabCatType.Movies3D);
+            AddCategoryMapping("10", TorznabCatType.MoviesBluRay);
+            AddCategoryMapping("20", TorznabCatType.MoviesDVD);
+            //AddCategoryMapping("cat_id", TorznabCatType.MoviesWEBDL);
+            //Music, Music/Packs
+            AddMultiCategoryMapping(TorznabCatType.Audio, 6, 46);
+            //AddCategoryMapping("cat_id", TorznabCatType.AudioMP3);
+            AddCategoryMapping("29", TorznabCatType.AudioVideo);
+            //AddCategoryMapping("cat_id", TorznabCatType.AudioAudiobook);
+            AddCategoryMapping("8", TorznabCatType.AudioLossless);
+            //AddCategoryMapping("cat_id", TorznabCatType.AudioOther);
+            //AddCategoryMapping("cat_id", TorznabCatType.AudioForeign);
+            AddCategoryMapping("21", TorznabCatType.PC);
+            AddCategoryMapping("22", TorznabCatType.PC0day);
+            AddCategoryMapping("4", TorznabCatType.PCISO);
+            AddCategoryMapping("2", TorznabCatType.PCMac);
+            //AddCategoryMapping("cat_id", TorznabCatType.PCPhoneOther);
+            //Games/PC-ISO, Games/PC-Rips
+            AddMultiCategoryMapping(TorznabCatType.PCGames, 4, 21);
+            //AddCategoryMapping("cat_id", TorznabCatType.PCPhoneIOS);
+            //AddCategoryMapping("cat_id", TorznabCatType.PCPhoneAndroid);
+            AddCategoryMapping("45", TorznabCatType.TV);
+            //AddCategoryMapping("cat_id", TorznabCatType.TVWEBDL);
+            //AddCategoryMapping("cat_id", TorznabCatType.TVFOREIGN);
+            //TV/DVDR, TV/SDx264, TV/XViD
+            AddMultiCategoryMapping(TorznabCatType.TVSD, 43, 41, 7);
+            AddCategoryMapping("42", TorznabCatType.TVHD);
+            //AddCategoryMapping("cat_id", TorznabCatType.TVOTHER);
+            //AddCategoryMapping("cat_id", TorznabCatType.TVSport);
+            AddCategoryMapping("23", TorznabCatType.TVAnime);
+            //AddCategoryMapping("cat_id", TorznabCatType.TVDocumentary);
+            //AddCategoryMapping("cat_id", TorznabCatType.XXX);
+            //AddCategoryMapping("cat_id", TorznabCatType.XXXDVD);
+            //AddCategoryMapping("cat_id", TorznabCatType.XXXWMV);
+            //AddCategoryMapping("cat_id", TorznabCatType.XXXXviD);
+            //AddCategoryMapping("cat_id", TorznabCatType.XXXx264);
+            //AddCategoryMapping("cat_id", TorznabCatType.XXXOther);
+            //AddCategoryMapping("cat_id", TorznabCatType.XXXImageset);
+            //AddCategoryMapping("cat_id", TorznabCatType.XXXPacks);
+            //AddCategoryMapping("cat_id", TorznabCatType.Other);
+            //AddCategoryMapping("cat_id", TorznabCatType.OtherMisc);
+            //AddCategoryMapping("cat_id", TorznabCatType.OtherHashed);
+            AddCategoryMapping("36", TorznabCatType.Books);
+            AddCategoryMapping("36", TorznabCatType.BooksEbook);
+            //AddCategoryMapping("cat_id", TorznabCatType.BooksComics);
+            //AddCategoryMapping("cat_id", TorznabCatType.BooksMagazines);
+            //AddCategoryMapping("cat_id", TorznabCatType.BooksTechnical);
+            //AddCategoryMapping("cat_id", TorznabCatType.BooksOther);
+            //AddCategoryMapping("cat_id", TorznabCatType.BooksForeign);
+
+            // RSS Textual categories
+            AddCategoryMapping("Anime", TorznabCatType.TVAnime);
+            AddCategoryMapping("Appz/Misc", TorznabCatType.PC0day);
+            AddCategoryMapping("Appz/PC-ISO", TorznabCatType.Books);
+            AddCategoryMapping("E-Book", TorznabCatType.BooksEbook);
+            AddCategoryMapping("Games/PC-ISO", TorznabCatType.PCGames);
+            AddCategoryMapping("Games/PC-Rips", TorznabCatType.PCGames);
+            AddCategoryMapping("Games/PS3", TorznabCatType.ConsolePS3);
+            AddCategoryMapping("Games/Wii", TorznabCatType.ConsoleWii);
+            AddCategoryMapping("Games/XBOX360", TorznabCatType.ConsoleXbox360);
+            AddCategoryMapping("Handheld/NDS", TorznabCatType.ConsoleNDS);
+            AddCategoryMapping("Handheld/PSP", TorznabCatType.ConsolePSP);
+            AddCategoryMapping("Mac", TorznabCatType.PCMac);
+            AddCategoryMapping("Movies/BluRay", TorznabCatType.MoviesBluRay);
+            AddCategoryMapping("Movies/DVDR", TorznabCatType.MoviesDVD);
+            AddCategoryMapping("Movies/HDx264", TorznabCatType.MoviesHD);
+            AddCategoryMapping("Movies/Packs", TorznabCatType.Movies);
+            AddCategoryMapping("Movies/SDx264", TorznabCatType.MoviesSD);
+            AddCategoryMapping("Movies/XviD", TorznabCatType.MoviesSD);
+            AddCategoryMapping("Music", TorznabCatType.Audio);
+            AddCategoryMapping("Music/FLAC", TorznabCatType.AudioLossless);
+            AddCategoryMapping("Music/Packs", TorznabCatType.AudioOther);
+            AddCategoryMapping("MusicVideos", TorznabCatType.AudioVideo);
+            AddCategoryMapping("TV/DVDR", TorznabCatType.TV);
+            AddCategoryMapping("TV/HDx264", TorznabCatType.TVHD);
+            AddCategoryMapping("TV/Packs", TorznabCatType.TV);
+            AddCategoryMapping("TV/SDx264", TorznabCatType.TVSD);
+            AddCategoryMapping("TV/XViD", TorznabCatType.TVSD);
+        }
+
+        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        {
+            configData.LoadValuesFromJson(configJson);
+
+            var pairs = new Dictionary<string, string> {
+                { "username", configData.Username.Value },
+                { "password", configData.Password.Value }
+            };
+
+            //  need to do an initial request to get PHP session cookie (any better way to do this?)
+            var homePageLoad = await RequestLoginAndFollowRedirect(LandingPageURL, new Dictionary<string, string> { }, null, true, null, SiteLink);
+
+            var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, homePageLoad.Cookies, true, null, LandingPageURL);
+            await ConfigureIfOK(result.Cookies, result.Content != null && result.Content.Contains("/logout.php"), () =>
+            {
+                CQ dom = result.Content;
+                var messageEl = dom[".error"];
+                var errorMessage = messageEl.Text().Trim();
+                throw new ExceptionWithConfigData(errorMessage, configData);
+            });
+
+            //  Store RSS key from feed generator page
+            try
+            {
+                var rssParams = new Dictionary<string, string> {
+                { "feed", "dl" }
+            };
+                var rssPage = await PostDataWithCookies(GetRSSKeyUrl, rssParams, result.Cookies);
+                var match = Regex.Match(rssPage.Content, "(?<=passkey\\=)([a-zA-z0-9]*)");
+                configData.RSSKey.Value = match.Success ? match.Value : string.Empty;
+                if (string.IsNullOrWhiteSpace(configData.RSSKey.Value))
+                    throw new Exception("Failed to get RSS Key");
+                SaveConfig();
+            }
+            catch (Exception e)
+            {
+                IsConfigured = false;
+                throw e;
+            }
+
+
+            return IndexerConfigurationStatus.RequiresTesting;
+        }
+
+        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        {
+            var releases = new List<ReleaseInfo>();
+            var searchString = query.GetQueryString();
+            var searchUrl = SearchUrl;
+
+            // If query is empty, use the RSS Feed
+            if (string.IsNullOrWhiteSpace(searchString))
+            {
+                var rssPage = await RequestStringWithCookiesAndRetry(RSSUrl + configData.RSSKey.Value);
+                var rssDoc = XDocument.Parse(rssPage.Content);
+
+                foreach (var item in rssDoc.Descendants("item"))
+                {
+                    var title = item.Descendants("title").First().Value;
+                    var description = item.Descendants("description").First().Value;
+                    var link = item.Descendants("link").First().Value;
+                    var date = item.Descendants("pubDate").First().Value;
+
+                    var torrentIdMatch = Regex.Match(link, "(?<=download\\.php/)([a-zA-z0-9]*)");
+                    var torrentId = torrentIdMatch.Success ? torrentIdMatch.Value : string.Empty;
+                    if (string.IsNullOrWhiteSpace(torrentId))
+                        throw new Exception("Missing torrent id");
+
+                    var infoMatch = Regex.Match(description, @"Category:\W(?<cat>.*)\W\n\WSize:\W(?<size>.*)\n\WStatus:\W(?<seeders>.*)\Wseeder(.*)\Wand\W(?<leechers>.*)\Wleecher(.*)\n\WAdded:\W(?<added>.*)\n\WDescription:");
+                    if (!infoMatch.Success)
+                        throw new Exception("Unable to find info");
+
+                    var imdbMatch = Regex.Match(description, "(?<=http://www.imdb.com/title/tt)([0-9]*)");
+                    long? imdbID = null;
+                    if(imdbMatch.Success)
+                    {
+                        long l;
+                        if(long.TryParse(imdbMatch.Value, out l))
+                        {
+                            imdbID = l;
+                        }
+                    }
+
+                    var release = new ReleaseInfo()
+                    {
+                        Title = title,
+                        Description = title,
+                        Guid = new Uri(string.Format(DetailsURL, torrentId)),
+                        Comments = new Uri(string.Format(DetailsURL, torrentId) + "&tocomm=1"),
+                        PublishDate = DateTime.ParseExact(infoMatch.Groups["added"].Value, "yyyy-MM-dd H:mm:ss", CultureInfo.InvariantCulture), //2015-08-08 21:20:31
+                        Link = new Uri(link),
+                        Seeders = ParseUtil.CoerceInt(infoMatch.Groups["seeders"].Value == "no" ? "0" : infoMatch.Groups["seeders"].Value),
+                        Peers = ParseUtil.CoerceInt(infoMatch.Groups["leechers"].Value == "no" ? "0" : infoMatch.Groups["leechers"].Value),
+                        Size = ReleaseInfo.GetBytes(infoMatch.Groups["size"].Value),
+                        Category = MapTrackerCatToNewznab(infoMatch.Groups["cat"].Value),
+                        Imdb = imdbID
+                    };
+
+                    //  if unknown category, set to "other"
+                    if (release.Category == 0)
+                        release.Category = 7000;
+
+                    release.Peers += release.Seeders;
+                    releases.Add(release);
+                }
+
+            }
+            else
+            {
+
+                searchUrl += "?titleonly=1&search=" + HttpUtility.UrlEncode(searchString);
+                string.Format(SearchUrl, HttpUtility.UrlEncode(searchString));
+
+                var cats = MapTorznabCapsToTrackers(query);
+                if (cats.Count > 0)
+                {
+                    foreach (var cat in cats)
+                    {
+                        searchUrl += "&c" + cat + "=1";
+                    }
+                }
+
+                var results = await RequestStringWithCookiesAndRetry(searchUrl);
+                try
+                {
+                    CQ dom = results.Content;
+
+                    //  table header is the first <tr> in table body, get all rows except this
+                    CQ qRows = dom["#torrents-table > tbody > tr:not(:first-child)"];
+
+                    foreach (var row in qRows)
+                    {
+                        var release = new ReleaseInfo();
+
+                        var qRow = row.Cq();
+
+                        var debug = qRow.Html();
+
+                        release.MinimumRatio = 1;
+                        release.MinimumSeedTime = 172800;
+
+                        CQ qLink = qRow.Find(".br_right > a").First();
+                        release.Guid = new Uri(SiteLink + qLink.Attr("href"));
+                        release.Comments = new Uri(SiteLink + qLink.Attr("href") + "&tocomm=1");
+                        release.Title = qLink.Find("b").Text();
+                        release.Description = release.Title;
+
+                        release.Link = new Uri(SiteLink + qRow.Find("td:nth-child(4) > a").Attr("href"));
+
+                        var dateString = qRow.Find("td:nth-child(6) nobr")[0].InnerText.Trim();
+                        //"2015-04-25 23:38:12"
+                        //"yyyy-MMM-dd hh:mm:ss"
+                        release.PublishDate = DateTime.ParseExact(dateString, "yyyy-MM-ddHH:mm:ss", CultureInfo.InvariantCulture);
+
+                        var sizeStr = qRow.Children().ElementAt(6).InnerText.Trim();
+                        release.Size = ReleaseInfo.GetBytes(sizeStr);
+
+                        release.Seeders = ParseUtil.CoerceInt(qRow.Find("td:nth-child(9)").Text());
+                        release.Peers = release.Seeders + ParseUtil.CoerceInt(qRow.Find("td:nth-child(10)").Text());
+
+                        var category = qRow.Find(".br_type > a").Attr("href").Replace("browse.php?cat=", string.Empty);
+                        release.Category = MapTrackerCatToNewznab(category);
+
+                        releases.Add(release);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    OnParseError(results.Content, ex);
+                }
+            }
+
+            return releases;
+        }
+    }
+}

src/Jackett/Indexers/SceneAccess.cs

@@ -1,164 +1,165 @@
-using CsQuery;
-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.Globalization;
-using System.Net;
-using System.Net.Http;
-using System.Text;
-using System.Threading.Tasks;
-using Jackett.Models.IndexerConfig;
-
-namespace Jackett.Indexers
-{
-    class SceneAccess : BaseIndexer, IIndexer
-    {
-        private string LoginUrl { get { return SiteLink + "login"; } }
-        private string SearchUrl { get { return SiteLink + "all?search={0}&method=2"; } }
-
-        new ConfigurationDataBasicLogin configData
-        {
-            get { return (ConfigurationDataBasicLogin)base.configData; }
-            set { base.configData = value; }
-        }
-
-        public SceneAccess(IIndexerManagerService i, IWebClient c, Logger l, IProtectionService ps)
-            : base(name: "SceneAccess",
-                description: "Your gateway to the scene",
-                link: "https://sceneaccess.eu/",
-                caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
-                manager: i,
-                client: c,
-                logger: l,
-                p: ps,
-                configData: new ConfigurationDataBasicLogin())
-        {
-
-            AddCategoryMapping(8, TorznabCatType.MoviesSD);
-            AddCategoryMapping(22, TorznabCatType.MoviesHD);
-            AddCategoryMapping(7, TorznabCatType.MoviesSD);
-            AddCategoryMapping(4, TorznabCatType.Movies);
-
-            AddCategoryMapping(27, TorznabCatType.TVHD);
-            AddCategoryMapping(17, TorznabCatType.TVSD);
-            AddCategoryMapping(11, TorznabCatType.MoviesSD);
-            AddCategoryMapping(26, TorznabCatType.TV);
-
-            AddCategoryMapping(3, TorznabCatType.PCGames);
-            AddCategoryMapping(5, TorznabCatType.ConsolePS3);
-            AddCategoryMapping(20, TorznabCatType.ConsolePSP);
-            AddCategoryMapping(28, TorznabCatType.TV);
-            AddCategoryMapping(23, TorznabCatType.Console);
-            AddCategoryMapping(29, TorznabCatType.Console);
-
-            AddCategoryMapping(40, TorznabCatType.AudioLossless);
-            AddCategoryMapping(13, TorznabCatType.AudioMP3);
-            AddCategoryMapping(15, TorznabCatType.AudioVideo);
-
-            AddCategoryMapping(1, TorznabCatType.PCISO);
-            AddCategoryMapping(2, TorznabCatType.PCISO);
-            AddCategoryMapping(14, TorznabCatType.PCISO);
-            AddCategoryMapping(21, TorznabCatType.Other);
-
-            AddCategoryMapping(41, TorznabCatType.MoviesHD);
-            AddCategoryMapping(42, TorznabCatType.MoviesSD);
-            AddCategoryMapping(43, TorznabCatType.MoviesSD);
-            AddCategoryMapping(44, TorznabCatType.TVHD);
-            AddCategoryMapping(45, TorznabCatType.TVSD);
-
-            AddCategoryMapping(12, TorznabCatType.XXXXviD);
-            AddCategoryMapping(35, TorznabCatType.XXXx264);
-            AddCategoryMapping(36, TorznabCatType.XXX);
-
-            AddCategoryMapping(30, TorznabCatType.MoviesForeign);
-            AddCategoryMapping(31, TorznabCatType.MoviesForeign);
-            AddCategoryMapping(32, TorznabCatType.MoviesForeign);
-            AddCategoryMapping(33, TorznabCatType.TVFOREIGN);
-            AddCategoryMapping(34, TorznabCatType.TVFOREIGN);
-
-            AddCategoryMapping(4, TorznabCatType.Movies);
-            AddCategoryMapping(37, TorznabCatType.XXX);
-            AddCategoryMapping(38, TorznabCatType.Audio);
-
-        }
-
-        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
-        {
-            configData.LoadValuesFromJson(configJson);
-
-            var pairs = new Dictionary<string, string> {
-                { "username", configData.Username.Value },
-                { "password", configData.Password.Value },
-                { "submit", "come on in" }
-            };
-
-            var loginPage = await RequestStringWithCookies(LoginUrl, string.Empty);
-
-            var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, loginPage.Cookies, true, SiteLink, LoginUrl);
-            await ConfigureIfOK(result.Cookies + " " + loginPage.Cookies, result.Content != null && result.Content.Contains("nav_profile"), () =>
-            {
-                CQ dom = result.Content;
-                var messageEl = dom["#login_box_desc"];
-                var errorMessage = messageEl.Text().Trim();
-                throw new ExceptionWithConfigData(errorMessage, configData);
-            });
-
-            return IndexerConfigurationStatus.RequiresTesting;
-        }
-
-        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
-        {
-            var releases = new List<ReleaseInfo>();
-            var results = await RequestStringWithCookiesAndRetry(string.Format(SearchUrl, query.GetQueryString()));
-
-            try
-            {
-                CQ dom = results.Content;
-                var rows = dom["#torrents-table > tbody > tr.tt_row"];
-                foreach (var row in rows)
-                {
-                    CQ qRow = row.Cq();
-                    var release = new ReleaseInfo();
-
-                    release.MinimumRatio = 1;
-                    release.MinimumSeedTime = 129600;
-                    release.Title = qRow.Find(".ttr_name > a").Text();
-                    release.Description = release.Title;
-                    release.Guid = new Uri(SiteLink  + qRow.Find(".ttr_name > a").Attr("href"));
-                    release.Comments = release.Guid;
-                    release.Link = new Uri(SiteLink + qRow.Find(".td_dl > a").Attr("href"));
-
-                    var sizeStr = qRow.Find(".ttr_size").Contents()[0].NodeValue;
-                    release.Size = ReleaseInfo.GetBytes(sizeStr);
-
-                    var timeStr = qRow.Find(".ttr_added").Text();
-                    DateTime time;
-                    if (DateTime.TryParseExact(timeStr, "yyyy-MM-ddHH:mm:ss", CultureInfo.InvariantCulture, DateTimeStyles.None, out time))
-                    {
-                        release.PublishDate = time;
-                    }
-
-                    release.Seeders = ParseUtil.CoerceInt(qRow.Find(".ttr_seeders").Text());
-                    release.Peers = ParseUtil.CoerceInt(qRow.Find(".ttr_leechers").Text()) + release.Seeders;
-
-                    var cat = qRow.Find(".ttr_type a").Attr("href").Replace("?cat=",string.Empty);
-
-                    release.Category = MapTrackerCatToNewznab(cat);
-
-                    releases.Add(release);
-                }
-            }
-            catch (Exception ex)
-            {
-                OnParseError(results.Content, ex);
-            }
-
-            return releases;
-        }
-    }
-}
+using CsQuery;
+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.Globalization;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using Jackett.Models.IndexerConfig;
+using System.Web;
+
+namespace Jackett.Indexers
+{
+    class SceneAccess : BaseIndexer, IIndexer
+    {
+        private string LoginUrl { get { return SiteLink + "login"; } }
+        private string SearchUrl { get { return SiteLink + "all?search={0}&method=2"; } }
+
+        new ConfigurationDataBasicLogin configData
+        {
+            get { return (ConfigurationDataBasicLogin)base.configData; }
+            set { base.configData = value; }
+        }
+
+        public SceneAccess(IIndexerManagerService i, IWebClient c, Logger l, IProtectionService ps)
+            : base(name: "SceneAccess",
+                description: "Your gateway to the scene",
+                link: "https://sceneaccess.eu/",
+                caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
+                manager: i,
+                client: c,
+                logger: l,
+                p: ps,
+                configData: new ConfigurationDataBasicLogin())
+        {
+
+            AddCategoryMapping(8, TorznabCatType.MoviesSD);
+            AddCategoryMapping(22, TorznabCatType.MoviesHD);
+            AddCategoryMapping(7, TorznabCatType.MoviesSD);
+            AddCategoryMapping(4, TorznabCatType.Movies);
+
+            AddCategoryMapping(27, TorznabCatType.TVHD);
+            AddCategoryMapping(17, TorznabCatType.TVSD);
+            AddCategoryMapping(11, TorznabCatType.MoviesSD);
+            AddCategoryMapping(26, TorznabCatType.TV);
+
+            AddCategoryMapping(3, TorznabCatType.PCGames);
+            AddCategoryMapping(5, TorznabCatType.ConsolePS3);
+            AddCategoryMapping(20, TorznabCatType.ConsolePSP);
+            AddCategoryMapping(28, TorznabCatType.TV);
+            AddCategoryMapping(23, TorznabCatType.Console);
+            AddCategoryMapping(29, TorznabCatType.Console);
+
+            AddCategoryMapping(40, TorznabCatType.AudioLossless);
+            AddCategoryMapping(13, TorznabCatType.AudioMP3);
+            AddCategoryMapping(15, TorznabCatType.AudioVideo);
+
+            AddCategoryMapping(1, TorznabCatType.PCISO);
+            AddCategoryMapping(2, TorznabCatType.PCISO);
+            AddCategoryMapping(14, TorznabCatType.PCISO);
+            AddCategoryMapping(21, TorznabCatType.Other);
+
+            AddCategoryMapping(41, TorznabCatType.MoviesHD);
+            AddCategoryMapping(42, TorznabCatType.MoviesSD);
+            AddCategoryMapping(43, TorznabCatType.MoviesSD);
+            AddCategoryMapping(44, TorznabCatType.TVHD);
+            AddCategoryMapping(45, TorznabCatType.TVSD);
+
+            AddCategoryMapping(12, TorznabCatType.XXXXviD);
+            AddCategoryMapping(35, TorznabCatType.XXXx264);
+            AddCategoryMapping(36, TorznabCatType.XXX);
+
+            AddCategoryMapping(30, TorznabCatType.MoviesForeign);
+            AddCategoryMapping(31, TorznabCatType.MoviesForeign);
+            AddCategoryMapping(32, TorznabCatType.MoviesForeign);
+            AddCategoryMapping(33, TorznabCatType.TVFOREIGN);
+            AddCategoryMapping(34, TorznabCatType.TVFOREIGN);
+
+            AddCategoryMapping(4, TorznabCatType.Movies);
+            AddCategoryMapping(37, TorznabCatType.XXX);
+            AddCategoryMapping(38, TorznabCatType.Audio);
+
+        }
+
+        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        {
+            configData.LoadValuesFromJson(configJson);
+
+            var pairs = new Dictionary<string, string> {
+                { "username", configData.Username.Value },
+                { "password", configData.Password.Value },
+                { "submit", "come on in" }
+            };
+
+            var loginPage = await RequestStringWithCookies(LoginUrl, string.Empty);
+
+            var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, loginPage.Cookies, true, SiteLink, LoginUrl);
+            await ConfigureIfOK(result.Cookies + " " + loginPage.Cookies, result.Content != null && result.Content.Contains("nav_profile"), () =>
+            {
+                CQ dom = result.Content;
+                var messageEl = dom["#login_box_desc"];
+                var errorMessage = messageEl.Text().Trim();
+                throw new ExceptionWithConfigData(errorMessage, configData);
+            });
+
+            return IndexerConfigurationStatus.RequiresTesting;
+        }
+
+        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        {
+            var releases = new List<ReleaseInfo>();
+            var results = await RequestStringWithCookiesAndRetry(string.Format(SearchUrl, HttpUtility.UrlEncode(query.GetQueryString())));
+
+            try
+            {
+                CQ dom = results.Content;
+                var rows = dom["#torrents-table > tbody > tr.tt_row"];
+                foreach (var row in rows)
+                {
+                    CQ qRow = row.Cq();
+                    var release = new ReleaseInfo();
+
+                    release.MinimumRatio = 1;
+                    release.MinimumSeedTime = 129600;
+                    release.Title = qRow.Find(".ttr_name > a").Text();
+                    release.Description = release.Title;
+                    release.Guid = new Uri(SiteLink  + qRow.Find(".ttr_name > a").Attr("href"));
+                    release.Comments = release.Guid;
+                    release.Link = new Uri(SiteLink + qRow.Find(".td_dl > a").Attr("href"));
+
+                    var sizeStr = qRow.Find(".ttr_size").Contents()[0].NodeValue;
+                    release.Size = ReleaseInfo.GetBytes(sizeStr);
+
+                    var timeStr = qRow.Find(".ttr_added").Text();
+                    DateTime time;
+                    if (DateTime.TryParseExact(timeStr, "yyyy-MM-ddHH:mm:ss", CultureInfo.InvariantCulture, DateTimeStyles.None, out time))
+                    {
+                        release.PublishDate = time;
+                    }
+
+                    release.Seeders = ParseUtil.CoerceInt(qRow.Find(".ttr_seeders").Text());
+                    release.Peers = ParseUtil.CoerceInt(qRow.Find(".ttr_leechers").Text()) + release.Seeders;
+
+                    var cat = qRow.Find(".ttr_type a").Attr("href").Replace("?cat=",string.Empty);
+
+                    release.Category = MapTrackerCatToNewznab(cat);
+
+                    releases.Add(release);
+                }
+            }
+            catch (Exception ex)
+            {
+                OnParseError(results.Content, ex);
+            }
+
+            return releases;
+        }
+    }
+}

src/Jackett/Indexers/SceneFZ.cs

@@ -0,0 +1,125 @@
+using Jackett.Utils.Clients;
+using NLog;
+using Jackett.Services;
+using Jackett.Utils;
+using Jackett.Models;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using System.Collections.Generic;
+using CsQuery;
+using System.Web;
+using System;
+using System.Globalization;
+using Jackett.Models.IndexerConfig;
+
+namespace Jackett.Indexers
+{
+    public class SceneFZ : BaseIndexer, IIndexer
+    {
+        string LoginUrl { get { return SiteLink + "takelogin.php"; } }
+
+        string BrowseUrl { get { return SiteLink + "ajax_browse.php"; } }
+
+        new ConfigurationDataBasicLogin configData
+        {
+            get { return (ConfigurationDataBasicLogin)base.configData; }
+            set { base.configData = value; }
+        }
+
+        public SceneFZ(IIndexerManagerService i, IWebClient wc, Logger l, IProtectionService ps)
+            : base(name: "SceneFZ",
+                   description: "Torrent tracker. Tracking over 50.000 torrent files.",
+                   link: "http://scenefz.net/",
+                   caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
+                   manager: i,
+                   client: wc,
+                   logger: l,
+                   p: ps,
+                   configData: new ConfigurationDataBasicLogin())
+        {
+            AddCategoryMapping(32, TorznabCatType.Movies);
+            AddCategoryMapping(33, TorznabCatType.TV);
+        }
+
+        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        {
+            configData.LoadValuesFromJson(configJson);
+            var pairs = new Dictionary<string, string>
+            {
+                { "username", configData.Username.Value },
+                { "password", configData.Password.Value }
+            };
+
+            var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, null, LoginUrl);
+            await ConfigureIfOK(result.Cookies, result.Content != null && result.Content.Contains("Please wait..."), () =>
+                {
+                    CQ dom = result.Content;
+                    var errorMessage = dom[".tableinborder:eq(1) td"].Text().Trim();
+                    throw new ExceptionWithConfigData(errorMessage, configData);
+                });
+            return IndexerConfigurationStatus.RequiresTesting;
+        }
+
+        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        {
+            var releases = new List<ReleaseInfo>();
+            var searchUrl = BrowseUrl;
+            var searchString = query.GetQueryString();
+
+            var cats = MapTorznabCapsToTrackers(query);
+            string cat = "0";
+
+            if (cats.Count == 1)
+            {
+                cat = cats[0];
+            }
+
+            if (!string.IsNullOrWhiteSpace(searchString) || cat != "0")
+                searchUrl += string.Format("?search={0}&param_val=0&complex_search=0&incldead=mc{1}&orderby=added&sort=desc", HttpUtility.UrlEncode(searchString), cat);
+
+            var response = await RequestStringWithCookiesAndRetry(searchUrl, null, BrowseUrl);
+            var results = response.Content;
+            try
+            {
+                CQ dom = results;
+                var rows = dom["td#browse-middle-td"];
+
+                foreach (var row in rows)
+                {
+                    var release = new ReleaseInfo();
+                    var qRow = row.Cq();
+                    var qTitleLink = qRow.Find("table tbody tr:eq(0) td a").First();
+                    release.Title = qRow.Find("table tbody tr:eq(0) td a b").Text().Trim();
+                    release.Description = release.Title;
+                    release.Guid = new Uri(SiteLink + qTitleLink.Attr("href"));
+                    release.Comments = release.Guid;
+
+                    //24.04.2016 16:44:57
+                    var dateStr = qRow.Find("table tbody tr:eq(1) td:eq(4)").Html().Replace("&nbsp;", " ").Trim();
+                    release.PublishDate = DateTime.ParseExact(dateStr, "dd.MM.yyyy HH:mm:ss", CultureInfo.InvariantCulture).AddHours(-2);
+
+                    var qLink = qRow.First().Next().Find("a");
+                    release.Link = new Uri(SiteLink + qLink.Attr("href"));
+
+                    var sizeStr = qRow.Find("table tbody tr:eq(1) td b").Text().Trim();
+                    release.Size = ReleaseInfo.GetBytes(sizeStr.Replace(",", "."));
+
+                    release.Seeders = ParseUtil.CoerceInt(qRow.Find("table tbody tr:eq(1) td:eq(1) b:eq(0) font").Text().Trim());
+                    release.Peers = ParseUtil.CoerceInt(qRow.Find("table tbody tr:eq(1) td:eq(1) b:eq(1) font").Text().Trim()) + release.Seeders;
+
+                    var catId = qRow.First().Prev().Find("a").Attr("onclick").Substring(21, 2);
+                    release.Category = MapTrackerCatToNewznab(catId);
+
+                    releases.Add(release);
+                }
+            }
+            catch (Exception ex)
+            {
+                OnParseError(results, ex);
+            }
+
+            return releases;
+        }
+    }
+}
+

src/Jackett/Indexers/SceneTime.cs

@@ -7,26 +7,23 @@ using Newtonsoft.Json.Linq;
 using NLog;
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Text;
 using System.Threading.Tasks;
-using System.Web;
 using Jackett.Models.IndexerConfig;
+using System.Text.RegularExpressions;
 
 namespace Jackett.Indexers
 {
     public class SceneTime : BaseIndexer, IIndexer
     {
+        private string StartPageUrl { get { return SiteLink + "login.php"; } }
         private string LoginUrl { get { return SiteLink + "takelogin.php"; } }
         private string SearchUrl { get { return SiteLink + "browse_API.php"; } }
         private string DownloadUrl { get { return SiteLink + "download.php/{0}/download.torrent"; } }
 
-        new ConfigurationDataBasicLogin configData
+        new ConfigurationDataRecaptchaLogin configData
         {
-            get { return (ConfigurationDataBasicLogin)base.configData; }
+            get { return (ConfigurationDataRecaptchaLogin)base.configData; }
             set { base.configData = value; }
         }
 
@@ -34,13 +31,72 @@ namespace Jackett.Indexers
             : base(name: "SceneTime",
                 description: "Always on time",
                 link: "https://www.scenetime.com/",
-                caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
+                caps: new TorznabCapabilities(),
                 manager: i,
                 client: w,
                 logger: l,
                 p: ps,
-                configData: new ConfigurationDataBasicLogin())
+                configData: new ConfigurationDataRecaptchaLogin("For best results, change the 'Torrents per page' setting to the maximum in your profile on the SceneTime webpage."))
         {
+            AddCategoryMapping(1, TorznabCatType.MoviesSD);
+            AddCategoryMapping(3, TorznabCatType.MoviesDVD);
+            AddCategoryMapping(47, TorznabCatType.MoviesSD);
+            AddCategoryMapping(57, TorznabCatType.MoviesSD);
+            AddCategoryMapping(59, TorznabCatType.MoviesHD);
+            AddCategoryMapping(61, TorznabCatType.MoviesSD);
+            AddCategoryMapping(64, TorznabCatType.Movies3D);
+            AddCategoryMapping(80, TorznabCatType.MoviesForeign);
+            AddCategoryMapping(81, TorznabCatType.MoviesBluRay);
+            AddCategoryMapping(82, TorznabCatType.MoviesOther);
+            AddCategoryMapping(102, TorznabCatType.MoviesOther);
+            AddCategoryMapping(103, TorznabCatType.MoviesWEBDL);
+            AddCategoryMapping(105, TorznabCatType.Movies);
+
+            AddCategoryMapping(6, TorznabCatType.PCGames);
+            AddCategoryMapping(48, TorznabCatType.ConsoleXbox);
+            AddCategoryMapping(49, TorznabCatType.ConsolePSP);
+            AddCategoryMapping(50, TorznabCatType.ConsolePS3);
+            AddCategoryMapping(51, TorznabCatType.ConsoleWii);
+            AddCategoryMapping(55, TorznabCatType.ConsoleNDS);
+            AddCategoryMapping(107, TorznabCatType.ConsolePS4);
+
+            AddCategoryMapping(2, TorznabCatType.TVSD);
+            AddCategoryMapping(43, TorznabCatType.TV);
+            AddCategoryMapping(9, TorznabCatType.TVHD);
+            AddCategoryMapping(63, TorznabCatType.TV);
+            AddCategoryMapping(77, TorznabCatType.TVSD);
+            AddCategoryMapping(79, TorznabCatType.TVSport);
+            AddCategoryMapping(100, TorznabCatType.TVFOREIGN);
+            AddCategoryMapping(83, TorznabCatType.TVWEBDL);
+
+            AddCategoryMapping(5, TorznabCatType.PC0day);
+            AddCategoryMapping(7, TorznabCatType.Books);
+            AddCategoryMapping(52, TorznabCatType.PCMac);
+            AddCategoryMapping(65, TorznabCatType.BooksComics);
+            AddCategoryMapping(53, TorznabCatType.PC);
+
+            AddCategoryMapping(4, TorznabCatType.Audio);
+            AddCategoryMapping(11, TorznabCatType.AudioVideo);
+        }
+
+        public override async Task<ConfigurationData> GetConfigurationForSetup()
+        {
+            var loginPage = await RequestStringWithCookies(StartPageUrl, string.Empty);
+            CQ cq = loginPage.Content;
+            var result = new ConfigurationDataRecaptchaLogin();
+            CQ recaptcha = cq.Find(".g-recaptcha").Attr("data-sitekey");
+            if (recaptcha.Length != 0)
+            {
+                result.CookieHeader.Value = loginPage.Cookies;
+                result.Captcha.SiteKey = cq.Find(".g-recaptcha").Attr("data-sitekey");
+                return result;
+            }
+            else
+            {
+                var stdResult = new ConfigurationDataBasicLogin();
+                stdResult.CookieHeader.Value = loginPage.Cookies;
+                return stdResult;
+            }
         }
 
         public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
@@ -48,9 +104,32 @@ namespace Jackett.Indexers
             configData.LoadValuesFromJson(configJson);
             var pairs = new Dictionary<string, string> {
                 { "username", configData.Username.Value },
-                { "password", configData.Password.Value }
+                { "password", configData.Password.Value },
+                { "g-recaptcha-response", configData.Captcha.Value }
             };
 
+            if (!string.IsNullOrWhiteSpace(configData.Captcha.Cookie))
+            {
+                CookieHeader = configData.Captcha.Cookie;
+                try
+                {
+                    var results = await PerformQuery(new TorznabQuery());
+                    if (results.Count() == 0)
+                    {
+                        throw new Exception("Your cookie did not work");
+                    }
+
+                    SaveConfig();
+                    IsConfigured = true;
+                    return IndexerConfigurationStatus.Completed;
+                }
+                catch (Exception e)
+                {
+                    IsConfigured = false;
+                    throw new Exception("Your cookie did not work: " + e.Message);
+                }
+            }
+
             var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, null, LoginUrl);
             await ConfigureIfOK(result.Cookies, result.Content != null && result.Content.Contains("logout.php"), () =>
             {
@@ -62,23 +141,45 @@ namespace Jackett.Indexers
             return IndexerConfigurationStatus.RequiresTesting;
         }
 
-        private Dictionary<string, string> GetSearchFormData(string searchString)
-        {
-            return new Dictionary<string, string> {
-                { "c2", "1" }, { "c43", "1" }, { "c9", "1" }, { "c63", "1" }, { "c77", "1" }, { "c100", "1" }, { "c101", "1" },
-                { "cata", "yes" }, { "sec", "jax" },
-                { "search", searchString}
-            };
-        }
 
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
-            var releases = new List<ReleaseInfo>();
-            var results = await PostDataWithCookiesAndRetry(SearchUrl, GetSearchFormData(query.GetQueryString()));
+            Dictionary<string, string> qParams = new Dictionary<string, string>();
+            qParams.Add("cata", "yes");
+            qParams.Add("sec", "jax");
+            
+            List<string> catList = MapTorznabCapsToTrackers(query);
+            foreach (string cat in catList)
+            {
+                qParams.Add("c" + cat, "1");
+            }
+
+            if (!string.IsNullOrEmpty(query.SanitizedSearchTerm))
+            {
+                qParams.Add("search", query.GetQueryString());
+            }
+
+            var results = await PostDataWithCookiesAndRetry(SearchUrl, qParams);
+            List<ReleaseInfo> releases = ParseResponse(results.Content);
+            
+            return releases;
+        }
+
+        public List<ReleaseInfo> ParseResponse(string htmlResponse)
+        {
+            List<ReleaseInfo> releases = new List<ReleaseInfo>();
 
             try
             {
-                CQ dom = results.Content;
+                CQ dom = htmlResponse;
+
+                List<string> headerColumns = dom["table[class*='movehere']"].First().Find("tbody > tr > td[class='cat_Head']").Select(x => x.Cq().Text()).ToList();
+                int categoryIndex = headerColumns.FindIndex(x => x.Equals("Type"));
+                int nameIndex = headerColumns.FindIndex(x => x.Equals("Name"));
+                int sizeIndex = headerColumns.FindIndex(x => x.Equals("Size"));
+                int seedersIndex = headerColumns.FindIndex(x => x.Equals("Seeders"));
+                int leechersIndex = headerColumns.FindIndex(x => x.Equals("Leechers"));
+
                 var rows = dom["tr.browse"];
                 foreach (var row in rows)
                 {
@@ -86,7 +187,12 @@ namespace Jackett.Indexers
                     release.MinimumRatio = 1;
                     release.MinimumSeedTime = 172800;
 
-                    var descCol = row.ChildElements.ElementAt(1);
+                    var categoryCol = row.ChildElements.ElementAt(categoryIndex);
+                    string catLink = categoryCol.Cq().Find("a").Attr("href");
+                    string catId = new Regex(@"\?cat=(\d*)").Match(catLink).Groups[1].ToString().Trim();
+                    release.Category = MapTrackerCatToNewznab(catId);
+
+                    var descCol = row.ChildElements.ElementAt(nameIndex);
                     var qDescCol = descCol.Cq();
                     var qLink = qDescCol.Find("a");
                     release.Title = qLink.Text();
@@ -98,19 +204,20 @@ namespace Jackett.Indexers
 
                     release.PublishDate = DateTimeUtil.FromTimeAgo(descCol.ChildNodes.Last().InnerText);
 
-                    var sizeStr = row.ChildElements.ElementAt(5).Cq().Text();
+                    var sizeStr = row.ChildElements.ElementAt(sizeIndex).Cq().Text();
                     release.Size = ReleaseInfo.GetBytes(sizeStr);
 
-                    release.Seeders = ParseUtil.CoerceInt(row.ChildElements.ElementAt(6).Cq().Text().Trim());
-                    release.Peers = ParseUtil.CoerceInt(row.ChildElements.ElementAt(7).Cq().Text().Trim()) + release.Seeders;
+                    release.Seeders = ParseUtil.CoerceInt(row.ChildElements.ElementAt(seedersIndex).Cq().Text().Trim());
+                    release.Peers = ParseUtil.CoerceInt(row.ChildElements.ElementAt(leechersIndex).Cq().Text().Trim()) + release.Seeders;
 
                     releases.Add(release);
                 }
             }
             catch (Exception ex)
             {
-                OnParseError(results.Content, ex);
+                OnParseError(htmlResponse, ex);
             }
+
             return releases;
         }
     }

src/Jackett/Indexers/SpeedCD.cs

@@ -8,18 +8,17 @@ using NLog;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Text.RegularExpressions;
+using System.Linq;
 using System.Threading.Tasks;
 using Jackett.Models.IndexerConfig;
+using System.Collections.Specialized;
 
 namespace Jackett.Indexers
 {
     public class SpeedCD : BaseIndexer, IIndexer
     {
-        private string LoginUrl { get { return SiteLink + "take.login.php"; } }
-        private string SearchUrl { get { return SiteLink + "V3/API/API.php"; } }
-        private string CommentsUrl { get { return SiteLink + "t/{0}"; } }
-        private string DownloadUrl { get { return SiteLink + "download.php?torrent={0}"; } }
+        private string LoginUrl { get { return SiteLink + "takeElogin.php"; } }
+        private string SearchUrl { get { return SiteLink + "browse.php"; } }
 
         new ConfigurationDataBasicLogin configData
         {
@@ -30,13 +29,14 @@ namespace Jackett.Indexers
         public SpeedCD(IIndexerManagerService i, Logger l, IWebClient wc, IProtectionService ps)
             : base(name: "Speed.cd",
                 description: "Your home now!",
-                link: "http://speed.cd/",
+                link: "https://speed.cd/",
                 caps: new TorznabCapabilities(),
                 manager: i,
                 client: wc,
                 logger: l,
                 p: ps,
-                configData: new ConfigurationDataBasicLogin())
+                configData: new ConfigurationDataBasicLogin(@"Speed.Cd have increased their security. If you are having problems please check the security tab in your Speed.Cd profile.
+                                                            eg. Geo Locking, your seedbox may be in a different country to the one where you login via your web browser"))
         {
             AddCategoryMapping("1", TorznabCatType.MoviesOther);
             AddCategoryMapping("42", TorznabCatType.Movies);
@@ -71,33 +71,46 @@ namespace Jackett.Indexers
         public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
         {
             configData.LoadValuesFromJson(configJson);
+
+            await DoLogin();
+
+            return IndexerConfigurationStatus.RequiresTesting;
+        }
+
+        private async Task DoLogin()
+        {
             var pairs = new Dictionary<string, string> {
                 { "username", configData.Username.Value },
                 { "password", configData.Password.Value },
             };
 
             var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, null, SiteLink);
-            await ConfigureIfOK(result.Cookies, result.Content != null && result.Content.Contains("logout.php"), () =>
+
+            await ConfigureIfOK(result.Cookies, result.Content != null && result.Content.Contains("/browse.php"), () =>
             {
                 CQ dom = result.Content;
-                var errorMessage = dom["h5"].First().Text().Trim();
+                var errorMessage = dom.Text();
                 throw new ExceptionWithConfigData(errorMessage, configData);
             });
-
-            return IndexerConfigurationStatus.RequiresTesting;
         }
 
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
+            var loggedInCheck = await RequestStringWithCookies(SearchUrl);
+            if (!loggedInCheck.Content.Contains("/logout.php"))
+            {
+                //Cookie appears to expire after a period of time or logging in to the site via browser
+                await DoLogin();
+            }
+
+
             var releases = new List<ReleaseInfo>();
 
-            Dictionary<string, string> qParams = new Dictionary<string, string>();
-            qParams.Add("jxt", "4");
-            qParams.Add("jxw", "b");
+            NameValueCollection qParams = new NameValueCollection();
 
-            if (!string.IsNullOrEmpty(query.SanitizedSearchTerm))
+            if (!string.IsNullOrEmpty(query.GetQueryString()))
             {
-                qParams.Add("search", query.SanitizedSearchTerm);
+                qParams.Add("search", query.GetQueryString());
             }
 
             List<string> catList = MapTorznabCapsToTrackers(query);
@@ -105,40 +118,58 @@ namespace Jackett.Indexers
             {
                 qParams.Add("c" + cat, "1");
             }
-            
-            var response = await PostDataWithCookiesAndRetry(SearchUrl, qParams);
+
+            string urlSearch = SearchUrl;
+            if (qParams.Count > 0)
+            {
+                urlSearch += $"?{qParams.GetQueryString()}";
+            }
+
+            var response = await RequestStringWithCookiesAndRetry(urlSearch);
+
             try
             {
-                var jsonResult = JObject.Parse(response.Content);
-                var resultArray = ((JArray)jsonResult["Fs"])[0]["Cn"]["torrents"];
-                foreach (var jobj in resultArray)
+                CQ dom = response.Content;
+                var rows = dom["div[id='torrentTable'] > div[class='box torrentBox'] > div[class='boxContent'] > table > tbody > tr"];
+
+                foreach (IDomObject row in rows)
                 {
+                    CQ torrentData = row.OuterHTML;
+                    CQ cells = row.Cq().Find("td");
+
+                    string title = torrentData.Find("a[class='torrent']").First().Text().Trim();
+                    Uri link = new Uri(SiteLink + torrentData.Find("img[class='icos save']").First().Parent().Attr("href").Trim());
+                    Uri guid = new Uri(SiteLink + torrentData.Find("a[class='torrent']").First().Attr("href").Trim().TrimStart('/'));
+                    long size = ReleaseInfo.GetBytes(cells.Elements.ElementAt(4).Cq().Text());
+                    int seeders = ParseUtil.CoerceInt(cells.Elements.ElementAt(5).Cq().Text());
+                    int leechers = ParseUtil.CoerceInt(cells.Elements.ElementAt(6).Cq().Text());
+
+                    string pubDateStr = torrentData.Find("span[class^='elapsedDate']").First().Attr("title").Trim().Replace(" at", "");
+                    DateTime publishDate = DateTime.ParseExact(pubDateStr, "dddd, MMMM d, yyyy h:mmtt", CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal).ToLocalTime();
+
+                    long category = 0;
+                    string cat = torrentData.Find("a[class='cat']").First().Attr("id").Trim();
+                    long.TryParse(cat, out category);
+
+
                     var release = new ReleaseInfo();
 
-                    var id = (int)jobj["id"];
-                    release.Comments = new Uri(string.Format(CommentsUrl, id));
-                    release.Guid = release.Comments;
-                    release.Link = new Uri(string.Format(DownloadUrl, id));
-
-                    release.Title = Regex.Replace((string)jobj["name"], "<.*?>", String.Empty);
-
-                    var SizeStr = ((string)jobj["size"]);
-                    release.Size = ReleaseInfo.GetBytes(SizeStr);
-
-                    var cat = (int)jobj["cat"];
-                    release.Category = MapTrackerCatToNewznab(cat.ToString());
-
-                    release.Seeders = ParseUtil.CoerceInt((string)jobj["seed"]);
-                    release.Peers = ParseUtil.CoerceInt((string)jobj["leech"]) + release.Seeders;
-
-                    // ex: Tuesday, May 26, 2015 at 6:00pm
-                    var dateStr = new Regex("title=\"(.*?)\"").Match((string)jobj["added"]).Groups[1].ToString();
-                    dateStr = dateStr.Replace(" at", "");
-                    var dateTime = DateTime.ParseExact(dateStr, "dddd, MMMM d, yyyy h:mmtt", CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal);
-                    release.PublishDate = dateTime.ToLocalTime();
+                    release.Title = title;
+                    release.Guid = guid;
+                    release.Link = link;
+                    release.PublishDate = publishDate;
+                    release.Size = size;
+                    release.Description = release.Title;
+                    release.Seeders = seeders;
+                    release.Peers = seeders + leechers;
+                    release.MinimumRatio = 1;
+                    release.MinimumSeedTime = 172800;
+                    release.Category = MapTrackerCatToNewznab(category.ToString());
+                    release.Comments = guid;
 
                     releases.Add(release);
                 }
+
             }
             catch (Exception ex)
             {

src/Jackett/Indexers/TVChaosUK.cs

@@ -39,7 +39,7 @@ namespace Jackett.Indexers
         public TVChaosUK(IIndexerManagerService i, IWebClient wc, Logger l, IProtectionService ps)
             : base(name: "TV Chaos",
                 description: "Total Chaos",
-                link: "https://tvchaosuk.com/",
+                link: "https://www.tvchaosuk.com/",
                 caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
                 manager: i,
                 client: wc,
@@ -194,6 +194,12 @@ namespace Jackett.Indexers
             }
             else
             {
+                // The TVChaos UK search requires an exact match of the search string.
+                // But it seems like they just send the unfiltered search to the SQL server in a like query (LIKE '%$searchstring%').
+                // So we replace any whitespace/special character with % to make the search more usable.
+                Regex ReplaceRegex = new Regex("[^a-zA-Z0-9]+");
+                searchString = ReplaceRegex.Replace(searchString, "%");
+
                 var searchParams = new Dictionary<string, string> {
                     { "do", "search" },
                     { "keywords",  searchString },

src/Jackett/Indexers/TehConnection.cs

@@ -1,5 +1,4 @@
 using CsQuery;
-using Jackett.Indexers;
 using Jackett.Models;
 using Jackett.Services;
 using Jackett.Utils;
@@ -41,27 +40,35 @@ namespace Jackett.Indexers
                                                                         Separate options with a space if using more than one option.<br>Filter options available:
                                                                         <br><code>QualityEncodeOnly</code><br><code>FreeLeechOnly</code>"))
         {
-            AddCategoryMapping(7, TorznabCatType.Movies);
-            AddCategoryMapping(7, TorznabCatType.MoviesForeign);
-            AddCategoryMapping(7, TorznabCatType.MoviesOther);
-            AddCategoryMapping(7, TorznabCatType.MoviesSD);
-            AddCategoryMapping(7, TorznabCatType.MoviesHD);
-            AddCategoryMapping(7, TorznabCatType.Movies3D);
-            AddCategoryMapping(7, TorznabCatType.MoviesBluRay);
-            AddCategoryMapping(7, TorznabCatType.MoviesDVD);
-            AddCategoryMapping(7, TorznabCatType.MoviesWEBDL);
+            AddCategoryMapping(1, TorznabCatType.Movies);
+            AddCategoryMapping(1, TorznabCatType.MoviesForeign);
+            AddCategoryMapping(1, TorznabCatType.MoviesOther);
+            AddCategoryMapping(1, TorznabCatType.MoviesSD);
+            AddCategoryMapping(1, TorznabCatType.MoviesHD);
+            AddCategoryMapping(1, TorznabCatType.Movies3D);
+            AddCategoryMapping(1, TorznabCatType.MoviesBluRay);
+            AddCategoryMapping(1, TorznabCatType.MoviesDVD);
+            AddCategoryMapping(1, TorznabCatType.MoviesWEBDL);
         }
 
         public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
         {
             configData.LoadValuesFromJson(configJson);
+
+            await DoLogin();
+
+            return IndexerConfigurationStatus.RequiresTesting;
+        }
+
+        private async Task DoLogin()
+        {
             var pairs = new Dictionary<string, string> {
                 { "username", configData.Username.Value },
                 { "password", configData.Password.Value },
                 { "keeplogged", "1" },
                 { "login", "Log In!" }
             };
-         
+
             var response = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, indexUrl, SiteLink);
 
             await ConfigureIfOK(response.Cookies, response.Content != null && response.Content.Contains("/logout.php"), () =>
@@ -70,11 +77,24 @@ namespace Jackett.Indexers
                 string errorMessage = "Unable to login to TehConnection";
                 throw new ExceptionWithConfigData(errorMessage, configData);
             });
-            return IndexerConfigurationStatus.RequiresTesting;
         }
 
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
+            var loggedInCheck = await RequestStringWithCookies(SearchUrl);
+            if (!loggedInCheck.Content.Contains("/logout.php"))
+            {
+                //Cookie appears to expire after a period of time or logging in to the site via browser
+                DateTime lastLoggedInCheck;
+                DateTime.TryParse(configData.LastLoggedInCheck.Value, out lastLoggedInCheck);
+                if (lastLoggedInCheck < DateTime.Now.AddMinutes(-15))
+                {
+                    await DoLogin();
+                    configData.LastLoggedInCheck.Value = DateTime.Now.ToString("o");
+                    SaveConfig();
+                }
+            }
+
             var releases = new List<ReleaseInfo>();
             bool configFreeLeechOnly = configData.FilterString.Value.ToLowerInvariant().Contains("freeleechonly");
             bool configQualityEncodeOnly = configData.FilterString.Value.ToLowerInvariant().Contains("qualityencodeonly");
@@ -84,7 +104,14 @@ namespace Jackett.Indexers
                 movieListSearchUrl = SearchUrl;
             else
             {
-                movieListSearchUrl = string.Format("{0}?action=basic&searchstr={1}", SearchUrl, HttpUtility.UrlEncode(query.GetQueryString()));
+                if (!string.IsNullOrEmpty(query.ImdbID))
+                {
+                    movieListSearchUrl = string.Format("{0}?action=basic&searchstr={1}", SearchUrl, HttpUtility.UrlEncode(query.ImdbID));
+                }
+                else
+                {
+                    movieListSearchUrl = string.Format("{0}?action=basic&searchstr={1}", SearchUrl, HttpUtility.UrlEncode(query.GetQueryString()));
+                } 
             }
 
             var results = await RequestStringWithCookiesAndRetry(movieListSearchUrl);

src/Jackett/Indexers/TorrentBytes.cs

@@ -152,15 +152,18 @@ namespace Jackett.Indexers
                         break;
                     }
 
-                    var cat = row.Cq().Find("td:eq(0) a").First().Attr("href").Substring(15);
-                    release.Category = MapTrackerCatToNewznab(cat);
-
+                    // Check if the release has been assigned a category
+                    if (row.Cq().Find("td:eq(0) a").Length > 0)
+                    {
+                        var cat = row.Cq().Find("td:eq(0) a").First().Attr("href").Substring(15);
+                        release.Category = MapTrackerCatToNewznab(cat);
+                    }
 
                     var qLink = row.Cq().Find("td:eq(1) a").First();
                     release.Link = new Uri(SiteLink + qLink.Attr("href"));
 
                     var added = row.Cq().Find("td:eq(4)").First().Text().Trim();
-                    release.PublishDate = DateTimeUtil.FromTimeAgo(added);
+                    release.PublishDate = DateTime.ParseExact(added, "yyyy-MM-ddHH:mm:ss", CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal).ToLocalTime();
 
                     var sizeStr = row.Cq().Find("td:eq(6)").First().Text().Trim();
                     release.Size = ReleaseInfo.GetBytes(sizeStr);

src/Jackett/Indexers/TorrentDay.cs

@@ -54,6 +54,7 @@ namespace Jackett.Indexers
             AddCategoryMapping(25, TorznabCatType.MoviesSD);
             AddCategoryMapping(11, TorznabCatType.MoviesHD);
             AddCategoryMapping(5, TorznabCatType.MoviesHD);
+            AddCategoryMapping(48, TorznabCatType.Movies);
             AddCategoryMapping(3, TorznabCatType.MoviesSD);
             AddCategoryMapping(21, TorznabCatType.MoviesSD);
             AddCategoryMapping(22, TorznabCatType.MoviesForeign);
@@ -61,9 +62,12 @@ namespace Jackett.Indexers
             AddCategoryMapping(44, TorznabCatType.MoviesSD);
             AddCategoryMapping(1, TorznabCatType.MoviesSD);
 
-            // Music foreign
-            // Music packs
-            // Music videos
+            // Music
+            AddCategoryMapping(17, TorznabCatType.AudioMP3);
+            AddCategoryMapping(44, TorznabCatType.AudioLossless);
+            AddCategoryMapping(23, TorznabCatType.AudioForeign);
+            AddCategoryMapping(41, TorznabCatType.AudioOther);
+            AddCategoryMapping(16, TorznabCatType.AudioVideo);
 
             AddCategoryMapping(4, TorznabCatType.PCGames);
             // ps3
@@ -79,6 +83,7 @@ namespace Jackett.Indexers
             AddCategoryMapping(26, TorznabCatType.TVSD);
             AddCategoryMapping(7, TorznabCatType.TVHD);
             AddCategoryMapping(2, TorznabCatType.TVSD);
+            AddCategoryMapping(34, TorznabCatType.TV);
 
             AddCategoryMapping(6, TorznabCatType.XXX);
             AddCategoryMapping(15, TorznabCatType.XXX);
@@ -151,8 +156,15 @@ namespace Jackett.Indexers
             var queryUrl = SearchUrl;
             var queryCollection = new NameValueCollection();
 
-            if (!string.IsNullOrWhiteSpace(searchString))
-                queryCollection.Add("search", searchString);
+            if (query.QueryType == "TorrentPotato" && !string.IsNullOrWhiteSpace(query.ImdbID) && query.ImdbID.ToLower().StartsWith("tt"))
+            {
+                queryCollection.Add("search", query.ImdbID);
+            }
+            else
+            {
+                if (!string.IsNullOrWhiteSpace(searchString))
+                    queryCollection.Add("search", searchString);
+            }
 
             foreach (var cat in MapTorznabCapsToTrackers(query))
                 queryCollection.Add("c" + cat, "1");