TorrentLeech: fix DL link

* AlphaReign: add login test selector

* Add Apollo/XANAX tacker

* Add Apollo/XANAX tracker

* fix readme

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,61 +14,120 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 
 
 #### Supported Private Trackers
+ * Abnormal
  * AlphaRatio
+ * AlphaReign
+ * Andraste
  * AnimeBytes
+ * AnimeTorrents
+ * Apollo (XANAX)
  * Avistaz
+ * BakaBT
  * bB
+ * Best Friends
  * BeyondHD
+ * Bit-City Reloaded
  * BIT-HDTV
  * BitMeTV
  * BitSoup
- * BlueTigers
+ * Blu-bits
  * BTN
+ * CinemaZ
  * DanishBits
  * Demonoid
- * EuTorrents
+ * DigitalHive
+ * EoT-Forum
+ * Ethor.net (Thor's Land)
  * FileList
- * Fnt
- * French-ADN
+ * Freaks Tracking System
  * Freshon
+ * FunFile
+ * Fuzer
+ * Ghost City
+ * HD4Free
  * HD-Space
  * HD-Torrents
+ * Hebits
+ * New Real World
  * Hounddawgs
+ * House-of-Torrents
+ * ILoveTorrents
  * Immortalseed
  * IPTorrents
  * MoreThanTV
+ * MyAnonamouse
+ * myAmity
+ * MySpleen
  * NCore
+ * NetHD
  * NextGen
+ * Norbits
+ * PassThePopcorn
+ * PirateTheNet
  * Pretome
  * PrivateHD
  * RevolutionTT
  * SceneAccess
+ * SceneFZ
  * SceneTime
+ * SDBits
+ * Secret Cinema
+ * Shareisland
  * Shazbat
  * SpeedCD
+ * The Horror Charnel
+ * The New Retro
+ * The Shinning
  * TehConnection
+ * TenYardTracker
+ * Torrent Network
+ * Torrent Sector Crew
+ * TorrentBD
  * TorrentBytes
  * TorrentDay
+ * TorrentHeaven
  * TorrentLeech
  * TorrentShack
+ * Torrent-Syndikat
+ * ToTheGlory
+ * TransmitheNet
+ * Tspate
  * TV Chaos UK
+ * TV-Vault
+ * UHDBits
  * World-In-HD
+ * WorldOfP2P
+ * x264
  * XSpeeds
+ * Xthor
 
 #### Installation on Windows
 
-We recommend you install Jackett as a Windows service using the supplied installer.  When installed as a service the tray icon acts as a way to open/start/stop Jackett. If you opted to not install it as a service then Jackett will run its web server from the tray tool.
+We recommend you install Jackett as a Windows service using the supplied installer. You may also download the zipped version if you would like to configure everything manually.
 
-Jackett can also be run from the command line using JackettConsole.exe if you would like to see log messages (Ensure the server isn't already running from the tray/service).
+To get started with using the installer for Jackett, follow the steps below:
+
+1. Download the latest version of the Windows installer, "Jackett.Installer.Windows.exe" from the [releases](https://github.com/Jackett/Jackett/releases/latest) page.
+2. When prompted if you would like this app to make changes to your computer, select "yes".
+3. If you would like to install Jackett as a Windows Service, make sure the "Install as Windows Service" checkbox is filled.
+4. Once the installation has finished, check the "Launch Jackett" box to get started.
+5. Navigate your web browser to: http://127.0.0.1:9117
+6. You're now ready to begin adding your trackers and using Jackett.
+
+When installed as a service the tray icon acts as a way to open/start/stop Jackett. If you opted to not install it as a service then Jackett will run its web server from the tray tool.
+
+Jackett can also be run from the command line if you would like to see log messages (Ensure the server isn't already running from the tray/service). This can be done by using "JackettConsole.exe" (for Command Prompt), found in the Jackett data folder: "%ProgramData%\Jackett". 
 
 #### 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.
+       * On Red Hat/CentOS  the `mono-locale-extras` package is also required
  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 +151,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/0d1nl7g.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

@@ -57,9 +57,12 @@ namespace Jackett.Console
         [Option('f', "SSLFix", HelpText = "[true/false] Linux Libcurl NSS Missing ECC Ciphers workaround (Use if you can't access some trackers) .")]
         public bool? SSLFix { get; set; }
 
-        [Option('n', "IgnoreSslErrors", HelpText = "[true/false] Linux Libcurl - Ignores invalid SSL certificates")]
+        [Option('n', "IgnoreSslErrors", HelpText = "[true/false] 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

@@ -9,6 +9,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Net;
 using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -96,7 +97,14 @@ namespace JackettConsole
                     Startup.IgnoreSslErrors = options.IgnoreSslErrors;
                     if (options.IgnoreSslErrors == true)
                     {
-                        Engine.Logger.Info("Curl will ignore SSL certificate errors.");
+                        Engine.Logger.Info("Jackett will ignore SSL certificate errors.");
+                    }
+
+                    // Choose Data Folder
+                    if (!string.IsNullOrWhiteSpace(options.DataFolder))
+                    {
+                        Startup.CustomDataFolder = options.DataFolder.Replace("\"", string.Empty).Replace("'", string.Empty).Replace(@"\\", @"\");
+                        Engine.Logger.Info("Jackett Data will be stored in: " + Startup.CustomDataFolder);
                     }
 
                     /*  ======     Actions    =====  */

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,15 @@ namespace JackettTest
         {
             throw new NotImplementedException();
         }
+
+        public void InitCardigannIndexers(string path)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void SortIndexers()
+        {
+            throw new NotImplementedException();
+        }
     }
 }

src/Jackett.Test/TestWebClient.cs

@@ -1,4 +1,6 @@
-using Jackett.Utils.Clients;
+using Jackett.Services;
+using Jackett.Utils.Clients;
+using NLog;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -12,6 +14,13 @@ namespace JackettTest
         private Dictionary<WebRequest, Func<WebRequest, WebClientByteResult>> byteCallbacks = new Dictionary<WebRequest, Func<WebRequest, WebClientByteResult>>();
         private Dictionary<WebRequest, Func<WebRequest, WebClientStringResult>> stringCallbacks = new Dictionary<WebRequest, Func<WebRequest, WebClientStringResult>>();
 
+        public TestWebClient(IProcessService p, Logger l, IConfigurationService c)
+            : base(p: p,
+                   l: l,
+                   c: c)
+        {
+        }
+
         public void RegisterByteCall(WebRequest req, Func<WebRequest, WebClientByteResult> f)
         {
             byteCallbacks.Add(req, f);
@@ -22,17 +31,17 @@ namespace JackettTest
             stringCallbacks.Add(req, f);
         }
 
-        public Task<WebClientByteResult> GetBytes(WebRequest request)
+        override public Task<WebClientByteResult> GetBytes(WebRequest request)
         {
            return Task.FromResult< WebClientByteResult>(byteCallbacks.Where(r => r.Key.Equals(request)).First().Value.Invoke(request));
         }
 
-        public Task<WebClientStringResult> GetString(WebRequest request)
+        override public Task<WebClientStringResult> GetString(WebRequest request)
         {
             return Task.FromResult<WebClientStringResult>(stringCallbacks.Where(r => r.Key.Equals(request)).First().Value.Invoke(request));
         }
 
-        public void Init()
+        override public void Init()
         {
           
         }

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,176 @@
-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));
+                    var destDir = Path.GetDirectoryName(dest);
+                    if (!Directory.Exists(destDir))
+                    {
+                        Engine.Logger.Info("Creating directory " + destDir);
+                        Directory.CreateDirectory(destDir);
+                    }
+                    File.Copy(file, dest, true);
+                }
+                catch(Exception e)
+                {
+                    Engine.Logger.Error(e);
+                }
+            }
+
+            // delete old files
+            string[] oldDirs = new string[] { "Content/logos" };
+
+            foreach (var oldDir in oldDirs)
+            {
+                try
+                {
+                    var deleteDir = Path.Combine(options.Path, oldDir);
+                    if (Directory.Exists(deleteDir))
+                    {
+                        Engine.Logger.Info("Deleting directory " + deleteDir);
+                        Directory.Delete(deleteDir, true);
+                    }
+                }
+                catch (Exception e)
+                {
+                    Engine.Logger.Error(e);
+                }
+            }
+
+            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

@@ -20,69 +20,25 @@
     display: none;
 }
 
-.card {
-    background-color: #f9f9f9;
-    border-radius: 6px;
-    box-shadow: 1px 1px 5px 2px #cdcdcd;
-    width: 270px;
-    display: inline-block;
-    vertical-align: top;
-    margin: 5px;
-    overflow: hidden;
-    position: relative;
-}
-
 #indexers {
    text-align: center;
    margin-top: 30px;
 }
 
-
-#unconfigured-indexers{
-   text-align: center;
+.indexer-table {
+   text-align: left;
 }
 
-#unconfigured-indexers .card {
-    width: 200px;
-    position: relative;
+.test-success {
+    color: #449d44;
 }
 
-.unconfigured-indexer {
-    height: 70px;
+.test-error {
+    color: #c9302c;
 }
 
-
-
-.indexer {
-    height: 252px;
-}
-
-.add-indexer {
-    border: 0;
-}
-
-.indexer-logo {
-    padding-bottom: 5px;
-}
-
-.indexer-logo > .hidden-name {
-    position: absolute;
-    color: rgba(255, 255, 255, 0);
-    left: 0;
-}
-
-.indexer-logo  img {
-    width: 100%;
-    border-bottom: 1px solid #FFF;
-}
-
-#unconfigured-indexers .indexer-logo  img {
-    cursor: pointer;
-}
-
-.indexer-name > h3 {
-    margin-top: 13px;
-    text-align: center;
+.test-inprogress {
+    color: #286090;
 }
 
 .indexer-buttons {
@@ -94,33 +50,7 @@
 }
 
 .indexer-button-test {
-    width: 60px;
-}
-
-.indexer-add-content {
-    color: gray;
-    text-align: center;
-}
-
-    .indexer-add-content > .glyphicon {
-        font-size: 50px;
-        vertical-align: bottom;
-    }
-
-    .indexer-add-content > .light-text {
-        margin-top: 11px;
-        font-size: 18px;
-        margin-left: -5px;
-    }
-
-.indexer-host {
-    padding-left: 5px;
-    padding-right: 5px;
-}
-
-.indexer-host > input {
-    font-size: 12px;
-    padding: 2px;
+   width: 60px;
 }
 
 .setup-item-inputstring {
@@ -293,3 +223,12 @@ pre {
     width: 80px;
 }
 
+.setup-item-displayinfo:empty {
+    display: none;
+}
+
+.table td.fit{
+    white-space: nowrap;
+    width: 1%;
+}
+

src/Jackett/Content/custom.js

@@ -1,15 +1,21 @@
-$(document).ready(function () {
+var basePath = '';
+
+var indexers = [];
+var configuredIndexers = [];
+var unconfiguredIndexers = [];
+
+$(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 +28,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,59 +44,158 @@ function loadJackettSettings() {
         if (password != null && password != '') {
             $("#logoutBtn").show();
         }
+
+        reloadIndexers();
     });
 }
 
 function reloadIndexers() {
     $('#indexers').hide();
-    $('#indexers > .indexer').remove();
-    $('#unconfigured-indexers').empty();
-    var jqxhr = $.get("/admin/get_indexers", function (data) {
-        displayIndexers(data.items);
+    var jqxhr = $.get("get_indexers", function (data) {
+        indexers = data;
+        configuredIndexers = [];
+        unconfiguredIndexers = [];
+        for (var i = 0; i < data.items.length; i++) {
+            var item = data.items[i];
+            item.torznab_host = resolveUrl(basePath + "/torznab/" + item.id);
+            item.potato_host = resolveUrl(basePath + "/potato/" + item.id);
+            
+            if (item.last_error)
+                item.state = "error";
+            else
+                item.state = "success";
+
+            var main_cats_list = [];
+            for (var catID in item.caps) {
+                var cat = item.caps[catID];
+                var mainCat = cat.split("/")[0];
+                main_cats_list.push(mainCat);
+            }
+            item.mains_cats = $.unique(main_cats_list).join(", ");
+           
+            if (item.configured)
+                configuredIndexers.push(item);
+            else
+                unconfiguredIndexers.push(item);
+        }
+        displayConfiguredIndexersList(configuredIndexers);
+        displayUnconfiguredIndexersList(unconfiguredIndexers);
     }).fail(function () {
         doNotify("Error loading indexers, request to Jackett server failed", "danger", "glyphicon glyphicon-alert");
     });
 }
 
-function displayIndexers(items) {
-    var indexerTemplate = Handlebars.compile($("#configured-indexer").html());
-    var unconfiguredIndexerTemplate = Handlebars.compile($("#unconfigured-indexer").html());
+function displayConfiguredIndexersList(indexers) {
+    var indexersTemplate = Handlebars.compile($("#configured-indexer-table").html());
+    var indexersTable = $(indexersTemplate({ indexers: indexers, total_configured_indexers: indexers.length }));
+    indexersTable.find('table').DataTable(
+         {
+             "pageLength": 100,
+             "lengthMenu": [[10, 20, 50, 100, 200, -1], [10, 20, 50, 100, 200, "All"]],
+             "order": [[0, "desc"]],
+             "columnDefs": [
+                {
+                    "targets": 0,
+                    "visible": true,
+                    "searchable": true
+                },
+                {
+                    "targets": 1,
+                    "visible": true,
+                    "searchable": false
+                }
+             ]
+         });
+    
+    $('#indexers').empty();
+    $('#indexers').append(indexersTable);
+    prepareTestButtons();
+    $('#indexers').fadeIn();
+    prepareSearchButtons();
+    prepareSetupButtons();
+    prepareDeleteButtons();
+    prepareCopyButtons();
+}
+
+function displayUnconfiguredIndexersList(indexers) {
+    var indexersTemplate = Handlebars.compile($("#unconfigured-indexer-table").html());
+    var indexersTable = $(indexersTemplate({ indexers: indexers, total_unconfigured_indexers: indexers.length  }));
+    indexersTable.find('table').DataTable(
+         {
+             "pageLength": 100,
+             "lengthMenu": [[10, 20, 50, 100, 200, -1], [10, 20, 50, 100, 200, "All"]],
+             "order": [[0, "desc"]],
+             "columnDefs": [
+                {
+                    "targets": 0,
+                    "visible": true,
+                    "searchable": true
+                },
+                {
+                    "targets": 1,
+                    "visible": true,
+                    "searchable": true
+                },
+                {
+                    "targets": 2,
+                    "visible": true,
+                    "searchable": true
+                },
+                {
+                    "targets": 3,
+                    "visible": true,
+                    "searchable": false
+                }
+             ]
+         });
     $('#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);
-        if (item.configured)
-            $('#indexers').append(indexerTemplate(item));
-        else
-            $('#unconfigured-indexers-template').append($(unconfiguredIndexerTemplate(item)));
+    $('#unconfigured-indexers-template').append(indexersTable);
+}
+
+function copyToClipboard(text) {
+    // create hidden text element, if it doesn't already exist
+    var targetId = "_hiddenCopyText_";
+    // must use a temporary form element for the selection and copy
+    target = document.getElementById(targetId);
+    if (!target) {
+        var target = document.createElement("textarea");
+        target.style.position = "absolute";
+        target.style.left = "-9999px";
+        target.style.top = "0";
+        target.id = targetId;
+        document.body.appendChild(target);
+    }
+    target.textContent = text;
+    // select the content
+    var currentFocus = document.activeElement;
+    target.focus();
+    target.setSelectionRange(0, target.value.length);
+
+    // copy the selection
+    var succeed;
+    try {
+        succeed = document.execCommand("copy");
+    } catch (e) {
+        succeed = false;
+    }
+    // restore original focus
+    if (currentFocus && typeof currentFocus.focus === "function") {
+        currentFocus.focus();
     }
 
-    var addIndexerButton = $($('#add-indexer').html());
-    addIndexerButton.appendTo($('#indexers'));
+    target.textContent = "";
 
-    addIndexerButton.click(function () {
-        $("#modals").empty();
-        var dialog = $($("#select-indexer").html());
-        dialog.find('#unconfigured-indexers').html($('#unconfigured-indexers-template').html());
-        $("#modals").append(dialog);
-        dialog.modal("show");
-        $('.indexer-setup').each(function (i, btn) {
-            var $btn = $(btn);
-            var id = $btn.data("id");
-            var link = $btn.data("link");
-            $btn.click(function () {
-                $('#select-indexer-modal').modal('hide').on('hidden.bs.modal', function (e) {
-                    displayIndexerSetup(id, link);
-                });
-            });
+    return succeed;
+}
+
+function prepareCopyButtons() {
+    $(".indexer-button-copy").each(function (i, btn) {
+        var $btn = $(btn);
+        var title = $btn[0].title;
+        $btn.click(function () {
+            copyToClipboard(title);
         });
     });
-
-    $('#indexers').fadeIn();
-    prepareSetupButtons();
-    prepareTestButtons();
-    prepareDeleteButtons();
 }
 
 function prepareDeleteButtons() {
@@ -92,7 +203,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");
                 }
@@ -108,6 +219,16 @@ function prepareDeleteButtons() {
     });
 }
 
+function prepareSearchButtons() {
+    $('.indexer-button-search').each(function (i, btn) {
+        var $btn = $(btn);
+        var id = $btn.data("id");
+        $btn.click(function() {
+            showSearch(id);
+        });
+    });
+}
+
 function prepareSetupButtons() {
     $('.indexer-setup').each(function (i, btn) {
         var $btn = $(btn);
@@ -119,29 +240,62 @@ function prepareSetupButtons() {
     });
 }
 
+function updateTestState(id, state, message)
+{
+    var btn = $(".indexer-button-test[data-id=" + id + "]");
+    if (message) {
+        btn.tooltip("hide");
+        btn.data('bs.tooltip', false).tooltip({ title: message });
+    }
+    var icon = btn.find("span");
+    icon.removeClass("glyphicon-ok test-success glyphicon-alert test-error glyphicon-refresh spinner test-inprogres");
+
+    if (state == "success") {
+        icon.addClass("glyphicon-ok test-success");
+    } else if (state == "error") {
+        icon.addClass("glyphicon-alert test-error");
+    } else if (state == "inprogres") {
+        icon.addClass("glyphicon-refresh test-inprogres spinner");
+    }
+}
+
+function testIndexer(id, notifyResult) {
+    updateTestState(id, "inprogres", null);
+    
+    if (notifyResult)
+        doNotify("Test started for " + id, "info", "glyphicon glyphicon-transfer");
+    var jqxhr = $.post("test_indexer", JSON.stringify({ indexer: id }), function (data) {
+        if (data.result == "error") {
+            updateTestState(id, "error", data.error);
+            if (notifyResult)
+                doNotify("Test failed for " + id + ": \n" + data.error, "danger", "glyphicon glyphicon-alert");
+        }
+        else {
+            updateTestState(id, "success", "Test successful");
+            if (notifyResult)
+                doNotify("Test successful for " + id, "success", "glyphicon glyphicon-ok");
+        }
+    }).fail(function () {
+        doNotify("Error testing indexer, request to Jackett server error", "danger", "glyphicon glyphicon-alert");
+    });
+}
+
 function prepareTestButtons() {
     $(".indexer-button-test").each(function (i, btn) {
         var $btn = $(btn);
         var id = $btn.data("id");
+        var state = $btn.data("state");
+        $btn.tooltip();
+        updateTestState(id, state, null);
         $btn.click(function () {
-            doNotify("Test started for " + id, "info", "glyphicon glyphicon-transfer");
-            var jqxhr = $.post("/admin/test_indexer", JSON.stringify({ indexer: id }), function (data) {
-                if (data.result == "error") {
-                    doNotify("Test failed for " + id + ": \n" + data.error, "danger", "glyphicon glyphicon-alert");
-                }
-                else {
-                    doNotify("Test successful for " + id, "success", "glyphicon glyphicon-ok");
-                }
-            }).fail(function () {
-                doNotify("Error testing indexer, request to Jackett server error", "danger", "glyphicon glyphicon-alert");
-            });
+            testIndexer(id, true);
         });
     });
 }
 
 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 +344,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 +405,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 +438,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 +489,166 @@ 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 showSearch(selectedIndexer) {
+    $('#select-indexer-modal').remove();
+    var releaseTemplate = Handlebars.compile($("#jackett-search").html());
+    var releaseDialog = $(releaseTemplate({
+        indexers: configuredIndexers
+    }));
+
+    $("#modals").append(releaseDialog);
+
+    releaseDialog.on('shown.bs.modal', function () {
+        releaseDialog.find('#searchquery').focus();
+    });
+
+    var setCategories = function (tracker, items) {
+        var cats = {};
+        for (var i = 0; i < items.length; i++) {
+            if (items[i].configured === true && (items[i].id === tracker || tracker === '')) {
+                indexers["'" + items[i].id + "'"] = items[i].name;
+                for (var prop in items[i].caps) {
+                    cats[prop] = items[i].caps[prop];
+                }
+            }
+        }
+        var select = $('#searchCategory');
+        select.html("<option value=''>-- All --</option>");
+        $.each(cats, function (value, key) {
+            select.append($("<option></option>")
+                .attr("value", value).text(key + ' (' + value + ')'));
+        });
+    };
+
+    $('#searchTracker').change(jQuery.proxy(function () {
+        var trackerId = $('#searchTracker').val();
+        setCategories(trackerId, this.items);
+    }, { items: configuredIndexers }));
+
+    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') {
+            // We are searchin already
+            return;
+        }
+        var queryObj = {
+            Query: releaseDialog.find('#searchquery').val(),
+            Category: releaseDialog.find('#searchCategory').val(),
+            Tracker: releaseDialog.find('#searchTracker').val().replace("'", "").replace("'", ""),
+        };
+        $('#searchResults').empty();
+
+        $('#jackett-search-perform').html($('#spinner').html());
+        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(
+                {
+                    "pageLength": 20,
+                    "lengthMenu": [[10, 20, 50, -1], [10, 20, 50, "All"]],
+                    "order": [[0, "desc"]],
+                    "columnDefs": [
+                        {
+                            "targets": 0,
+                            "visible": false,
+                            "searchable": false,
+                            "type": 'date'
+                        },
+                        {
+                            "targets": 1,
+                            "visible": true,
+                            "searchable": false,
+                            "iDataSort": 0
+                        },
+                        {
+                            "targets": 4,
+                            "visible": false,
+                            "searchable": false,
+                            "type": 'num'
+                        },
+                            {
+                                "targets": 5,
+                                "visible": true,
+                                "searchable": false,
+                                "iDataSort": 4
+                            }
+                    ],
+                    initComplete: function () {
+                        var count = 0;
+                        this.api().columns().every(function () {
+                            count++;
+                            if (count === 3 || count === 8) {
+                                var column = this;
+                                var select = $('<select><option value=""></option></select>')
+                                    .appendTo($(column.footer()).empty())
+                                    .on('change', function () {
+                                        var val = $.fn.dataTable.util.escapeRegex(
+                                            $(this).val()
+                                        );
+
+                                        column
+                                            .search(val ? '^' + val + '$' : '', true, false)
+                                            .draw();
+                                    });
+
+                                column.data().unique().sort().each(function (d, j) {
+                                    select.append('<option value="' + d + '">' + d + '</option>')
+                                });
+                            }
+                        });
+                    }
+                });
+
+        }).fail(function () {
+            $('#jackett-search-perform').html('Search trackers');
+            doNotify("Request to Jackett server failed", "danger", "glyphicon glyphicon-alert");
+        });
+    });
+
+    var searchTracker = releaseDialog.find("#searchTracker");
+    if (selectedIndexer)
+        searchTracker.val(selectedIndexer);
+    searchTracker.trigger("change");
+    releaseDialog.modal("show");
+}
 
 function bindUIButtons() {
     $('body').on('click', '.downloadlink', function (e, b) {
@@ -320,11 +671,38 @@ function bindUIButtons() {
         return false;
     });
 
+    $('#jackett-add-indexer').click(function () {
+        $("#modals").empty();
+        var dialog = $($("#select-indexer").html());
+        dialog.find('#unconfigured-indexers').html($('#unconfigured-indexers-template').html());
+        $("#modals").append(dialog);
+        dialog.modal("show");
+        $('.indexer-setup').each(function (i, btn) {
+            var $btn = $(btn);
+            var id = $btn.data("id");
+            var link = $btn.data("link");
+            $btn.click(function () {
+                $('#select-indexer-modal').modal('hide').on('hidden.bs.modal', function (e) {
+                    displayIndexerSetup(id, link);
+                });
+            });
+        });
+    });
+
+    $("#jackett-test-all").click(function () {
+        $(".indexer-button-test").each(function (i, btn) {
+            var $btn = $(btn);
+            var id = $btn.data("id");
+            testIndexer(id, false);
+        });
+    });
+
     $("#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 +750,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())
@@ -402,139 +780,11 @@ function bindUIButtons() {
     });
 
     $("#jackett-show-search").click(function () {
-        $('#select-indexer-modal').remove();
-        var jqxhr = $.get("/admin/get_indexers", function (data) {
-            var scope = {
-                items: data.items
-            };
-
-            var indexers = [];
-            indexers.push({ id: '', name: '-- All --' });
-            for (var i = 0; i < data.items.length; i++) {
-                if (data.items[i].configured === true) {
-                    indexers.push(data.items[i]);
-                }
-            }
-
-            var releaseTemplate = Handlebars.compile($("#jackett-search").html());
-            var releaseDialog = $(releaseTemplate({ indexers: indexers }));
-            $("#modals").append(releaseDialog);
-            releaseDialog.modal("show");
-
-            var setCategories = function (tracker, items) {
-                var cats = {};
-                for (var i = 0; i < items.length; i++) {
-                    if (items[i].configured === true && (items[i].id === tracker || tracker === '')) {
-                        indexers["'" + items[i].id + "'"] = items[i].name;
-                        for (var prop in items[i].caps) {
-                            cats[prop] = items[i].caps[prop];
-                        }
-                    }
-                }
-                var select = $('#searchCategory');
-                select.html("<option value=''>-- All --</option>");
-                $.each(cats, function (value, key) {
-                    select.append($("<option></option>")
-                       .attr("value", value).text(key + ' (' + value + ')'));
-                });
-            };
-
-            setCategories('', data.items);
-            $('#searchTracker').change(jQuery.proxy(function () {
-                var trackerId = $('#searchTracker').val();
-                setCategories(trackerId, this.items);
-            }, scope));
-
-
-            $('#jackett-search-perform').click(function () {
-                if ($('#jackett-search-perform').text().trim() !== 'Search trackers') {
-                    // We are searchin already
-                    return;
-                }
-                var queryObj = {
-                    Query: releaseDialog.find('#searchquery').val(),
-                    Category: releaseDialog.find('#searchCategory').val(),
-                    Tracker: releaseDialog.find('#searchTracker').val().replace("'", "").replace("'", ""),
-                };
-                $('#searchResults').empty();
-
-                $('#jackett-search-perform').html($('#spinner').html());
-                var jqxhr = $.post("/admin/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('table').DataTable(
-                    {
-                        "pageLength": 20,
-                        "lengthMenu": [[10, 20, 50, -1], [10, 20, 50, "All"]],
-                        "order": [[0, "desc"]],
-                        "columnDefs": [
-                           {
-                               "targets": 0,
-                               "visible": false,
-                               "searchable": false,
-                               "type": 'date'
-                           },
-                           {
-                               "targets": 1,
-                               "visible": true,
-                               "searchable": false,
-                               "iDataSort": 0
-                           },
-                           {
-                                "targets": 4,
-                                "visible": false,
-                                "searchable": false,
-                                "type": 'num'
-                           },
-                           {
-                                 "targets": 5,
-                                 "visible": true,
-                                 "searchable": false,
-                                 "iDataSort": 4
-                           }
-                        ],
-                        initComplete: function () {
-                            var count = 0;
-                            this.api().columns().every(function () {
-                                count++;
-                                if (count === 3 || count === 7) {
-                                    var column = this;
-                                    var select = $('<select><option value=""></option></select>')
-                                        .appendTo($(column.footer()).empty())
-                                        .on('change', function () {
-                                            var val = $.fn.dataTable.util.escapeRegex(
-                                                $(this).val()
-                                            );
-
-                                            column
-                                                .search(val ? '^' + val + '$' : '', true, false)
-                                                .draw();
-                                        });
-
-                                    column.data().unique().sort().each(function (d, j) {
-                                        select.append('<option value="' + d + '">' + d + '</option>')
-                                    });
-                                }
-                            });
-                        }
-                    });
-
-                }).fail(function () {
-                    $('#jackett-search-perform').html('Search trackers');
-                    doNotify("Request to Jackett server failed", "danger", "glyphicon glyphicon-alert");
-                });
-            });
-
-        }).fail(function () {
-            doNotify("Error loading indexers, request to Jackett server failed", "danger", "glyphicon glyphicon-alert");
-        });
+        showSearch(null);
     });
 
     $("#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 +798,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 +809,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 +829,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 +845,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 +862,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>
@@ -32,11 +32,17 @@
         </div>
         <hr />
         <div class="pull-right">
+            <button id="jackett-add-indexer" class="btn btn-success btn-sm">
+                <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add indexer
+            </button>
             <button id="jackett-show-search" class="btn btn-success btn-sm">
-                <i class="fa fa-search"></i> Manual Search <span class="glyphicon glyphicon-ok-wrench" aria-hidden="true"></span>
+                <span class="glyphicon glyphicon-search" aria-hidden="true"></span> Manual Search 
             </button>
             <button id="jackett-show-releases" class="btn btn-primary btn-sm">
-                <i class="fa fa-database"></i>  View cached releases <span class="glyphicon glyphicon-ok-wrench" aria-hidden="true"></span>
+                <i class="fa fa-database"></i>  View cached releases
+            </button>
+            <button id="jackett-test-all" class="btn btn-warning btn-sm">
+                <span class="glyphicon glyphicon-screenshot" aria-hidden="true"></span> Test All 
             </button>
         </div>
         <h3>Configured Indexers</h3>
@@ -48,7 +54,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 +90,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>
@@ -167,49 +176,82 @@
         </div>
     </script>
 
-    <script id="configured-indexer" type="text/x-handlebars-template">
-        <div class="configured-indexer indexer card">
-            <div class="indexer-logo">
-                <!-- Make section browser searchable -->
-                <span class="hidden-name">{{name}}</span>
-                <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}}">
-                    <span class="glyphicon glyphicon-wrench" aria-hidden="true"></span>
-                </button>
-                <button class="btn btn-danger btn-sm indexer-button-delete" data-id="{{id}}">
-                    <span class="glyphicon glyphicon-trash" aria-hidden="true"></span>
-                </button>
-                <a class="btn btn-info btn-sm" target="_blank" href="{{site_link}}">
-                    <span class="glyphicon glyphicon-new-window" aria-hidden="true"></span>
-                </a>
-                <button class="btn btn-warning btn-sm indexer-button-test" data-id="{{id}}">
-                    Test <span class="glyphicon glyphicon-screenshot" aria-hidden="true"></span>
-                </button>
-            </div>
-            <div class="indexer-host">
-                <b>Torznab Host:</b>
-                <input class="form-control" type="text" value="{{torznab_host}}" placeholder="Torznab Host" readonly="">
-                <b>CouchPotato Host:</b>
-                {{#if potatoenabled}}
 
-                <input class="form-control" type="text" value="{{potato_host}}" placeholder="Torznab Host" readonly="">
-                {{else}}
-                <input class="form-control" type="text" value="Not available" placeholder="Torznab Host" readonly="">
-                {{/if}}
-            </div>
-        </div>
+    <script id="configured-indexer-table" type="text/x-handlebars-template">
+        <table class="indexer-table configured-indexer-table dataTable compact cell-border hover stripe table table-responsive">
+            <thead>
+                <tr>
+                    <th>Indexer</th>
+                    <th>Actions</th>
+                </tr>
+            </thead>
+            <tbody>
+                {{#each indexers}}
+                <tr class="configured-indexer-row">
+                    <td><a target="_blank" href="{{site_link}}" title="{{description}}">{{name}}</a></td>
+                    <td class="fit">
+                        <div class="indexer-buttons">
+                            <button title="{{torznab_host}}" type="button" class="indexer-button-copy btn btn-xs btn-info">Copy Torznab Feed</button>
+                            <button title="{{potato_host}}" type="button" class="indexer-button-copy btn btn-xs btn-info{{#unless potatoenabled}} disabled{{/unless}}">Copy Potato Feed</button>
+
+                            <button title="Search" class="btn btn-success btn-xs indexer-button-search" data-id="{{id}}">
+                                <span class="glyphicon glyphicon-search" aria-hidden="true"></span>
+                            </button>
+                            <button title="Configure" class="btn btn-primary btn-xs indexer-setup" data-id="{{id}}" data-link="{{site_link}}">
+                                <span class="glyphicon glyphicon-wrench" aria-hidden="true"></span>
+                            </button>
+                            <button title="Delete" class="btn btn-danger btn-xs indexer-button-delete" data-id="{{id}}">
+                                <span class="glyphicon glyphicon-trash" aria-hidden="true"></span>
+                            </button>
+                            <button title="{{last_error}}" class="btn btn-warning btn-xs indexer-button-test" data-toggle="tooltip" data-id="{{id}}" data-state="{{state}}">
+                                Test
+                                <span class="glyphicon" aria-hidden="true"></span>
+                            </button>
+                        </div>
+                    </td>
+                </tr>
+                {{/each}}
+            </tbody>
+            <tfoot>
+                <tr>
+                    <td colspan="2">Total configured indexers: {{total_configured_indexers}}</td>
+                </tr>
+            </tfoot>
+        </table>      
     </script>
-    <script id="unconfigured-indexer" type="text/x-handlebars-template">
-        <div class="unconfigured-indexer card">
-            <div class="indexer-logo indexer-setup" data-id="{{id}}" data-link="{{site_link}}">
-                <!-- Make section browser searchable -->
-                <span class="hidden-name">{{name}}</span>
-                <img alt="{{name}}" title="{{name}}" src="../../logos/{{id}}.png" />
-              
-            </div>
-        </div>
+
+    <script id="unconfigured-indexer-table" type="text/x-handlebars-template">
+        <table class="indexer-table configured-indexer-table dataTable compact cell-border hover stripe table table-responsive">
+            <thead>
+                <tr>
+                    <th>Indexer</th>
+                    <th>Categories</th>
+                    <th>Language</th>
+                    <th></th>
+                </tr>
+            </thead>
+            <tbody>
+                {{#each indexers}}
+                <tr class="unconfigured-indexer-row">
+                    <td><a target="_blank" href="{{site_link}}" title="{{description}}">{{name}}</a></td>
+                    <td>{{mains_cats}}</td>
+                    <td>{{language}}</td>
+                    <td class="fit">
+                        <div class="indexer-buttons">
+                            <button title="Configure" class="btn btn-success btn-xs indexer-setup" data-id="{{id}}" data-link="{{site_link}}">
+                                <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
+                            </button>
+                        </div>
+                    </td>
+                </tr>
+                {{/each}}
+            </tbody>
+            <tfoot>
+                <tr>
+                    <td colspan="4">Total unconfigured indexers: {{total_unconfigured_indexers}}</td>
+                </tr>
+            </tfoot>
+        </table>
     </script>
 
     <script id="jackett-releases" type="text/x-handlebars-template">
@@ -233,26 +275,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 +324,12 @@
                                     <td></td>
                                     <td></td>
                                     <td></td>
+                                    <td></td>
+                                    <td></td>
+                                    <td></td>
+                                    <td></td>
+                                    <td></td>
+                                    <td></td>
                                 </tr>
                             </tfoot>
                         </table>
@@ -302,6 +358,7 @@
                         <select name="category" id="searchCategory"></select>
                         <label>Tracker</label>
                         <select name="tracker" id="searchTracker">
+                            <option value="">-- All --</option>
                             {{#each indexers}}
                             <option value="{{id}}">{{name}}</option>
                             {{/each}}
@@ -331,24 +388,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 +433,12 @@
                     <td></td>
                     <td></td>
                     <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
                 </tr>
             </tfoot>
         </table>
@@ -466,18 +537,11 @@
             </div>
         </div>
     </script>
-    <script id="add-indexer" type="text/x-handlebars-template">
-        <button class="indexer card add-indexer" data-toggle="modal">
-            <div class="indexer-add-content">
-                <span class="glyphicon glyphicon glyphicon-plus" aria-hidden="true"></span>
-                <div class="light-text">Add</div>
-            </div>
-        </button>
-    </script>
+
     <script id="spinner" type="text/x-handlebars-template">
         <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]
@@ -232,6 +232,8 @@ namespace Jackett.Controllers
                     item["description"] = indexer.DisplayDescription;
                     item["configured"] = indexer.IsConfigured;
                     item["site_link"] = indexer.SiteLink;
+                    item["language"] = indexer.Language;
+                    item["last_error"] = indexer.LastError;
                     item["potatoenabled"] = indexer.TorznabCaps.Categories.Select(c => c.ID).Any(i => PotatoController.MOVIE_CATS.Contains(i));
 
                     var caps = new JObject();
@@ -256,19 +258,24 @@ namespace Jackett.Controllers
         public async Task<IHttpActionResult> Test()
         {
             JToken jsonReply = new JObject();
+            IIndexer indexer = null;
             try
             {
                 var postData = await ReadPostDataJson();
                 string indexerString = (string)postData["indexer"];
+                indexer = indexerService.GetIndexer(indexerString);
                 await indexerService.TestIndexer(indexerString);
-                jsonReply["name"] = indexerService.GetIndexer(indexerString).DisplayName;
+                jsonReply["name"] = indexer.DisplayName;
                 jsonReply["result"] = "success";
+                indexer.LastError = null;
             }
             catch (Exception ex)
             {
                 logger.Error(ex, "Exception in test_indexer");
                 jsonReply["result"] = "error";
                 jsonReply["error"] = ex.Message;
+                if (indexer != null)
+                    indexer.LastError = ex.Message;
             }
             return Json(jsonReply);
         }
@@ -318,6 +325,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 +357,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 +457,7 @@ namespace Jackett.Controllers
 
         private void ConfigureCacheResults(List<TrackerCacheResult> results)
         {
-            var serverUrl = string.Format("{0}://{1}:{2}/", Request.RequestUri.Scheme, Request.RequestUri.Host, Request.RequestUri.Port);
+            var serverUrl = string.Format("{0}://{1}:{2}{3}", Request.RequestUri.Scheme, Request.RequestUri.Host, Request.RequestUri.Port, serverService.BasePath());
             foreach (var result in results)
             {
                 var link = result.Link;

src/Jackett/Controllers/PotatoController.cs

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

src/Jackett/Controllers/TorznabController.cs

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

src/Jackett/CurlHelper.cs

@@ -24,14 +24,16 @@ namespace Jackett
             public string Referer { get; private set; }
             public HttpMethod Method { get; private set; }
             public IEnumerable<KeyValuePair<string, string>> PostData { get; set; }
+            public Dictionary<string, string> Headers { get; set; }
             public string RawPOSTDdata { get; set;}
 
-            public CurlRequest(HttpMethod method, string url, string cookies = null, string referer = null, string rawPOSTData = null)
+            public CurlRequest(HttpMethod method, string url, string cookies = null, string referer = null, Dictionary<string, string> headers = null, string rawPOSTData = null)
             {
                 Method = method;
-                Url = url;
+                Url = url.Replace(" ", "+"); // avoids bad request to cloudflare for urls containing a space followed by H (" H")
                 Cookies = cookies;
                 Referer = referer;
+                Headers = headers;
                 RawPOSTDdata = rawPOSTData;
             }
         }
@@ -52,16 +54,16 @@ namespace Jackett
             }
         }
 
-        public static async Task<CurlResponse> GetAsync(string url, string cookies = null, string referer = null)
+        public static async Task<CurlResponse> GetAsync(string url, string cookies = null, string referer = null, Dictionary<string, string> headers = null)
         {
-            var curlRequest = new CurlRequest(HttpMethod.Get, url, cookies, referer);
+            var curlRequest = new CurlRequest(HttpMethod.Get, url, cookies, referer, headers);
             var result = await PerformCurlAsync(curlRequest);
             return result;
         }
 
-        public static async Task<CurlResponse> PostAsync(string url, IEnumerable<KeyValuePair<string, string>> formData, string cookies = null, string referer = null, string rawPostData =null)
+        public static async Task<CurlResponse> PostAsync(string url, IEnumerable<KeyValuePair<string, string>> formData, string cookies = null, string referer = null, Dictionary<string, string> headers = null, string rawPostData =null)
         {
-            var curlRequest = new CurlRequest(HttpMethod.Post, url, cookies, referer);
+            var curlRequest = new CurlRequest(HttpMethod.Post, url, cookies, referer, headers);
             curlRequest.PostData = formData;
             curlRequest.RawPOSTDdata = rawPostData;
             var result = await PerformCurlAsync(curlRequest);
@@ -90,7 +92,16 @@ namespace Jackett
                     easy.BufferSize = 64 * 1024;
                     easy.UserAgent = BrowserUtil.ChromeUserAgent;
                     easy.FollowLocation = false;
-                    easy.ConnectTimeout = 20;
+                    easy.ConnectTimeout = 20;
+                    if(curlRequest.Headers != null)
+                    {
+                        CurlSlist curlHeaders = new CurlSlist();
+                        foreach (var header in curlRequest.Headers)
+                        {
+                            curlHeaders.Append(header.Key + ": " + header.Value);
+                        }
+                        easy.SetOpt(CurlOption.HttpHeader, curlHeaders);
+                    }
 
                     easy.WriteFunction = (byte[] buf, int size, int nmemb, object data) =>
                     {
@@ -151,7 +162,7 @@ namespace Jackett
 
                     if (easy.LastErrorCode != CurlCode.Ok)
                     {
-                        var message = "Error " + easy.LastErrorCode.ToString() + " " + easy.LastErrorDescription;
+                        var message = "Error " + easy.LastErrorCode.ToString() + " " + easy.LastErrorDescription + " " + easy.ErrorBuffer;
                         if (null != OnErrorMessage)
                             OnErrorMessage(message);
                         else
@@ -173,7 +184,7 @@ namespace Jackett
                 var headerParts = headerString.Split(new char[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries);
                 var headers = new List<string[]>();
                 var headerCount = 0;
-                HttpStatusCode status = HttpStatusCode.InternalServerError;
+                HttpStatusCode status = HttpStatusCode.NotImplemented;
                 var cookieBuilder = new StringBuilder();
                 var cookies = new List<Tuple<string, string>>();
                 foreach (var headerPart in headerParts)
@@ -216,6 +227,31 @@ namespace Jackett
                     cookieBuilder.AppendFormat("{0} ", cookieGroup.Last().Item2);
                 }
 
+                // add some debug output to track down the problem causing people getting InternalServerError results
+                if (status == HttpStatusCode.NotImplemented || status == HttpStatusCode.InternalServerError)
+                {
+                    try
+                    {
+                        OnErrorMessage("got NotImplemented/InternalServerError");
+                        OnErrorMessage("request.Method: " + curlRequest.Method);
+                        OnErrorMessage("request.Url: " + curlRequest.Url);
+                        OnErrorMessage("request.Cookies: " + curlRequest.Cookies);
+                        OnErrorMessage("request.Referer: " + curlRequest.Referer);
+                        OnErrorMessage("request.RawPOSTDdata: " + curlRequest.RawPOSTDdata);
+                        OnErrorMessage("cookies: "+ cookieBuilder.ToString().Trim());
+                        OnErrorMessage("headerString:\n" + headerString);
+                    
+                        foreach (var headerPart in headerParts)
+                        {
+                            OnErrorMessage("headerParts: "+headerPart);
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        OnErrorMessage(string.Format("CurlHelper: error while handling NotImplemented/InternalServerError:\n{0}", ex));
+                    }
+                }
+                
                 var contentBytes = Combine(contentBuffers.ToArray());
                 var curlResponse = new CurlResponse(headers, contentBytes, status, cookieBuilder.ToString().Trim());
                 return curlResponse;

src/Jackett/Definitions/alphareign.yml

@@ -0,0 +1,82 @@
+---
+  site: alphareign
+  name: AlphaReign
+  description: "A DHT only tracker"
+  language: en-us
+  encoding: UTF-8
+  links:
+    - https://alphareign.se
+
+  caps:
+    categories:
+      Movies: Movies
+      Movies/HD: Movies/HD
+      Movies/SD: Movies/SD
+      TV: TV
+      TV/HD: TV/HD
+      TV/SD: TV/SD
+      Other: Other
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: /login
+    method: form
+    form: form[action^="/login"]
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - path: /login
+        selector: div.auth-form > div > div.alert-danger
+
+    test:
+      path: settings
+      selector: a[href="/logout"]
+
+  ratio:
+    text: "∞"
+
+  search:
+    path: /
+    method: get
+    inputs:
+      query: "{{ .Keywords }}"
+    rows:
+      selector: .result
+    fields:
+      title:
+        attribute: data-name
+      details:
+        selector: a[href^="/torrent"]
+        attribute: href
+      download:
+        selector: a[href^="magnet:"]
+        attribute: href
+      date:
+        attribute: data-added
+      size:
+        attribute: data-size
+      seeders:
+        attribute: data-seeders
+      leechers:
+        attribute: data-leechers
+      downloadvolumefactor:
+        case:
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"
+      category:
+        case:
+          "span[class=\"label label-primary\"]:contains(\"video\") + span[class=\"label label-success\"]:contains(\"movie\") + span[class=\"label label-info\"]:contains(\"HD\")": "Movies/HD"
+          "span[class=\"label label-primary\"]:contains(\"video\") + span[class=\"label label-success\"]:contains(\"movie\") + span[class=\"label label-info\"]:contains(\"720p\")": "Movies/HD"
+          "span[class=\"label label-primary\"]:contains(\"video\") + span[class=\"label label-success\"]:contains(\"movie\") + span[class=\"label label-info\"]:contains(\"1080p\")": "Movies/HD"
+          "span[class=\"label label-primary\"]:contains(\"video\") + span[class=\"label label-success\"]:contains(\"movie\") + span[class=\"label label-info\"]:contains(\"SD\")": "Movies/SD"
+          "span[class=\"label label-primary\"]:contains(\"video\") + span[class=\"label label-success\"]:contains(\"movie\")": "Movies"
+          "span[class=\"label label-primary\"]:contains(\"video\") + span[class=\"label label-success\"]:contains(\"show\") + span[class=\"label label-info\"]:contains(\"HD\")": "TV/HD"
+          "span[class=\"label label-primary\"]:contains(\"video\") + span[class=\"label label-success\"]:contains(\"show\") + span[class=\"label label-info\"]:contains(\"SD\")": "TV/SD"
+          "span[class=\"label label-primary\"]:contains(\"video\") + span[class=\"label label-success\"]:contains(\"show\")": "TV"
+          "*": "Other"

src/Jackett/Definitions/apollo.yml

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

src/Jackett/Definitions/blubits.yml

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

src/Jackett/Definitions/eotforum.yml

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

src/Jackett/Definitions/ethor.yml

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

src/Jackett/Definitions/freakstrackingsystem.yml

@@ -0,0 +1,101 @@
+---
+  site: freakstrackingsystem
+  name: Freaks Tracking System
+  description: "A German gerneral tracker"
+  language: de-de
+  encoding: UTF-8
+  links:
+    - https://fts.to
+
+  caps:
+    categories:
+      1: Movies
+      2: TV
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: /index.php?form=UserLogin
+    method: form
+    inputs:
+      loginUsername: "{{ .Config.username }}"
+      loginPassword: "{{ .Config.password }}"
+    error:
+      - selector: p.innerError
+    test:
+      path: index.php?page=FTSAttachmentList
+      selector: "span:contains(\"Freaks-Punkte:\") > span"
+
+  ratio:
+    path: index.php?page=FTSAttachmentList
+    selector: "span:contains(\"Freaks-Punkte:\") > span"
+
+  search:
+    path: index.php
+    inputs:
+      page: "FTSAttachmentList"
+      sortField: "uploadTime"
+      sortOrder: "DESC"
+      filename: "{{ .Query.Keywords }}"
+    rows:
+      selector: table.tableList > tbody > tr[class^="container-"]:has(td:nth-child(5) > a, td:nth-child(6) > a) # has makes sure that we can build a download link
+    fields:
+      download:
+        selector: td:nth-child(5) > a, td:nth-child(6) > a
+        attribute: href
+        filters:
+          - name: replace
+            args: ["page=FTSPeerList&torrentID=", "page=Attachment&attachmentID="]
+      title:
+        selector: td:nth-child(4) > a
+      category:
+        text: 2
+      details:
+        selector: td:nth-child(4) > a
+        attribute: href
+      size:
+        selector: td:nth-child(8)
+        filters:
+          - name: replace
+            args: [".", ""]
+          - name: replace
+            args: [",", "."]
+      grabs:
+        selector: td:nth-child(7)
+      seeders:
+        selector: td:nth-child(5)
+      leechers:
+        selector: td:nth-child(6)
+      date:
+        selector: td:nth-child(3)
+        filters:
+          - name: replace
+            args: ["Heute", "Today"]
+          - name: replace
+            args: ["Gestern", "Yesterday"]
+          - name: replace
+            args: ["Januar", "January"]
+          - name: replace
+            args: ["Februar", "February"]
+          - name: replace
+            args: ["März", "March"]
+          - name: replace
+            args: ["Mai", "May"]
+          - name: replace
+            args: ["Juni", "June"]
+          - name: replace
+            args: ["Juli", "July"]
+          - name: replace
+            args: ["Oktober", "October"]
+          - name: replace
+            args: ["Dezember", "December"]
+          - name: dateparse
+            args: "2. January 2006, 15:04"
+      downloadvolumefactor:
+        case:
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett/Definitions/funfile.yml

@@ -0,0 +1,80 @@
+---
+  site: funfile
+  name: FunFile
+  description: "A general tracker"
+  language: en-us
+  encoding: windows-1252
+  links:
+    - https://www.funfile.org/
+
+  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
+
+    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: mf_content
+    test:
+      path: /my.php
+
+  ratio:
+    path: /browse.php
+    selector: div:has(div#clock) > b + b+ b > span
+
+  search:
+    path: /browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      incldead: 1
+      showspam: 1
+
+    rows:
+      selector: table[cellpadding="2"] > tbody > tr:has(td.row3)
+    fields:
+      title:
+        selector: a[title][href^="details.php"]
+        attribute: title
+      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"]
+        attribute: href
+      size:
+        selector: td:nth-child(8)
+      seeders:
+        selector: td:nth-child(10)
+      leechers:
+        selector: td:nth-child(11)
+      date:
+        selector: td:nth-child(6)
+        filters:
+          - name: append
+            args: " ago"

src/Jackett/Definitions/hdme.yml

@@ -0,0 +1,102 @@
+---
+  site: hdme
+  name: HDME
+  language: en-us
+  encoding: windows-1252
+  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/myspleen.yml

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

src/Jackett/Definitions/nethd.yml

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

src/Jackett/Definitions/newretro.yml

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

src/Jackett/Definitions/sdbits.yml

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

src/Jackett/Definitions/secretcinema.yml

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

src/Jackett/Definitions/shareisland.yml

@@ -0,0 +1,151 @@
+---
+  site: shareisland
+  name: Shareisland
+  description: "A general italian tracker"
+  language: it-it
+  encoding: UTF-8
+  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/tenyardtracker.yml

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

src/Jackett/Definitions/thehorrorcharnel.yml

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

src/Jackett/Definitions/theshinning.yml

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

src/Jackett/Definitions/torrentbd.yml

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

src/Jackett/Definitions/torrentsectorcrew.yml

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

src/Jackett/Definitions/totheglory.yml

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

src/Jackett/Definitions/tspate.yml

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

src/Jackett/Definitions/uhdbits.yml

@@ -0,0 +1,130 @@
+---
+  site: uhdbits
+  name: UHDBits
+  description: "A vietnamese general tracker"
+  language: en-us
+  encoding: UTF-8
+  links:
+    - https://uhdbits.org/
+
+  caps:
+    categories:
+      1: Movies
+      2: Audio
+      3: TV
+      4: Audio
+      5: PC
+      6: Other
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  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:
+      download:
+        selector: a[title="Download"]
+        attribute: href
+        filters:
+          - name: replace
+            args: ["\t", " "]
+      title:
+        selector: div.group_info
+        remove: span, div.tags
+        filters:
+          - name: replace
+            args: [" / Free", ""]
+          - name: replace
+            args: [" / ViE", ""]
+          - name: replace
+            args: [" / User", ""]
+          - name: replace
+            args: [" / Exclusive!", ""]
+          - name: replace
+            args: [" / ↓25%", ""]
+          - name: replace
+            args: [" / ↓50%", ""]
+          - name: replace
+            args: [" / ↓75%", ""]
+          - name: replace
+            args: [" / 2x 50%", ""]
+          - name: replace
+            args: [" / 2x Free", ""]
+          - name: replace
+            args: [" / 2x", ""]
+      downloadvolumefactor:
+        case:
+          "strong.blink_me:contains(\"Free\")": "0"
+          "strong.blink_me:contains(\"50\")": "0.5"
+          "strong.blink_me:contains(\"25\")": "0.75"
+          "strong.blink_me:contains(\"75\")": "0.25"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "strong.blink_me:contains(\"2x\")": "2"
+          "*": "1"
+      category:
+        selector: a[href^="torrents.php?filter_cat"]
+        attribute: href
+        filters:
+          - name: regexp
+            args: "\\[(\\d+?)\\]"
+      comments:
+        selector: a.torrent_name
+        attribute: href
+        filters:
+          - name: replace
+            args: ["\t", " "]
+      details:
+        selector: a.torrent_name
+        attribute: href
+        filters:
+          - name: replace
+            args: ["\t", " "]
+          - name: regexp
+            args: (.*)#torrent\d+$
+      size:
+        selector: td: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,142 @@
+---
+  site: worldofp2p
+  name: WorldOfP2P
+  description: "A general tracker"
+  language: en-us
+  encoding: UTF-8
+  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

@@ -40,6 +40,9 @@ namespace Jackett.Indexers
                 p: protectionService,
                 configData: new ConfigurationDataBasicLogin())
         {
+            Encoding = Encoding.GetEncoding("UTF-8");
+            Language = "en-us";
+
             AddCategoryMapping(1, TorznabCatType.Movies);
             AddCategoryMapping(1, TorznabCatType.MoviesForeign);
             AddCategoryMapping(1, TorznabCatType.MoviesHD);
@@ -52,13 +55,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 +94,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 +103,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,
@@ -38,6 +38,9 @@ namespace Jackett.Indexers
                 downloadBase: "https://alpharatio.cc/torrents.php?action=download&id=",
                 configData: new ConfigurationDataBasicLogin())
         {
+            Encoding = Encoding.GetEncoding("UTF-8");
+            Language = "en-us";
+
             AddCategoryMapping(1, TorznabCatType.TVSD);
             AddCategoryMapping(2, TorznabCatType.TVHD);
             AddCategoryMapping(6, TorznabCatType.MoviesSD);
@@ -56,13 +59,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 +82,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 +96,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)
@@ -110,6 +137,11 @@ namespace Jackett.Indexers
 
             searchUrl += queryCollection.GetQueryString();
             var response = await RequestStringWithCookiesAndRetry(searchUrl);
+            if (response.IsRedirect)
+            {
+                await ApplyConfiguration(null);
+                response = await RequestStringWithCookiesAndRetry(searchUrl);
+            }
 
             try
             {
@@ -159,7 +191,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,208 @@
+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())
+        {
+            Encoding = Encoding.GetEncoding("iso-8859-1");
+            Language = "de-de";
+
+            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 RequestStringWithCookies(searchUrl);
+            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();
+                    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;
+        }
+    }
+}
+