Update XSpeeds categories (#639)

Added test for ParseUtil.RemoveInvalidXmlChars() using a snippet of rss from XSeeds that was originally causing problems.

README.md

@@ -2,9 +2,9 @@
 
 This project is a new fork and is recruiting development help.  If you are able to help out please contact us.
 
-Jackett works as a proxy server: it translates queries from apps (Sonarr, 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. 
+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,46 +14,71 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 
 
 #### Supported Private Trackers
+ * Abnormal
  * AlphaRatio
+ * Andraste
  * AnimeBytes
+ * AnimeTorrents
  * Avistaz
+ * BakaBT
  * bB
+ * Best Friends
  * BeyondHD
+ * Bit-City Reloaded
  * BIT-HDTV
  * BitMeTV
  * BitSoup
  * BlueTigers
  * BTN
+ * CinemaZ
  * DanishBits
  * Demonoid
- * EuTorrents
+ * DigitalHive
  * FileList
- * Fnt
- * French-ADN
  * 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
+ * Shareisland
  * Shazbat
  * SpeedCD
  * TehConnection
+ * Torrent Network
  * TorrentBytes
  * TorrentDay
+ * TorrentHeaven
  * TorrentLeech
  * TorrentShack
+ * Torrent-Syndikat
+ * TransmitheNet
  * TV Chaos UK
  * World-In-HD
+ * WorldOfP2P
+ * x264
  * XSpeeds
+ * Xthor
 
 #### Installation on Windows
 
@@ -63,12 +88,13 @@ Jackett can also be run from the command line using JackettConsole.exe if you wo
 
 #### Installation on Linux/OSX
  1. Install [Mono 4](http://www.mono-project.com/download/) or better
+       * Follow the instructions on the mono website and install the `mono-devel` package.
  2. Install  libcurl:
-       * Debian/Ubunutu: apt-get install libcurl-dev
-       * Redhat/Fedora: yum install libcurl-devel
+       * 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/)
 
 #### Installation on Synology
@@ -92,9 +118,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

@@ -60,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

@@ -99,6 +99,13 @@ namespace JackettConsole
                         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

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">
@@ -164,6 +164,7 @@
     <Compile Include="TestIIndexerManagerServiceHelper.cs" />
     <Compile Include="TestUtil.cs" />
     <Compile Include="TestWebClient.cs" />
+    <Compile Include="Util\ParseUtilTests.cs" />
     <Compile Include="Util\ServerUtilTests.cs" />
     <Compile Include="Util\TvCategoryParserTests.cs" />
   </ItemGroup>
@@ -182,6 +183,9 @@
   <ItemGroup>
     <Folder Include="Indexers\" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Util\Invalid-RSS.xml" />
+  </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>

src/Jackett.Test/TestIIndexerManagerServiceHelper.cs

@@ -42,5 +42,10 @@ namespace JackettTest
         {
             throw new NotImplementedException();
         }
+
+        public void InitCardigannIndexers(string path)
+        {
+            throw new NotImplementedException();
+        }
     }
 }

src/Jackett.Test/Util/Invalid-RSS.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0">
+  <channel>
+    <title>RSS Syndicator</title>
+    <link>http://somewebsite.com</link>
+    <description>
+      &lt;br /&gt;
+      Enjoy!&lt;br /&gt;
+      &lt;br /&gt;
+      -&lt;br /&gt;
+      &lt;br /&gt;
+       group info&lt;br /&gt;
+      &lt;br /&gt;
+      Know Your Role and Shut Your Mouth!&lt;br /&gt;
+      &lt;br /&gt;
+       we are now looking for...&lt;br /&gt;
+      &lt;br /&gt;
+    </description>
+  </channel>
+</rss>

src/Jackett.Test/Util/ParseUtilTests.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+using System.Xml.XPath;
+using FluentAssertions;
+using Jackett.Utils;
+using NUnit.Framework;
+
+namespace JackettTest.Util
+{
+    [TestFixture]
+    public class ParseUtilTests
+    {
+        private static string InvalidRssXml
+        {
+            get
+            {
+                var type = typeof(ParseUtilTests);
+                using (var resourceStream = type.Assembly.GetManifestResourceStream($"{type.Namespace}.Invalid-RSS.xml"))
+                using (var sr = new StreamReader(resourceStream))
+                {
+                    return sr.ReadToEnd();
+                }
+                
+            }
+        }
+
+        [Test]
+        public void Invalid_RSS_should_parse_after_removing_invalid_chars()
+        {
+            var invalidRss = InvalidRssXml;
+            Action parseAction = () => XDocument.Parse(invalidRss);
+            parseAction.ShouldThrow<Exception>().WithMessage("'\a', hexadecimal value 0x07, is an invalid character. Line 12, position 7.");
+
+            var validRSs = ParseUtil.RemoveInvalidXmlChars(invalidRss);
+            var rssDoc = XDocument.Parse(validRSs);
+            rssDoc.Root.Should().NotBeNull();
+            var description = rssDoc.Root.XPathSelectElement("//description");
+            description.Value.Should().Contain("Know Your Role and Shut Your Mouth!");
+        }
+    }
+}

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

@@ -293,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
@@ -92,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");
                 }
@@ -125,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");
                 }
@@ -141,7 +151,7 @@ function prepareTestButtons() {
 
 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;
@@ -190,9 +200,35 @@ 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;
+                }
             }
         }
     }
@@ -225,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();
                 }
@@ -247,7 +294,7 @@ function populateSetupForm(indexerId, name, config, caps, link) {
         $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);
@@ -298,6 +345,32 @@ function clearNotifications() {
     $('[data-notify="container"]').remove();
 }
 
+function updateReleasesRow(row)
+{    
+    var labels = $(row).find("span.release-labels");
+    var DownloadVolumeFactor = parseFloat($(row).find("td.DownloadVolumeFactor").html());
+    var UploadVolumeFactor = parseFloat($(row).find("td.UploadVolumeFactor").html());
+
+    labels.empty();
+
+    if (!isNaN(DownloadVolumeFactor)) {
+        if (DownloadVolumeFactor == 0) {
+            labels.append('\n<span class="label label-success">FREELEECH</span>');
+        } else if (DownloadVolumeFactor < 1) {
+            labels.append('\n<span class="label label-primary">' + DownloadVolumeFactor * 100 + '%DL</span>');
+        } else if (DownloadVolumeFactor > 1) {
+            labels.append('\n<span class="label label-danger">' + DownloadVolumeFactor * 100 + '%DL</span>');
+        }
+    }
+
+    if (!isNaN(UploadVolumeFactor)) {
+        if (UploadVolumeFactor == 0) {
+            labels.append('\n<span class="label label-warning">NO UPLOAD</span>');
+        } else if (UploadVolumeFactor != 1) {
+            labels.append('\n<span class="label label-info">' + UploadVolumeFactor * 100 + '%UL</span>');
+        }
+    }
+}
 
 function bindUIButtons() {
     $('body').on('click', '.downloadlink', function (e, b) {
@@ -321,10 +394,11 @@ 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));
+            releaseDialog.find('tr.jackett-releases-row').each(function () { updateReleasesRow(this); });
             releaseDialog.find('table').DataTable(
                  {
                      "pageLength": 20,
@@ -372,7 +446,7 @@ function bindUIButtons() {
                          var count = 0;
                          this.api().columns().every(function () {
                              count++;
-                             if (count === 5 || count === 9) {
+                             if (count === 5 || count === 10) {
                                  var column = this;
                                  var select = $('<select><option value=""></option></select>')
                                      .appendTo($(column.footer()).empty())
@@ -403,7 +477,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
             };
@@ -420,6 +494,10 @@ function bindUIButtons() {
             var releaseDialog = $(releaseTemplate({ indexers: indexers }));
             $("#modals").append(releaseDialog);
             releaseDialog.modal("show");
+            
+            releaseDialog.on('shown.bs.modal', function() {
+                releaseDialog.find('#searchquery').focus();
+            });
 
             var setCategories = function (tracker, items) {
                 var cats = {};
@@ -445,6 +523,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') {
@@ -459,11 +544,12 @@ 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');
                     results.html($(resultsTemplate(data)));
+                    results.find('tr.jackett-search-results-row').each(function () { updateReleasesRow(this); });
 
                     results.find('table').DataTable(
                     {
@@ -500,7 +586,7 @@ function bindUIButtons() {
                             var count = 0;
                             this.api().columns().every(function () {
                                 count++;
-                                if (count === 3 || count === 7) {
+                                if (count === 3 || count === 8) {
                                     var column = this;
                                     var select = $('<select><option value=""></option></select>')
                                         .appendTo($(column.footer()).empty())
@@ -534,7 +620,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));
@@ -548,6 +634,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'); 
@@ -558,21 +645,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);
 
             }
@@ -582,7 +665,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;
@@ -598,7 +681,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");
@@ -615,4 +698,4 @@ function bindUIButtons() {
             doNotify("Request to Jackett server failed", "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,7 +175,7 @@
             <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}}" data-link="{{site_link}}">
@@ -206,7 +209,7 @@
             <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" />
+                <img alt="{{name}}" title="{{name}}" src="../logos/{{id}}.png" />
               
             </div>
         </div>
@@ -233,26 +236,34 @@
                                     <th>Name</th>
                                     <th>Size</th>
                                     <th>Size</th>
+                                    <th>Files</th>
                                     <th>Category</th>
+                                    <th>Grabs</th>
                                     <th>Seeds</th>
                                     <th>Leechers</th>
+                                    <th>DL Factor</th>
+                                    <th>UL Factor</th>
                                     <th>Download</th>
                                 </tr>
                             </thead>
                             <tbody>
                                 {{#each releases}}
-                                <tr>
+                                <tr class="jackett-releases-row">
                                     <td>{{PublishDate}}</td>
                                     <td>{{FirstSeen}}</td>
                                     <td>{{jacketTimespan PublishDate}}</td>
                                     <td>{{jacketTimespan FirstSeen}}</td>
                                     <td>{{Tracker}}</td>
-                                    <td><a href="{{Comments}}">{{Title}}</a></td>
+                                    <td><a href="{{Comments}}">{{Title}}</a> <span class="release-labels"></span></td>
                                     <td>{{Size}}</td>
                                     <td>{{jacketSize Size}}</td>
+                                    <td>{{Files}}</td>
                                     <td>{{CategoryDesc}}</td>
+                                    <td>{{Grabs}}</td>
                                     <td>{{Seeders}}</td>
                                     <td>{{Peers}}</td>
+                                    <td class="DownloadVolumeFactor">{{DownloadVolumeFactor}}</td>
+                                    <td class="UploadVolumeFactor">{{UploadVolumeFactor}}</td>
                                     <td class="downloadcolumn">
                                         <a class="downloadlink" title="Download locally" href="{{Link}}"><i class="fa fa-download"></i></a>
                                         {{#if BlackholeLink}}
@@ -274,6 +285,12 @@
                                     <td></td>
                                     <td></td>
                                     <td></td>
+                                    <td></td>
+                                    <td></td>
+                                    <td></td>
+                                    <td></td>
+                                    <td></td>
+                                    <td></td>
                                 </tr>
                             </tfoot>
                         </table>
@@ -331,24 +348,32 @@
                     <th>Name</th>
                     <th>Size</th>
                     <th>Size</th>
+                    <th>Files</th>
                     <th>Category</th>
+                    <th>Grabs</th>
                     <th>Seeds</th>
                     <th>Leechers</th>
+                    <th>DL Factor</th>
+                    <th>UL Factor</th>
                     <th>Download</th>
                 </tr>
             </thead>
             <tbody>
                 {{#each Results}}
-                <tr>
+                <tr class="jackett-search-results-row">
                     <td>{{PublishDate}}</td>
                     <td>{{jacketTimespan PublishDate}}</td>
                     <td>{{Tracker}}</td>
-                    <td><a href="{{Comments}}">{{Title}}</a></td>
+                    <td><a href="{{Comments}}">{{Title}}</a> <span class="release-labels"></span></td>
                     <td>{{Size}}</td>
                     <td>{{jacketSize Size}}</td>
+                    <td>{{Files}}</td>
                     <td>{{CategoryDesc}}</td>
+                    <td>{{Grabs}}</td>
                     <td>{{Seeders}}</td>
                     <td>{{Peers}}</td>
+                    <td class="DownloadVolumeFactor">{{DownloadVolumeFactor}}</td>
+                    <td class="UploadVolumeFactor">{{UploadVolumeFactor}}</td>
                     <td class="downloadcolumn">
                         <a class="downloadlink" title="Download locally" href="{{Link}}"><i class="fa fa-download"></i></a>
                         {{#if BlackholeLink}}
@@ -368,6 +393,12 @@
                     <td></td>
                     <td></td>
                     <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
                 </tr>
             </tfoot>
         </table>
@@ -478,6 +509,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/Definitions/hdme.yml

@@ -0,0 +1,101 @@
+---
+  site: hdme
+  name: HDME
+  language: en-us
+  links:
+    - https://hdme.eu
+
+  caps:
+    categories:
+      24: TV/Anime       # Anime
+      25: PC/0day        # Appz
+      47: Movies/HD      # AVCHD
+      26: Movies/BluRay  # Bluray
+      54: Movies/HD      # dbREMUX
+      41: Movies/HD      # Documentaries
+      50: Movies/HD      # FourGHD
+      44: Movies/HD      # HDME
+      28: Audio/Lossless # HQ Music
+      48: Movies/HD      # iCandy
+      45: Movies/HD      # INtL
+      29: Other          # Misc
+      49: PC/Phone-Other # Mobile
+      30: Movies/HD      # Movie 1080i
+      31: Movies/HD      # Movie 1080p
+      32: Movies/HD      # Movie 720p
+      33: Audio/Video    # Music Videos
+      34: TV             # Packs
+      53: Movies/HD      # Remux
+      56: Movies/HD      # RUXi
+      55: Movies/HD      # SiNiSteR
+      36: TV/Sport       # Sports
+      37: TV/HD          # TV Series 1080i
+      38: TV/HD          # TV Series 1080p
+      39: TV/HD          # TV Series 720p
+      57: Movies         # UHD 2160p
+      40: XXX            # XXX
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: /takelogin.php
+    method: post
+    form: form
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: td.embedded
+        message:
+          selector: td.text
+    test:
+      path: /my.php
+
+  ratio:
+    path: /my.php
+    selector: span.smallfont > font
+    filters:
+      - name: regexp
+        args: "Ratio:(.+?)Uploaded"
+      - name: replace
+        args: [",", ""]
+
+  search:
+    path: /browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      incldead: "1"
+      blah: "0"
+    rows:
+      selector: table[width="100%"] > tbody > tr:has(td.bottom[background="_images/bg_torrent.jpg"])
+    fields:
+      category:
+        selector: td:nth-child(2) a
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        selector: td:nth-child(3) > a
+        attribute: title
+      comments:
+        selector: td:nth-child(3) > a
+        attribute: href
+      download:
+        selector: td:nth-child(11) > a
+        attribute: href
+      size:
+        selector: td:nth-child(6)
+        remove: br
+      date:
+        selector: td:nth-child(3)
+        filters:
+          - name: regexp
+            args: "Added: (.+?)\n"
+      seeders:
+        selector: td:nth-child(8)
+      leechers:
+        selector: td:nth-child(9)

src/Jackett/Definitions/shareisland.yml

@@ -0,0 +1,150 @@
+---
+  site: shareisland
+  name: Shareisland
+  description: "A general italian tracker"
+  language: it-it
+  links:
+    - http://shareisland.org
+
+  caps:
+    categories:
+       32: Other # Vip
+       45: XXX # Vip XXX
+       33: Other # ex Vip
+       1: Movies # Movies
+       49: Movies/HD # H-264
+       51: Movies/HD # H-265
+       41: Movies/Other # Cartoons
+       14: Movies/SD # DivX
+       16: Movies/Other # Cine News
+       39: Movies/HD # 720p
+       40: Movies/HD # 1080p
+       46: Movies/BluRay # Blu Ray Disk
+       31: Movies/HD # BDRip
+       17: Movies/DVD # DVD
+       43: Movies/SD # DVDRip
+       6: PC # Applications
+       18: PC/0day # PC Applications
+       19: PC/Mac # Macintosh Applications
+       44: PC/Phone-Android # Android applications
+       7: Audio # Music
+       20: Audio/Video # Video
+       21: Audio/MP3 # Mp3
+       2: Console # Games
+       3: Console/PS4 # Sony PS
+       4: Console/Wii # Wii
+       26: Console/Xbox # XboX
+       27: PC/Games # PC
+       28: Console/NDS # Nintendo
+       34: Books # Edicola
+       52: Books # Quotidiani
+       53: Books # Libreria
+       35: TV # SerieTV
+       55: TV/HD # Serie Tv HD
+       36: Other # Rip By ShareIsland
+       47: Other # Disclaimer
+       48: Other # P2P network 
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: /ajax/login.php
+    method: post
+    form: form
+    inputs:
+      loginbox_membername: "{{ .Config.username }}"
+      loginbox_password: "{{ .Config.password }}"
+      action: "login"
+      loginbox_remember: "true"
+    error:
+      - selector: div.error
+    test:
+      path: /?p=home&pid=1
+      selector: div#member_info_bar
+
+  ratio:
+    path: /?p=home&pid=1
+    selector: img[title="Ratio"] + span
+
+  search:
+    path: /
+    inputs:
+      p: "torrents"
+      pid: "32"
+      $raw: "{{range .Categories}}cid[]:{{.}}&{{end}}"
+      keywords: "{{ .Query.Keywords }}"
+      search_type: "name"
+      searchin: "title"
+
+    rows:
+      selector: table#torrents_table_classic > tbody > tr:not([id="torrents_table_classic_head"])
+    fields:
+      title:
+        selector: td.torrent_name > a
+      category:
+        selector: div.category_image > a
+        attribute: href
+        filters:
+          - name: querystring
+            args: cid
+      comments:
+        selector: td.torrent_name > a
+        attribute: href
+      download:
+        selector: a:has(img[title="Download Torrent"])
+        attribute: href
+      size:
+        selector: td.size
+      seeders:
+        selector: td.seeders
+      leechers:
+        selector: td.leechers
+      grabs:
+        selector: td.completed
+      downloadvolumefactor:
+        case:
+          "img[title=\"FREE!\"]": "0"
+          "img[title=\"Download Multiplier: 0.5\"]": "0.5"
+          "img[title=\"Moltiplicatore Download: 0.5\"]": "0.5"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "img[title=\"Upload Multiplier: 3\"]": "3"
+          "img[title=\"Upload Multiplier: 2\"]": "2"
+          "img[title=\"Upload Multiplier: 1.5\"]": "1.5"
+          "img[title=\"Moltiplicatore Upload: 3\"]": "3"
+          "img[title=\"Moltiplicatore Upload: 2\"]": "2"
+          "img[title=\"Moltiplicatore Upload: 1.5\"]": "1.5"
+          "*": "1"
+      date:
+        selector: td.torrent_name
+        remove: a, span, div, br
+        filters:
+          - name: replace
+            args: ["Uploaded ", ""]
+          - name: replace
+            args: [" by", ""]
+          - name: replace
+            args: [" at", ""]
+          - name: replace
+            args: ["Oggi", "Today"]
+          - name: replace
+            args: ["Ieri", "Yesterday"]
+          - name: replace
+            args: ["lunedì", "Monday"]
+          - name: replace
+            args: ["martedì", "Tuesday"]
+          - name: replace
+            args: ["Mercoledì", "Wednesday"]
+          - name: replace
+            args: ["Giovedì", "Thursday"]
+          - name: replace
+            args: ["Venerdì", "Friday"]
+          - name: replace
+            args: ["Sabato", "Saturday"]
+          - name: replace
+            args: ["Domenica", "Sunday"]
+          - name: replace
+            args: [" alle", ""]

src/Jackett/Definitions/uhdbits.yml

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

src/Jackett/Definitions/worldofp2p.yml

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

src/Jackett/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/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,29 +100,47 @@ 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());
+
+                    var grabs = row.Cq().Find("td:nth-child(9)").Text();
+                    release.Grabs = ParseUtil.CoerceInt(grabs);
+
+                    if (row.Cq().Find("i.fa-star").Any())
+                        release.DownloadVolumeFactor = 0;
+                    else if (row.Cq().Find("i.fa-star-half-o").Any())
+                        release.DownloadVolumeFactor = 0.5;
+                    else
+                        release.DownloadVolumeFactor = 1;
+
+                    if (row.Cq().Find("i.fa-diamond").Any())
+                        release.UploadVolumeFactor = 2;
+                    else
+                        release.UploadVolumeFactor = 1;
+
                     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,25 @@ 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"]));
+            release.Files = (int)r["fileCount"];
+            release.Grabs = (int)r["snatches"];
+            release.DownloadVolumeFactor = 1;
+            release.UploadVolumeFactor = 1;
+            if ((bool)r["isFreeleech"])
+            {
+                release.DownloadVolumeFactor = 0;
+            }
+            if ((bool)r["isPersonalFreeleech"])
+            {
+                release.DownloadVolumeFactor = 0;
+            }
+            if ((bool)r["isNeutralLeech"])
+            {
+                release.DownloadVolumeFactor = 0;
+                release.UploadVolumeFactor = 0;
+            }
+
         }
 
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
@@ -159,7 +183,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,205 @@
+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");
+
+                    if (!query.MatchQueryStringAND(release.Title))
+                        continue;
+
+                    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();
+
+                    var files = qRow.Find("a[href*=\"&filelist=1\"] ~ font ~ b").Text();
+                    release.Files = ParseUtil.CoerceInt(files);
+
+                    var grabs = qRow.Find("a[href*=\"&tosnatchers=1\"] ~ font ~ b").Text();
+                    release.Grabs = ParseUtil.CoerceInt(grabs);
+
+                    if (qRow.Find("img[alt=\"OU\"]").Length >= 1)
+                        release.DownloadVolumeFactor = 0;
+                    else
+                        release.DownloadVolumeFactor = 1;
+
+                    release.UploadVolumeFactor = 1;
+
+                    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;
+                                    }
                                 }
 
 
@@ -357,6 +426,17 @@ namespace Jackett.Indexers
                                 release.Seeders = ParseUtil.CoerceInt(rowCq.Find(".torrent_seeders").Text());
                                 release.Peers = release.Seeders + ParseUtil.CoerceInt(rowCq.Find(".torrent_leechers").Text());
 
+                                // grabs
+                                var grabs = rowCq.Find("td.torrent_snatched").Text();
+                                release.Grabs = ParseUtil.CoerceInt(grabs);
+
+                                // freeleech
+                                if (rowCq.Find("img[alt=\"Freeleech!\"]").Length >= 1)
+                                    release.DownloadVolumeFactor = 0;
+                                else
+                                    release.DownloadVolumeFactor = 1;
+                                release.UploadVolumeFactor = 1;
+
                                 if (release.Category != 0)
                                     releases.Add(release);
                             }
@@ -372,7 +452,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/AnimeTorrents.cs

@@ -0,0 +1,197 @@
+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.Threading.Tasks;
+using System.Web;
+using Jackett.Models.IndexerConfig;
+using System.Collections.Specialized;
+using System.Globalization;
+
+namespace Jackett.Indexers
+{
+    public class AnimeTorrents : BaseIndexer, IIndexer
+    {
+        private string LoginUrl { get { return SiteLink + "login.php"; } }
+        private string SearchUrl { get { return SiteLink + "ajax/torrents_data.php"; } }
+        private string SearchUrlReferer { get { return SiteLink + "torrents.php?cat=0&searchin=filename&search="; } }
+
+        new ConfigurationDataBasicLogin configData
+        {
+            get { return (ConfigurationDataBasicLogin)base.configData; }
+            set { base.configData = value; }
+        }
+
+        public AnimeTorrents(IIndexerManagerService i, HttpWebClient c, Logger l, IProtectionService ps)
+            : base(name: "AnimeTorrents",
+                description: "Definitive source for anime and manga",
+                link: "http://animetorrents.me/",
+                caps: new TorznabCapabilities(),
+                manager: i,
+                client: c, // Forced HTTP client for custom headers
+                logger: l,
+                p: ps,
+                configData: new ConfigurationDataBasicLogin())
+        {
+            AddCategoryMapping(1, TorznabCatType.MoviesSD); // Anime Movie
+            AddCategoryMapping(6, TorznabCatType.MoviesHD); // Anime Movie HD
+            AddCategoryMapping(2, TorznabCatType.TVAnime); // Anime Series
+            AddCategoryMapping(7, TorznabCatType.TVAnime); // Anime Series HD
+            AddCategoryMapping(5, TorznabCatType.XXXDVD); // Hentai (censored)
+            AddCategoryMapping(9, TorznabCatType.XXXDVD); // Hentai (censored) HD
+            AddCategoryMapping(4, TorznabCatType.XXXDVD); // Hentai (un-censored)
+            AddCategoryMapping(8, TorznabCatType.XXXDVD); // Hentai (un-censored) HD
+            AddCategoryMapping(13, TorznabCatType.BooksForeign); // Light Novel
+            AddCategoryMapping(3, TorznabCatType.BooksComics); // Manga
+            AddCategoryMapping(10, TorznabCatType.BooksComics); // Manga 18+
+            AddCategoryMapping(11, TorznabCatType.TVAnime); // OVA
+            AddCategoryMapping(12, TorznabCatType.TVAnime); // OVA HD
+            AddCategoryMapping(14, TorznabCatType.BooksComics); // Doujin Anime
+            AddCategoryMapping(15, TorznabCatType.XXXDVD); // Doujin Anime 18+
+            AddCategoryMapping(16, TorznabCatType.AudioForeign); // Doujin Music
+            AddCategoryMapping(17, TorznabCatType.BooksComics); // Doujinshi
+            AddCategoryMapping(18, TorznabCatType.BooksComics); // Doujinshi 18+
+            AddCategoryMapping(19, TorznabCatType.Audio); // OST
+        }
+
+        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        {
+            configData.LoadValuesFromJson(configJson);
+            var pairs = new Dictionary<string, string> {
+                { "username", configData.Username.Value },
+                { "password", configData.Password.Value },
+                { "form", "login" },
+                { "rememberme[]", "1" }
+            };
+
+            var loginPage = await RequestStringWithCookiesAndRetry(LoginUrl, null, null);
+
+            var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, loginPage.Cookies, true);
+            await ConfigureIfOK(result.Cookies, result.Content != null && result.Content.Contains("logout.php"), () =>
+            {
+                CQ dom = result.Content;
+                var errorMessage = dom[".ui-state-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 = SearchUrl;
+            var queryCollection = new NameValueCollection();
+
+            queryCollection.Add("total", "146"); // Not sure what this is about but its required!
+
+            var cat = "0";
+            var queryCats = MapTorznabCapsToTrackers(query);
+            if (queryCats.Count == 1)
+            {
+                cat = queryCats.First().ToString();
+            }
+
+            queryCollection.Add("cat", cat);
+            queryCollection.Add("searchin", "filename");
+            queryCollection.Add("search", searchString);
+            queryCollection.Add("page", "1");
+            searchUrl += "?" + queryCollection.GetQueryString();
+
+            var extraHeaders = new Dictionary<string, string>()
+            {
+                { "X-Requested-With", "XMLHttpRequest" }
+            };
+
+            var response = await RequestStringWithCookiesAndRetry(searchUrl, null, SearchUrlReferer, extraHeaders);
+
+            var results = response.Content;
+            try
+            {
+                CQ dom = results;
+
+                var rows = dom["tr"];
+                foreach (var row in rows.Skip(1))
+                {
+                    var release = new ReleaseInfo();
+                    var qRow = row.Cq();
+                    var qTitleLink = qRow.Find("td:eq(1) a:eq(0)").First();
+                    release.Title = qTitleLink.Find("strong").Text().Trim();
+
+                    // If we search an get no results, we still get a table just with no info.
+                    if (string.IsNullOrWhiteSpace(release.Title))
+                    {
+                        break;
+                    }
+
+                    release.Description = release.Title;
+                    release.Guid = new Uri(qTitleLink.Attr("href"));
+                    release.Comments = release.Guid;
+
+                    var dateString = qRow.Find("td:eq(4)").Text();
+                    release.PublishDate = DateTime.ParseExact(dateString, "dd MMM yy", CultureInfo.InvariantCulture);
+
+                    var qLink = qRow.Find("td:eq(2) a");
+                    if (qLink.Length != 0) // newbie users don't see DL links
+                    {
+                        release.Link = new Uri(qLink.Attr("href"));
+                    }
+
+                    var sizeStr = qRow.Find("td:eq(5)").Text();
+                    release.Size = ReleaseInfo.GetBytes(sizeStr);
+
+                    var connections = qRow.Find("td:eq(7)").Text().Trim().Split("/".ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
+
+                    release.Seeders = ParseUtil.CoerceInt(connections[0].Trim());
+                    release.Peers = ParseUtil.CoerceInt(connections[1].Trim()) + release.Seeders;
+                    release.Grabs = ParseUtil.CoerceLong(connections[2].Trim());
+
+                    var rCat = row.Cq().Find("td:eq(0) a").First().Attr("href");
+                    var rCatIdx = rCat.IndexOf("cat=");
+                    if (rCatIdx > -1)
+                    {
+                        rCat = rCat.Substring(rCatIdx + 4);
+                    }
+
+                    release.Category = MapTrackerCatToNewznab(rCat);
+
+                    if (qRow.Find("img[alt=\"Gold Torrent\"]").Length >= 1)
+                        release.DownloadVolumeFactor = 0;
+                    else if (qRow.Find("img[alt=\"Silver Torrent\"]").Length >= 1)
+                        release.DownloadVolumeFactor = 0.5;
+                    else
+                        release.DownloadVolumeFactor = 1;
+
+                    var ULFactorImg = qRow.Find("img[alt*=\"x Multiplier Torrent\"]");
+                    if (ULFactorImg.Length >= 1)
+                    {
+                        release.UploadVolumeFactor = ParseUtil.CoerceDouble(ULFactorImg.Attr("alt").Split('x')[0]);
+                    }
+                    else
+                    {
+                        release.UploadVolumeFactor = 1;
+                    }
+                    
+                    releases.Add(release);
+                }
+            }
+            catch (Exception ex)
+            {
+                OnParseError(results, ex);
+            }
+
+            return releases;
+        }
+    }
+}

src/Jackett/Indexers/BJShare.cs

@@ -0,0 +1,319 @@
+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 System;
+using System.Globalization;
+using Jackett.Models.IndexerConfig;
+using System.Collections.Specialized;
+using AngleSharp.Parser.Html;
+using AngleSharp.Dom;
+using System.Text.RegularExpressions;
+
+namespace Jackett.Indexers
+{
+    public class BJShare : BaseIndexer, IIndexer
+    {
+        string LoginUrl { get { return SiteLink + "login.php"; } }
+        string BrowseUrl { get { return SiteLink + "torrents.php"; } }
+        string TodayUrl { get { return SiteLink + "torrents.php?action=today"; } }
+
+        new ConfigurationDataBasicLoginWithRSSAndDisplay configData
+        {
+            get { return (ConfigurationDataBasicLoginWithRSSAndDisplay)base.configData; }
+            set { base.configData = value; }
+        }
+
+        public BJShare(IIndexerManagerService i, IWebClient wc, Logger l, IProtectionService ps)
+            : base(name: "BJ-Share",
+                   description: "A brazilian tracker.",
+                   link: "https://bj-share.me/",
+                   caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
+                   manager: i,
+                   client: wc,
+                   logger: l,
+                   p: ps,
+                   configData: new ConfigurationDataBasicLoginWithRSSAndDisplay())
+        {
+            AddCategoryMapping(14, TorznabCatType.TVAnime); // Anime
+            AddCategoryMapping(3, TorznabCatType.PC0day); // Aplicativos
+            AddCategoryMapping(8, TorznabCatType.Other); // Apostilas/Tutoriais
+            AddCategoryMapping(19, TorznabCatType.AudioAudiobook); // Audiobook
+            AddCategoryMapping(16, TorznabCatType.TVOTHER); // Desenho Animado
+            AddCategoryMapping(18, TorznabCatType.TVDocumentary); // Documentários
+            AddCategoryMapping(10, TorznabCatType.Books); // E-Books
+            AddCategoryMapping(20, TorznabCatType.TVSport); // Esportes
+            AddCategoryMapping(1, TorznabCatType.Movies); // Filmes
+            AddCategoryMapping(12, TorznabCatType.MoviesOther); // Histórias em Quadrinhos
+            AddCategoryMapping(5, TorznabCatType.Audio); // Músicas
+            AddCategoryMapping(7, TorznabCatType.Other); // Outros
+            AddCategoryMapping(9, TorznabCatType.BooksMagazines); // Revistas
+            AddCategoryMapping(2, TorznabCatType.TV); // Seriados
+            AddCategoryMapping(17, TorznabCatType.TV); // Shows
+            AddCategoryMapping(13, TorznabCatType.TV); // Stand Up Comedy
+            AddCategoryMapping(11, TorznabCatType.Other); // Video-Aula
+            AddCategoryMapping(6, TorznabCatType.TV); // Vídeos de TV
+            AddCategoryMapping(4, TorznabCatType.Other); // Jogos
+            AddCategoryMapping(199, TorznabCatType.XXX); // Filmes Adultos
+            AddCategoryMapping(200, TorznabCatType.XXX); // Jogos Adultos
+            AddCategoryMapping(201, TorznabCatType.XXXImageset); // Fotos Adultas
+        }
+
+        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        {
+            configData.LoadValuesFromJson(configJson);
+
+            var pairs = new Dictionary<string, string>
+            {
+                { "username", configData.Username.Value },
+                { "password", configData.Password.Value },
+                { "keeplogged", "1" }
+            };
+
+            var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, null, LoginUrl, true);
+            await ConfigureIfOK(result.Cookies, result.Content != null && result.Content.Contains("logout.php"), () =>
+            {
+                var errorMessage = result.Content;
+                throw new ExceptionWithConfigData(errorMessage, configData);
+            });
+            return IndexerConfigurationStatus.RequiresTesting;
+        }
+
+        private string StripSearchString(string term)
+        {
+            // Search does not support searching with episode numbers so strip it if we have one
+            // Ww AND filter the result later to archive the proper result
+            term = Regex.Replace(term, @"[S|E]\d\d", string.Empty);
+            return term.Trim();
+        }
+
+        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        {
+            var releases = new List<ReleaseInfo>();
+            
+            var searchString = query.GetQueryString();
+            
+            // if the search string is empty use the "last 24h torrents" view
+            if (string.IsNullOrWhiteSpace(searchString))
+            {
+                var results = await RequestStringWithCookies(TodayUrl);
+                try
+                {
+                    string RowsSelector = "table.torrent_table > tbody > tr:not(tr.colhead)";
+
+                    var SearchResultParser = new HtmlParser();
+                    var SearchResultDocument = SearchResultParser.Parse(results.Content);
+                    var Rows = SearchResultDocument.QuerySelectorAll(RowsSelector);
+                    foreach (var Row in Rows)
+                    {
+                        try
+                        {
+                            var release = new ReleaseInfo();
+
+                            release.MinimumRatio = 1;
+                            release.MinimumSeedTime = 0;
+
+                            var qDetailsLink = Row.QuerySelector("a.BJinfoBox");
+                            var qTitle = qDetailsLink.QuerySelector("font");
+                            release.Title = qTitle.TextContent;
+
+                            var qBJinfoBox = qDetailsLink.QuerySelector("span");
+                            var qCatLink = Row.QuerySelector("a[href^=\"/torrents.php?filter_cat\"]");
+                            var qDLLink = Row.QuerySelector("a[href^=\"torrents.php?action=download\"]");
+                            var qSeeders = Row.QuerySelector("td:nth-child(4)");
+                            var qLeechers = Row.QuerySelector("td:nth-child(5)");
+                            var qFreeLeech = Row.QuerySelector("font[color=\"green\"]:contains(Free)");
+
+                            release.Description = "";
+                            foreach (var Child in qBJinfoBox.ChildNodes)
+                            {
+                                var type = Child.NodeType;
+                                if (type != NodeType.Text)
+                                    continue;
+
+                                var line = Child.TextContent;
+                                if (line.StartsWith("Tamanho:"))
+                                {
+                                    string Size = line.Substring("Tamanho: ".Length); ;
+                                    release.Size = ReleaseInfo.GetBytes(Size);
+                                }
+                                else if (line.StartsWith("Lançado em: "))
+                                {
+                                    string PublishDateStr = line.Substring("Lançado em: ".Length).Replace("às ", "");
+                                    PublishDateStr += " +0";
+                                    var PublishDate = DateTime.SpecifyKind(DateTime.ParseExact(PublishDateStr, "dd/MM/yyyy HH:mm z", CultureInfo.InvariantCulture), DateTimeKind.Unspecified);
+                                    release.PublishDate = PublishDate.ToLocalTime();
+                                }
+                                else
+                                {
+                                    release.Description += line + "\n";
+                                }
+                            }
+
+
+                            var catStr = qCatLink.GetAttribute("href").Split('=')[1];
+                            release.Category = MapTrackerCatToNewznab(catStr);
+
+                            release.Link = new Uri(SiteLink + qDLLink.GetAttribute("href"));
+                            release.Comments = new Uri(SiteLink + qDetailsLink.GetAttribute("href"));
+                            release.Guid = release.Link;
+
+                            release.Seeders = ParseUtil.CoerceInt(qSeeders.TextContent);
+                            release.Peers = ParseUtil.CoerceInt(qLeechers.TextContent) + release.Seeders;
+
+
+                            if (qFreeLeech != null)
+                                release.DownloadVolumeFactor = 0;
+                            else
+                                release.DownloadVolumeFactor = 1;
+
+                            release.UploadVolumeFactor = 1;
+
+                            releases.Add(release);
+                        }
+                        catch (Exception ex)
+                        {
+                            logger.Error(string.Format("{0}: Error while parsing row '{1}': {2}", ID, Row.OuterHtml, ex.Message));
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    OnParseError(results.Content, ex);
+                }
+            }
+            else // use search
+            {
+                var searchUrl = BrowseUrl;
+
+                var queryCollection = new NameValueCollection();
+                queryCollection.Add("searchstr", StripSearchString(searchString));
+                queryCollection.Add("order_by", "time");
+                queryCollection.Add("order_way", "desc");
+                queryCollection.Add("group_results", "1");
+                queryCollection.Add("action", "basic");
+                queryCollection.Add("searchsubmit", "1");
+
+                foreach (var cat in MapTorznabCapsToTrackers(query))
+                {
+                    queryCollection.Add("filter_cat["+cat+"]", "1");
+                }
+
+                searchUrl += "?" + queryCollection.GetQueryString();
+
+                var results = await RequestStringWithCookies(searchUrl);
+                try
+                {
+                    string RowsSelector = "table.torrent_table > tbody > tr:not(tr.colhead)";
+
+                    var SearchResultParser = new HtmlParser();
+                    var SearchResultDocument = SearchResultParser.Parse(results.Content);
+                    var Rows = SearchResultDocument.QuerySelectorAll(RowsSelector);
+
+                    int GroupCategory = 0;
+                    string GroupTitle = null;
+                    string GroupYearStr = null;
+                    Nullable<DateTime> GroupPublishDate = null;
+
+                    foreach (var Row in Rows)
+                    {
+                        try
+                        {
+                            var qDetailsLink = Row.QuerySelector("a[href^=\"torrents.php?id=\"]");
+                            string Title = qDetailsLink.TextContent;
+                            int Category = 0;
+                            string YearStr = null;
+                            Nullable<DateTime> YearPublishDate = null;
+
+                            if (Row.ClassList.Contains("group") || Row.ClassList.Contains("torrent")) // group/ungrouped headers
+                            {
+                                var qCatLink = Row.QuerySelector("a[href^=\"/torrents.php?filter_cat\"]");
+                                string CategoryStr = qCatLink.GetAttribute("href").Split('=')[1].Split('&')[0];
+                                Category = MapTrackerCatToNewznab(CategoryStr);
+                                YearStr = qDetailsLink.NextSibling.TextContent.Trim().TrimStart('[').TrimEnd(']');
+                                YearPublishDate = DateTime.SpecifyKind(DateTime.ParseExact(YearStr, "yyyy", CultureInfo.InvariantCulture), DateTimeKind.Unspecified);
+
+                                if (Row.ClassList.Contains("group")) // group headers
+                                {
+                                    GroupCategory = Category;
+                                    GroupTitle = Title;
+                                    GroupYearStr = YearStr;
+                                    GroupPublishDate = YearPublishDate;
+                                    continue;
+                                }
+                            }
+
+                            var release = new ReleaseInfo();
+
+                            release.MinimumRatio = 1;
+                            release.MinimumSeedTime = 0;
+
+                            var qDLLink = Row.QuerySelector("a[href^=\"torrents.php?action=download\"]");
+                            var qSize = Row.QuerySelector("td:nth-last-child(4)");
+                            var qSeeders = Row.QuerySelector("td:nth-last-child(3)");
+                            var qLeechers = Row.QuerySelector("td:nth-last-child(2)");
+                            var qFreeLeech = Row.QuerySelector("strong[title=\"Free\"]");
+
+                            if (Row.ClassList.Contains("group_torrent")) // torrents belonging to a group
+                            {
+                                release.Description = qDetailsLink.TextContent;
+                                release.Title = GroupTitle + " " + GroupYearStr;
+                                release.PublishDate = GroupPublishDate.Value;
+                                release.Category = GroupCategory;
+                            }
+                            else if (Row.ClassList.Contains("torrent")) // standalone/un grouped torrents
+                            {
+                                var qDescription = Row.QuerySelector("div.torrent_info");
+                                release.Description = qDescription.TextContent;
+                                release.Title = Title + " " + YearStr;
+                                release.PublishDate = YearPublishDate.Value;
+                                release.Category = Category;
+                            }
+
+                            release.Description = release.Description.Replace(" / Free", ""); // Remove Free Tag
+                            release.Title += " " + release.Description; // add year and Description to the release Title to add some meaning to it
+
+                            // check for previously stripped search terms
+                            if (!query.MatchQueryStringAND(release.Title))
+                                continue;
+
+                            var Size = qSize.TextContent;
+                            release.Size = ReleaseInfo.GetBytes(Size);
+
+                            release.Link = new Uri(SiteLink + qDLLink.GetAttribute("href"));
+                            release.Comments = new Uri(SiteLink + qDetailsLink.GetAttribute("href"));
+                            release.Guid = release.Link;
+
+                            release.Seeders = ParseUtil.CoerceInt(qSeeders.TextContent);
+                            release.Peers = ParseUtil.CoerceInt(qLeechers.TextContent) + release.Seeders;
+
+                            if (qFreeLeech != null)
+                                release.DownloadVolumeFactor = 0;
+                            else
+                                release.DownloadVolumeFactor = 1;
+
+                            release.UploadVolumeFactor = 1;
+
+                            releases.Add(release);
+                        }
+                        catch (Exception ex)
+                        {
+                            logger.Error(string.Format("{0}: Error while parsing row '{1}': {2}", ID, Row.OuterHtml, ex.Message));
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    OnParseError(results.Content, ex);
+                }
+            }
+
+            return releases;
+        }
+    }
+}
+

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

@@ -17,13 +17,13 @@ namespace Jackett.Indexers
 {
     public abstract class BaseIndexer
     {
-        public string SiteLink { get; private set; }
-        public string DisplayDescription { get; private set; }
-        public string DisplayName { get; private set; }
+        public string SiteLink { get; protected set; }
+        public string DisplayDescription { get; protected set; }
+        public string DisplayName { get; protected set; }
         public string ID { get { return GetIndexerID(GetType()); } }
 
         public bool IsConfigured { get; protected set; }
-        public TorznabCapabilities TorznabCaps { get; private set; }
+        public TorznabCapabilities TorznabCaps { get; protected set; }
         protected Logger logger;
         protected IIndexerManagerService indexerService;
         protected static List<CachedQueryResult> cache = new List<CachedQueryResult>();
@@ -44,7 +44,9 @@ namespace Jackett.Indexers
 
         private List<CategoryMapping> categoryMapping = new List<CategoryMapping>();
 
+        // standard constructor used by most indexers
         public BaseIndexer(string name, string link, string description, IIndexerManagerService manager, IWebClient client, Logger logger, ConfigurationData configData, IProtectionService p, TorznabCapabilities caps = null, string downloadBase = null)
+            : this(manager, client, logger, p)
         {
             if (!link.EndsWith("/"))
                 throw new Exception("Site link must end with a slash.");
@@ -52,12 +54,7 @@ namespace Jackett.Indexers
             DisplayName = name;
             DisplayDescription = description;
             SiteLink = link;
-            this.logger = logger;
-            indexerService = manager;
-            webclient = client;
-            protectionService = p;
             this.downloadUrlBase = downloadBase;
-
             this.configData = configData;
 
             if (caps == null)
@@ -66,6 +63,15 @@ namespace Jackett.Indexers
 
         }
 
+        // minimal constructor used by e.g. cardigann generic indexer
+        public BaseIndexer(IIndexerManagerService manager, IWebClient client, Logger logger, IProtectionService p)
+        {
+            this.logger = logger;
+            indexerService = manager;
+            webclient = client;
+            protectionService = p;
+        }
+
         public IEnumerable<ReleaseInfo> CleanLinks(IEnumerable<ReleaseInfo> releases)
         {
             if (string.IsNullOrEmpty(downloadUrlBase))
@@ -141,7 +147,7 @@ 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);
             }
@@ -179,7 +185,7 @@ namespace Jackett.Indexers
 
         private String ResolveCookies(String incomingCookies = "")
         {
-            var redirRequestCookies = (CookieHeader != "" ? CookieHeader + " " : "") + 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);
@@ -192,6 +198,19 @@ namespace Jackett.Indexers
             
         }
 
+        // 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)
@@ -306,7 +325,9 @@ namespace Jackett.Indexers
 
             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)
@@ -358,7 +379,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)
@@ -436,43 +459,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,227 @@
+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");
+
+                    if (!query.MatchQueryStringAND(release.Title))
+                        continue;
+
+                    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;
+
+                    var files = qRow.Find("td:nth-child(3)").Text();
+                    release.Files = ParseUtil.CoerceInt(files);
+
+                    var grabs = qRow.Find("td:nth-child(7)").Text();
+                    release.Grabs = ParseUtil.CoerceInt(grabs);
+
+                    if (qRow.Find("font[color=\"red\"]:contains(OnlyUp)").Length >= 1)
+                        release.DownloadVolumeFactor = 0;
+                    else
+                        release.DownloadVolumeFactor = 1;
+
+                    release.UploadVolumeFactor = 1;
+
+                    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,10 +79,11 @@ 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();
-            var result = new ConfigurationDataRecaptchaLogin();
+            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 = this.configData;
             result.CookieHeader.Value = loginPage.Cookies;
             result.Captcha.SiteKey = recaptchaSiteKey;
+            result.Captcha.Version = "2";
             return result;
         }
 
@@ -187,6 +188,15 @@ namespace Jackett.Indexers
                     release.Seeders = ParseUtil.CoerceInt(row.ChildElements.ElementAt(9).Cq().Text());
                     release.Peers = ParseUtil.CoerceInt(row.ChildElements.ElementAt(10).Cq().Text()) + release.Seeders;
 
+                    var files = qRow.Find("td:nth-child(6)").Text();
+                    release.Files = ParseUtil.CoerceInt(files);
+
+                    var grabs = qRow.Find("td:nth-child(9) > a").Get(0).FirstChild.ToString();
+                    release.Grabs = ParseUtil.CoerceInt(grabs);
+
+                    release.DownloadVolumeFactor = 0; // ratioless
+                    release.UploadVolumeFactor = 1;
+
                     releases.Add(release);
 
                 }

src/Jackett/Indexers/BitCityReloaded.cs

@@ -0,0 +1,199 @@
+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();
+
+                    if (!query.MatchQueryStringAND(release.Title))
+                        continue;
+
+                    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);
+
+                    var cat = qRow.Find("td:eq(0) a").First().Attr("href").Substring(1);
+                    release.Category = MapTrackerCatToNewznab(cat);
+
+                    var files = qRow.Find("td:has(a[href*=\"&filelist=1\"])> b:nth-child(2)").Text();
+                    release.Files = ParseUtil.CoerceInt(files);
+
+                    var grabs = qRow.Find("td:has(a[href*=\"&tosnatchers=1\"])> b:nth-child(1)").Text();
+                    release.Grabs = ParseUtil.CoerceInt(grabs);
+
+                    if (qRow.Find("img[src=\"pic/torrent_ou.gif\"]").Length >= 1)
+                        release.DownloadVolumeFactor = 0;
+                    else
+                        release.DownloadVolumeFactor = 1;
+
+                    release.UploadVolumeFactor = 1;
+
+                    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."))
         {
         }
 
@@ -129,6 +129,15 @@ namespace Jackett.Indexers
                     //if (!release.Title.ToLower().Contains(title.ToLower()))
                     //    continue;
 
+                    var files = row.Cq().Find("td:nth-child(4)").Text();
+                    release.Files = ParseUtil.CoerceInt(files);
+
+                    var grabs = row.Cq().Find("td:nth-child(8)").Get(0).FirstChild.ToString();
+                    release.Grabs = ParseUtil.CoerceInt(grabs);
+
+                    release.DownloadVolumeFactor = 1;
+                    release.UploadVolumeFactor = 1;
+
                     releases.Add(release);
                 }
             }

src/Jackett/Indexers/BitSoup.cs

@@ -25,12 +25,12 @@ namespace Jackett.Indexers
         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/"};
+        private string LoginReferer { get { return UseLink + "login.php"; } }
+        private List<String> KnownURLs = new List<String> { "https://www.bitsoup.me/", "https://www.bitsoup.org/" };
 
-        new NxtGnConfigurationData configData
+        new ConfigurationDataBasicLoginWithAlternateLink configData
         {
-            get { return (NxtGnConfigurationData)base.configData; }
+            get { return (ConfigurationDataBasicLoginWithAlternateLink)base.configData; }
             set { base.configData = value; }
         }
 
@@ -43,11 +43,11 @@ namespace Jackett.Indexers
                 client: wc,
                 logger: l,
                 p: ps,
-                configData: new NxtGnConfigurationData())
+                configData: new ConfigurationDataBasicLoginWithAlternateLink())
         {
-            this.configData.DisplayText.Value = this.DisplayName + " has multiple URLs.  The default (" + this.SiteLink + ") can be changed by entering a new value in the box below.";
-            this.configData.DisplayText.Value += "The following are some known URLs for " + this.DisplayName;
-            this.configData.DisplayText.Value += "<ul><li>" + String.Join("</li><li>", this.KnownURLs.ToArray()) + "</li></ul>";
+            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);
@@ -158,12 +158,12 @@ namespace Jackett.Indexers
                 {
                     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);
@@ -188,11 +188,12 @@ namespace Jackett.Indexers
             var queryCollection = new NameValueCollection();
 
 
-            queryCollection.Add("search", string.IsNullOrWhiteSpace(searchString)? "" : searchString);
+            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
+                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"));
             }
@@ -220,6 +221,7 @@ namespace Jackett.Indexers
                     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);
@@ -241,23 +243,5 @@ namespace Jackett.Indexers
                 OnParseError(results, ex);
             }
         }
-
-        public class NxtGnConfigurationData : ConfigurationData
-        {
-            public StringItem Username { get; private set; }
-            public StringItem Password { get; private set; }
-            public DisplayItem DisplayText { get; private set; }
-            public StringItem AlternateLink { get; set; }
-           
-
-            public NxtGnConfigurationData()
-            {
-                Username = new StringItem { Name = "Username" };
-                Password = new StringItem { Name = "Password" };
-                DisplayText = new DisplayItem("") { Name = "" };
-                AlternateLink = new StringItem { Name = "AlternateLinks" };
-            }
-            
-        }
     }
-}
+}

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/CardigannIndexer.cs

@@ -0,0 +1,673 @@
+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 System;
+using Jackett.Models.IndexerConfig;
+using System.Collections.Specialized;
+using System.Text;
+using YamlDotNet.Serialization;
+using YamlDotNet.Serialization.NamingConventions;
+using static Jackett.Models.IndexerConfig.ConfigurationData;
+using AngleSharp.Parser.Html;
+using System.Text.RegularExpressions;
+using System.Web;
+using AngleSharp.Dom;
+
+namespace Jackett.Indexers
+{
+    public class CardigannIndexer : BaseIndexer, IIndexer
+    {
+        protected IndexerDefinition Definition;
+        public new string ID { get { return (Definition != null ? Definition.Site : GetIndexerID(GetType())); } }
+
+        new ConfigurationData configData
+        {
+            get { return (ConfigurationData)base.configData; }
+            set { base.configData = value; }
+        }
+
+        // Cardigann yaml classes
+        public class IndexerDefinition {
+            public string Site { get; set; }
+            public List<settingsField> Settings { get; set; }
+            public string Name { get; set; }
+            public string Description { get; set; }
+            public string Language { get; set; }
+            public List<string> Links { get; set; }
+            public capabilitiesBlock Caps { get; set; }
+            public loginBlock Login { get; set; }
+            public ratioBlock Ratio { get; set; }
+            public searchBlock Search { get; set; }
+            // IndexerDefinitionStats not needed/implemented
+        }
+        public class settingsField
+        {
+            public string Name { get; set; }
+            public string Type { get; set; }
+            public string Label { get; set; }
+        }
+
+        public class capabilitiesBlock
+        {
+            public Dictionary<string, string> Categories  { get; set; }
+            public Dictionary<string, List<string>> Modes { get; set; }
+        }
+
+        public class loginBlock
+        {
+            public string Path { get; set; }
+            public string Method { get; set; }
+            public string Form { get; set; }
+            public Dictionary<string, string> Inputs { get; set; }
+            public List<errorBlock> Error { get; set; }
+            public pageTestBlock Test { get; set; }
+        }
+
+        public class errorBlock
+        {
+            public string Path { get; set; }
+            public string Selector { get; set; }
+            public selectorBlock Message { get; set; }
+        }
+
+        public class selectorBlock
+        {
+            public string Selector { get; set; }
+            public string Text { get; set; }
+            public string Attribute { get; set; }
+            public string Remove { get; set; }
+            public List<filterBlock> Filters { get; set; }
+            public Dictionary<string, string> Case { get; set; }
+        }
+
+        public class filterBlock
+        {
+            public string Name { get; set; }
+            public dynamic Args { get; set; }
+        }
+
+        public class pageTestBlock
+        {
+            public string Path { get; set; }
+            public string Selector { get; set; }
+        }
+
+        public class ratioBlock : selectorBlock
+        {
+            public string Path { get; set; }
+        }
+
+        public class searchBlock
+        {
+            public string Path { get; set; }
+            public Dictionary<string, string> Inputs { get; set; }
+            public rowsBlock Rows { get; set; }
+            public Dictionary<string, selectorBlock> Fields { get; set; }
+        }
+
+        public class rowsBlock : selectorBlock
+        {
+            public int After { get; set; }
+            //public string Remove { get; set; } // already inherited
+            public string Dateheaders { get; set; }
+        }
+
+        public CardigannIndexer(IIndexerManagerService i, IWebClient wc, Logger l, IProtectionService ps)
+            : base(manager: i,
+                   client: wc,
+                   logger: l,
+                   p: ps)
+        {
+        }
+
+        public CardigannIndexer(IIndexerManagerService i, IWebClient wc, Logger l, IProtectionService ps, string DefinitionString)
+            : base(manager: i,
+                   client: wc,
+                   logger: l,
+                   p: ps)
+        {
+            Init(DefinitionString);
+        }
+
+        protected void Init(string DefinitionString)
+        {
+            var deserializer = new DeserializerBuilder()
+                .WithNamingConvention(new CamelCaseNamingConvention())
+                .IgnoreUnmatchedProperties()
+                .Build();
+            Definition = deserializer.Deserialize<IndexerDefinition>(DefinitionString);
+
+            // Add default data if necessary
+            if (Definition.Settings == null)
+                Definition.Settings = new List<settingsField>();
+
+            if (Definition.Settings.Count == 0)
+            {
+                Definition.Settings.Add(new settingsField { Name = "username", Label = "Username", Type = "text" });
+                Definition.Settings.Add(new settingsField { Name = "password", Label = "Password", Type = "password" });
+            }
+
+            // init missing mandatory attributes
+            DisplayName = Definition.Name;
+            DisplayDescription = Definition.Description;
+            SiteLink = Definition.Links[0]; // TODO: implement alternative links
+            if (!SiteLink.EndsWith("/"))
+                SiteLink += "/";
+            TorznabCaps = TorznabUtil.CreateDefaultTorznabTVCaps(); // TODO implement caps
+
+            // init config Data
+            configData = new ConfigurationData();
+            foreach (var Setting in Definition.Settings)
+            {
+                configData.AddDynamic(Setting.Name, new StringItem { Name = Setting.Label });
+            }
+
+            foreach (var Category in Definition.Caps.Categories)
+            {
+                var cat = TorznabCatType.GetCatByName(Category.Value);
+                if (cat == null)
+                {
+                    logger.Error(string.Format("CardigannIndexer ({0}): Can't find a category for {1}", ID, Category.Value));
+                    continue;
+                }
+                AddCategoryMapping(Category.Key, TorznabCatType.GetCatByName(Category.Value));
+                
+            }
+        }
+
+        protected Dictionary<string, object> getTemplateVariablesFromConfigData()
+        {
+            Dictionary<string, object> variables = new Dictionary<string, object>();
+
+            foreach (settingsField Setting in Definition.Settings)
+            {
+                variables[".Config."+Setting.Name] = ((StringItem)configData.GetDynamic(Setting.Name)).Value;
+            }
+            return variables;
+        }
+
+        // A very bad implementation of the golang template/text templating engine.
+        // But it should work for most basic constucts used by Cardigann definitions.
+        protected string applyGoTemplateText(string template, Dictionary<string, object> variables = null)
+        {
+            if (variables == null)
+            {
+                variables = getTemplateVariablesFromConfigData();
+            }
+
+            // handle if ... else ... expression
+            Regex IfElseRegex = new Regex(@"{{if\s*(.+?)\s*}}(.*?){{\s*else\s*}}(.*?){{\s*end\s*}}");
+            var IfElseRegexMatches = IfElseRegex.Match(template);
+
+            while (IfElseRegexMatches.Success)
+            {
+                string conditionResult = null;
+
+                string all = IfElseRegexMatches.Groups[0].Value;
+                string condition = IfElseRegexMatches.Groups[1].Value;
+                string onTrue = IfElseRegexMatches.Groups[2].Value;
+                string onFalse = IfElseRegexMatches.Groups[3].Value;
+
+                if (condition.StartsWith("."))
+                {
+                    string value = (string)variables[condition];
+                    if (!string.IsNullOrWhiteSpace(value))
+                    {
+                        conditionResult = onTrue;
+                    }
+                    else
+                    {
+                        conditionResult = onFalse;
+                    }
+                }
+                else
+                {
+                    throw new NotImplementedException("CardigannIndexer: Condition operation '" + condition + "' not implemented");
+                }
+                template = template.Replace(all, conditionResult);
+                IfElseRegexMatches = IfElseRegexMatches.NextMatch();
+            }
+
+            // handle range expression
+            Regex RangeRegex = new Regex(@"{{\s*range\s*(.+?)\s*}}(.*?){{\.}}(.*?){{end}}");
+            var RangeRegexMatches = RangeRegex.Match(template);
+
+            while (RangeRegexMatches.Success)
+            {
+                string expanded = string.Empty;
+
+                string all = RangeRegexMatches.Groups[0].Value;
+                string variable = RangeRegexMatches.Groups[1].Value;
+                string prefix = RangeRegexMatches.Groups[2].Value;
+                string postfix = RangeRegexMatches.Groups[3].Value;
+
+                foreach (string value in (List<string>)variables[variable])
+                {
+                    expanded += prefix + value + postfix;
+                }
+                template = template.Replace(all, expanded);
+                RangeRegexMatches = RangeRegexMatches.NextMatch();
+            }
+
+            // handle simple variables
+            Regex VariablesRegEx = new Regex(@"{{\s*(\..+?)\s*}}");
+            var VariablesRegExMatches = VariablesRegEx.Match(template);
+
+            while (VariablesRegExMatches.Success)
+            {
+                string expanded = string.Empty;
+
+                string all = VariablesRegExMatches.Groups[0].Value;
+                string variable = VariablesRegExMatches.Groups[1].Value;
+
+                string value = (string)variables[variable];
+                template = template.Replace(all, value);
+                VariablesRegExMatches = VariablesRegExMatches.NextMatch();
+            }
+
+            return template;
+        }
+
+        protected async Task<bool> DoLogin()
+        {
+            var Login = Definition.Login;
+
+            if (Login == null)
+                return false;
+
+            if (Login.Method == null || Login.Method == "post")
+            {
+                var pairs = new Dictionary<string, string>();
+                foreach (var Input in Definition.Login.Inputs)
+                {
+                    var value = applyGoTemplateText(Input.Value);
+                    pairs.Add(Input.Key, value);
+                }
+
+                var LoginUrl = SiteLink + Login.Path;
+                configData.CookieHeader.Value = null;
+                var loginResult = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, null, SiteLink, true);
+                configData.CookieHeader.Value = loginResult.Cookies;
+
+                if (Login.Error != null)
+                {
+                    var loginResultParser = new HtmlParser();
+                    var loginResultDocument = loginResultParser.Parse(loginResult.Content);
+                    foreach (errorBlock error in Login.Error)
+                    {
+                        var selection = loginResultDocument.QuerySelector(error.Selector);
+                        if (selection != null)
+                        {
+                            string errorMessage = selection.TextContent;
+                            if (error.Message != null)
+                            {
+                                var errorSubMessage = loginResultDocument.QuerySelector(error.Message.Selector);
+                                errorMessage = errorSubMessage.TextContent;
+                            }
+                            throw new ExceptionWithConfigData(string.Format("Login failed: {0}", errorMessage.Trim()), configData);
+                        }
+                    }
+                }
+            }
+            else if (Login.Method == "cookie")
+            {
+                configData.CookieHeader.Value = ((StringItem)configData.GetDynamic("cookie")).Value;
+            }
+            else
+            {
+                throw new NotImplementedException("Login method " + Definition.Login.Method + " not implemented");
+            }
+            return true;
+        }
+
+        protected async Task<bool> TestLogin()
+        {
+            var Login = Definition.Login;
+
+            if (Login == null || Login.Test == null)
+                return false;
+
+            // test if login was successful
+            var LoginTestUrl = SiteLink + Login.Test.Path;
+            var testResult = await RequestStringWithCookies(LoginTestUrl);
+
+            if (testResult.IsRedirect)
+            {
+                throw new ExceptionWithConfigData("Login Failed, got redirected", configData);
+            }
+
+            if (Login.Test.Selector != null)
+            {
+                var testResultParser = new HtmlParser();
+                var testResultDocument = testResultParser.Parse(testResult.Content);
+                var selection = testResultDocument.QuerySelectorAll(Login.Test.Selector);
+                if (selection.Length == 0)
+                {
+                    throw new ExceptionWithConfigData(string.Format("Login failed: Selector \"{0}\" didn't match", Login.Test.Selector), configData);
+                }
+            }
+            return true;
+        }
+
+        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        {
+            configData.LoadValuesFromJson(configJson);
+
+            await DoLogin();
+            await TestLogin();
+
+            SaveConfig();
+            IsConfigured = true;
+            return IndexerConfigurationStatus.Completed;
+        }
+
+        protected string applyFilters(string Data, List<filterBlock> Filters)
+        {
+            if (Filters == null)
+                return Data;
+
+            foreach(filterBlock Filter in Filters)
+            {
+                switch (Filter.Name)
+                {
+                    case "querystring":
+                        var param = (string)Filter.Args;
+                        var qsStr = Data.Split(new char[] { '?' }, 2)[1];
+                        qsStr = qsStr.Split(new char[] { '#' }, 2)[0];
+                        var qs = HttpUtility.ParseQueryString(qsStr);
+                        Data = qs.Get(param);
+                        break;
+                    case "timeparse":
+                    case "dateparse":
+                        throw new NotImplementedException("Filter " + Filter.Name + " not implemented");
+                        /*
+                        TODO: implement golang time format conversion, see http://fuckinggodateformat.com/
+                        if args == nil {
+			                return filterDateParse(nil, value)
+		                }
+		                if layout, ok := args.(string); ok {
+			                return filterDateParse([]string{layout}, value)
+		                }
+		                return "", fmt.Errorf("Filter argument type %T was invalid", args)
+                         */
+                        break;
+                    case "regexp":
+                        var pattern = (string)Filter.Args;
+                        var Regexp = new Regex(pattern);
+                        var Match = Regexp.Match(Data);
+                        Data = Match.Groups[1].Value;
+                        break;
+                    case "split":
+                        var sep = (string)Filter.Args[0];
+                        var pos = (string)Filter.Args[1];
+                        var posInt = int.Parse(pos);
+                        var strParts = Data.Split(sep[0]);
+                        if (posInt < 0)
+                        {
+                            posInt += strParts.Length;
+                        }
+                        Data = strParts[posInt];
+                        break;
+                    case "replace":
+                        var from = (string)Filter.Args[0];
+                        var to = (string)Filter.Args[1];
+                        Data = Data.Replace(from, to);
+                        break;
+                    case "trim":
+                        var cutset = (string)Filter.Args;
+                        Data = Data.Trim(cutset[0]);
+                        break;
+                    case "append":
+                        var str = (string)Filter.Args;
+                        Data += str;
+                        break;
+                    case "timeago":
+                    case "fuzzytime":
+                    case "reltime":
+                        var timestr = (string)Filter.Args;
+                        Data = DateTimeUtil.FromUnknown(timestr).ToString(DateTimeUtil.RFC1123ZPattern);
+                        break;
+                    default:
+                        break;
+                }
+            }
+            return Data;
+        }
+
+        protected string handleSelector(selectorBlock Selector, IElement Dom)
+        {
+            if (Selector.Text != null)
+            {
+                return applyFilters(Selector.Text, Selector.Filters);
+            }
+
+            IElement selection = Dom;
+            string value = null;
+
+            if (Selector.Selector != null)
+            {
+                selection = Dom.QuerySelector(Selector.Selector);
+                if (selection == null)
+                {
+                    throw new Exception(string.Format("Selector \"{0}\" didn't match {1}", Selector.Selector, Dom.OuterHtml));
+                }
+            }
+
+            if (Selector.Remove != null)
+            {
+                foreach(var i in selection.QuerySelectorAll(Selector.Remove))
+                {
+                    i.Remove();
+                }
+            }
+
+            if (Selector.Case != null)
+            {
+                foreach(var Case in Selector.Case)
+                {
+                    if (selection.Matches(Case.Key) || selection.QuerySelector(Case.Key) != null)
+                    {
+                        value = Case.Value;
+                        break;
+                    }
+                }
+                if(value == null)
+                    throw new Exception(string.Format("None of the case selectors \"{0}\" matched {1}", string.Join(",", Selector.Case), selection.OuterHtml));
+            }
+            else if (Selector.Attribute != null)
+            {
+                value = selection.GetAttribute(Selector.Attribute);
+            }
+            else
+            {
+                value = selection.TextContent;
+            }
+                
+            return applyFilters(value, Selector.Filters); ;
+        }
+
+        protected Uri resolvePath(string path)
+        {
+            if(path.StartsWith("http"))
+            {
+                return new Uri(path);
+            }
+            else
+            {
+                return new Uri(SiteLink + path);
+            }
+            
+        }
+
+        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        {
+            var releases = new List<ReleaseInfo>();
+
+            searchBlock Search = Definition.Search;
+
+            // init template context
+            var variables = getTemplateVariablesFromConfigData();
+
+            variables[".Query.Type"] = query.QueryType;
+            variables[".Query.Q"] = query.SearchTerm;
+            variables[".Query.Series"] = null;
+            variables[".Query.Ep"] = query.Episode;
+            variables[".Query.Season"] = query.Season;
+            variables[".Query.Movie"] = null;
+            variables[".Query.Year"] = null;
+            variables[".Query.Limit"] = query.Limit;
+            variables[".Query.Offset"] = query.Offset;
+            variables[".Query.Extended"] = query.Extended;
+            variables[".Query.Categories"] = query.Categories;
+            variables[".Query.APIKey"] = query.ApiKey;
+            variables[".Query.TVDBID"] = null;
+            variables[".Query.TVRageID"] = query.RageID;
+            variables[".Query.IMDBID"] = query.ImdbID;
+            variables[".Query.TVMazeID"] = null;
+            variables[".Query.TraktID"] = null;
+
+            variables[".Query.Episode"] = query.GetEpisodeSearchString();
+            variables[".Categories"] = MapTorznabCapsToTrackers(query);
+
+            var KeywordTokens = new List<string>();
+            var KeywordTokenKeys = new List<string> { "Q", "Series", "Movie", "Year" };
+            foreach (var key in KeywordTokenKeys)
+            {
+                var Value = (string)variables[".Query." + key];
+                if (!string.IsNullOrWhiteSpace(Value))
+                    KeywordTokens.Add(Value);
+            }
+
+            if (!string.IsNullOrWhiteSpace((string)variables[".Query.Episode"]))
+                KeywordTokens.Add((string)variables[".Query.Episode"]);
+            variables[".Query.Keywords"] = string.Join(" ", KeywordTokens);
+            variables[".Keywords"] = variables[".Query.Keywords"];
+
+            // build search URL
+            var searchUrl = SiteLink + applyGoTemplateText(Search.Path, variables) + "?";
+            var queryCollection = new NameValueCollection();
+            if (Search.Inputs != null)
+            { 
+                foreach (var Input in Search.Inputs)
+                {
+                    var value = applyGoTemplateText(Input.Value, variables);
+                    if (Input.Key == "$raw")
+                        searchUrl += value;
+                    else
+                        queryCollection.Add(Input.Key, value);
+                }
+            }
+            searchUrl += "&" + queryCollection.GetQueryString();
+
+            // send HTTP request
+            var response = await RequestBytesWithCookies(searchUrl);
+            var results = Encoding.GetEncoding("iso-8859-1").GetString(response.Content);
+            try
+            {
+                var SearchResultParser = new HtmlParser();
+                var SearchResultDocument = SearchResultParser.Parse(results);
+                
+                var Rows = SearchResultDocument.QuerySelectorAll(Search.Rows.Selector);
+                foreach (var Row in Rows)
+                {
+                    try
+                    {
+                        var release = new ReleaseInfo();
+                        release.MinimumRatio = 1;
+                        release.MinimumSeedTime = 48 * 60 * 60;
+
+                        // Parse fields
+                        foreach (var Field in Search.Fields)
+                        {
+                            string value = handleSelector(Field.Value, Row);
+                            value = ParseUtil.NormalizeSpace(value);
+                            try
+                            {
+                                switch (Field.Key)
+                                {
+                                    case "download":
+                                        release.Link = resolvePath(value);
+                                        break;
+                                    case "details":
+                                        var url = resolvePath(value);
+                                        release.Guid = url;
+                                        if (release.Comments == null)
+                                            release.Comments = url;
+                                        break;
+                                    case "comments":
+                                        release.Comments = resolvePath(value);
+                                        break;
+                                    case "title":
+                                        release.Title = value;
+                                        break;
+                                    case "description":
+                                        release.Description = value;
+                                        break;
+                                    case "category":
+                                        release.Category = MapTrackerCatToNewznab(value);
+                                        break;
+                                    case "size":
+                                        release.Size = ReleaseInfo.GetBytes(value);
+                                        break;
+                                    case "leechers":
+                                        if (release.Peers == null)
+                                            release.Peers = ParseUtil.CoerceInt(value);
+                                        else
+                                            release.Peers += ParseUtil.CoerceInt(value);
+                                        break;
+                                    case "seeders":
+                                        release.Seeders = ParseUtil.CoerceInt(value);
+                                        if (release.Peers == null)
+                                            release.Peers = release.Seeders;
+                                        else
+                                            release.Peers += release.Seeders;
+
+                                        break;
+                                    case "date":
+                                        release.PublishDate = DateTimeUtil.FromUnknown(value);
+                                        break;
+                                    case "files":
+                                        release.Files = ParseUtil.CoerceLong(value);
+                                        break;
+                                    case "grabs":
+                                        release.Grabs = ParseUtil.CoerceLong(value);
+                                        break;
+                                    case "downloadvolumefactor":
+                                        release.DownloadVolumeFactor = ParseUtil.CoerceDouble(value);
+                                        break;
+                                    case "uploadvolumefactor":
+                                        release.UploadVolumeFactor = ParseUtil.CoerceDouble(value);
+                                        break;
+                                    default:
+                                        break;
+                                }
+                            }
+                            catch (Exception ex)
+                            {
+                                throw new Exception(string.Format("Error while parsing field={0}, selector={1}, value={2}: {3}", Field.Key, Field.Value.Selector, value, ex.Message));
+                            }
+                        }
+
+                        releases.Add(release);
+                    }
+                    catch (Exception ex)
+                    {
+                        logger.Error(string.Format("CardigannIndexer ({0}): Error while parsing row '{1}': {2}", ID, Row.OuterHtml, ex));
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                OnParseError(results, ex);
+            }
+
+            return releases;
+        }
+    }
+}
+

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,147 @@
-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;
+
+                    var grabs = rowB.Cq().Find("td:nth-child(6)").Text();
+                    release.Grabs = ParseUtil.CoerceInt(grabs);
+
+                    release.DownloadVolumeFactor = 0; // ratioless
+                    release.UploadVolumeFactor = 1;
+
+                    releases.Add(release);
+                }
+
+            }
+            catch (Exception ex)
+            {
+                OnParseError(results.Content, ex);
+            }
+            return releases;
+        }
+    }
+}

src/Jackett/Indexers/DigitalHive.cs

@@ -0,0 +1,219 @@
+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.Text.RegularExpressions;
+
+namespace Jackett.Indexers
+{
+    public class DigitalHive : BaseIndexer, IIndexer
+    {
+        private string SearchUrl { get { return SiteLink + "browse.php"; } }
+        private string LoginUrl { get { return SiteLink + "login.php?returnto=%2F"; } }
+        private string AjaxLoginUrl { get { return SiteLink + "takelogin.php"; } }
+
+        new ConfigurationDataRecaptchaLogin configData
+        {
+            get { return (ConfigurationDataRecaptchaLogin)base.configData; }
+            set { base.configData = value; }
+        }
+
+        public DigitalHive(IIndexerManagerService i, Logger l, IWebClient w, IProtectionService ps)
+            : base(name: "DigitalHive",
+                description: "DigitalHive is one of the oldest general trackers",
+                link: "https://www.digitalhive.org/",
+                caps: new TorznabCapabilities(),
+                manager: i,
+                client: w,
+                logger: l,
+                p: ps,
+                configData: new ConfigurationDataRecaptchaLogin())
+        {
+            AddCategoryMapping(0, TorznabCatType.Other);
+            AddCategoryMapping(48, TorznabCatType.Other); // 0Day
+            AddCategoryMapping(56, TorznabCatType.XXXImageset); // 0Day-Imagesets
+            AddCategoryMapping(6, TorznabCatType.Audio); // 0Day-Music
+            AddCategoryMapping(51, TorznabCatType.XXX); // 0Day-XXX
+            AddCategoryMapping(2, TorznabCatType.TVAnime); // Anime
+            AddCategoryMapping(59, TorznabCatType.MoviesBluRay); // BluRay
+            AddCategoryMapping(40, TorznabCatType.TVDocumentary); // Documentary
+            AddCategoryMapping(20, TorznabCatType.MoviesDVD); // DVD-R
+            AddCategoryMapping(25, TorznabCatType.BooksEbook); // Ebooks
+            AddCategoryMapping(38, TorznabCatType.PCPhoneIOS); // HandHeld
+            AddCategoryMapping(38, TorznabCatType.PCPhoneAndroid); // HandHeld
+            AddCategoryMapping(38, TorznabCatType.PCPhoneOther); // HandHeld
+            AddCategoryMapping(37, TorznabCatType.Other); // Kids Stuff
+            AddCategoryMapping(23, TorznabCatType.PC); // Linux
+            AddCategoryMapping(24, TorznabCatType.PCMac); // Mac
+            AddCategoryMapping(22, TorznabCatType.OtherMisc); // Misc
+            AddCategoryMapping(35, TorznabCatType.MoviesOther); // Movie Pack
+            AddCategoryMapping(36, TorznabCatType.MoviesHD); // Movie-HD
+            AddCategoryMapping(19, TorznabCatType.MoviesSD); // Movie-SD
+            AddCategoryMapping(50, TorznabCatType.Audio); // Music
+            AddCategoryMapping(53, TorznabCatType.AudioLossless); // Music-FLAC
+            AddCategoryMapping(49, TorznabCatType.AudioVideo); // MVID
+            AddCategoryMapping(1, TorznabCatType.PC); // PC Apps
+            AddCategoryMapping(4, TorznabCatType.PCGames); // PC Games
+            AddCategoryMapping(17, TorznabCatType.ConsolePS3); // Playstation
+            AddCategoryMapping(17, TorznabCatType.ConsolePS4); // Playstation
+            AddCategoryMapping(17, TorznabCatType.ConsolePSVita); // Playstation
+            AddCategoryMapping(17, TorznabCatType.ConsolePSP); // Playstation
+            AddCategoryMapping(28, TorznabCatType.ConsolePSP); // PSP
+            AddCategoryMapping(34, TorznabCatType.TVOTHER); // TV Pack
+            AddCategoryMapping(32, TorznabCatType.TVHD); // TV-HD
+            AddCategoryMapping(55, TorznabCatType.TVOTHER); // TV-HDRip
+            AddCategoryMapping(7, TorznabCatType.TVSD); // TV-SD
+            AddCategoryMapping(57, TorznabCatType.TVOTHER); // TV-SDRip
+            AddCategoryMapping(33, TorznabCatType.ConsoleWii); // WII
+            AddCategoryMapping(33, TorznabCatType.ConsoleWiiU); // WII
+            AddCategoryMapping(45, TorznabCatType.ConsoleXbox); // XBox
+            AddCategoryMapping(45, TorznabCatType.ConsoleXbox360); // XBox
+            AddCategoryMapping(45, TorznabCatType.ConsoleXBOX360DLC); // XBox
+            AddCategoryMapping(45, TorznabCatType.ConsoleXboxOne); // XBox
+            AddCategoryMapping(9, TorznabCatType.XXX); // XXX
+            AddCategoryMapping(52, TorznabCatType.XXXOther); // XXX-ISO
+        }
+
+        public override async Task<ConfigurationData> GetConfigurationForSetup()
+        {
+            var loginPage = await RequestStringWithCookies(LoginUrl, configData.CookieHeader.Value);
+            CQ cq = loginPage.Content;
+            string recaptchaSiteKey = cq.Find(".g-recaptcha").Attr("data-sitekey");
+            var result = this.configData;
+            result.CookieHeader.Value = loginPage.Cookies;
+            result.Captcha.SiteKey = recaptchaSiteKey;
+            result.Captcha.Version = "2";
+            return result;
+        }
+
+        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        {
+            configData.LoadValuesFromJson(configJson);
+            var pairs = new Dictionary<string, string> {
+                { "returnto" , "/" },
+                { "username", configData.Username.Value },
+                { "password", configData.Password.Value },
+                { "g-recaptcha-response", configData.Captcha.Value }
+            };
+
+            if (!string.IsNullOrWhiteSpace(configData.Captcha.Cookie))
+            {
+                // Cookie was manually supplied
+                CookieHeader = configData.Captcha.Cookie;
+                try
+                {
+                    var results = await PerformQuery(new TorznabQuery());
+                    if (!results.Any())
+                    {
+                        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(AjaxLoginUrl, pairs, configData.CookieHeader.Value, true, SiteLink, LoginUrl);
+
+            await ConfigureIfOK(result.Cookies, result.Content.Contains("logout.php"), () =>
+            {
+                var errorMessage = result.Content;
+                throw new ExceptionWithConfigData(errorMessage, configData);
+            });
+
+            return IndexerConfigurationStatus.RequiresTesting;
+        }
+
+        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        {
+            List<ReleaseInfo> releases = new List<ReleaseInfo>();
+
+            var queryCollection = new NameValueCollection();
+            var searchString = query.GetQueryString();
+            var searchUrl = SearchUrl;
+
+            foreach (var cat in MapTorznabCapsToTrackers(query))
+            {
+                queryCollection.Add("c" + cat, "1");
+            }
+            
+            if (!string.IsNullOrWhiteSpace(searchString))
+            {
+                queryCollection.Add("search", searchString);
+            }
+
+            queryCollection.Add("blah", "0");
+
+            var results = await RequestStringWithCookiesAndRetry(searchUrl + "?" + queryCollection.GetQueryString());
+            try
+            {
+                releases.AddRange(contentToReleaseInfos(results.Content));
+            }
+            catch (Exception ex)
+            {
+                OnParseError(results.Content, ex);
+            }
+
+            return releases;
+        }
+
+        private IEnumerable<ReleaseInfo> contentToReleaseInfos(CQ dom)
+        {
+            List<ReleaseInfo> releases = new List<ReleaseInfo>();
+
+            // Doesn't handle pagination yet...
+            var rows = dom["div.panel-body > table.table > tbody > tr"];
+            foreach (var row in rows)
+            {
+                var release = new ReleaseInfo();
+                release.MinimumRatio = 1;
+                release.MinimumSeedTime = 259200;
+
+                var qRow = row.Cq();
+                release.Title = qRow.Find("td:nth-child(2) > a").First().Text().Trim();
+                release.Description = release.Title;
+                release.Guid = new Uri(SiteLink + qRow.Find("td:nth-child(2) > a").First().Attr("href"));
+                release.Comments = release.Guid;
+                release.Link = new Uri(SiteLink + qRow.Find("td:nth-child(3) > a").First().Attr("href"));
+                var pubDate = qRow.Find("td:nth-child(2) > span").First().Text().Trim().Replace("Added: ", "");
+                release.PublishDate = DateTime.Parse(pubDate).ToLocalTime();
+                release.Category = MapTrackerCatToNewznab(qRow.Find("td:nth-child(1) > a").First().Attr("href").Split('=')[1]);
+                release.Size = ReleaseInfo.GetBytes(qRow.Find("td:nth-child(7)").First().Text());
+                release.Seeders = ParseUtil.CoerceInt(qRow.Find("td:nth-child(9)").First().Text());
+                release.Peers = ParseUtil.CoerceInt(qRow.Find("td:nth-child(10)").First().Text()) + release.Seeders;
+
+                var files = row.Cq().Find("td:nth-child(5)").Text();
+                release.Files = ParseUtil.CoerceInt(files);
+
+                var grabs = row.Cq().Find("td:nth-child(8)").Text();
+                release.Grabs = ParseUtil.CoerceInt(grabs);
+
+                if (row.Cq().Find("i.fa-star").Any())
+                    release.DownloadVolumeFactor = 0;
+                else
+                    release.DownloadVolumeFactor = 1;
+
+                release.UploadVolumeFactor = 1;
+
+                releases.Add(release);
+            }
+
+            return releases;
+        }
+    }
+}

src/Jackett/Indexers/FrenchADN.cs

@@ -1,966 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Globalization;
-using System.Linq;
-using System.Reflection;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-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 French-ADN Private Tracker
-    /// </summary>
-    public class FrenchADN : BaseIndexer, IIndexer
-    {
-        private string LoginUrl { get { return SiteLink + "login.php?"; } }
-        private string LoginCheckUrl { get { return SiteLink + "takelogin.php"; } }
-        private string SearchUrl { get { return SiteLink + "browse.php"; } }
-        private string TorrentCommentUrl { get { return SiteLink + "details.php?id={id}#comments"; } }
-        private string TorrentDescriptionUrl { get { return SiteLink + "details.php?id={id}"; } }
-        private string TorrentDownloadUrl { get { return SiteLink + "download.php?id={id}"; } }
-        private string TorrentThanksUrl { get { return SiteLink + "takethanks.php"; } }
-        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 ConfigurationDataFrenchADN ConfigData
-        {
-            get { return (ConfigurationDataFrenchADN)configData; }
-            set { base.configData = value; }
-        }
-
-        public FrenchADN(IIndexerManagerService i, IWebClient w, Logger l, IProtectionService ps)
-            : base(
-                name: "French-ADN",
-                description: "Your French Family Provider",
-                link: "https://french-adn.com/",
-                caps: new TorznabCapabilities(),
-                manager: i,
-                client: w,
-                logger: l,
-                p: ps,
-                downloadBase: "https://french-adn.com/download.php?id=",
-                configData: new ConfigurationDataFrenchADN())
-        {
-            // Clean capabilities
-            TorznabCaps.Categories.Clear();
-
-            // Movies
-            AddCategoryMapping("15", TorznabCatType.Movies);            // ALL
-            AddCategoryMapping("108", TorznabCatType.MoviesSD);         // TS CAM
-            AddCategoryMapping("25", TorznabCatType.MoviesSD);          // BDRIP
-            AddCategoryMapping("56", TorznabCatType.MoviesSD);          // BRRIP
-            AddCategoryMapping("16", TorznabCatType.MoviesSD);          // DVDRIP
-            AddCategoryMapping("49", TorznabCatType.MoviesDVD);         // TVRIP
-            AddCategoryMapping("102", TorznabCatType.MoviesWEBDL);      // WEBRIP
-            AddCategoryMapping("105", TorznabCatType.MoviesHD);         // 1080P
-            AddCategoryMapping("104", TorznabCatType.MoviesHD);         // 720P
-            AddCategoryMapping("17", TorznabCatType.MoviesDVD);         // DVD R
-            AddCategoryMapping("21", TorznabCatType.MoviesDVD);         // DVD R5
-            AddCategoryMapping("112", TorznabCatType.MoviesDVD);        // DVD REMUX
-            AddCategoryMapping("107", TorznabCatType.Movies3D);         // 3D
-            AddCategoryMapping("113", TorznabCatType.MoviesBluRay);     // BLURAY
-            AddCategoryMapping("118", TorznabCatType.MoviesHD);         // MHD
-
-            // Series
-            AddCategoryMapping("41", TorznabCatType.TV);                // ALL
-            AddCategoryMapping("43", TorznabCatType.TV);                // VF
-            AddCategoryMapping("44", TorznabCatType.TV);                // VOSTFR
-            AddCategoryMapping("42", TorznabCatType.TV);                // PACK
-
-            // TV
-            AddCategoryMapping("110", TorznabCatType.TV);               // SHOWS
-
-            // Anime
-            AddCategoryMapping("109", TorznabCatType.TVAnime);          // ANIME
-
-            // Manga
-            AddCategoryMapping("119", TorznabCatType.TVAnime);          // MANGA
-
-            // Documentaries
-            AddCategoryMapping("114", TorznabCatType.TVDocumentary);    // DOCUMENTARY
-
-            // Music
-            AddCategoryMapping("22", TorznabCatType.Audio);             // ALL
-            AddCategoryMapping("24", TorznabCatType.AudioLossless);     // FLAC
-            AddCategoryMapping("23", TorznabCatType.AudioMP3);          // MP3
-
-            // Games
-            AddCategoryMapping("33", TorznabCatType.PCGames);           // ALL
-            AddCategoryMapping("45", TorznabCatType.PCGames);           // PC GAMES
-            AddCategoryMapping("93", TorznabCatType.Console3DS);        // 3DS
-            AddCategoryMapping("94", TorznabCatType.Console);           // PS2
-            AddCategoryMapping("93", TorznabCatType.ConsolePS3);        // PS3
-            AddCategoryMapping("95", TorznabCatType.ConsolePSP);        // PSP
-            AddCategoryMapping("35", TorznabCatType.ConsolePS3);        // WII
-
-            // Applications
-            AddCategoryMapping("11", TorznabCatType.PC);                // ALL
-            AddCategoryMapping("12", TorznabCatType.PC);                // APPS WINDOWS
-            AddCategoryMapping("97", TorznabCatType.PCMac);             // APPS MAC
-            AddCategoryMapping("98", TorznabCatType.PC);                // APPS LINUX
-
-            // Books
-            AddCategoryMapping("115", TorznabCatType.BooksEbook);       // EBOOK
-            AddCategoryMapping("114", TorznabCatType.BooksComics);      // COMICS
-
-            // Other
-            AddCategoryMapping("103", TorznabCatType.Other);            // STAFF
-        }
-
-        /// <summary>
-        /// Configure our FADN 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);
-            }
-
-            // Build WebRequest for index
-            var myIndexRequest = new WebRequest()
-            {
-                Type = RequestType.GET,
-                Url = SiteLink,
-                Headers = emulatedBrowserHeaders
-            };
-
-            // Get index page for cookies
-            output("\nGetting index page (for cookies).. with " + SiteLink);
-            var indexPage = await webclient.GetString(myIndexRequest);
-
-             // Building login form data
-             var pairs = new Dictionary<string, string> {
-                { "username", ConfigData.Username.Value },
-                { "password", ConfigData.Password.Value }
-            };
-
-            // Build WebRequest for login
-            var myRequestLogin = new WebRequest()
-            {
-                Type = RequestType.GET,
-                Url = LoginUrl,
-                Headers = emulatedBrowserHeaders,
-                Cookies = indexPage.Cookies,
-                Referer = SiteLink
-            };
-
-            // Get login page -- (not used, but simulation needed by tracker security's checks)
-            latencyNow();
-            output("\nGetting login page (user simulation).. with " + LoginUrl);
-            var loginPage = await webclient.GetString(myRequestLogin);
-
-            // Build WebRequest for submitting authentification
-            var request = new WebRequest()
-            {
-                PostData = pairs,
-                Referer = LoginUrl,
-                Type = RequestType.POST,
-                Url = LoginCheckUrl,
-                Headers = emulatedBrowserHeaders,
-                Cookies = indexPage.Cookies,
-   
-            };
-
-            // Perform loggin
-            latencyNow();
-            output("\nPerform loggin.. with " + LoginCheckUrl);
-            var response = await webclient.GetString(request);
-
-            // Test if we are logged in
-            await ConfigureIfOK(response.Cookies, !string.IsNullOrEmpty(response.Cookies) && !response.IsRedirect, () =>
-            {
-                // Default error message
-                string message = "Error during attempt !";
-
-                // Parse redirect header
-                string redirectTo = response.RedirectingTo;
-
-                // Analyzer error code
-                if(redirectTo.Contains("login.php?error=4"))
-                {
-                    // Set message
-                    message = "Wrong username or password !";
-                }
-
-                // Oops, unable to login
-                output("-> Login failed: " + message, "error");
-                throw new ExceptionWithConfigData("Login failed: " + message, configData);
-            });
-
-            output("\nCookies saved for future uses...");
-            ConfigData.CookieHeader.Value = indexPage.Cookies + " " + response.Cookies + " ts_username=" + ConfigData.Username.Value;
-
-            output("\n-> Login Success\n");
-
-            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["#quicknavpage_menu"].Length != 0);
-
-                // If pagination available
-                if (pagination)
-                {
-                    // Retrieve available pages (3 pages shown max)
-                    pageLinkCount = fDom["#navcontainer_f:first > ul"].Find("a").Not(".smalltext").Not("#quicknavpage").Length;
-
-                    // Last button ? (So more than 3 page are available)
-                    Boolean more = (fDom["#navcontainer_f:first > ul"].Find("a.smalltext").Length > 1); ;
-                
-                    // More page than 3 pages ?
-                    if (more)
-                    {
-                        // Get total page count from last link
-                        pageLinkCount = ParseUtil.CoerceInt(Regex.Match(fDom["#navcontainer_f:first > ul"].Find("a:eq(4)").Attr("href").ToString(), @"\d+").Value);
-                    }
-
-                    // Calculate average number of results (based on torrents rows lenght on first page)
-                    nbResults = firstPageRows.Count() * pageLinkCount;
-                }
-                else {
-                    nbResults = 1;
-                    pageLinkCount = 1;
-
-                    // Check if we have a minimum of one result
-                    if (firstPageRows.Length > 1)
-                    {
-                        // Retrieve total count on our alone page
-                        nbResults = firstPageRows.Count();
-                    }
-                    else
-                    {
-                        // Check if no result
-                        if(torrentRowList.First().Find("td").Length == 1)
-                        {
-                            // No results found
-                            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 -- Minus 1 to page due to strange pagination number on tracker side, starting with page 0...
-                        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()));
-                    }
-                }
-
-                // 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) > div:first > a").Attr("name").ToString(), @"\d+").Value);
-                    output("ID: " + id);
-
-                    // Check if torrent is not nuked by tracker or rulez, can't download it
-                    if (tRow.Find("td:eq(2) > a").Length == 0)
-                    {
-                        // Next item
-                        output("Torrent is nuked, we can't download it, going to next torrent...");
-                        continue;
-                    }
-
-                    // Release Name
-                    string name = tRow.Find("td:eq(2) > a").Attr("title").ToString().Substring(24).Trim();
-                    output("Release: " + name);
-
-                    // Category
-                    int categoryID = ParseUtil.CoerceInt(Regex.Match(tRow.Find("td:eq(0) > a").Attr("href").ToString(), @"\d+").Value);
-                    string categoryName = tRow.Find("td:eq(0) > a > img").Attr("title").Split(new[] { ':' }, 2)[1].Trim().ToString();
-                    output("Category: " + MapTrackerCatToNewznab(categoryID.ToString()) + " (" + categoryID + " - " + categoryName + ")");
-
-                    // Seeders
-                    int seeders = ParseUtil.CoerceInt(Regex.Match(tRow.Find("td:eq(5) > div > font").Select(s => Regex.Replace(s.ToString(), "<.*?>", String.Empty)).ToString(), @"\d+").Value);
-                    output("Seeders: " + seeders);
-
-                    // Leechers
-                    int leechers = ParseUtil.CoerceInt(Regex.Match(tRow.Find("td:eq(6) > div > font").Text().ToString(), @"\d+").Value);
-                    output("Leechers: " + leechers);
-
-                    // Completed
-                    int completed = ParseUtil.CoerceInt(Regex.Match(tRow.Find("td:eq(4)").Text().ToString(), @"\d+").Value);
-                    output("Completed: " + completed);
-
-                    // Files
-                    int files = 1;
-                    if (tRow.Find("td:eq(3) > a").Length == 1)
-                    {
-                        files = ParseUtil.CoerceInt(Regex.Match(tRow.Find("td:eq(3) > a").Text().ToString(), @"\d+").Value);
-                    }
-                    output("Files: " + files);
-
-                    // Health
-                    int percent = ParseUtil.CoerceInt(Regex.Match(tRow.Find("td:eq(7) > img").Attr("src").ToString(), @"\d+").Value) * 10;
-                    output("Health: " + percent + "%");
-
-                    // Size
-                    string humanSize = tRow.Find("td:eq(8)").Text().ToString().ToLowerInvariant();
-                    long size = ReleaseInfo.GetBytes(humanSize);
-                    output("Size: " + humanSize + " (" + size + " bytes)");
-
-                    // Date & IMDB & Genre
-                    string infosData = tRow.Find("td:eq(1) > div:last").Text().ToString();
-                    IList<string> infosList = Regex.Split(infosData, "\\|").ToList();
-                    IList<string> infosTorrent = infosList.Select(s => s.Split(new[] { ':' }, 2)[1].Trim()).ToList();
-
-                    // --> Date
-                    DateTime date = formatDate(infosTorrent.First());
-                    output("Released on: " + date.ToLocalTime().ToString());
-
-                    // --> Genre
-                    string genre = infosTorrent.Last();
-                    output("Genre: " + genre);
-
-                    // Torrent Details URL
-                    Uri detailsLink = new Uri(TorrentDescriptionUrl.Replace("{id}", id.ToString()));
-                    output("Details: " + detailsLink.AbsoluteUri);
-
-                    // Torrent Comments URL
-                    Uri commentsLink = new Uri(TorrentCommentUrl.Replace("{id}", id.ToString()));
-                    output("Comments Link: " + commentsLink.AbsoluteUri);
-
-                    // Torrent Download URL
-                    Uri downloadLink = new Uri(TorrentDownloadUrl.Replace("{id}", id.ToString()));
-                    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);
-
-            // Building our tracker query
-            parameters.Add("do", "search");
-
-            // If search term provided
-            if (!string.IsNullOrWhiteSpace(term))
-            {
-                // Add search term ~~ Strange search engine, need to replace space with dot for results !
-                parameters.Add("keywords", term.Replace(' ', '.'));
-            }
-            else
-            {
-                // Showing all torrents (just for output function)
-                parameters.Add("keywords", "");
-                term = "all";
-            }
-
-            // Adding requested categories
-            if(categoriesList.Count > 0)
-            {
-                // Add categories
-                parameters.Add("category", String.Join(",", categoriesList));
-            }
-            else
-            {
-                // Add empty category parameter
-                parameters.Add("category", "");
-            }
-
-            // Building our tracker query
-            parameters.Add("search_type", "t_name");
-
-            // Check if we are processing a new page
-            if (page > 1)
-            {
-                // Adding page number to query
-                parameters.Add("page", page.ToString());
-            }
-
-            // Building our query
-            url += "?" + parameters.GetQueryString();
-
-            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, ConfigData.CookieHeader.Value, SearchUrl, 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["#showcontents > table > tbody > tr:not(:first)"];
-        }
-
-        /// <summary>
-        /// Format Date to DateTime
-        /// </summary>
-        /// <param name="clock"></param>
-        /// <returns>A DateTime</returns>
-        private DateTime formatDate(string clock)
-        {
-            DateTime date;
-
-            // Switch from date format
-            if(clock.Contains("Aujourd'hui") || clock.Contains("Hier"))
-            {
-                // Get hours & minutes
-                IList<int> infosClock = clock.Split(':').Select(s => ParseUtil.CoerceInt(Regex.Match(s, @"\d+").Value)).ToList();
-
-                // Ago date with today
-                date = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, Convert.ToInt32(infosClock[0]), Convert.ToInt32(infosClock[1]), DateTime.Now.Second);
-
-                // Set yesterday if necessary
-                if (clock.Contains("Hier"))
-                {
-                    // Remove one day from date
-                    date.AddDays(-1);
-                }
-            }
-            else
-            {
-                // Parse Date if full
-                date = DateTime.ParseExact(clock, "MM-dd-yyyy HH:mm", CultureInfo.GetCultureInfo("fr-FR"), DateTimeStyles.AssumeLocal);
-            }
-
-            return date.ToUniversalTime();
-        }
-
-        /// <summary>
-        /// Download torrent file from tracker
-        /// </summary>
-        /// <param name="link">URL string</param>
-        /// <returns></returns>
-        public async override Task<byte[]> Download(Uri link)
-        {
-            var dl = link.AbsoluteUri;
-            // This tracker need to thanks Uploader before getting torrent file...
-            output("\nThis tracker needs you to thank uploader before downloading torrent!");
-
-            // Retrieving ID from link provided
-            int id = ParseUtil.CoerceInt(Regex.Match(link.AbsoluteUri, @"\d+").Value);
-            output("Torrent Requested ID: " + id);
-
-            // Building login form data
-            var pairs = new Dictionary<string, string> {
-                { "torrentid", id.ToString() },
-                { "_", string.Empty } // ~~ Strange, blank param...
-            };
-
-            // Add emulated XHR request
-            emulatedBrowserHeaders.Add("X-Prototype-Version", "1.6.0.3");
-            emulatedBrowserHeaders.Add("X-Requested-With", "XMLHttpRequest");
-
-            // Build WebRequest for thanks
-            var myRequestThanks = new WebRequest()
-            {
-                Type = RequestType.POST,
-                PostData = pairs,
-                Url = TorrentThanksUrl,
-                Headers = emulatedBrowserHeaders,
-                Cookies = ConfigData.CookieHeader.Value,
-                Referer = TorrentDescriptionUrl.Replace("{id}", id.ToString())
-            };
-
-            // Get thanks page -- (not used, just for doing a request)
-            latencyNow();
-            output("Thanks user, to get download link for our torrent.. with " + TorrentThanksUrl);
-            var thanksPage = await webclient.GetString(myRequestThanks);
-
-            // Get torrent file now
-            output("Getting torrent file now....");
-            var response = await base.Download(link);
-
-            // Remove our XHR request header
-            emulatedBrowserHeaders.Remove("X-Prototype-Version");
-            emulatedBrowserHeaders.Remove("X-Requested-With");
-
-            // Return content
-            return response;
-        }
-
-        /// <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 == true)
-            {
-                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());
-                }
-            }
-            else
-            {
-                // Browser simulation must be enabled (otherwhise, this provider will not work due to tracker's security)
-                throw new ExceptionWithConfigData("Browser Simulation must be enabled for this provider to work, please enable it !", ConfigData);
-            }
-
-            // 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/Freshon.cs

@@ -104,10 +104,13 @@ namespace Jackett.Indexers
                     release.MinimumRatio = 1;
                     release.MinimumSeedTime = 172800;
                     release.Title = qLink.Attr("title");
+                    if (!query.MatchQueryStringAND(release.Title))
+                        continue;
+
                     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());
@@ -128,6 +131,18 @@ namespace Jackett.Indexers
                     DateTime pubDateUtc = TimeZoneInfo.ConvertTimeToUtc(pubDateRomania, romaniaTz);
                     release.PublishDate = pubDateUtc.ToLocalTime();
 
+                    var grabs = row.Cq().Find("td.table_snatch").Get(0).FirstChild.ToString();
+                    release.Grabs = ParseUtil.CoerceInt(grabs);
+
+                    if (row.Cq().Find("img[alt=\"100% Free\"]").Any())
+                        release.DownloadVolumeFactor = 0;
+                    else if (row.Cq().Find("img[alt=\"50% Free\"]").Any())
+                        release.DownloadVolumeFactor = 0.5;
+                    else
+                        release.DownloadVolumeFactor = 1;
+
+                    release.UploadVolumeFactor = 1;
+
                     releases.Add(release);
                 }
             }

src/Jackett/Indexers/FunFile.cs

@@ -0,0 +1,154 @@
+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);
+
+                    var files = qRow.Find("td:nth-child(4)").Text();
+                    release.Files = ParseUtil.CoerceInt(files);
+
+                    var grabs = qRow.Find("td:nth-child(9)").Text();
+                    release.Grabs = ParseUtil.CoerceInt(grabs);
+
+                    var ka = qRow.Next();
+                    var DLFactor = ka.Find("table > tbody > tr:nth-child(3) > td:nth-child(2)").Text().Replace("X", "");
+                    var ULFactor = ka.Find("table > tbody > tr:nth-child(3) > td:nth-child(1)").Text().Replace("X", "");
+                    release.DownloadVolumeFactor = ParseUtil.CoerceDouble(DLFactor);
+                    release.UploadVolumeFactor = ParseUtil.CoerceDouble(ULFactor);
+
+                    releases.Add(release);
+                }
+            }
+            catch (Exception ex)
+            {
+                OnParseError(results.Content, ex);
+            }
+
+            return releases;
+        }
+    }
+}

src/Jackett/Indexers/Fuzer.cs

@@ -0,0 +1,306 @@
+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);
+
+                    var grabs = qRow.Find("td:nth-child(6)").Text();
+                    release.Grabs = ParseUtil.CoerceInt(grabs);
+
+                    if (qRow.Find("img[src=\"/images/FL.png\"]").Length >= 1)
+                        release.DownloadVolumeFactor = 0;
+                    else
+                        release.DownloadVolumeFactor = 1;
+
+                    release.UploadVolumeFactor = 1;
+
+                    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/GFTracker.cs

@@ -63,16 +63,19 @@ namespace Jackett.Indexers
         {
             var loginPage = await RequestStringWithCookies(StartPageUrl, string.Empty);
             CQ cq = loginPage.Content;
-            var result = new ConfigurationDataRecaptchaLogin();
+            var result = this.configData;
             CQ recaptcha = cq.Find(".g-recaptcha").Attr("data-sitekey");
             if(recaptcha.Length != 0)   // recaptcha not always present in login form, perhaps based on cloudflare uid or just phase of the moon
             {
                 result.CookieHeader.Value = loginPage.Cookies;
                 result.Captcha.SiteKey = cq.Find(".g-recaptcha").Attr("data-sitekey");
+                result.Captcha.Version = "2";
                 return result;
             } else
             {
                 var stdResult = new ConfigurationDataBasicLogin();
+                stdResult.Username.Value = configData.Username.Value;
+                stdResult.Password.Value = configData.Password.Value;
                 stdResult.CookieHeader.Value = loginPage.Cookies;
                 return stdResult;
             }           

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

@@ -14,13 +14,14 @@ using System.Web;
 using System.Text.RegularExpressions;
 using System.Globalization;
 using Jackett.Models.IndexerConfig;
-
+using System.Collections.Specialized;
+
 namespace Jackett.Indexers
 {
     public class HDSpace : BaseIndexer, IIndexer
     {
         private string LoginUrl { get { return SiteLink + "index.php?page=login"; } }
-        private string SearchUrl { get { return SiteLink + "index.php?page=torrents&active=0&options=0&category=21%3B22&search={0}"; } }
+        private string SearchUrl { get { return SiteLink + "index.php?page=torrents&"; } }
 
         new ConfigurationDataBasicLogin configData
         {
@@ -39,7 +40,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)
         {
@@ -69,8 +99,22 @@ namespace Jackett.Indexers
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
-            var episodeSearchUrl = string.Format(SearchUrl, HttpUtility.UrlEncode(query.GetQueryString()));
-            var response = await RequestStringWithCookiesAndRetry(episodeSearchUrl);
+
+            var searchString = query.GetQueryString();
+            var searchUrl = SearchUrl;
+            var queryCollection = new NameValueCollection();
+            queryCollection.Add("active", "0");
+            queryCollection.Add("options", "0");
+            queryCollection.Add("category", string.Join(";", MapTorznabCapsToTrackers(query)));
+
+            if (!string.IsNullOrWhiteSpace(searchString))
+            {
+                queryCollection.Add("search", searchString);
+            }
+
+            searchUrl += queryCollection.GetQueryString();
+
+            var response = await RequestStringWithCookiesAndRetry(searchUrl);
             var results = response.Content;
 
             try
@@ -112,6 +156,25 @@ namespace Jackett.Indexers
                     release.Seeders = ParseUtil.CoerceInt(row.ChildElements.ElementAt(7).Cq().Text());
                     release.Peers = ParseUtil.CoerceInt(row.ChildElements.ElementAt(8).Cq().Text()) + release.Seeders;
 
+                    var grabs = qRow.Find("td:nth-child(10)").Text();
+                    grabs = grabs.Replace("---", "0");
+                    release.Grabs = ParseUtil.CoerceInt(grabs);
+
+                    if (qRow.Find("img[title=\"FreeLeech\"]").Length >= 1)
+                        release.DownloadVolumeFactor = 0;
+                    else if (qRow.Find("img[src=\"images/sf.png\"]").Length >= 1) // side freeleech
+                        release.DownloadVolumeFactor = 0;
+                    else if (qRow.Find("img[title=\"Half FreeLeech\"]").Length >= 1)
+                        release.DownloadVolumeFactor = 0.5;
+                    else
+                        release.DownloadVolumeFactor = 1;
+
+                    release.UploadVolumeFactor = 1;
+
+                    var qCat = qRow.Find("a[href^=\"index.php?page=torrents&category=\"]");
+                    var cat = qCat.Attr("href").Split('=')[2];
+                    release.Category = MapTrackerCatToNewznab(cat);
+
                     releases.Add(release);
                 }
             }

src/Jackett/Indexers/Hebits.cs

@@ -0,0 +1,169 @@
+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());
+
+                    var files = qRow.Find("div.bFiles").Get(0).LastChild.ToString();
+                    release.Files = ParseUtil.CoerceInt(files);
+
+                    var grabs = qRow.Find("div.bFinish").Get(0).LastChild.ToString();
+                    release.Grabs = ParseUtil.CoerceInt(grabs);
+
+                    if (qRow.Find("img[src=\"/pic/free.jpg\"]").Length >= 1)
+                        release.DownloadVolumeFactor = 0;
+                    else
+                        release.DownloadVolumeFactor = 1;
+
+                    if (qRow.Find("img[src=\"/pic/triple.jpg\"]").Length >= 1)
+                        release.UploadVolumeFactor = 3;
+                    else if (qRow.Find("img[src=\"/pic/double.jpg\"]").Length >= 1)
+                        release.UploadVolumeFactor = 2;
+                    else
+                        release.UploadVolumeFactor = 1;
+
+                    releases.Add(release);
+                }
+            }
+
+            catch (Exception ex)
+            {
+                OnParseError(results, ex);
+            }
+
+            return releases;
+        }
+    }
+}

src/Jackett/Indexers/Hounddawgs.cs

@@ -131,9 +131,19 @@ namespace Jackett.Indexers
 					release.Size = ReleaseInfo.GetBytes(sizeStr);
 
 					release.Seeders = ParseUtil.CoerceInt(row.ChildElements.ElementAt(6).Cq().Text());
-					release.Peers = ParseUtil.CoerceInt(row.ChildElements.ElementAt(7).Cq().Text()) + release.Seeders;
+					release.Peers = ParseUtil.CoerceInt(row.ChildElements.ElementAt(7).Cq().Text()) + release.Seeders;
+
+                    var files = row.Cq().Find("td:nth-child(4)").Text();
+                    release.Files = ParseUtil.CoerceInt(files);
 
-					releases.Add(release);
+                    if (row.Cq().Find("img[src=\"/static//common/browse/freeleech.png\"]").Any())
+                         release.DownloadVolumeFactor = 0;
+                    else
+                        release.DownloadVolumeFactor = 1;
+
+                    release.UploadVolumeFactor = 1;
+
+                    releases.Add(release);
 				}
 			}
 			catch (Exception ex)

src/Jackett/Indexers/HouseOfTorrents.cs

@@ -0,0 +1,220 @@
+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();
+
+                    var files = qRow.Find("td:nth-child(4)").Text();
+                    release.Files = ParseUtil.CoerceInt(files);
+
+                    var grabs = qRow.Find("td:nth-child(8) > a").Html();
+                    release.Grabs = ParseUtil.CoerceInt(grabs.Split('<')[0]);
+
+                    release.DownloadVolumeFactor = 0; // ratioless
+                    
+                    release.UploadVolumeFactor = 1;
+
+                    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,14 @@ 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); } }
+        string TakeLoginUrl { get { return UseLink + "take_login.php"; } }
+        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 +41,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 +99,9 @@ namespace Jackett.Indexers
             };
             var request = new Utils.Clients.WebRequest()
             {
-                Url = SiteLink,
+                Url = TakeLoginUrl,
                 Type = RequestType.POST,
-                Referer = SiteLink,
+                Referer = UseLink,
                 PostData = pairs
             };
             var response = await webclient.GetString(request);
@@ -141,7 +148,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 +163,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 +172,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);
@@ -176,6 +183,16 @@ namespace Jackett.Indexers
                     var cat = row.Cq().Find("td:eq(0) a").First().Attr("href").Substring(1);
                     release.Category = MapTrackerCatToNewznab(cat);
 
+                    var grabs = row.Cq().Find("td:nth-child(7)").Text();
+                    release.Grabs = ParseUtil.CoerceInt(grabs);
+
+                    if(row.Cq().Find("span.t_tag_free_leech").Any())
+                        release.DownloadVolumeFactor = 0;
+                    else
+                        release.DownloadVolumeFactor = 1;
+
+                    release.UploadVolumeFactor = 1;
+
                     releases.Add(release);
                 }
             }