DataScene: fix free detection

I'm 99% sure that since they've resurrected they're fully public (no login needed, no ratio, etc.) and since even Jackett isn't asking for login info, it should be reflected here.

README.md

@@ -1,10 +1,12 @@
-# Jackett
+# Jackett
 
 [![GitHub issues](https://img.shields.io/github/issues/Jackett/Jackett.svg?maxAge=60&style=flat-square)](https://github.com/Jackett/Jackett/issues)
 [![GitHub pull requests](https://img.shields.io/github/issues-pr/Jackett/Jackett.svg?maxAge=60&style=flat-square)](https://github.com/Jackett/Jackett/pulls)
-[![Build status](https://ci.appveyor.com/api/projects/status/gaybh5mvyx418nsp?svg=true)](https://ci.appveyor.com/project/camjac251/jackett)
+[![Bountysource](https://img.shields.io/bountysource/team/jackett/activity.svg?style=flat-square)](https://www.bountysource.com/teams/jackett)
+[![Build status](https://ci.appveyor.com/api/projects/status/gaybh5mvyx418nsp/branch/master?svg=true)](https://ci.appveyor.com/project/camjac251/jackett)
 [![Github Releases](https://img.shields.io/github/downloads/Jackett/Jackett/total.svg?maxAge=60&style=flat-square)](https://github.com/Jackett/Jackett/releases/latest)
 [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/jackett.svg?maxAge=60&style=flat-square)](https://hub.docker.com/r/linuxserver/jackett/)
+[![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60&style=flat-square)](https://discord.gg/J865QuA)
 
 This project is a new fork and is recruiting development help.  If you are able to help out please contact us.
 
@@ -16,17 +18,21 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 
 #### Supported Systems
 * Windows using .NET 4.5
-* Linux and OSX using Mono 4 (mono 3 is no longer supported).
+* Linux and macOS using Mono 4 (mono 3 is no longer supported).
 
 ### Supported Public Trackers
  * Anidex
+ * Anime Tosho
+ * cpasbien
  * EZTV
+ * Gay-Torrents.net
  * Horrible Subs
  * Il Corsaro Nero <!-- maintained by bonny1992 -->
  * Isohunt
  * KickAssTorrent
- * KickAssTorrent (kat.how clone)
+ * KickAssTorrent (thekat.se clone)
  * LimeTorrents
+ * NextTorrent
  * Nyaa.si
  * Nyaa-Pantsu
  * Nyoo
@@ -36,9 +42,12 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * The Pirate Bay
  * TNTVillage <!-- maintained by bonny1992 -->
  * Tokyo Toshokan
+ * Torlock
+ * Torrent Downloads
  * TorrentProject
  * Torrentz2
- 
+ * zetorrents
+
 ### Supported Private Trackers
  * 2 Fast 4 You
  * 3D Torrents
@@ -57,9 +66,9 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Audiobook Torrents
  * Awesome-HD
  * Avistaz
+ * B2S-Share
  * BakaBT  [![(invite needed)][inviteneeded]](#)
  * bB
- * Best Friends
  * BeyondHD
  * BIGTorrent
  * Bit-City Reloaded
@@ -71,7 +80,9 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Bitspyder
  * Blu-bits
  * BlueBird
- * BroadcastTheNet  [![(invite needed)][inviteneeded]](#)
+ * Blutopia
+ * BroadcastTheNet
+ * BrokenStones
  * BTNext
  * Carpathians
  * CHDBits
@@ -80,13 +91,13 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * CinemaZ
  * Classix
  * CZTeam
+ * CzTorrent
  * DanishBits
  * DataScene
  * Deildu
  * Demonoid
  * Diablo Torrent
  * DigitalHive
- * Dragon World (DTW)
  * Dragonworld Reloaded
  * Dream Team
  * EoT-Forum
@@ -95,11 +106,11 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * FANO.IN
  * FileList
  * Freedom-HD
- * Freshon
  * FullMixMusic
  * FunFile
  * FunkyTorrents
  * Fuzer
+ * GayTorrent.ru
  * GFXPeers
  * Ghost City
  * GigaTorrents  [![(invite needed)][inviteneeded]](#)
@@ -108,10 +119,11 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Gormogon
  * Greek Team
  * Hardbay
- * HD4Free
+ * HD-Forever
  * HD-Space
  * HD-Torrents
  * HD-Bits.com
+ * HD4Free
  * HDBits
  * HDChina
  * HDClub
@@ -133,18 +145,17 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * JPopsuki
  * Kapaki
  * Karagarga
- * Le Paradis Du Net
  * LinkoManija
  * LosslessClub
  * M-Team - TP
  * Magico
- * Majomparádé 
+ * Majomparádé
+ * Manicomio Share
  * Mononoké-BT
  * MoreThanTV
  * MyAnonamouse
  * myAmity
  * MySpleen
- * Nachtwerk
  * NCore
  * Nebulance
  * NetHD
@@ -163,7 +174,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * PrivateHD
  * Psytorrents
  * PTFiles
- * QcTorrent
  * Redacted (PassTheHeadphones)
  * RevolutionTT
  * Rockhard Lossless
@@ -179,6 +189,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Shazbat
  * Shellife
  * SpeedCD
+ * SpeedTorrent Reloaded
  * SportsCult
  * SportHD
  * Superbits
@@ -197,7 +208,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * TenYardTracker
  * Torrent Network
  * Torrent Sector Crew
- * Torrent411
  * Torrent9
  * TorrentBD
  * TorrentBytes
@@ -214,21 +224,25 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Trezzor
  * TV Chaos UK
  * TV-Vault
+ * T411 v2
  * u-Torrent
  * UHDBits
  * Ultimate Gamer Club
  * ULTRAHDCLUB
  * Waffles
- * World-In-HD  [![(invite needed)][inviteneeded]](#)
+ * World-In-HD
  * WorldOfP2P
  * x264
  * XSpeeds
  * Xthor
- * Xtreme Zone 
+ * Xtreme Zone
+ * YggTorrent
+ * Zamunda.net
+ * Zelka.org
  * Ztracker
 
 Trackers marked with  [![(invite needed)][inviteneeded]](#) have no active maintainer and are missing features or are broken. If you have an invite for them please send it to kaso1717 -at- gmail.com to get them fixed/improved.
- 
+
 ## Installation on Windows
 
 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.
@@ -244,7 +258,7 @@ To get started with using the installer for Jackett, follow the steps below:
 
 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". 
+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
  1. Install [Mono 4](http://www.mono-project.com/download/#download-lin) or better (version 4.8 is recommended)
@@ -258,20 +272,27 @@ Jackett can also be run from the command line if you would like to see log messa
 
 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 OSX
- 1. Install [Mono 4](http://www.mono-project.com/download/#download-mac) or better (version 4.8 is recommended)
-       * Setup ssl support by running
-       ```
-       https://curl.haxx.se/ca/cacert.pem
-       cert-sync --user ~/Downloads/cacert.pem
-       ```
- 1. 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 --debug JackettConsole.exe`.
+## Installation on macOS
+
+### Prerequisites
+Install [Mono 4](http://www.mono-project.com/download/#download-mac) or better (version 4.8 is recommended).
+ * Setup ssl support by running `curl -sS https://curl.haxx.se/ca/cacert.pem | cert-sync --user /dev/stdin`
+
+### Install as service
+1. Download and extract the latest `Jackett.Binaries.Mono.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases).
+2. In Terminal, run the install script from the extracted directory using `./install_service_macos.sh`
+       
+The service will start on each logon. You can always stop it by running `launchctl unload ~/Library/LaunchAgents/org.user.Jackett.plist` from Terminal. You can start it again it using `launchctl load ~/Library/LaunchAgents/org.user.Jackett.plist`.
+Logs are stored as usual under `~/.config/Jackett/log.txt`.
+
+### Run without installing as a service
+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 --debug JackettConsole.exe`.
 
 ## Installation using Docker
 Detailed instructions are available at [LinuxServer.io Jackett Docker](https://hub.docker.com/r/linuxserver/jackett/). The Jackett Docker is highly recommended, especially if you are having Mono stability issues or having issues running Mono on your system eg. QNAP, Synology. Thanks to [LinuxServer.io](https://linuxserver.io)
 
 ## Installation on Synology
-Jackett is available as beta package from [SynoCommuniy](https://synocommunity.com/)
+Jackett is available as beta package from [SynoCommunity](https://synocommunity.com/)
 
 ## Troubleshooting
 
@@ -281,13 +302,18 @@ Jackett is available as beta package from [SynoCommuniy](https://synocommunity.c
 
 * __Unable to  connect to trackers with invalid SSL certificates__
 
-  You can disable certificate validation using the `--IgnoreSslErrors true` option but it's not recommended to use it as it enables Man-in-the-middle attacks on your connections.
+  If you're using mono this is often caused by missing ca-certificates.
+  Try reimporting the certificates in this case:
+   - On Linux: `wget -O - https://curl.haxx.se/ca/cacert.pem | cert-sync /dev/stdin`
+   - On macOS: `curl -sS https://curl.haxx.se/ca/cacert.pem | cert-sync --user /dev/stdin`
+
+  As a option of last resort you can disable certificate validation using the `--IgnoreSslErrors true` option but it's not recommended to use it as it enables Man-in-the-middle attacks on your connections.
 
 *  __Enable logging__
 
-  You can get additional logging with the command line switches `-t -l` or by enabeling `Enhanced logging` via the web interface.
+  You can get additional logging with the command line switches `-t -l` or by enabling `Enhanced logging` via the web interface.
   Please post logs if you are unable to resolve your issue with these switches ensuring to remove your username/password/cookies.
-  The logfiles (log.txt/updater.txt) are stored in `%ProgramData%\Jackett` on Windows and `~/.config/Jackett/` on Linux/OSX.
+  The logfiles (log.txt/updater.txt) are stored in `%ProgramData%\Jackett` on Windows and `~/.config/Jackett/` on Linux/macOS.
 
 ## Creating an issue
 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.

src/CurlSharp/CurlSharp.csproj

@@ -94,8 +94,14 @@
     <MonoDevelop>
       <Properties>
         <Policies>
-          <TextStylePolicy inheritsSet="VisualStudio" inheritsScope="text/plain" scope="text/x-csharp" />
-          <CSharpFormattingPolicy IndentSwitchBody="True" IndentBlocksInsideExpressions="True" AnonymousMethodBraceStyle="NextLine" PropertyBraceStyle="NextLine" PropertyGetBraceStyle="NextLine" PropertySetBraceStyle="NextLine" EventBraceStyle="NextLine" EventAddBraceStyle="NextLine" EventRemoveBraceStyle="NextLine" StatementBraceStyle="NextLine" ElseNewLinePlacement="NewLine" CatchNewLinePlacement="NewLine" FinallyNewLinePlacement="NewLine" WhileNewLinePlacement="DoNotCare" ArrayInitializerWrapping="DoNotChange" ArrayInitializerBraceStyle="NextLine" BeforeMethodDeclarationParentheses="False" BeforeMethodCallParentheses="False" BeforeConstructorDeclarationParentheses="False" NewLineBeforeConstructorInitializerColon="NewLine" NewLineAfterConstructorInitializerColon="SameLine" BeforeDelegateDeclarationParentheses="False" NewParentheses="False" SpacesBeforeBrackets="False" inheritsSet="Mono" inheritsScope="text/x-csharp" scope="text/x-csharp" />
+          <TextStylePolicy TabWidth="4" IndentWidth="4" RemoveTrailingWhitespace="True" NoTabsAfterNonTabs="False" EolMarker="Native" FileWidth="80" TabsToSpaces="True" scope="text/x-csharp">
+            <inheritsSet />
+            <inheritsScope />
+          </TextStylePolicy>
+          <CSharpFormattingPolicy IndentBlock="True" IndentBraces="False" IndentSwitchSection="False" IndentSwitchCaseSection="True" LabelPositioning="OneLess" NewLinesForBracesInTypes="True" NewLinesForBracesInMethods="True" NewLinesForBracesInProperties="False" NewLinesForBracesInAccessors="False" NewLinesForBracesInAnonymousMethods="False" NewLinesForBracesInControlBlocks="False" NewLinesForBracesInAnonymousTypes="False" NewLinesForBracesInObjectCollectionArrayInitializers="False" NewLinesForBracesInLambdaExpressionBody="False" NewLineForElse="False" NewLineForCatch="False" NewLineForFinally="False" NewLineForMembersInObjectInit="False" NewLineForMembersInAnonymousTypes="False" NewLineForClausesInQuery="False" SpacingAfterMethodDeclarationName="True" SpaceWithinMethodDeclarationParenthesis="False" SpaceBetweenEmptyMethodDeclarationParentheses="False" SpaceAfterMethodCallName="True" SpaceWithinMethodCallParentheses="False" SpaceBetweenEmptyMethodCallParentheses="False" SpaceAfterControlFlowStatementKeyword="True" SpaceWithinExpressionParentheses="False" SpaceWithinCastParentheses="False" SpaceWithinOtherParentheses="False" SpaceAfterCast="False" SpacesIgnoreAroundVariableDeclaration="False" SpaceBeforeOpenSquareBracket="True" SpaceBetweenEmptySquareBrackets="False" SpaceWithinSquareBrackets="False" SpaceAfterColonInBaseTypeDeclaration="True" SpaceAfterComma="True" SpaceAfterDot="False" SpaceAfterSemicolonsInForStatement="True" SpaceBeforeColonInBaseTypeDeclaration="True" SpaceBeforeComma="False" SpaceBeforeDot="False" SpaceBeforeSemicolonsInForStatement="False" SpacingAroundBinaryOperator="Single" WrappingPreserveSingleLine="True" WrappingKeepStatementsOnSingleLine="True" PlaceSystemDirectiveFirst="True" scope="text/x-csharp">
+            <inheritsSet />
+            <inheritsScope />
+          </CSharpFormattingPolicy>
         </Policies>
       </Properties>
     </MonoDevelop>

src/Jackett.Console/ConsoleOptions.cs

@@ -60,7 +60,7 @@ namespace Jackett.Console
         [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\\\"")]
+        [Option('d', "DataFolder", HelpText = "Specify the location of the data folder (Must be admin on Windows) eg. --DataFolder=\"D:\\Your Data\\Jackett\\\". Don't use this on Unix (mono) systems. On Unix just adjust the HOME directory of the user to the datedir or set the XDG_CONFIG_HOME environment variable.")]
         public string DataFolder { get; set; }
 
         [Option(HelpText = "Don't restart after update")]

src/Jackett.Console/Jackett.Console.csproj

@@ -153,6 +153,9 @@
   <ItemGroup>
     <None Include="App.config" />
     <None Include="packages.config" />
+    <Content Include="install_service_macos.sh">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\CurlSharp\CurlSharp.csproj">
@@ -182,4 +185,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

src/Jackett.Console/install_service_macos.sh

@@ -0,0 +1,67 @@
+#!/bin/bash
+
+# Stop and unload the service if it's running
+launchctl remove org.user.Jackett
+
+# Check if we're running from Jackett's directory
+if [ ! -f ./JackettConsole.exe ]; then
+    echo "Couldn't locate JackettConsole.exe. Are you running from the right directory?"
+    exit 1
+fi
+jackettdir="$(pwd)"
+
+# Check if mono is installed
+command -v mono >/dev/null 2>&1 || { echo >&2 "Jackett requires Mono but it's not installed. Aborting."; exit 1; }
+monodir="$(dirname $(command -v mono))"
+
+# Check that no other service called Jackett is already running
+if [[ $(launchctl list | grep org.user.Jackett) ]]; then
+    echo "Jackett already seems to be running as a service. Please stop it before running this script again."
+    exit 1
+fi
+
+# Write the plist to LaunchAgents
+cat >~/Library/LaunchAgents/org.user.Jackett.plist <<EOL
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>EnvironmentVariables</key>
+    <dict>
+        <key>PATH</key>
+        <string>/usr/bin:/bin:/usr/sbin:/sbin:${monodir}</string>
+    </dict>
+    <key>KeepAlive</key>
+    <true/>
+    <key>Label</key>
+    <string>org.user.Jackett</string>
+    <key>ProgramArguments</key>
+    <array>
+        <string>${monodir}/mono</string>
+        <string>--debug</string>
+        <string>JackettConsole.exe</string>
+        <string>--NoRestart</string>
+    </array>
+    <key>RunAtLoad</key>
+    <true/>
+    <key>WorkingDirectory</key>
+    <string>${jackettdir}</string>
+</dict>
+</plist>
+
+EOL
+
+# Run the agent
+launchctl load ~/Library/LaunchAgents/org.user.Jackett.plist
+
+# Check that it's running
+if [[ $(launchctl list | grep org.user.Jackett) ]]; then
+    echo "Agent successfully installed and launched!"
+else
+    cat << EOL
+Could not launch agent. The installation might have failed.
+Please open an issue on https://github.com/Jackett/Jackett/issues and paste following information:
+Mono directory: \`${monodir}\`
+Jackett directory: \`${jackettdir}\`
+EOL
+fi

src/Jackett.Test/TestIIndexerManagerServiceHelper.cs

@@ -28,7 +28,12 @@ namespace JackettTest
             throw new NotImplementedException();
         }
 
-        public void InitIndexers()
+        public IWebIndexer GetWebIndexer(string name)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void InitIndexers(IEnumerable<string> path)
         {
             throw new NotImplementedException();
         }
@@ -43,16 +48,6 @@ namespace JackettTest
             throw new NotImplementedException();
         }
 
-        public void InitCardigannIndexers(string path)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void SortIndexers()
-        {
-            throw new NotImplementedException();
-        }
-
         public void InitAggregateIndexer()
         {
             throw new NotImplementedException();

src/Jackett.Updater/Program.cs

@@ -76,7 +76,7 @@ namespace Jackett.Updater
 #endif
 */
                 }
-                catch (ArgumentException e)
+                catch (ArgumentException)
                 {
                     Engine.Logger.Info("Process " + pid.ToString() + " is already dead");
                 }
@@ -185,7 +185,12 @@ namespace Jackett.Updater
                 "Definitions/rarbg.yml",
                 "Definitions/t411.yml",
                 "Definitions/hdbc.yml", // renamed to hdbitscom
+                "Definitions/maniatorrent.yml",
                 "Definitions/nyaa.yml",
+                "Definitions/nachtwerk.yml",
+                "Definitions/leparadisdunet.yml",
+                "Definitions/qctorrent.yml",
+                "Definitions/dragonworld.yml",
             };
 
             foreach (var oldFIle in oldFiles)

src/Jackett.sln

@@ -66,9 +66,9 @@ Global
 	GlobalSection(MonoDevelopProperties) = preSolution
 		Policies = $0
 		$0.TextStylePolicy = $1
-		$1.inheritsSet = VisualStudio
-		$1.inheritsScope = text/plain
 		$1.scope = text/x-csharp
+		$1.TabsToSpaces = True
+		$1.EolMarker = Unix
 		$0.CSharpFormattingPolicy = $2
 		$2.IndentSwitchBody = True
 		$2.IndentBlocksInsideExpressions = True
@@ -94,8 +94,27 @@ Global
 		$2.BeforeDelegateDeclarationParentheses = False
 		$2.NewParentheses = False
 		$2.SpacesBeforeBrackets = False
-		$2.inheritsSet = Mono
-		$2.inheritsScope = text/x-csharp
 		$2.scope = text/x-csharp
+		$2.IndentSwitchSection = True
+		$2.NewLinesForBracesInProperties = True
+		$2.NewLinesForBracesInAccessors = True
+		$2.NewLinesForBracesInAnonymousMethods = True
+		$2.NewLinesForBracesInControlBlocks = True
+		$2.NewLinesForBracesInAnonymousTypes = True
+		$2.NewLinesForBracesInObjectCollectionArrayInitializers = True
+		$2.NewLinesForBracesInLambdaExpressionBody = True
+		$2.NewLineForElse = True
+		$2.NewLineForCatch = True
+		$2.NewLineForFinally = True
+		$2.NewLineForMembersInObjectInit = True
+		$2.NewLineForMembersInAnonymousTypes = True
+		$2.NewLineForClausesInQuery = True
+		$2.SpacingAfterMethodDeclarationName = False
+		$2.SpaceAfterMethodCallName = False
+		$2.SpaceBeforeOpenSquareBracket = False
+		$0.TextStylePolicy = $3
+		$3.FileWidth = 80
+		$3.TabsToSpaces = True
+		$3.scope = text/plain
 	EndGlobalSection
 EndGlobal

src/Jackett/Content/custom.css

@@ -62,6 +62,10 @@ body {
     height: 20px;
 }
 
+.setup-item-inputselect {
+    max-width: 255px;
+}
+
 [data-type=hiddendata]{
     display: none;
 }

src/Jackett/Content/custom_mobile.css

@@ -62,6 +62,10 @@ body {
     height: 20px;
 }
 
+.setup-item-inputselect {
+    max-width: 255px;
+}
+
 [data-type=hiddendata]{
     display: none;
 }

src/Jackett/Content/libs/api.js

@@ -0,0 +1,89 @@
+var api = {
+	version: "2.0",
+	root: "/api",
+    key: "",
+
+	getApiPath: function(category, action) {
+	    var path = this.root + "/v" + this.version + "/" + category;
+	    if (action !== undefined)
+	        path = path + "/" + action
+	    return path;
+	},
+
+	getAllIndexers: function(callback) {
+	    return $.get(this.getApiPath("indexers"), callback);
+	},
+
+	getServerConfig: function(callback) {
+	    return $.get(this.getApiPath("server", "config"), callback);
+	},
+
+	getIndexerConfig: function(indexerId, callback) {
+	    return $.get(this.getApiPath("indexers", indexerId + "/config"), callback);
+	},
+
+	updateIndexerConfig: function(indexerId, config, callback) {
+	    return $.ajax({
+	        url: this.getApiPath("indexers", indexerId + "/config"),
+	        type: 'POST',
+	        data: JSON.stringify(config),
+	        dataType: 'json',
+	        contentType: 'application/json',
+	        cache: false,
+	        success: callback
+	    });
+	},
+
+	deleteIndexer: function(indexerId, callback) {
+	    return $.ajax({
+	        url: this.getApiPath("indexers", indexerId),
+	        type: 'DELETE',
+	        cache: false,
+	        success: callback
+	    });
+	},
+
+	testIndexer: function(indexerId, callback) {
+	    return $.post(this.getApiPath("indexers", indexerId + "/test"), callback);
+	},
+
+	resultsForIndexer: function(indexerId, query, callback) {
+	    return $.get(this.getApiPath("indexers", indexerId + "/results?apikey=" + this.key), query, callback);
+	},
+
+	getServerCache: function(callback) {
+	    return $.get(this.getApiPath("indexers", "cache"), callback);
+	},
+
+	getServerLogs: function(callback) {
+	    return $.get(this.getApiPath("server", "logs"), callback);
+	},
+
+	updateServerConfig: function(serverConfig, callback) {
+	    return $.ajax({
+	        url: this.getApiPath("server", "config"),
+	        type: 'POST',
+	        data: JSON.stringify(serverConfig),
+	        dataType: 'json',
+	        contentType: 'application/json',
+	        cache: false,
+	        success: callback
+	    });
+	},
+
+	updateServer: function(callback) {
+	    return $.post(this.getApiPath("server", "update"), callback);
+	},
+
+	updateAdminPassword: function(password, callback) {
+	    return $.ajax({
+	        url: this.getApiPath("server", "adminpassword"),
+	        type: 'POST',
+	        data: JSON.stringify(password),
+	        dataType: 'json',
+	        contentType: 'application/json',
+	        cache: false,
+	        success: callback
+	    });
+	}
+}

src/Jackett/Content/libs/handlebarsextend.js

@@ -0,0 +1,6 @@
+Handlebars.registerHelper('ifCond', function (v1, v2, options) {
+    if(v1 === v2) {
+        return options.fn(this);
+    }
+    return options.inverse(this);
+});

src/Jackett/Content/setup_indexer.html

@@ -1,117 +0,0 @@
-<!DOCTYPE html>
-
-<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <meta charset="utf-8" />
-    <script src="jquery-2.1.3.min.js"></script>
-    <script src="common.js"></script>
-    <style>
-        #formItemTemplateContainer {
-            display: none;
-        }
-    </style>
-    <title></title>
-</head>
-<body>
-    <script>
-
-        $(function () {
-
-            var urlParams = getUrlParams();
-
-            var jqxhr = $.post("get_config_form", JSON.stringify({ indexer: urlParams.indexer }), function (data) {
-                populateForm(data.config);
-            })
-            .fail(function () {
-                alert("error");
-            });
-
-            $("#loginButton").click(function () {
-                var data = { indexer: urlParams.indexer, config: {} };
-                $("#formItems").children().each(function (i, item) {
-                    var $item = $(item);
-                    var type = $item.data("type");
-                    var id = $item.data("id");
-                    var $valEl = $item.find(".formItemValue").children().first();
-                    switch (type) {
-                        case "inputstring":
-                            data.config[id] = $valEl.val();
-                            break;
-                        case "inputbool":
-                            data.config[id] = $valEl.val();
-                            break;
-                    }
-                });
-
-                var jqxhr = $.post("configure_indexer", JSON.stringify(data), function (data) {
-                    if (data.result == "error") {
-                        if (data.config) {
-                            populateForm(data.config);
-                        }
-                        alert(data.error);
-
-                    }
-                })
-                .fail(function () {
-                    alert("error");
-                });
-
-            });
-
-        });
-
-        function populateForm(data) {
-            $("#formItems").empty();
-            for (var i = 0; i < data.length; i++) {
-                $("#formItems").append(createFormItem(data[i]));
-            }
-        }
-
-        function createFormItem(itemData) {
-            var $template = $("#formItemTemplate").clone();
-            $template.attr("id", "item" + itemData.id);
-            $template.data("id", itemData.id);
-            $template.data("type", itemData.type);
-            $template.attr("data-type", itemData.type);
-            $template.data("value", itemData.value);
-            $template.find(".formItemName").text(itemData.name);
-
-            $valueElement = $template.find(".formItemValue");
-
-            switch (itemData.type) {
-                case "inputstring":
-                    $valueElement.append($("<input type='text'></input>").val(itemData.value));
-                    break;
-                case "inputbool":
-                    $valueElement.append($("<input type='checkbox'></input>").prop("checked", itemData.value));
-                    break;
-                case "displayimage":
-                    $valueElement.append($("<img src='" + itemData.value + "'>"));
-                    break;
-                case "displayinfo":
-                    $valueElement.append($("<span></span>").text(itemData.value));
-                    break;
-            }
-
-            return $template;
-        }
-
-
-
-    </script>
-
-    <div id="formItems">
-
-    </div>
-
-    <button id="loginButton">Login</button>
-
-    <div id="formItemTemplateContainer">
-        <div id="formItemTemplate">
-            <div class="formItemName"></div>
-            <div class="formItemValue"></div>
-        </div>
-    </div>
-
-</body>
-</html>

src/Jackett/Controllers/AdminController.cs

@@ -1,595 +0,0 @@
-using Autofac;
-using AutoMapper;
-using Jackett.Indexers;
-using Jackett.Models;
-using Jackett.Services;
-using Jackett.Utils;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using NLog;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Security.Claims;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Web;
-using System.Web.Http;
-using System.Web.Http.Results;
-using System.Web.Security;
-using System.Windows.Forms;
-
-namespace Jackett.Controllers
-{
-    [RoutePrefix("admin")]
-    [JackettAuthorized]
-    [JackettAPINoCache]
-    public class AdminController : ApiController
-    {
-        private IConfigurationService config;
-        private IIndexerManagerService indexerService;
-        private IServerService serverService;
-        private ISecuityService securityService;
-        private IProcessService processService;
-        private ICacheService cacheService;
-        private Logger logger;
-        private ILogCacheService logCache;
-        private IUpdateService updater;
-
-        public AdminController(IConfigurationService config, IIndexerManagerService i, IServerService ss, ISecuityService s, IProcessService p, ICacheService c, Logger l, ILogCacheService lc, IUpdateService u)
-        {
-            this.config = config;
-            indexerService = i;
-            serverService = ss;
-            securityService = s;
-            processService = p;
-            cacheService = c;
-            logger = l;
-            logCache = lc;
-            updater = u;
-        }
-
-        private async Task<JToken> ReadPostDataJson()
-        {
-            var content = await Request.Content.ReadAsStringAsync();
-            return JObject.Parse(content);
-        }
-
-
-        private HttpResponseMessage GetFile(string path)
-        {
-            var result = new HttpResponseMessage(HttpStatusCode.OK);
-            var mappedPath = Path.Combine(config.GetContentFolder(), path);
-            var stream = new FileStream(mappedPath, FileMode.Open, FileAccess.Read, FileShare.Read);
-            result.Content = new StreamContent(stream);
-            result.Content.Headers.ContentType = new MediaTypeHeaderValue(MimeMapping.GetMimeMapping(mappedPath));
-
-            return result;
-        }
-
-        [HttpGet]
-        [AllowAnonymous]
-        public RedirectResult Logout()
-        {
-            var ctx = Request.GetOwinContext();
-            var authManager = ctx.Authentication;
-            authManager.SignOut("ApplicationCookie");
-            return Redirect("Admin/Dashboard");
-        }
-
-        [HttpGet]
-        [HttpPost]
-        [AllowAnonymous]
-        public async Task<HttpResponseMessage> Dashboard()
-        {
-            if (Request.RequestUri.Query != null && Request.RequestUri.Query.Contains("logout"))
-            {
-                var file = GetFile("login.html");
-                securityService.Logout(file);
-                return file;
-            }
-
-
-            if (securityService.CheckAuthorised(Request))
-            {
-                return GetFile("index.html");
-
-            }
-            else
-            {
-                var formData = await Request.Content.ReadAsFormDataAsync();
-
-                if (formData != null && securityService.HashPassword(formData["password"]) == serverService.Config.AdminPassword)
-                {
-                    var file = GetFile("index.html");
-                    securityService.Login(file);
-                    return file;
-                }
-                else
-                {
-                    return GetFile("login.html");
-                }
-            }
-        }
-
-        [Route("set_admin_password")]
-        [HttpPost]
-        public async Task<IHttpActionResult> SetAdminPassword()
-        {
-            var jsonReply = new JObject();
-            try
-            {
-                var postData = await ReadPostDataJson();
-                var password = (string)postData["password"];
-                if (string.IsNullOrEmpty(password))
-                {
-                    serverService.Config.AdminPassword = string.Empty;
-                }
-                else
-                {
-                    serverService.Config.AdminPassword = securityService.HashPassword(password);
-                }
-
-                serverService.SaveConfig();
-                jsonReply["result"] = "success";
-            }
-            catch (Exception ex)
-            {
-                logger.Error(ex, "Exception in SetAdminPassword");
-                jsonReply["result"] = "error";
-                jsonReply["error"] = ex.Message;
-            }
-            return Json(jsonReply);
-        }
-
-        [Route("get_config_form")]
-        [HttpPost]
-        public async Task<IHttpActionResult> GetConfigForm()
-        {
-            var jsonReply = new JObject();
-            try
-            {
-                var postData = await ReadPostDataJson();
-                var indexer = indexerService.GetIndexer((string)postData["indexer"]);
-                var config = await indexer.GetConfigurationForSetup();
-                jsonReply["config"] = config.ToJson(null);
-                jsonReply["caps"] = indexer.TorznabCaps.CapsToJson();
-                jsonReply["name"] = indexer.DisplayName;
-                jsonReply["alternativesitelinks"] = JToken.FromObject(indexer.AlternativeSiteLinks);
-                jsonReply["result"] = "success";
-            }
-            catch (Exception ex)
-            {
-                logger.Error(ex, "Exception in GetConfigForm");
-                jsonReply["result"] = "error";
-                jsonReply["error"] = ex.Message;
-            }
-            return Json(jsonReply);
-        }
-
-        [Route("configure_indexer")]
-        [HttpPost]
-        public async Task<IHttpActionResult> Configure()
-        {
-            var jsonReply = new JObject();
-            IIndexer indexer = null;
-            try
-            {
-                var postData = await ReadPostDataJson();
-                string indexerString = (string)postData["indexer"];
-                indexer = indexerService.GetIndexer((string)postData["indexer"]);
-                jsonReply["name"] = indexer.DisplayName;
-                var configurationResult = await indexer.ApplyConfiguration(postData["config"]);
-                if (configurationResult == IndexerConfigurationStatus.RequiresTesting)
-                {
-                    await indexerService.TestIndexer((string)postData["indexer"]);
-                }
-                else if (configurationResult == IndexerConfigurationStatus.Failed)
-                {
-                    throw new Exception("Configuration Failed");
-                }
-                jsonReply["result"] = "success";
-            }
-            catch (Exception ex)
-            {
-                jsonReply["result"] = "error";
-                jsonReply["error"] = ex.Message;
-                var baseIndexer = indexer as BaseIndexer;
-                if (null != baseIndexer)
-                    baseIndexer.ResetBaseConfig();
-                if (ex is ExceptionWithConfigData)
-                {
-                    jsonReply["config"] = ((ExceptionWithConfigData)ex).ConfigData.ToJson(null,false);
-                }
-                else
-                {
-                    logger.Error(ex, "Exception in Configure");
-                }
-            }
-            return Json(jsonReply);
-        }
-
-        [Route("get_indexers")]
-        [HttpGet]
-        public IHttpActionResult Indexers()
-        {
-            var jsonReply = new JObject();
-            try
-            {
-                jsonReply["result"] = "success";
-                JArray items = new JArray();
-
-                foreach (var indexer in indexerService.GetAllIndexers())
-                {
-                    var item = new JObject();
-                    item["id"] = indexer.ID;
-                    item["name"] = indexer.DisplayName;
-                    item["description"] = indexer.DisplayDescription;
-                    item["type"] = indexer.Type;
-                    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();
-                    foreach (var cap in indexer.TorznabCaps.Categories)
-                        caps[cap.ID.ToString()] = cap.Name;
-                    item["caps"] = caps;
-                    items.Add(item);
-                }
-                jsonReply["items"] = items;
-            }
-            catch (Exception ex)
-            {
-                logger.Error(ex, "Exception in get_indexers");
-                jsonReply["result"] = "error";
-                jsonReply["error"] = ex.Message;
-            }
-            return Json(jsonReply);
-        }
-
-        [Route("test_indexer")]
-        [HttpPost]
-        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"] = indexer.DisplayName;
-                jsonReply["result"] = "success";
-                indexer.LastError = null;
-            }
-            catch (Exception ex)
-            {
-                var msg = ex.Message;
-                if (ex.InnerException != null)
-                    msg += ": " + ex.InnerException.Message;
-                logger.Error(ex, "Exception in test_indexer");
-                jsonReply["result"] = "error";
-                jsonReply["error"] = msg;
-                if (indexer != null)
-                    indexer.LastError = msg;
-            }
-            return Json(jsonReply);
-        }
-
-        [Route("delete_indexer")]
-        [HttpPost]
-        public async Task<IHttpActionResult> Delete()
-        {
-            var jsonReply = new JObject();
-            try
-            {
-                var postData = await ReadPostDataJson();
-                string indexerString = (string)postData["indexer"];
-                indexerService.DeleteIndexer(indexerString);
-            }
-            catch (Exception ex)
-            {
-                logger.Error(ex, "Exception in delete_indexer");
-                jsonReply["result"] = "error";
-                jsonReply["error"] = ex.Message;
-            }
-            return Json(jsonReply);
-        }
-
-        [Route("trigger_update")]
-        [HttpGet]
-        public IHttpActionResult TriggerUpdates()
-        {
-            var jsonReply = new JObject();
-            updater.CheckForUpdatesNow();
-            return Json(jsonReply);
-        }
-
-        [Route("get_jackett_config")]
-        [HttpGet]
-        public IHttpActionResult GetConfig()
-        {
-            var jsonReply = new JObject();
-            try
-            {
-                var cfg = new JObject();
-                cfg["notices"] = JToken.FromObject(serverService.notices);
-                cfg["port"] = serverService.Config.Port;
-                cfg["external"] = serverService.Config.AllowExternal;
-                cfg["api_key"] = serverService.Config.APIKey;
-                cfg["blackholedir"] = serverService.Config.BlackholeDir;
-                cfg["updatedisabled"] = serverService.Config.UpdateDisabled;
-                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;
-                jsonReply["app_version"] = config.GetVersion();
-                jsonReply["result"] = "success";
-            }
-            catch (Exception ex)
-            {
-                logger.Error(ex, "Exception in get_jackett_config");
-                jsonReply["result"] = "error";
-                jsonReply["error"] = ex.Message;
-            }
-            return Json(jsonReply);
-        }
-
-        [Route("set_config")]
-        [HttpPost]
-        public async Task<IHttpActionResult> SetConfig()
-        {
-            var originalPort = Engine.Server.Config.Port;
-            var originalAllowExternal = Engine.Server.Config.AllowExternal;
-            var jsonReply = new JObject();
-            try
-            {
-                var postData = await ReadPostDataJson();
-                int port = (int)postData["port"];
-                bool external = (bool)postData["external"];
-                string saveDir = (string)postData["blackholedir"];
-                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);
-                Startup.TracingEnabled = logging;
-
-                if (port != Engine.Server.Config.Port || external != Engine.Server.Config.AllowExternal)
-                {
-
-                    if (ServerUtil.RestrictedPorts.Contains(port))
-                    {
-                        jsonReply["result"] = "error";
-                        jsonReply["error"] = "The port you have selected is restricted, try a different one.";
-                        return Json(jsonReply);
-                    }
-
-                    // Save port to the config so it can be picked up by the if needed when running as admin below.
-                    Engine.Server.Config.AllowExternal = external;
-                    Engine.Server.Config.Port = port;
-                    Engine.Server.SaveConfig();
-
-                    // On Windows change the url reservations
-                    if (System.Environment.OSVersion.Platform != PlatformID.Unix)
-                    {
-                        if (!ServerUtil.IsUserAdministrator())
-                        {
-                            try
-                            {
-                                processService.StartProcessAndLog(Application.ExecutablePath, "--ReserveUrls", true);
-                            }
-                            catch
-                            {
-                                Engine.Server.Config.Port = originalPort;
-                                Engine.Server.Config.AllowExternal = originalAllowExternal;
-                                Engine.Server.SaveConfig();
-                                jsonReply["result"] = "error";
-                                jsonReply["error"] = "Failed to acquire admin permissions to reserve the new port.";
-                                return Json(jsonReply);
-                            }
-                        }
-                        else
-                        {
-                            serverService.ReserveUrls(true);
-                        }
-                    }
-
-                (new Thread(() =>
-                {
-                    Thread.Sleep(500);
-                    serverService.Stop();
-                    Engine.BuildContainer();
-                    Engine.Server.Initalize();
-                    Engine.Server.Start();
-                })).Start();
-                }
-                
-                if (saveDir != Engine.Server.Config.BlackholeDir)
-                {
-                    if (!string.IsNullOrEmpty(saveDir))
-                    {
-                        if (!Directory.Exists(saveDir))
-                        {
-                            throw new Exception("Blackhole directory does not exist");
-                        }
-                    }
-
-                    Engine.Server.Config.BlackholeDir = saveDir;
-                    Engine.Server.SaveConfig();
-                }
-
-                jsonReply["result"] = "success";
-                jsonReply["port"] = port;
-                jsonReply["external"] = external;
-            }
-            catch (Exception ex)
-            {
-                logger.Error(ex, "Exception in set_port");
-                jsonReply["result"] = "error";
-                jsonReply["error"] = ex.Message;
-            }
-            return Json(jsonReply);
-        }
-
-        [Route("GetCache")]
-        [HttpGet]
-        public List<TrackerCacheResult> GetCache()
-        {
-            var results = cacheService.GetCachedResults();
-            ConfigureCacheResults(results);
-            return results;
-        }
-
-
-        private void ConfigureCacheResults(List<TrackerCacheResult> results)
-        {
-            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;
-                result.Link = serverService.ConvertToProxyLink(link, serverUrl, result.TrackerId, "dl", result.Title + ".torrent");
-                if (result.Link != null && result.Link.Scheme != "magnet" && !string.IsNullOrWhiteSpace(Engine.Server.Config.BlackholeDir))
-                    result.BlackholeLink = serverService.ConvertToProxyLink(link, serverUrl, result.TrackerId, "bh", string.Empty);
-
-            }
-        }
-
-        [Route("GetLogs")]
-        [HttpGet]
-        public List<CachedLog> GetLogs()
-        {
-            return logCache.Logs;
-        }
-
-        [Route("Search")]
-        [HttpPost]
-        public ManualSearchResult Search([FromBody]AdminSearch value)
-        {
-            var results = new List<TrackerCacheResult>();
-            var stringQuery = new TorznabQuery();
-
-            var queryStr = value.Query;
-            if (queryStr != null)
-            { 
-                var seasonMatch = Regex.Match(queryStr, @"S(\d{2,4})");
-                if (seasonMatch.Success)
-                {
-                    stringQuery.Season = int.Parse(seasonMatch.Groups[1].Value);
-                    queryStr = queryStr.Remove(seasonMatch.Index, seasonMatch.Length);
-                }
-
-                var episodeMatch = Regex.Match(queryStr, @"E(\d{2,4})");
-                if (episodeMatch.Success)
-                {
-                    stringQuery.Episode = episodeMatch.Groups[1].Value;
-                    queryStr = queryStr.Remove(episodeMatch.Index, episodeMatch.Length);
-                }
-                queryStr = queryStr.Trim();
-            }
-        
-
-            stringQuery.SearchTerm = queryStr;
-            stringQuery.Categories = value.Category == 0 ? new int[0] : new int[1] { value.Category };
-            stringQuery.ExpandCatsToSubCats();
-
-            // try to build an IMDB Query
-            var imdbID = ParseUtil.GetFullImdbID(stringQuery.SanitizedSearchTerm);
-            TorznabQuery imdbQuery = null;
-            if (imdbID != null)
-            {
-                imdbQuery = new TorznabQuery()
-                {
-                    ImdbID = imdbID,
-                    Categories = stringQuery.Categories,
-                    Season = stringQuery.Season,
-                    Episode = stringQuery.Episode,
-                };
-                imdbQuery.ExpandCatsToSubCats();
-            }
-
-            var trackers = indexerService.GetAllIndexers().Where(t => t.IsConfigured).ToList();
-            if (!string.IsNullOrWhiteSpace(value.Tracker))
-            {
-                trackers = trackers.Where(t => t.ID == value.Tracker).ToList();
-            }
-
-            if (value.Category != 0)
-            {
-                trackers = trackers.Where(t => t.TorznabCaps.Categories.Select(c => c.ID).Contains(value.Category)).ToList();
-            }
-
-            Parallel.ForEach(trackers.ToList(), new ParallelOptions { MaxDegreeOfParallelism = 1000 }, indexer =>
-            {
-                try
-                {
-                    var query = stringQuery;
-                    // use imdb Query for trackers which support it
-                    if (imdbQuery != null && indexer.TorznabCaps.SupportsImdbSearch)
-                        query = imdbQuery;
-
-                    var searchResults = indexer.PerformQuery(query).Result;
-                    searchResults = indexer.CleanLinks(searchResults);
-                    cacheService.CacheRssResults(indexer, searchResults);
-                    searchResults = indexer.FilterResults(query, searchResults);
-
-                    foreach (var result in searchResults)
-                    {
-                        var item = Mapper.Map<TrackerCacheResult>(result);
-                        item.Tracker = indexer.DisplayName;
-                        item.TrackerId = indexer.ID;
-                        item.Peers = item.Peers - item.Seeders; // Use peers as leechers
-                        lock (results)
-                        {
-                            results.Add(item);
-                        }
-                    }
-                }
-                catch (Exception e)
-                {
-                    logger.Error(e, "An error occured during manual search on " + indexer.DisplayName + ":  " + e.Message);
-                }
-            });
-
-            ConfigureCacheResults(results);
-
-            if (trackers.Count > 1)
-            {
-                results = results.OrderByDescending(d => d.PublishDate).ToList();
-            }
-
-            var manualResult = new ManualSearchResult()
-            {
-                Results = results,
-                Indexers = trackers.Select(t => t.DisplayName).ToList()
-            };
-
-
-            if (manualResult.Indexers.Count == 0)
-                manualResult.Indexers = new List<string>() { "None" };
-
-            logger.Info(string.Format("Manual search for \"{0}\" on {1} with {2} results.", stringQuery.GetQueryString(), string.Join(", ", manualResult.Indexers), manualResult.Results.Count));
-            return manualResult;
-        }
-    }
-}
-

src/Jackett/Controllers/BlackholeController.cs

@@ -1,4 +1,5 @@
 using Jackett.Services;
+using Jackett.Utils;
 using Newtonsoft.Json.Linq;
 using NLog;
 using System;
@@ -22,34 +23,36 @@ namespace Jackett.Controllers
         private Logger logger;
         private IIndexerManagerService indexerService;
         IServerService serverService;
+        IProtectionService protectionService;
 
-        public BlackholeController(IIndexerManagerService i, Logger l, IServerService s)
+        public BlackholeController(IIndexerManagerService i, Logger l, IServerService s, IProtectionService ps)
         {
             logger = l;
             indexerService = i;
             serverService = s;
+            protectionService = ps;
         }
 
         [HttpGet]
-        public async Task<IHttpActionResult> Blackhole(string indexerID, string path, string apikey)
+        public async Task<IHttpActionResult> Blackhole(string indexerID, string path, string jackett_apikey, string file)
         {
 
             var jsonReply = new JObject();
             try
             {
-                var indexer = indexerService.GetIndexer(indexerID);
+                var indexer = indexerService.GetWebIndexer(indexerID);
                 if (!indexer.IsConfigured)
                 {
                     logger.Warn(string.Format("Rejected a request to {0} which is unconfigured.", indexer.DisplayName));
                     throw new Exception("This indexer is not configured.");
                 }
 
-                if (serverService.Config.APIKey != apikey)
+                if (serverService.Config.APIKey != jackett_apikey)
                     throw new Exception("Incorrect API key");
 
-                var remoteFile = new Uri(Encoding.UTF8.GetString(HttpServerUtility.UrlTokenDecode(path)), UriKind.RelativeOrAbsolute);
-                remoteFile = indexer.UncleanLink(remoteFile);
-
+                path = Encoding.UTF8.GetString(HttpServerUtility.UrlTokenDecode(path));
+                path = protectionService.UnProtect(path);
+                var remoteFile = new Uri(path, UriKind.RelativeOrAbsolute);
                 var downloadBytes = await indexer.Download(remoteFile);
 
                 if (string.IsNullOrWhiteSpace(Engine.Server.Config.BlackholeDir))
@@ -62,7 +65,12 @@ namespace Jackett.Controllers
                     throw new Exception("Blackhole directory does not exist: " + Engine.Server.Config.BlackholeDir);
                 }
 
-                var fileName = DateTime.Now.Ticks + ".torrent";
+                var fileName = DateTime.Now.Ticks.ToString() + "-" + StringUtil.MakeValidFileName(indexer.DisplayName, '_', false);
+                if (string.IsNullOrWhiteSpace(file))
+                    fileName += ".torrent";
+                else
+                    fileName += "-"+StringUtil.MakeValidFileName(file, '_', false); // call MakeValidFileName() again to avoid any possibility of path traversal attacks 
+
                 File.WriteAllBytes(Path.Combine(Engine.Server.Config.BlackholeDir, fileName), downloadBytes);
                 jsonReply["result"] = "success";
             }

src/Jackett/Controllers/DownloadController.cs

@@ -11,6 +11,7 @@ using System.Threading.Tasks;
 using System.Web;
 using System.Web.Http;
 using MonoTorrent.BEncoding;
+using Jackett.Utils;
 
 namespace Jackett.Controllers
 {
@@ -21,20 +22,22 @@ namespace Jackett.Controllers
         Logger logger;
         IIndexerManagerService indexerService;
         IServerService serverService;
+        IProtectionService protectionService;
 
-        public DownloadController(IIndexerManagerService i, Logger l, IServerService s)
+        public DownloadController(IIndexerManagerService i, Logger l, IServerService s, IProtectionService ps)
         {
             logger = l;
             indexerService = i;
             serverService = s;
+            protectionService = ps;
         }
 
         [HttpGet]
-        public async Task<HttpResponseMessage> Download(string indexerID, string path, string apikey, string file)
+        public async Task<HttpResponseMessage> Download(string indexerID, string path, string jackett_apikey, string file)
         {
             try
             {
-                var indexer = indexerService.GetIndexer(indexerID);
+                var indexer = indexerService.GetWebIndexer(indexerID);
 
                 if (!indexer.IsConfigured)
                 {
@@ -43,31 +46,24 @@ namespace Jackett.Controllers
                 }
 
                 path = Encoding.UTF8.GetString(HttpServerUtility.UrlTokenDecode(path));
+                path = protectionService.UnProtect(path);
 
-                if (serverService.Config.APIKey != apikey)
+                if (serverService.Config.APIKey != jackett_apikey)
                     return new HttpResponseMessage(HttpStatusCode.Unauthorized);
 
                 var target = new Uri(path, UriKind.RelativeOrAbsolute);
-                target = indexer.UncleanLink(target);
-
                 var downloadBytes = await indexer.Download(target);
 
                 // This will fix torrents where the keys are not sorted, and thereby not supported by Sonarr.
                 var torrentDictionary = BEncodedDictionary.DecodeTorrent(downloadBytes);
                 downloadBytes = torrentDictionary.Encode();
 
-				char[] invalidChars = System.IO.Path.GetInvalidFileNameChars();
-				for(int i=0;i<file.Count();i++)
-					if(invalidChars.Contains(file[i])) {
-						file = file.Remove(i, 1).Insert(i, " ");
-					}
-				
                 var result = new HttpResponseMessage(HttpStatusCode.OK);
                 result.Content = new ByteArrayContent(downloadBytes);
                 result.Content.Headers.ContentType = new MediaTypeHeaderValue("application/x-bittorrent");
                 result.Content.Headers.ContentDisposition = new ContentDispositionHeaderValue("attachment")
                 {
-                    FileName = file
+                    FileName = StringUtil.MakeValidFileName(file, '_', false) // call MakeValidFileName again to avoid any kind of injection attack
                 };
                 return result;
             }

src/Jackett/Controllers/IndexerApiController.cs

@@ -0,0 +1,173 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using System.Web.Http;
+using System.Web.Http.Controllers;
+using System.Web.Http.Filters;
+using AutoMapper;
+using Jackett.Indexers;
+using Jackett.Models;
+using Jackett.Services;
+using Jackett.Utils;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using NLog;
+
+namespace Jackett.Controllers.V20
+{
+    public interface IIndexerController
+    {
+        IIndexerManagerService IndexerService { get; }
+        IIndexer CurrentIndexer { get; set; }
+    }
+
+    public class RequiresIndexerAttribute : ActionFilterAttribute
+    {
+        public override void OnActionExecuting(HttpActionContext actionContext)
+        {
+            base.OnActionExecuting(actionContext);
+
+            var controller = actionContext.ControllerContext.Controller;
+            if (!(controller is IIndexerController))
+                return;
+
+            var indexerController = controller as IIndexerController;
+
+            var parameters = actionContext.RequestContext.RouteData.Values;
+
+            if (!parameters.ContainsKey("indexerId"))
+            {
+                indexerController.CurrentIndexer = null;
+                return;
+            }
+
+            var indexerId = parameters["indexerId"] as string;
+            if (indexerId.IsNullOrEmptyOrWhitespace())
+                return;
+
+            var indexerService = indexerController.IndexerService;
+            var indexer = indexerService.GetIndexer(indexerId);
+            indexerController.CurrentIndexer = indexer;
+        }
+    }
+
+    [RoutePrefix("api/v2.0/indexers")]
+    [JackettAuthorized]
+    [JackettAPINoCache]
+    public class IndexerApiController : ApiController, IIndexerController
+    {
+        public IIndexerManagerService IndexerService { get; private set; }
+        public IIndexer CurrentIndexer { get; set; }
+
+        public IndexerApiController(IIndexerManagerService indexerManagerService, IServerService ss, ICacheService c, Logger logger)
+        {
+            IndexerService = indexerManagerService;
+            serverService = ss;
+            cacheService = c;
+            this.logger = logger;
+        }
+
+        [HttpGet]
+        [RequiresIndexer]
+        public async Task<IHttpActionResult> Config()
+        {
+            var config = await CurrentIndexer.GetConfigurationForSetup();
+            return Ok(config.ToJson(null));
+        }
+
+        [HttpPost]
+        [ActionName("Config")]
+        [RequiresIndexer]
+        public async Task UpdateConfig([FromBody]Models.DTO.ConfigItem[] config)
+        {
+            try
+            {
+                // HACK
+                var jsonString = JsonConvert.SerializeObject(config);
+                var json = JToken.Parse(jsonString);
+
+                var configurationResult = await CurrentIndexer.ApplyConfiguration(json);
+
+                if (configurationResult == IndexerConfigurationStatus.RequiresTesting)
+                    await IndexerService.TestIndexer(CurrentIndexer.ID);
+            }
+            catch
+            {
+                var baseIndexer = CurrentIndexer as BaseIndexer;
+                if (null != baseIndexer)
+                    baseIndexer.ResetBaseConfig();
+                throw;
+            }
+        }
+
+        [HttpGet]
+        [Route("")]
+        public IEnumerable<Models.DTO.Indexer> Indexers()
+        {
+            var dto = IndexerService.GetAllIndexers().Select(i => new Models.DTO.Indexer(i));
+            return dto;
+        }
+
+        [HttpPost]
+        [RequiresIndexer]
+        public async Task Test()
+        {
+            JToken jsonReply = new JObject();
+            try
+            {
+                await IndexerService.TestIndexer(CurrentIndexer.ID);
+                CurrentIndexer.LastError = null;
+            }
+            catch (Exception ex)
+            {
+                var msg = ex.Message;
+                if (ex.InnerException != null)
+                    msg += ": " + ex.InnerException.Message;
+
+                if (CurrentIndexer != null)
+                    CurrentIndexer.LastError = msg;
+
+                throw;
+            }
+        }
+
+        [HttpDelete]
+        [RequiresIndexer]
+        [Route("{indexerId}")]
+        public void Delete()
+        {
+            IndexerService.DeleteIndexer(CurrentIndexer.ID);
+        }
+
+        // TODO
+        // This should go to ServerConfigurationController
+        [Route("Cache")]
+        [HttpGet]
+        public List<TrackerCacheResult> Cache()
+        {
+            var results = cacheService.GetCachedResults();
+            ConfigureCacheResults(results);
+            return results;
+        }
+
+        private void ConfigureCacheResults(IEnumerable<TrackerCacheResult> results)
+        {
+            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;
+                var file = StringUtil.MakeValidFileName(result.Title, '_', false) + ".torrent";
+                result.Link = serverService.ConvertToProxyLink(link, serverUrl, result.TrackerId, "dl", file);
+                if (result.Link != null && result.Link.Scheme != "magnet" && !string.IsNullOrWhiteSpace(Engine.Server.Config.BlackholeDir))
+                    result.BlackholeLink = serverService.ConvertToProxyLink(link, serverUrl, result.TrackerId, "bh", file);
+
+            }
+        }
+
+        private Logger logger;
+        private IServerService serverService;
+        private ICacheService cacheService;
+    }
+}

src/Jackett/Controllers/PotatoController.cs

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

src/Jackett/Controllers/ResultsController.cs

@@ -0,0 +1,417 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using System.Web;
+using System.Web.Http;
+using System.Web.Http.Controllers;
+using System.Web.Http.Filters;
+using System.Xml.Linq;
+using Jackett.Indexers;
+using Jackett.Models;
+using Jackett.Services;
+using Jackett.Utils;
+using Jackett.Utils.Clients;
+using Newtonsoft.Json;
+using NLog;
+using Jackett.Models.DTO;
+
+namespace Jackett.Controllers.V20
+{
+    public class RequiresApiKeyAttribute : AuthorizationFilterAttribute
+    {
+        public override void OnAuthorization(HttpActionContext actionContext)
+        {
+            var validApiKey = Engine.Server.Config.APIKey;
+            var queryParams = actionContext.Request.GetQueryNameValuePairs().ToDictionary();
+            var queryApiKey = queryParams.ContainsKey("apikey") ? queryParams["apikey"] : null;
+            queryApiKey = queryParams.ContainsKey("passkey") ? queryParams["passkey"] : queryApiKey;
+
+#if DEBUG
+            if (Debugger.IsAttached)
+                return;
+#endif
+            if (queryApiKey != validApiKey)
+                actionContext.Response = actionContext.Request.CreateResponse(HttpStatusCode.Unauthorized);
+        }
+    }
+
+    public class RequiresConfiguredIndexerAttribute : ActionFilterAttribute
+    {
+        public override void OnActionExecuting(HttpActionContext actionContext)
+        {
+            var controller = actionContext.ControllerContext.Controller;
+            if (!(controller is IIndexerController))
+                return;
+
+            var indexerController = controller as IIndexerController;
+
+            var parameters = actionContext.RequestContext.RouteData.Values;
+
+            if (!parameters.ContainsKey("indexerId"))
+            {
+                indexerController.CurrentIndexer = null;
+                actionContext.Response = actionContext.Request.CreateErrorResponse(HttpStatusCode.Unauthorized, "Invalid parameter");
+                return;
+            }
+
+            var indexerId = parameters["indexerId"] as string;
+            if (indexerId.IsNullOrEmptyOrWhitespace())
+            {
+                indexerController.CurrentIndexer = null;
+                actionContext.Response = actionContext.Request.CreateErrorResponse(HttpStatusCode.Unauthorized, "Invalid parameter");
+                return;
+            }
+
+            var indexerService = indexerController.IndexerService;
+            var indexer = indexerService.GetIndexer(indexerId);
+
+            if (indexer == null)
+            {
+                indexerController.CurrentIndexer = null;
+                actionContext.Response = actionContext.Request.CreateErrorResponse(HttpStatusCode.Unauthorized, "Invalid parameter");
+                return;
+            }
+
+            if (!indexer.IsConfigured)
+            {
+                indexerController.CurrentIndexer = null;
+                actionContext.Response = actionContext.Request.CreateErrorResponse(HttpStatusCode.Unauthorized, "Indexer is not configured");
+                return;
+            }
+
+            indexerController.CurrentIndexer = indexer;
+        }
+    }
+
+    public class RequiresValidQueryAttribute : RequiresConfiguredIndexerAttribute
+    {
+        public override void OnActionExecuting(HttpActionContext actionContext)
+        {
+            base.OnActionExecuting(actionContext);
+            if (actionContext.Response != null)
+                return;
+
+            var controller = actionContext.ControllerContext.Controller;
+            if (!(controller is IResultController))
+                return;
+
+            var resultController = controller as IResultController;
+
+            var query = actionContext.ActionArguments.First().Value;
+            var queryType = query.GetType();
+            var converter = queryType.GetMethod("ToTorznabQuery", System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.Public);
+            if (converter == null)
+                actionContext.Response = actionContext.Request.CreateErrorResponse(HttpStatusCode.BadRequest, "");
+            var converted = converter.Invoke(null, new object[] { query });
+            var torznabQuery = converted as TorznabQuery;
+            resultController.CurrentQuery = torznabQuery;
+
+            if (!resultController.CurrentIndexer.CanHandleQuery(resultController.CurrentQuery))
+                actionContext.Response = actionContext.Request.CreateErrorResponse(HttpStatusCode.BadRequest, $"{resultController.CurrentIndexer.ID} does not support the requested query.");
+        }
+    }
+
+    public class JsonResponseAttribute : ActionFilterAttribute
+    {
+        public override void OnActionExecuted(HttpActionExecutedContext actionExecutedContext)
+        {
+            base.OnActionExecuted(actionExecutedContext);
+
+            var content = actionExecutedContext.Response.Content as ObjectContent;
+            actionExecutedContext.Response.Content = new JsonContent(content.Value);
+        }
+    }
+
+    public interface IResultController : IIndexerController
+    {
+        TorznabQuery CurrentQuery { get; set; }
+    }
+
+    [AllowAnonymous]
+    [JackettAPINoCache]
+    [RoutePrefix("api/v2.0/indexers")]
+    [RequiresApiKey]
+    [RequiresValidQuery]
+    public class ResultsController : ApiController, IResultController
+    {
+        public IIndexerManagerService IndexerService { get; private set; }
+        public IIndexer CurrentIndexer { get; set; }
+        public TorznabQuery CurrentQuery { get; set; }
+
+        public ResultsController(IIndexerManagerService indexerManagerService, IServerService ss, ICacheService c, Logger logger)
+        {
+            IndexerService = indexerManagerService;
+            serverService = ss;
+            cacheService = c;
+            this.logger = logger;
+        }
+
+        [HttpGet]
+        public async Task<Models.DTO.ManualSearchResult> Results([FromUri]Models.DTO.ApiSearch request)
+        {
+            var manualResult = new ManualSearchResult();
+            var trackers = IndexerService.GetAllIndexers().Where(t => t.IsConfigured);
+            if (CurrentIndexer.ID != "all")
+                trackers = trackers.Where(t => t.ID == CurrentIndexer.ID).ToList();
+            trackers = trackers.Where(t => t.CanHandleQuery(CurrentQuery));
+
+            var tasks = trackers.ToList().Select(t => t.ResultsForQuery(CurrentQuery)).ToList();
+            try
+            {
+                var aggregateTask = Task.WhenAll(tasks);
+                await aggregateTask;
+            }
+            catch (AggregateException aex)
+            {
+                foreach (var ex in aex.InnerExceptions)
+                {
+                    logger.Error(ex);
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.Error(ex);
+            }
+
+            manualResult.Indexers = tasks.Select(t =>
+            {
+                var resultIndexer = new ManualSearchResultIndexer();
+                IIndexer indexer = null;
+                if (t.Status == TaskStatus.RanToCompletion)
+                {
+                    resultIndexer.Status = ManualSearchResultIndexerStatus.OK;
+                    resultIndexer.Results = t.Result.Releases.Count();
+                    resultIndexer.Error = null;
+                    indexer = t.Result.Indexer;
+                }
+                else if (t.Exception.InnerException is IndexerException)
+                {
+                    resultIndexer.Status = ManualSearchResultIndexerStatus.Error;
+                    resultIndexer.Results = 0;
+                    resultIndexer.Error = ((IndexerException)t.Exception.InnerException).ToString();
+                    indexer = ((IndexerException)t.Exception.InnerException).Indexer;
+                }
+                else
+                {
+                    resultIndexer.Status = ManualSearchResultIndexerStatus.Unknown;
+                    resultIndexer.Results = 0;
+                    resultIndexer.Error = null;
+                }
+
+                if (indexer != null)
+                {
+                    resultIndexer.ID = indexer.ID;
+                    resultIndexer.Name = indexer.DisplayName;
+                }
+                return resultIndexer;
+            }).ToList();
+
+            manualResult.Results = tasks.Where(t => t.Status == TaskStatus.RanToCompletion).Where(t => t.Result.Releases.Count() > 0).SelectMany(t =>
+            {
+                var searchResults = t.Result.Releases;
+                var indexer = t.Result.Indexer;
+                cacheService.CacheRssResults(indexer, searchResults);
+
+                return searchResults.Select(result =>
+                {
+                    var item = AutoMapper.Mapper.Map<TrackerCacheResult>(result);
+                    item.Tracker = indexer.DisplayName;
+                    item.TrackerId = indexer.ID;
+                    item.Peers = item.Peers - item.Seeders; // Use peers as leechers
+
+                    return item;
+                });
+            }).OrderByDescending(d => d.PublishDate).ToList();
+
+            ConfigureCacheResults(manualResult.Results);
+
+            logger.Info(string.Format("Manual search for \"{0}\" on {1} with {2} results.", CurrentQuery.SanitizedSearchTerm, string.Join(", ", manualResult.Indexers), manualResult.Results.Count()));
+            return manualResult;
+        }
+
+        [HttpGet]
+        public async Task<IHttpActionResult> Torznab([FromUri]Models.DTO.TorznabRequest request)
+        {
+            if (string.Equals(CurrentQuery.QueryType, "caps", StringComparison.InvariantCultureIgnoreCase))
+            {
+                return ResponseMessage(new HttpResponseMessage()
+                {
+                    Content = new StringContent(CurrentIndexer.TorznabCaps.ToXml(), Encoding.UTF8, "application/xml")
+                });
+            }
+
+            if (CurrentQuery.ImdbID != null)
+            {
+                if (CurrentQuery.QueryType != "movie")
+                {
+                    logger.Warn($"A non movie request with an imdbid was made from {Request.GetOwinContext().Request.RemoteIpAddress}.");
+                    return GetErrorXML(201, "Incorrect parameter: only movie-search supports the imdbid parameter");
+                }
+
+                if (!string.IsNullOrEmpty(CurrentQuery.SearchTerm))
+                {
+                    logger.Warn($"A movie-search request from {Request.GetOwinContext().Request.RemoteIpAddress} was made contining q and imdbid.");
+                    return GetErrorXML(201, "Incorrect parameter: please specify either imdbid or q");
+                }
+
+                CurrentQuery.ImdbID = ParseUtil.GetFullImdbID(CurrentQuery.ImdbID); // normalize ImdbID
+                if (CurrentQuery.ImdbID == null)
+                {
+                    logger.Warn($"A movie-search request from {Request.GetOwinContext().Request.RemoteIpAddress} was made with an invalid imdbid.");
+                    return GetErrorXML(201, "Incorrect parameter: invalid imdbid format");
+                }
+
+                if (!CurrentIndexer.TorznabCaps.SupportsImdbSearch)
+                {
+                    logger.Warn($"A movie-search request with imdbid from {Request.GetOwinContext().Request.RemoteIpAddress} was made but the indexer {CurrentIndexer.DisplayName} doesn't support it.");
+                    return GetErrorXML(203, "Function Not Available: imdbid is not supported by this indexer");
+                }
+            }
+
+            var result = await CurrentIndexer.ResultsForQuery(CurrentQuery);
+
+            // Some trackers do not support multiple category filtering so filter the releases that match manually.
+            int? newItemCount = null;
+
+            // Cache non query results
+            if (string.IsNullOrEmpty(CurrentQuery.SanitizedSearchTerm))
+            {
+                newItemCount = cacheService.GetNewItemCount(CurrentIndexer, result.Releases);
+                cacheService.CacheRssResults(CurrentIndexer, result.Releases);
+            }
+
+            // Log info
+            var logBuilder = new StringBuilder();
+            if (newItemCount != null)
+            {
+                logBuilder.AppendFormat("Found {0} ({1} new) releases from {2}", result.Releases.Count(), newItemCount, CurrentIndexer.DisplayName);
+            }
+            else
+            {
+                logBuilder.AppendFormat("Found {0} releases from {1}", result.Releases.Count(), CurrentIndexer.DisplayName);
+            }
+
+            if (!string.IsNullOrWhiteSpace(CurrentQuery.SanitizedSearchTerm))
+            {
+                logBuilder.AppendFormat(" for: {0}", CurrentQuery.GetQueryString());
+            }
+
+            logger.Info(logBuilder.ToString());
+
+            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 = CurrentIndexer.DisplayName,
+                Description = CurrentIndexer.DisplayDescription,
+                Link = new Uri(CurrentIndexer.SiteLink),
+                ImageUrl = new Uri(serverUrl + "logos/" + CurrentIndexer.ID + ".png"),
+                ImageTitle = CurrentIndexer.DisplayName,
+                ImageLink = new Uri(CurrentIndexer.SiteLink),
+                ImageDescription = CurrentIndexer.DisplayName
+            });
+
+            var proxiedReleases = result.Releases.Select(r => AutoMapper.Mapper.Map<ReleaseInfo>(r)).Select(r =>
+            {
+                r.Link = serverService.ConvertToProxyLink(r.Link, serverUrl, r.Origin.ID, "dl", r.Title + ".torrent");
+                return r;
+            });
+
+            resultPage.Releases = proxiedReleases.ToList();
+
+            var xml = resultPage.ToXml(new Uri(serverUrl));
+            // Force the return as XML
+            return ResponseMessage(new HttpResponseMessage()
+            {
+                Content = new StringContent(xml, Encoding.UTF8, "application/rss+xml")
+            });
+        }
+
+        public IHttpActionResult GetErrorXML(int code, string description)
+        {
+            var xdoc = new XDocument(
+                new XDeclaration("1.0", "UTF-8", null),
+                new XElement("error",
+                    new XAttribute("code", code.ToString()),
+                    new XAttribute("description", description)
+                )
+            );
+
+            var xml = xdoc.Declaration.ToString() + Environment.NewLine + xdoc.ToString();
+
+            return ResponseMessage(new HttpResponseMessage()
+            {
+                Content = new StringContent(xml, Encoding.UTF8, "application/xml")
+            });
+        }
+
+        [HttpGet]
+        [JsonResponse]
+        public async Task<Models.DTO.TorrentPotatoResponse> Potato([FromUri]Models.DTO.TorrentPotatoRequest request)
+        {
+            var result = await CurrentIndexer.ResultsForQuery(CurrentQuery);
+
+            // Cache non query results
+            if (string.IsNullOrEmpty(CurrentQuery.SanitizedSearchTerm))
+                cacheService.CacheRssResults(CurrentIndexer, result.Releases);
+
+            // Log info
+            if (string.IsNullOrWhiteSpace(CurrentQuery.SanitizedSearchTerm))
+                logger.Info($"Found {result.Releases.Count()} torrentpotato releases from {CurrentIndexer.DisplayName}");
+            else
+                logger.Info($"Found {result.Releases.Count()} torrentpotato releases from {CurrentIndexer.DisplayName} for: {CurrentQuery.GetQueryString()}");
+
+            var serverUrl = string.Format("{0}://{1}:{2}{3}", Request.RequestUri.Scheme, Request.RequestUri.Host, Request.RequestUri.Port, serverService.BasePath());
+            var potatoReleases = result.Releases.Where(r => r.Link != null || r.MagnetUri != null).Select(r =>
+            {
+                var release = AutoMapper.Mapper.Map<ReleaseInfo>(r);
+                release.Link = serverService.ConvertToProxyLink(release.Link, serverUrl, CurrentIndexer.ID, "dl", release.Title + ".torrent");
+                var item = new Models.DTO.TorrentPotatoResponseItem()
+                {
+                    release_name = release.Title + "[" + CurrentIndexer.DisplayName + "]", // Suffix the indexer so we can see which tracker we are using in CPS as it just says torrentpotato >.>
+                    torrent_id = release.Guid.ToString(),
+                    details_url = release.Comments.ToString(),
+                    download_url = (release.Link != null ? release.Link.ToString() : release.MagnetUri.ToString()),
+                    imdb_id = release.Imdb.HasValue ? "tt" + release.Imdb : null,
+                    freeleech = (release.DownloadVolumeFactor == 0 ? true : false),
+                    type = "movie",
+                    size = (long)release.Size / (1024 * 1024), // This is in MB
+                    leechers = (int)release.Peers - (int)release.Seeders,
+                    seeders = (int)release.Seeders,
+                    publish_date = r.PublishDate == DateTime.MinValue ? null : release.PublishDate.ToUniversalTime().ToString("s")
+                };
+                return item;
+            });
+
+            var potatoResponse = new Models.DTO.TorrentPotatoResponse()
+            {
+                results = potatoReleases.ToList()
+            };
+
+            return potatoResponse;
+        }
+
+        private void ConfigureCacheResults(IEnumerable<TrackerCacheResult> results)
+        {
+            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;
+                var file = StringUtil.MakeValidFileName(result.Title, '_', false) + ".torrent";
+                result.Link = serverService.ConvertToProxyLink(link, serverUrl, result.TrackerId, "dl", file);
+                if (result.Link != null && result.Link.Scheme != "magnet" && !string.IsNullOrWhiteSpace(Engine.Server.Config.BlackholeDir))
+                    result.BlackholeLink = serverService.ConvertToProxyLink(link, serverUrl, result.TrackerId, "bh", file);
+
+            }
+        }
+
+        private Logger logger;
+        private IServerService serverService;
+        private ICacheService cacheService;
+    }
+}

src/Jackett/Controllers/ServerConfigurationController.cs

@@ -0,0 +1,169 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Web.Http;
+using Jackett.Models;
+using Jackett.Services;
+using Jackett.Utils;
+using NLog;
+
+namespace Jackett.Controllers.V20
+{
+    [RoutePrefix("api/v2.0/server")]
+    [JackettAuthorized]
+    [JackettAPINoCache]
+    public class ServerConfigurationController : ApiController
+    {
+        public ServerConfigurationController(IConfigurationService c, IServerService s, IProcessService p, IIndexerManagerService i, ISecuityService ss, IUpdateService u, ILogCacheService lc, Logger l)
+        {
+            config = c;
+            serverService = s;
+            processService = p;
+            indexerService = i;
+            securityService = ss;
+            updater = u;
+            logCache = lc;
+            logger = l;
+        }
+
+        [HttpPost]
+        public void AdminPassword([FromBody]string password)
+        {
+            var oldPassword = serverService.Config.AdminPassword;
+            if (string.IsNullOrEmpty(password))
+                password = string.Empty;
+
+            if (oldPassword != password)
+            {
+                serverService.Config.AdminPassword = securityService.HashPassword(password);
+                serverService.SaveConfig();
+            }
+        }
+
+        [HttpPost]
+        public void Update()
+        {
+            updater.CheckForUpdatesNow();
+        }
+
+        [HttpGet]
+        public Models.DTO.ServerConfig Config()
+        {
+
+            var dto = new Models.DTO.ServerConfig(serverService.notices, serverService.Config, config.GetVersion());
+            return dto;
+        }
+
+        [ActionName("Config")]
+        [HttpPost]
+        public void UpdateConfig([FromBody]Models.DTO.ServerConfig config)
+        {
+            var originalPort = Engine.Server.Config.Port;
+            var originalAllowExternal = Engine.Server.Config.AllowExternal;
+            int port = config.port;
+            bool external = config.external;
+            string saveDir = config.blackholedir;
+            bool updateDisabled = config.updatedisabled;
+            bool preRelease = config.prerelease;
+            bool logging = config.logging;
+            string basePathOverride = config.basepathoverride;
+            string omdbApiKey = config.omdbkey;
+
+            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);
+            Startup.TracingEnabled = logging;
+
+            if (omdbApiKey != Engine.Server.Config.OmdbApiKey)
+            {
+                Engine.Server.Config.OmdbApiKey = omdbApiKey;
+                Engine.Server.SaveConfig();
+                // HACK
+                indexerService.InitAggregateIndexer();
+            }
+
+            if (port != Engine.Server.Config.Port || external != Engine.Server.Config.AllowExternal)
+            {
+
+                if (ServerUtil.RestrictedPorts.Contains(port))
+                    throw new Exception("The port you have selected is restricted, try a different one.");
+
+                if (port < 1 || port > 65535)
+                    throw new Exception("The port you have selected is invalid, it must be below 65535.");
+
+                // Save port to the config so it can be picked up by the if needed when running as admin below.
+                Engine.Server.Config.AllowExternal = external;
+                Engine.Server.Config.Port = port;
+                Engine.Server.SaveConfig();
+
+                // On Windows change the url reservations
+                if (System.Environment.OSVersion.Platform != PlatformID.Unix)
+                {
+                    if (!ServerUtil.IsUserAdministrator())
+                    {
+                        try
+                        {
+                            processService.StartProcessAndLog(System.Windows.Forms.Application.ExecutablePath, "--ReserveUrls", true);
+                        }
+                        catch
+                        {
+                            Engine.Server.Config.Port = originalPort;
+                            Engine.Server.Config.AllowExternal = originalAllowExternal;
+                            Engine.Server.SaveConfig();
+
+                            throw new Exception("Failed to acquire admin permissions to reserve the new port.");
+                        }
+                    }
+                    else
+                    {
+                        serverService.ReserveUrls(true);
+                    }
+                }
+
+            (new Thread(() =>
+            {
+                Thread.Sleep(500);
+                serverService.Stop();
+                Engine.BuildContainer();
+                Engine.Server.Initalize();
+                Engine.Server.Start();
+            })).Start();
+            }
+
+            if (saveDir != Engine.Server.Config.BlackholeDir)
+            {
+                if (!string.IsNullOrEmpty(saveDir))
+                {
+                    if (!Directory.Exists(saveDir))
+                    {
+                        throw new Exception("Blackhole directory does not exist");
+                    }
+                }
+
+                Engine.Server.Config.BlackholeDir = saveDir;
+                Engine.Server.SaveConfig();
+            }
+        }
+
+        [HttpGet]
+        public List<CachedLog> Logs()
+        {
+            return logCache.Logs;
+        }
+
+        private IConfigurationService config;
+        private IServerService serverService;
+        private IProcessService processService;
+        private IIndexerManagerService indexerService;
+        private ISecuityService securityService;
+        private IUpdateService updater;
+        private ILogCacheService logCache;
+        private Logger logger;
+    }
+}

src/Jackett/Controllers/TorznabController.cs

@@ -1,181 +0,0 @@
-using AutoMapper;
-using Jackett.Models;
-using Jackett.Services;
-using Jackett.Utils;
-using NLog;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Text;
-using System.Threading.Tasks;
-using System.Web;
-using System.Web.Http;
-using System.Xml.Linq;
-
-namespace Jackett.Controllers
-{
-    [AllowAnonymous]
-    [JackettAPINoCache]
-    public class TorznabController : ApiController
-    {
-        private IIndexerManagerService indexerService;
-        private Logger logger;
-        private IServerService serverService;
-        private ICacheService cacheService;
-
-        public TorznabController(IIndexerManagerService i, Logger l, IServerService s, ICacheService c)
-        {
-            indexerService = i;
-            logger = l;
-            serverService = s;
-            cacheService = c;
-        }
-
-        public HttpResponseMessage GetErrorXML(int code, string description)
-        {
-            var xdoc = new XDocument(
-                new XDeclaration("1.0", "UTF-8", null),
-                new XElement("error",
-                    new XAttribute("code", code.ToString()),
-                    new XAttribute("description", description)
-                )
-            );
-
-            var xml = xdoc.Declaration.ToString() + Environment.NewLine + xdoc.ToString();
-
-            return new HttpResponseMessage()
-            {
-                Content = new StringContent(xml, Encoding.UTF8, "application/xml")
-            };
-        }
-
-        [HttpGet]
-        public async Task<HttpResponseMessage> Call(string indexerID)
-        {
-            var indexer = indexerService.GetIndexer(indexerID);
-            var torznabQuery = TorznabQuery.FromHttpQuery(HttpUtility.ParseQueryString(Request.RequestUri.Query));
-           
-            if (string.Equals(torznabQuery.QueryType, "caps", StringComparison.InvariantCultureIgnoreCase))
-            {
-                return new HttpResponseMessage()
-                {
-                    Content = new StringContent(indexer.TorznabCaps.ToXml(), Encoding.UTF8, "application/xml")
-                };
-            }
-
-            torznabQuery.ExpandCatsToSubCats();
-            var allowBadApiDueToDebug = false;
-#if DEBUG
-            allowBadApiDueToDebug = Debugger.IsAttached;
-#endif
-
-            if (!allowBadApiDueToDebug && !string.Equals(torznabQuery.ApiKey, serverService.Config.APIKey, StringComparison.InvariantCultureIgnoreCase))
-            {
-                logger.Warn(string.Format("A request from {0} was made with an incorrect API key.", Request.GetOwinContext().Request.RemoteIpAddress));
-                return Request.CreateResponse(HttpStatusCode.Forbidden, "Incorrect API key");
-            }
-
-            if (!indexer.IsConfigured)
-            {
-                logger.Warn(string.Format("Rejected a request to {0} which is unconfigured.", indexer.DisplayName));
-                return Request.CreateResponse(HttpStatusCode.Forbidden, "This indexer is not configured.");
-            }
-
-            if (torznabQuery.ImdbID != null)
-            {
-                if (torznabQuery.QueryType != "movie")
-                {
-                    logger.Warn(string.Format("A non movie request with an imdbid was made from {0}.", Request.GetOwinContext().Request.RemoteIpAddress));
-                    return GetErrorXML(201, "Incorrect parameter: only movie-search supports the imdbid parameter");
-                }
-
-                if (!string.IsNullOrEmpty(torznabQuery.SearchTerm))
-                {
-                    logger.Warn(string.Format("A movie-search request from {0} was made contining q and imdbid.", Request.GetOwinContext().Request.RemoteIpAddress));
-                    return GetErrorXML(201, "Incorrect parameter: please specify either imdbid or q");
-                }
-
-                torznabQuery.ImdbID = ParseUtil.GetFullImdbID(torznabQuery.ImdbID); // normalize ImdbID
-                if (torznabQuery.ImdbID == null)
-                {
-                    logger.Warn(string.Format("A movie-search request from {0} was made with an invalid imdbid.", Request.GetOwinContext().Request.RemoteIpAddress));
-                    return GetErrorXML(201, "Incorrect parameter: invalid imdbid format");
-                }
-
-                if (!indexer.TorznabCaps.SupportsImdbSearch)
-                {
-                    logger.Warn(string.Format("A movie-search request with imdbid from {0} was made but the indexer {1} doesn't support it.", Request.GetOwinContext().Request.RemoteIpAddress, indexer.DisplayName));
-                    return GetErrorXML(203, "Function Not Available: imdbid is not supported by this indexer");
-                }
-            }
-
-            var releases = await indexer.PerformQuery(torznabQuery);
-            releases = indexer.CleanLinks(releases);
-
-            // Some trackers do not keep their clocks up to date and can be ~20 minutes out!
-            foreach (var release in releases)
-            {
-                if (release.PublishDate > DateTime.Now)
-                    release.PublishDate = DateTime.Now;
-            }
-
-            // Some trackers do not support multiple category filtering so filter the releases that match manually.
-            var filteredReleases = releases = indexer.FilterResults(torznabQuery, releases); 
-            int? newItemCount = null;
-
-            // Cache non query results
-            if (string.IsNullOrEmpty(torznabQuery.SanitizedSearchTerm))
-            {
-                newItemCount = cacheService.GetNewItemCount(indexer, filteredReleases);
-                cacheService.CacheRssResults(indexer, releases);
-            }
-
-            // Log info
-            var logBuilder = new StringBuilder();
-            if (newItemCount != null)  {
-                logBuilder.AppendFormat(string.Format("Found {0} ({1} new) releases from {2}", releases.Count(), newItemCount, indexer.DisplayName));
-            }
-            else {
-                logBuilder.AppendFormat(string.Format("Found {0} releases from {1}", releases.Count(), indexer.DisplayName));
-            }
-
-            if (!string.IsNullOrWhiteSpace(torznabQuery.SanitizedSearchTerm)) { 
-                logBuilder.AppendFormat(" for: {0}", torznabQuery.GetQueryString());
-            }
-
-            logger.Info(logBuilder.ToString());
-
-            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,
-                Description = indexer.DisplayDescription,
-                Link = new Uri(indexer.SiteLink),
-                ImageUrl = new Uri(serverUrl + "logos/" + indexer.ID + ".png"),
-                ImageTitle = indexer.DisplayName,
-                ImageLink = new Uri(indexer.SiteLink),
-                ImageDescription = indexer.DisplayName
-            });
-
-
-            foreach(var result in releases)
-            {
-                var clone = Mapper.Map<ReleaseInfo>(result);
-                clone.Link = serverService.ConvertToProxyLink(clone.Link, serverUrl, indexerID, "dl", result.Title + ".torrent");
-                resultPage.Releases.Add(clone);
-            }
-
-            var xml = resultPage.ToXml(new Uri(serverUrl));
-            // Force the return as XML
-            return new HttpResponseMessage()
-            {
-                Content = new StringContent(xml, Encoding.UTF8, "application/rss+xml")
-            };
-        }
-
-
-    }
-}

src/Jackett/Controllers/UIController.cs

@@ -0,0 +1,89 @@
+using System;
+using System.IO;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Threading.Tasks;
+using System.Web;
+using System.Web.Http;
+using Jackett.Services;
+using Jackett.Utils;
+using NLog;
+
+namespace Jackett.Controllers
+{
+    [RoutePrefix("UI")]
+    [JackettAuthorized]
+    [JackettAPINoCache]
+    public class WebUIController : ApiController
+    {
+        public WebUIController(IConfigurationService config, IServerService ss, ISecuityService s, Logger l)
+        {
+            this.config = config;
+            serverService = ss;
+            securityService = s;
+            logger = l;
+        }
+
+        private HttpResponseMessage GetFile(string path)
+        {
+            var result = new HttpResponseMessage(HttpStatusCode.OK);
+            var mappedPath = Path.Combine(config.GetContentFolder(), path);
+            var stream = new FileStream(mappedPath, FileMode.Open, FileAccess.Read, FileShare.Read);
+            result.Content = new StreamContent(stream);
+            result.Content.Headers.ContentType = new MediaTypeHeaderValue(MimeMapping.GetMimeMapping(mappedPath));
+
+            return result;
+        }
+
+        [HttpGet]
+        [AllowAnonymous]
+        public IHttpActionResult Logout()
+        {
+            var ctx = Request.GetOwinContext();
+            var authManager = ctx.Authentication;
+            authManager.SignOut("ApplicationCookie");
+            return Redirect("UI/Dashboard");
+        }
+
+        [HttpGet]
+        [HttpPost]
+        [AllowAnonymous]
+        public async Task<HttpResponseMessage> Dashboard()
+        {
+            if (Request.RequestUri.Query != null && Request.RequestUri.Query.Contains("logout"))
+            {
+                var file = GetFile("login.html");
+                securityService.Logout(file);
+                return file;
+            }
+
+
+            if (securityService.CheckAuthorised(Request))
+            {
+                return GetFile("index.html");
+
+            }
+            else
+            {
+                var formData = await Request.Content.ReadAsFormDataAsync();
+
+                if (formData != null && securityService.HashPassword(formData["password"]) == serverService.Config.AdminPassword)
+                {
+                    var file = GetFile("index.html");
+                    securityService.Login(file);
+                    return file;
+                }
+                else
+                {
+                    return GetFile("login.html");
+                }
+            }
+        }
+
+        private IConfigurationService config;
+        private IServerService serverService;
+        private ISecuityService securityService;
+        private Logger logger;
+    }
+}

src/Jackett/Definitions/2fast4you.yml

@@ -112,6 +112,9 @@
             args: ["torrents-details.php", "download.php"]
       title:
         selector: a[href^="torrents-details.php?id="]
+        filters:
+          - name: replace
+            args: [" - (Nouveau!)", ""]
       category:
         selector: a[href^="torrents.php?cat="]
         attribute: href

src/Jackett/Definitions/anidex.yml

@@ -9,13 +9,34 @@
     - https://anidex.info/
 
   caps:
-    categories:
-      1:  TV/Anime # Anime
+    categorymappings:
+      - {id: 1, cat: TV/Anime, desc: "Anime - Sub"}
+      - {id: 2, cat: TV/Anime, desc: "Anime - Raw"}
+      - {id: 3, cat: TV/Anime, desc: "Anime - Dub"}
+      - {id: 4, cat: TV/Anime, desc: "LA - Sub"}
+      - {id: 5, cat: TV/Anime, desc: "LA - Raw"}
+      - {id: 6, cat: TV/Anime, desc: "Light Novel"}
+      - {id: 7, cat: TV/Anime, desc: "Manga - TLed"}
+      - {id: 8, cat: TV/Anime, desc: "Manga - Raw"}
+      - {id: 9, cat: TV/Anime, desc: "♫ - Lossy"}
+      - {id: 10, cat: TV/Anime, desc: "♫ - Lossless"}
+      - {id: 11, cat: TV/Anime, desc: "♫ - Video"}
+      - {id: 12, cat: TV/Anime, desc: "Games"}
+      - {id: 13, cat: TV/Anime, desc: "Applications"}
+      - {id: 14, cat: TV/Anime, desc: "Pictures"}
+      - {id: 15, cat: TV/Anime, desc: "Adult Video"}
+      - {id: 16, cat: TV/Anime, desc: "Other"}
     modes:
       search: [q]
       tv-search: [q, season, ep]
 
-  settings: []
+  settings:
+    - name: cat-id
+      type: text
+      label: Category Id
+    - name: lang-id
+      type: text
+      label: Language Id
       
   search:
     path: "ajax/page.ajax.php"
@@ -24,12 +45,31 @@
     inputs:
       page: "torrents"
       filename: "{{ .Query.Keywords }}"
-      category: "0"
+      category: "{{ .Config.cat-id }}"
+      lang_id: "{{ .Config.lang-id }}"
     rows:
       selector: div.table-responsive > table > tbody > tr
     fields:
       category:
-        text: "1"
+        selector: td:nth-child(1) > div
+        case:
+          ":contains(\"Anime - Sub\")": 1
+          ":contains(\"Anime - Raw\")": 2
+          ":contains(\"Anime - Dub\")": 3
+          ":contains(\"LA - Sub\")": 4
+          ":contains(\"LA - Raw\")": 5
+          ":contains(\"Light Novel\")": 6
+          ":contains(\"Manga - TLed\")": 7
+          ":contains(\"Manga - Raw\")": 8
+          ":contains(\"♫ - Lossy\")": 9
+          ":contains(\"♫ - Lossless\")": 10
+          ":contains(\"♫ - Video\")": 11
+          ":contains(\"Games\")": 12
+          ":contains(\"Applications\")": 13
+          ":contains(\"Pictures\")": 14
+          ":contains(\"Adult Video\")": 15
+          ":contains(\"Other\")": 16
+          "*": 0 # some old torrents don't have a category
       title:
         selector: td:nth-child(3) > a.torrent > span.span-1440
       details:

src/Jackett/Definitions/anirena.yml

@@ -0,0 +1,53 @@
+---
+  site: aniRena
+  name: AniRena
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    - https://www.anirena.com/
+    
+  settings: []
+
+  caps:
+    categorymappings:
+      # Anime
+      - {id: 2,   cat: TV/Anime, desc: "Anime"}
+      - {id: 9,   cat: TV/Anime, desc: "Anime Music Videos"}
+      - {id: 10,  cat: TV/Anime, desc: "Non-English"}
+      - {id: 1,   cat: TV/Anime, desc: "Raw Animes"}
+      # Audio
+      - {id: 8,   cat: Audio, desc: "Audio"}
+      # Literature
+      - {id: 7,   cat: Books, desc: "Manga"}
+      # Software
+      - {id: 5,   cat: PC/ISO, desc: "DVD/ISO"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+
+  search:
+    path: "/"
+    inputs:
+      s: "{{ .Query.Keywords }}"
+    rows:
+      selector: table tbody tr
+    fields:
+      title:
+        selector: .torrents_small_info_data1 div
+      download:
+        selector: .torrents_small_info_data2 a[title="Download Torrent"]
+        attribute: href
+      magnet:
+        selector: .torrents_small_info_data2 a[title="Magnet Link"]
+        attribute: href
+      size:
+        selector: .torrents_small_size_data1
+      seeders:
+        selector: .torrents_small_seeders_data1 b big
+      leechers:
+        selector: .torrents_small_leechers_data1 b big
+      grabs:
+        selector: .torrents_small_downloads_data1

src/Jackett/Definitions/b2s-share.yml

@@ -0,0 +1,264 @@
+---
+  site: b2s-share
+  name: B2S-Share
+  language: pt-br
+  type: private
+  encoding: iso-8859-1
+  links:
+    - http://www.b2s-share.com/
+
+  caps:
+    categorymappings:
+      #3D
+      - {id: 141, cat: Movies/3D, desc: "3D Ação"}
+      - {id: 142, cat: Movies/3D, desc: "3D Animação"}
+      - {id: 143, cat: Movies/3D, desc: "3D Aventura"}
+      - {id: 144, cat: Movies/3D, desc: "3D Clássico"}
+      - {id: 145, cat: Movies/3D, desc: "3D Comédia"}
+      - {id: 146, cat: Movies/3D, desc: "3D Documentário"}
+      - {id: 147, cat: Movies/3D, desc: "3D Drama"}
+      - {id: 149, cat: Movies/3D, desc: "3D Ficção"}
+      - {id: 150, cat: Movies/3D, desc: "3D Guerra"}
+      - {id: 151, cat: Movies/3D, desc: "3D Infantil"}
+      - {id: 152, cat: Movies/3D, desc: "3D Musical"}
+      - {id: 154, cat: Movies/3D, desc: "3D Outros"}
+      - {id: 155, cat: Movies/3D, desc: "3D Policial"}
+      - {id: 156, cat: Movies/3D, desc: "3D Religioso"}
+      - {id: 157, cat: Movies/3D, desc: "3D Romance"}
+      - {id: 158, cat: Movies/3D, desc: "3D Shows"}
+      - {id: 159, cat: Movies/3D, desc: "3D Suspense"}
+      - {id: 160, cat: Movies/3D, desc: "3D Terror"}
+      - {id: 161, cat: Movies/3D, desc: "3D Thriller"}
+      - {id: 162, cat: Movies/3D, desc: "3D Western"}
+      
+      #4K
+      - {id: 173, cat: Movies, desc: "4K Ação"}
+      - {id: 191, cat: Movies, desc: "4K Animação"}
+      - {id: 190, cat: Movies, desc: "4K Aventura"}
+      - {id: 188, cat: Movies, desc: "4K Clássico"}
+      - {id: 175, cat: Movies, desc: "4K Comédia"}
+      - {id: 186, cat: Movies, desc: "4K Documentário"}
+      - {id: 185, cat: Movies, desc: "4K Drama"}
+      - {id: 177, cat: Movies, desc: "4K Ficção"}
+      - {id: 178, cat: Movies, desc: "4K Guerra"}
+      - {id: 179, cat: Movies, desc: "4K Infantil"}
+      - {id: 180, cat: Movies, desc: "4K Musical"}
+      - {id: 184, cat: Movies, desc: "4K Outros"}
+      - {id: 176, cat: Movies, desc: "4K Policial"}
+      - {id: 187, cat: Movies, desc: "4K Religioso"}
+      - {id: 174, cat: Movies, desc: "4K Romance"}
+      - {id: 181, cat: Movies, desc: "4K Shows"}
+      - {id: 182, cat: Movies, desc: "4K Suspense"}
+      - {id: 189, cat: Movies, desc: "4K Terror"}
+      - {id: 183, cat: Movies, desc: "4K Thriller"}
+      
+      #ANIME
+      - {id: 11, cat: TV/Anime, desc: "Anime"}
+      
+      #PC-APPS
+      - {id: 2, cat: PC, desc: "PC APPS - Linux"}
+      - {id: 3, cat: PC, desc: "PC APPS - Mac"}
+      - {id: 33, cat: PC, desc: "PC APPS - Portateis"}
+      - {id: 1, cat: PC, desc: "PC APPS - Windows"}
+      
+      #BD-R           
+      - {id: 140, cat: Movies, desc: "BD-R Autorado"}
+      - {id: 119, cat: Movies, desc: "BD-R"}
+      
+      #MOBILE        
+      - {id: 163, cat: Other, desc: "Mobile App/Jogos-Android"}
+      - {id: 164, cat: Other, desc: "Mobile App/Jogos-iPhone"}
+      - {id: 93, cat: Other, desc: "Mobile App/Jogos-Java"}
+      - {id: 169, cat: Other, desc: "Mobile App/Jogos-Outros"}
+      - {id: 168, cat: Other, desc: "Mobile App/Jogos-Win"}
+      - {id: 92, cat: Other, desc: "Mobile Filmes"}
+      - {id: 118, cat: Other, desc: "Mobile Séries"}
+      - {id: 94, cat: Other, desc: "Mobile Wallpapers"}
+      
+      #CARTOON       
+      - {id: 172, cat: TV/Other, desc: "Desenho Animado"}
+      
+      #OTHER           
+      - {id: 4, cat: Other, desc: "Apostilas/Cursos"}
+      - {id: 12, cat: Books, desc: "Diversos"}
+      - {id: 167, cat: Books, desc: "E-book/Livros"}
+      - {id: 7, cat: PC/Games, desc: "Emuladores / Roms"}
+      - {id: 166, cat: Books/Comics, desc: "HQ"}
+      - {id: 165, cat: Books, desc: "Revistas"}
+      
+      #DVD-R          
+      - {id: 41, cat: Movies/SD, desc: "DVD-R Autorado"}
+      - {id: 32, cat: Movies/SD, desc: "DVD-R"}
+      
+      #MOVIES        
+      - {id: 14, cat: Movies, desc: "Filmes Ação"}
+      - {id: 99, cat: Movies, desc: "Filmes Animação"}
+      - {id: 15, cat: Movies, desc: "Filmes Aventura"}
+      - {id: 16, cat: Movies, desc: "Filmes Clássico"}
+      - {id: 17, cat: Movies, desc: "Filmes Comédia"}
+      - {id: 31, cat: Movies, desc: "Filmes Documentário"}
+      - {id: 18, cat: Movies, desc: "Filmes Drama"}
+      - {id: 19, cat: Movies, desc: "Filmes Ficção"}
+      - {id: 20, cat: Movies, desc: "Filmes Guerra"}
+      - {id: 126, cat: Movies, desc: "Filmes Infantil"}
+      - {id: 96, cat: Movies, desc: "Filmes Musical"}
+      - {id: 24, cat: Movies, desc: "Filmes Outros"}
+      - {id: 40, cat: Movies, desc: "Filmes Policial"}
+      - {id: 39, cat: Movies, desc: "Filmes Religioso"}
+      - {id: 30, cat: Movies, desc: "Filmes Romance"}
+      - {id: 22, cat: Movies, desc: "Filmes Suspense"}
+      - {id: 23, cat: Movies, desc: "Filmes Terror"}
+      - {id: 130, cat: Movies, desc: "Filmes Thriller"}
+      - {id: 131, cat: Movies, desc: "Filmes Western"}
+      - {id: 34, cat: Movies, desc: "Filmes x264"}
+      
+      #HD-1080p       
+      - {id: 73, cat: Movies/HD, desc: "Filmes 1080p Ação"}
+      - {id: 87, cat: Movies/HD, desc: "Filmes 1080p Animação"}
+      - {id: 74, cat: Movies/HD, desc: "Filmes 1080p Aventura"}
+      - {id: 75, cat: Movies/HD, desc: "Filmes 1080p Clássico"}
+      - {id: 76, cat: Movies/HD, desc: "Filmes 1080p Comédia"}
+      - {id: 77, cat: Movies/HD, desc: "Filmes 1080p Documentário"}
+      - {id: 78, cat: Movies/HD, desc: "Filmes 1080p Drama"}
+      - {id: 79, cat: Movies/HD, desc: "Filmes 1080p Ficção"}
+      - {id: 80, cat: Movies/HD, desc: "Filmes 1080p Guerra"}
+      - {id: 127, cat: Movies/HD, desc: "Filmes 1080p Infantil"}
+      - {id: 97, cat: Movies/HD, desc: "Filmes 1080p Musical"}
+      - {id: 63, cat: Movies/HD, desc: "Filmes 1080p Outros"}
+      - {id: 82, cat: Movies/HD, desc: "Filmes 1080p Policial"}
+      - {id: 83, cat: Movies/HD, desc: "Filmes 1080p Religioso"}
+      - {id: 84, cat: Movies/HD, desc: "Filmes 1080p Romance"}
+      - {id: 88, cat: Movies/HD, desc: "Filmes 1080p Shows"}
+      - {id: 85, cat: Movies/HD, desc: "Filmes 1080p Suspense"}
+      - {id: 86, cat: Movies/HD, desc: "Filmes 1080p Terror"}
+      - {id: 132, cat: Movies/HD, desc: "Filmes 1080p Thriller"}
+      - {id: 135, cat: Movies/HD, desc: "Filmes 1080p Western"}
+      
+      #HD-720p        
+      - {id: 58, cat: Movies/HD, desc: "Filmes 720p Ação"}
+      - {id: 89, cat: Movies/HD, desc: "Filmes 720p Animação"}
+      - {id: 60, cat: Movies/HD, desc: "Filmes 720p Aventura"}
+      - {id: 61, cat: Movies/HD, desc: "Filmes 720p Clássico"}
+      - {id: 62, cat: Movies/HD, desc: "Filmes 720p Comédia"}
+      - {id: 72, cat: Movies/HD, desc: "Filmes 720p Documentário"}
+      - {id: 64, cat: Movies/HD, desc: "Filmes 720p Drama"}
+      - {id: 65, cat: Movies/HD, desc: "Filmes 720p Ficção"}
+      - {id: 66, cat: Movies/HD, desc: "Filmes 720p Guerra"}
+      - {id: 129, cat: Movies/HD, desc: "Filmes 720p Infantil"}
+      - {id: 98, cat: Movies/HD, desc: "Filmes 720p Musical"}
+      - {id: 59, cat: Movies/HD, desc: "Filmes 720p Outros"}
+      - {id: 70, cat: Movies/HD, desc: "Filmes 720p Policial"}
+      - {id: 57, cat: Movies/HD, desc: "Filmes 720p Religioso"}
+      - {id: 71, cat: Movies/HD, desc: "Filmes 720p Romance"}
+      - {id: 90, cat: Movies/HD, desc: "Filmes 720p Shows"}
+      - {id: 68, cat: Movies/HD, desc: "Filmes 720p Suspense"}
+      - {id: 69, cat: Movies/HD, desc: "Filmes 720p Terror"}
+      - {id: 134, cat: Movies/HD, desc: "Filmes 720p Thriller"}
+      - {id: 137, cat: Movies/HD, desc: "Filmes 720p Western"}
+      
+      #GAMES          
+      - {id: 6, cat: Console, desc: "Jogos Console"}
+      - {id: 51, cat: PC/Games, desc: "Jogos Emuladores"}
+      - {id: 44, cat: Console, desc: "Jogos Gamecube"}
+      - {id: 43, cat: Console/NDS, desc: "Jogos Nintendo DS"}
+      - {id: 52, cat: Console, desc: "Jogos Outros"}
+      - {id: 5, cat: PC/Games, desc: "Jogos PC"}
+      - {id: 47, cat: Console, desc: "Jogos PS2"}
+      - {id: 48, cat: Console, desc: "Jogos PS3"}
+      - {id: 170, cat: Console, desc: "Jogos PS4"}
+      - {id: 46, cat: Console, desc: "Jogos PSP"}
+      - {id: 45, cat: Console/Wii, desc: "Jogos Wii"}
+      - {id: 49, cat: Console/Xbox, desc: "Jogos XBOX"}
+      - {id: 50, cat: Console/Xbox 360, desc: "Jogos XBOX360"}
+      - {id: 171, cat: Console, desc: "Jogos XBOXONE"}
+      
+      #MUSIC          
+      - {id: 29, cat: Audio, desc: "Musica Discografia"}
+      - {id: 28, cat: Audio, desc: "Musica Gospel"}
+      - {id: 139, cat: Audio, desc: "Musica Infantil"}
+      - {id: 27, cat: Audio, desc: "Musica Internacionais"}
+      - {id: 26, cat: Audio, desc: "Musica Nacionais"}
+      - {id: 91, cat: Audio, desc: "Musica Outros"}
+      
+      #TV-SERIES      
+      - {id: 35, cat: TV/HD, desc: "Séries HD"}
+      - {id: 8, cat: TV, desc: "Séries"}
+      
+      #SHOWS          
+      - {id: 13, cat: Audio/Video, desc: "Show"}
+      - {id: 56, cat: Audio/Video, desc: "Video Clipes"}
+      
+      #TV             
+      - {id: 53, cat: TV, desc: "Entretenimento"}
+      - {id: 54, cat: TV/Sport, desc: "Esportes"}
+      - {id: 138, cat: TV, desc: "Infantil"}
+      - {id: 55, cat: TV, desc: "Jornalismo"}
+      
+      #XXX            
+      - {id: 36, cat: XXX/Other, desc: "Anime Hentai"}
+      - {id: 10, cat: XXX, desc: "Filmes Adultos"}
+      - {id: 37, cat: XXX/Other, desc: "XXX Fotos"}
+      - {id: 95, cat: XXX/Other, desc: "XXX Revistas"}
+
+    modes:
+      search: [q]
+
+  login:
+    path: account-login.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    test:
+      path: torrents.php
+
+  search:
+    path: torrents-search.php
+    keywordsfilters: 
+      - name: re_replace
+        args: ["[^a-zA-Z0-9]+", "%"]
+    inputs:
+      search: "{{ .Keywords }}"
+    rows:
+      selector: table[class^="ttable_headinner"] > tbody > tr:has(a[href^="torrents-details.php?id="])
+    fields:
+      details:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: href
+      title:
+        selector: a[href^="torrents-details.php?id="]
+      download:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: href
+        filters:
+        - name: replace
+          args: ["torrents-details.php", "download.php"]
+      category:
+        selector: a[href^="torrents.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      date:
+        selector: td:nth-child(2) > span
+        filters:
+        - name: replace
+          args: ["(", ""]
+        - name: replace
+          args: [")", ""]
+      size:
+        selector: td:nth-child(3)
+      grabs:
+        selector: td:nth-child(4) > font > b
+      seeders:
+        selector: td:nth-child(5) > b > font
+      leechers:
+        selector: td:nth-child(6) > font > b
+      downloadvolumefactor:
+        case:
+          "img[alt=\"[free]\"]": "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "img[alt=\"[+UP x2]\"]": "2"
+          "*": "1"

src/Jackett/Definitions/blutopia.yml

@@ -0,0 +1,83 @@
+---
+  site: blutopia
+  name: Blutopia
+  description: "HD Movie tracker"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://blutopia.xyz/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Movies, desc: "Movies"}
+      - {id: 2, cat: TV, desc: "TV"}
+      - {id: 3, cat: Movies, desc: "FANRES"}
+
+    modes:
+      search: [q]
+
+  login:
+    path: /login
+    method: form
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: table.main:contains("Login Failed!")
+    test:
+      path: /torrents
+
+  download:
+    selector: a[href^="/download.php/"]
+        
+  search:
+    path: /torrents/search
+    inputs:
+      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+      name: "{{ .Query.Keywords }}"
+      category_id: 1
+      type: BD50
+      order: created_at:desc
+    rows:
+      selector: table.table > tbody > tr
+    fields:
+      # category:
+      #   selector: a[href^="categories"]
+      #   attribute: href
+      title:
+        remove: ul
+        selector: td:nth-child(2)
+      download:
+        selector: a.view-torrent
+        attribute: href
+        filters:
+          - name: replace
+            args: ["/torrents/", "/download/"]
+      details:
+        selector: a.view-torrent
+        attribute: href
+      size:
+        selector: td:nth-child(4)
+      seeders:
+        selector: td:nth-child(6)
+      leechers:
+        selector: td:nth-child(7)
+      grabs:
+        selector: td:nth-child(5)
+        filters:
+          - name: regexp
+            args: (\d+)
+      date:
+        selector: td:nth-child(3)
+        filters:
+          - name: append
+            args: " ago"
+      downloadvolumefactor:
+        case:
+          #"i[data-original-title=\"100% Free\"]": "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          #"i[data-original-title=\"Double upload\"]": "2"
+          "*": "1"

src/Jackett/Definitions/btnext.yml

@@ -120,7 +120,7 @@
       search_type: "name"
       searchin: "title"
     error:
-      - selector: div.error
+      - selector: div.error:not(:contains("Não existem resultados encontrados."))
     rows:
       selector: table#torrents_table_classic > tbody > tr:has(td.torrent_name)
     fields:

src/Jackett/Definitions/cpabien.yml

@@ -0,0 +1,88 @@
+---
+  site: cpasbien
+  name: cpasbien
+  language: fr-fr
+  type: public
+  encoding: UTF-8
+  links:
+    - http://cpabien.cc/
+
+  caps:
+    categorymappings:
+      - {id: films, cat: Movies, desc: "Movies"}
+      - {id: series, cat: TV, desc: "TV"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  settings: []
+
+  download:
+    selector: "#telecharger"
+
+  search:
+    path: "/search.php?t={{ .Query.Keywords }}"
+    rows:
+      selector: div[class^='ligne']
+    fields:
+      site_date:
+        selector: a
+        filters:
+          # date is at the end of the title, so we get it and name it site_date
+          - name: regexp
+            args: "(\\w+)$"
+      title:
+        selector: a
+        filters:
+          # now we put the date at the right place according scene naming rules using .Result.site_date
+          - name: replace
+            args: ["FRENCH", "{{ .Result.site_date }} FRENCH"]
+          - name: replace
+            args: ["TRUEFRENCH", "{{ .Result.site_date }} TRUEFRENCH"]
+          - name: replace
+            args: ["VOSTFR", "{{ .Result.site_date }} VOSTFR"]
+          # and we delete it at the end
+          - name: re_replace
+            args: ["(\\w+)$", ""]
+      details:
+        selector: a
+        attribute: href
+      download:
+        selector: a
+        attribute: href
+      size:
+        selector: div.poid
+        filters:
+          - name: re_replace
+            args: [ "\\.(\\d) Ko", "$1X00"]
+          - name: re_replace
+            args: [ " Ko", "000"]
+          - name: re_replace
+            args: [ "\\.(\\d) Mo", "$1X00000"]
+          - name: re_replace
+            args: [ " Mo", "000000"]
+          - name: re_replace
+            args: [ "\\.(\\d) Go", "$1X00000000"]
+          - name: re_replace
+            args: [ " Go", "000000000"]
+          - name: re_replace
+            args: [ "\\.(\\d) To", "$1X00000000000"]
+          - name: re_replace
+            args: [ " To", "000000000000"]
+          - name: replace
+            args: [ "X", "" ]
+      seeders:
+        text: 0
+      seeders:
+        selector: div.up
+        optional: true
+      leechers:
+        text: 0
+      leechers:
+        selector: div.down
+        optional: true
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"

src/Jackett/Definitions/cztorrent.yml

@@ -0,0 +1,125 @@
+---
+  site: cztorrent
+  name: CzTorrent
+  language: cs-cz
+  type: semi-private
+  encoding: UTF-8
+  links:
+    - https://tracker.cztorrent.net/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Movies, desc: "Filmy"}
+      - {id: 25, cat: TV, desc: "Seriály"}
+      - {id: 23, cat: TV/Documentary, desc: "Filmy - dokument"}
+      - {id: 22, cat: PC, desc: "Aplikace"}
+      - {id: 36, cat: Movies/3D, desc: "Filmy - 3D"}
+      - {id: 35, cat: Movies/Other, desc: "Filmy - anime"}
+      - {id: 37, cat: Movies/BluRay, desc: "Filmy - Blu-ray"}
+      - {id: 11, cat: Movies/DVD, desc: "Filmy - DVD"}
+      - {id: 30, cat: Movies/DVD, desc: "Filmy - DVD full"}
+      - {id: 5, cat: Movies, desc: "Filmy - kreslené"}
+      - {id: 31, cat: Movies/HD, desc: "HD"}
+      - {id: 38, cat: Movies/HD, desc: "HD-LQ"}
+      - {id: 3, cat: PC/Games, desc: "Hry"}
+      - {id: 2, cat: Audio, desc: "Hudba"}
+      - {id: 34, cat:  Audio/Video, desc: "Hudba DVD/HD"}
+      - {id: 6, cat: Books, desc: "Knihy"}
+      - {id: 13, cat: Console, desc: "Konzole"}
+      - {id: 32, cat: Audio, desc: "Mluvené slovo"}
+      - {id: 16, cat: PC/Phone-Other, desc: "Mobil, PDA"}
+      - {id: 4, cat: Other, desc: "Ostatní"}
+      - {id: 29, cat: Audio, desc: "Soundtrack"}
+      - {id: 19, cat:  Audio/Video, desc: "Videoklipy"}
+      - {id: 24, cat: XXX, desc: "xXx"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  login:
+    path: /login-page
+    method: form
+    form: form[action^="/login"]
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      persistent_login: "1"
+    error:
+      - selector: div.error
+    test:
+      path: /torrents
+
+  search:
+    path: /torrents
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      s: "{{ .Keywords }}"
+      t: "1"
+    rows:
+      selector: tr.torr_hover
+    fields:
+      title:
+        selector: td.detaily a
+        filters:
+          - name: re_replace
+            args: [".*? / ", ""]
+      category:
+        selector: td:nth-child(2)
+        case:
+          ":contains(\"Filmy\")": 1
+          ":contains(\"Seriály\")": 25
+          ":contains(\"Filmy - dokument\")": 23
+          ":contains(\"Aplikace\")": 22
+          ":contains(\"Filmy - 3D\")": 36
+          ":contains(\"Filmy - anime\")": 35
+          ":contains(\"Filmy - Blu-ray\")": 37
+          ":contains(\"Filmy - DVD\")": 11
+          ":contains(\"Filmy - DVD full\")": 30
+          ":contains(\"Filmy - kreslené\")": 5
+          ":contains(\"HD\")": 31
+          ":contains(\"HD-LQ\")": 38
+          ":contains(\"Hry\")": 3
+          ":contains(\"Hudba\")": 2
+          ":contains(\"Hudba DVD/HD\")": 34
+          ":contains(\"Knihy\")": 6
+          ":contains(\"Konzole\")": 13
+          ":contains(\"Mluvené slovo\")": 32
+          ":contains(\"Mobil, PDA\")": 16
+          ":contains(\"Ostatní\")": 4
+          ":contains(\"Soundtrack\")": 29
+          ":contains(\"Videoklipy\")": 19
+          ":contains(\"xXx\")": 24
+      details:
+        selector: td.detaily a
+        attribute: href
+      download:
+        selector: td.download a
+        attribute: href
+      size:
+        selector: td.detaily
+        filters:
+          - name: split
+            args: [ "|", 0 ]
+          - name: regexp
+            args: "Velikost: (.+?) ?$"
+      date:
+        selector: td:nth-child(4)
+        filters:
+          - name: split
+            args: [ "|", 1 ]
+          - name: regexp
+            args: "Přidán: (.+?) ?$"
+          - name: append
+            args: " +02:00"
+      seeders:
+        selector: td:nth-child(7) span
+      leechers:
+        selector: td:nth-child(8) span
+      downloadvolumefactor:
+        case:
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett/Definitions/datascene.yml

@@ -67,11 +67,15 @@
       search: "{{ .Query.Keywords }}"
       incldead: 1
     rows:
-      selector: tr:has(a.tname)
+      selector: div.ncls > table > tbody > tr:has(a.tname)
     fields:
-      title:
+      title-attribute:
         selector: a.tname
         attribute: title
+      title-text:
+        selector: a.tname
+      title:
+        text: "{{if .Result.title-attribute }}{{ .Result.title-attribute }}{{else}}{{ .Result.title-text }}{{end}}"
       details:
         selector: a.tname
         attribute: href
@@ -82,34 +86,37 @@
           - name: querystring
             args: cat
       download:
-        selector: a[href^="/download.php/"]
+        selector: a[href^="/download.php/"], a[href^="/downloadd.php/"] # some releases use a download link with two d's
         attribute: href
       grabs:
-        selector: td:nth-child(7)
+        selector: td:nth-child(8)
         filters:
           - name: regexp
             args: (\d+)
       size:
-        selector: td:nth-child(6)
+        selector: td:nth-child(7)
       date:
         selector: td:nth-child(2) > right > div:has(font:contains("Uploaded"))
-        remove: div > font
         filters:
-          - name: trim
-            args: ":"
+          - name: replace
+            args: ["Uploaded: ", ""]
       seeders:
-        selector: td:nth-child(8)
-      leechers:
         selector: td:nth-child(9)
+      leechers:
+        selector: td:nth-child(10)
       banner:
         selector: a.tname
         attribute: onmouseover
         filters:
           - name: regexp
             args: src=([^\s]+)
+      imdb:
+        selector: a[href^="http://www.imdb.com/title/"]
+        optional: true
+        attribute: href
       downloadvolumefactor:
         case:
-          "img[src=\"pic/free.gif\"]": "0"
+          "img[src=\"pic/free.png\"]": "0"
           "*": "1"
       uploadvolumefactor:
         case:

src/Jackett/Definitions/diablotorrent.yml

@@ -58,32 +58,25 @@
       movie-search: [q]
 
   login:
-    path: login.php
-    submitpath: login.php
+    path: login
+    submitpath: login/run
     method: form
     inputs:
       referer: ""
       nev: "{{ .Config.username }}"
       jelszo: "{{ .Config.password }}"
-      fsv: "-1"
-      ssl: "1"
+      fsv: "0"
+      login: "1"
       belepes: "1"
-    getselectorinputs:
-      c:
-        selector: "script:contains(\"login.php\")"
-        filters:
-          - name: regexp
-            args: "login.php\\?c=(.*?)&rhash="
-      rhash:
-        text: "123"
+      rhash: "123"
     test:
-      path: browse.php
+      path: browse
 
   search:
-    path: browse.php
+    path: browse
     inputs:
       $raw: "{{range .Categories}}category[]={{.}}&{{end}}"
-      cim: "{{ .Keywords }}"
+      search: "{{ .Keywords }}"
       s_alapjan: "7"
       s_sorrend: "desc"
     rows:
@@ -93,10 +86,8 @@
       download:
         selector: div.box_download > a
         attribute: href
-      #title: # shortened
-      #  selector: a.box_name_a
       title:
-        selector: div.torrent_details_po + h2
+        selector: a.box_name_a > span
       details:
         selector: a.box_name_a
         attribute: href

src/Jackett/Definitions/dragonworld.yml

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

src/Jackett/Definitions/eotforum.yml

@@ -6,7 +6,7 @@
   type: private
   encoding: windows-1252
   links:
-    - http://eot-forum.net
+    - https://eot-forum.net
 
   caps:
     categorymappings:

src/Jackett/Definitions/freedomhd.yml

@@ -7,6 +7,16 @@
   links:
     - http://freedom-paradise.eu/
 
+  download:
+    before:
+      path: "list_thanks.php"
+      method: "get"
+      inputs:
+        id: "{{ .DownloadUri.Query.id }}"
+        to: "give"
+        torrent: "{{ .DownloadUri.Query.id }}"
+    
+
   caps:
     categorymappings:
       # ANIMES

src/Jackett/Definitions/gay-torrents.yml

@@ -0,0 +1,114 @@
+  site: gay-torrents
+  name: Gay-Torrents.net
+  description: "Gay Torrents Live Free!"
+  language: en-us
+  type: semi-private
+  encoding: UTF-8
+  links:
+    - https://www.gay-torrents.net/
+
+  caps:
+    categorymappings:
+     - {id: porn , cat: XXX , desc: "Porn"}
+     - {id: porn/Amateur , cat: XXX , desc: "Amateur"}
+     - {id: porn/Anal , cat: XXX , desc: "Anal"}
+     - {id: porn/Asian , cat: XXX , desc: "Asian"}
+     - {id: porn/Bareback , cat: XXX , desc: "Bareback"}
+     - {id: porn/Bears , cat: XXX , desc: "Bears"}
+     - {id: porn/Bisexual , cat: XXX , desc: "Bisexual"}
+     - {id: porn/Black-Men , cat: XXX , desc: "Black-Men"}
+     - {id: porn/Chubs , cat: XXX , desc: "Chubs"}
+     - {id: porn/Clips , cat: XXX/Packs , desc: "Clips"}
+     - {id: porn/Cross-Generation , cat: XXX , desc: "Cross-Generation"}
+     - {id: porn/DVD-R , cat: XXX/DVD , desc: "DVD-R"}
+     - {id: porn/Fetish , cat: XXX , desc: "Fetish"}
+     - {id: porn/Group-Sex , cat: XXX , desc: "Group-Sex"}
+     - {id: porn/HD-Movies , cat: XXX , desc: "HD-Movies"}
+     - {id: porn/Hunks , cat: XXX , desc: "Hunks"}
+     - {id: porn/Images , cat: XXX/Imageset , desc: "Images"}
+     - {id: porn/Interracial , cat: XXX , desc: "Interracial"}
+     - {id: porn/Jocks , cat: XXX , desc: "Jocks"}
+     - {id: porn/Latino , cat: XXX , desc: "Latino"}
+     - {id: porn/Mature , cat: XXX , desc: "Mature"}
+     - {id: porn/Member , cat: XXX , desc: "Member"}
+     - {id: porn/MiddleEast , cat: XXX , desc: "MiddleEast"}
+     - {id: porn/Military , cat: XXX , desc: "Military"}
+     - {id: porn/Muscle , cat: XXX , desc: "Muscle"}
+     - {id: porn/Oral-Sex , cat: XXX , desc: "Oral-Sex"}
+     - {id: porn/Solo , cat: XXX , desc: "Solo"}
+     - {id: porn/Transsexual , cat: XXX , desc: "Transsexual"}
+     - {id: porn/Twinks , cat: XXX , desc: "Twinks"}
+     - {id: porn/Vintage , cat: XXX , desc: "Vintage"}
+     - {id: porn/Wrestling , cat: XXX , desc: "Wrestling"}
+     - {id: nonporn , cat: Other , desc: "NonPorn"}
+     - {id: nonporn/Anime , cat: TV/Anime , desc: "Anime"}
+     - {id: nonporn/Applications , cat: PC , desc: "Applications"}
+     - {id: nonporn/Comedy , cat: Movies , desc: "Comedy"}
+     - {id: nonporn/Comics , cat: Books/Comics , desc: "Comics"}
+     - {id: nonporn/Coming-Out , cat: Movies , desc: "Coming-Out"}
+     - {id: nonporn/Documentary , cat: Movies , desc: "Documentary"}
+     - {id: nonporn/Drama , cat: Movies , desc: "Drama"}
+     - {id: nonporn/DVD-R , cat: Movies/DVD , desc: "DVD-R"}
+     - {id: nonporn/Gay-Movies , cat: Movies , desc: "Gay-Movies"}
+     - {id: nonporn/Misc , cat: Other/Misc , desc: "Misc"}
+     - {id: nonporn/Short-Film , cat: Movies , desc: "Short-Film"}
+     - {id: nonporn/Softcore , cat: Movies , desc: "Softcore"}
+     - {id: nonporn/Thriller , cat: Movies , desc: "Thriller"}
+     - {id: nonporn/TV-Episode , cat: TV , desc: "TV-Episode"}
+    modes:
+      search: [q]
+
+  login:
+    path: login.php
+    method: post
+    inputs:
+      vb_login_username: "{{ .Config.username }}"
+      vb_login_password: "{{ .Config.password }}"
+      cookieuser: "1"
+      do: "login"
+    test:
+      path: torrentslist.php
+      selector: ul.isuser
+
+  search:
+    path: "{{if .Query.Keywords}}search.php{{else}}torrentslist.php{{end}}"
+    inputs:
+      $raw: "{{range .Categories}}type={{.}}&{{end}}"
+      textsearch: "{{ .Query.Keywords }}"
+    rows:
+      selector: ul.TorrentList
+    fields:
+      category:
+        selector: .TorrentList1 > a
+        attribute: href
+        filters:
+          - name: querystring
+            args: type
+      title:
+        selector: .TorrentList2 > a
+      download:
+        selector: .TorrentList2 > a
+        attribute: href
+        filters:
+          - name: append
+            args: "&do=download"
+      details:
+        selector: .TorrentList2 > a
+        attribute: href
+      size:
+        selector: .TorrentList3
+      seeders:
+        selector: .TorrentList6
+      leechers:
+        selector: .TorrentList7
+      date:
+        selector: li.TorrentList8
+        filters:
+          - name: dateparse
+            args: "02 Jan 06, 15:04"
+      downloadvolumefactor:
+        case:
+          ".TorrentList2 > a:contains(\"[FFL]\")": "0"
+          "*": "1"
+      uploadvolumefactor:
+        text: "1"

src/Jackett/Definitions/gaytorrentru.yml

@@ -0,0 +1,113 @@
+  site: gaytorrentru
+  name: GayTorrent.ru
+  description: "World largest gay porn library for free with a stunning forum and 24/7 Chat"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://www.gaytorrent.ru/
+
+  caps:
+    categorymappings:
+     - {id: 62 , cat: XXX , desc: "Amateur"}
+     - {id: 29 , cat: XXX , desc: "Anal"}
+     - {id: 46 , cat: XXX , desc: "Anime Games"}
+     - {id: 30 , cat: XXX , desc: "Asian"}
+     - {id: 43 , cat: XXX , desc: "Bareback"}
+     - {id: 19 , cat: XXX , desc: "BDSM"}
+     - {id: 17 , cat: XXX , desc: "Bears"}
+     - {id: 44 , cat: XXX , desc: "Black"}
+     - {id: 50 , cat: Books , desc: "Books & Magazines"}
+     - {id: 9 , cat: XXX , desc: "Chubbies"}
+     - {id: 7 , cat: XXX , desc: "Clips"}
+     - {id: 48 , cat: Books/Comics  , desc: "Comic & Yaoi"}
+     - {id: 5 , cat: XXX , desc: "Daddies / Sons"}
+     - {id: 34 , cat: XXX , desc: "Fetish"}
+     - {id: 27 , cat: XXX , desc: "Grey / Older"}
+     - {id: 32 , cat: XXX , desc: "Group-Sex"}
+     - {id: 63 , cat: XXX , desc: "Homemade"}
+     - {id: 12 , cat: XXX , desc: "Hunks"}
+     - {id: 33 , cat: XXX , desc: "Images"}
+     - {id: 53 , cat: XXX , desc: "Interracial"}
+     - {id: 57 , cat: XXX , desc: "Jocks"}
+     - {id: 35 , cat: XXX , desc: "Latino"}
+     - {id: 36 , cat: XXX , desc: "Mature"}
+     - {id: 58 , cat: PC , desc: "Media Programs"}
+     - {id: 37 , cat: XXX , desc: "Member"}
+     - {id: 54 , cat: XXX , desc: "Middle Eastern"}
+     - {id: 38 , cat: XXX , desc: "Military"}
+     - {id: 39 , cat: XXX , desc: "Oral-Sex"}
+     - {id: 47 , cat: XXX , desc: "Shemale"}
+     - {id: 56 , cat: XXX , desc: "Softcore"}
+     - {id: 40 , cat: XXX , desc: "Solo"}
+     - {id: 45 , cat: Movies , desc: "Themed Movie"}
+     - {id: 1 , cat: TV , desc: "TV / Episodes"}
+     - {id: 41 , cat: XXX , desc: "Twinks"}
+     - {id: 42 , cat: XXX , desc: "Vintage"}
+     - {id: 51 , cat: XXX , desc: "Voyeur"}
+     - {id: 65 , cat: XXX , desc: "Wrestling and Sports"}
+     - {id: 28 , cat: XXX , desc: "Youngblood"}
+    modes:
+      search: [q]
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    test:
+      path: browse.php
+
+  search:
+    path: browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      incldead: "0" # Searches only for alive torrents
+    rows:
+      selector: table.browse_result > tbody > tr:has(a[href^="details.php?id="])
+    fields:
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        selector: .browsedesc > a
+      download:
+        selector: a[href^="download.php/"]
+        attribute: href
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      grabs:
+        selector: .tsnatch
+      files:
+        selector: .tfiles
+        filters:
+          - name: regexp
+            args: ([\d]+)
+      size:
+        selector: .tsize
+      seeders:
+        optional: true
+        selector: a[href$="&toseeders=1"]
+      leechers:
+        optional: true
+        selector: a[href$="&todlers=1"]
+      date:
+        selector: .tadded
+        filters:
+          - name: re_replace
+            args: ["(\\d{4}-\\d{2}-\\d{2})(\\d{2}:\\d{2}:\\d{2})(.*)","$1 $2"]
+          - name: dateparse
+            args: "2006-01-02 15:04:05"
+      downloadvolumefactor:
+        case:
+          "td:nth-child(3) > div > nobr > font[color=\"yellow\"]": "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett/Definitions/gigatorrents.yml

@@ -70,6 +70,8 @@
       blah: "0"
     rows:
       selector: table#torrenttable > tbody > tr:has()
+    error:
+      - selector: div.content:contains("Meg van vonva a letöltési jogod")
     fields:
       download:
         selector: a[href^="/details.php?id="]

src/Jackett/Definitions/greekteam.yml

@@ -119,9 +119,9 @@
       download:
         text: "download2.php?torrent={{ .Result._id }}"
       size:
-        selector: td:nth-last-child(3)
+        selector: td:nth-last-child(4)
       date:
-        selector: td:nth-last-child(5)
+        selector: td:nth-last-child(6) > nobr
         filters:
           - name: append
             args: " +02:00"
@@ -130,9 +130,9 @@
       files:
         selector: td:nth-last-child(7)
       seeders:
-        selector: td:nth-last-child(2)
+        selector: td:nth-last-child(3)
       leechers:
-        selector: td:nth-last-child(1)
+        selector: td:nth-last-child(2)
       downloadvolumefactor:
         case:
           "img[src=\"pic/free.png\"]": "0"

src/Jackett/Definitions/horriblesubs.yml

@@ -39,6 +39,8 @@
             args: ["/", "-"]
           - name: dateparse 
             args: "01-02-06"
+          - name: dateparse 
+            args: "01-02"
     fields:
       category:
         text: "1"

src/Jackett/Definitions/ilcorsaronero.yml

@@ -6,6 +6,8 @@
   encoding: UTF-8
   links:
     - https://ilcorsaronero.info/
+  certificates:
+    - FFB230323B987B07C24DCC13BC892CF30536F015 # incomplete CA chain
 
   caps:
     categorymappings:

src/Jackett/Definitions/kapaki.yml

@@ -76,7 +76,8 @@
       keywords: "{{ .Keywords }}"
       search_type: "name"
       searchin: "title"
-
+    error:
+      - selector: div#show_error:not(:contains("Ουπς! Λάθος!Δεν βρέθηκαν αποτελέσματα."))
     rows:
       selector: div#content > div.torrent-box[id^="torrent_"]
       filters:

src/Jackett/Definitions/karagarga.yml

@@ -30,9 +30,6 @@
     test:
       path: index.php
 
-  download:
-    selector: a[href^="download.php?id="]
-        
   search:
     path: browse.php
     inputs:
@@ -47,11 +44,8 @@
       title:
         selector: td:nth-child(2) span
       download:
-        selector: a[href^="details.php?id="]
+        selector: a[href^="down.php"]
         attribute: href
-        filters:
-          - name: replace
-            args: ["details.php?id=", "download.php?id="]
       details:
         selector: a[href^="details.php?id="]
         attribute: href

src/Jackett/Definitions/kickasstorrent-kathow.yml

@@ -1,11 +1,11 @@
 ---
   site: kickasstorrent-kathow
-  name: KickAssTorrent (kat.how)
+  name: KickAssTorrent (thekat.se)
   language: en-us
   type: public
   encoding: UTF-8
   links:
-    - https://kat.how
+    - https://thekat.se
 
   caps:
     categories:

src/Jackett/Definitions/kickasstorrent.yml

@@ -85,25 +85,10 @@
       search: [q]
       tv-search: [q, season, ep]
 
-  settings:
-    - name: username
-      type: text
-      label: Username
-    - name: passkey
-      type: text
-      label: Passkey
-
-  login:
-    method: post
-    path: "new/account-login.php"
-    inputs:
-      username: "{{ .Config.username }}"
-      passkey: "{{ .Config.passkey }}"
-    test:
-      path: index.php
+  settings: []
 
   search:
-    path: "/new/torrents-search.php"
+    path: "/new/{{if .Query.Keywords}}search-torrents.php{{else}}index.php{{end}}"
     inputs:
       $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
       search: "\"{{ .Query.Keywords }}\""
@@ -200,8 +185,6 @@
       date:
         selector: td:nth-child(3)
         filters:
-          - name: append
-            args: " +00:00"
           - name: dateparse
             args: "02-01-2006 15:04:05 -07:00"
       seeders:

src/Jackett/Definitions/leparadisdunet.yml

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

src/Jackett/Definitions/manicomioshare.yml

@@ -0,0 +1,257 @@
+---
+  site: manicomioshare
+  name: Manicomio Share
+  language: pt-br
+  type: private
+  encoding: iso-8859-1
+  links:
+    - https://www.manicomio-share.com
+
+  caps:
+    categorymappings:
+      #XXX
+      - {id: 80, cat: XXX, desc: "Adulto: [XXX] - Filmes"}
+      - {id: 157, cat: XXX, desc: "Adulto: [XXX] - Blu-Ray"}
+      - {id: 159, cat: XXX, desc: "Adulto: [XXX] - DVD-R"}
+      - {id: 160, cat: XXX, desc: "Adulto: [XXX] - DVD-R 9"}
+      - {id: 161, cat: XXX, desc: "Adulto: [XXX] - Eróticos"}
+      - {id: 162, cat: XXX, desc: "Adulto: [XXX] - HD"}
+      - {id: 188, cat: XXX, desc: "Adulto: [XXX] - 4K"}
+      - {id: 112, cat: XXX/Other, desc: "Adulto: [XXX] - Fotos"}
+      - {id: 113, cat: XXX/Other, desc: "Adulto: [XXX] - Hentai"}
+      - {id: 131, cat: XXX/Other, desc: "Adulto: [XXX] - Jogos"}
+      
+      #ANIME
+      - {id: 21, cat: TV/Anime, desc: "Anime: Anime"}
+      - {id: 155, cat: TV/Anime, desc: "Anime: Anime DVD-R"}
+      - {id: 156, cat: TV/Anime, desc: "Anime: Anime HD"}
+      
+      #PC APPS
+      - {id: 22, cat: PC, desc: "Aplicativos: Linux"}
+      - {id: 23, cat: PC, desc: "Aplicativos: Mac OS"}
+      - {id: 24, cat: PC, desc: "Aplicativos: Windows"}
+      
+      #BOOKLET
+      - {id: 25, cat: Other, desc: "Apostila: Apostila e Textos"}
+      - {id: 169, cat: Other, desc: "Apostila: Cursos e Video Aula"}
+      
+      #MOBILE
+      - {id: 26, cat: Other, desc: "Celular: Aplicativos"}
+      - {id: 184, cat: Other, desc: "Celular: Jogos"}
+      
+      #TV-CHILD
+      - {id: 88, cat: TV/Other, desc: "Desenhos: Desenhos"}
+      - {id: 165, cat: TV/Other, desc: "Desenhos: Desenhos DVD-R"}
+      - {id: 166, cat: TV/Other, desc: "Desenhos: Desenhos HD"}
+      - {id: 83, cat: TV/Other, desc: "Diversos: Diversos"}
+      - {id: 84, cat: TV/Other, desc: "Educativos: Infantil"}
+      
+      #TV-SPORTS
+      - {id: 105, cat: TV/Sport, desc: "Eventos: Esportivos"}
+      - {id: 153, cat: TV/Sport, desc: "Eventos: Esportivos DVD-R"}
+      - {id: 154, cat: TV/Sport, desc: "Eventos: Esportivos HD"}
+      
+      #MOVIES
+      - {id: 189, cat: Movies, desc: "Filmes: 4K"}
+      - {id: 132, cat: Movies/BluRay, desc: "Filmes: Blu-Ray"}
+      - {id: 152, cat: Movies/BluRay, desc: "Filmes: Blu-Ray Nacionais"}
+      - {id: 141, cat: Movies/BluRay, desc: "Filmes: Blu-Ray 3D"}
+      - {id: 142, cat: Movies/BluRay, desc: "Filmes: Blu-Ray BD25"}
+      - {id: 182, cat: Movies/BluRay, desc: "Filmes: Blu-Ray BD25 Nacionais"}
+      - {id: 183, cat: Movies/BluRay, desc: "Filmes: Blu-Ray BD25 3D"}
+      - {id: 143, cat: Movies/BluRay, desc: "Filmes: Blu-Ray Remux"}
+      - {id: 34, cat: Movies/SD, desc: "Filmes: DVD-R"}
+      - {id: 134, cat: Movies/SD, desc: "Filmes: DVD-R Nacionais"}
+      - {id: 144, cat: Movies/SD, desc: "Filmes: DVD-R 9"}
+      - {id: 145, cat: Movies/Other, desc: "Filmes: Documentarios DVD-R"}
+      - {id: 151, cat: Movies/Other, desc: "Filmes: Documentarios HD"}
+      - {id: 127, cat: Movies/HD, desc: "Filmes: HD"}
+      - {id: 148, cat: Movies/Foreign, desc: "Filmes: HD Nacionais"}
+      - {id: 147, cat: Movies/3D, desc: "Filmes: HD 3D"}
+      - {id: 128, cat: Movies/Foreign, desc: "Filmes: Nacionais"}
+      - {id: 27, cat: Movies, desc: "Filmes: Ação"}
+      - {id: 95, cat: Movies, desc: "Filmes: Animação"}
+      - {id: 28, cat: Movies, desc: "Filmes: Aventura"}
+      - {id: 29, cat: Movies, desc: "Filmes: Biografia"}
+      - {id: 30, cat: Movies, desc: "Filmes: Classicos"}
+      - {id: 31, cat: Movies, desc: "Filmes: Comédia"}
+      - {id: 32, cat: Movies, desc: "Filmes: Documentarios"}
+      - {id: 33, cat: Movies, desc: "Filmes: Drama"}
+      - {id: 35, cat: Movies, desc: "Filmes: Esportes"}
+      - {id: 185, cat: Movies, desc: "Filmes: Fantasia"}
+      - {id: 36, cat: Movies, desc: "Filmes: Ficção"}
+      - {id: 85, cat: Movies, desc: "Filmes: Guerra"}
+      - {id: 37, cat: Movies, desc: "Filmes: Infantil"}
+      - {id: 118, cat: Movies, desc: "Filmes: Musicais"}
+      - {id: 104, cat: Movies, desc: "Filmes: Policial"}
+      - {id: 40, cat: Movies, desc: "Filmes: Suspense"}
+      - {id: 38, cat: Movies, desc: "Filmes: Religiosos"}
+      - {id: 39, cat: Movies, desc: "Filmes: Romance"}
+      - {id: 41, cat: Movies, desc: "Filmes: Terror"}
+      - {id: 107, cat: Movies, desc: "Filmes: Western"}
+      
+      #GAMES
+      - {id: 97, cat: Console, desc: "Jogos: Dreamcast"}
+      - {id: 44, cat: PC/Games, desc: "Jogos: Emuladores e Rom"}
+      - {id: 101, cat: Console, desc: "Jogos: Game Cube"}
+      - {id: 140, cat: PC/Mac, desc: "Jogos: Mac OS"}
+      - {id: 119, cat: Console/NDS, desc: "Jogos: Nintendo DS"}
+      - {id: 45, cat: PC/Games, desc: "Jogos: Pc"}
+      - {id: 87, cat: Console, desc: "Jogos: PS1"}
+      - {id: 46, cat: Console, desc: "Jogos: PS2"}
+      - {id: 120, cat: Console, desc: "Jogos: PS3"}
+      - {id: 82, cat: Console/PSP, desc: "Jogos: PSP"}
+      - {id: 191, cat: Console, desc: "Jogos: PSVita"}
+      - {id: 47, cat: Console/XBox, desc: "Jogos: Xbox"}
+      - {id: 48, cat: Console/XBox 360, desc: "Jogos: Xbox 360"}
+      - {id: 100, cat: Console/Wii, desc: "Jogos: Wii"}
+      - {id: 187, cat: Console/Wii, desc: "Jogos: Wii-U"}
+      
+      #EBOOKS
+      - {id: 49, cat: Books/EBook, desc: "Livros: E-books"}
+      
+      #MUSIC
+      - {id: 50, cat: Audio, desc: "Músicas: Axé"}
+      - {id: 51, cat: Audio, desc: "Músicas: Blues"}
+      - {id: 52, cat: Audio, desc: "Músicas: Classica"}
+      - {id: 53, cat: Audio, desc: "Músicas: Coletânea"}
+      - {id: 103, cat: Audio, desc: "Músicas: Country"}
+      - {id: 102, cat: Audio, desc: "Músicas: Discografia"}
+      - {id: 54, cat: Audio, desc: "Músicas: Dance"}
+      - {id: 55, cat: Audio, desc: "Músicas: Eletronica"}
+      - {id: 135, cat: Audio, desc: "Músicas: Enka e Japonesa"}
+      - {id: 56, cat: Audio, desc: "Músicas: Forró"}
+      - {id: 57, cat: Audio, desc: "Músicas: Funk"}
+      - {id: 58, cat: Audio, desc: "Músicas: Gospel"}
+      - {id: 117, cat: Audio, desc: "Músicas: Hard Core"}
+      - {id: 59, cat: Audio, desc: "Músicas: Hard Rock"}
+      - {id: 61, cat: Audio, desc: "Músicas: Hip Hop"}
+      - {id: 90, cat: Audio, desc: "Músicas: House"}
+      - {id: 62, cat: Audio, desc: "Músicas: Infantil"}
+      - {id: 175, cat: Audio, desc: "Músicas: Instrumental"}
+      - {id: 86, cat: Audio, desc: "Músicas: Jazz"}
+      - {id: 60, cat: Audio, desc: "Músicas: Metal"}
+      - {id: 63, cat: Audio, desc: "Músicas: MPB"}
+      - {id: 64, cat: Audio, desc: "Músicas: New Age"}
+      - {id: 94, cat: Audio, desc: "Músicas: Oldies"}
+      - {id: 65, cat: Audio, desc: "Músicas: Pagode"}
+      - {id: 66, cat: Audio, desc: "Músicas: Pop"}
+      - {id: 109, cat: Audio, desc: "Músicas: Psychedelic"}
+      - {id: 67, cat: Audio, desc: "Músicas: Punk Rock"}
+      - {id: 89, cat: Audio, desc: "Músicas: Raízes"}
+      - {id: 68, cat: Audio, desc: "Músicas: Rap"}
+      - {id: 69, cat: Audio, desc: "Músicas: Reggae"}
+      - {id: 70, cat: Audio, desc: "Músicas: Regionais"}
+      - {id: 71, cat: Audio, desc: "Músicas: Religiosas"}
+      - {id: 72, cat: Audio, desc: "Músicas: Rock"}
+      - {id: 73, cat: Audio, desc: "Músicas: Samba"}
+      - {id: 74, cat: Audio, desc: "Músicas: Sertanejo"}
+      - {id: 98, cat: Audio, desc: "Músicas: Soul R&B"}
+      - {id: 110, cat: Audio, desc: "Músicas: Surf Music"}
+      - {id: 92, cat: Audio, desc: "Músicas: Techno"}
+      - {id: 91, cat: Audio, desc: "Músicas: Trance"}
+      - {id: 75, cat: Audio, desc: "Músicas: Trilha Sonora"}
+      - {id: 93, cat: Audio, desc: "Músicas: Vocal"}
+      - {id: 111, cat: Audio, desc: "Músicas: World Music"}
+      
+      #TV-FOREIGN
+      - {id: 170, cat: TV/Foreign, desc: "Novelas: Novela"}
+      - {id: 171, cat: TV/Foreign, desc: "Novelas: Novela DVD-R"}
+      - {id: 172, cat: TV/Foreign, desc: "Novelas: Novela HD"}
+      - {id: 179, cat: TV/Other, desc: "Religião: Religião Diversos"}
+      - {id: 178, cat: TV/Other, desc: "Religião: Religião DVD-R"}
+      
+      #BOOKS
+      - {id: 96, cat: Books, desc: "Revistas: Revistas"}
+      - {id: 99, cat: Books/Comics, desc: "Revistas: HQ"}
+      - {id: 192, cat: Books/Comics, desc: "Revistas: Mangá"}
+      
+      #TV-SERIES
+      - {id: 76, cat: TV, desc: "Séries: Seriados"}
+      - {id: 122, cat: TV/HD, desc: "Séries: HD"}
+      - {id: 190, cat: TV, desc: "Séries: 4K"}
+      - {id: 186, cat: TV, desc: "Séries: Blu-Ray"}
+      - {id: 124, cat: TV/SD, desc: "Séries: DVD-R"}
+      - {id: 181, cat: TV/SD, desc: "Séries: DVD-R 9"}
+      - {id: 125, cat: TV/SD, desc: "Séries: DVDRip"}
+      - {id: 123, cat: TV/Other, desc: "Séries: Cartoon"}
+      - {id: 164, cat: TV/Other, desc: "Séries: Cartoon DVD-R"}
+      - {id: 163, cat: TV/Other, desc: "Séries: Cartoon HD"}
+      
+      #MUSIC SHOWS
+      - {id: 77, cat: Audio/Video, desc: "Shows: Shows"}
+      - {id: 133, cat: Audio/Video, desc: "Shows: Shows Blu-Ray"}
+      - {id: 130, cat: Audio/Video, desc: "Shows: Shows DVD-R"}
+      - {id: 180, cat: Audio/Video, desc: "Shows: Shows DVD-R 9"}
+      - {id: 129, cat: Audio/Video, desc: "Shows: Shows HD"}
+      
+      #TV-OTHER
+      - {id: 78, cat: TV, desc: "Televisão: Televisão"}
+      - {id: 136, cat: TV, desc: "Televisão: Televisão HDTV"}
+      - {id: 137, cat: TV, desc: "Televisão: Televisão HD"}
+      - {id: 139, cat: TV, desc: "Televisão: Televisão SDTV"}
+      
+      #MUSIC CLIPS
+      - {id: 79, cat: Audio/Video, desc: "Video: Video Clipes"}
+      - {id: 167, cat: Audio/Video, desc: "Video: Video Clipes DVD-R"}
+      - {id: 168, cat: Audio/Video, desc: "Video: Video Clipes HD"}
+
+    modes:
+      search: [q]
+
+  login:
+    path: index.php
+    method: post
+    inputs:
+      dados: "ok"
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    test:
+      path: torrents.php
+
+  search:
+    path: pesquisa.php
+    keywordsfilters: 
+      # workaroud to remove year in search keywords
+      - name: re_replace
+        args: ["([1-2]\\d{3})", ""]    
+      - name: re_replace
+        args: ["[^a-zA-Z0-9]+", "%"]
+    inputs:
+      busca: "{{ .Keywords }}"
+    rows:
+      selector: table#tbltorrent > tbody > tr[data-id]
+    fields:
+      download:
+        selector: a[href*="/download.php?id="]
+        attribute: href
+      details:
+        selector: a[href*="/item/"]
+        attribute: href
+      category:
+        selector: a[href*="/torrents.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        selector: a[href*="/item/"]
+        remove: font[color^=green]
+        filters:
+          - name: replace
+            args: ["|", ""]
+      size:
+        selector: td:nth-child(4)
+      grabs:
+        selector: td:nth-child(6)
+      seeders:
+        selector: td:nth-child(5) > span:nth-child(1)
+      leechers:
+        selector: td:nth-child(5) > span:nth-child(2)
+      downloadvolumefactor:
+        case:
+          "span.h3t:contains(\"[livre]\")": "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett/Definitions/nachtwerk.yml

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

src/Jackett/Definitions/newretro.yml

@@ -6,7 +6,7 @@
   type: private
   encoding: windows-1252
   links:
-    - http://new-retro.eu/
+    - https://new-retro.eu/
 
   caps:
     categorymappings:
@@ -46,8 +46,9 @@
       tv-search: [q, season, ep]
 
   login:
-    path: /takelogin.php
-    method: post
+    path: /login.php
+    method: form
+    cookies: ["JAVA=OK"] # avoid jscheck redirect
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"

src/Jackett/Definitions/nexttorrent.yml

@@ -0,0 +1,88 @@
+---
+  site: nexttorrent
+  name: NextTorrent
+  language: fr-fr
+  type: public
+  encoding: UTF-8
+  links:
+    - https://www.nextorrent.org/
+
+  caps:
+    categorymappings:
+      - {id: films, cat: Movies, desc: "Movies"}
+      - {id: series, cat: TV, desc: "TV"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  settings: []
+
+  download:
+    selector: a[href^="/get_torrent/"]
+
+  search:
+    path: "recherche/{{ .Query.Keywords }}"
+    rows:
+      selector: div.listing-torrent > table tbody tr:has(a)
+    fields:
+      site_date:
+        selector: td:nth-child(1) a
+        filters:
+          # date is at the end of the title, so we get it and name it site_date
+          - name: regexp
+            args: "(\\w+)$"
+      title:
+        selector: td:nth-child(1) a
+        filters:
+          # now we put the date at the right place according scene naming rules using .Result.site_date
+          - name: replace
+            args: ["FRENCH", "{{ .Result.site_date }} FRENCH"]
+          - name: replace
+            args: ["TRUEFRENCH", "{{ .Result.site_date }} TRUEFRENCH"]
+          - name: replace
+            args: ["VOSTFR", "{{ .Result.site_date }} VOSTFR"]
+          # and we delete it at the end
+          - name: re_replace
+            args: ["(\\w+)$", ""]
+      details:
+        selector: td:nth-child(1) a
+        attribute: href
+      download:
+        selector: td:nth-child(1) a
+        attribute: href
+      size:
+        selector: td:nth-child(2)
+        filters:
+          - name: re_replace
+            args: [ "\\.(\\d) Ko", "$1X00"]
+          - name: re_replace
+            args: [ " Ko", "000"]
+          - name: re_replace
+            args: [ "\\.(\\d) Mo", "$1X00000"]
+          - name: re_replace
+            args: [ " Mo", "000000"]
+          - name: re_replace
+            args: [ "\\.(\\d) Go", "$1X00000000"]
+          - name: re_replace
+            args: [ " Go", "000000000"]
+          - name: re_replace
+            args: [ "\\.(\\d) To", "$1X00000000000"]
+          - name: re_replace
+            args: [ " To", "000000000000"]
+          - name: replace
+            args: [ "X", "" ]
+      seeders:
+        text: 0
+      seeders:
+        selector: td:nth-child(3)
+        optional: true
+      leechers:
+        text: 0
+      leechers:
+        selector: td:nth-child(4)
+        optional: true
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"

src/Jackett/Definitions/nyaa-pantsu.yml

@@ -1,6 +1,6 @@
 #,==========,
 #|   |  |   |
-#`-./    \.-'   -Config'd by Quatroking, 05-05-2017-
+#`-./    \.-'   - Config'd by Quatroking (05-05-2017), updated by AeonLucid (26-05-2017) -
 #   `.__.'
 
 ---
@@ -12,44 +12,74 @@
   links:
     - https://nyaa.pantsu.cat/
     
-  settings: []
+  settings:
+    - name: cat-id
+      type: select
+      label: Category
+      default: "_"
+      options:
+        _: "All categories"
+        3_: "Anime"
+        3_12: "Anime - Anime Music Video"
+        3_5: "Anime - English-translated"
+        3_13: "Anime - Non-English-translated"
+        3_6: "Anime - Raw"
+        2_: "Audio"
+        2_3: "Audio - Lossless"
+        2_4: "Audio - Lossy"
+        4_: "Literature"
+        4_7: "Literature - English-translated"
+        4_14: "Literature - Non-English-translated"
+        4_14: "Literature - Raw"
+        1_: "Software"
+        1_1: "Software - Applications"
+        1_2: "Software - Games"
+    - name: filter-id
+      type: select
+      label: Filter
+      default: "0"
+      options:
+        0: "Show all"
+        1: "Filter Remakes"
+        2: "Trusted"
+        3: "A+"
 
   caps:
     categorymappings:
       # Anime
-#      - {id: 3_,   cat: TV/Anime, desc: "Anime"}
+      - {id: 3_,   cat: TV/Anime, desc: "Anime"}
       - {id: 3_12, cat: TV/Anime, desc: "Anime music videos"}
       - {id: 3_5,  cat: TV/Anime, desc: "English subtitled animes"}
       - {id: 3_13, cat: TV/Anime, desc: "Non-english subtitled animes"}
       - {id: 3_6,  cat: TV/Anime, desc: "Raw animes"}
       # Audio
-#      - {id: 2_,   cat: Audio, desc: "Audio"}
+      - {id: 2_,   cat: Audio, desc: "Audio"}
       - {id: 2_3,  cat: Audio, desc: "Lossless audio"}
       - {id: 2_4,  cat: Audio, desc: "Lossy audio"}
       # Literature
-#      - {id: 4_,   cat: Books, desc: "Literature"}
+      - {id: 4_,   cat: Books, desc: "Literature"}
       - {id: 4_7,  cat: Books, desc: "Literature english translated"}
-      - {id: 4_14,  cat: Books, desc: "Literature non-english translated"}
-      - {id: 4_8, cat: Books, desc: "Raw literature"}
+      - {id: 4_14, cat: Books, desc: "Literature non-english translated"}
+      - {id: 4_8,  cat: Books, desc: "Raw literature"}
       # Software
+      - {id: 1_,   cat: PC, desc: "Software"}
       - {id: 1_1,  cat: PC/ISO, desc: "Applications"}
       - {id: 1_2,  cat: PC/Games, desc: "Games"}
-
     modes:
       search: [q]
       tv-search: [q]
 
-
   search:
     path: /search
     inputs:
-     # page: "search"
-      q: "{{ .Query.Keywords}}"
+      q: "{{ .Query.Keywords }}"
+      c: "{{ .Config.cat-id }}"
+      s: "{{ .Config.filter-id }}"
     rows:
       selector: tr.torrent-info
     fields:
       title:
-        selector: td.name a
+        selector: td.tr-name a
       category:
         selector: td:nth-child(1) a
         attribute: href
@@ -57,26 +87,27 @@
           - name: split
             args: [ "=", -1 ]
       details:
-        selector: td.name a
+        selector: td.tr-name a
         attribute: href
       download:
-        selector: a[title="Magnet link"]
+        selector: a[title="Magnet Link"]
         attribute: href
-      size:
-        selector: td.filesize
       seeders:
-        text: 0
-   #   seeders:
-   #     selector: td.tlistsn
-   #     optional: true
-   #   leechers:
-   #     text: 0
-   #   leechers:
-   #     selector: td.tlistln
-   #     optional: true
-   #   grabs:
-   #     selector: td.tlistdn
-      downloadvolumefactor:
-        text: "0"
-      uploadvolumefactor:
-        text: "1"
+        selector: td.tr-se
+        optional: true
+      leechers:
+        selector: td.tr-le
+        optional: true
+      grabs:
+        selector: td.tr-dl
+        optional: true
+      date:
+        selector: td.date-short
+        filters:
+          - name: dateparse
+            args: "2006-01-02T15:04:05Z"
+      size:
+        selector: td.tr-size
+        filters:
+          - name: replace
+            args: ["Unknown", "0"]

src/Jackett/Definitions/nyaasi.yml

@@ -7,39 +7,68 @@
   links:
     - https://nyaa.si
     
-  settings: []
+  settings:
+    - name: filter-id
+      type: select
+      label: Filter
+      default: "0"
+      options:
+        0: No filter
+        1: No remakes
+        2: Trusted only
+    - name: cat-id
+      type: select
+      label: Category
+      default: "0_0"
+      options:
+        0_0: "All categories"
+        1_0: "Anime"
+        1_1: "Anime - Anime Music Video"
+        1_2: "Anime - English-translated"
+        1_3: "Anime - Non-English-translated"
+        1_4: "Anime - Raw"
+        2_0: "Audio"
+        2_1: "Audio - Lossless"
+        2_2: "Audio - Lossy"
+        3_0: "Literature"
+        3_1: "Literature - English-translated"
+        3_2: "Literature - Non-English-translated"
+        3_3: "Literature - Lossy"
+        6_0: "Software"
+        6_1: "Software - Applications"
+        6_2: "Software - Games"
 
   caps:
     categorymappings:
       # Anime
-      - {id: 1_0,   cat: TV/Anime, desc: "Anime"}
-      - {id: 1_1, cat: TV/Anime, desc: "Anime music videos"}
+      - {id: 1_0,  cat: TV/Anime, desc: "Anime"}
+      - {id: 1_1,  cat: TV/Anime, desc: "Anime music videos"}
       - {id: 1_2,  cat: TV/Anime, desc: "English subtitled animes"}
-      - {id: 1_3, cat: TV/Anime, desc: "Non-english subtitled animes"}
+      - {id: 1_3,  cat: TV/Anime, desc: "Non-english subtitled animes"}
       - {id: 1_4,  cat: TV/Anime, desc: "Raw animes"}
       # Audio
-      - {id: 2_0,   cat: Audio, desc: "Audio"}
+      - {id: 2_0,  cat: Audio, desc: "Audio"}
       - {id: 2_1,  cat: Audio, desc: "Lossless audio"}
       - {id: 2_2,  cat: Audio, desc: "Lossy audio"}
       # Literature
-      - {id: 3_0,   cat: Books, desc: "Literature"}
+      - {id: 3_0,  cat: Books, desc: "Literature"}
       - {id: 3_1,  cat: Books, desc: "Literature english translated"}
       - {id: 3_2,  cat: Books, desc: "Literature non-english translated"}
-      - {id: 3_3, cat: Books, desc: "Raw literature"}
+      - {id: 3_3,  cat: Books, desc: "Raw literature"}
       # Software
       - {id: 6_0,  cat: PC, desc: "Software"}
       - {id: 6_1,  cat: PC/ISO, desc: "Applications"}
       - {id: 6_2,  cat: PC/Games, desc: "Games"}
-
     modes:
       search: [q]
       tv-search: [q]
 
-
   search:
     path: /
     inputs:
       q: "{{ .Query.Keywords}}"
+      f: "{{ .Config.filter-id }}"
+      c: "{{ .Config.cat-id }}"
     rows:
       selector: tr.default,tr.danger,tr.success
     fields:
@@ -50,20 +79,25 @@
           - name: split
             args: [ "=", -1 ]
       title:
-        selector: td:nth-child(2) a
+        selector: td:nth-child(2) a:last-of-type
       details:
-        selector: td:nth-child(2) a
+        selector: td:nth-child(2) a:last-of-type
         attribute: href
       download:
-        selector: td:nth-child(3) a
+        selector: td:nth-child(3) a[href$=".torrent"]
+        attribute: href
+      magnet:
+        selector: td:nth-child(3) a[href^="magnet:?"]
         attribute: href
       size:
         selector: td:nth-child(4)
       date:
         selector: td:nth-child(5)
         filters:
+          - name: append
+            args: " -00"
           - name: dateparse
-            args: "2006-01-02 15:04 UTC"
+            args: "2006-01-02 15:04 -07"
       seeders:
         selector: td:nth-child(6)
       leechers:

src/Jackett/Definitions/nyoo.yml

@@ -39,24 +39,24 @@
       page: "search"
       q: "{{ .Query.Keywords}}"
     rows:
-      selector: tr.tlistrow
+      selector: tr.torrent-info
     fields:
       title:
-        selector: td.tlistname a
+        selector: td.tr-name a
       category:
-        selector: td.tlisticon a
+        selector: td.tr-cat div.nyaa-cat a
         attribute: href
         filters:
           - name: split
             args: [ "=", -1 ]
       details:
-        selector: td.tlistname a
+        selector: td.tr-name a
         attribute: href
       download:
-        selector: a[title="Magnet Download"]
+        selector: a[title="Magnet Link"]
         attribute: href
       size:
-        selector: td.tlistsize
+        selector: td.tr-size
      # seeders:
      #   text: 0
      # seeders:

src/Jackett/Definitions/polishtracker.yml

@@ -6,6 +6,8 @@
   encoding: UTF-8
   links:
     - https://polishtracker.net/
+  certificates:
+    - 95EAB2795D8E35A14A9B35619C2568F974AE4D95 # expired
 
   caps:
     categorymappings:
@@ -57,6 +59,8 @@
       search: "{{ .Query.Keywords }}"
     rows:
       selector: div#bro1 > table.shad1 > tbody > tr[class^="rowfx"]
+    error:
+      - selector: table.textfx2 td:contains("In order to use PolishTracker we require users to familiarize with FAQ, Rules and any News from Home Page.")
     fields:
       download:
         selector: a[href^="/download.php/"]

src/Jackett/Definitions/qctorrent.yml

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

src/Jackett/Definitions/rockhardlossless.yml

@@ -54,20 +54,20 @@
         selector: td:nth-child(2) > img
         attribute: src
       size:
-        selector: td:nth-child(8)
-      files:
-        selector: td:nth-child(5)
-      grabs:
         selector: td:nth-child(9)
+      files:
+        selector: td:nth-child(6)
+      grabs:
+        selector: td:nth-child(10)
         filters:
           - name: regexp
             args: ([\d\.]+)
       seeders:
-        selector: td:nth-child(10)
-      leechers:
         selector: td:nth-child(11)
+      leechers:
+        selector: td:nth-child(12)
       date:
-        selector: td:nth-child(7)
+        selector: td:nth-child(8)
       downloadvolumefactor:
         case:
           "a.info > b:contains(\"Free\")": "0"

src/Jackett/Definitions/secretcinema.yml

@@ -6,7 +6,7 @@
   type: private
   encoding: "UTF-8"
   links:
-    - http://www.secret-cinema.net
+    - https://secret-cinema.pw
 
   caps:
     categorymappings:

src/Jackett/Definitions/skytorrents.yml

@@ -50,9 +50,9 @@
           - name: dateparse
             args: "01-02-2006"
       download:
-        selector: td > a[href^="/file"]
+        selector: td > a[href^="magnet"]
         attribute: href
       downloadvolumefactor:
         text: "0"
       uploadvolumefactor:
-        text: "1"
+        text: "1"

src/Jackett/Definitions/speedtorrentreloaded.yml

@@ -0,0 +1,122 @@
+---
+  site: speedtorrentreloaded
+  name: SpeedTorrent Reloaded
+  language: de-de
+  type: private
+  encoding: UTF-8
+  links:
+    - https://speedtorrent-tracker.mine.nu/
+
+  caps:
+    categorymappings:
+      - {id: 201, cat: Movies/HD, desc: "Filme: HD 720P / 1080P"}
+      - {id: 103, cat: Movies/DVD, desc: "Filme: DVD"}
+      - {id: 104, cat: Movies/DVD, desc: "Filme: HD2DVD"}
+      - {id: 137, cat: Audio/Video, desc: "Musik: Video"}
+      - {id: 106, cat: Movies/SD, desc: "Filme: DVDRip"}
+      - {id: 107, cat: Movies/SD, desc: "Filme: BDRip "}
+      - {id: 108, cat: Movies/3D, desc: "Filme: 3D"}
+      - {id: 109, cat: Movies/BluRay, desc: "Filme: Blue Ray"}
+      - {id: 111, cat: Movies/SD, desc: "Filme:  SD"}
+      - {id: 112, cat: Movies/Other, desc: "Filme: TV/HDTV"}
+      - {id: 203, cat: XXX, desc: "Erotik: XXX PDF"}
+      - {id: 116, cat: Console, desc: "Spiele: Konsolen"}
+      - {id: 117, cat: PC/Games, desc: "Spiele: Windows / Mac"}
+      - {id: 126, cat: PC/0day, desc: "Software: Mac / Linux"}
+      - {id: 120, cat: Audio/Other, desc: "Musik: Alben/Sampler "}
+      - {id: 121, cat: TV/SD, desc: "Serien: SD"}
+      - {id: 123, cat: TV/Documentary, desc: "Doku: sonstige"}
+      - {id: 124, cat: Console/Other, desc: "Spiele: sonstige"}
+      - {id: 125, cat: PC/0day, desc: "Software: Windows"}
+      - {id: 129, cat: PC/Phone-Other, desc: "Software: Handy / Navi / Sonst"}
+      - {id: 131, cat: TV/HD, desc: "Serien: HD"}
+      - {id: 132, cat: TV, desc: "Serien: Packs"}
+      - {id: 135, cat: Audio, desc: "Musik: Discographie"}
+      - {id: 138, cat: TV/Documentary, desc: "Doku: HD"}
+      - {id: 139, cat: TV/Documentary, desc: "Doku: x264"}
+      - {id: 141, cat: Audio/Audiobook, desc: "A/Ebook: Hoerbook"}
+      - {id: 142, cat: Books, desc: "A/Ebook: EBooks"}
+      - {id: 143, cat: Books, desc: "sonstige:PDF"}
+      - {id: 144, cat: XXX, desc: "Erotik: XXX Pics"}
+      - {id: 202, cat: TV/Sport, desc: "Sport"}
+      - {id: 204, cat: XXX, desc: "XXX-Games"}
+      - {id: 205, cat: Movies/SD, desc: "International-SD"}
+      - {id: 206, cat: movies/HD, desc: "International-HD"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    test:
+      path: browse.php
+
+  search:
+    path: browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      incldead: "1"
+      orderby: "added"
+      sort: desc
+    rows:
+      selector: table.tableinborder > tbody > tr > td > table.tableinborder > tbody > tr:has(a[href^="details.php"])
+    fields:
+      title:
+        selector: a[href^="details.php"]
+      banner:
+        selector: a[href^="details.php"][onmouseover]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "<img src=(.*)>')"
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      details:
+        selector: a[href^="details.php"]
+        attribute: href
+      comments:
+        selector: a[href*="&tocomm="]
+        attribute: href
+      download:
+        selector: a[href^="download.php"]
+        attribute: href
+      files:
+        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(1) > b:nth-child(2)
+      grabs:
+        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(3) > b:nth-child(1)
+      size:
+        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(1) > b:nth-child(1)
+        filters:
+          - name: replace
+            args: [".", ""]
+          - name: replace
+            args: [",", "."]
+      seeders:
+        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(2) > b:nth-child(1)
+      leechers:
+        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(2) > b:nth-child(3)
+      date:
+        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(5)
+        filters:
+          - name: append
+            args: " +2:00"
+          - name: dateparse
+            args: "02.01.2006 15:04:05 -07:00"
+      downloadvolumefactor:
+        case:
+          img[title="OnlyUp"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett/Definitions/t411v2.yml

@@ -0,0 +1,117 @@
+---
+  site: t411v2
+  name: t411 v2
+  language: fr-fr
+  type: public
+  encoding: UTF-8
+  links:
+    - https://t411.si
+  caps:
+    categorymappings:
+      - {id: 1, cat: Movies, desc: Films}
+      - {id: 2, cat: TV, desc: Séries}
+      - {id: 3, cat: TV/Anime, desc: Animes}
+      - {id: 4, cat: Audio, desc: Musique}
+      - {id: 5, cat: Books, desc: Ebooks}
+      - {id: 6, cat: PC/0day, desc: Logiciels}
+      - {id: 7, cat: PC/Games, desc: Jeux}
+      - {id: 8, cat: TV/Documentary, desc: Documentaires}
+      - {id: 9, cat: XXX, desc: XXX}
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+  settings: []
+
+  download:
+    selector: a[href^="/telecharger-torrent/"]
+
+  search:
+    path: /torrents/search/?search={{ .Keywords}}
+    rows:
+      selector: tr.isItem.isItemDesk
+    fields:
+     category:
+        selector: td.m-cat > a
+        attribute: href
+        filters:
+          - name: querystring
+            args: category
+     site_date:
+        selector: td.m-name > a
+        filters:
+          # date is at the end of the title, so we get it and name it 
+          # site_date
+          - name: regexp
+            args: "(\\w+)$"
+     title:
+        selector: td.m-name > a
+        filters:
+          # now we put the date at the right place according scene 
+          # naming rules using .Result.site_date
+          - name: replace
+            args: ["FRENCH", "{{ .Result.site_date }} FRENCH"]
+          - name: replace
+            args: ["TRUEFRENCH", "{{ .Result.site_date }} TRUEFRENCH"]
+          - name: replace
+            args: ["VOSTFR", "{{ .Result.site_date }} VOSTFR"]
+          # and we delete it at the end
+          - name: re_replace
+            args: ["(\\w+)$", ""]
+     details:
+        selector: td.m-name > a
+        attribute: href
+     download:
+        selector: td.m-name > a
+        attribute: href
+     size:
+        selector: td.m-taille > span
+        filters:
+          - name: re_replace
+            args: [ "\\.(\\w+) K", "$1X00"]
+          - name: re_replace
+            args: [ " K", "000"]
+          - name: re_replace
+            args: [ "\\.(\\w+) M", "$1X0000"]
+          - name: re_replace
+            args: [ " M", "000000"]
+          - name: re_replace
+            args: [ "\\.(\\w+) G", "$1X0000000"]
+          - name: re_replace
+            args: [ " G", "000000000"]
+     seeders:
+        text: 0
+     seeders:
+        selector: td.m-seeders > span
+        optional: true
+     leechers:
+        text: 0
+     leechers:
+        selector: td.m-leechers > span
+        optional: true
+     downloadvolumefactor:
+        text: "0"
+     uploadvolumefactor:
+        text: "1"
+     date:
+        selector: td.m-age > span
+        filters:
+          - name: replace
+            args: [ " jours", " days"]
+          - name: replace
+            args: [ " jour", " day"]
+          - name: replace
+            args: [ " heures", " hours"]
+          - name: replace
+            args: [ " heure", " hour"]
+          - name: replace
+            args: [ " semaines", " weeks"]
+          - name: replace
+            args: [ " semaine", " week"]
+          - name: replace
+            args: [ " mois", " month"]
+          - name: replace
+            args: [ " ans", " years"]
+          - name: replace
+            args: [ " an", " year"]
+          - name: append
+            args: " ago"

src/Jackett/Definitions/tasmanit.yml

@@ -71,6 +71,9 @@
       keywords: "{{ .Keywords }}"
       search_type: "t_name"
       include_dead_torrents: "yes"
+    keywordsfilters: 
+      - name: re_replace
+        args: ["[^a-zA-Z0-9]+", "%"]
     rows:
       selector: table#sortabletable > tbody > tr:has(a[href])
     fields:

src/Jackett/Definitions/thegeeks.yml

@@ -6,7 +6,7 @@
   type: private
   encoding: UTF-8
   links:
-    - http://thegeeks.click/
+    - https://thegeeks.click/
 
   caps:
     categorymappings:

src/Jackett/Definitions/thepiratebay.yml

@@ -73,7 +73,12 @@
   settings: []
   
   search:
-    path: "{{if .Query.Keywords}}/search/{{ .Query.Keywords}}/0/99/{{range .Categories }}{{.}}{{end}}{{else}}/recent{{end}}"
+    path: "{{if .Query.Keywords}}/search/{{ .Keywords}}/0/99/{{range .Categories }}{{.}}{{end}}{{else}}/recent{{end}}"
+    keywordsfilters:
+        # currently, the only uploader for General Hospital puts a space between season and episode
+        # this filter searches both formats, so "General Hospital S01E02" becomes "General Hospital S01E02 | (S01 E02)"
+      - name: re_replace
+        args: ["General Hospital S(\\d{2,3})E(\\d{2,3})", "$0 | \\(S$1 E$2\\)"]
     rows:
       selector: "#searchResult tbody tr:has(td.vertTh)"
     fields:
@@ -85,6 +90,9 @@
             args: [ "/", -1 ]
       title:
         selector: .detLink
+        filters:
+          - name: replace
+            args: ["\u000f", ""] # get rid of unwanted character (Example: at the end of https://thepiratebay.org/torrent/18316540/Game.of.Thrones.S07E04.iNTERNAL.1080p.WEBRip.x264-MOROSE_)
       details:
         selector: .detLink
         attribute: href

src/Jackett/Definitions/thetorrents.yml

@@ -65,8 +65,9 @@
       tv-search: [q, season, ep]
 
   login:
-    path: /takelogin.php
-    method: post
+    path: /login.php
+    method: form
+    form: form[action="takelogin.php"]
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
@@ -102,7 +103,7 @@
           - name: querystring
             args: cat
       download:
-        selector: a[href^="/download.php/"]
+        selector: a[href^="/download.php"]
         attribute: href
       description:
         selector: td:nth-child(2) > small

src/Jackett/Definitions/tokyotosho.yml

@@ -8,6 +8,11 @@
   links:
     - https://www.tokyotosho.info/
 
+  settings:
+    - name: type-id
+      type: text
+      label: Type Id
+
   caps:
     categories:
       1:  TV/Anime # Anime
@@ -32,6 +37,8 @@
     path: "{{if .Query.Keywords }}search.php{{else}}index.php{{end}}"
     inputs:
       terms: "{{ .Query.Keywords }}"
+      type: "{{ .Config.type-id }}"
+      cat: "{{ .Config.type-id }}"
     rows:
       selector: "table.listing tr.category_0"
       after: 1
@@ -64,8 +71,10 @@
             args: [ "|", 2 ]
           - name: regexp
             args: "Date: (.+?) ?$"
+          - name: replace
+            args: ["UTC","-00"]
           - name: dateparse
-            args: "2006-01-02 15:04 UTC"
+            args: "2006-01-02 15:04 -07"
       seeders:
         selector: td:nth-child(5) > span:nth-child(1)
       leechers:

src/Jackett/Definitions/torlock.yml

@@ -0,0 +1,79 @@
+---
+  site: torlock
+  name: Torlock
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    - https://www.torlock.com/
+
+  caps:
+    categorymappings:
+      - {id: TELEVISION, cat: TV, desc: "TV Shows"}
+      - {id: MOVIES, cat: Movies, desc: "Movies"}
+      - {id: MUSIC, cat: Audio, desc: "Music"}
+      - {id: GAMES, cat: PC/Games, desc: "Games"}
+      - {id: SOFTWARE, cat: PC, desc: "Software"}
+      - {id: ANIME, cat: TV/Anime, desc: "Anime"}
+      - {id: EBOOKS, cat: Books/Ebook, desc: "Books"}
+      - {id: OTHER, cat: Other, desc: "Other"}
+      - {id: ADULT, cat: XXX, desc: "Adult"}
+      - {id: AUDIOBOOK, cat: Audio/Audiobook, desc: "Audiobook"}
+      - {id: IMAGES, cat: Other/Misc, desc: "Images"}
+      
+    modes:
+      search: [q]
+  
+  settings: []
+  
+  search:
+    path: "{{if .Keywords}}/all/torrents/{{ .Keywords }}.html{{else}}/fresh.html{{end}}"
+    keywordsfilters:
+      - name: tolower
+      - name: re_replace
+        args: ["[^a-zA-Z0-9]+", "-"]
+    rows:
+      selector: table > tbody > tr:has(td:has(div:has(a[href^="/torrent/"])))
+    fields:
+      title:
+        selector: td:nth-child(1) > div > a
+      details:
+        selector: td:nth-child(1) > div > a[href^="/torrent/"]
+        attribute: href
+      download:
+        selector: td:nth-child(1) > div > a[href^="/torrent/"]
+        attribute: href
+        filters:
+        - name: replace
+          args: ["/torrent/", "/tor/"]
+        - name: regexp
+          args: (^/tor/\d*)
+        - name: append
+          args: ".torrent"
+      date:
+        selector: td:nth-child(2)
+      size:
+        selector: td:nth-child(3)
+      seeders:
+        selector: td:nth-child(4)
+      leechers:
+        selector: td:nth-child(5)
+      category:
+        selector: span[class^="tv"]
+        attribute: class
+        case:
+          span.tv0: OTHER
+          span.tv1: MOVIES
+          span.tv2: MUSIC
+          span.tv3: TELEVISION
+          span.tv4: GAMES
+          span.tv5: SOFTWARE
+          span.tv6: ANIME
+          span.tv7: ADULT
+          span.tv8: EBOOKS
+          span.tv9: IMAGES
+          span.tv12: AUDIOBOOK
+      downloadvolumefactor:
+        text: "1"
+      uploadvolumefactor:
+        text: "1"

src/Jackett/Definitions/torrent9.yml

@@ -5,7 +5,7 @@
   type: public
   encoding: UTF-8
   links:
-    - http://www.torrent9.biz/
+    - http://www.torrent9.cc/
 
   caps:
     categorymappings:
@@ -28,8 +28,25 @@
     rows:
       selector: div.table-responsive > table tbody tr
     fields:
+      site_date:
+        selector: td:nth-child(1) a
+        filters:
+          # date is at the end of the title, so we get it and name it site_date
+          - name: regexp
+            args: "(\\w+)$"
       title:
         selector: td:nth-child(1) a
+        filters:
+          # now we put the date at the right place according scene naming rules using .Result.site_date
+          - name: replace
+            args: ["FRENCH", "{{ .Result.site_date }} FRENCH"]
+          - name: replace
+            args: ["TRUEFRENCH", "{{ .Result.site_date }} TRUEFRENCH"]
+          - name: replace
+            args: ["VOSTFR", "{{ .Result.site_date }} VOSTFR"] 
+          # and we delete it at the end
+          - name: re_replace
+            args: ["(\\w+)$", ""]
       details:
         selector: td:nth-child(1) a
         attribute: href
@@ -75,4 +92,4 @@
       downloadvolumefactor:
         text: "0"
       uploadvolumefactor:
-        text: "1"
+        text: "1"

src/Jackett/Definitions/torrentdownloads.yml

@@ -0,0 +1,61 @@
+---
+  site: torrentdownloads
+  name: Torrent Downloads
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    - https://www.torrentdownloads.me/
+
+  caps:
+    categorymappings:
+      - {id: 8, cat: TV, desc: "TV Shows"}
+      - {id: 4, cat: Movies, desc: "Movies"}
+      - {id: 5, cat: Audio, desc: "Music"}
+      - {id: 3, cat: PC/Games, desc: "Games"}
+      - {id: 7, cat: PC, desc: "Software"}
+      - {id: 1, cat: TV/Anime, desc: "Anime"}
+      - {id: 2, cat: Books, desc: "Books"}
+      - {id: 9, cat: Other, desc: "Other"}
+
+    modes:
+      search: [q]
+  
+  settings: []
+  
+  search:
+    path: "{{if .Keywords}}/search/{{else}}/today/{{end}}"
+    inputs:
+      $raw: "new=1&{{range .Categories}}s_cat={{.}}&{{end}}"
+      search: "{{ .Query.Keywords }}"
+    rows:
+      selector: div.inner_container > div:has(p:has(a[href^="/torrent/"]))
+    fields:
+      title:
+        selector: p:nth-child(1) > a
+      details:
+        selector: p:nth-child(1) > a[href^="/torrent/"]
+        attribute: href
+      download:
+        selector: p:nth-child(1) > a[href^="/torrent/"]
+        attribute: href
+        filters:
+        - name: replace
+          args: ["/torrent/", "/download/"]
+      size:
+        selector: span:nth-child(5)
+      seeders:
+        selector: span:nth-child(4)
+      leechers:
+        selector: span:nth-child(3)
+      category:
+        selector: img[src^="/templates/new/images/icons/menu_icon"]
+        attribute: src
+        filters:
+          - name: regexp
+            args: ([\d,]+)
+          - name: strdump
+      downloadvolumefactor:
+        text: "1"
+      uploadvolumefactor:
+        text: "1"

src/Jackett/Definitions/torrentproject.yml

@@ -52,9 +52,23 @@
       details:
         selector: span > a
         attribute: href
-      download:
+      magfile:
+        text: "{{ .Result.title }}"
+        filters:
+          - name: validfilename
+          - name: urlencode
+      magnet:
         selector: span > a
         attribute: href
+        filters:
+          - name: regexp
+            args: "/(\\w+)/"
+          - name: prepend
+            args: "magnet:?xt=urn:btih:"
+          - name: append
+            args: "&dn={{ .Result.magfile }}.torrent"
+          - name: append
+            args: "&tr=http://182.176.139.129:6969/announce&tr=http://explodie.org:6969/announce&tr=http://tracker.mgtracker.org:2710/announce&tr=udp://tracker.coppersurfer.tk:6969/announce&tr=udp://tracker.leechers-paradise.org:6969/announce&tr=udp://tracker.pirateparty.gr:6969/announce&tr=udp://tracker.sktorrent.net:6969/announce&tr=udp://tracker.zer0day.to:1337/announce"
       category|optional:
         selector: div > span:nth-child(1) > span
       date:

src/Jackett/Definitions/trancetraffic.yml

@@ -7,7 +7,7 @@
   links:
     - https://www.trancetraffic.com
   certificates:
-    - D40789207A75EA36B02E255BF7162C8DF9637750 # expired 13.03.2017
+    - 117B89D7C086F3E051F0A5A3576504667402AE52
 
   caps:
     categories:

src/Jackett/Definitions/waffles.yml

@@ -110,9 +110,6 @@
     test:
       path: index.php
 
-  download:
-    selector: a[href^="download.php?id="]
-        
   search:
     path: browse.php
     inputs:
@@ -130,11 +127,8 @@
       title:
         selector: td:nth-child(2)
       download:
-        selector: a[href^="/details.php?id="]
+        selector: a[href^="/download.php/"]
         attribute: href
-        filters:
-          - name: replace
-            args: ["/details.php?id=", "/download.php?id="]
       details:
         selector: a[href^="/details.php?id="]
         attribute: href

src/Jackett/Definitions/worldofp2p.yml

@@ -93,7 +93,7 @@
       searchin: "title"
 
     rows:
-      selector: table.browsewidth100 > tbody > tr:has(a[href^="download.php?torrent="])
+      selector: table > tbody > tr:has(a[href^="download.php?torrent="])
       filters:
         - name: andmatch
     fields:

src/Jackett/Definitions/xtremezone.yml

@@ -86,18 +86,23 @@
         selector: a[href^="dwn.php"]
         attribute: href
       size:
-        selector: td:nth-child(6)
+        selector: td:nth-child(7)
       date:
-        selector: td:nth-child(5)
+        selector: td:nth-child(6)
         filters:
           - name: append
             args: " +00:00"
           - name: dateparse
             args: "02-01-200615:04:05 -07:00"
-      seeders:
-        selector: td:nth-child(7)
-      leechers:
+      grabs:
         selector: td:nth-child(8)
+        filters:
+          - name: regexp
+            args: ([\d\.]+)
+      seeders:
+        selector: td:nth-child(9)
+      leechers:
+        selector: td:nth-child(10)
       banner:
         selector: a[onmouseover][href^="details.php?id="]
         attribute: onmouseover

src/Jackett/Definitions/yggtorrent.yml

@@ -0,0 +1,165 @@
+---
+  site: yggtorrent
+  name: YGGtorrent
+  language: fr-fr
+  type: semi-private
+  encoding: UTF-8
+  links:
+    - https://yggtorrent.com
+
+  caps:
+    categorymappings:
+      # Film/Video for search results
+      - {id: 2145, cat: Other, desc: "Movies & TV"}
+      - {id: 2178, cat: Movies, desc: "Anim Movies"}
+      - {id: 2179, cat: TV/Anime, desc: "Anim TV"}
+      - {id: 2180, cat: Other, desc: "Concerts"}
+      - {id: 2181, cat: TV/Documentary, desc: "Documentary"}
+      - {id: 2182, cat: TV, desc: "TV Shows"}
+      - {id: 2183, cat: Movies, desc: "Movies"}
+      - {id: 2184, cat: TV, desc: "TV"}
+      - {id: 2185, cat: TV/Other, desc: "Shows"}
+      - {id: 2186, cat: TV/Sport, desc: "Sport"}
+      - {id: 2187, cat: TV/Other, desc: "Clips"}
+      # Film/Video for blank search
+      - {id: "Tous les torrents", cat: Other, desc: "Movies & TV"}
+      - {id: "Animation", cat: Movies, desc: "Anim Movies"}
+      - {id: "Animation Série", cat: TV/Anime, desc: "Anim TV"}
+      - {id: "Concert", cat: Other, desc: "Concerts"}
+      - {id: "Documentaire", cat: TV/Documentary, desc: "Documentary"}
+      - {id: "Emission TV", cat: TV, desc: "TV Shows"}
+      - {id: "Film", cat: Movies, desc: "Movies"}
+      - {id: "Série TV", cat: TV, desc: "TV"}
+      - {id: "Spectacle", cat: TV/Other, desc: "Shows"}
+      - {id: "Sport", cat: TV/Sport, desc: "Sport"}
+      - {id: "Vidéo-clips", cat: TV/Other, desc: "Clips"}
+    modes:
+      search: [q]
+      #tv-search: [q, season, ep]
+  settings:
+    - name: username
+      type: text
+      label: Username (email or username)
+    - name: password
+      type: password
+      label: Password
+    - name: filter_title
+      type: checkbox
+      label: Try to normalize releases names by moving year after the title
+      default: false
+  login:
+    path: "/user/login"
+    method: post
+    inputs:
+      id: "{{ .Config.username }}"
+      pass: "{{ .Config.password }}"
+      submit: ""
+    headers:
+      "[:authority]": "yggtorrent.com"
+      "[:method]": "post"
+      "[:path]": "/"
+      "[:scheme]": "https"
+    error:
+      - selector: "body > div.page-content > div > div.col-md-10 > div > div > div > div > div.content-box-large.box-with-header > form > center > table > tbody > tr:nth-child(3) > td:nth-child(2) > button.text:contains('Se connecter')"
+    test:
+      path: "/"
+      selector: "a[href=\"https://yggtorrent.com/user/logout\"]"
+  search:
+    paths:
+      - path: "{{if .Keywords}}/engine/search?q={{ .Keywords}}{{else}}/torrents/2145-filmvideo{{end}}"
+      - path: "{{if .Keywords}}/engine/search?q={{ .Keywords}}&page=15{{else}}/torrents/2145-filmvideo?page=25{{end}}"
+      - path: "{{if .Keywords}}/engine/search?q={{ .Keywords}}&page=30{{else}}/torrents/2145-filmvideo?page=50{{end}}"
+    rows:
+      selector: "table.table.table-striped > tbody > tr"
+    fields:
+      site_date:
+        selector: "td:nth-child(3)"
+        filters:
+          - name: replace
+            args: ["il y a ", ""]
+          - name: replace
+            args: [ " jours", " days"]
+          - name: replace
+            args: [ " jour", " day"]
+          - name: replace
+            args: [ " heures", " hours"]
+          - name: replace
+            args: [ " heure", " hour"]
+          - name: replace
+            args: [ " semaines", " weeks"]
+          - name: replace
+            args: [ " semaine", " week"]
+          - name: replace
+            args: [ " mois", " month"]
+          - name: replace
+            args: [ " ans", " years"]
+          - name: replace
+            args: [ " an", " year"]
+          - name: append
+            args: " ago"
+      title_normal:
+        selector: "a.torrent-name"
+      title_filtered:
+        selector: "a.torrent-name"
+        filters:
+          - name: re_replace
+            args: ["(?i)^(?:(.+?)((?:[\\.\\-\\s_\\[]+(?:imax|(?:dvd|bd|tv)(?:rip|scr)|bluray(?:\\-?rip)?|720\\s*p?|1080\\s*p?|vof?|vost(?:fr)?|multi|vf(?:f|q)?[1-3]?|(?:true)?french|eng?)[\\.\\-\\s_\\]]*)*)([\\(\\[]?(?:20|1[7-9])\\d{2}[\\)\\]]?)(.*)$|(.*))$", "$1 $3 $2 $4 $5"]
+          - name: replace
+            args: [".", " "]
+          - name: trim
+          - name: re_replace
+            args: ["(?i)\\s(mkv|avi|divx|xvid|mp4)$", ""]
+          - name: re_replace
+            args: ["(\\s{2,5})", " "]
+          - name: trim
+      title:
+        text: "{{if .Config.filter_title }}{{ .Result.title_filtered }}{{else}}{{ .Result.title_normal }}{{end}}"
+      details:
+        selector: "a.torrent-name"
+        attribute: href
+      category:
+        selector: "td:nth-child(1) > span > i:last-child > a"
+      comments:
+        optional: true
+        selector: "td:nth-child(1) > a[href$=\"#comments\"]"
+        attribute: href
+      download:
+        selector: "td:nth-child(1) > a[href^=\"https://yggtorrent.com/engine/download_torrent?id=\"]"
+        attribute: href
+      size:
+        selector: "td:nth-child(4)"
+        filters:
+          - name: re_replace
+            args: [ "\\.(\\d) KB", "$1X00"]
+          - name: re_replace
+            args: [ " KB", "000"]
+          - name: re_replace
+            args: [ "\\.(\\d) MB", "$1X00000"]
+          - name: re_replace
+            args: [ " MB", "000000"]
+          - name: re_replace
+            args: [ "\\.(\\d) GB", "$1X00000000"]
+          - name: re_replace
+            args: [ " GB", "000000000"]
+          - name: re_replace
+            args: [ "\\.(\\d) TB", "$1X00000000000"]
+          - name: re_replace
+            args: [ " TB", "000000000000"]
+          - name: replace
+            args: [ "X", "" ]
+      seeders:
+        text: 0
+      seeders:
+        selector: "td:nth-child(5)"
+        optional: true
+      leechers:
+        text: 0
+      leechers:
+        selector: "td:nth-child(6)"
+        optional: true
+      date:
+        text: "{{ .Result.site_date }}"
+      downloadvolumefactor:
+        text: "1"
+      uploadvolumefactor:
+        text: "1"

src/Jackett/Definitions/zamundanet.yml

@@ -0,0 +1,87 @@
+---
+  site: zamundanet
+  name: Zamunda.net
+  language: bg-bg
+  type: private
+  encoding: windows-1251
+  links:
+    - http://zamunda.net/
+
+  caps:
+    categories:
+      7: TV/SD
+      33: TV/HD
+      25: TV/Other
+      5: Movies/HD
+      19: Movies/SD
+      46: Movies/3D
+      42: Movies/BluRay
+      20: Movies/DVD
+      9: XXX
+      49: XXX/Other
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  login:
+    path: /takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: td.embedded:has(h2:contains("failed"))
+    test:
+      path: /bananas
+
+  search:
+    path: /bananas
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      incldead: 1
+    rows:
+      selector: .responsetop > tbody > tr:has(td.td_newborder)
+    fields:
+      title:
+        selector: td:nth-child(2) > a:nth-child(1)
+      details:
+        selector: td:nth-child(2) > a:nth-child(1)
+        attribute: href
+      category:
+        selector: td:nth-child(1) > a
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      download:
+        selector: a:has(i.fa-download)
+        attribute: href
+      grabs:
+        selector: td:nth-child(7)
+        filters:
+          - name: regexp
+            args: (\d+)			
+      size:
+        selector: td:nth-child(6)
+      date:
+        selector: td:nth-child(5)
+        filters:
+          - name: regexp
+            args: ([12]\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[12]\d|3[01]))
+      seeders:
+        selector: td:nth-child(8)
+      leechers:
+        selector: td:nth-child(9)
+      banner:
+        selector: td:nth-child(2) > a:nth-child(1)
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: src=\\'([^\s\\]+)
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"

src/Jackett/Definitions/zelkaorg.yml

@@ -0,0 +1,93 @@
+---
+  site: zelkaorg
+  name: Zelka.org
+  language: bg-bg
+  type: private
+  encoding: windows-1251
+  links:
+    - http://zelka.org/
+    - http://zamunda.se/
+
+  caps:
+    categories:
+      7: TV/SD
+      33: TV/HD
+      25: TV/Other
+      5: Movies/HD
+      53: Movies/HD
+      35: Movies/WEBDL
+      19: Movies/SD
+      46: Movies/3D
+      42: Movies/BluRay
+      20: Movies/DVD
+      9: XXX
+      49: XXX/Other
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  login:
+    path: /takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: td.embedded:has(h2:contains("failed"))
+    test:
+      path: /browse.php
+
+  search:
+    path: /browse.php
+    inputs:
+      $raw: "{{range .Categories}}cat{{.}}=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      incldead: 1
+    rows:
+      selector: .test > tbody > tr:has(a[href^="browse.php"])
+    fields:
+      title:
+        selector: td:nth-child(2) > a:nth-child(1)
+      details:
+        selector: td:nth-child(2) > a:nth-child(1)
+        attribute: href
+      category:
+        selector: td:nth-child(1) > a
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      download:
+        selector: a:has(img[src^="http://img.zamunda.se/pic/download.gif"])
+        attribute: href
+      magnet:
+        selector: a:has(img[src^="http://img.zamunda.se/pic/magnet-icon-12w-12h.gif"])
+        attribute: href	  
+      grabs:
+        selector: td:nth-child(7)
+        filters:
+          - name: regexp
+            args: (\d+)			
+      size:
+        selector: td:nth-child(6)
+      date:
+        selector: td:nth-child(5)
+        filters:
+          - name: regexp
+            args: ([12]\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[12]\d|3[01]))
+      seeders:
+        selector: td:nth-child(8)
+      leechers:
+        selector: td:nth-child(9)
+      banner:
+        selector: td:nth-child(2) > a:nth-child(1)
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: src=([^\s]+)
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"

src/Jackett/Definitions/zetorrents.yml

@@ -0,0 +1,88 @@
+---
+  site: zetorrents
+  name: zetorrents
+  language: fr-fr
+  type: public
+  encoding: UTF-8
+  links:
+    - http://www.zetorrents.cc/
+
+  caps:
+    categorymappings:
+      - {id: films, cat: Movies, desc: "Movies"}
+      - {id: series, cat: TV, desc: "TV"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  settings: []
+
+  download:
+    selector: a[href^="/get_torrent/"]
+
+  search:
+    path: "/recherche/{{ .Query.Keywords }}"
+    rows:
+      selector: div.content-list-torrent > table tbody tr:has(a)
+    fields:
+      site_date:
+        selector: td:nth-child(1) a
+        filters:
+          # date is at the end of the title, so we get it and name it site_date
+          - name: regexp
+            args: "(\\w+)$"
+      title:
+        selector: td:nth-child(1) a
+        filters:
+          # now we put the date at the right place according scene naming rules using .Result.site_date
+          - name: replace
+            args: ["FRENCH", "{{ .Result.site_date }} FRENCH"]
+          - name: replace
+            args: ["TRUEFRENCH", "{{ .Result.site_date }} TRUEFRENCH"]
+          - name: replace
+            args: ["VOSTFR", "{{ .Result.site_date }} VOSTFR"]
+          # and we delete it at the end
+          - name: re_replace
+            args: ["(\\w+)$", ""]
+      details:
+        selector: td:nth-child(1) a
+        attribute: href
+      download:
+        selector: td:nth-child(1) a
+        attribute: href
+      size:
+        selector: td:nth-child(2)
+        filters:
+          - name: re_replace
+            args: [ "\\.(\\d) Ko", "$1X00"]
+          - name: re_replace
+            args: [ " Ko", "000"]
+          - name: re_replace
+            args: [ "\\.(\\d) Mo", "$1X00000"]
+          - name: re_replace
+            args: [ " Mo", "000000"]
+          - name: re_replace
+            args: [ "\\.(\\d) Go", "$1X00000000"]
+          - name: re_replace
+            args: [ " Go", "000000000"]
+          - name: re_replace
+            args: [ "\\.(\\d) To", "$1X00000000000"]
+          - name: re_replace
+            args: [ " To", "000000000000"]
+          - name: replace
+            args: [ "X", "" ]
+      seeders:
+        text: 0
+      seeders:
+        selector: td:nth-child(3)
+        optional: true
+      leechers:
+        text: 0
+      leechers:
+        selector: td:nth-child(4)
+        optional: true
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"

src/Jackett/Engine.cs

@@ -10,6 +10,8 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Web.Http.Dependencies;
+using Autofac.Integration.WebApi;
 
 namespace Jackett
 {
@@ -37,9 +39,9 @@ namespace Jackett
 
         }
 
-        public static IContainer GetContainer()
+        public static IDependencyResolver DependencyResolver()
         {
-            return container;
+            return new AutofacWebApiDependencyResolver(container);
         }
 
         public static bool IsWindows

src/Jackett/IndexerException.cs

@@ -0,0 +1,30 @@
+using Jackett.Indexers;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Jackett
+{
+    class IndexerException : Exception
+    {
+        public IIndexer Indexer { get; protected set; }
+
+        public IndexerException(IIndexer Indexer, string message, Exception innerException)
+            : base(message, innerException)
+        {
+            this.Indexer = Indexer;
+        }
+
+        public IndexerException(IIndexer Indexer, string message)
+            : this(Indexer, message, null)
+        {
+        }
+
+        public IndexerException(IIndexer Indexer, Exception innerException)
+            : this(Indexer, "Exception (" + Indexer.ID + "): " + innerException.Message, innerException)
+        {
+        }
+    }
+}

src/Jackett/Indexers/7tor.cs

@@ -18,7 +18,7 @@ using System.Web;
 
 namespace Jackett.Indexers
 {
-    public class SevenTor : BaseIndexer, IIndexer
+    public class SevenTor : BaseWebIndexer
     {
         string LoginUrl { get { return SiteLink + "ucp.php?mode=login"; } }
         string SearchUrl { get { return SiteLink + "search.php"; } }
@@ -29,12 +29,12 @@ namespace Jackett.Indexers
             set { base.configData = value; }
         }
 
-        public SevenTor(IIndexerManagerService i, IWebClient wc, Logger l, IProtectionService ps)
+        public SevenTor(IIndexerConfigurationService configService, IWebClient wc, Logger l, IProtectionService ps)
             : base(name: "7tor",
                    description: null,
                    link: "https://7tor.org/",
                    caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
-                   manager: i,
+                   configService: configService,
                    client: wc,
                    logger: l,
                    p: ps,
@@ -1584,7 +1584,7 @@ namespace Jackett.Indexers
             AddCategoryMapping(1569, TorznabCatType.Other, "   Amateur videos");
         }
 
-        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        public override async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
         {
             LoadValuesFromJson(configJson);
 
@@ -1606,7 +1606,7 @@ namespace Jackett.Indexers
             return IndexerConfigurationStatus.RequiresTesting;
         }
 
-        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
             var searchString = query.GetQueryString();

src/Jackett/Indexers/Abnormal.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text;
@@ -22,7 +23,7 @@ namespace Jackett.Indexers
     /// <summary>
     /// Provider for Abnormal Private French Tracker
     /// </summary>
-    public class Abnormal : BaseIndexer, IIndexer
+    public class Abnormal : BaseCachingWebIndexer
     {
         private string LoginUrl { get { return SiteLink + "login.php"; } }
         private string SearchUrl { get { return SiteLink + "torrents.php"; } }
@@ -32,7 +33,7 @@ namespace Jackett.Indexers
         private bool Latency { get { return ConfigData.Latency.Value; } }
         private bool DevMode { get { return ConfigData.DevMode.Value; } }
         private bool CacheMode { get { return ConfigData.HardDriveCache.Value; } }
-        private string directory { get { return System.IO.Path.GetTempPath() + "Jackett\\" + MethodBase.GetCurrentMethod().DeclaringType.Name + "\\"; } }
+        private static string Directory => Path.Combine(Path.GetTempPath(), Assembly.GetExecutingAssembly().GetName().Name.ToLower(), MethodBase.GetCurrentMethod().DeclaringType?.Name.ToLower());
 
         private Dictionary<string, string> emulatedBrowserHeaders = new Dictionary<string, string>();
         private CQ fDom = null;
@@ -43,13 +44,13 @@ namespace Jackett.Indexers
             set { base.configData = value; }
         }
 
-        public Abnormal(IIndexerManagerService i, IWebClient w, Logger l, IProtectionService ps)
+        public Abnormal(IIndexerConfigurationService configService, IWebClient w, Logger l, IProtectionService ps)
             : base(
                 name: "Abnormal",
                 description: "General French Private Tracker",
                 link: "https://abnormal.ws/",
                 caps: new TorznabCapabilities(),
-                manager: i,
+                configService: configService,
                 client: w,
                 logger: l,
                 p: ps,
@@ -104,7 +105,7 @@ namespace Jackett.Indexers
         /// </summary>
         /// <param name="configJson">Our params in Json</param>
         /// <returns>Configuration state</returns>
-        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        public override async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
         {
             // Retrieve config values set by Jackett's user
             LoadValuesFromJson(configJson);
@@ -117,7 +118,8 @@ namespace Jackett.Indexers
             // emulatedBrowserHeaders.Add("Accept-Encoding", "gzip, deflate");
 
             // If we want to simulate a browser
-            if (ConfigData.Browser.Value) {
+            if (ConfigData.Browser.Value)
+            {
 
                 // Clean headers
                 emulatedBrowserHeaders.Clear();
@@ -149,7 +151,8 @@ namespace Jackett.Indexers
             };
 
             // Do the login
-            var request = new Utils.Clients.WebRequest(){
+            var request = new Utils.Clients.WebRequest()
+            {
                 PostData = pairs,
                 Referer = LoginUrl,
                 Type = RequestType.POST,
@@ -187,7 +190,7 @@ namespace Jackett.Indexers
         /// </summary>
         /// <param name="query">Query</param>
         /// <returns>Releases</returns>
-        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
             var torrentRowList = new List<CQ>();
@@ -197,7 +200,7 @@ namespace Jackett.Indexers
             int pageLinkCount = 0;
 
             // Check cache first so we don't query the server (if search term used or not in dev mode)
-            if(!DevMode && !string.IsNullOrEmpty(searchTerm))
+            if (!DevMode && !string.IsNullOrEmpty(searchTerm))
             {
                 lock (cache)
                 {
@@ -215,8 +218,7 @@ namespace Jackett.Indexers
             var request = buildQuery(searchTerm, query, searchUrl);
 
             // Getting results & Store content
-            WebClientStringResult results = await queryExec(request);
-            fDom = results.Content;
+            fDom = await queryExec(request);
 
             try
             {
@@ -230,14 +232,16 @@ namespace Jackett.Indexers
                 Boolean pagination = (fDom[".linkbox > a"].Length != 0);
 
                 // If pagination available
-                if (pagination) {
+                if (pagination)
+                {
                     // Calculate numbers of pages available for this search query (Based on number results and number of torrents on first page)
                     pageLinkCount = ParseUtil.CoerceInt(Regex.Match(fDom[".linkbox > a"].Last().Attr("href").ToString(), @"\d+").Value);
 
                     // Calculate average number of results (based on torrents rows lenght on first page)
                     nbResults = firstPageRows.Count() * pageLinkCount;
                 }
-                else {
+                else
+                {
                     // Check if we have a minimum of one result
                     if (firstPageRows.Length >= 1)
                     {
@@ -270,10 +274,7 @@ namespace Jackett.Indexers
                         var pageRequest = buildQuery(searchTerm, query, searchUrl, i);
 
                         // Getting results & Store content
-                        WebClientStringResult pageResults = await queryExec(pageRequest);
-
-                        // Assign response
-                        fDom = pageResults.Content;
+                        fDom = await queryExec(pageRequest);
 
                         // Process page results
                         var additionalPageRows = findTorrentRows();
@@ -282,20 +283,6 @@ namespace Jackett.Indexers
                         torrentRowList.AddRange(additionalPageRows.Select(fRow => fRow.Cq()));
                     }
                 }
-                else
-                {
-                    // No search term, maybe testing... so registring autkey and torrentpass for future uses
-                    string infosData = firstPageRows.First().Find("td:eq(3) > a").Attr("href");
-                    IList<string> infosList = infosData.Split('&').Select(s => s.Trim()).Where(s => s != String.Empty).ToList();
-                    IList<string> infosTracker = infosList.Select(s => s.Split(new[] { '=' }, 2)[1].Trim()).ToList();
-
-                    output("\nStoring Authkey for future uses...");
-                    ConfigData.AuthKey.Value = infosTracker[2];
-
-                    output("\nStoring TorrentPass for future uses...");
-                    ConfigData.TorrentPass.Value = infosTracker[3];
-
-                }
 
                 // Loop on results
                 foreach (CQ tRow in torrentRowList)
@@ -307,12 +294,13 @@ namespace Jackett.Indexers
                     output("ID: " + id);
 
                     // Release Name
-                    string name = tRow.Find("td:eq(1) > a").Text().ToString();
+                    string name = tRow.Find("td:eq(1) > a").Text();
                     output("Release: " + name);
 
                     // Category
                     string categoryID = tRow.Find("td:eq(0) > a").Attr("href").Replace("torrents.php?cat[]=", String.Empty);
-                    output("Category: " + MapTrackerCatToNewznab(categoryID) + " (" + categoryID + ")");
+                    var newznab = MapTrackerCatToNewznab(categoryID);
+                    output("Category: " + MapTrackerCatToNewznab(categoryID).First().ToString() + " (" + categoryID + ")");
 
                     // Seeders
                     int seeders = ParseUtil.CoerceInt(Regex.Match(tRow.Find("td:eq(5)").Text(), @"\d+").Value);
@@ -345,30 +333,46 @@ namespace Jackett.Indexers
                     output("Comments Link: " + commentsLink.AbsoluteUri);
 
                     // Torrent Download URL
-                    Uri downloadLink = new Uri(TorrentDownloadUrl.Replace("{id}", id.ToString()).Replace("{auth_key}", ConfigData.AuthKey.Value).Replace("{torrent_pass}", ConfigData.TorrentPass.Value));
-                    output("Download Link: " + downloadLink.AbsoluteUri);
+                    Uri downloadLink = null;
+                    string link = tRow.Find("td:eq(3) > a").Attr("href");
+                    if (!String.IsNullOrEmpty(link))
+                    {
+                        // Download link available
+                        downloadLink = new Uri(SiteLink + link);
+                        output("Download Link: " + downloadLink.AbsoluteUri);
+                    }
+                    else
+                    {
+                        // No download link available -- Must be on pending ( can't be downloaded now...)
+                        output("Download Link: Not available, torrent pending ? Skipping ...");
+                        continue;
+                    }
+
+                    // Freeleech
+                    int downloadVolumeFactor = 1;
+                    if (tRow.Find("img[alt=\"Freeleech\"]").Length >= 1)
+                    {
+                        downloadVolumeFactor = 0;
+                        output("FreeLeech =)");
+                    }
 
                     // Building release infos
-                    var release = new ReleaseInfo();
-                    release.Category = MapTrackerCatToNewznab(categoryID.ToString());
-                    release.Title = name;
-                    release.Seeders = seeders;
-                    release.Peers = seeders + leechers;
-                    release.MinimumRatio = 1;
-                    release.MinimumSeedTime = 172800;
-                    release.PublishDate = date;
-                    release.Size = size;
-                    release.Guid = detailsLink;
-                    release.Comments = commentsLink;
-                    release.Link = downloadLink;
-
-                    // freeleech
-                    if (tRow.Find("img[alt=\"Freeleech\"]").Length >= 1)
-                        release.DownloadVolumeFactor = 0;
-                    else
-                        release.DownloadVolumeFactor = 1;
-                    release.UploadVolumeFactor = 1;
-
+                    var release = new ReleaseInfo()
+                    {
+                        Category = MapTrackerCatToNewznab(categoryID.ToString()),
+                        Title = name,
+                        Seeders = seeders,
+                        Peers = seeders + leechers,
+                        MinimumRatio = 1,
+                        MinimumSeedTime = 172800,
+                        PublishDate = date,
+                        Size = size,
+                        Guid = detailsLink,
+                        Comments = commentsLink,
+                        Link = downloadLink,
+                        UploadVolumeFactor = 1,
+                        DownloadVolumeFactor = downloadVolumeFactor
+                    };
                     releases.Add(release);
                 }
 
@@ -446,9 +450,9 @@ namespace Jackett.Indexers
         /// </summary>
         /// <param name="request">URL created by Query Builder</param>
         /// <returns>Results from query</returns>
-        private async Task<WebClientStringResult> queryExec(string request)
+        private async Task<String> queryExec(string request)
         {
-            WebClientStringResult results = null;
+            String results = null;
 
             // Switch in we are in DEV mode with Hard Drive Cache or not
             if (DevMode && CacheMode)
@@ -469,25 +473,40 @@ namespace Jackett.Indexers
         /// </summary>
         /// <param name="request">URL created by Query Builder</param>
         /// <returns>Results from query</returns>
-        private async Task<WebClientStringResult> queryCache(string request)
+        private async Task<String> queryCache(string request)
         {
-            WebClientStringResult results = null;
+            String results;
 
             // Create Directory if not exist
-            System.IO.Directory.CreateDirectory(directory);
+            System.IO.Directory.CreateDirectory(Directory);
 
             // Clean Storage Provider Directory from outdated cached queries
             cleanCacheStorage();
 
+            // File Name
+            string fileName = StringUtil.HashSHA1(request) + ".json";
+
             // Create fingerprint for request
-            string file = directory + request.GetHashCode() + ".json";
+            string file = Path.Combine(Directory, fileName);
 
             // Checking modes states
-            if (System.IO.File.Exists(file))
+            if (File.Exists(file))
             {
                 // File exist... loading it right now !
-                output("Loading results from hard drive cache ..." + request.GetHashCode() + ".json");
-                results = JsonConvert.DeserializeObject<WebClientStringResult>(System.IO.File.ReadAllText(file));
+                output("Loading results from hard drive cache ..." + fileName);
+                try
+                {
+                    using (StreamReader fileReader = File.OpenText(file))
+                    {
+                        JsonSerializer serializer = new JsonSerializer();
+                        results = (String)serializer.Deserialize(fileReader, typeof(String));
+                    }
+                }
+                catch (Exception e)
+                {
+                    output("Error loading cached results ! " + e.Message, "error");
+                    results = null;
+                }
             }
             else
             {
@@ -495,8 +514,12 @@ namespace Jackett.Indexers
                 results = await queryTracker(request);
 
                 // Cached file didn't exist for our query, writing it right now !
-                output("Writing results to hard drive cache ..." + request.GetHashCode() + ".json");
-                System.IO.File.WriteAllText(file, JsonConvert.SerializeObject(results));
+                output("Writing results to hard drive cache ..." + fileName);
+                using (StreamWriter fileWriter = File.CreateText(file))
+                {
+                    JsonSerializer serializer = new JsonSerializer();
+                    serializer.Serialize(fileWriter, results);
+                }
             }
             return results;
         }
@@ -506,7 +529,7 @@ namespace Jackett.Indexers
         /// </summary>
         /// <param name="request">URL created by Query Builder</param>
         /// <returns>Results from query</returns>
-        private async Task<WebClientStringResult> queryTracker(string request)
+        private async Task<String> queryTracker(string request)
         {
             WebClientStringResult results = null;
 
@@ -518,26 +541,26 @@ namespace Jackett.Indexers
             results = await RequestStringWithCookiesAndRetry(request, null, null, emulatedBrowserHeaders);
 
             // Return results from tracker
-            return results;
+            return results.Content;
         }
 
         /// <summary>
         /// Clean Hard Drive Cache Storage
         /// </summary>
         /// <param name="force">Force Provider Folder deletion</param>
-        private void cleanCacheStorage(Boolean force = false)
+        private void cleanCacheStorage(bool force = false)
         {
             // Check cleaning method
-            if(force)
+            if (force)
             {
                 // Deleting Provider Storage folder and all files recursively
                 output("\nDeleting Provider Storage folder and all files recursively ...");
-                
+
                 // Check if directory exist
-                if(System.IO.Directory.Exists(directory))
+                if (System.IO.Directory.Exists(Directory))
                 {
                     // Delete storage directory of provider
-                    System.IO.Directory.Delete(directory, true);
+                    System.IO.Directory.Delete(Directory, true);
                     output("-> Storage folder deleted successfully.");
                 }
                 else
@@ -548,24 +571,27 @@ namespace Jackett.Indexers
             }
             else
             {
-                int i = 0;
+                var i = 0;
                 // Check if there is file older than ... and delete them
                 output("\nCleaning Provider Storage folder... in progress.");
-                System.IO.Directory.GetFiles(directory)
-                .Select(f => new System.IO.FileInfo(f))
+                System.IO.Directory.GetFiles(Directory)
+                .Select(f => new FileInfo(f))
                 .Where(f => f.LastAccessTime < DateTime.Now.AddMilliseconds(-Convert.ToInt32(ConfigData.HardDriveCacheKeepTime.Value)))
                 .ToList()
-                .ForEach(f => {
+                .ForEach(f =>
+                {
                     output("Deleting cached file << " + f.Name + " >> ... done.");
                     f.Delete();
                     i++;
-                    });
+                });
 
                 // Inform on what was cleaned during process
-                if(i > 0) {
+                if (i > 0)
+                {
                     output("-> Deleted " + i + " cached files during cleaning.");
                 }
-                else {
+                else
+                {
                     output("-> Nothing deleted during cleaning.");
                 }
             }
@@ -577,7 +603,7 @@ namespace Jackett.Indexers
         private void latencyNow()
         {
             // Need latency ?
-            if(Latency)
+            if (Latency)
             {
                 // Generate a random value in our range
                 var random = new Random(DateTime.Now.Millisecond);
@@ -696,7 +722,7 @@ namespace Jackett.Indexers
         private void output(string message, string level = "debug")
         {
             // Check if we are in dev mode
-            if(DevMode)
+            if (DevMode)
             {
                 // Output message to console
                 Console.WriteLine(message);

src/Jackett/Indexers/Abstract/AvistazTracker.cs

@@ -18,7 +18,7 @@ using Jackett.Models.IndexerConfig;
 
 namespace Jackett.Indexers
 {
-    public abstract class AvistazTracker : BaseIndexer
+    public abstract class AvistazTracker : BaseWebIndexer
     {
         private string LoginUrl { get { return SiteLink + "auth/login"; } }
         private string SearchUrl { get { return SiteLink + "torrents?in=1&type={0}&search={1}"; } }
@@ -29,12 +29,12 @@ namespace Jackett.Indexers
             set { base.configData = value; }
         }
 
-        public AvistazTracker(IIndexerManagerService indexerManager, IWebClient webClient, Logger logger, IProtectionService protectionService, string name, string desc, string link)
+        public AvistazTracker(IIndexerConfigurationService configService, IWebClient webClient, Logger logger, IProtectionService protectionService, string name, string desc, string link)
             : base(name: name,
                 description: desc,
                 link: link,
                 caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
-                manager: indexerManager,
+                configService: configService,
                 client: webClient,
                 logger: logger,
                 p: protectionService,
@@ -51,7 +51,7 @@ namespace Jackett.Indexers
             AddCategoryMapping(3, TorznabCatType.Audio);
         }
 
-        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        public override async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
         {
             LoadValuesFromJson(configJson);
             var loginPage = await RequestStringWithCookies(LoginUrl, string.Empty);
@@ -75,7 +75,7 @@ namespace Jackett.Indexers
             return IndexerConfigurationStatus.RequiresTesting;
         }
 
-        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
 

src/Jackett/Indexers/Abstract/GazelleTracker.cs

@@ -17,7 +17,7 @@ using System.Web;
 
 namespace Jackett.Indexers.Abstract
 {
-    public abstract class GazelleTracker : BaseIndexer
+    public abstract class GazelleTracker : BaseWebIndexer
     {
         protected string LoginUrl { get { return SiteLink + "login.php"; } }
         protected string APIUrl { get { return SiteLink + "ajax.php"; } }
@@ -30,12 +30,12 @@ namespace Jackett.Indexers.Abstract
             set { base.configData = value; }
         }
 
-        public GazelleTracker(IIndexerManagerService indexerManager, IWebClient webClient, Logger logger, IProtectionService protectionService, string name, string desc, string link)
+        public GazelleTracker(IIndexerConfigurationService configService, IWebClient webClient, Logger logger, IProtectionService protectionService, string name, string desc, string link)
             : base(name: name,
                 description: desc,
                 link: link,
                 caps: new TorznabCapabilities(),
-                manager: indexerManager,
+                configService: configService,
                 client: webClient,
                 logger: logger,
                 p: protectionService,
@@ -44,7 +44,7 @@ namespace Jackett.Indexers.Abstract
             Encoding = Encoding.GetEncoding("UTF-8");
         }
 
-        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        public override async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
         {
             LoadValuesFromJson(configJson);
             var pairs = new Dictionary<string, string> {
@@ -68,7 +68,7 @@ namespace Jackett.Indexers.Abstract
             return IndexerConfigurationStatus.RequiresTesting;
         }
 
-        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
             var searchString = query.GetQueryString();
@@ -126,9 +126,9 @@ namespace Jackett.Indexers.Abstract
                     if (!string.IsNullOrEmpty(artist))
                         release.Title += artist + " - ";
                     release.Title += groupName;
-                    if (!string.IsNullOrEmpty(groupYear))
+                    if (!string.IsNullOrEmpty(groupYear) && groupYear != "0")
                         release.Title += " [" + groupYear + "]";
-                    if (!string.IsNullOrEmpty(releaseType))
+                    if (!string.IsNullOrEmpty(releaseType) && releaseType != "Unknown")
                         release.Title += " [" + releaseType + "]";
 
                     release.Description = "";
@@ -180,7 +180,7 @@ namespace Jackett.Indexers.Abstract
 
             var format = (string)torrent["format"];
             if (!string.IsNullOrEmpty(format))
-                flags.Add(format);
+                flags.Add(HttpUtility.HtmlDecode(format));
 
             var encoding = (string)torrent["encoding"];
             if (!string.IsNullOrEmpty(encoding))
@@ -228,7 +228,8 @@ namespace Jackett.Indexers.Abstract
             {
                 release.DownloadVolumeFactor = 0;
             }
-            if ((bool)torrent["isPersonalFreeleech"])
+            var isPersonalFreeleech = (bool?)torrent["isPersonalFreeleech"];
+            if (isPersonalFreeleech != null && isPersonalFreeleech == true)
             {
                 release.DownloadVolumeFactor = 0;
             }

src/Jackett/Indexers/AlphaRatio.cs

@@ -19,19 +19,19 @@ using System.Collections.Specialized;
 
 namespace Jackett.Indexers
 {
-    public class AlphaRatio : BaseIndexer, IIndexer
+    public class AlphaRatio : BaseWebIndexer
     {
         private string LoginUrl { get { return SiteLink + "login.php"; } }
         private string SearchUrl { get { return SiteLink + "ajax.php?action=browse&order_by=time&order_way=desc&"; } }
         private string DownloadUrl { get { return SiteLink + "torrents.php?action=download&id="; } }
         private string GuidUrl { get { return SiteLink + "torrents.php?torrentid="; } }
 
-        public AlphaRatio(IIndexerManagerService i, IWebClient w, Logger l, IProtectionService ps)
+        public AlphaRatio(IIndexerConfigurationService configService, IWebClient w, Logger l, IProtectionService ps)
             : base(name: "AlphaRatio",
                 description: "Legendary",
                 link: "https://alpharatio.cc/",
                 caps: new TorznabCapabilities(),
-                manager: i,
+                configService: configService,
                 client: w,
                 logger: l,
                 p: ps,
@@ -71,7 +71,7 @@ namespace Jackett.Indexers
             set { base.configData = value; }
         }
 
-        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        public override async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
         {
             LoadValuesFromJson(configJson);
             var pairs = new Dictionary<string, string> {
@@ -123,7 +123,7 @@ namespace Jackett.Indexers
 
         }
 
-        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
             var searchString = query.GetQueryString();

src/Jackett/Indexers/Andraste.cs

@@ -16,7 +16,7 @@ using System.Linq;
 
 namespace Jackett.Indexers
 {
-    public class Andraste : BaseIndexer, IIndexer
+    public class Andraste : BaseWebIndexer
     {
         string LoginUrl { get { return SiteLink + "takelogin.php"; } }
         string BrowseUrl { get { return SiteLink + "browse.php"; } }
@@ -27,12 +27,12 @@ namespace Jackett.Indexers
             set { base.configData = value; }
         }
 
-        public Andraste(IIndexerManagerService i, IWebClient wc, Logger l, IProtectionService ps)
+        public Andraste(IIndexerConfigurationService configService, IWebClient wc, Logger l, IProtectionService ps)
             : base(name: "Andraste",
                    description: "A German general tracker.",
                    link: "https://andraste.io/",
                    caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
-                   manager: i,
+                   configService: configService,
                    client: wc,
                    logger: l,
                    p: ps,
@@ -74,7 +74,7 @@ namespace Jackett.Indexers
             AddCategoryMapping(32, TorznabCatType.XXX); // XXX
         }
 
-        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        public override async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
         {
             LoadValuesFromJson(configJson);
 
@@ -95,7 +95,7 @@ namespace Jackett.Indexers
             return IndexerConfigurationStatus.RequiresTesting;
         }
 
-        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        protected override 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);

src/Jackett/Indexers/AnimeBytes.cs

@@ -22,7 +22,7 @@ using System.Web;
 
 namespace Jackett.Indexers
 {
-    public class AnimeBytes : BaseIndexer, IIndexer
+    public class AnimeBytes : BaseCachingWebIndexer
     {
         enum SearchType
         {
@@ -34,7 +34,7 @@ namespace Jackett.Indexers
         private string SearchUrl { get { return SiteLink + "torrents.php?"; } }
         private string MusicSearchUrl { get { return SiteLink + "torrents2.php?"; } }
         public bool AllowRaws { get { return configData.IncludeRaw.Value; } }
-        public bool InsertSeason { get { return configData.InsertSeason!=null && configData.InsertSeason.Value; } }
+        public bool InsertSeason { get { return configData.InsertSeason != null && configData.InsertSeason.Value; } }
 
         new ConfigurationDataAnimeBytes configData
         {
@@ -42,11 +42,11 @@ namespace Jackett.Indexers
             set { base.configData = value; }
         }
 
-        public AnimeBytes(IIndexerManagerService i, IWebClient client, Logger l, IProtectionService ps)
+        public AnimeBytes(IIndexerConfigurationService configService, IWebClient client, Logger l, IProtectionService ps)
             : base(name: "AnimeBytes",
                 link: "https://animebytes.tv/",
                 description: "Powered by Tentacles",
-                manager: i,
+                configService: configService,
                 client: client,
                 caps: new TorznabCapabilities(TorznabCatType.TVAnime,
                                               TorznabCatType.Movies,
@@ -64,16 +64,18 @@ namespace Jackett.Indexers
             Encoding = Encoding.GetEncoding("UTF-8");
             Language = "en-us";
             Type = "private";
+
+            webclient.EmulateBrowser = false; // Animebytes doesn't like fake user agents (issue #1535)
         }
 
 
-        public override IEnumerable<ReleaseInfo> FilterResults(TorznabQuery query, IEnumerable<ReleaseInfo> input)
+        protected override IEnumerable<ReleaseInfo> FilterResults(TorznabQuery query, IEnumerable<ReleaseInfo> input)
         {
             // Prevent filtering
             return input;
         }
 
-        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        public override async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
         {
             LoadValuesFromJson(configJson);
 
@@ -86,7 +88,7 @@ namespace Jackett.Indexers
             var loginPage = await webclient.GetString(new Utils.Clients.WebRequest()
             {
                 Url = LoginUrl,
-                Encoding = Encoding
+                Encoding = Encoding,
             });
 
             CQ loginPageDom = loginPage.Content;
@@ -112,7 +114,7 @@ namespace Jackett.Indexers
                 Referer = LoginUrl,
                 Type = RequestType.POST,
                 Encoding = Encoding,
-                Url = LoginUrl
+                Url = LoginUrl,
             };
             var response = await RequestLoginAndFollowRedirect(LoginUrl, pairs, loginPage.Cookies, true, null);
 
@@ -128,21 +130,6 @@ namespace Jackett.Indexers
             return IndexerConfigurationStatus.RequiresTesting;
         }
 
-        // Override to load legacy config format
-        public override void LoadFromSavedConfiguration(JToken jsonConfig)
-        {
-            if (jsonConfig is JObject)
-            {
-                configData.CookieHeader.Value = jsonConfig.Value<string>("cookies");
-                configData.IncludeRaw.Value = jsonConfig.Value<bool>("raws");
-                IsConfigured = true;
-                SaveConfig();
-                return;
-            }
-
-            base.LoadFromSavedConfiguration(jsonConfig);
-        }
-
         private string StripEpisodeNumber(string term)
         {
             // Tracer does not support searching with episode number so strip it if we have one
@@ -151,11 +138,11 @@ namespace Jackett.Indexers
             return term;
         }
 
-        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             // The result list
             var releases = new List<ReleaseInfo>();
-            
+
             if (ContainsMusicCategories(query.Categories))
             {
                 foreach (var result in await GetResults(SearchType.Audio, query.SanitizedSearchTerm))
@@ -210,7 +197,7 @@ namespace Jackett.Indexers
                 if (cachedResult != null)
                     return cachedResult.Results.Select(s => (ReleaseInfo)s.Clone()).ToArray();
             }
-            
+
             // Get the content from the tracker
             var response = await RequestStringWithCookiesAndRetry(queryUrl);
             if (response.IsRedirect)
@@ -302,7 +289,7 @@ namespace Jackett.Indexers
                                 releaseInfo = releaseInfo.Replace("Season ", "S");
                                 releaseInfo = releaseInfo.Trim();
                                 int test = 0;
-                                if (InsertSeason && int.TryParse(releaseInfo, out test) && releaseInfo.Length<=3)
+                                if (InsertSeason && int.TryParse(releaseInfo, out test) && releaseInfo.Length <= 3)
                                 {
                                     releaseInfo = "E0" + releaseInfo;
                                 }

src/Jackett/Indexers/AnimeTorrents.cs

@@ -20,7 +20,7 @@ using System.Globalization;
 
 namespace Jackett.Indexers
 {
-    public class AnimeTorrents : BaseIndexer, IIndexer
+    public class AnimeTorrents : BaseWebIndexer
     {
         private string LoginUrl { get { return SiteLink + "login.php"; } }
         private string SearchUrl { get { return SiteLink + "ajax/torrents_data.php"; } }
@@ -32,13 +32,13 @@ namespace Jackett.Indexers
             set { base.configData = value; }
         }
 
-        public AnimeTorrents(IIndexerManagerService i, HttpWebClient c, Logger l, IProtectionService ps)
+        public AnimeTorrents(IIndexerConfigurationService configService, IWebClient c, Logger l, IProtectionService ps)
             : base(name: "AnimeTorrents",
                 description: "Definitive source for anime and manga",
                 link: "https://animetorrents.me/",
                 caps: new TorznabCapabilities(),
-                manager: i,
-                client: c, // Forced HTTP client for custom headers
+                configService: configService,
+                client: c,
                 logger: l,
                 p: ps,
                 configData: new ConfigurationDataBasicLogin())
@@ -68,7 +68,7 @@ namespace Jackett.Indexers
             AddCategoryMapping(19, TorznabCatType.Audio); // OST
         }
 
-        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        public override async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
         {
             LoadValuesFromJson(configJson);
             var pairs = new Dictionary<string, string> {
@@ -91,7 +91,7 @@ namespace Jackett.Indexers
             return IndexerConfigurationStatus.RequiresTesting;
         }
 
-        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
             var searchString = query.GetQueryString();

src/Jackett/Indexers/ArcheTorrent.cs

@@ -5,11 +5,9 @@ using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-
 using AngleSharp.Parser.Html;
 using Newtonsoft.Json.Linq;
 using NLog;
-
 using Jackett.Models;
 using Jackett.Models.IndexerConfig;
 using Jackett.Services;
@@ -18,7 +16,7 @@ using Jackett.Utils.Clients;
 
 namespace Jackett.Indexers
 {
-    class ArcheTorrent : BaseIndexer, IIndexer
+    class ArcheTorrent : BaseWebIndexer
     {
         string LoginUrl { get { return SiteLink + "account-login.php"; } }
         string BrowseUrl { get { return SiteLink + "torrents-search.php"; } }
@@ -30,11 +28,11 @@ namespace Jackett.Indexers
             set { base.configData = value; }
         }
 
-        public ArcheTorrent(IIndexerManagerService indexerManager, IWebClient webClient, Logger logger, IProtectionService protectionService)
+        public ArcheTorrent(IIndexerConfigurationService configService, IWebClient webClient, Logger logger, IProtectionService protectionService)
             : base(name: "Arche Torrent",
                 description: "French Torrent Tracker",
                 link: "https://www.archetorrent.com/",
-                manager: indexerManager,
+                configService: configService,
                 logger: logger,
                 p: protectionService,
                 client: webClient,
@@ -81,10 +79,7 @@ namespace Jackett.Indexers
             AddCategoryMapping (14, TorznabCatType.ConsoleXbox360, "Jeux: Xbox360");
             AddCategoryMapping (44, TorznabCatType.ConsoleWii, "Jeux: Wii");
             AddCategoryMapping (45, TorznabCatType.ConsoleNDS, "Jeux: DS");
-            AddCategoryMapping (71, TorznabCatType.AudioMP3, "Musique: TAT Music Release");
-            AddCategoryMapping (26, TorznabCatType.AudioMP3, "Musique: Mp3");
             AddCategoryMapping (27, TorznabCatType.AudioVideo, "Musique: Clip Video");
-            AddCategoryMapping (58, TorznabCatType.AudioLossless, "Musique: Flac");
             AddCategoryMapping (62, TorznabCatType.TVSD, "Serie tv: TV BDRip");
             AddCategoryMapping (5, TorznabCatType.TVSD, "Serie tv: Dvdrip");
             AddCategoryMapping (41, TorznabCatType.TVHD, "Serie tv: Hd");
@@ -98,7 +93,7 @@ namespace Jackett.Indexers
             AddCategoryMapping (61, TorznabCatType.TVSD, "Tv: DVDRip");
         }
 
-        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        public override async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
         {
             configData.LoadValuesFromJson(configJson);
 
@@ -119,16 +114,24 @@ namespace Jackett.Indexers
             return IndexerConfigurationStatus.RequiresTesting;
         }
 
-        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
             var searchString = query.GetQueryString();
 
+            var arraySearchString = searchString.Split(' ');
+            searchString = "";
+            foreach (var subSearchString in arraySearchString) 
+            {
+                searchString += "+" + subSearchString + " ";
+            }
+            searchString = searchString.Trim ();
+
             var queryCollection = new Dictionary<string, string>();
             queryCollection.Add ("search", searchString);
             queryCollection.Add ("cat", "0");
-            queryCollection.Add("incldead", "0");
-            queryCollection.Add("freeleech", "0");
+            queryCollection.Add ("incldead", "0");
+            queryCollection.Add ("freeleech", "0");
             queryCollection.Add ("lang", "0");
 
             var searchUrl = BrowseUrl + "?" + queryCollection.GetQueryString ();

src/Jackett/Indexers/Avistaz.cs

@@ -18,13 +18,13 @@ using Jackett.Models.IndexerConfig;
 
 namespace Jackett.Indexers
 {
-    public class Avistaz : AvistazTracker, IIndexer
+    public class Avistaz : AvistazTracker
     {
-        public Avistaz(IIndexerManagerService indexerManager, IWebClient webClient, Logger logger, IProtectionService protectionService)
+        public Avistaz(IIndexerConfigurationService configService, IWebClient webClient, Logger logger, IProtectionService protectionService)
             : base(name: "Avistaz",
                 desc: "Aka AsiaTorrents",
                 link: "https://avistaz.to/",
-                indexerManager: indexerManager,
+                configService: configService,
                 logger: logger,
                 protectionService: protectionService,
                 webClient: webClient

src/Jackett/Indexers/BB.cs

@@ -11,6 +11,7 @@ using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Web;
 using Jackett.Models.IndexerConfig;
@@ -20,7 +21,7 @@ namespace Jackett.Indexers
 {
     // To comply with the rules for this tracker, only the acronym is used and no publicly displayed URLs to the site. 
 
-    public class BB : BaseIndexer, IIndexer
+    public class BB : BaseWebIndexer
     {
         private string BaseUrl { get { return StringUtil.FromBase64("aHR0cHM6Ly9iYWNvbmJpdHMub3JnLw=="); } }
         private Uri BaseUri { get { return new Uri(BaseUrl); } }
@@ -33,12 +34,12 @@ namespace Jackett.Indexers
             set { base.configData = value; }
         }
 
-        public BB(IIndexerManagerService i, Logger l, IWebClient w, IProtectionService ps)
+        public BB(IIndexerConfigurationService configService, IWebClient w, Logger l, IProtectionService ps)
             : base(name: "bB",
                 description: "bB",
-                link: "https://baconbits.org/",
+                link: StringUtil.FromBase64("aHR0cHM6Ly9iYWNvbmJpdHMub3JnLw=="),
                 caps: new TorznabCapabilities(),
-                manager: i,
+                configService: configService,
                 client: w,
                 logger: l,
                 p: ps,
@@ -49,6 +50,8 @@ namespace Jackett.Indexers
             Type = "private";
 
             AddCategoryMapping(1, TorznabCatType.Audio);
+            AddCategoryMapping(1, TorznabCatType.AudioMP3);
+            AddCategoryMapping(1, TorznabCatType.AudioLossless);
             AddCategoryMapping(2, TorznabCatType.PC);
             AddCategoryMapping(3, TorznabCatType.BooksEbook);
             AddCategoryMapping(4, TorznabCatType.AudioAudiobook);
@@ -61,7 +64,7 @@ namespace Jackett.Indexers
             AddCategoryMapping(11, TorznabCatType.PCGames);
         }
 
-        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        public override async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
         {
             LoadValuesFromJson(configJson);
             var pairs = new Dictionary<string, string> {
@@ -89,91 +92,110 @@ namespace Jackett.Indexers
             return IndexerConfigurationStatus.RequiresTesting;
         }
 
-        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             List<ReleaseInfo> releases = new List<ReleaseInfo>();
+            List<string> searchStrings = new List<string>(new string[] { query.GetQueryString() });
+            
+            if (string.IsNullOrEmpty(query.Episode) && (query.Season > 0))
+                // Tracker naming rules: If query is for a whole season, "Season #" instead of "S##".
+                searchStrings.Add((query.SanitizedSearchTerm + " " + string.Format("\"Season {0}\"", query.Season)).Trim());
 
-            var searchString = query.GetQueryString();
-            var searchUrl = SearchUrl;
-            var queryCollection = new NameValueCollection();
-
-            queryCollection.Add("action", "basic");
-
-            if (!string.IsNullOrWhiteSpace(searchString))
+            List<string> categories = MapTorznabCapsToTrackers(query);
+            List<string> request_urls = new List<string>();
+            
+            foreach (var searchString in searchStrings)
             {
-                queryCollection.Add("searchstr", searchString);
-            }
+                var queryCollection = new NameValueCollection();
+                queryCollection.Add("action", "basic");
 
-            foreach (var cat in MapTorznabCapsToTrackers(query))
-            {
-                queryCollection.Add("filter_cat[" + cat + "]", "1");
-            }
-
-            searchUrl += queryCollection.GetQueryString();
-
-            var results = await RequestStringWithCookiesAndRetry(searchUrl);
-
-            // Occasionally the cookies become invalid, login again if that happens
-            if (results.IsRedirect)
-            {
-                await ApplyConfiguration(null);
-                results = await RequestStringWithCookiesAndRetry(searchUrl);
-            }
-
-            try
-            {
-                CQ dom = results.Content;
-                var rows = dom["#torrent_table > tbody > tr.torrent"];
-                foreach (var row in rows)
+                if (!string.IsNullOrWhiteSpace(searchString))
                 {
-                    CQ qRow = row.Cq();
-                    var release = new ReleaseInfo();
-
-                    release.MinimumRatio = 1;
-                    release.MinimumSeedTime = 172800;
-
-                    var catStr = row.ChildElements.ElementAt(0).FirstElementChild.GetAttribute("href").Split(new char[] { '[', ']' })[1];
-                    release.Category = MapTrackerCatToNewznab(catStr);
-
-                    var qLink = row.ChildElements.ElementAt(1).Cq().Children("a")[0].Cq();
-                    var linkStr = qLink.Attr("href");
-                    release.Comments = new Uri(BaseUrl + "/" + linkStr);
-                    release.Guid = release.Comments;
-
-                    var qDownload = row.ChildElements.ElementAt(1).Cq().Find("a[title='Download']")[0].Cq();
-                    release.Link = new Uri(BaseUrl + "/" + qDownload.Attr("href"));
-
-                    var dateStr = row.ChildElements.ElementAt(3).Cq().Text().Trim().Replace(" and", "");
-                    release.PublishDate = DateTimeUtil.FromTimeAgo(dateStr);
-
-                    var sizeStr = row.ChildElements.ElementAt(4).Cq().Text();
-                    release.Size = ReleaseInfo.GetBytes(sizeStr);
-
-                    release.Files = ParseUtil.CoerceInt(row.ChildElements.ElementAt(2).Cq().Text().Trim());
-                    release.Grabs = ParseUtil.CoerceInt(row.ChildElements.ElementAt(6).Cq().Text().Trim());
-                    release.Seeders = ParseUtil.CoerceInt(row.ChildElements.ElementAt(7).Cq().Text().Trim());
-                    release.Peers = ParseUtil.CoerceInt(row.ChildElements.ElementAt(8).Cq().Text().Trim()) + release.Seeders;
-
-                    var grabs = qRow.Find("td:nth-child(6)").Text();
-                    release.Grabs = ParseUtil.CoerceInt(grabs);
-
-                    if (qRow.Find("strong:contains(\"Freeleech!\")").Length >= 1)
-                        release.DownloadVolumeFactor = 0;
-                    else
-                        release.DownloadVolumeFactor = 1;
-
-                    release.UploadVolumeFactor = 1;
-
-                    var title = qRow.Find("td:nth-child(2)");
-                    title.Find("span, strong, div, br").Remove();
-                    release.Title = ParseUtil.NormalizeMultiSpaces(title.Text().Replace(" - ]", "]"));
-
-                    releases.Add(release);
+                    queryCollection.Add("searchstr", searchString);
                 }
+
+                foreach (var cat in categories)
+                {
+                    
+                    queryCollection.Add("filter_cat[" + cat + "]", "1");
+                }
+
+                request_urls.Add(SearchUrl + queryCollection.GetQueryString());
             }
-            catch (Exception ex)
+            IEnumerable<Task<WebClientStringResult>> downloadTasksQuery =
+            	from url in request_urls select RequestStringWithCookiesAndRetry(url); 
+
+            WebClientStringResult[] responses = await Task.WhenAll(downloadTasksQuery.ToArray());  
+
+            for (int i = 0; i < searchStrings.Count(); i++)
             {
-                OnParseError(results.Content, ex);
+                var results = responses[i];
+                // Occasionally the cookies become invalid, login again if that happens
+                if (results.IsRedirect)
+                {
+                    await ApplyConfiguration(null);
+                    results = await RequestStringWithCookiesAndRetry(request_urls[i]);
+                }
+                try
+                {
+                    CQ dom = results.Content;
+                    var rows = dom["#torrent_table > tbody > tr.torrent"];
+                    foreach (var row in rows)
+                    {
+                        CQ qRow = row.Cq();
+                        var release = new ReleaseInfo();
+
+                        release.MinimumRatio = 1;
+                        release.MinimumSeedTime = 172800;
+
+                        var catStr = row.ChildElements.ElementAt(0).FirstElementChild.GetAttribute("href").Split(new char[] { '[', ']' })[1];
+                        release.Category = MapTrackerCatToNewznab(catStr);
+
+                        var qLink = row.ChildElements.ElementAt(1).Cq().Children("a")[0].Cq();
+                        var linkStr = qLink.Attr("href");
+                        release.Comments = new Uri(BaseUrl + "/" + linkStr);
+                        release.Guid = release.Comments;
+
+                        var qDownload = row.ChildElements.ElementAt(1).Cq().Find("a[title='Download']")[0].Cq();
+                        release.Link = new Uri(BaseUrl + "/" + qDownload.Attr("href"));
+
+                        var dateStr = row.ChildElements.ElementAt(3).Cq().Text().Trim().Replace(" and", "");
+                        release.PublishDate = DateTimeUtil.FromTimeAgo(dateStr);
+
+                        var sizeStr = row.ChildElements.ElementAt(4).Cq().Text();
+                        release.Size = ReleaseInfo.GetBytes(sizeStr);
+
+                        release.Files = ParseUtil.CoerceInt(row.ChildElements.ElementAt(2).Cq().Text().Trim());
+                        release.Grabs = ParseUtil.CoerceInt(row.ChildElements.ElementAt(6).Cq().Text().Trim());
+                        release.Seeders = ParseUtil.CoerceInt(row.ChildElements.ElementAt(7).Cq().Text().Trim());
+                        release.Peers = ParseUtil.CoerceInt(row.ChildElements.ElementAt(8).Cq().Text().Trim()) + release.Seeders;
+
+                        var grabs = qRow.Find("td:nth-child(6)").Text();
+                        release.Grabs = ParseUtil.CoerceInt(grabs);
+
+                        if (qRow.Find("strong:contains(\"Freeleech!\")").Length >= 1)
+                            release.DownloadVolumeFactor = 0;
+                        else
+                            release.DownloadVolumeFactor = 1;
+
+                        release.UploadVolumeFactor = 1;
+
+                        var title = qRow.Find("td:nth-child(2)");
+                        title.Find("span, strong, div, br").Remove();
+
+                        release.Title = ParseUtil.NormalizeMultiSpaces(title.Text().Replace(" - ]", "]"));
+
+                        if (catStr == "10") //change "Season #" to "S##" for TV shows
+                            release.Title = Regex.Replace(release.Title, @"Season (\d+)",
+                                                          m => string.Format("S{0:00}", Int32.Parse(m.Groups[1].Value)));
+                        
+                        releases.Add(release);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    OnParseError(results.Content, ex);
+                }
             }
             return releases;
         }

src/Jackett/Indexers/BJShare.cs

@@ -17,7 +17,7 @@ using System.Text.RegularExpressions;
 
 namespace Jackett.Indexers
 {
-    public class BJShare : BaseIndexer, IIndexer
+    public class BJShare : BaseWebIndexer
     {
         string LoginUrl { get { return SiteLink + "login.php"; } }
         string BrowseUrl { get { return SiteLink + "torrents.php"; } }
@@ -29,12 +29,12 @@ namespace Jackett.Indexers
             set { base.configData = value; }
         }
 
-        public BJShare(IIndexerManagerService i, IWebClient wc, Logger l, IProtectionService ps)
+        public BJShare(IIndexerConfigurationService configService, IWebClient wc, Logger l, IProtectionService ps)
             : base(name: "BJ-Share",
                    description: "A brazilian tracker.",
                    link: "https://bj-share.me/",
                    caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
-                   manager: i,
+                   configService: configService,
                    client: wc,
                    logger: l,
                    p: ps,
@@ -68,7 +68,7 @@ namespace Jackett.Indexers
             AddCategoryMapping(201, TorznabCatType.XXXImageset); // Fotos Adultas
         }
 
-        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        public override async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
         {
             LoadValuesFromJson(configJson);
 
@@ -96,7 +96,7 @@ namespace Jackett.Indexers
             return term.Trim();
         }
 
-        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
             
@@ -283,6 +283,7 @@ namespace Jackett.Indexers
                             
                             release.Description = release.Description.Replace("Full HD", "1080p");
                             release.Description = release.Description.Replace("/ HD / ", "/ 720p /");
+                            release.Description = release.Description.Replace(" / HD]", " / 720p]");
                             release.Description = release.Description.Replace("4K", "2160p");
 
                             int nBarra = release.Title.IndexOf("[");

src/Jackett/Indexers/BakaBT.cs

@@ -17,7 +17,7 @@ using Jackett.Models.IndexerConfig;
 
 namespace Jackett.Indexers
 {
-    public class BakaBT : BaseIndexer, IIndexer
+    public class BakaBT : BaseWebIndexer
     {
         public string SearchUrl { get { return SiteLink + "browse.php?only=0&incomplete=1&lossless=1&hd=1&multiaudio=1&bonus=1&reorder=1&q="; } }
         public string LoginUrl { get { return SiteLink + "login.php"; } }
@@ -29,12 +29,12 @@ namespace Jackett.Indexers
             set { base.configData = value; }
         }
 
-        public BakaBT(IIndexerManagerService i, IWebClient wc, Logger l, IProtectionService ps)
+        public BakaBT(IIndexerConfigurationService configService, IWebClient wc, Logger l, IProtectionService ps)
             : base(name: "BakaBT",
                 description: "Anime Comunity",
                 link: "https://bakabt.me/",
                 caps: new TorznabCapabilities(TorznabCatType.TVAnime),
-                manager: i,
+                configService: configService,
                 client: wc,
                 logger: l,
                 p: ps,
@@ -46,7 +46,7 @@ namespace Jackett.Indexers
         }
 
 
-        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        public override async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
         {
             LoadValuesFromJson(configJson);
 
@@ -75,7 +75,7 @@ namespace Jackett.Indexers
             return IndexerConfigurationStatus.RequiresTesting;
         }
 
-        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
 
             // This tracker only deals with full seasons so chop off the episode/season number if we have it D:

src/Jackett/Indexers/BaseIndexer.cs

@@ -10,33 +10,34 @@ using Jackett.Services;
 using Jackett.Utils;
 using Jackett.Utils.Clients;
 using AutoMapper;
-using System.Threading;
 using Jackett.Models.IndexerConfig;
 using System.Text.RegularExpressions;
+using Newtonsoft.Json;
 
 namespace Jackett.Indexers
 {
-    public abstract class BaseIndexer
+    public abstract class BaseIndexer : IIndexer
     {
+        public static string GetIndexerID(Type type)
+        {
+            return type.Name.ToLowerInvariant().StripNonAlphaNumeric();
+        }
+
         public string SiteLink { get; protected set; }
         public string DefaultSiteLink { get; protected set; }
         public string[] AlternativeSiteLinks { get; protected set; } = new string[] { };
         public string DisplayDescription { get; protected set; }
         public string DisplayName { get; protected set; }
         public string Language { get; protected set; }
-        public Encoding Encoding { get; protected set; }
         public string Type { get; protected set; }
-        public string ID { get { return GetIndexerID(GetType()); } }
+        public virtual string ID { get { return GetIndexerID(GetType()); } }
 
-        public bool IsConfigured { get; protected set; }
-        public TorznabCapabilities TorznabCaps { get; protected set; }
+        public virtual bool IsConfigured { get; protected set; }
         protected Logger logger;
-        protected IIndexerManagerService indexerService;
-        protected static List<CachedQueryResult> cache = new List<CachedQueryResult>();
-        protected static readonly TimeSpan cacheTime = new TimeSpan(0, 9, 0);
-        protected IWebClient webclient;
+        protected IIndexerConfigurationService configurationService;
         protected IProtectionService protectionService;
-        protected readonly string downloadUrlBase = "";
+
+        protected ConfigurationData configData;
 
         protected string CookieHeader
         {
@@ -56,126 +57,25 @@ namespace Jackett.Indexers
             }
         }
 
-        protected ConfigurationData configData;
-
-        private List<CategoryMapping> categoryMapping = new List<CategoryMapping>();
+        public abstract TorznabCapabilities TorznabCaps { get; protected set; }
 
         // standard constructor used by most indexers
-        public BaseIndexer(string name, string link, string description, IIndexerManagerService manager, IWebClient client, Logger logger, ConfigurationData configData, IProtectionService p, TorznabCapabilities caps = null, string downloadBase = null)
-            : this(manager, client, logger, p)
+        public BaseIndexer(string name, string link, string description, IIndexerConfigurationService configService, Logger logger, ConfigurationData configData, IProtectionService p)
         {
-            if (!link.EndsWith("/"))
+            this.logger = logger;
+            configurationService = configService;
+            protectionService = p;
+
+            if (!link.EndsWith("/", StringComparison.Ordinal))
                 throw new Exception("Site link must end with a slash.");
 
             DisplayName = name;
             DisplayDescription = description;
             SiteLink = link;
             DefaultSiteLink = link;
-            this.downloadUrlBase = downloadBase;
             this.configData = configData;
-            LoadValuesFromJson(null);
-
-            if (caps == null)
-                caps = TorznabUtil.CreateDefaultTorznabTVCaps();
-            TorznabCaps = caps;
-
-        }
-
-        // minimal constructor used by e.g. cardigann generic indexer
-        public BaseIndexer(IIndexerManagerService manager, IWebClient client, Logger logger, IProtectionService p)
-        {
-            this.logger = logger;
-            indexerService = manager;
-            webclient = client;
-            protectionService = p;
-        }
-
-        public IEnumerable<ReleaseInfo> CleanLinks(IEnumerable<ReleaseInfo> releases)
-        {
-            if (string.IsNullOrEmpty(downloadUrlBase))
-                return releases;
-            foreach (var release in releases)
-            {
-                if (release.Link.ToString().StartsWith(downloadUrlBase))
-                {
-                    release.Link = new Uri(release.Link.ToString().Substring(downloadUrlBase.Length), UriKind.Relative);
-                }
-            }
-
-            return releases;
-        }
-
-        public virtual Uri UncleanLink(Uri link)
-        {
-            if (string.IsNullOrWhiteSpace(downloadUrlBase))
-            {
-                return link;
-            }
-
-            if (link.ToString().StartsWith(downloadUrlBase))
-            {
-                return link;
-            }
-
-            return new Uri(downloadUrlBase + link.ToString(), UriKind.RelativeOrAbsolute);
-        }
-
-        protected ICollection<int> MapTrackerCatToNewznab(string input)
-        {
-            var cats = new List<int>();
-            if (null != input)
-            {
-                var mapping = categoryMapping.Where(m => m.TrackerCategory != null && m.TrackerCategory.ToLowerInvariant() == input.ToLowerInvariant()).FirstOrDefault();
-                if (mapping != null)
-                {
-                    cats.Add(mapping.NewzNabCategory);
-                }
-
-                // 1:1 category mapping
-                try
-                {
-                    var trackerCategoryInt = int.Parse(input);
-                    cats.Add(trackerCategoryInt + 100000);
-                }
-                catch (FormatException)
-                {
-                    // input is not an integer, continue
-                }
-            }
-            return cats;
-        }
-
-        protected ICollection<int> MapTrackerCatDescToNewznab(string input)
-        {
-            var cats = new List<int>();
-            if (null != input)
-            {
-                var mapping = categoryMapping.Where(m => m.TrackerCategoryDesc != null && m.TrackerCategoryDesc.ToLowerInvariant() == input.ToLowerInvariant()).FirstOrDefault();
-                if (mapping != null)
-                {
-                    cats.Add(mapping.NewzNabCategory);
-
-                    if (mapping.TrackerCategory != null)
-                    {
-                        // 1:1 category mapping
-                        try
-                        {
-                            var trackerCategoryInt = int.Parse(mapping.TrackerCategory);
-                            cats.Add(trackerCategoryInt + 100000);
-                        }
-                        catch (FormatException)
-                        {
-                            // mapping.TrackerCategory is not an integer, continue
-                        }
-                    }
-                }
-            }
-            return cats;
-        }
-
-        public static string GetIndexerID(Type type)
-        {
-            return StringUtil.StripNonAlphaNumeric(type.Name.ToLowerInvariant());
+            if (configData != null)
+                LoadValuesFromJson(null);
         }
 
         public virtual Task<ConfigurationData> GetConfigurationForSetup()
@@ -191,109 +91,9 @@ namespace Jackett.Indexers
 
         public virtual void SaveConfig()
         {
-            indexerService.SaveConfig(this as IIndexer, configData.ToJson(protectionService, forDisplay: false));
+            configurationService.Save(this as IIndexer, configData.ToJson(protectionService, forDisplay: false));
         }
 
-        protected void OnParseError(string results, Exception ex)
-        {
-            var fileName = string.Format("Error on {0} for {1}.txt", DateTime.Now.ToString("yyyyMMddHHmmss"), DisplayName);
-            var spacing = string.Join("", Enumerable.Repeat(Environment.NewLine, 5));
-            var fileContents = string.Format("{0}{1}{2}", ex, spacing, results);
-            logger.Error(fileName + fileContents);
-            throw ex;
-        }
-
-        protected void CleanCache()
-        {
-            foreach (var expired in cache.Where(i => DateTime.Now - i.Created > cacheTime).ToList())
-            {
-                cache.Remove(expired);
-            }
-        }
-
-        protected async Task FollowIfRedirect(WebClientStringResult response, string referrer = null, string overrideRedirectUrl = null, string overrideCookies = null, bool accumulateCookies = false)
-        {
-            var byteResult = new WebClientByteResult();
-            // Map to byte
-            Mapper.Map(response, byteResult);
-            await FollowIfRedirect(byteResult, referrer, overrideRedirectUrl, overrideCookies, accumulateCookies);
-            // Map to string
-            Mapper.Map(byteResult, response);
-        }
-
-        protected async Task FollowIfRedirect(WebClientByteResult response, string referrer = null, string overrideRedirectUrl = null, string overrideCookies = null, bool accumulateCookies = false)
-        {
-            // Follow up  to 5 redirects
-            for (int i = 0; i < 5; i++)
-            {
-                if (!response.IsRedirect)
-                    break;
-                await DoFollowIfRedirect(response, referrer, overrideRedirectUrl, overrideCookies, accumulateCookies);
-                if (accumulateCookies)
-                {
-                    CookieHeader = ResolveCookies((CookieHeader != null && CookieHeader != ""? CookieHeader + " " : "") + (overrideCookies != null && overrideCookies != "" ? overrideCookies + " " : "") + response.Cookies);
-                    overrideCookies = response.Cookies = CookieHeader;
-                }
-                if (overrideCookies != null && response.Cookies == null)
-                {
-                    response.Cookies = overrideCookies;
-                }
-            }
-        }
-
-        private String ResolveCookies(String incomingCookies = "")
-        {
-            var redirRequestCookies = (CookieHeader != null && CookieHeader != "" ? CookieHeader + " " : "") + incomingCookies;
-            System.Text.RegularExpressions.Regex expression = new System.Text.RegularExpressions.Regex(@"([^\\,;\s]+)=([^=\\,;\s]*)");
-            Dictionary<string, string> cookieDIctionary = new Dictionary<string, string>();
-            var matches = expression.Match(redirRequestCookies);
-            while (matches.Success)
-            {
-                if (matches.Groups.Count > 2) cookieDIctionary[matches.Groups[1].Value] = matches.Groups[2].Value;
-                matches = matches.NextMatch();
-            }
-            return string.Join("; ", cookieDIctionary.Select(kv => kv.Key.ToString() + "=" + kv.Value.ToString()).ToArray());
-            
-        }
-
-        // Update CookieHeader with new cookies and save the config if something changed (e.g. a new CloudFlare clearance cookie was issued)
-        protected void UpdateCookieHeader(string newCookies, string cookieOverride = null)
-        {
-            string newCookieHeader = ResolveCookies((cookieOverride != null && cookieOverride != "" ? cookieOverride + " " : "") + newCookies);
-            if (CookieHeader != newCookieHeader)
-            {
-                logger.Debug(string.Format("updating Cookies {0} => {1}", CookieHeader, newCookieHeader));
-                CookieHeader = newCookieHeader;
-                if (IsConfigured)
-                    SaveConfig();
-            }
-        }
-
-        private async Task DoFollowIfRedirect(WebClientByteResult incomingResponse, string referrer = null, string overrideRedirectUrl = null, string overrideCookies = null, bool accumulateCookies = false)
-        {
-            if (incomingResponse.IsRedirect)
-            {
-                var redirRequestCookies = "";
-                if (accumulateCookies)
-                {
-                    redirRequestCookies = ResolveCookies((CookieHeader != "" ? CookieHeader + " " : "") + (overrideCookies != null ? overrideCookies : ""));
-                } else
-                {
-                    redirRequestCookies = (overrideCookies != null ? overrideCookies : "");
-                }
-                // Do redirect
-                var redirectedResponse = await webclient.GetBytes(new WebRequest()
-                {
-                    Url = overrideRedirectUrl ?? incomingResponse.RedirectingTo,
-                    Referer = referrer,
-                    Cookies = redirRequestCookies,
-                    Encoding = Encoding
-                });
-                Mapper.Map(redirectedResponse, incomingResponse);
-            }
-        }
-
-
         protected void LoadLegacyCookieConfig(JToken jsonConfig)
         {
             string legacyCookieHeader = (string)jsonConfig["cookie_header"];
@@ -334,19 +134,15 @@ namespace Jackett.Indexers
             {
                 configData.SiteLink.Value = DefaultSiteLink;
             }
-            if (!configData.SiteLink.Value.EndsWith("/"))
+            if (!configData.SiteLink.Value.EndsWith("/", StringComparison.Ordinal))
                 configData.SiteLink.Value += "/";
 
-            var match = Regex.Match(configData.SiteLink.Value, "^https?:\\/\\/[\\w\\-\\/\\.]+$");
-            if (!match.Success)
-            {
-                throw new Exception(string.Format("\"{0}\" is not a valid URL.", configData.SiteLink.Value));
-            }
-
+            // check whether the site link is well-formatted
+            var siteUri = new Uri(configData.SiteLink.Value);
             SiteLink = configData.SiteLink.Value;
         }
 
-        public virtual void LoadFromSavedConfiguration(JToken jsonConfig)
+        public void LoadFromSavedConfiguration(JToken jsonConfig)
         {
             if (jsonConfig is JArray)
             {
@@ -362,12 +158,122 @@ namespace Jackett.Indexers
             }
         }
 
-        public async virtual Task<byte[]> Download(Uri link)
+        protected async Task ConfigureIfOK(string cookies, bool isLoggedin, Func<Task> onError)
         {
-            return await Download(link, RequestType.GET);
+            if (isLoggedin)
+            {
+                CookieHeader = cookies;
+                IsConfigured = true;
+                SaveConfig();
+            }
+            else
+            {
+                await onError();
+            }
         }
 
-        public async virtual Task<byte[]> Download(Uri link, RequestType method = RequestType.GET)
+        protected virtual IEnumerable<ReleaseInfo> FilterResults(TorznabQuery query, IEnumerable<ReleaseInfo> results)
+        {
+            if (query.Categories.Length == 0)
+                return results;
+
+            var filteredResults = results.Where(result =>
+            {
+                return result.Category.IsEmptyOrNull() || query.Categories.Intersect(result.Category).Any() || TorznabCatType.QueryContainsParentCategory(query.Categories, result.Category);
+            });
+
+            return filteredResults;
+        }
+
+        public bool CanHandleQuery(TorznabQuery query)
+        {
+            if (query == null)
+                return false;
+            if (query.QueryType == "caps")
+                return true;
+
+            var caps = TorznabCaps;
+
+            if (query.HasSpecifiedCategories)
+                if (!caps.SupportsCategories(query.Categories))
+                    return false;
+
+            if (caps.SearchAvailable && query.IsSearch)
+                return true;
+            if (caps.TVSearchAvailable && query.IsTVSearch)
+                return true;
+            if (caps.MovieSearchAvailable && query.IsMovieSearch)
+                return true;
+            if (caps.SupportsTVRageSearch && query.IsTVRageSearch)
+                return true;
+            if (caps.SupportsImdbSearch && query.IsImdbQuery)
+                return true;
+
+            return false;
+        }
+
+        public void Unconfigure()
+        {
+            IsConfigured = false;
+        }
+
+        public abstract Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson);
+
+        public virtual async Task<IndexerResult> ResultsForQuery(TorznabQuery query)
+        {
+            try
+            {
+                if (!CanHandleQuery(query))
+                    return new IndexerResult(this, new ReleaseInfo[0]);
+                var results = await PerformQuery(query);
+                results = FilterResults(query, results);
+                results = results.Select(r =>
+                {
+                    r.Origin = this;
+
+                    // Some trackers do not keep their clocks up to date and can be ~20 minutes out!
+                    if (r.PublishDate > DateTime.Now)
+                        r.PublishDate = DateTime.Now;
+                    return r;
+                });
+
+                return new IndexerResult(this, results);
+            }
+            catch (Exception ex)
+            {
+                throw new IndexerException(this, ex);
+            }
+        }
+        protected abstract Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query);
+    }
+
+    public abstract class BaseWebIndexer : BaseIndexer, IWebIndexer
+    {
+        protected BaseWebIndexer(string name, string link, string description, IIndexerConfigurationService configService, IWebClient client, Logger logger, ConfigurationData configData, IProtectionService p, TorznabCapabilities caps = null, string downloadBase = null)
+            : base(name, link, description, configService, logger, configData, p)
+        {
+            this.webclient = client;
+            this.downloadUrlBase = downloadBase;
+
+            if (caps == null)
+                caps = TorznabUtil.CreateDefaultTorznabTVCaps();
+            TorznabCaps = caps;
+        }
+
+        // minimal constructor used by e.g. cardigann generic indexer
+        protected BaseWebIndexer(IIndexerConfigurationService configService, IWebClient client, Logger logger, IProtectionService p)
+            : base("", "/", "", configService, logger, null, p)
+        {
+            this.webclient = client;
+        }
+
+        public async virtual Task<byte[]> Download(Uri link)
+        {
+            var uncleanLink = UncleanLink(link);
+            return await Download(uncleanLink, RequestType.GET);
+        }
+
+        protected async Task<byte[]> Download(Uri link, RequestType method)
         {
             // do some extra escaping, needed for HD-Torrents
             var requestLink = link.ToString()
@@ -380,7 +286,7 @@ namespace Jackett.Indexers
                 logger.Error("Failed download cookies: " + this.CookieHeader);
                 if (response.Content != null)
                     logger.Error("Failed download response:\n" + Encoding.UTF8.GetString(response.Content));
-                throw new Exception($"Remote server returned {response.Status.ToString()}" + (response.IsRedirect ? " => "+response.RedirectingTo : ""));
+                throw new Exception($"Remote server returned {response.Status.ToString()}" + (response.IsRedirect ? " => " + response.RedirectingTo : ""));
             }
 
             return response.Content;
@@ -531,32 +437,90 @@ namespace Jackett.Indexers
             {
                 response.Cookies = ResolveCookies(firstCallCookies + (accumulateCookies ? " " + response.Cookies : ""));
             }
-            
+
             return response;
         }
 
-        protected async Task ConfigureIfOK(string cookies, bool isLoggedin, Func<Task> onError)
+        protected async Task FollowIfRedirect(WebClientStringResult response, string referrer = null, string overrideRedirectUrl = null, string overrideCookies = null, bool accumulateCookies = false)
         {
-            if (isLoggedin)
+            var byteResult = new WebClientByteResult();
+            // Map to byte
+            Mapper.Map(response, byteResult);
+            await FollowIfRedirect(byteResult, referrer, overrideRedirectUrl, overrideCookies, accumulateCookies);
+            // Map to string
+            Mapper.Map(byteResult, response);
+        }
+
+        protected async Task FollowIfRedirect(WebClientByteResult response, string referrer = null, string overrideRedirectUrl = null, string overrideCookies = null, bool accumulateCookies = false)
+        {
+            // Follow up  to 5 redirects
+            for (int i = 0; i < 5; i++)
             {
-                CookieHeader = cookies;
-                IsConfigured = true;
-                SaveConfig();
-            }
-            else
-            {
-                await onError();
+                if (!response.IsRedirect)
+                    break;
+                await DoFollowIfRedirect(response, referrer, overrideRedirectUrl, overrideCookies, accumulateCookies);
+                if (accumulateCookies)
+                {
+                    CookieHeader = ResolveCookies((CookieHeader != null && CookieHeader != "" ? CookieHeader + " " : "") + (overrideCookies != null && overrideCookies != "" ? overrideCookies + " " : "") + response.Cookies);
+                    overrideCookies = response.Cookies = CookieHeader;
+                }
+                if (overrideCookies != null && response.Cookies == null)
+                {
+                    response.Cookies = overrideCookies;
+                }
             }
         }
 
-        public virtual IEnumerable<ReleaseInfo> FilterResults(TorznabQuery query, IEnumerable<ReleaseInfo> results)
+        private String ResolveCookies(String incomingCookies = "")
         {
-            foreach (var result in results)
+            var redirRequestCookies = (CookieHeader != null && CookieHeader != "" ? CookieHeader + " " : "") + incomingCookies;
+            System.Text.RegularExpressions.Regex expression = new System.Text.RegularExpressions.Regex(@"([^\\,;\s]+)=([^=\\,;\s]*)");
+            Dictionary<string, string> cookieDIctionary = new Dictionary<string, string>();
+            var matches = expression.Match(redirRequestCookies);
+            while (matches.Success)
             {
-                if (query.Categories.Length == 0 || result.Category == null || result.Category.Count() == 0 || query.Categories.Intersect(result.Category).Any() || TorznabCatType.QueryContainsParentCategory(query.Categories, result.Category))
+                if (matches.Groups.Count > 2) cookieDIctionary[matches.Groups[1].Value] = matches.Groups[2].Value;
+                matches = matches.NextMatch();
+            }
+            return string.Join("; ", cookieDIctionary.Select(kv => kv.Key.ToString() + "=" + kv.Value.ToString()).ToArray());
+
+        }
+
+        // Update CookieHeader with new cookies and save the config if something changed (e.g. a new CloudFlare clearance cookie was issued)
+        protected void UpdateCookieHeader(string newCookies, string cookieOverride = null)
+        {
+            string newCookieHeader = ResolveCookies((cookieOverride != null && cookieOverride != "" ? cookieOverride + " " : "") + newCookies);
+            if (CookieHeader != newCookieHeader)
+            {
+                logger.Debug(string.Format("updating Cookies {0} => {1}", CookieHeader, newCookieHeader));
+                CookieHeader = newCookieHeader;
+                if (IsConfigured)
+                    SaveConfig();
+            }
+        }
+
+        private async Task DoFollowIfRedirect(WebClientByteResult incomingResponse, string referrer = null, string overrideRedirectUrl = null, string overrideCookies = null, bool accumulateCookies = false)
+        {
+            if (incomingResponse.IsRedirect)
+            {
+                var redirRequestCookies = "";
+                if (accumulateCookies)
                 {
-                    yield return result;
+                    redirRequestCookies = ResolveCookies((CookieHeader != "" ? CookieHeader + " " : "") + (overrideCookies != null ? overrideCookies : ""));
                 }
+                else
+                {
+                    redirRequestCookies = (overrideCookies != null ? overrideCookies : "");
+                }
+                // Do redirect
+                var redirectedResponse = await webclient.GetBytes(new WebRequest()
+                {
+                    Url = overrideRedirectUrl ?? incomingResponse.RedirectingTo,
+                    Referer = referrer,
+                    Cookies = redirRequestCookies,
+                    Encoding = Encoding
+                });
+                Mapper.Map(redirectedResponse, incomingResponse);
             }
         }
 
@@ -642,24 +606,132 @@ namespace Jackett.Indexers
             return result.Distinct().ToList();
         }
 
-        public bool CanHandleQuery(TorznabQuery query)
+        protected ICollection<int> MapTrackerCatToNewznab(string input)
         {
-            var caps = TorznabCaps;
-            if (!caps.SearchAvailable && query.IsSearch)
-                return false;
-            if (!caps.TVSearchAvailable && query.IsTVSearch)
-                return false;
-            if (!caps.MovieSearchAvailable && query.IsMovieSearch)
-                return false;
-            if (!caps.SupportsTVRageSearch && query.IsTVRageSearch)
-                return false;
-            if (!caps.SupportsImdbSearch && query.IsImdbQuery)
-                return false;
+            var cats = new List<int>();
+            if (null != input)
+            {
+                var mapping = categoryMapping.Where(m => m.TrackerCategory != null && m.TrackerCategory.ToLowerInvariant() == input.ToLowerInvariant()).FirstOrDefault();
+                if (mapping != null)
+                {
+                    cats.Add(mapping.NewzNabCategory);
+                }
 
-            if (query.HasSpecifiedCategories)
-                if (!caps.SupportsCategories(query.Categories))
-                    return false;
-            return true;
+                // 1:1 category mapping
+                try
+                {
+                    var trackerCategoryInt = int.Parse(input);
+                    cats.Add(trackerCategoryInt + 100000);
+                }
+                catch (FormatException)
+                {
+                    // input is not an integer, continue
+                }
+            }
+            return cats;
         }
+
+        protected ICollection<int> MapTrackerCatDescToNewznab(string input)
+        {
+            var cats = new List<int>();
+            if (null != input)
+            {
+                var mapping = categoryMapping.Where(m => m.TrackerCategoryDesc != null && m.TrackerCategoryDesc.ToLowerInvariant() == input.ToLowerInvariant()).FirstOrDefault();
+                if (mapping != null)
+                {
+                    cats.Add(mapping.NewzNabCategory);
+
+                    if (mapping.TrackerCategory != null)
+                    {
+                        // 1:1 category mapping
+                        try
+                        {
+                            var trackerCategoryInt = int.Parse(mapping.TrackerCategory);
+                            cats.Add(trackerCategoryInt + 100000);
+                        }
+                        catch (FormatException)
+                        {
+                            // mapping.TrackerCategory is not an integer, continue
+                        }
+                    }
+                }
+            }
+            return cats;
+        }
+
+        private IEnumerable<ReleaseInfo> CleanLinks(IEnumerable<ReleaseInfo> releases)
+        {
+            if (string.IsNullOrEmpty(downloadUrlBase))
+                return releases;
+            foreach (var release in releases)
+            {
+                if (release.Link.ToString().StartsWith(downloadUrlBase, StringComparison.Ordinal))
+                {
+                    release.Link = new Uri(release.Link.ToString().Substring(downloadUrlBase.Length), UriKind.Relative);
+                }
+            }
+
+            return releases;
+        }
+
+        public override async Task<IndexerResult> ResultsForQuery(TorznabQuery query)
+        {
+            var result = await base.ResultsForQuery(query);
+            result.Releases = CleanLinks(result.Releases);
+
+            return result;
+        }
+
+        protected virtual Uri UncleanLink(Uri link)
+        {
+            if (string.IsNullOrWhiteSpace(downloadUrlBase))
+            {
+                return link;
+            }
+
+            if (link.ToString().StartsWith(downloadUrlBase, StringComparison.Ordinal))
+            {
+                return link;
+            }
+
+            return new Uri(downloadUrlBase + link.ToString(), UriKind.RelativeOrAbsolute);
+        }
+
+        protected void OnParseError(string results, Exception ex)
+        {
+            var fileName = string.Format("Error on {0} for {1}.txt", DateTime.Now.ToString("yyyyMMddHHmmss"), DisplayName);
+            var spacing = string.Join("", Enumerable.Repeat(Environment.NewLine, 5));
+            var fileContents = string.Format("{0}{1}{2}", ex, spacing, results);
+            logger.Error(fileName + fileContents);
+            throw ex;
+        }
+
+        public override TorznabCapabilities TorznabCaps { get; protected set; }
+
+        [JsonConverter(typeof(EncodingJsonConverter))]
+        public Encoding Encoding { get; protected set; }
+
+        private List<CategoryMapping> categoryMapping = new List<CategoryMapping>();
+        protected IWebClient webclient;
+        protected readonly string downloadUrlBase = "";
+    }
+
+    public abstract class BaseCachingWebIndexer : BaseWebIndexer
+    {
+        protected BaseCachingWebIndexer(string name, string link, string description, IIndexerConfigurationService configService, IWebClient client, Logger logger, ConfigurationData configData, IProtectionService p, TorznabCapabilities caps = null, string downloadBase = null)
+            : base(name, link, description, configService, client, logger, configData, p, caps, downloadBase)
+        {
+        }
+
+        protected void CleanCache()
+        {
+            foreach (var expired in cache.Where(i => DateTime.Now - i.Created > cacheTime).ToList())
+            {
+                cache.Remove(expired);
+            }
+        }
+
+        protected static List<CachedQueryResult> cache = new List<CachedQueryResult>();
+        protected static readonly TimeSpan cacheTime = new TimeSpan(0, 9, 0);
     }
 }

src/Jackett/Indexers/BestFriends.cs

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

src/Jackett/Indexers/BeyondHD.cs

@@ -16,7 +16,7 @@ using System.Text;
 
 namespace Jackett.Indexers
 {
-    public class BeyondHD : BaseIndexer, IIndexer
+    public class BeyondHD : BaseWebIndexer
     {
         private string SearchUrl { get { return SiteLink + "browse.php?searchin=title&incldead=0&"; } }
 
@@ -26,12 +26,12 @@ namespace Jackett.Indexers
             set { base.configData = value; }
         }
 
-        public BeyondHD(IIndexerManagerService i, Logger l, IWebClient w, IProtectionService ps)
+        public BeyondHD(IIndexerConfigurationService configService, IWebClient w, Logger l, IProtectionService ps)
             : base(name: "BeyondHD",
                 description: "Without BeyondHD, your HDTV is just a TV",
                 link: "https://beyond-hd.me/",
                 caps: new TorznabCapabilities(),
-                manager: i,
+                configService: configService,
                 client: w,
                 logger: l,
                 p: ps,
@@ -85,7 +85,7 @@ namespace Jackett.Indexers
 
         }
 
-        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        public override async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
         {
             LoadValuesFromJson(configJson);
             
@@ -98,7 +98,7 @@ namespace Jackett.Indexers
             return IndexerConfigurationStatus.RequiresTesting;
         }
 
-        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             List<ReleaseInfo> releases = new List<ReleaseInfo>();
 

src/Jackett/Indexers/BitCityReloaded.cs

@@ -16,7 +16,7 @@ using System.Collections.Specialized;
 
 namespace Jackett.Indexers
 {
-    public class BitCityReloaded : BaseIndexer, IIndexer
+    public class BitCityReloaded : BaseWebIndexer
     {
         string LoginUrl { get { return SiteLink + "login.php"; } }
         string BrowseUrl { get { return SiteLink + "uebersicht.php"; } }
@@ -28,12 +28,12 @@ namespace Jackett.Indexers
             set { base.configData = value; }
         }
 
-        public BitCityReloaded(IIndexerManagerService i, IWebClient wc, Logger l, IProtectionService ps)
+        public BitCityReloaded(IIndexerConfigurationService configService, IWebClient wc, Logger l, IProtectionService ps)
             : base(name: "Bit-City Reloaded",
                    description: "A German general tracker.",
                    link: "https://bc-reloaded.net/",
                    caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
-                   manager: i,
+                   configService: configService,
                    client: wc,
                    logger: l,
                    p: ps,
@@ -83,7 +83,7 @@ namespace Jackett.Indexers
             AddCategoryMapping(25, TorznabCatType.TVSport); // Sport
         }
 
-        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        public override async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
         {
             LoadValuesFromJson(configJson);
 
@@ -103,7 +103,7 @@ namespace Jackett.Indexers
             return IndexerConfigurationStatus.RequiresTesting;
         }
 
-        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
             

src/Jackett/Indexers/BitHdtv.cs

@@ -19,28 +19,29 @@ using System.Collections.Specialized;
 
 namespace Jackett.Indexers
 {
-    public class BitHdtv : BaseIndexer, IIndexer
+    public class BitHdtv : BaseWebIndexer
     {
-        private string LoginUrl { get { return SiteLink + "takelogin.php"; } }
+        private string LoginUrl { get { return SiteLink + "login.php"; } }
+        private string TakeLoginUrl { get { return SiteLink + "takelogin.php"; } }
         private string SearchUrl { get { return SiteLink + "torrents.php?"; } }
         private string DownloadUrl { get { return SiteLink + "download.php?id={0}"; } }
 
-        new ConfigurationDataBasicLogin configData
+        new ConfigurationDataRecaptchaLogin configData
         {
-            get { return (ConfigurationDataBasicLogin)base.configData; }
+            get { return (ConfigurationDataRecaptchaLogin)base.configData; }
             set { base.configData = value; }
         }
 
-        public BitHdtv(IIndexerManagerService i, Logger l, IWebClient w, IProtectionService ps)
+        public BitHdtv(IIndexerConfigurationService configService, IWebClient w, Logger l, IProtectionService ps)
             : base(name: "BIT-HDTV",
                 description: "Home of high definition invites",
                 link: "https://www.bit-hdtv.com/",
                 caps: new TorznabCapabilities(),
-                manager: i,
+                configService: configService,
                 client: w,
                 logger: l,
                 p: ps,
-                configData: new ConfigurationDataBasicLogin())
+                configData: new ConfigurationDataRecaptchaLogin())
         {
             Encoding = Encoding.GetEncoding("iso-8859-1");
             Language = "en-us";
@@ -58,16 +59,52 @@ namespace Jackett.Indexers
             AddCategoryMapping(11, TorznabCatType.XXX); // XXX
         }
 
-        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        public override async Task<ConfigurationData> GetConfigurationForSetup()
+        {
+            var loginPage = await RequestStringWithCookies(LoginUrl, configData.CookieHeader.Value);
+            CQ cq = loginPage.Content;
+            string recaptchaSiteKey = cq.Find(".g-recaptcha").Attr("data-sitekey");
+            var result = this.configData;
+            result.CookieHeader.Value = loginPage.Cookies;
+            result.Captcha.SiteKey = recaptchaSiteKey;
+            result.Captcha.Version = "2";
+            return result;
+        }
+
+        public override async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
         {
             LoadValuesFromJson(configJson);
 
             var pairs = new Dictionary<string, string> {
                 { "username", configData.Username.Value },
-                { "password", configData.Password.Value }
+                { "password", configData.Password.Value },
+                { "g-recaptcha-response", configData.Captcha.Value },
             };
 
-            var response = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, null, SiteLink);
+            if (!string.IsNullOrWhiteSpace(configData.Captcha.Cookie))
+            {
+                // Cookie was manually supplied
+                CookieHeader = configData.Captcha.Cookie;
+                try
+                {
+                    var results = await PerformQuery(new TorznabQuery());
+                    if (!results.Any())
+                    {
+                        throw new Exception("Your cookie did not work");
+                    }
+
+                    IsConfigured = true;
+                    SaveConfig();
+                    return IndexerConfigurationStatus.Completed;
+                }
+                catch (Exception e)
+                {
+                    IsConfigured = false;
+                    throw new Exception("Your cookie did not work: " + e.Message);
+                }
+            }
+
+            var response = await RequestLoginAndFollowRedirect(TakeLoginUrl, pairs, null, true, null, SiteLink);
             await ConfigureIfOK(response.Cookies, response.Content != null && response.Content.Contains("logout.php"), () =>
             {
                 CQ dom = response.Content;
@@ -80,7 +117,7 @@ namespace Jackett.Indexers
             return IndexerConfigurationStatus.RequiresTesting;
         }
 
-        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
             var searchString = query.GetQueryString();
@@ -133,7 +170,7 @@ namespace Jackett.Indexers
                             continue;
 
                         var dateString = qRow.Children().ElementAt(5).Cq().Text().Trim();
-                        var pubDate = DateTime.ParseExact(dateString, "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture);
+                        var pubDate = DateTime.ParseExact(dateString, "yyyy-MM-ddHH:mm:ss", CultureInfo.InvariantCulture);
                         release.PublishDate = DateTime.SpecifyKind(pubDate, DateTimeKind.Local);
 
                         var sizeStr = qRow.Children().ElementAt(6).Cq().Text();

src/Jackett/Indexers/BitMeTV.cs

@@ -19,7 +19,7 @@ using System.Web;
 
 namespace Jackett.Indexers
 {
-    public class BitMeTV : BaseIndexer, IIndexer
+    public class BitMeTV : BaseWebIndexer
     {
         //https is poorly implemented on BitMeTV. Site uses http to login, but then redirects to https for search
         private string LoginUrl { get { return SiteLink + "login.php"; } }
@@ -33,12 +33,12 @@ namespace Jackett.Indexers
             set { base.configData = value; }
         }
 
-        public BitMeTV(IIndexerManagerService i, Logger l, IWebClient c, IProtectionService ps)
+        public BitMeTV(IIndexerConfigurationService configService, IWebClient c, Logger l, IProtectionService ps)
             : base(name: "BitMeTV",
                 description: "TV Episode specialty tracker",
                 link: "http://www.bitmetv.org/",
                 caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
-                manager: i,
+                configService: configService,
                 client: c,
                 logger: l,
                 p: ps,
@@ -62,7 +62,7 @@ namespace Jackett.Indexers
             return configData;
         }
 
-        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        public override async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
         {
             LoadValuesFromJson(configJson);
 
@@ -87,7 +87,7 @@ namespace Jackett.Indexers
             return IndexerConfigurationStatus.RequiresTesting;
         }
 
-        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
             var episodeSearchUrl = string.Format("{0}?search={1}&cat=0&incldead=1", SearchUrl, HttpUtility.UrlEncode(query.GetQueryString()));