Merge pull request #123 from flightlevel/ftdb

FTDB: Remove tracker

.gitignore

@@ -196,3 +196,4 @@ FakesAssemblies/
 *.opt
 /Build.mono
 /Build.windows
+/Output

Build.bat

@@ -11,6 +11,8 @@ copy /Y src\Jackett.Service\bin\Release\JackettService.exe build.windows\Jackett
 copy /Y src\Jackett.Service\bin\Release\JackettService.exe.config build.windows\JackettService.exe.config
 copy /Y src\Jackett.Tray\bin\Release\JackettTray.exe build.windows\JackettTray.exe
 copy /Y src\Jackett.Tray\bin\Release\JackettTray.exe.config build.windows\JackettTray.exe.config
+copy /Y src\Jackett.Updater\bin\Release\JackettUpdater.exe build.windows\JackettUpdater.exe
+copy /Y src\Jackett.Updater\bin\Release\JackettUpdater.exe.config build.windows\JackettUpdater.exe.config
 copy /Y LICENSE build.windows\LICENSE
 copy /Y README.md build.windows\README.md
 
@@ -25,6 +27,8 @@ copy /Y src\Jackett.Service\bin\Release\JackettService.exe build.mono\JackettSer
 copy /Y src\Jackett.Service\bin\Release\JackettService.exe.config build.mono\JackettService.exe.config
 copy /Y src\Jackett.Tray\bin\Release\JackettTray.exe build.mono\JackettTray.exe
 copy /Y src\Jackett.Tray\bin\Release\JackettTray.exe.config build.mono\JackettTray.exe.config
+copy /Y src\Jackett.Updater\bin\Release\JackettUpdater.exe build.mono\JackettUpdater.exe
+copy /Y src\Jackett.Updater\bin\Release\JackettUpdater.exe.config build.mono\JackettUpdater.exe.config
 copy /Y LICENSE build.mono\LICENSE
 copy /Y README.md build.mono\README.md
 copy /Y Upstart.config build.mono\Upstart.config

Installer.iss

@@ -4,7 +4,7 @@
 #define MyAppName "Jackett"
 #define MyAppVersion GetFileVersion("build.windows/Jackett.dll")
 #define MyAppPublisher "Jackett  Inc."
-#define MyAppURL "https://github.com/zone117x/Jackett"
+#define MyAppURL "https://github.com/Jackett/Jackett"
 #define MyAppExeName "JackettTray.exe"
 
 [Setup]
@@ -24,9 +24,10 @@ DefaultGroupName={#MyAppName}
 DisableProgramGroupPage=yes
 OutputBaseFilename=setup
 SetupIconFile=src\Jackett.Console\jackett.ico
-UninstallDisplayIcon={app}\JackettConsole.exe
+UninstallDisplayIcon={commonappdata}\Jackett\JackettConsole.exe
 Compression=lzma
 SolidCompression=yes
+DisableDirPage=yes
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
@@ -36,26 +37,27 @@ Name: "windowsService"; Description: "Install as a Windows Service"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "build.windows\JackettTray.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "build.windows\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "build.windows\JackettTray.exe"; DestDir: "{commonappdata}\Jackett"; Flags: ignoreversion
+Source: "build.windows\JackettUpdater.exe"; DestDir: "{commonappdata}\Jackett"; Flags: ignoreversion
+Source: "build.windows\*"; DestDir: "{commonappdata}\Jackett"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
-Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{group}\{#MyAppName}"; Filename: "{commonappdata}\Jackett\{#MyAppExeName}"
 Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
-Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+Name: "{commondesktop}\{#MyAppName}"; Filename: "{commonappdata}\Jackett\{#MyAppExeName}"; Tasks: desktopicon
 
 [Run]
-Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+Filename: "{commonappdata}\Jackett\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
 
 [Run]
-Filename: "{app}\JackettConsole.exe"; Parameters: "--Uninstall"; Flags: waituntilterminated;
-Filename: "{app}\JackettConsole.exe"; Parameters: "--ReserveUrls"; Flags: waituntilterminated;
-Filename: "{app}\JackettConsole.exe"; Parameters: "--MigrateSettings"; Flags: waituntilterminated;
-Filename: "{app}\JackettConsole.exe"; Parameters: "--Install"; Flags: waituntilterminated; Tasks: windowsService
-Filename: "{app}\JackettConsole.exe"; Parameters: "--Start"; Flags: waituntilterminated; Tasks: windowsService
+Filename: "{commonappdata}\Jackett\JackettConsole.exe"; Parameters: "--Uninstall"; Flags: waituntilterminated;
+Filename: "{commonappdata}\Jackett\JackettConsole.exe"; Parameters: "--ReserveUrls"; Flags: waituntilterminated;
+Filename: "{commonappdata}\Jackett\JackettConsole.exe"; Parameters: "--MigrateSettings"; Flags: waituntilterminated;
+Filename: "{commonappdata}\Jackett\JackettConsole.exe"; Parameters: "--Install"; Flags: waituntilterminated; Tasks: windowsService
+Filename: "{commonappdata}\Jackett\JackettConsole.exe"; Parameters: "--Start"; Flags: waituntilterminated; Tasks: windowsService
 
 [UninstallRun]
-Filename: "{app}\JackettConsole.exe"; Parameters: "--Uninstall"; Flags: waituntilterminated skipifdoesntexist
+Filename: "{commonappdata}\Jackett\JackettConsole.exe"; Parameters: "--Uninstall"; Flags: waituntilterminated skipifdoesntexist
 
 

README.md

@@ -2,12 +2,10 @@
 
 This project is a new fork and is recruiting development help.  If you are able to help out please contact us.
 
-#### Overview
-This software creates a [Torznab](https://github.com/Sonarr/Sonarr/wiki/Implementing-a-Torznab-indexer) (with [nZEDb](https://github.com/nZEDb/nZEDb/blob/master/docs/newznab_api_specification.txt) category numbering) and [TorrentPotato](https://github.com/RuudBurger/CouchPotatoServer/wiki/Couchpotato-torrent-provider) API server on your machine.  Torznab enables software such as [Sonarr](https://sonarr.tv) to access data from your favorite indexers in a similar fashion to rss but with added features such as searching.  TorrentPotato is an interface accessible to [CouchPotato](https://couchpota.to/).
-
 Jackett works as a proxy server: it translates queries from apps (Sonarr, SickRage, CouchPotato, Mylar, etc) into tracker-site-specific http queries, parses the html response, then sends results back to the requesting software. This allows for getting recent uploads (like RSS) and performing searches. Jackett is a single repository of maintained indexer scraping & translation logic - removing the burden from other apps. 
 
-We were previously focused on TV but are working on extending searches to allow for searching other items such as movies, comics, and music.
+Developer note: The software implements the [Torznab](https://github.com/Sonarr/Sonarr/wiki/Implementing-a-Torznab-indexer) (with [nZEDb](https://github.com/nZEDb/nZEDb/blob/master/docs/newznab_api_specification.txt) category numbering) and [TorrentPotato](https://github.com/RuudBurger/CouchPotatoServer/wiki/Couchpotato-torrent-provider) APIs.
+
 
 
 #### Supported Systems
@@ -15,46 +13,41 @@ We were previously focused on TV but are working on extending searches to allow
 * Linux and OSX using Mono 4 (v3 should work but you may experience crashes).
 
 
-#### Supported Trackers
- * [AlphaRatio](https://alpharatio.cc/)
- * [AnimeBytes](https://animebytes.tv/)
- * [AnimeTorrents](http://animetorrents.me/)
- * [Avistaz](https://avistaz.to/)
- * [BakaBT](http://bakabt.me/)
- * [bB](http://reddit.com/r/baconbits)
- * [BeyondHD](https://beyondhd.me/)
- * [BIT-HDTV](https://www.bit-hdtv.com)
- * [BitMeTV](http://www.bitmetv.org/)
- * [BTN](http://broadcasthe.net)
- * [Demonoid](http://www.demonoid.pw/)
- * [EuTorrents](https://eutorrents.to/)
- * [FileList](http://filelist.ro/)
- * [FrenchTorrentDb](http://www.frenchtorrentdb.com/)
- * [Freshon](https://freshon.tv/)
- * [HD-Space](https://hd-space.org/)
- * [HD-Torrents.org](https://hd-torrents.org/)
- * [Immortalseed.me](http://immortalseed.me)
- * [IPTorrents](https://iptorrents.com/)
- * [MoreThan.tv](https://morethan.tv/)
- * [NextGen](https://nxtgn.org/)
- * [pretome](https://pretome.info)
- * [PrivateHD](https://privatehd.to/)
- * [RARBG](https://rarbg.to/)
- * [RuTor](http://rutor.org/)
- * [SceneAccess](https://sceneaccess.eu/login)
- * [SceneTime](https://www.scenetime.com/)
- * [Shazbat](www.shazbat.tv/login)
- * [ShowRSS](https://showrss.info/)
- * [Strike](https://getstrike.net/)
- * [T411](http://www.t411.io/)
- * [TehConnection](https://tehconnection.eu/) 
- * [The Pirate Bay](https://thepiratebay.se/)
- * [TorrentBytes](https://www.torrentbytes.net/)
- * [TorrentDay](https://torrentday.eu/)
- * [TorrentLeech](http://www.torrentleech.org/)
- * [TorrentShack](http://torrentshack.me/)
- * [Torrentz](https://torrentz.eu/)
- * [TV Chaos UK](https://tvchaosuk.com/)
+#### Supported Private Trackers
+ * AlphaRatio
+ * AnimeBytes
+ * Avistaz
+ * bB
+ * BeyondHD
+ * BIT-HDTV
+ * BitMeTV
+ * BlueTigers
+ * BTN
+ * DanishBits
+ * Demonoid
+ * EuTorrents
+ * FileList
+ * Freshon
+ * HD-Space
+ * HD-Torrents
+ * Hounddawgs
+ * Immortalseed
+ * IPTorrents
+ * MoreThanTV
+ * NCore
+ * NextGen
+ * Pretome
+ * PrivateHD
+ * SceneAccess
+ * SceneTime
+ * Shazbat
+ * SpeedCD
+ * TehConnection
+ * TorrentBytes
+ * TorrentDay
+ * TorrentLeech
+ * TorrentShack
+ * TV Chaos UK
 
 #### Installation on Windows
 
@@ -68,18 +61,12 @@ Jackett can also be run from the command line using JackettConsole.exe if you wo
        * Debian/Ubunutu: apt-get install libcurl-dev
        * Redhat/Fedora: yum install libcurl-devel
        * For other distros see the  [Curl docs](http://curl.haxx.se/dlwiz/?type=devel).
- 3. Download and extract the latest ```.tar.bz2``` release from the [releases page](https://github.com/Jackett/Jackett/releases) and run Jackett using mono with the command "mono JackettConsole.exe".
+ 3. Download and extract the latest ```.tar.gz``` release from the [releases page](https://github.com/Jackett/Jackett/releases) and run Jackett using mono with the command "mono JackettConsole.exe".
  
 Detailed instructions for [Ubuntu 14.x](http://www.htpcguides.com/install-jackett-on-ubuntu-14-x-for-custom-torrents-in-sonarr/) and [Ubuntu 15.x](http://www.htpcguides.com/install-jackett-ubuntu-15-x-for-custom-torrents-in-sonarr/)
 
 #### Installation on Synology
-1. Install Sonarr & Mono 3.10 from synocommunity.
-2. Install Mono beta 3.12 from the main Synology repo (Or newer if available).
-3. Download jackett and place it in /opt/Jackett
-4. cd /opt
-5. chown -R {user who will run jackett} Jackett
-6. Copy Upstart.config to /etc/init/jackett.conf and replace the braces {} in the script with the username that you wish to run Jackett with.
-9. From anywhere on command line type "start jackett" . You should see output telling you that Jackett is running and you should be able to browse to {IP Address}:9117 . If not you should check /var/log/upstart/jackett.log and see what that says.
+Jackett is available as beta package from [SynoCommuniy](https://synocommunity.com/)
 
 #### Troubleshooting
 
@@ -89,14 +76,17 @@ You can pass various options when running via the command line, see --help for d
 
 * Unable to  connect to certain trackers on Linux
 
-Try running with the "--SSLFix true" if you are on Redhat/Fedora/NNS based libcurl.  If the tracker is currently configured try removing it and adding it again. Alternatively try running with a different client via --UseClient (Warning: safecurl just executes curl and your details may be seen from the process list).
+Try running with the "--SSLFix true" if you are on Redhat/Fedora/NNS based libcurl.  If the tracker is currently configured try removing it and adding it again. Alternatively try running with a different client via --UseClient (Warning: safecurl just executes curl and your details may be seen from the process list). You can also try running with the "--IgnoreSslErrors true" option which is useful if the site has an invalid SSL certificate.
 
 *  Enable logging
 
 You can get additional logging with the switches "-t -l".  Please post logs if you are unable to resolve your issue with these switches ensuring to remove your username/password/cookies.
 
+#### 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.
+
 ### Contributing
-All contributions are welcome just send a pull request.  Jackett's framework allows our team (and any other volunteering dev) to implement new trackers in an hour or two. If you'd like support for a new tracker but are not a developer then feel free to leave a request on the [issues page](https://github.com/zone117x/Jackett/issues).  It is recommended to use Visual studio 2015 when making code changes in this project.
+All contributions are welcome just send a pull request.  Jackett's framework allows our team (and any other volunteering dev) to implement new trackers in an hour or two. If you'd like support for a new tracker but are not a developer then feel free to leave a request on the [issues page](https://github.com/zone117x/Jackett/issues).  It is recommended to use Visual studio 2015 when making code changes in this project.  We currently only support private trackers.
 
 
 ### Screenshots

src/Jackett.Console/ConsoleOptions.cs

@@ -54,6 +54,9 @@ namespace Jackett.Console
         [Option('f', "SSLFix", HelpText = "[true/false] Linux Libcurl NSS Missing ECC Ciphers workaround (Use if you can't access some trackers) .")]
         public bool? SSLFix { get; set; }
 
+        [Option('n', "IgnoreSslErrors", HelpText = "[true/false] Linux Libcurl - Ignores invalid SSL certificates")]
+        public bool? IgnoreSslErrors { get; set; }
+
         [ParserState]
         public IParserState LastParserState { get; set; }
     }

src/Jackett.Console/Jackett.Console.csproj

@@ -54,12 +54,12 @@
       <HintPath>..\packages\Autofac.WebApi2.3.4.0\lib\net45\Autofac.Integration.WebApi.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Autofac.Integration.WebApi.Owin, Version=3.2.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autofac.WebApi2.Owin.3.2.0\lib\net45\Autofac.Integration.WebApi.Owin.dll</HintPath>
+    <Reference Include="Autofac.Integration.WebApi.Owin, Version=3.3.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autofac.WebApi2.Owin.3.3.0\lib\net45\Autofac.Integration.WebApi.Owin.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="AutoMapper, Version=4.0.4.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoMapper.4.0.4\lib\net45\AutoMapper.dll</HintPath>
+    <Reference Include="AutoMapper, Version=4.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.4.1.1\lib\net45\AutoMapper.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="CommandLine, Version=1.9.71.2, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
@@ -99,7 +99,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.0.1\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.2.0\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">

src/Jackett.Console/Program.cs

@@ -85,6 +85,14 @@ namespace JackettConsole
                         Engine.Logger.Info("SSL ECC workaround enabled.");
                     else if (options.SSLFix == false)
                         Engine.Logger.Info("SSL ECC workaround has been disabled.");
+
+                    // Ignore SSL errors on Curl
+                    Startup.IgnoreSslErrors = options.IgnoreSslErrors;
+                    if (options.IgnoreSslErrors == true)
+                    {
+                        Engine.Logger.Info("Curl will ignore SSL certificate errors.");
+                    }
+
                     /*  ======     Actions    =====  */
 
                     // Install service

src/Jackett.Console/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.0.0.0")]
+[assembly: AssemblyFileVersion("0.0.0.0")]

src/Jackett.Console/packages.config

@@ -3,8 +3,8 @@
   <package id="Autofac" version="3.5.2" targetFramework="net45" />
   <package id="Autofac.Owin" version="3.1.0" targetFramework="net45" />
   <package id="Autofac.WebApi2" version="3.4.0" targetFramework="net45" />
-  <package id="Autofac.WebApi2.Owin" version="3.2.0" targetFramework="net45" />
-  <package id="AutoMapper" version="4.0.4" targetFramework="net45" />
+  <package id="Autofac.WebApi2.Owin" version="3.3.0" targetFramework="net45" />
+  <package id="AutoMapper" version="4.1.1" targetFramework="net45" />
   <package id="CommandLineParser" version="1.9.71" targetFramework="net45" />
   <package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
@@ -22,6 +22,6 @@
   <package id="Microsoft.Owin.Hosting" version="3.0.1" targetFramework="net45" />
   <package id="Microsoft.Owin.StaticFiles" version="3.0.1" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
-  <package id="NLog" version="4.0.1" targetFramework="net45" />
+  <package id="NLog" version="4.2.0" targetFramework="net45" />
   <package id="Owin" version="1.0" targetFramework="net45" />
 </packages>

src/Jackett.Distribution/Jackett.Distribution.csproj

@@ -34,8 +34,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Octokit, Version=0.14.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Octokit.0.14.0\lib\net45\Octokit.dll</HintPath>
+    <Reference Include="Octokit, Version=0.16.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Octokit.0.16.0\lib\net45\Octokit.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

src/Jackett.Distribution/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.0.0.0")]
+[assembly: AssemblyFileVersion("0.0.0.0")]

src/Jackett.Distribution/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Octokit" version="0.14.0" targetFramework="net45" />
+  <package id="Octokit" version="0.16.0" targetFramework="net45" />
 </packages>

src/Jackett.Service/Jackett.Service.csproj

@@ -51,8 +51,8 @@
       <HintPath>..\packages\Autofac.WebApi2.3.4.0\lib\net45\Autofac.Integration.WebApi.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Autofac.Integration.WebApi.Owin, Version=3.2.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autofac.WebApi2.Owin.3.2.0\lib\net45\Autofac.Integration.WebApi.Owin.dll</HintPath>
+    <Reference Include="Autofac.Integration.WebApi.Owin, Version=3.3.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autofac.WebApi2.Owin.3.3.0\lib\net45\Autofac.Integration.WebApi.Owin.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Owin, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -80,7 +80,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.0.1\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.2.0\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">

src/Jackett.Service/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.0.0.0")]
+[assembly: AssemblyFileVersion("0.0.0.0")]

src/Jackett.Service/packages.config

@@ -3,7 +3,7 @@
   <package id="Autofac" version="3.5.2" targetFramework="net45" />
   <package id="Autofac.Owin" version="3.1.0" targetFramework="net45" />
   <package id="Autofac.WebApi2" version="3.4.0" targetFramework="net45" />
-  <package id="Autofac.WebApi2.Owin" version="3.2.0" targetFramework="net45" />
+  <package id="Autofac.WebApi2.Owin" version="3.3.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Owin" version="5.2.3" targetFramework="net45" />
@@ -18,6 +18,6 @@
   <package id="Microsoft.Owin.Hosting" version="3.0.1" targetFramework="net45" />
   <package id="Microsoft.Owin.StaticFiles" version="3.0.1" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
-  <package id="NLog" version="4.0.1" targetFramework="net45" />
+  <package id="NLog" version="4.2.0" targetFramework="net45" />
   <package id="Owin" version="1.0" targetFramework="net45" />
 </packages>

src/Jackett.Test/Indexers/BakaBTTests.cs

@@ -1,177 +0,0 @@
-using Jackett.Utils.Clients;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Autofac;
-using Jackett.Indexers;
-using FluentAssertions;
-using Newtonsoft.Json.Linq;
-using Jackett;
-using Newtonsoft.Json;
-
-namespace JackettTest.Indexers
-{
-    [TestFixture]
-    class BakaBTTests : TestBase
-    {
-        [Test]
-        public async void should_return_be_able_to_login_successfully()
-        {
-            // Do Login
-            TestUtil.RegisterStringCall(new WebRequest()
-            {
-                Url = "http://bakabt.me/login.php",
-                Cookies = "bbtid=b",
-                Type = RequestType.POST,
-                Referer = "http://bakabt.me/",
-                PostData = new Dictionary<string, string>()
-                {
-                     {"username", "user" },
-                     {"password", "pwd" },
-                     {"returnto", "/index.php" }
-                 }
-            }, (req) => {
-                return new WebClientStringResult()
-                {
-                    Status = System.Net.HttpStatusCode.Found,
-                    Cookies = "bbtid=c",
-                };
-            });
-
-            // Get login form
-            TestUtil.RegisterStringCall(new WebRequest()
-            {
-                Url = "http://bakabt.me/login.php",
-                Type = RequestType.GET
-            }, (req) => {
-                return new WebClientStringResult()
-                {
-                    Cookies = "bbtid=b",
-                    Status = System.Net.HttpStatusCode.Found
-                };
-            });
-
-            // Get logged in page
-            TestUtil.RegisterStringCall(new WebRequest()
-            {
-                Cookies = "bbtid=c",
-                Type = RequestType.GET,
-                Url = "http://bakabt.me/browse.php?only=0&hentai=1&incomplete=1&lossless=1&hd=1&multiaudio=1&bonus=1&c1=1&reorder=1&q="
-            }, (req) => {
-                return new WebClientStringResult()
-                {
-                    Content = TestUtil.GetResource("Indexers/BakaBTTestsSearchPage.html"),
-                    Status = System.Net.HttpStatusCode.OK
-                };
-            });
-
-            var indexer = TestUtil.Container.ResolveNamed<IIndexer>(BakaBT.GetIndexerID(typeof(BakaBT))) as BakaBT;
-
-            indexer.DisplayName.Should().Be("BakaBT");
-            indexer.DisplayDescription.Should().Be("Anime Community");
-            indexer.ID.Should().Be("bakabt");
-
-            indexer.LoginUrl.Should().Be("http://bakabt.me/login.php");
-
-            var token = JObject.Parse("{\"username\":\"user\",\"password\":\"pwd\"}");
-            await indexer.ApplyConfiguration(token);
-            indexer.IsConfigured.Should().Be(true);
-
-            ((string)TestUtil.IndexManager.LastSavedConfig["cookies"]).Should().Be("bbtid=c");
-        }
-
-        [Test]
-        public async void should_return_be_able_to_login_unsuccessfully()
-        {
-            // Do Login
-            TestUtil.RegisterStringCall(new WebRequest()
-            {
-                Url = "http://bakabt.me/login.php",
-                Cookies = "bbtid=b",
-                Type = RequestType.POST,
-                Referer = "http://bakabt.me/",
-                PostData = new Dictionary<string, string>()
-                {
-                     {"username", "user" },
-                     {"password", "pwd" },
-                     {"returnto", "/index.php" }
-                 }
-            }, (req) => {
-                return new WebClientStringResult()
-                {
-                    Status = System.Net.HttpStatusCode.OK,
-                    Cookies = "bbtid=c",
-                    Content = TestUtil.GetResource("Indexers/BakaBTTestsLoginError.html"),
-                };
-            });
-
-            // Get login form
-            TestUtil.RegisterStringCall(new WebRequest()
-            {
-                Url = "http://bakabt.me/login.php",
-                Type = RequestType.GET
-            }, (req) => {
-                return new WebClientStringResult()
-                {
-                    Cookies = "bbtid=b",
-                    Status = System.Net.HttpStatusCode.Found
-                };
-            });
-
-            var indexer = TestUtil.Container.ResolveNamed<IIndexer>(BakaBT.GetIndexerID(typeof(BakaBT))) as BakaBT;
-
-            var token = JObject.Parse("{\"username\":\"user\",\"password\":\"pwd\"}");
-            try {
-                await indexer.ApplyConfiguration(token);
-            }
-            catch(ExceptionWithConfigData e)
-            {
-                e.Message.Should().Be("Username or password is incorrect");
-            }
-
-            indexer.IsConfigured.Should().Be(false);
-        }
-
-        [Test]
-        public async void should_return_be_able_to_scrape_the_search_page()
-        {
-            // Do Search
-            TestUtil.RegisterStringCall(new WebRequest()
-            {
-                Url = "http://bakabt.me/browse.php?only=0&hentai=1&incomplete=1&lossless=1&hd=1&multiaudio=1&bonus=1&c1=1&reorder=1&q=Series",
-                Cookies = "bbtid=c",
-                Type = RequestType.GET
-            }, (req) => {
-                return new WebClientStringResult()
-                {
-                    Status = System.Net.HttpStatusCode.OK,
-                    Cookies = "bbtid=c",
-                    Content = TestUtil.GetResource("Indexers/BakaBTTestsSearchPage.html"),
-                };
-            });
-
-            var indexer = TestUtil.Container.ResolveNamed<IIndexer>(BakaBT.GetIndexerID(typeof(BakaBT))) as BakaBT;
-
-            indexer.LoadFromSavedConfiguration(JObject.Parse("{\"cookies\":\"bbtid=c\"}"));
-            var results = await indexer.PerformQuery(new Jackett.Models.TorznabQuery() { SearchTerm = "Series S1", Season = 1 });
-
-            results.Count().Should().Be(44);
-            results.First().Title.Should().Be("Golden Time Season 1 (BD 720p) [FFF]");
-            results.First().Guid.Should().Be("http://bakabt.me/torrent/180302/golden-time-bd-720p-fff");
-            results.First().Comments.Should().Be("http://bakabt.me/torrent/180302/golden-time-bd-720p-fff");
-            results.First().Size.Should().Be(10307921920);
-            results.First().Description.Should().Be("Golden Time Season 1 (BD 720p) [FFF]");
-            results.First().Link.Should().Be("http://bakabt.me/torrent/180302/golden-time-bd-720p-fff");
-            results.First().Peers.Should().Be(161);
-            results.First().Seeders.Should().Be(151);
-            results.First().MinimumRatio.Should().Be(1);
-
-            results.ElementAt(1).Title.Should().Be("Yowamushi Pedal Season 1 (BD 720p) [Commie]");
-            results.ElementAt(4).Title.Should().Be("Dungeon ni Deai o Motomeru no wa Machigatte Iru Darouka: Familia Myth Season 1 (480p) [HorribleSubs]");
-            results.ElementAt(5).Title.Should().Be("Is It Wrong to Try to Pick Up Girls in a Dungeon? Season 1 (480p) [HorribleSubs]");
-        }
-    }
-}

src/Jackett.Test/Indexers/BakaBTTestsLoginError.html

@@ -1,59 +0,0 @@
-<html class="">
-<head>
-    <meta charset="utf-8">
-    <title>Login - BakaBT</title>
-    <link rel="shortcut icon" href="/resources/img/favicon.png">
-    <base href="/">
-    <script type="text/javascript" async="" src="http://www.google-analytics.com/ga.js"></script>
-    <script type="text/javascript" src="resources/61ccf6a181efcd89748c30755b9c6541.js"></script>
-    <link rel="stylesheet" type="text/css" href="resources/61ccf6a181efcd89748c30755b9c6541.css">
-    <script type="text/javascript">var user = create_user({"id":0,"class":0,"avatars":false});</script>
-    <style type="text/css">
-        .fancybox-margin {
-            margin-right: 15px;
-        }
-    </style>
-    <style type="text/css">
-        @media print {
-            .lpiframeoverlay {
-                display: none;
-            }
-        }
-    </style>
-</head>
-<body>
-    <div class="dango"></div><div class="heart" style="transform: rotate(0deg); bottom: 50px; right: 55px;"></div><div class="main">
-        <div class="banner" style="background-image:url(images/banners/Grimmjow.jpg);"><a href="" class="home"></a><a href="rss.php?uid=0&amp;pass=" class="icon rss" title="RSS Feed"></a></div><div class="headerbar"><ul><li><a href="">News</a></li><li><a href="browse.php">Browse</a></li><li><a href="http://forums.bakabt.me">Forums</a></li><li><a href="http://bakashots.me">BakaSHOTS</a><ul><li><a href="http://compare.bakashots.me">BakaCOMPARE</a></li></ul></li><li><a href="http://wiki.bakabt.me">Wiki</a><ul><li><a href="http://wiki.bakabt.me/index.php/Rules">Rules</a></li><li><a href="http://wiki.bakabt.me/index.php/FAQ">FAQ</a></li></ul></li><li><a href="http://wiki.bakabt.me/index.php/IRC" title="#bakabt@irc.rizon.net">IRC</a><ul><li><a href="webirc.php">Web IRC</a></li></ul></li><li><a href="http://www.cafepress.com/bakabt">Store</a></li><li><a href="donate.php">Donate</a></li><li><a href="#" onclick="return false;">More…</a><ul><li><a href="http://blog.bakabt.me">Blog</a></li><li><a href="topten.php">Top 10</a></li><li><a href="banners.php">Banners</a></li><li><a href="random" title="Go to a random torrent">Random</a></li><li><a href="keywords.php">Keywords</a></li></ul></li><li><form method="get" action="browse.php"><input type="text" maxlength="128" name="q"></form></li><li class="welcomeback">Welcome, <strong>Guest</strong>. <a href="login.php">Login</a> or <a href="signup.php">Signup</a></li></ul></div>
-        <div class="content">
-            <div class="login">
-                <h1>Login</h1>
-                <p class="error">Username or password is incorrect</p>
-                <form method="post" action="login.php" name="login">
-                    <input type="text" name="username" placeholder="Username" autocomplete="off" style="cursor: auto; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAASCAYAAABSO15qAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QsPDiIBl+zfqgAAAdJJREFUOMvNkj9oU2EUxX/3e4+X2AYtgoIotAUVlZSiVQKCOFgwQ50cKhUcg4qbEITwvfyTjEKnCqUgbqJooQgFRXAROoiiKFWHOsdiSw0UXvK4DkloGl+wOHm2c7ice++5F/47ZLPZQ9baM21urU1Za0d61ZtOYq29FY/Hl0VkDhBARGRGRN75vl+JMnC7eCAi/cCItXZSVRsichJAVb9FGUg3933/tYicA76qaigix4FXxWLxQk+DXC43aIzZXa/XN13XHTLGLIqI0+ocApdVtSoiiUaj8aNSqbzftoLruneA67FY7M8OTaN5keawruvOApnuEM2/Xk1a6Y+p6j5VXReR/Y7jPANMu+tfDTqRz+dfAOOq+tEY07q/x1j6EqeG9rLx/QPPF5eo9fiDK8B4i5bb+pGJDBOpJH3EOJZKk5kcjX4k4CjQUNVPpVLpSVNKMHjAY315nun7D1gJoS8WjzYol8ulIAhGwzC8CWhTrfFy9h7Tj1yy+dsMO7BarfbOoBOFQkHB40TqLLt+fubL6h4uXp0iObDCzN2HVCNeOQL9nE6fZzg4yMbcG3Caan3n91/j6eMlfnmHmbpxjeTAJm8XFljb+Qpb8BIeQS3YVvMbj7WWjTVB6I8AAAAASUVORK5CYII=); background-attachment: scroll; background-position: 100% 50%; background-repeat: no-repeat;">
-                    <input type="password" name="password" onfocus="formInUse = true;" placeholder="Password" autocomplete="off" style="cursor: auto; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAASCAYAAABSO15qAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QsPDiIBl+zfqgAAAdJJREFUOMvNkj9oU2EUxX/3e4+X2AYtgoIotAUVlZSiVQKCOFgwQ50cKhUcg4qbEITwvfyTjEKnCqUgbqJooQgFRXAROoiiKFWHOsdiSw0UXvK4DkloGl+wOHm2c7ice++5F/47ZLPZQ9baM21urU1Za0d61ZtOYq29FY/Hl0VkDhBARGRGRN75vl+JMnC7eCAi/cCItXZSVRsichJAVb9FGUg3933/tYicA76qaigix4FXxWLxQk+DXC43aIzZXa/XN13XHTLGLIqI0+ocApdVtSoiiUaj8aNSqbzftoLruneA67FY7M8OTaN5keawruvOApnuEM2/Xk1a6Y+p6j5VXReR/Y7jPANMu+tfDTqRz+dfAOOq+tEY07q/x1j6EqeG9rLx/QPPF5eo9fiDK8B4i5bb+pGJDBOpJH3EOJZKk5kcjX4k4CjQUNVPpVLpSVNKMHjAY315nun7D1gJoS8WjzYol8ulIAhGwzC8CWhTrfFy9h7Tj1yy+dsMO7BarfbOoBOFQkHB40TqLLt+fubL6h4uXp0iObDCzN2HVCNeOQL9nE6fZzg4yMbcG3Caan3n91/j6eMlfnmHmbpxjeTAJm8XFljb+Qpb8BIeQS3YVvMbj7WWjTVB6I8AAAAASUVORK5CYII=); background-attachment: scroll; background-position: 100% 50%; background-repeat: no-repeat;">
-                    <input type="submit" value="Log in" class="border button">
-                    <input type="hidden" name="returnto" value="/index.php">
-                </form>
-                <p><a href="recover.php">Recover Password </a></p>
-                <p><a href="signup.php">Sign up</a></p>
-                <script type="text/javascript">
-var formInUse = false;
-$(document).ready(function() {
-	if(!formInUse)
-		document.login.username.focus();
-});
-
-                </script>
-            </div>
-            <div class="clear"></div>
-        </div>
-    </div>
-
-
-    <script>try{function lpshowmenudiv(id){   closelpmenus(id);   var div = document.getElementById('lppopup'+id);   var btn = document.getElementById('lp'+id);   if(btn && div){     var btnstyle = window.getComputedStyle(btn, null);     var divstyle = window.getComputedStyle(div, null);     var posx = btn.offsetLeft;     posx -= 80;     var divwidth = parseInt(divstyle.getPropertyValue('width'));     if(posx + divwidth > window.innerWidth - 25){       posx -= ((posx + divwidth) - window.innerWidth + 25);     }     div.style.left = posx + "px";     div.style.top = (btn.offsetTop + parseInt(btnstyle.getPropertyValue('height'))) + "px";         if(div.style.display=='block'){div.style.display = 'none'; if(typeof(slideup)=='function'){slideup();} }    else div.style.display = 'block';       } }function closelpmenus(id){   if(typeof(lpgblmenus)!='undefined'){     for(var i=0; i < lpgblmenus.length; i++){       if((id==null || lpgblmenus[i]!='lppopup'+id) && document.getElementById(lpgblmenus[i]))         document.getElementById(lpgblmenus[i]).style.display = 'none';     }   }} var lpcustomEvent = document.createEvent('Event'); lpcustomEvent.initEvent('lpCustomEventMenu', true, true); }catch(e){}</script>
-    <script>try{if(typeof(lpgblmenus)=='undefined'){ lpgblmenus = new Array(); }   lpgblmenus[lpgblmenus.length] = 'lppopupnever';   }catch(e){}</script>
-    <script>try{document.addEventListener('mouseup', function(e){ if(typeof(closelpmenus)=='function'){closelpmenus();}}, false)}catch(e){}</script><div style="position: absolute; z-index: -10000; top: 0px; left: 0px; right: 0px; height: 592px;"></div>
-    <script id="hiddenlpsubmitdiv" style="display: none;"></script>
-    <script>try{for(var lastpass_iter=0; lastpass_iter < document.forms.length; lastpass_iter++){ var lastpass_f = document.forms[lastpass_iter]; if(typeof(lastpass_f.lpsubmitorig2)=="undefined"){ lastpass_f.lpsubmitorig2 = lastpass_f.submit; if (typeof(lastpass_f.lpsubmitorig2)=='object'){ continue;}lastpass_f.submit = function(){ var form=this; var customEvent = document.createEvent("Event"); customEvent.initEvent("lpCustomEvent", true, true); var d = document.getElementById("hiddenlpsubmitdiv"); if (d) {for(var i = 0; i < document.forms.length; i++){ if(document.forms[i]==form){ if (typeof(d.innerText) != 'undefined') { d.innerText=i.toString(); } else { d.textContent=i.toString(); } } } d.dispatchEvent(customEvent); }form.lpsubmitorig2(); } } }}catch(e){}</script>
-</body>
-</html>

src/Jackett.Test/Jackett.Test.csproj

@@ -50,24 +50,24 @@
       <HintPath>..\packages\Autofac.WebApi2.3.4.0\lib\net45\Autofac.Integration.WebApi.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Autofac.Integration.WebApi.Owin, Version=3.2.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autofac.WebApi2.Owin.3.2.0\lib\net45\Autofac.Integration.WebApi.Owin.dll</HintPath>
+    <Reference Include="Autofac.Integration.WebApi.Owin, Version=3.3.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autofac.WebApi2.Owin.3.3.0\lib\net45\Autofac.Integration.WebApi.Owin.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="AutoMapper, Version=4.0.4.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoMapper.4.0.4\lib\net45\AutoMapper.dll</HintPath>
+    <Reference Include="AutoMapper, Version=4.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.4.1.1\lib\net45\AutoMapper.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="CsQuery, Version=1.3.3.249, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\CsQuery.1.3.4\lib\net40\CsQuery.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FluentAssertions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.3.5.0\lib\net45\FluentAssertions.dll</HintPath>
+    <Reference Include="FluentAssertions, Version=4.0.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.0.1\lib\net45\FluentAssertions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FluentAssertions.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.3.5.0\lib\net45\FluentAssertions.Core.dll</HintPath>
+    <Reference Include="FluentAssertions.Core, Version=4.0.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.0.1\lib\net45\FluentAssertions.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -92,7 +92,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.0.1\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.2.0\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="nunit.core, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
@@ -158,7 +158,6 @@
     </Otherwise>
   </Choose>
   <ItemGroup>
-    <Compile Include="Indexers\BakaBTTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Services\ProtectionServiceTests.cs" />
     <Compile Include="TestBase.cs" />
@@ -166,6 +165,7 @@
     <Compile Include="TestUtil.cs" />
     <Compile Include="TestWebClient.cs" />
     <Compile Include="Util\ServerUtilTests.cs" />
+    <Compile Include="Util\TvCategoryParserTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config">
@@ -180,10 +180,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Indexers\BakaBTTestsSearchPage.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Indexers\BakaBTTestsLoginError.html" />
+    <Folder Include="Indexers\" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">

src/Jackett.Test/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.0.0.0")]
+[assembly: AssemblyFileVersion("0.0.0.0")]

src/Jackett.Test/Util/TvCategoryParserTests.cs

@@ -0,0 +1,27 @@
+using NUnit.Framework;
+using Jackett.Utils;
+
+namespace JackettTest.Util
+{
+    [TestFixture]
+    internal class ParseTvShowQualityTest : TestBase
+    {
+        [TestCase("Chuck.S04E05.HDTV.XviD-LOL", 5030)]
+        [TestCase("Gold.Rush.S04E05.Garnets.or.Gold.REAL.REAL.PROPER.HDTV.x264-W4F", 5030)]
+        [TestCase("Chuck.S03E17.REAL.PROPER.720p.HDTV.x264-ORENJI-RP", 5040)]
+        [TestCase("Covert.Affairs.S05E09.REAL.PROPER.HDTV.x264-KILLERS", 5030)]
+        [TestCase("Mythbusters.S14E01.REAL.PROPER.720p.HDTV.x264-KILLERS", 5040)]
+        [TestCase("Orange.Is.the.New.Black.s02e06.real.proper.720p.webrip.x264-2hd", 5040)]
+        [TestCase("Top.Gear.S21E07.Super.Duper.Real.Proper.HDTV.x264-FTP", 5030)]
+        [TestCase("Top.Gear.S21E07.PROPER.HDTV.x264-RiVER-RP", 5030)]
+        [TestCase("House.S07E11.PROPER.REAL.RERIP.1080p.BluRay.x264-TENEIGHTY", 5040)]
+        [TestCase("The.Blacklist.S02E05", 5000)]
+        [TestCase("The.IT.Crowd.S01.DVD.REMUX.DD2.0.MPEG2-DTG", 5030)]
+
+        public void should_parse_quality_from_title(string title, int quality)
+        {
+            Assert.That(TvCategoryParser.ParseTvShowQuality(title), Is.EqualTo(quality));
+        }
+    }
+}
+

src/Jackett.Test/packages.config

@@ -3,10 +3,10 @@
   <package id="Autofac" version="3.5.2" targetFramework="net45" />
   <package id="Autofac.Owin" version="3.1.0" targetFramework="net45" />
   <package id="Autofac.WebApi2" version="3.4.0" targetFramework="net45" />
-  <package id="Autofac.WebApi2.Owin" version="3.2.0" targetFramework="net45" />
-  <package id="AutoMapper" version="4.0.4" targetFramework="net45" />
+  <package id="Autofac.WebApi2.Owin" version="3.3.0" targetFramework="net45" />
+  <package id="AutoMapper" version="4.1.1" targetFramework="net45" />
   <package id="CsQuery" version="1.3.4" targetFramework="net45" />
-  <package id="FluentAssertions" version="3.5.0" targetFramework="net45" />
+  <package id="FluentAssertions" version="4.0.1" targetFramework="net45" />
   <package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />
@@ -19,7 +19,7 @@
   <package id="Microsoft.Owin.Host.HttpListener" version="3.0.1" targetFramework="net45" />
   <package id="Microsoft.Owin.Hosting" version="3.0.1" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
-  <package id="NLog" version="4.0.1" targetFramework="net45" />
+  <package id="NLog" version="4.2.0" targetFramework="net45" />
   <package id="NUnit" version="2.6.4" targetFramework="net45" />
   <package id="NUnitTestAdapter" version="2.0.0" targetFramework="net45" />
   <package id="Owin" version="1.0" targetFramework="net45" />

src/Jackett.Tray/Jackett.Tray.csproj

@@ -51,12 +51,12 @@
       <HintPath>..\packages\Autofac.WebApi2.3.4.0\lib\net45\Autofac.Integration.WebApi.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Autofac.Integration.WebApi.Owin, Version=3.2.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autofac.WebApi2.Owin.3.2.0\lib\net45\Autofac.Integration.WebApi.Owin.dll</HintPath>
+    <Reference Include="Autofac.Integration.WebApi.Owin, Version=3.3.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autofac.WebApi2.Owin.3.3.0\lib\net45\Autofac.Integration.WebApi.Owin.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="AutoMapper, Version=4.0.4.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoMapper.4.0.4\lib\net45\AutoMapper.dll</HintPath>
+    <Reference Include="AutoMapper, Version=4.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.4.1.1\lib\net45\AutoMapper.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Owin, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -84,7 +84,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.0.1\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.2.0\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">

src/Jackett.Tray/Main.cs

@@ -42,6 +42,14 @@ namespace JackettTray
                 Engine.Logger.Info("Starting server from tray");
                 Engine.Server.Start();
             }
+
+            Task.Factory.StartNew(WaitForEvent);
+        }
+
+        private void WaitForEvent()
+        {
+            Engine.LockService.WaitForSignal();
+            Application.Exit();
         }
 
         void toolStripMenuItemWebUI_Click(object sender, EventArgs e)

src/Jackett.Tray/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.0.0.0")]
+[assembly: AssemblyFileVersion("0.0.0.0")]

src/Jackett.Tray/packages.config

@@ -3,8 +3,8 @@
   <package id="Autofac" version="3.5.2" targetFramework="net45" />
   <package id="Autofac.Owin" version="3.1.0" targetFramework="net45" />
   <package id="Autofac.WebApi2" version="3.4.0" targetFramework="net45" />
-  <package id="Autofac.WebApi2.Owin" version="3.2.0" targetFramework="net45" />
-  <package id="AutoMapper" version="4.0.4" targetFramework="net45" />
+  <package id="Autofac.WebApi2.Owin" version="3.3.0" targetFramework="net45" />
+  <package id="AutoMapper" version="4.1.1" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Owin" version="5.2.3" targetFramework="net45" />
@@ -19,6 +19,6 @@
   <package id="Microsoft.Owin.Hosting" version="3.0.1" targetFramework="net45" />
   <package id="Microsoft.Owin.StaticFiles" version="3.0.1" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
-  <package id="NLog" version="4.0.1" targetFramework="net45" />
+  <package id="NLog" version="4.2.0" targetFramework="net45" />
   <package id="Owin" version="1.0" targetFramework="net45" />
 </packages>

src/Jackett.Updater/App.config

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+    </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Http.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

src/Jackett.Updater/Jackett.Updater.csproj

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{A61E311A-6F8B-4497-B5E4-2EA8994C7BD8}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Jackett.Updater</RootNamespace>
+    <AssemblyName>JackettUpdater</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>jackett.ico</ApplicationIcon>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="CommandLine, Version=1.9.71.2, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
+      <HintPath>..\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.4.2.0\lib\net45\NLog.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="UpdaterConsoleOptions.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Jackett\Jackett.csproj">
+      <Project>{e636d5f8-68b4-4903-b4ed-ccfd9c9e899f}</Project>
+      <Name>Jackett</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="jackett.ico" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

src/Jackett.Updater/Program.cs

@@ -0,0 +1,149 @@
+using CommandLine;
+using Jackett.Services;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Jackett.Updater
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            new Program().Run(args);
+        }
+
+        private void Run(string[] args)
+        {
+            Engine.Logger.Info("Jackett Updater v" + GetCurrentVersion());
+
+            try {
+                var options = new UpdaterConsoleOptions();
+                if (Parser.Default.ParseArguments(args, options))
+                {
+                    ProcessUpdate(options);
+                }
+                else
+                {
+                    Engine.Logger.Error("Failed to process update arguments!: " + string.Join(" ", args));
+                    Console.ReadKey();
+                }
+            }
+            catch (Exception e)
+            {
+                Engine.Logger.Error(e, "Exception applying update!");
+            }
+        }
+
+        private string GetCurrentVersion()
+        {
+            var assembly = System.Reflection.Assembly.GetExecutingAssembly();
+            var fvi = FileVersionInfo.GetVersionInfo(assembly.Location);
+            return fvi.FileVersion;
+        }
+
+        private void ProcessUpdate(UpdaterConsoleOptions options)
+        {
+            var updateLocation = GetUpdateLocation();
+            if(!(updateLocation.EndsWith("\\") || updateLocation.EndsWith("/")))
+            {
+                updateLocation += Path.DirectorySeparatorChar;
+            }
+
+            var isWindows = System.Environment.OSVersion.Platform != PlatformID.Unix;
+            var trayRunning = false;
+            var trayProcesses = Process.GetProcessesByName("JackettTray");
+            if (isWindows)
+            {
+                if (trayProcesses.Count() > 0)
+                {  
+                    foreach (var proc in trayProcesses)
+                    {
+                        try
+                        {
+                            Engine.Logger.Info("Killing tray process " + proc.Id);
+                            proc.Kill();
+                            trayRunning = true;
+                        }
+                        catch { }
+                    }
+                }
+            }
+
+            Engine.Logger.Info("Waiting for Jackett to close..");
+            Thread.Sleep(2000);
+
+            var files = Directory.GetFiles(updateLocation, "*.*", SearchOption.AllDirectories);
+            foreach(var file in files)
+            {
+                var fileName = Path.GetFileName(file).ToLowerInvariant();
+
+                if (fileName.EndsWith(".zip") ||
+                    fileName.EndsWith(".tar") ||
+                    fileName.EndsWith(".gz"))
+                {
+                    continue;
+                }
+                try {
+                    Engine.Logger.Info("Copying " + fileName);
+                    var dest = Path.Combine(options.Path, file.Substring(updateLocation.Length));
+                    File.Copy(file, dest, true);
+                }
+                catch(Exception e)
+                {
+                    Engine.Logger.Error(e);
+                }
+            }
+
+            if (trayRunning)
+            {
+                var startInfo = new ProcessStartInfo()
+                {
+                    Arguments = options.Args,
+                    FileName = Path.Combine(options.Path, "JackettTray.exe"),
+                    UseShellExecute = true
+                };
+
+                Process.Start(startInfo);
+            }
+
+            if(string.Equals(options.Type, "JackettService.exe", StringComparison.InvariantCultureIgnoreCase))
+            {
+                var serviceHelper = new ServiceConfigService(null, null);
+                if (serviceHelper.ServiceExists())
+                {
+                    serviceHelper.Start();
+                }
+            } else
+            {
+                var startInfo = new ProcessStartInfo()
+                {
+                    Arguments = options.Args,
+                    FileName = Path.Combine(options.Path, "JackettConsole.exe"),
+                    UseShellExecute = true
+                };
+
+                if (!isWindows)
+                {
+                    startInfo.Arguments = startInfo.FileName + " " + startInfo.Arguments;
+                    startInfo.FileName = "mono";
+                }
+
+                Engine.Logger.Info("Starting Jackett: " + startInfo.FileName + " " + startInfo.Arguments);
+                Process.Start(startInfo);
+            }
+        }
+
+        private string GetUpdateLocation()
+        {
+            var location = new Uri(Assembly.GetEntryAssembly().GetName().CodeBase);
+            return new FileInfo(location.AbsolutePath).DirectoryName;
+        }
+    }
+}

src/Jackett.Updater/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Jackett.Updater")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Jackett.Updater")]
+[assembly: AssemblyCopyright("Copyright ©  2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("a61e311a-6f8b-4497-b5e4-2ea8994c7bd8")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("0.0.0.0")]
+[assembly: AssemblyFileVersion("0.0.0.0")]

src/Jackett.Updater/UpdaterConsoleOptions.cs

@@ -0,0 +1,21 @@
+using CommandLine;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Jackett.Updater
+{
+    public class UpdaterConsoleOptions
+    {
+        [Option('p', "Path", HelpText = "Install location")]
+        public string Path { get; set; }
+
+        [Option('t', "Type", HelpText = "Install type")]
+        public string Type { get; set; }
+
+        [Option('a', "Args", HelpText = "Launch arguments")]
+        public string Args { get; set; }
+    }
+}

src/Jackett.Updater/packages.config

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="CommandLineParser" version="1.9.71" targetFramework="net45" />
+  <package id="NLog" version="4.2.0" targetFramework="net45" />
+</packages>

src/Jackett.sln

@@ -27,6 +27,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jackett.Distribution", "Jac
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Website", "Website\Website.csproj", "{6B6AB1B0-5ABD-4696-A3D2-70E991174625}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jackett.Updater", "Jackett.Updater\Jackett.Updater.csproj", "{A61E311A-6F8B-4497-B5E4-2EA8994C7BD8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -65,6 +67,10 @@ Global
 		{6B6AB1B0-5ABD-4696-A3D2-70E991174625}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6B6AB1B0-5ABD-4696-A3D2-70E991174625}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6B6AB1B0-5ABD-4696-A3D2-70E991174625}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A61E311A-6F8B-4497-B5E4-2EA8994C7BD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A61E311A-6F8B-4497-B5E4-2EA8994C7BD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A61E311A-6F8B-4497-B5E4-2EA8994C7BD8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A61E311A-6F8B-4497-B5E4-2EA8994C7BD8}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/Jackett/Content/custom.css

@@ -220,7 +220,7 @@ hr {
     text-align: center;
 }
 
-#jackett-allowext {
+#jackett-allowext, #jackett-allowupdate, #jackett-logging {
     width: 25px;
 }
 

src/Jackett/Content/custom.js

@@ -24,6 +24,8 @@ function loadJackettSettings() {
         $("#jackett-port").val(data.config.port);
         $("#jackett-savedir").val(data.config.blackholedir);
         $("#jackett-allowext").attr('checked', data.config.external);
+        $("#jackett-allowupdate").attr('checked', data.config.updatedisabled);
+        $("#jackett-logging").attr('checked', data.config.logging);
         var password = data.config.password;
         $("#jackett-adminpwd").val(password);
         if (password != null && password != '') {
@@ -544,10 +546,14 @@ function bindUIButtons() {
     $("#change-jackett-port").click(function () {
         var jackett_port = $("#jackett-port").val();
         var jackett_external = $("#jackett-allowext").is(':checked');
+        var jackett_update = $("#jackett-allowupdate").is(':checked');
+        var jackett_logging = $("#jackett-logging").is(':checked');
         var jsonObject = {
             port: jackett_port,
             external: jackett_external,
-            blackholedir: $("#jackett-savedir").val()
+            updatedisabled: jackett_update,
+            blackholedir: $("#jackett-savedir").val(),
+            logging: jackett_logging
         };
         var jqxhr = $.post("/admin/set_config", JSON.stringify(jsonObject), function (data) {
             if (data.result == "error") {
@@ -570,6 +576,19 @@ function bindUIButtons() {
         });
     });
 
+    $("#trigger-updater").click(function () {
+        var jqxhr = $.get("/admin/trigger_update", function (data) {
+            if (data.result == "error") {
+                doNotify("Error: " + data.error, "danger", "glyphicon glyphicon-alert");
+                return;
+            } else {
+                doNotify("Updater triggered see log for details..", "success", "glyphicon glyphicon-ok");
+            }
+        }).fail(function () {
+            doNotify("Request to Jackett server failed", "danger", "glyphicon glyphicon-alert");
+        });
+    });
+
     $("#change-jackett-password").click(function () {
         var password = $("#jackett-adminpwd").val();
         var jsonObject = { password: password };

src/Jackett/Content/index.html

@@ -60,8 +60,22 @@
         </div>
         <hr />
         <h3>Jackett Configuration</h3>
+        <div class="text-center">
+            <div class="btn-group">
+                <button id="change-jackett-port" class="btn btn-primary btn-sm">
+                    <i class="fa fa-wrench"></i>   Apply server settings <span class="glyphicon glyphicon-ok-wrench" aria-hidden="true"></span>
+                </button>
+                <button id="view-jackett-logs" class="btn btn-danger btn-sm">
+                    <i class="fa fa-rss"></i> View logs <span class="glyphicon glyphicon-ok-wrench" aria-hidden="true"></span>
+                </button>
+                <button id="trigger-updater" class="btn btn-warning btn-sm">
+                    <i class="fa fa-wrench"></i>   Check for updates <span class="glyphicon glyphicon-ok-wrench" aria-hidden="true"></span>
+                </button>
+            </div>
+        </div>
+        <br />
         <div class="input-area">
-            <span class="input-header">Admin Password: </span>
+            <span class="input-header">Admin password: </span>
             <input id="jackett-adminpwd" class="form-control input-right" type="password" value="" placeholder="Blank to disable" />
             <button id="change-jackett-password" class="btn btn-primary btn-sm">
                 <i class="fa fa-user-secret"></i>  Set Password <span class="glyphicon glyphicon-ok-wrench" aria-hidden="true"></span>
@@ -73,12 +87,7 @@
         <div class="input-area">
             <span class="input-header">Server port: </span>
             <input id="jackett-port" class="form-control input-right" type="text" value="" placeholder="9117">
-            <button id="change-jackett-port" class="btn btn-primary btn-sm">
-                <i class="fa fa-wrench"></i>   Apply server settings <span class="glyphicon glyphicon-ok-wrench" aria-hidden="true"></span>
-            </button>
-            <button id="view-jackett-logs" class="btn btn-danger btn-sm">
-                <i class="fa fa-rss"></i> View logs <span class="glyphicon glyphicon-ok-wrench" aria-hidden="true"></span>
-            </button>
+
         </div>
         <div class="input-area">
             <span class="input-header">Manual download blackhole directory: </span>
@@ -88,6 +97,15 @@
             <span class="input-header">External access: </span>
             <input id="jackett-allowext" class="form-control input-right" type="checkbox" />
         </div>
+        <div class="input-area">
+            <span class="input-header">Disable auto update: </span>
+            <input id="jackett-allowupdate" class="form-control input-right" type="checkbox" />
+
+        </div>
+        <div class="input-area">
+            <span class="input-header">Enhanced logging: </span>
+            <input id="jackett-logging" class="form-control input-right" type="checkbox" />
+        </div>
         <hr />
         <div id="footer">
             Jackett Version <span id="app-version"></span>

src/Jackett/Controllers/AdminController.cs

@@ -39,8 +39,9 @@ namespace Jackett.Controllers
         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)
+        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;
@@ -50,6 +51,7 @@ namespace Jackett.Controllers
             cacheService = c;
             logger = l;
             logCache = lc;
+            updater = u;
         }
 
         private async Task<JToken> ReadPostDataJson()
@@ -291,6 +293,15 @@ namespace Jackett.Controllers
             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()
@@ -303,7 +314,10 @@ namespace Jackett.Controllers
                 cfg["external"] = serverService.Config.AllowExternal;
                 cfg["api_key"] = serverService.Config.APIKey;
                 cfg["blackholedir"] = serverService.Config.BlackholeDir;
+                cfg["updatedisabled"] = serverService.Config.UpdateDisabled;
                 cfg["password"] = string.IsNullOrEmpty(serverService.Config.AdminPassword) ? string.Empty : serverService.Config.AdminPassword.Substring(0, 10);
+                cfg["logging"] = Startup.TracingEnabled;
+               
 
                 jsonReply["config"] = cfg;
                 jsonReply["app_version"] = config.GetVersion();
@@ -331,9 +345,19 @@ namespace Jackett.Controllers
                 int port = (int)postData["port"];
                 bool external = (bool)postData["external"];
                 string saveDir = (string)postData["blackholedir"];
+                bool updateDisabled = (bool)postData["updatedisabled"];
+                bool logging = (bool)postData["logging"];
+
+
+                Engine.Server.Config.UpdateDisabled = updateDisabled;
+                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";
@@ -371,17 +395,16 @@ namespace Jackett.Controllers
                         }
                     }
 
-                    (new Thread(() =>
-                    {
-                        Thread.Sleep(500);
-                        serverService.Stop();
-                        Engine.BuildContainer();
-                        Engine.Server.Initalize();
-                        Engine.Server.Start();
-                    })).Start();
+                (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))

src/Jackett/CurlHelper.cs

@@ -135,6 +135,12 @@ namespace Jackett
                         easy.ForbidReuse = true;
                     }
 
+                    if (Startup.IgnoreSslErrors == true)
+                    {
+                        easy.SetOpt(CurlOption.SslVerifyhost, false);
+                        easy.SetOpt(CurlOption.SslVerifyPeer, false);
+                    }
+
                     easy.Perform();
 
                     if (easy.LastErrorCode != CurlCode.Ok)

src/Jackett/Engine.cs

@@ -20,7 +20,7 @@ namespace Jackett
         static Engine()
         {
             BuildContainer();
-           
+
         }
 
         public static void BuildContainer()
@@ -74,6 +74,14 @@ namespace Jackett
             }
         }
 
+        public static ITrayLockService LockService
+        {
+            get
+            {
+                return container.Resolve<ITrayLockService>();
+            }
+        }
+
         public static IServerService Server
         {
             get
@@ -128,21 +136,49 @@ namespace Jackett
 
             var logConsole = new ColoredConsoleTarget();
             logConfig.AddTarget("console", logConsole);
-            
+
             logConsole.Layout = "${simpledatetime} ${level} ${message} ${exception:format=ToString}";
             var logConsoleRule = new LoggingRule("*", logLevel, logConsole);
             logConfig.LoggingRules.Add(logConsoleRule);
 
             var logService = new LogCacheService();
             logConfig.AddTarget("service", logService);
-            var serviceRule = new LoggingRule("*", logLevel,logService);
+            var serviceRule = new LoggingRule("*", logLevel, logService);
             logConfig.LoggingRules.Add(serviceRule);
 
             LogManager.Configuration = logConfig;
             builder.RegisterInstance<Logger>(LogManager.GetCurrentClassLogger()).SingleInstance();
+
+
+        }
+
+        public static void SetLogLevel(LogLevel level)
+        {
+
+            foreach (var rule in LogManager.Configuration.LoggingRules)
+            {
+                if (level == LogLevel.Debug)
+                {
+                    if (!rule.Levels.Contains(LogLevel.Debug))
+                    {
+                        rule.EnableLoggingForLevel(LogLevel.Debug);
+                    }
+                }
+                else
+                {
+                    if (rule.Levels.Contains(LogLevel.Debug))
+                    {
+                        rule.DisableLoggingForLevel(LogLevel.Debug);
+                    }
+                }
+
+            }
+
+            LogManager.ReconfigExistingLoggers();
         }
     }
 
+
     [LayoutRenderer("simpledatetime")]
     public class SimpleDateTimeRenderer : LayoutRenderer
     {

src/Jackett/Indexers/AnimeTorrents.cs

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

src/Jackett/Indexers/BakaBT.cs

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

src/Jackett/Indexers/BeyondHD.cs

@@ -8,24 +8,22 @@ using NLog;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Text;
 using System.Threading.Tasks;
-using System.Web;
 using Jackett.Models.IndexerConfig;
 using System.Collections.Specialized;
+using System.Text.RegularExpressions;
 
 namespace Jackett.Indexers
 {
     public class BeyondHD : BaseIndexer, IIndexer
     {
         private string SearchUrl { get { return SiteLink + "browse.php?searchin=title&incldead=0&"; } }
-        private string DownloadUrl { get { return SiteLink + "download.php?torrent={0}"; } }
+        private string LoginUrl { get { return SiteLink + "login.php?returnto=%2F"; } }
+        private string AjaxLoginUrl { get { return SiteLink + "ajax/takelogin.php"; } }
 
-        new ConfigurationDataCookie configData
+        new ConfigurationDataRecaptchaLogin configData
         {
-            get { return (ConfigurationDataCookie)base.configData; }
+            get { return (ConfigurationDataRecaptchaLogin)base.configData; }
             set { base.configData = value; }
         }
 
@@ -38,7 +36,7 @@ namespace Jackett.Indexers
                 client: w,
                 logger: l,
                 p: ps,
-                configData: new ConfigurationDataCookie())
+                configData: new ConfigurationDataRecaptchaLogin())
         {
             AddCategoryMapping(37, TorznabCatType.MoviesBluRay); // Movie / Blu-ray
             AddMultiCategoryMapping(TorznabCatType.Movies3D,
@@ -78,20 +76,55 @@ namespace Jackett.Indexers
 
         }
 
+        public override async Task<ConfigurationData> GetConfigurationForSetup()
+        {
+            var loginPage = await RequestStringWithCookies(LoginUrl, string.Empty);
+            string recaptchaSiteKey = new Regex(@"loginwidget', \{[\s]{4,30}'sitekey' : '([0-9A-Za-z]{5,60})',[\s]{4,30}'theme'").Match(loginPage.Content).Groups[1].ToString().Trim();
+            var result = new ConfigurationDataRecaptchaLogin();
+            result.CookieHeader.Value = loginPage.Cookies;
+            result.Captcha.SiteKey = recaptchaSiteKey;
+            return result;
+        }
+
         public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
         {
             configData.LoadValuesFromJson(configJson);
+            var pairs = new Dictionary<string, string> {
+                { "username", configData.Username.Value },
+                { "password", configData.Password.Value },
+                { "g-recaptcha-response", configData.Captcha.Value }
+            };
 
-            var response = await webclient.GetString(new Utils.Clients.WebRequest()
+            if (!string.IsNullOrWhiteSpace(configData.Captcha.Cookie))
             {
-                Url = SiteLink,
-                Cookies = configData.Cookie.Value
-            });
+                // 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");
+                    }
 
-            await ConfigureIfOK(configData.Cookie.Value, response.Content.Contains("logout.php"), () =>
+                    SaveConfig();
+                    IsConfigured = true;
+                    return IndexerConfigurationStatus.Completed;
+                }
+                catch (Exception e)
+                {
+                    IsConfigured = false;
+                    throw new Exception("Your cookie did not work: " + e.Message);
+                }
+            }
+
+            var result = await RequestLoginAndFollowRedirect(AjaxLoginUrl, pairs, configData.CookieHeader.Value, true, SiteLink, LoginUrl);
+            JToken token = JObject.Parse(result.Content);
+            bool success = token.Value<bool?>("success") ?? false;
+            await ConfigureIfOK(result.Cookies, success, () =>
             {
-                CQ dom = response.Content;
-                throw new ExceptionWithConfigData("Invalid cookie header", configData);
+                var errorMessage = result.Content;
+                throw new ExceptionWithConfigData(errorMessage, configData);
             });
             return IndexerConfigurationStatus.RequiresTesting;
         }
@@ -135,7 +168,7 @@ namespace Jackett.Indexers
 
                     var qLink = row.ChildElements.ElementAt(2).FirstChild.Cq();
                     release.Link = new Uri(SiteLink + "/" + qLink.Attr("href"));
-                    var torrentID = qLink.Attr("href").Split('=').Last();
+                    var torrentId = qLink.Attr("href").Split('=').Last();
 
                     var descCol = row.ChildElements.ElementAt(3);
                     var qCommentLink = descCol.FirstChild.Cq();
@@ -143,6 +176,7 @@ namespace Jackett.Indexers
                     release.Description = release.Title;
                     release.Comments = new Uri(SiteLink + "/" + qCommentLink.Attr("href"));
                     release.Guid = release.Comments;
+                    release.Link = new Uri($"{SiteLink}download.php?torrent={torrentId}");
 
                     var dateStr = descCol.ChildElements.Last().Cq().Text().Split('|').Last().ToLowerInvariant().Replace("ago.", "").Trim();
                     release.PublishDate = DateTimeUtil.FromTimeAgo(dateStr);

src/Jackett/Indexers/BlueTigers.cs

@@ -0,0 +1,257 @@
+using CsQuery;
+using Jackett.Models;
+using Jackett.Services;
+using Jackett.Utils;
+using Jackett.Utils.Clients;
+using Newtonsoft.Json.Linq;
+using NLog;
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Globalization;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using Jackett.Models.IndexerConfig.Bespoke;
+
+namespace Jackett.Indexers
+{
+    public class BlueTigers : BaseIndexer, IIndexer
+    {
+        private string LoginUrl => SiteLink + "account-login.php";
+        private string TorrentSearchUrl => SiteLink + "torrents-search.php";
+        private string IndexUrl => SiteLink + "index.php";
+
+        private ConfigurationDataBlueTigers ConfigData
+        {
+            get { return (ConfigurationDataBlueTigers)configData; }
+            set { base.configData = value; }
+        }
+
+        public BlueTigers(IIndexerManagerService i, IWebClient wc, Logger l, IProtectionService ps)
+            : base(name: "BlueTigers",
+                description: "BlueTigers - No Ratio - Private",
+                link: "https://www.bluetigers.ca/",
+                caps: new TorznabCapabilities(),
+                manager: i,
+                client: wc,
+                logger: l,
+                p: ps,
+                configData: new ConfigurationDataBlueTigers(@"BlueTigers can search for one or all languages. 
+                                                            If you select 2 languages below, results will contain all 3 languages.
+                                                            <br> For best results change the torrents per page setting to 50 in your BlueTigers profile."))
+        {
+            AddCategoryMapping("14", TorznabCatType.ConsolePSP);
+            AddCategoryMapping("150", TorznabCatType.ConsoleWii);
+            AddCategoryMapping("150", TorznabCatType.ConsoleWiiwareVC);
+            AddCategoryMapping("150", TorznabCatType.ConsoleWiiU);
+            AddCategoryMapping("52", TorznabCatType.ConsoleXbox);
+            AddCategoryMapping("52", TorznabCatType.ConsoleXbox360);
+            AddCategoryMapping("52", TorznabCatType.ConsoleXBOX360DLC);
+            AddCategoryMapping("52", TorznabCatType.ConsoleXboxOne);
+            AddCategoryMapping("11", TorznabCatType.PCGames);
+            AddCategoryMapping("13", TorznabCatType.ConsolePS4);
+            AddCategoryMapping("13", TorznabCatType.ConsolePS3);
+            AddCategoryMapping("13", TorznabCatType.ConsolePSVita);
+            AddCategoryMapping("12", TorznabCatType.Console3DS);
+            AddCategoryMapping("160", TorznabCatType.PCPhoneIOS);
+            AddCategoryMapping("160", TorznabCatType.PCPhoneAndroid);
+            AddCategoryMapping("1", TorznabCatType.PCPhoneAndroid);
+            AddCategoryMapping("29", TorznabCatType.PCMac);
+            AddCategoryMapping("27", TorznabCatType.PC);
+            AddCategoryMapping("41", TorznabCatType.PC);
+            AddCategoryMapping("50", TorznabCatType.PC);
+            AddCategoryMapping("333", TorznabCatType.BooksMagazines);
+            AddCategoryMapping("38", TorznabCatType.TVDocumentary);
+            AddCategoryMapping("37", TorznabCatType.BooksEbook);
+            AddCategoryMapping("61", TorznabCatType.Movies3D);
+            AddCategoryMapping("45", TorznabCatType.XXX);
+            AddCategoryMapping("59", TorznabCatType.MoviesHD);
+            AddCategoryMapping("222", TorznabCatType.MoviesHD);
+            AddCategoryMapping("22", TorznabCatType.MoviesHD);
+            AddCategoryMapping("60", TorznabCatType.MoviesHD);
+            AddCategoryMapping("56", TorznabCatType.MoviesBluRay);
+            AddCategoryMapping("23", TorznabCatType.MoviesOther);
+            AddCategoryMapping("15", TorznabCatType.MoviesOther);
+            AddCategoryMapping("43", TorznabCatType.MoviesDVD);
+            AddCategoryMapping("24", TorznabCatType.MoviesDVD);
+            AddCategoryMapping("25", TorznabCatType.MoviesOther);
+            AddCategoryMapping("21", TorznabCatType.MoviesOther);
+            AddCategoryMapping("20", TorznabCatType.MoviesDVD);
+            AddCategoryMapping("9", TorznabCatType.TVAnime);
+            AddCategoryMapping("34", TorznabCatType.Other);
+            AddCategoryMapping("35", TorznabCatType.Audio);
+            AddCategoryMapping("36", TorznabCatType.AudioVideo);
+            AddCategoryMapping("31", TorznabCatType.AudioVideo);
+            AddCategoryMapping("2", TorznabCatType.TVOTHER);
+            AddCategoryMapping("16", TorznabCatType.TVHD);
+            AddCategoryMapping("130", TorznabCatType.TVHD);
+            AddCategoryMapping("10", TorznabCatType.TVSD);
+            AddCategoryMapping("131", TorznabCatType.TV);
+            AddCategoryMapping("17", TorznabCatType.TV);
+            AddCategoryMapping("18", TorznabCatType.TV);
+            AddCategoryMapping("19", TorznabCatType.TV);
+            AddCategoryMapping("58", TorznabCatType.TVSport);
+            AddCategoryMapping("33", TorznabCatType.TVOTHER);
+            AddCategoryMapping("34", TorznabCatType.Other);
+        }
+
+        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        {
+            ConfigData.LoadValuesFromJson(configJson);
+
+            if (ConfigData.French.Value == false && ConfigData.English.Value == false && ConfigData.Spanish.Value == false)
+                throw new ExceptionWithConfigData("Please select at least one language.", ConfigData);
+
+            await RequestStringWithCookies(LoginUrl, string.Empty);
+            var pairs = new Dictionary<string, string> {
+                { "username", ConfigData.Username.Value },
+                { "password", ConfigData.Password.Value },
+                { "take_login", "1" }
+            };
+
+            var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, IndexUrl, SiteLink);
+            Regex rgx = new Regex(@"uid=[0-9]{1,10}; pass=[a-z0-9]{1,40};");
+            await ConfigureIfOK(result.Cookies, rgx.IsMatch(result.Cookies), () =>
+            {
+                var errorMessage = "Error while trying to login.";
+                throw new ExceptionWithConfigData(errorMessage, ConfigData);
+            });
+
+            return IndexerConfigurationStatus.RequiresTesting;
+        }
+
+        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        {
+            List<ReleaseInfo> releases = new List<ReleaseInfo>();
+
+            NameValueCollection qParams = new NameValueCollection();
+            if (ConfigData.French.Value && !ConfigData.English.Value && !ConfigData.Spanish.Value)
+            {
+                qParams.Add("lang", "1");
+            }
+            else
+            {
+                if (!ConfigData.French.Value && ConfigData.English.Value && !ConfigData.Spanish.Value)
+                {
+                    qParams.Add("lang", "2");
+                }
+                else
+                {
+                    if (!ConfigData.French.Value && !ConfigData.English.Value && ConfigData.Spanish.Value)
+                    {
+                        qParams.Add("lang", "3");
+                    }
+                    else
+                    {
+                        qParams.Add("lang", "0");
+                    }
+                }
+                     
+            } 
+                
+            List<string> catList = MapTorznabCapsToTrackers(query);
+            foreach (string cat in catList)
+            {
+                qParams.Add("c" + cat, "1");
+            }
+
+            if (!string.IsNullOrEmpty(query.SanitizedSearchTerm))
+            {
+                qParams.Add("search", query.GetQueryString());
+            }
+
+            string queryStr = qParams.GetQueryString();
+            string searchUrl = $"{TorrentSearchUrl}?incldead=0&freeleech=0&sort=id&order=ascdesc&{queryStr}";
+
+            List<CQ> torrentRowList = new List<CQ>();
+
+            var results = await RequestStringWithCookiesAndRetry(searchUrl);
+            try
+            {
+                CQ fDom = results.Content;
+                var firstPageRows = fDom["table[class='ttable_headinner'] > tbody > tr:not(:First-child)"];
+                torrentRowList.AddRange(firstPageRows.Select(fRow => fRow.Cq()));
+
+                //If a search term is used, follow upto the first 4 pages (initial plus 3 more)
+                if (!string.IsNullOrWhiteSpace(query.GetQueryString()) && fDom["a[class='boutons']"].Filter("a[href*=&page=]").Length > 0)
+                {
+                    int pageLinkCount;
+                    int.TryParse(fDom["a[class='boutons']"].Filter("a[href*=&page=]").Last().Attr("href").Split(new[] { "&page=" }, StringSplitOptions.None).LastOrDefault(), out pageLinkCount);
+                    for (int i = 1; i < Math.Min(4, pageLinkCount + 1); i++)
+                    {
+                        var sResults = await RequestStringWithCookiesAndRetry($"{searchUrl}&page={i}");
+                        CQ sDom = sResults.Content;
+                        var additionalPageRows = sDom["table[class='ttable_headinner'] > tbody > tr:not(:First-child)"];
+                        torrentRowList.AddRange(additionalPageRows.Select(sRow => sRow.Cq()));
+                    }
+                }
+
+                foreach (CQ tRow in torrentRowList)
+                {
+                    long torrentId = 0;
+                    string idTarget = "bookmarks.php?torrent=";
+                    string id = tRow.Find("a[href*=" + idTarget + "]").First().Attr("href").Trim();
+                    if (!string.IsNullOrEmpty(id) && id.Contains(idTarget))
+                    {
+                        long.TryParse(id.Substring(id.LastIndexOf(idTarget, StringComparison.Ordinal) + idTarget.Length), out torrentId);
+                    }
+
+                    if (torrentId <= 0) continue;
+
+                    long category = 0;
+                    string catTarget = "torrents.php?cat=";
+                    string cat = tRow.Find("a[href*=" + catTarget + "]").First().Attr("href").Trim();
+                    if (!string.IsNullOrEmpty(cat) && cat.Contains(catTarget))
+                    {
+                        long.TryParse(cat.Substring(cat.LastIndexOf(catTarget, StringComparison.Ordinal) + catTarget.Length), out category);
+                    }
+
+                    Uri guid = new Uri($"{SiteLink}torrents-details.php?hit=1&id={torrentId}");
+                    Uri link = new Uri($"{SiteLink}download.php?hit=1&id={torrentId}");
+                    Uri comments = new Uri($"{SiteLink}comments.php?type=torrent&id={torrentId}");
+                    string title = tRow.Find("a[href*=torrents-details.php?id=]").First().Text().Trim();
+                    string stats = tRow.Find("div[id=kt" + torrentId.ToString() + "]").First().Text();
+                    string sizeStr = new Regex("Taille:(.*)Vitesse:").Match(stats).Groups[1].ToString().Trim();
+                    string pubDateStr = new Regex("Ajout.:(.*)Compl.t.s").Match(stats).Groups[1].ToString().Trim();
+                    DateTime pubDate = DateTime.ParseExact(pubDateStr, "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal).ToLocalTime();
+
+                    string statistics = tRow.Find("a[href*=torrents-details.php?id=]").First().RenderSelection().Trim();
+                    string startTag = "<table ";
+                    string endTag = "</table>";
+                    CQ statsCq = startTag + new Regex(startTag + "(.*)" + endTag).Match(statistics).Groups[1].ToString().Trim() + endTag;
+                    int seeders;
+                    int leechers;
+                    int.TryParse(statsCq.Find("font[color=#05FC09]").First().Text(), out seeders);
+                    int.TryParse(statsCq.Find("font[color=red]").First().Text(), out leechers);
+
+                    var release = new ReleaseInfo();
+
+                    release.Title = title;
+                    release.Guid = guid;
+                    release.Link = link;
+                    release.PublishDate = pubDate;
+                    release.Size = ReleaseInfo.GetBytes(sizeStr);
+                    release.Description = title;
+                    release.Seeders = seeders;
+                    release.Peers = leechers + seeders;
+                    release.MinimumRatio = 1;
+                    release.MinimumSeedTime = 172800;
+                    release.Category = MapTrackerCatToNewznab(category.ToString());
+                    release.Comments = comments;
+
+                    releases.Add(release);
+                }
+
+            }
+            catch (Exception ex)
+            {
+                OnParseError(results.Content, ex);
+            }
+
+            return releases;
+        }
+
+    }
+
+}

src/Jackett/Indexers/FrenchTorrentDb.cs

@@ -1,97 +0,0 @@
-using CsQuery;
-using Jackett.Models;
-using Jackett.Models.IndexerConfig;
-using Jackett.Services;
-using Jackett.Utils;
-using Jackett.Utils.Clients;
-using Newtonsoft.Json.Linq;
-using NLog;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using System.Web;
-
-namespace Jackett.Indexers
-{
-    class FrenchTorrentDb : BaseIndexer, IIndexer
-    {
-        private string MainUrl { get { return SiteLink + "?section=INDEX"; } }
-        private string SearchUrl { get { return SiteLink + "?section=TORRENTS&exact=1&name={0}&submit=GO"; } }
-
-        new ConfigurationDataCookie configData
-        {
-            get { return (ConfigurationDataCookie)base.configData; }
-            set { base.configData = value; }
-        }
-
-        public FrenchTorrentDb(IIndexerManagerService i, Logger l, IWebClient c, IProtectionService ps)
-            : base(name: "FrenchTorrentDb",
-                description: "One the biggest French Torrent Tracker",
-                link: "http://www.frenchtorrentdb.com/",
-                caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
-                manager: i,
-                client: c,
-                logger: l,
-                p: ps,
-                configData: new ConfigurationDataCookie())
-        {
-        }
-
-        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
-        {
-            configData.LoadValuesFromJson(configJson);
-            var response = await webclient.GetString(new Utils.Clients.WebRequest()
-            {
-                Url = MainUrl,
-                Type = RequestType.GET,
-                Cookies = configData.Cookie.Value
-            });
-
-            await ConfigureIfOK(configData.Cookie.Value, response.Content.Contains("/?section=LOGOUT"), () =>
-            {
-                throw new ExceptionWithConfigData("Failed to login", configData);
-            });
-            return IndexerConfigurationStatus.RequiresTesting;
-        }
-
-        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
-        {
-            var releases = new List<ReleaseInfo>();
-            var episodeSearchUrl = string.Format(SearchUrl, HttpUtility.UrlEncode(query.GetQueryString()));
-            var response = await RequestStringWithCookiesAndRetry(episodeSearchUrl);
-            try
-            {
-                CQ dom = response.Cookies;
-                var rows = dom[".results_index ul"];
-                foreach (var row in rows)
-                {
-                    var release = new ReleaseInfo();
-                    CQ qRow = row.Cq();
-                    CQ qLink = qRow.Find("li.torrents_name > .torrents_name_link").First();
-                    CQ qDlLink = qRow.Find("li.torrents_download  > a").First();
-
-                    release.MinimumRatio = 1;
-                    release.MinimumSeedTime = 172800;
-                    release.Title = qLink.Text().Trim();
-                    release.Description = release.Title;
-                    release.Comments = new Uri(SiteLink + "/" + qLink.Attr("href").TrimStart('/'));
-                    release.Guid = release.Comments;
-                    release.Link = new Uri(SiteLink + "/" + qDlLink.Attr("href").TrimStart('/'));
-                    release.PublishDate = DateTime.Now;
-                    release.Seeders = ParseUtil.CoerceInt(qRow.Find("li.torrents_seeders").Text());
-                    release.Peers = ParseUtil.CoerceInt(qRow.Find("li.torrents_leechers").Text()) + release.Seeders;
-                    var sizeParts = qRow.Find("li.torrents_size").Text();
-                    release.Size = ReleaseInfo.GetBytes(sizeParts);
-
-                    releases.Add(release);
-                }
-            }
-            catch (Exception ex)
-            {
-                OnParseError(response.Content, ex);
-            }
-
-            return releases;
-        }
-    }
-}

src/Jackett/Indexers/Freshon.cs

@@ -70,6 +70,13 @@ namespace Jackett.Indexers
 
         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 romaniaTz = TimeZoneInfo.CreateCustomTimeZone("Romania Time", new TimeSpan(2, 0, 0), "(GMT+02:00) Romania Time", "Romania Time", "Romania Daylight Time", adjustments);
+
             var releases = new List<ReleaseInfo>();
             string episodeSearchUrl;
 
@@ -77,7 +84,7 @@ namespace Jackett.Indexers
                 episodeSearchUrl = SearchUrl;
             else
             {
-                episodeSearchUrl = string.Format("{0}?search={1}&cat=0", SearchUrl, HttpUtility.UrlEncode(query.GetQueryString()));
+                episodeSearchUrl = $"{SearchUrl}?search={HttpUtility.UrlEncode(query.GetQueryString())}&cat=0";
             }
 
             var results = await RequestStringWithCookiesAndRetry(episodeSearchUrl);
@@ -101,16 +108,7 @@ namespace Jackett.Indexers
                     release.Guid = new Uri(SiteLink + qLink.Attr("href"));
                     release.Comments = release.Guid;
                     release.Link = new Uri(SiteLink + qRow.Find("td.table_links > a").First().Attr("href"));
-
-                    DateTime pubDate;
-                    var dateString = qRow.Find("td.table_added").Text().Trim();
-                    if (dateString.StartsWith("Today "))
-                        pubDate = (DateTime.UtcNow + TimeSpan.Parse(dateString.Split(' ')[1])).ToLocalTime();
-                    else if (dateString.StartsWith("Yesterday "))
-                        pubDate = (DateTime.UtcNow + TimeSpan.Parse(dateString.Split(' ')[1]) - TimeSpan.FromDays(1)).ToLocalTime();
-                    else
-                        pubDate = DateTime.ParseExact(dateString, "d-MMM-yyyy HH:mm:ss", CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal).ToLocalTime();
-                    release.PublishDate = pubDate;
+                    release.Category = TvCategoryParser.ParseTvShowQuality(release.Title);
 
                     release.Seeders = ParseUtil.CoerceInt(qRow.Find("td.table_seeders").Text().Trim());
                     release.Peers = ParseUtil.CoerceInt(qRow.Find("td.table_leechers").Text().Trim()) + release.Seeders;
@@ -118,6 +116,18 @@ namespace Jackett.Indexers
                     var sizeStr = qRow.Find("td.table_size")[0].Cq().Text();
                     release.Size = ReleaseInfo.GetBytes(sizeStr);
 
+                    DateTime pubDateRomania;
+                    var dateString = qRow.Find("td.table_added").Text().Trim();
+                    if (dateString.StartsWith("Today "))
+                    {   pubDateRomania = DateTime.SpecifyKind(DateTime.UtcNow.Date, DateTimeKind.Unspecified) + TimeSpan.Parse(dateString.Split(' ')[1]); }
+                    else if (dateString.StartsWith("Yesterday "))
+                    {   pubDateRomania = DateTime.SpecifyKind(DateTime.UtcNow.Date, DateTimeKind.Unspecified) + TimeSpan.Parse(dateString.Split(' ')[1]) - TimeSpan.FromDays(1); }
+                    else
+                    {   pubDateRomania = DateTime.SpecifyKind(DateTime.ParseExact(dateString, "d-MMM-yyyy HH:mm:ss", CultureInfo.InvariantCulture), DateTimeKind.Unspecified); }
+
+                    DateTime pubDateUtc = TimeZoneInfo.ConvertTimeToUtc(pubDateRomania, romaniaTz);
+                    release.PublishDate = pubDateUtc.ToLocalTime();
+
                     releases.Add(release);
                 }
             }

src/Jackett/Indexers/GFTracker.cs

@@ -0,0 +1,202 @@
+using CsQuery;
+using Jackett.Models;
+using Jackett.Services;
+using Jackett.Utils;
+using Jackett.Utils.Clients;
+using Newtonsoft.Json.Linq;
+using NLog;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web;
+using Jackett.Models.IndexerConfig;
+using System.Collections.Specialized;
+
+namespace Jackett.Indexers
+{
+    //
+    //     Quick and dirty indexer for GFTracker.  
+    // 
+    public class GFTracker : BaseIndexer, IIndexer
+    {
+        private string StartPageUrl { get { return SiteLink + "login.php?returnto=%2F"; } }
+        private string LoginUrl { get { return SiteLink + "loginsite.php"; } }
+        private string SearchUrl { get { return SiteLink + "browse.php"; } }
+
+        new ConfigurationDataRecaptchaLogin configData
+        {
+            get { return (ConfigurationDataRecaptchaLogin)base.configData; }
+            set { base.configData = value; }
+        }
+
+        public GFTracker(IIndexerManagerService i, Logger l, IWebClient w, IProtectionService ps)
+            : base(name: "GFTracker",
+                description: "Home of user happiness",
+                link: "https://www.thegft.org/",
+                caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
+                manager: i,
+                client: w,
+                logger: l,
+                p: ps,
+                configData: new ConfigurationDataRecaptchaLogin())
+        {
+            AddCategoryMapping(4, TorznabCatType.TV);               // TV/XVID
+            AddCategoryMapping(17, TorznabCatType.TVHD);            // TV/X264
+            AddCategoryMapping(19, TorznabCatType.TV);              // TV/DVDRIP
+            AddCategoryMapping(26, TorznabCatType.TVHD);            // TV/BLURAY
+            AddCategoryMapping(37, TorznabCatType.TV);              // TV/DVDR
+            AddCategoryMapping(47, TorznabCatType.TV);              // TV/SD
+
+            AddCategoryMapping(7, TorznabCatType.Movies);           // Movies/XVID
+            AddCategoryMapping(8, TorznabCatType.MoviesDVD);        // Movies/DVDR
+            AddCategoryMapping(12, TorznabCatType.MoviesBluRay);    // Movies/BLURAY
+            AddCategoryMapping(18, TorznabCatType.MoviesHD);        // Movies/X264-HD
+            AddCategoryMapping(49, TorznabCatType.MoviesSD);        // Movies/X264-SD
+        }
+
+        public override async Task<ConfigurationData> GetConfigurationForSetup()
+        {
+            var loginPage = await RequestStringWithCookies(StartPageUrl, string.Empty);
+            CQ cq = loginPage.Content;
+            var result = new ConfigurationDataRecaptchaLogin();
+            CQ recaptcha = cq.Find(".g-recaptcha").Attr("data-sitekey");
+            if(recaptcha.Length != 0)   // recaptcha not always present in login form, perhaps based on cloudflare uid or just phase of the moon
+            {
+                result.CookieHeader.Value = loginPage.Cookies;
+                result.Captcha.SiteKey = cq.Find(".g-recaptcha").Attr("data-sitekey");
+                return result;
+            } else
+            {
+                var stdResult = new ConfigurationDataBasicLogin();
+                stdResult.CookieHeader.Value = loginPage.Cookies;
+                return stdResult;
+            }           
+        }
+
+        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
+        {
+            configData.LoadValuesFromJson(configJson);
+            var pairs = new Dictionary<string, string> {
+                { "username", configData.Username.Value },
+                { "password", configData.Password.Value },
+                { "g-recaptcha-response", configData.Captcha.Value }
+            };
+
+            if (!string.IsNullOrWhiteSpace(configData.Captcha.Cookie))
+            {
+                CookieHeader = configData.Captcha.Cookie;
+                try
+                {
+                    var results = await PerformQuery(new TorznabQuery());
+                    if (results.Count() == 0)
+                    {
+                        throw new Exception("Your cookie did not work");
+                    }
+
+                    SaveConfig();
+                    IsConfigured = true;
+                    return IndexerConfigurationStatus.Completed;
+                }
+                catch (Exception e)
+                {
+                    IsConfigured = false;
+                    throw new Exception("Your cookie did not work: " + e.Message);
+                }
+            }
+
+            var cookieJar = configData.CookieHeader.Value;
+            var response = await RequestLoginAndFollowRedirect(LoginUrl, pairs, configData.CookieHeader.Value, true, null, StartPageUrl);
+            cookieJar += response.Cookies.ToString();
+            response = await RequestStringWithCookiesAndRetry(SearchUrl, cookieJar);
+
+            await ConfigureIfOK(cookieJar, response.Content != null && response.Content.Contains("logout.php"), () =>
+            {
+                CQ dom = response.Content;
+                var messageEl = dom["h2"].Last();
+                messageEl.Children("a").Remove();
+                messageEl.Children("style").Remove();
+                var errorMessage = messageEl.Text().Trim();
+                throw new ExceptionWithConfigData(errorMessage, configData);
+            });
+            return IndexerConfigurationStatus.RequiresTesting;
+        }
+
+        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
+        {
+            var releases = new List<ReleaseInfo>();
+            var searchString = query.GetQueryString();
+            var queryCollection = new NameValueCollection();
+
+            queryCollection.Add("view", "0");
+            if (!string.IsNullOrWhiteSpace(searchString))
+            {
+                queryCollection.Add("search", searchString);
+            }
+
+            foreach (var cat in MapTorznabCapsToTrackers(query))
+            {
+                queryCollection.Add(string.Format("c{0}", cat), "1");
+            }
+
+            var searchUrl = SearchUrl + "?" + queryCollection.GetQueryString();
+
+            var results = await RequestStringWithCookiesAndRetry(searchUrl, CookieHeader);
+            try
+            {
+                CQ dom = results.Content;
+                var rows = dom["#torrentBrowse > table > tbody > tr"];
+                foreach (var row in rows.Skip(1))
+                {
+                    var release = new ReleaseInfo();
+                    CQ qRow = row.Cq();
+
+                    //CQ qLink = qRow.Children().ElementAt(1).Cq().Children("a").ElementAt(1).Cq();
+                    CQ qLink;
+                    CQ qTmp = qRow.Children().ElementAt(1).Cq().Find("a");                    
+                    if (qTmp.Length < 2) {
+                        qLink = qRow.Children().ElementAt(1).Cq().Find("a").ElementAt(0).Cq();
+                    } else {
+                        qLink = qRow.Children().ElementAt(1).Cq().Find("a").ElementAt(1).Cq();
+                    }
+
+                    release.MinimumRatio = 1;
+                    release.MinimumSeedTime = 172800;
+                    release.Title = qLink.Attr("title");
+                    release.Description = release.Title;
+                    release.Guid = new Uri(SiteLink + qLink.Attr("href").TrimStart('/'));
+                    release.Comments = release.Guid;
+
+                    qLink = qRow.Children().ElementAt(3).Cq().Children("a").First();
+                    release.Link = new Uri(string.Format("{0}{1}", SiteLink, qLink.Attr("href")));
+
+                    var catUrl = qRow.Children().ElementAt(0).FirstElementChild.Cq().Attr("href");
+                    var catNum = catUrl.Split(new char[] { '=', '&' })[2].Replace("c", "");
+                    release.Category = MapTrackerCatToNewznab(catNum);
+
+                    var dateString = qRow.Children().ElementAt(6).Cq().Text().Trim();
+                    //var pubDate = DateTime.ParseExact(dateString, "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture);
+                    release.PublishDate = Jackett.Utils.DateTimeUtil.FromTimeAgo(dateString);
+
+                    var sizeStr = qRow.Children().ElementAt(7).Cq().Text().Split(new char[] { '/' })[0];
+                    release.Size = ReleaseInfo.GetBytes(sizeStr);
+
+                    release.Seeders = ParseUtil.CoerceInt(qRow.Children().ElementAt(8).Cq().Text().Split(new char[] { '/' })[0].Trim());
+                    release.Peers = ParseUtil.CoerceInt(qRow.Children().ElementAt(8).Cq().Text().Split(new char[] { '/' })[1].Trim()) + release.Seeders;
+
+                    releases.Add(release);
+                }
+            }
+            catch (Exception ex)
+            {
+                OnParseError(results.Content, ex);
+            }
+
+            return releases;
+        }
+    }
+}

src/Jackett/Indexers/Hounddawgs.cs

@@ -1,4 +1,4 @@
-using CsQuery;
+using CsQuery;
 using Jackett.Indexers;
 using Jackett.Models;
 using Jackett.Services;
@@ -26,9 +26,9 @@ namespace Jackett.Indexers
 		private string LoginUrl { get { return SiteLink + "login.php"; } }
 		private string SearchUrl { get { return SiteLink + "torrents.php"; } }
 
-		new ConfigurationDataBasicLogin configData
+		new NxtGnConfigurationData configData
 		{
-			get { return (ConfigurationDataBasicLogin)base.configData; }
+			get { return (NxtGnConfigurationData)base.configData; }
 			set { base.configData = value; }
 		}
 
@@ -41,7 +41,7 @@ namespace Jackett.Indexers
 				client: c,
 				logger: l,
 				p: ps,
-				configData: new ConfigurationDataBasicLogin())
+				configData: new NxtGnConfigurationData())
 		{
 			AddCategoryMapping(92, TorznabCatType.TV);
 			AddCategoryMapping(92, TorznabCatType.TVHD);
@@ -65,13 +65,13 @@ namespace Jackett.Indexers
 			var pairs = new Dictionary<string, string> {
 				{ "username", configData.Username.Value },
 				{ "password", configData.Password.Value },
-				{ "Submit", "Submit" }
+				{ "login", "Login" }
 
 			};
 			// Get inital cookies
-			var response = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, null, LoginUrl);
+            var response = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, null, "https://hounddawgs.org/");
 
-			await ConfigureIfOK(response.Cookies, response.Content != null && response.Content.Contains("Velkommen til vores seneste bruger"), () =>
+			await ConfigureIfOK(response.Cookies, response.Content != null && response.Content.Contains("Velkommen til"), () =>
 				{
 					CQ dom = response.Content;
 					var messageEl = dom["inputs"];
@@ -142,5 +142,15 @@ namespace Jackett.Indexers
 
 			return releases;
 		}
+		public class NxtGnConfigurationData : ConfigurationData
+		{
+			public NxtGnConfigurationData()
+			{
+				Username = new StringItem { Name = "Username" };
+				Password = new StringItem { Name = "Password" };
+			}
+			public StringItem Username { get; private set; }
+			public StringItem Password { get; private set; }
+		}
 	}
 }

src/Jackett/Indexers/MoreThanTV.cs

@@ -12,6 +12,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;
@@ -93,10 +94,17 @@ namespace Jackett.Indexers
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
-            var episodeSearchUrl = SearchUrl + HttpUtility.UrlEncode(query.GetQueryString());
-            WebClientStringResult response = null;
+            string qryString = query.GetQueryString();
 
-            response = await RequestStringWithCookiesAndRetry(episodeSearchUrl);
+            Match matchQry = new Regex(@".*\s[Ss]{1}\d{2}$").Match(qryString);
+            if (matchQry.Success)
+            {
+                //If search string ends in S## eg. S03 (season search) add an asterix to search term
+                qryString += "*";
+            }
+
+            var episodeSearchUrl = SearchUrl + HttpUtility.UrlEncode(qryString);
+            WebClientStringResult response = await RequestStringWithCookiesAndRetry(episodeSearchUrl);
 
             try
             {
@@ -112,16 +120,18 @@ namespace Jackett.Indexers
                         pubDate = DateTime.SpecifyKind(pubDate, DateTimeKind.Utc).ToLocalTime();
                     }
 
-                    var groupName = (string)r["groupName"];
+                    string groupName = (string)r["groupName"];
 
                     if (r["torrents"] is JArray)
                     {
+                        string showName = (string) r["artist"];
+
                         foreach (JObject t in r["torrents"])
                         {
                             var release = new ReleaseInfo();
                             release.PublishDate = pubDate;
-                            release.Title = groupName;
-                            release.Description = groupName;
+                            release.Title = $"{showName} {groupName}";
+                            release.Description = $"{showName} {groupName}";
                             FillReleaseInfoFromJson(release, t);
                             releases.Add(release);
                         }

src/Jackett/Indexers/RUTor.cs

@@ -1,233 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Jackett.Models;
-using Newtonsoft.Json.Linq;
-using NLog;
-using Jackett.Utils;
-using System.Net;
-using System.Net.Http;
-using CsQuery;
-using System.Web;
-using Jackett.Services;
-using Jackett.Utils.Clients;
-using System.Text.RegularExpressions;
-using Jackett.Models.IndexerConfig;
-using System.Globalization;
-using Newtonsoft.Json;
-using Jackett.Models.IndexerConfig.Bespoke;
-
-namespace Jackett.Indexers
-{
-    public class RuTor : BaseIndexer, IIndexer
-    {
-        private string SearchUrl { get { return SiteLink + "search/0/{0}/000/0/{1}"; } }
-        private string BrowseUrl { get { return SiteLink + "browse/0/{0}/0/0"; } }
-        readonly static string defaultSiteLink = "http://rutor.org/";
-
-        new ConfigurationDataRuTor configData
-        {
-            get { return (ConfigurationDataRuTor)base.configData; }
-            set { base.configData = value; }
-        }
-
-        public RuTor(IIndexerManagerService i, Logger l, IWebClient wc, IProtectionService ps)
-            : base(name: "RUTor",
-                description: "Свободный торрент трекер",
-                link: "http://rutor.org/",
-                caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
-                manager: i,
-                client: wc,
-                logger: l,
-                p: ps,
-                configData: new ConfigurationDataRuTor(defaultSiteLink))
-        {
-            TorznabCaps.Categories.Add(TorznabCatType.TVAnime);
-            TorznabCaps.Categories.Add(TorznabCatType.Movies);
-            TorznabCaps.Categories.Add(TorznabCatType.Audio);
-            TorznabCaps.Categories.Add(TorznabCatType.Books);
-        }
-
-        public async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
-        {
-            configData.LoadValuesFromJson(configJson);
-            var oldConfig = configData;
-            var releases = await PerformQuery(new TorznabQuery());
-
-            await ConfigureIfOK(string.Empty, releases.Count() > 0, () =>
-            {
-                configData = oldConfig;
-                throw new Exception("Could not find releases from this URL");
-            });
-
-            return IndexerConfigurationStatus.RequiresTesting;
-        }
-
-
-        protected override void SaveConfig()
-        {
-            indexerService.SaveConfig(this as IIndexer, JsonConvert.SerializeObject(configData));
-        }
-
-        // Override to load legacy config format
-        public override void LoadFromSavedConfiguration(JToken jsonConfig)
-        {
-            var json = jsonConfig.ToString();
-            configData = JsonConvert.DeserializeObject<ConfigurationDataRuTor>(json);
-            IsConfigured = true;
-        }
-
-        private readonly int CAT_ANY = 0;
-        private readonly int CAT_FOREIGN_MOVIE = 1;
-        // private readonly int CAT_OUR_MOVIES = 5;
-        // private readonly int CAT_POP_SCIFI_MOVIES = 12;
-        private readonly int CAT_TV_SERIES = 4;
-        // private readonly int CAT_TV = 6;
-        // private readonly int CAT_ANIMATION = 7;
-        private readonly int CAT_ANIME = 10;
-        private readonly int CAT_MUSIC = 2;
-        // private readonly int CAT_GAMES = 8;
-        // private readonly int CAT_SOFTWARE = 9;
-        // private readonly int CAT_SPORTS_HEALTH = 13;
-        // private readonly int CAT_HUMOR = 15;
-        // private readonly int CAT_ECONOMY_LIFE = 14;
-        private readonly int CAT_BOOKS = 11;
-        // private readonly int CAT_OTHER = 3;
-
-        public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
-        {
-            var releases = new List<ReleaseInfo>();
-            var searchString = query.GetQueryString();
-            var searchCategory = CAT_ANY;
-
-            if (query.Categories.Contains(TorznabCatType.TV.ID) ||
-                query.Categories.Contains(TorznabCatType.TVHD.ID) ||
-                query.Categories.Contains(TorznabCatType.TVSD.ID))
-            {
-                searchCategory = CAT_TV_SERIES;
-            }
-
-            if ((searchCategory == CAT_ANY) &&
-               (query.Categories.Contains(TorznabCatType.Movies.ID) ||
-               query.Categories.Contains(TorznabCatType.MoviesForeign.ID) ||
-               query.Categories.Contains(TorznabCatType.MoviesHD.ID) ||
-               query.Categories.Contains(TorznabCatType.MoviesSD.ID)))
-            {
-                searchCategory = CAT_FOREIGN_MOVIE;
-            }
-
-            if ((searchCategory == CAT_ANY) &&
-               (query.Categories.Contains(TorznabCatType.TVAnime.ID)))
-            {
-                searchCategory = CAT_ANIME;
-            }
-
-            if ((searchCategory == CAT_ANY) &&
-              (query.Categories.Contains(TorznabCatType.Books.ID)))
-            {
-                searchCategory = CAT_BOOKS;
-            }
-
-            if ((searchCategory == CAT_ANY) &&
-              (query.Categories.Contains(TorznabCatType.Audio.ID) ||
-              query.Categories.Contains(TorznabCatType.AudioLossless.ID) ||
-              query.Categories.Contains(TorznabCatType.AudioMP3.ID)))
-            {
-                searchCategory = CAT_MUSIC;
-            }
-
-            string queryUrl = string.Empty;
-            if (string.IsNullOrWhiteSpace(searchString))
-            {
-                queryUrl = string.Format(BrowseUrl, searchCategory);
-            }
-            else
-            {
-                queryUrl = string.Format(SearchUrl, searchCategory, HttpUtility.UrlEncode(searchString.Trim()));
-            }
-
-            var results = await RequestStringWithCookiesAndRetry(queryUrl, string.Empty);
-            try
-            {
-                CQ dom = results.Content;
-                var rows = dom["#index table tr"];
-                foreach (var row in rows.Skip(1))
-                {
-                    var release = new ReleaseInfo();
-
-                    release.MinimumRatio = 1;
-                    release.MinimumSeedTime = 172800;
-
-                    var date = StringUtil.StripNonAlphaNumeric(row.Cq().Find("td:eq(0)").Text().Trim()
-                        .Replace("Янв", "01")
-                        .Replace("Фев", "02")
-                        .Replace("Мар", "03")
-                        .Replace("Апр", "04")
-                        .Replace("Май", "05")
-                        .Replace("Июн", "06")
-                        .Replace("Июл", "07")
-                        .Replace("Авг", "08")
-                        .Replace("Сен", "09")
-                        .Replace("Окт", "10")
-                        .Replace("Ноя", "11")
-                        .Replace("Дек", "12"));
-
-                    release.PublishDate = DateTime.ParseExact(date, "ddMMyy", CultureInfo.InvariantCulture);
-
-                    var hasTorrent = row.Cq().Find("td:eq(1) a").Length == 3;
-                    var titleIndex = 1;
-                    if (hasTorrent)
-                        titleIndex++;
-
-                    release.Title = row.Cq().Find("td:eq(1) a:eq(" + titleIndex + ")").Text().Trim();
-                    if (configData.StripRussian.Value)
-                    {
-                        var split = release.Title.IndexOf('/');
-                        if (split > -1)
-                        {
-                            release.Title = release.Title.Substring(split + 1).Trim();
-                        }
-                    }
-
-                    release.Description = release.Title;
-
-                    var hasComments = row.Cq().Find("td:eq(2) img").Length > 0;
-                    var sizeCol = 2;
-
-                    if (hasComments)
-                        sizeCol++;
-
-                    var sizeStr = StringUtil.StripRegex(row.Cq().Find("td:eq(" + sizeCol + ")").Text(), "[^a-zA-Z0-9\\. -]", " ").Trim();
-                    string[] sizeSplit = sizeStr.Split(' ');
-                    release.Size = ReleaseInfo.GetBytes(sizeSplit[1].ToLower(), ParseUtil.CoerceFloat(sizeSplit[0]));
-
-                    release.Seeders = ParseUtil.CoerceInt(row.Cq().Find(".green").Text().Trim());
-                    release.Peers = ParseUtil.CoerceInt(row.Cq().Find(".red").Text().Trim()) + release.Seeders;
-
-                    release.Guid = new Uri(configData.Url.Value + row.Cq().Find("td:eq(1) a:eq(" + titleIndex + ")").Attr("href").Substring(1));
-                    release.Comments = release.Guid;
-
-                    if (hasTorrent)
-                    {
-                        release.Link = new Uri(row.Cq().Find("td:eq(1) a:eq(0)").Attr("href"));
-                        release.MagnetUri = new Uri(row.Cq().Find("td:eq(1) a:eq(1)").Attr("href"));
-                    }
-                    else
-                    {
-                        release.MagnetUri = new Uri(row.Cq().Find("td:eq(1) a:eq(0)").Attr("href"));
-                    }
-
-                    releases.Add(release);
-                }
-            }
-            catch (Exception ex)
-            {
-                OnParseError(results.Content, ex);
-            }
-
-            return releases;
-        }
-    }
-}