Synthesiz3r: removed (dead)

* Additional fix for #1450
Sonarr is search for a tilte if the result title is different it reject it.
So it is not enough that Jackett give the result it must give with the same language.

Workaround create a new title from the original one and from the title.
It also make some fine tunning:
if title not contains the language we add it from category

* Make decision safer

.github/ISSUE_TEMPLATE.md

@@ -1,9 +1,9 @@
 **Please use the search bar** at the top of the page and make sure you are not creating an already submitted issue. Duplicating issues makes it more difficult for everyone to follow. Your issue may have already been solved in the past as well.
 
 Provide a description of the feature request or bug, the more details the better.
-If you are experiencing an issue with a tracker, a **full log must be included**. Instructions for obtaining logs are here: https://github.com/Jackett/Jackett#troubleshooting
+If you are experiencing an issue with a tracker, a **full enhanced log must be included**. Instructions for obtaining logs are here: https://github.com/Jackett/Jackett#troubleshooting
 
-Jackett version:  
-Mono version (if not using Windows):  
+**Jackett version**:  
+**Mono version** (if not using Windows):  
 
 -------------------------------

.github/duplicate_issue.md

@@ -0,0 +1,7 @@
+Duplicate of #{{ chosenIssue.number }}
+
+Hi @{{ payload.sender.login }},
+
+This issue looks similar to #{{ chosenIssue.number }}. 
+
+To prevent issue tracker clutter, this issue will now be closed. If you feel this issue isn't a duplicate of #{{ chosenIssue.number }}, then feel free to post a comment on this issue stating why it's not a duplicate. Your comment will automatically re-open this issue.

.github/no_information_provided.md

@@ -0,0 +1,9 @@
+Hi @{{ payload.sender.login }},
+
+You've created an issue, but haven't provided any details to allow the community to assist you. To prevent issue tracker clutter, this issue will now be closed. Please provide the information needed below and your comment will automatically re-open this issue.
+
+Provide a description of the feature request or bug, the more details the better.
+If you are experiencing an issue with a tracker, a **full enhanced log must be included**. Instructions for obtaining logs are here: https://github.com/Jackett/Jackett#troubleshooting
+
+**Jackett version**:  
+**Mono version** (if not using Windows):

.github/no_response.md

@@ -0,0 +1,3 @@
+Hi @{{ payload.data.user.login }},
+
+No response has been received for {{ days }} days. To prevent issue tracker clutter, this issue will now be closed. To re-open the issue, please provide the information requested and the issue will automatically re-open.

.github/pull_request_readme.md

@@ -0,0 +1,7 @@
+Hi @{{ payload.pull_request.user.login }},
+
+Thanks for your contribution to Jackett!
+
+If you are adding a new indexer, please ensure that you've added it to the readme as well
+
+A human will be along soon to review

.gitignore

@@ -194,6 +194,10 @@ FakesAssemblies/
 
 # Visual Studio 6 workspace options file
 *.opt
-/Build.mono
-/Build.windows
-/Output
+/tools
+/BuildOutput
+/Artifacts
+/TestResults
+*.DS_Store
+.idea/
+launchSettings.json

Build.bat

@@ -1,37 +0,0 @@
-
-rmdir /s /q  build.windows
-rmdir /s /q  build.mono
-rmdir /s /q  Output
-cd src
-Msbuild Jackett.sln /t:Clean,Build /p:Configuration=Release /verbosity:minimal
-cd ..
-
-xcopy src\Jackett.Console\bin\Release build.windows\  /e /y
-copy /Y src\Jackett.Service\bin\Release\JackettService.exe build.windows\JackettService.exe
-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
-
-
-cd src
-Msbuild Jackett.sln /t:Clean
-call "C:\Program Files (x86)\Mono\bin\xbuild.bat"  Jackett.sln /t:Build /p:Configuration=Release /verbosity:minimal
-cd ..
-
-xcopy src\Jackett.Console\bin\Release build.mono\  /e /y
-copy /Y src\Jackett.Service\bin\Release\JackettService.exe build.mono\JackettService.exe
-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
-
-iscc Installer.iss
-

Installer.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Jackett"
-#define MyAppVersion GetFileVersion("build.windows/Jackett.dll")
+#define MyAppVersion GetFileVersion("BuildOutput\FullFramework\Windows\Jackett\Jackett.Common.dll")
 #define MyAppPublisher "Jackett  Inc."
 #define MyAppURL "https://github.com/Jackett/Jackett"
 #define MyAppExeName "JackettTray.exe"
@@ -22,7 +22,7 @@ AppUpdatesURL={#MyAppURL}
 DefaultDirName={pf}\{#MyAppName}
 DefaultGroupName={#MyAppName}
 DisableProgramGroupPage=yes
-OutputBaseFilename=setup
+OutputBaseFilename=Jackett.Installer.Windows
 SetupIconFile=src\Jackett.Console\jackett.ico
 UninstallDisplayIcon={commonappdata}\Jackett\JackettConsole.exe
 Compression=lzma
@@ -37,9 +37,9 @@ 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: "{commonappdata}\Jackett"; Flags: ignoreversion
-Source: "build.windows\JackettUpdater.exe"; DestDir: "{commonappdata}\Jackett"; Flags: ignoreversion
-Source: "build.windows\*"; DestDir: "{commonappdata}\Jackett"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "BuildOutput\FullFramework\Windows\Jackett\JackettTray.exe"; DestDir: "{commonappdata}\Jackett"; Flags: ignoreversion
+Source: "BuildOutput\FullFramework\Windows\Jackett\JackettUpdater.exe"; DestDir: "{commonappdata}\Jackett"; Flags: ignoreversion
+Source: "BuildOutput\FullFramework\Windows\Jackett\*"; DestDir: "{commonappdata}\Jackett"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]

README.md

@@ -2,8 +2,7 @@
 
 [![GitHub issues](https://img.shields.io/github/issues/Jackett/Jackett.svg?maxAge=60&style=flat-square)](https://github.com/Jackett/Jackett/issues)
 [![GitHub pull requests](https://img.shields.io/github/issues-pr/Jackett/Jackett.svg?maxAge=60&style=flat-square)](https://github.com/Jackett/Jackett/pulls)
-[![Bountysource](https://img.shields.io/bountysource/team/jackett/activity.svg?style=flat-square)](https://www.bountysource.com/teams/jackett)
-[![Build status](https://ci.appveyor.com/api/projects/status/gaybh5mvyx418nsp/branch/master?svg=true)](https://ci.appveyor.com/project/camjac251/jackett)
+[![Build status](https://ci.appveyor.com/api/projects/status/gaybh5mvyx418nsp/branch/master?svg=true)](https://ci.appveyor.com/project/Jackett/jackett)
 [![Github Releases](https://img.shields.io/github/downloads/Jackett/Jackett/total.svg?maxAge=60&style=flat-square)](https://github.com/Jackett/Jackett/releases/latest)
 [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/jackett.svg?maxAge=60&style=flat-square)](https://hub.docker.com/r/linuxserver/jackett/)
 [![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60&style=flat-square)](https://discord.gg/J865QuA)
@@ -17,8 +16,8 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 
 
 #### Supported Systems
-* Windows using .NET 4.5.2 [Download here](https://www.microsoft.com/net/framework/versions/net452).
-* Linux and macOS using Mono 4.6.0 and above. [Download here](http://www.mono-project.com/download/). Earlier versions of mono may work but some trackers may fail to negotiate SSL correctly, and others may cause Jackett to crash when used.
+* Windows using .NET 4.6.1 or above [Download here](https://www.microsoft.com/net/framework/versions/net461).
+* Linux and macOS using Mono 5.8 or above. [Download here](http://www.mono-project.com/download/). Earlier versions of mono may work, but some trackers may fail to negotiate SSL correctly, and others may cause Jackett to crash when used.
 
 ### Supported Public Trackers
  * 1337x
@@ -29,35 +28,43 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * BTDB
  * BT-Scene
  * cpasbien
+ * ETTV
+ * ExtraTorrent.ag
  * EZTV
+ * Frozen Layer
  * GkTorrent
  * Horrible Subs
  * Idope
  * Il Corsaro Nero <!-- maintained by bonny1992 -->
+ * Il Corsaro Blu
+ * Isohunt2
  * KickAssTorrent
  * KickAssTorrent (thekat.se clone)
  * LimeTorrents
  * MagnetDL
  * NextTorrent
+ * Newpct (aka: tvsinpagar, descargas2020, torrentlocura, torrentrapid, etc)
  * Nyaa.si
  * Nyaa-Pantsu
  * Nyoo
  * RARBG
  * RuTor
  * ShowRSS
- * Sky torrents
+ * sukebei.Nyaa.si
+ * sukebei-Pantsu
  * The Pirate Bay
  * TNTVillage <!-- maintained by bonny1992 -->
  * Tokyo Toshokan
  * Torlock
  * Torrent Downloads
  * Torrent9
- * TorrentProject
+ * TorrentKim
  * Torrentz2
  * World Wide Torrents
+ * YIFY (YTS)
  * YTS.ag
  * Zooqle
- 
+
 ### Supported Semi-Private Trackers
  * 7tor
  * CzTorrent
@@ -69,10 +76,12 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Metal Tracker
  * MVGroup Forum
  * MVGroup Main
+ * Newstudio
  * NetHD
+ * NoName Club
  * RuTracker
  * SkTorrent
- * TorrentBytes
+ * Union Fansub
  * Xtreme Zone
  * YggTorrent
  * Ztracker
@@ -83,7 +92,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Abnormal
  * Acid-Lounge
  * AlphaRatio
- * Andraste
  * AnimeBytes
  * AnimeTorrents
  * AOX
@@ -103,78 +111,82 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * BIGTorrent
  * Bit-City Reloaded
  * BIT-HDTV
- * BitHQ
+ * Bithorlo
  * BitHUmen
  * BitMe
  * BitMeTV
  * BitSoup  [![(invite needed)][inviteneeded]](#)
  * Bitspyder
+ * BitTorrentFiles  [![(invite needed)][inviteneeded]](#)
  * BJ-Share
- * Blu-bits
  * BlueBird
  * Blutopia
+ * Brasil Tracker
  * BroadcastTheNet
  * BrokenStones
  * BTNext
+ * BTWorld
  * Carpathians
+ * CCFBits
  * CGPeers
  * CHDBits
  * Cinematik
  * Cinemageddon
  * CinemaZ
  * Classix
- * CZTeam
  * DanishBits
  * DataScene
  * Demonoid
  * Diablo Torrent
  * DigitalHive
+ * Downloadville
  * Dragonworld Reloaded
  * Dream Team
  * EliteHD  [![(invite needed)][inviteneeded]](#)
+ * Elit Tracker
  * Elite-Tracker
+ * Empornium
  * EoT-Forum
  * eStone
  * Ethor.net (Thor's Land)
  * FANO.IN
  * FileList
+ * Femdomcult
  * Freedom-HD
  * FullMixMusic
  * FunFile
  * FunkyTorrents
  * Fuzer
  * GayTorrent.ru
- * GFTracker
+ * GazelleGames
  * Gfxnews
  * GFXPeers
- * Ghost City
  * GigaTorrents
  * GimmePeers <!-- maintained by jamesb2147 -->
+ * Girotottent
  * GODS  [![(invite needed)][inviteneeded]](#)
- * Gormogon
  * Greek Team
+ * HacheDe
  * Hardbay
  * HD-Forever
  * HD-Only
  * HD-Space
+ * HD-Spain
  * HD-Torrents
  * HD-Bits.com
- * HD4Free
  * HDBits
  * HDChina
+ * HDCity
  * HDHome
  * HDME
  * HDSky
  * HDTorrents.it
  * Hebits
  * Hon3y HD
- * Hounddawgs
- * House-of-Torrents
  * Hyperay
  * ICE Torrent
  * I Love Classics
  * Immortalseed
- * Infinity-T
  * inPeril
  * Insane Tracker
  * IPTorrents
@@ -195,11 +207,11 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * NCore
  * Nebulance
  * New Real World
- * Norbits  [![(invite needed)][inviteneeded]](#) <!-- added by DiseaseNO but no longer maintained? -->
+ * Norbits <!-- added by DiseaseNO but no longer maintained? -->
  * notwhat.cd
  * Ourbits
  * Passione Torrent <!-- maintained by bonny1992 -->
- * PassThePopcorn  [![(invite needed)][inviteneeded]](#)
+ * PassThePopcorn
  * PirateTheNet
  * PiXELHD
  * PolishSource
@@ -208,11 +220,14 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * PrivateHD
  * Psytorrents
  * PTFiles
+ * PuntoTorrent
+ * Racing4Everyone (R4E)
  * Redacted (PassTheHeadphones)
  * RevolutionTT
- * Rockhard Lossless
+ * RGU
  * RoDVD
  * SceneFZ
+ * SceneReactor
  * SceneTime
  * SDBits
  * Secret Cinema
@@ -226,8 +241,9 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * SportsCult
  * SportHD
  * Superbits
- * Synthesiz3r
  * Tasmanit
+ * TBPlus
+ * TenYardTracker
  * The Empire
  * The Geeks
  * The Horror Charnel
@@ -238,42 +254,52 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * The Show
  * The Vault
  * The-Torrents
- * TehConnection
- * TenYardTracker
  * Torrent Network
  * Torrent Sector Crew
+ * Torrent.LT
  * TorrentBD
+ * TorrentBytes
  * TorrentCCF  [![(invite needed)][inviteneeded]](#)
  * TorrentDay
  * Torrentech
  * TorrentHeaven
  * TorrentHR
  * Torrenting
+ * Torrentland
  * TorrentLeech
  * Torrents.Md
- * TorrentVault
+ * TorrentSeeds
  * Torrent-Syndikat
+ * TOrrent-tuRK (TORK)
  * TorViet
  * ToTheGlory
  * TranceTraffic
  * Trezzor
  * TV Chaos UK
  * TV-Vault
- * u-Torrent
+ * u-torrents (SceneFZ)
  * UHDBits
  * Ultimate Gamer Club
- * ULTRAHDCLUB
  * Waffles
  * World-In-HD
  * WorldOfP2P
  * x264
+ * xBytesV2
  * XSpeeds
  * Xthor
+ * Your Exotic Torrents
  * Zamunda.net
  * Zelka.org
 
 Trackers marked with  [![(invite needed)][inviteneeded]](#) have no active maintainer and are missing features or are broken. If you have an invite for them please send it to kaso1717 -at- gmail.com to get them fixed/improved.
 
+### Aggregate indexers
+
+A special "all" indexer is available at `/api/v2.0/indexers/all/results/torznab/api`.
+It will query all configured indexers and return the combined results.
+
+To get all Jackett indexers including their capabilities you can use `t=indexers` on the all indexer. To get only configured/unconfigured indexers you can also add `configured=true/false` as query parameter.
+
 ## Installation on Windows
 
 We recommend you install Jackett as a Windows service using the supplied installer. You may also download the zipped version if you would like to configure everything manually.
@@ -292,7 +318,7 @@ When installed as a service the tray icon acts as a way to open/start/stop Jacke
 Jackett can also be run from the command line if you would like to see log messages (Ensure the server isn't already running from the tray/service). This can be done by using "JackettConsole.exe" (for Command Prompt), found in the Jackett data folder: "%ProgramData%\Jackett".
 
 ## Installation on Linux
- 1. Install [Mono 4.6](http://www.mono-project.com/download/#download-lin) or better (using the latest stable release for your distribution is recommended)
+ 1. Install [Mono 5.8](http://www.mono-project.com/download/#download-lin) or better (using the latest stable release is recommended)
        * Follow the instructions on the mono website and install the `mono-devel` and the `ca-certificates-mono` packages.
        * On Red Hat/CentOS/openSUSE/Fedora the `mono-locale-extras` package is also required.
  2. Install  libcurl:
@@ -305,6 +331,8 @@ Detailed instructions for [Ubuntu 14.x](http://www.htpcguides.com/install-jacket
 
 If you want to run it with a user without a /home directory you need to add `Environment=XDG_CONFIG_HOME=/path/to/folder` to your systemd file, this folder will be used to store your config files.  
 
+Mono must be compiled with the Roslyn compiler (default), using MCS will cause "An error has occurred." errors (See https://github.com/Jackett/Jackett/issues/2704).
+
 ## Installation on macOS
 
 ### Prerequisites
@@ -315,7 +343,7 @@ Install [Mono 4.6](http://www.mono-project.com/download/#download-mac) or better
 1. Download and extract the latest `Jackett.Binaries.Mono.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases).
 2. Open the extracted folder and double-click on `install_service_macos`.
 3. If the installation was a success, you can close the Terminal window.
-       
+
 The service will start on each logon. You can always stop it by running `launchctl unload ~/Library/LaunchAgents/org.user.Jackett.plist` from Terminal. You can start it again it using `launchctl load ~/Library/LaunchAgents/org.user.Jackett.plist`.
 Logs are stored as usual under `~/.config/Jackett/log.txt`.
 
@@ -328,6 +356,19 @@ Detailed instructions are available at [LinuxServer.io Jackett Docker](https://h
 ## Installation on Synology
 Jackett is available as beta package from [SynoCommunity](https://synocommunity.com/)
 
+## Running Jackett behind a reverse proxy
+When running jackett behind a reverse proxy make sure that the original hostname of the request is passed to Jackett. If HTTPS is used also set the X-Forwarded-Proto header to "https". Don't forget to adjust the "Base Path Override" Jackett option accordingly.
+
+Example config for apache:
+```
+<Location /jackett>
+    ProxyPreserveHost On
+    RequestHeader set X-Forwarded-Proto expr=%{REQUEST_SCHEME}
+    ProxyPass http://127.0.0.1:9117
+    ProxyPassReverse http://127.0.0.1:9117
+</Location>
+```
+
 ## Troubleshooting
 
 * __Command line switches__
@@ -341,18 +382,42 @@ Jackett is available as beta package from [SynoCommunity](https://synocommunity.
    - On Linux (as user root): `wget -O - https://curl.haxx.se/ca/cacert.pem | cert-sync /dev/stdin`
    - On macOS: `curl -sS https://curl.haxx.se/ca/cacert.pem | cert-sync --user /dev/stdin`
 
-*  __Enable logging__
+*  __Enable enhanced logging__
 
-  You can get additional logging with the command line switches `-t -l` or by enabling `Enhanced logging` via the web interface.
+  You can get *enhanced* logging with the command line switches `-t -l` or by enabling `Enhanced logging` via the web interface (followed by clicking on the `Apply Server Settings` button).
   Please post logs if you are unable to resolve your issue with these switches ensuring to remove your username/password/cookies.
   The logfiles (log.txt/updater.txt) are stored in `%ProgramData%\Jackett` on Windows and `~/.config/Jackett/` on Linux/macOS.
 
+## Configuring OMDb
+This feature is used as a fallback to get the movie/series title if only the IMDB ID is provided in the request.
+To use it, please just request a free API key on [OMDb](http://www.omdbapi.com/apikey.aspx) (1,000 daily requests limit) and paste the key in Jackett
+
 ## 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/Jackett/Jackett/issues).  It is recommended to use Visual Studio 2017 when making code changes in this project. You can download the community version for free [here](https://www.visualstudio.com/downloads/).
 
+
+## Building from source
+
+### Windows
+* Open the Jackett solution in Visual Studio 2017 (version 15.7 or above)
+* Right click on the Jackett solution and click 'Rebuild Solution' to restore nuget packages
+* Select Jackett.Console as startup project
+* Build/Start the project
+
+### Linux
+
+```bash
+sudo apt install mono-complete nuget msbuild # install build tools (debian/ubuntu)
+git clone https://github.com/Jackett/Jackett.git
+cd Jackett/src
+nuget restore Jackett.sln # prepare dependencies
+msbuild Jackett.Console/Jackett.Console.csproj /t:Build /p:Configuration=Debug # compile
+mono Jackett.Console/bin/Debug/JackettConsole.exe # run jackett
+```
+
 ## Screenshots
 
 ![screenshot](https://i.imgur.com/0d1nl7g.png "screenshot")

appveyor.yml

@@ -1,72 +1,33 @@
 version: 0.8.{build}
-pull_requests:
-  do_not_increment_build_number: true
 skip_tags: true
 image: Visual Studio 2017
 configuration: Release
-shallow_clone: true
 assembly_info:
   patch: true
   file: '**\AssemblyInfo.*'
   assembly_version: '{version}'
   assembly_file_version: '{version}'
   assembly_informational_version: '{version}'
-install:
-- cmd: choco install InnoSetup
-before_build:
-- cmd: nuget restore src\Jackett.sln
-build:
-  verbosity: minimal
-after_build:
-- cmd: >-
-    xcopy src\Jackett.Console\bin\Release base\  /e /y
-
-    copy /Y src\Jackett.Service\bin\Release\JackettService.exe* %APPVEYOR_BUILD_FOLDER%\base\
-
-    copy /Y src\Jackett.Tray\bin\Release\JackettTray.exe* %APPVEYOR_BUILD_FOLDER%\base\
-
-    copy /Y src\Jackett.Updater\bin\Release\JackettUpdater.exe* %APPVEYOR_BUILD_FOLDER%\base\
-
-    copy /Y Upstart.config base\Upstart.config
-
-    copy /Y LICENSE base\LICENSE
-
-    copy /Y README.md base\README.md
-
-
-    xcopy base build.windows\ /e /y
-
-    xcopy base BaseBuild\Jackett\ /e /y
-
-
-    "C:\Program Files (x86)\Inno Setup 5\ISCC.exe" Installer.iss
-
-    RENAME Output\setup.exe Jackett.Installer.Windows.exe
-
-    MOVE Output\Jackett.Installer.Windows.exe %APPVEYOR_BUILD_FOLDER%
-
-
-    cd BaseBuild
-
-    7z a -tzip -r "%APPVEYOR_BUILD_FOLDER%\Jackett.Binaries.Windows.zip" "Jackett\"
-
-    7z a -ttar "%APPVEYOR_BUILD_FOLDER%\Jackett.Binaries.Mono.tar" "Jackett\"
-
-    cd %APPVEYOR_BUILD_FOLDER%
-
-    7z a -tgzip "Jackett.Binaries.Mono.tar.gz" "Jackett.Binaries.Mono.tar"
-
-
-    appveyor PushArtifact Jackett.Installer.Windows.exe
-
-    appveyor PushArtifact Jackett.Binaries.Windows.zip
-
-    appveyor PushArtifact Jackett.Binaries.Mono.tar.gz
+dotnet_csproj:
+  patch: true
+  file: '**\*.csproj'
+  version: '{version}'
+  package_version: '{version}'
+  assembly_version: '{version}'
+  file_version: '{version}'
+  informational_version: '{version}'
+build_script:
+- ps: .\build.ps1
+test: off
+before_deploy:
+- ps: ${env:release_description} = ( Get-Content -LiteralPath BuildOutput/ReleaseNotes.txt -Encoding UTF8 ) -join "`n";
 deploy:
 - provider: GitHub
   tag: v$(appveyor_build_version)
+  description: $(release_description)
   auth_token:
     secure: hOg+16YTIbq4kO9u4D1YVOTbWDqgCX6mAQYMbnmBBSw2CiUsZh7OKbupoUb3FtWa
+  artifact: /^(?:(?![Ee]xperimental).)*$/
   draft: true
   on:
     branch: master

build.cake

@@ -0,0 +1,285 @@
+#tool nuget:?package=NUnit.ConsoleRunner
+#addin nuget:?package=Cake.Git
+
+//////////////////////////////////////////////////////////////////////
+// ARGUMENTS
+//////////////////////////////////////////////////////////////////////
+
+var target = Argument("target", "Default");
+var configuration = Argument("configuration", "Release");
+
+//////////////////////////////////////////////////////////////////////
+// PREPARATION
+//////////////////////////////////////////////////////////////////////
+
+// Define directories.
+var workingDir = MakeAbsolute(Directory("./"));
+var artifactsDirName = "Artifacts";
+var testResultsDirName = "TestResults";
+
+var windowsBuildFullFramework = "./BuildOutput/FullFramework/Windows";
+var monoBuildFullFramework = "./BuildOutput/FullFramework/Mono";
+
+//////////////////////////////////////////////////////////////////////
+// TASKS
+//////////////////////////////////////////////////////////////////////
+
+Task("Info")
+	.Does(() =>
+	{
+		Information(@"Jackett Cake build script starting...");
+		Information(@"Requires InnoSetup and C:\cygwin to be present for packaging (Pre-installed on AppVeyor)");
+		Information(@"Working directory is: " + workingDir);
+	});
+
+Task("Clean")
+	.IsDependentOn("Info")
+	.Does(() =>
+	{
+		CleanDirectories("./src/**/obj" + configuration);
+		CleanDirectories("./src/**/bin" + configuration);
+		CleanDirectories("./BuildOutput");
+		CleanDirectories("./" + artifactsDirName);
+		CleanDirectories("./" + testResultsDirName);
+
+		Information("Clean completed");
+	});
+
+Task("Restore-NuGet-Packages")
+	.IsDependentOn("Clean")
+	.Does(() =>
+	{
+		NuGetRestore("./src/Jackett.sln");
+	});
+
+Task("Build")
+	.IsDependentOn("Restore-NuGet-Packages")
+	.Does(() =>
+	{
+		MSBuild("./src/Jackett.sln", settings => settings.SetConfiguration(configuration));
+	});
+
+Task("Run-Unit-Tests")
+	.IsDependentOn("Build")
+	.Does(() =>
+	{
+		CreateDirectory("./" + testResultsDirName);
+		var resultsFile = $"./{testResultsDirName}/JackettTestResult.xml";
+
+		NUnit3("./src/**/bin/" + configuration + "/**/*.Test.dll", new NUnit3Settings
+		{
+			Results = new[] { new NUnit3Result { FileName = resultsFile } }
+		});
+
+		if(AppVeyor.IsRunningOnAppVeyor)
+		{
+			AppVeyor.UploadTestResults(resultsFile, AppVeyorTestResultsType.NUnit3);
+		}
+	});
+
+Task("Copy-Files-Full-Framework")
+	.IsDependentOn("Run-Unit-Tests")
+	.Does(() =>
+	{
+		var windowsOutput = windowsBuildFullFramework + "/Jackett";
+
+		CopyDirectory("./src/Jackett.Console/bin/" + configuration, windowsOutput);
+		CopyFiles("./src/Jackett.Service/bin/" + configuration + "/JackettService.*", windowsOutput);
+		CopyFiles("./src/Jackett.Tray/bin/" + configuration + "/JackettTray.*", windowsOutput);
+		CopyFiles("./src/Jackett.Updater/bin/" + configuration + "/JackettUpdater.*", windowsOutput);
+		CopyFiles("./Upstart.config", windowsOutput);
+		CopyFiles("./LICENSE", windowsOutput);
+		CopyFiles("./README.md", windowsOutput);
+
+		var monoOutput = monoBuildFullFramework + "/Jackett";
+
+		CopyDirectory(windowsBuildFullFramework, monoBuildFullFramework);
+		DeleteFiles(monoOutput + "/JackettService.*");
+		DeleteFiles(monoOutput + "/JackettTray.*");
+
+		Information("Full framework file copy completed");
+	});
+
+Task("Check-Packaging-Platform")
+	.IsDependentOn("Copy-Files-Full-Framework")
+	.Does(() =>
+	{
+		if (IsRunningOnWindows())
+		{
+			CreateDirectory("./" + artifactsDirName);
+			Information("Platform is Windows");
+		}
+		else
+		{
+			throw new Exception("Packaging is currently only implemented for a Windows environment");
+		}
+	});
+
+Task("Package-Windows-Installer-Full-Framework")
+	.IsDependentOn("Check-Packaging-Platform")
+	.Does(() =>
+	{
+		InnoSetup("./Installer.iss", new InnoSetupSettings {
+			OutputDirectory = workingDir + "/" + artifactsDirName
+		});
+	});
+
+Task("Package-Files-Full-Framework-Windows")
+	.IsDependentOn("Check-Packaging-Platform")
+	.Does(() =>
+	{
+		Zip(windowsBuildFullFramework, $"./{artifactsDirName}/Jackett.Binaries.Windows.zip");
+		Information(@"Full Framework Windows Binaries Zipping Completed");
+	});
+
+Task("Package-Files-Full-Framework-Mono")
+	.IsDependentOn("Check-Packaging-Platform")
+	.Does(() =>
+	{
+		var cygMonoBuildPath = RelativeWinPathToCygPath(monoBuildFullFramework);
+		var tarFileName = "Jackett.Binaries.Mono.tar";
+		var tarArguments = @"-cvf " + cygMonoBuildPath + "/" + tarFileName + " -C " + cygMonoBuildPath + " Jackett --mode ='755'";
+		var gzipArguments = @"-k " + cygMonoBuildPath + "/" + tarFileName;
+
+		RunCygwinCommand("Tar", tarArguments);
+		RunCygwinCommand("Gzip", gzipArguments);
+
+		MoveFile($"{monoBuildFullFramework}/{tarFileName}.gz", $"./{artifactsDirName}/{tarFileName}.gz");
+	});
+
+Task("Package-Full-Framework")
+	.IsDependentOn("Package-Windows-Installer-Full-Framework")
+	.IsDependentOn("Package-Files-Full-Framework-Windows")
+	.IsDependentOn("Package-Files-Full-Framework-Mono")
+	.Does(() =>
+	{
+		Information("Full Framwork Packaging Completed");
+	});
+
+Task("Appveyor-Push-Artifacts")
+	.IsDependentOn("Package-Full-Framework")
+	.Does(() =>
+	{
+		if (AppVeyor.IsRunningOnAppVeyor)
+		{
+			foreach (var file in GetFiles(workingDir + $"/{artifactsDirName}/*"))
+			{
+				AppVeyor.UploadArtifact(file.FullPath);
+			}
+		}
+		else
+		{
+			Information(@"Skipping as not running in AppVeyor Environment");
+		}
+	});
+
+Task("Release-Notes")
+	.IsDependentOn("Appveyor-Push-Artifacts")
+	.Does(() =>
+	{
+		string latestTag = GitDescribe(".", false, GitDescribeStrategy.Tags, 0);
+		Information($"Latest tag is: {latestTag}" + Environment.NewLine);
+
+		List<GitCommit> relevantCommits = new List<GitCommit>();
+
+		var commitCollection = GitLog("./", 50);
+
+		foreach(GitCommit commit in commitCollection)
+		{
+			var commitTag = GitDescribe(".", commit.Sha, false, GitDescribeStrategy.Tags, 0);
+
+			if (commitTag == latestTag)
+			{
+				relevantCommits.Add(commit);
+			}
+			else
+			{
+				break;
+			}
+		}
+
+		relevantCommits = relevantCommits.AsEnumerable().Reverse().Skip(1).ToList();
+
+		if (relevantCommits.Count() > 0)
+		{
+			List<string> notesList = new List<string>();
+				
+			foreach(GitCommit commit in relevantCommits)
+			{
+				notesList.Add($"{commit.MessageShort} (Thank you @{commit.Author.Name})");
+			}
+
+			string buildNote = String.Join(Environment.NewLine, notesList);
+			Information(buildNote);
+
+			System.IO.File.WriteAllLines(workingDir + "\\BuildOutput\\ReleaseNotes.txt", notesList.ToArray());
+		}
+		else
+		{
+			Information($"No commit messages found to create release notes");
+		}
+
+	});
+
+
+private void RunCygwinCommand(string utility, string utilityArguments)
+{
+	var cygwinDir = @"C:\cygwin\bin\";
+	var utilityProcess = cygwinDir + utility + ".exe";
+
+	Information("CygWin Utility: " + utility);
+	Information("CygWin Directory: " + cygwinDir);
+	Information("Utility Location: " + utilityProcess);
+	Information("Utility Arguments: " + utilityArguments);
+
+	IEnumerable<string> redirectedStandardOutput;
+	IEnumerable<string> redirectedErrorOutput;
+	var exitCodeWithArgument =
+		StartProcess(
+			utilityProcess,
+			new ProcessSettings {
+				Arguments = utilityArguments,
+				WorkingDirectory = cygwinDir,
+				RedirectStandardOutput = true
+			},
+			out redirectedStandardOutput,
+			out redirectedErrorOutput
+		);
+
+	Information(utility + " output:" + Environment.NewLine + string.Join(Environment.NewLine, redirectedStandardOutput.ToArray()));
+
+	// Throw exception if anything was written to the standard error.
+	if (redirectedErrorOutput != null && redirectedErrorOutput.Any())
+	{
+		throw new Exception(
+			string.Format(
+				utility + " Errors ocurred: {0}",
+				string.Join(", ", redirectedErrorOutput)));
+	}
+
+	Information(utility + " Exit code: {0}", exitCodeWithArgument);
+}
+
+private string RelativeWinPathToCygPath(string relativePath)
+{
+	var cygdriveBase = "/cygdrive/" + workingDir.ToString().Replace(":", "").Replace("\\", "/");
+	var cygPath = cygdriveBase + relativePath.Replace(".", "");
+	return cygPath;
+}
+
+//////////////////////////////////////////////////////////////////////
+// TASK TARGETS
+//////////////////////////////////////////////////////////////////////
+
+Task("Default")
+	.IsDependentOn("Release-Notes")
+	.Does(() =>
+	{
+		Information("Default Task Completed");
+	});
+
+//////////////////////////////////////////////////////////////////////
+// EXECUTION
+//////////////////////////////////////////////////////////////////////
+
+RunTarget(target);

build.ps1

@@ -0,0 +1,235 @@
+##########################################################################
+# This is the Cake bootstrapper script for PowerShell.
+# This file was downloaded from https://github.com/cake-build/resources
+# Feel free to change this file to fit your needs.
+##########################################################################
+
+<#
+
+.SYNOPSIS
+This is a Powershell script to bootstrap a Cake build.
+
+.DESCRIPTION
+This Powershell script will download NuGet if missing, restore NuGet tools (including Cake)
+and execute your Cake build script with the parameters you provide.
+
+.PARAMETER Script
+The build script to execute.
+.PARAMETER Target
+The build script target to run.
+.PARAMETER Configuration
+The build configuration to use.
+.PARAMETER Verbosity
+Specifies the amount of information to be displayed.
+.PARAMETER ShowDescription
+Shows description about tasks.
+.PARAMETER DryRun
+Performs a dry run.
+.PARAMETER Experimental
+Uses the nightly builds of the Roslyn script engine.
+.PARAMETER Mono
+Uses the Mono Compiler rather than the Roslyn script engine.
+.PARAMETER SkipToolPackageRestore
+Skips restoring of packages.
+.PARAMETER ScriptArgs
+Remaining arguments are added here.
+
+.LINK
+https://cakebuild.net
+
+#>
+
+[CmdletBinding()]
+Param(
+    [string]$Script = "build.cake",
+    [string]$Target,
+    [string]$Configuration,
+    [ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")]
+    [string]$Verbosity,
+    [switch]$ShowDescription,
+    [Alias("WhatIf", "Noop")]
+    [switch]$DryRun,
+    [switch]$Experimental,
+    [switch]$Mono,
+    [switch]$SkipToolPackageRestore,
+    [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)]
+    [string[]]$ScriptArgs
+)
+
+[Reflection.Assembly]::LoadWithPartialName("System.Security") | Out-Null
+function MD5HashFile([string] $filePath)
+{
+    if ([string]::IsNullOrEmpty($filePath) -or !(Test-Path $filePath -PathType Leaf))
+    {
+        return $null
+    }
+
+    [System.IO.Stream] $file = $null;
+    [System.Security.Cryptography.MD5] $md5 = $null;
+    try
+    {
+        $md5 = [System.Security.Cryptography.MD5]::Create()
+        $file = [System.IO.File]::OpenRead($filePath)
+        return [System.BitConverter]::ToString($md5.ComputeHash($file))
+    }
+    finally
+    {
+        if ($file -ne $null)
+        {
+            $file.Dispose()
+        }
+    }
+}
+
+function GetProxyEnabledWebClient
+{
+    $wc = New-Object System.Net.WebClient
+    $proxy = [System.Net.WebRequest]::GetSystemWebProxy()
+    $proxy.Credentials = [System.Net.CredentialCache]::DefaultCredentials        
+    $wc.Proxy = $proxy
+    return $wc
+}
+
+Write-Host "Preparing to run build script..."
+
+if(!$PSScriptRoot){
+    $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
+}
+
+$TOOLS_DIR = Join-Path $PSScriptRoot "tools"
+$ADDINS_DIR = Join-Path $TOOLS_DIR "Addins"
+$MODULES_DIR = Join-Path $TOOLS_DIR "Modules"
+$NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe"
+$CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe"
+$NUGET_URL = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
+$PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config"
+$PACKAGES_CONFIG_MD5 = Join-Path $TOOLS_DIR "packages.config.md5sum"
+$ADDINS_PACKAGES_CONFIG = Join-Path $ADDINS_DIR "packages.config"
+$MODULES_PACKAGES_CONFIG = Join-Path $MODULES_DIR "packages.config"
+
+# Make sure tools folder exists
+if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) {
+    Write-Verbose -Message "Creating tools directory..."
+    New-Item -Path $TOOLS_DIR -Type directory | out-null
+}
+
+# Make sure that packages.config exist.
+if (!(Test-Path $PACKAGES_CONFIG)) {
+    Write-Verbose -Message "Downloading packages.config..."    
+    try {        
+        $wc = GetProxyEnabledWebClient
+        $wc.DownloadFile("https://cakebuild.net/download/bootstrapper/packages", $PACKAGES_CONFIG) } catch {
+        Throw "Could not download packages.config."
+    }
+}
+
+# Try find NuGet.exe in path if not exists
+if (!(Test-Path $NUGET_EXE)) {
+    Write-Verbose -Message "Trying to find nuget.exe in PATH..."
+    $existingPaths = $Env:Path -Split ';' | Where-Object { (![string]::IsNullOrEmpty($_)) -and (Test-Path $_ -PathType Container) }
+    $NUGET_EXE_IN_PATH = Get-ChildItem -Path $existingPaths -Filter "nuget.exe" | Select -First 1
+    if ($NUGET_EXE_IN_PATH -ne $null -and (Test-Path $NUGET_EXE_IN_PATH.FullName)) {
+        Write-Verbose -Message "Found in PATH at $($NUGET_EXE_IN_PATH.FullName)."
+        $NUGET_EXE = $NUGET_EXE_IN_PATH.FullName
+    }
+}
+
+# Try download NuGet.exe if not exists
+if (!(Test-Path $NUGET_EXE)) {
+    Write-Verbose -Message "Downloading NuGet.exe..."
+    try {
+        $wc = GetProxyEnabledWebClient
+        $wc.DownloadFile($NUGET_URL, $NUGET_EXE)
+    } catch {
+        Throw "Could not download NuGet.exe."
+    }
+}
+
+# Save nuget.exe path to environment to be available to child processed
+$ENV:NUGET_EXE = $NUGET_EXE
+
+# Restore tools from NuGet?
+if(-Not $SkipToolPackageRestore.IsPresent) {
+    Push-Location
+    Set-Location $TOOLS_DIR
+
+    # Check for changes in packages.config and remove installed tools if true.
+    [string] $md5Hash = MD5HashFile($PACKAGES_CONFIG)
+    if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or
+      ($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) {
+        Write-Verbose -Message "Missing or changed package.config hash..."
+        Get-ChildItem -Exclude packages.config,nuget.exe,Cake.Bakery |
+        Remove-Item -Recurse
+    }
+
+    Write-Verbose -Message "Restoring tools from NuGet..."
+    $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`""
+
+    if ($LASTEXITCODE -ne 0) {
+        Throw "An error occurred while restoring NuGet tools."
+    }
+    else
+    {
+        $md5Hash | Out-File $PACKAGES_CONFIG_MD5 -Encoding "ASCII"
+    }
+    Write-Verbose -Message ($NuGetOutput | out-string)
+
+    Pop-Location
+}
+
+# Restore addins from NuGet
+if (Test-Path $ADDINS_PACKAGES_CONFIG) {
+    Push-Location
+    Set-Location $ADDINS_DIR
+
+    Write-Verbose -Message "Restoring addins from NuGet..."
+    $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$ADDINS_DIR`""
+
+    if ($LASTEXITCODE -ne 0) {
+        Throw "An error occurred while restoring NuGet addins."
+    }
+
+    Write-Verbose -Message ($NuGetOutput | out-string)
+
+    Pop-Location
+}
+
+# Restore modules from NuGet
+if (Test-Path $MODULES_PACKAGES_CONFIG) {
+    Push-Location
+    Set-Location $MODULES_DIR
+
+    Write-Verbose -Message "Restoring modules from NuGet..."
+    $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$MODULES_DIR`""
+
+    if ($LASTEXITCODE -ne 0) {
+        Throw "An error occurred while restoring NuGet modules."
+    }
+
+    Write-Verbose -Message ($NuGetOutput | out-string)
+
+    Pop-Location
+}
+
+# Make sure that Cake has been installed.
+if (!(Test-Path $CAKE_EXE)) {
+    Throw "Could not find Cake.exe at $CAKE_EXE"
+}
+
+
+
+# Build Cake arguments
+$cakeArguments = @("$Script");
+if ($Target) { $cakeArguments += "-target=$Target" }
+if ($Configuration) { $cakeArguments += "-configuration=$Configuration" }
+if ($Verbosity) { $cakeArguments += "-verbosity=$Verbosity" }
+if ($ShowDescription) { $cakeArguments += "-showdescription" }
+if ($DryRun) { $cakeArguments += "-dryrun" }
+if ($Experimental) { $cakeArguments += "-experimental" }
+if ($Mono) { $cakeArguments += "-mono" }
+$cakeArguments += $ScriptArgs
+
+# Start Cake
+Write-Host "Running build script..."
+&$CAKE_EXE $cakeArguments
+exit $LASTEXITCODE

src/CurlSharp/Callbacks/CurlEasyCallbacks.cs

@@ -1,7 +1,8 @@
 using System;
 using System.Runtime.InteropServices;
+using CurlSharp.Enums;
 
-namespace CurlSharp
+namespace CurlSharp.Callbacks
 {
     /// <summary>
     ///     Called when cURL has debug information for the client.

src/CurlSharp/Callbacks/CurlShareCallbacks.cs

@@ -1,6 +1,7 @@
 using System;
+using CurlSharp.Enums;
 
-namespace CurlSharp
+namespace CurlSharp.Callbacks
 {
     /// <summary>
     ///     Called when <c>cURL</c> wants to lock a shared resource.

src/CurlSharp/Curl.cs

@@ -19,6 +19,7 @@
 
 using System;
 using System.Runtime.InteropServices;
+using CurlSharp.Enums;
 
 namespace CurlSharp
 {

src/CurlSharp/CurlEasy.cs

@@ -19,6 +19,8 @@
 
 using System;
 using System.Runtime.InteropServices;
+using CurlSharp.Callbacks;
+using CurlSharp.Enums;
 
 namespace CurlSharp
 {

src/CurlSharp/CurlHttpMultiPartForm.cs

@@ -19,6 +19,7 @@
 
 using System;
 using System.Runtime.InteropServices;
+using CurlSharp.Enums;
 
 namespace CurlSharp
 {

src/CurlSharp/CurlMulti.cs

@@ -20,6 +20,7 @@
 using System;
 using System.Collections;
 using System.Runtime.InteropServices;
+using CurlSharp.Enums;
 
 namespace CurlSharp
 {
@@ -295,7 +296,9 @@ namespace CurlSharp
             _multiInfo = null;
             throw new NotImplementedException("CurlMulti.InfoRead()");
 #endif
+#pragma warning disable CS0162 // Unreachable code detected when not compiling with the shim
             return _multiInfo;
+#pragma warning restore CS0162 // Unreachable code detected when not compiling with the shim
         }
     }
 }

src/CurlSharp/CurlMultiInfo.cs

@@ -17,6 +17,8 @@
  *
  **************************************************************************/
 
+using CurlSharp.Enums;
+
 namespace CurlSharp
 {
     /// <summary>

src/CurlSharp/CurlShare.cs

@@ -19,6 +19,8 @@
 
 using System;
 using System.Runtime.InteropServices;
+using CurlSharp.Callbacks;
+using CurlSharp.Enums;
 
 namespace CurlSharp
 {

src/CurlSharp/CurlSlist.cs

@@ -20,6 +20,7 @@
 using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
+using CurlSharp.Enums;
 
 namespace CurlSharp
 {

src/CurlSharp/CurlSslContext.cs

@@ -18,6 +18,7 @@
  **************************************************************************/
 
 using System;
+using CurlSharp.Callbacks;
 
 namespace CurlSharp
 {

src/CurlSharp/CurlVersionInfoData.cs

@@ -18,7 +18,7 @@
  **************************************************************************/
 
 using System;
-using System.Runtime.InteropServices;
+using CurlSharp.Enums;
 
 namespace CurlSharp
 {

src/CurlSharp/Enums/CurlClosePolicy.cs

@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
     /// <summary>
     ///     Contains values used to specify the order in which cached connections

src/CurlSharp/Enums/CurlCode.cs

@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
     /// <summary>
     ///     Status code returned from <see cref="CurlEasy" /> functions.

src/CurlSharp/Enums/CurlFormCode.cs

@@ -17,7 +17,7 @@
  * $Id: Enums.cs,v 1.1 2005/02/17 22:47:25 jeffreyphillips Exp $
  **************************************************************************/
 
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
     /// <summary>
     ///     One of these is returned by <see cref="CurlHttpMultiPartForm.AddSection" />.

src/CurlSharp/Enums/CurlFormOption.cs

@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
     /// <summary>
     ///     These are options available to build a multi-part form section

src/CurlSharp/Enums/CurlFtpAuth.cs

@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
     /// <summary>
     ///     This enumeration contains values used to specify the FTP Ssl

src/CurlSharp/Enums/CurlFtpSsl.cs

@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
     /// <summary>
     ///     This enumeration contains values used to specify the FTP Ssl level

src/CurlSharp/Enums/CurlHttpAuth.cs

@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
     /// <summary>
     ///     This enumeration contains values used to specify the HTTP authentication

src/CurlSharp/Enums/CurlHttpVersion.cs

@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
     /// <summary>
     ///     Contains values used to specify the HTTP version level when using

src/CurlSharp/Enums/CurlInfo.cs

@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
     /// <summary>
     ///     This enumeration is used to extract information associated with an

src/CurlSharp/Enums/CurlInfoType.cs

@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
     /// <summary>
     ///     A member of this enumeration is passed as the first parameter to the

src/CurlSharp/Enums/CurlInitFlag.cs

@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
     /// <summary>
     ///     Contains values used to initialize libcurl internally. One of

src/CurlSharp/Enums/CurlIoCommand.cs

@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
     /// <summary>
     ///     Your handler for the <see cref="CurlEasy.CurlIoctlCallback" />

src/CurlSharp/Enums/CurlIoError.cs

@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
     /// <summary>
     ///     Your handler for the <see cref="CurlEasy.CurlIoctlCallback" /> delegate

src/CurlSharp/Enums/CurlIpResolve.cs

@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
     /// <summary>
     ///     This enumeration contains values used to specify the IP resolution

src/CurlSharp/Enums/CurlLockAccess.cs

@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
     /// <summary>
     ///     Values containing the type of shared access requested when libcurl

src/CurlSharp/Enums/CurlLockData.cs

@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
     /// <summary>
     ///     Members of this enumeration should be passed to

src/CurlSharp/Enums/CurlMessage.cs

@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
     /// <summary>
     ///     The status code associated with an <see cref="CurlEasy" /> object in a

src/CurlSharp/Enums/CurlMultiCode.cs

@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
     /// <summary>
     ///     Contains return codes for many of the functions in the

src/CurlSharp/Enums/CurlMultiOption.cs

@@ -8,7 +8,7 @@
 // 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
     public enum CurlMultiOption
     {

src/CurlSharp/Enums/CurlNetrcOption.cs

@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
     /// <summary>
     ///     Contains values used to specify the preference of libcurl between

src/CurlSharp/Enums/CurlOptType.cs

@@ -8,7 +8,7 @@
 // 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
     public enum CurlOptType
     {

src/CurlSharp/Enums/CurlOption.cs

@@ -17,7 +17,9 @@
  *
  **************************************************************************/
 
-namespace CurlSharp
+using CurlSharp.Callbacks;
+
+namespace CurlSharp.Enums
 {
     /// <summary>
     ///     One of these is passed as the first parameter to

src/CurlSharp/Enums/CurlPipelining.cs

@@ -8,7 +8,7 @@
 // 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
     /* bitmask bits for CURLMOPT_PIPELINING */
 

src/CurlSharp/Enums/CurlProxyType.cs

@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
     /// <summary>
     ///     This enumeration contains values used to specify the proxy type when

src/CurlSharp/Enums/CurlShareCode.cs

@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
     /// <summary>
     ///     Contains return codes from many of the functions in the

src/CurlSharp/Enums/CurlShareOption.cs

@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
     /// <summary>
     ///     A member of this enumeration is passed to the function

src/CurlSharp/Enums/CurlSslVersion.cs

@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
     /// <summary>
     ///     Contains values used to specify the Ssl version level when using

src/CurlSharp/Enums/CurlTimeCond.cs

@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
     /// <summary>
     ///     Contains values used to specify the time condition when using

src/CurlSharp/Enums/CurlVersion.cs

@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
     /// <summary>
     ///     A member of this enumeration is passed to the function

src/CurlSharp/Enums/CurlVersionFeatureBitmask.cs

@@ -1,4 +1,4 @@
-namespace CurlSharp
+namespace CurlSharp.Enums
 {
     /// <summary>
     ///     A bitmask of libcurl features OR'd together as the value of the

src/CurlSharp/NativeMethods.cs

@@ -24,6 +24,7 @@ using System;
 using System.IO;
 using System.Reflection;
 using System.Runtime.InteropServices;
+using CurlSharp.Enums;
 
 namespace CurlSharp
 {

src/CurlSharp/SSLFix.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CurlSharp
+namespace CurlSharp
 {
     public class SSLFix
     {

src/DateTimeRoutines/DateTimeRoutines.cs

@@ -5,14 +5,11 @@
 //        sergey.stoyan@gmail.com
 //        27 February 2007
 //********************************************************************************************
+
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
 using System.Text.RegularExpressions;
-using System.Threading;
-using System.Collections;
-namespace Cliver
+
+namespace DateTimeRoutines
 {
     /// <summary>
     /// Miscellaneous and parsing methods for DateTime

src/DateTimeRoutines/DateTimeRoutines.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.5;net452</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
   </PropertyGroup>
 
 </Project>

src/Jackett.Common/Content/custom.css

@@ -1,275 +1,275 @@
-body {
-    background-image: url("binding_dark.png");
-    background-repeat: repeat;
-}
-
-#page {
-    border-radius: 6px;
-    background-color: white;
-    max-width: 900px;
-    margin: 0 auto;
-    margin-top: 30px;
-    padding: 20px;
-    margin-bottom: 100px;
-}
-
-.container-fluid {
-}
-
-#templates {
-    display: none;
-}
-
-#indexers {
-   text-align: center;
-   margin-top: 30px;
-}
-
-.indexer-table {
-   text-align: left;
-}
-
-.test-success {
-    color: #449d44;
-}
-
-.test-error {
-    color: #c9302c;
-}
-
-.test-inprogress {
-    color: #286090;
-}
-
-.indexer-buttons {
-    text-align: center;
-}
-
-.indexer-buttons > .btn {
-    margin-bottom: 2px;
-}
-
-.indexer-button-test {
-   width: 60px;
-}
-
-.setup-item-inputstring {
-    max-width: 255px;
-}
-
-.setup-item-inputbool input {
-    max-width: 100px;
-    height: 20px;
-}
-
-.setup-item-inputselect {
-    max-width: 255px;
-}
-
-[data-type=hiddendata]{
-    display: none;
-}
-
-.spinner {
-    -webkit-animation: spin 2s infinite linear;
-    -moz-animation: spin 2s infinite linear;
-    -o-animation: spin 2s infinite linear;
-    animation: spin 2s infinite linear;
-}
-
-@-moz-keyframes spin {
-    from {
-        -moz-transform: rotate(0deg);
-    }
-
-    to {
-        -moz-transform: rotate(360deg);
-    }
-}
-
-@-webkit-keyframes spin {
-    from {
-        -webkit-transform: rotate(0deg);
-    }
-
-    to {
-        -webkit-transform: rotate(360deg);
-    }
-}
-
-@keyframes spin {
-    from {
-        transform: rotate(0deg);
-    }
-
-    to {
-        transform: rotate(360deg);
-    }
-}
-
-#setup-indexer-go {
-    width: 70px;
-}
-
-hr {
-    border-top-color: #cdcdcd;
-}
-
-.input-area {
-    margin: 4px 0px;
-}
-
-    .input-area > * {
-        vertical-align: middle;
-    }
-
-    .input-area > p {
-        margin-top: 10px;
-    }
-
-.input-header {
-    font-size: 18px;
-    width: 160px;
-    display: inline-block;
-}
-
-.input-right {
-    width: 300px;
-    display: inline-block;
-    font-family: monospace;
-}
-
-#sonarr-warning {
-    display: none;
-}
-
-#logo {
-    max-width: 50px;
-}
-
-#header-title {
-    font-size: 34px;
-    vertical-align: middle;
-    padding-left: 15px;
-}
-
-#footer {
-    color: #444444;
-    margin: 0 auto;
-    margin-top: 10px;
-    text-align: center;
-}
-
-#jackett-allowext, #jackett-allowupdate, #jackett-logging, #jackett-prerelease {
-    width: 25px;
-}
-
-.modal-fillwidth {
-    width: 1200px;
-    min-width:80%;
-}
-
-.indexer-caps {
-   padding: 0px 15px 15px 15px;
-   border-top: 1px solid #e5e5e5;
-}
-
-.indexer-caps table {
-    border-bottom:   1px solid #ddd;
-}
-
-.jackettlogWarn {
-    background-color: #FFFF8E !important;
-}
-
-.jackettlogError {
-    background-color: #FF6060 !important;
-}
-
-.jackettdownloaded {
-    color: blueviolet;
-}
-
-.jacketdownloadlocal {
-    padding-left: 10px;
-}
-
-.downloadcolumn {
-    text-align:center;
-}
-
-pre {
-    display: block;
-    padding: 3px;
-    margin: 0 0 0px;
-    font-size: 13px;
-    line-height: 1.42857143;
-    color: #333;
-    word-break: break-all;
-    word-wrap: break-word;
-    background-color: transparent;
-    border: 0px;
-    border-radius: 0px;
-}
-
-.modal-open .modal {
-    overflow-x: auto;  /* Model can be bigger than the screen on mobiles */
-}
-
-.dataTables_filter input {
-    width: 400px 
-}
-
-#unconfigured-indexers-template {
-    display: none;
-}
-.jackett-apikey{
-    margin-top: 10px;
-}
-
-.jackett-apikey .input-header{
-    width: 80px;
-}
-
-.setup-item-displayinfo:empty {
-    display: none;
-}
-
-table td.fit{
-    white-space: nowrap;
-    width: 1%;
-}
-
-.label-imdb {
-    background-color: #d0ab44;
-}
-
-.tooltip-inner {
-    max-width: 500px !important;
-}
-
-.tooltip-inner img {
-    max-width: 250px;
-    height: auto;      
-}
-
-.type-public {
-    color: #449d44
-}
-
-.type-private {
-    color: #c9302c
-}
-
-.type-semi-private {
-    color: #ec971f
-}
-
-.dataTables_deadfilter {
-    float: right;
-    text-align: right;
-    margin-right: 1em;
-}
-input#searchquery{
-	width:400px;
-}
+body {
+    background-image: url("binding_dark.png");
+    background-repeat: repeat;
+}
+
+#page {
+    border-radius: 6px;
+    background-color: white;
+    max-width: 900px;
+    margin: 0 auto;
+    margin-top: 30px;
+    padding: 20px;
+    margin-bottom: 100px;
+}
+
+.container-fluid {
+}
+
+#templates {
+    display: none;
+}
+
+#indexers {
+   text-align: center;
+   margin-top: 30px;
+}
+
+.indexer-table {
+   text-align: left;
+}
+
+.test-success {
+    color: #449d44;
+}
+
+.test-error {
+    color: #c9302c;
+}
+
+.test-inprogress {
+    color: #286090;
+}
+
+.indexer-buttons {
+    text-align: center;
+}
+
+.indexer-buttons > .btn {
+    margin-bottom: 2px;
+}
+
+.indexer-button-test {
+   width: 60px;
+}
+
+.setup-item-inputstring {
+    max-width: 255px;
+}
+
+.setup-item-inputbool input {
+    max-width: 100px;
+    height: 20px;
+}
+
+.setup-item-inputselect {
+    max-width: 255px;
+}
+
+[data-type=hiddendata]{
+    display: none;
+}
+
+.spinner {
+    -webkit-animation: spin 2s infinite linear;
+    -moz-animation: spin 2s infinite linear;
+    -o-animation: spin 2s infinite linear;
+    animation: spin 2s infinite linear;
+}
+
+@-moz-keyframes spin {
+    from {
+        -moz-transform: rotate(0deg);
+    }
+
+    to {
+        -moz-transform: rotate(360deg);
+    }
+}
+
+@-webkit-keyframes spin {
+    from {
+        -webkit-transform: rotate(0deg);
+    }
+
+    to {
+        -webkit-transform: rotate(360deg);
+    }
+}
+
+@keyframes spin {
+    from {
+        transform: rotate(0deg);
+    }
+
+    to {
+        transform: rotate(360deg);
+    }
+}
+
+#setup-indexer-go {
+    width: 70px;
+}
+
+hr {
+    border-top-color: #cdcdcd;
+}
+
+.input-area {
+    margin: 4px 0px;
+}
+
+    .input-area > * {
+        vertical-align: middle;
+    }
+
+    .input-area > p {
+        margin-top: 10px;
+    }
+
+.input-header {
+    font-size: 18px;
+    width: 160px;
+    display: inline-block;
+}
+
+.input-right {
+    width: 300px;
+    display: inline-block;
+    font-family: monospace;
+}
+
+#sonarr-warning {
+    display: none;
+}
+
+#logo {
+    max-width: 50px;
+}
+
+#header-title {
+    font-size: 34px;
+    vertical-align: middle;
+    padding-left: 15px;
+}
+
+#footer {
+    color: #444444;
+    margin: 0 auto;
+    margin-top: 10px;
+    text-align: center;
+}
+
+#jackett-allowext, #jackett-allowupdate, #jackett-logging, #jackett-prerelease {
+    width: 25px;
+}
+
+.modal-fillwidth {
+    width: 1200px;
+    min-width:80%;
+}
+
+.indexer-caps {
+   padding: 0px 15px 15px 15px;
+   border-top: 1px solid #e5e5e5;
+}
+
+.indexer-caps table {
+    border-bottom:   1px solid #ddd;
+}
+
+.jackettlogWarn {
+    background-color: #FFFF8E !important;
+}
+
+.jackettlogError {
+    background-color: #FF6060 !important;
+}
+
+.jackettdownloaded {
+    color: blueviolet;
+}
+
+.jacketdownloadlocal {
+    padding-left: 10px;
+}
+
+.downloadcolumn {
+    text-align:center;
+}
+
+pre {
+    display: block;
+    padding: 3px;
+    margin: 0 0 0px;
+    font-size: 13px;
+    line-height: 1.42857143;
+    color: #333;
+    word-break: break-all;
+    word-wrap: break-word;
+    background-color: transparent;
+    border: 0px;
+    border-radius: 0px;
+}
+
+.modal-open .modal {
+    overflow-x: auto;  /* Model can be bigger than the screen on mobiles */
+}
+
+.dataTables_filter input {
+    width: 400px 
+}
+
+#unconfigured-indexers-template {
+    display: none;
+}
+.jackett-apikey{
+    margin-top: 10px;
+}
+
+.jackett-apikey .input-header{
+    width: 80px;
+}
+
+.setup-item-displayinfo:empty {
+    display: none;
+}
+
+table td.fit{
+    white-space: nowrap;
+    width: 1%;
+}
+
+.label-imdb {
+    background-color: #d0ab44;
+}
+
+.tooltip-inner {
+    max-width: 500px !important;
+}
+
+.tooltip-inner img {
+    max-width: 250px;
+    height: auto;      
+}
+
+.type-public {
+    color: #449d44
+}
+
+.type-private {
+    color: #c9302c
+}
+
+.type-semi-private {
+    color: #ec971f
+}
+
+.dataTables_deadfilter {
+    float: right;
+    text-align: right;
+    margin-right: 1em;
+}
+input#searchquery{
+	width:400px;
+}

src/Jackett.Common/Content/custom.js

@@ -67,6 +67,7 @@ function loadJackettSettings() {
         $("#app-version").html(data.app_version);
         $("#jackett-port").val(data.port);
 
+        $("#jackett-proxy-type").val(data.proxy_type);
         $("#jackett-proxy-url").val(data.proxy_url);
         $("#jackett-proxy-port").val(data.proxy_port);
         $("#jackett-proxy-username").val(data.proxy_username);
@@ -109,6 +110,7 @@ function reloadIndexers() {
         unconfiguredIndexers = [];
         for (var i = 0; i < data.length; i++) {
             var item = data[i];
+            item.rss_host = resolveUrl(basePath + "/api/v2.0/indexers/" + item.id + "/results/torznab/api?apikey=" + api.key + "&t=search&cat=&q=");
             item.torznab_host = resolveUrl(basePath + "/api/v2.0/indexers/" + item.id + "/results/torznab/");
             item.potato_host = resolveUrl(basePath + "/api/v2.0/indexers/" + item.id + "/results/potato/");
 
@@ -219,7 +221,7 @@ function displayUnconfiguredIndexersList() {
 		                }
 			        }).fail(function (data) {
 			            if(data.responseJSON.error !== undefined) {
-                doNotify("An error occured while configuring this indexer<br /><b>" + data.responseJSON.error + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + indexerId + "] " + data.responseJSON.error + " (Config)\" target=\"_blank\">Click here to open an issue on Github for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
+                doNotify("An error occured while configuring this indexer<br /><b>" + data.responseJSON.error + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + indexerId + "] " + data.responseJSON.error + " (Config)\" target=\"_blank\">Click here to open an issue on GitHub for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
             } else {
                 doNotify("An error occured while configuring this indexer, is Jackett server running ?", "danger", "glyphicon glyphicon-alert");
             }
@@ -442,7 +444,7 @@ function testIndexer(id, notifyResult) {
     }).fail(function (data) {
         updateTestState(id, "error", data.error, indexers);
         if(data.responseJSON.error !== undefined && notifyResult) {
-                doNotify("An error occured while testing this indexer<br /><b>" + data.responseJSON.error + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + id + "] " + data.responseJSON.error + " (Test)\" target=\"_blank\">Click here to open an issue on Github for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
+                doNotify("An error occured while testing this indexer<br /><b>" + data.responseJSON.error + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + id + "] " + data.responseJSON.error + " (Test)\" target=\"_blank\">Click here to open an issue on GitHub for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
             } else {
                 doNotify("An error occured while testing indexers, please take a look at indexers with failed test for more informations.", "danger", "glyphicon glyphicon-alert");
             }
@@ -495,10 +497,14 @@ function populateConfigItems(configForm, config) {
             hasReacaptcha = true;
             captchaItem = config[i];
         }
+        else if (config[i].id === 'cookieheader' && hasReacaptcha) { // inject cookie into captcha item
+            captchaItem.cookieheader = config[i].value;
+            console.log(captchaItem);
+        }
     }
 
     var setupItemTemplate = Handlebars.compile($("#setup-item").html());
-    if (hasReacaptcha && !window.jackettIsLocal) {
+    if (hasReacaptcha && !window.jackettIsLocal && false) { // disable this for now, use inline cookie (below)
         var setupValueTemplate = Handlebars.compile($("#setup-item-nonlocalrecaptcha").html());
         captchaItem.value_element = setupValueTemplate(captchaItem);
         var template = setupItemTemplate(captchaItem);
@@ -507,11 +513,22 @@ function populateConfigItems(configForm, config) {
 
         for (var i = 0; i < config.length; i++) {
             var item = config[i];
-            var setupValueTemplate = Handlebars.compile($("#setup-item-" + item.type).html());
-            item.value_element = setupValueTemplate(item);
-            var template = setupItemTemplate(item);
-            $formItemContainer.append(template);
+            if ((item.id === 'username' || item.id === 'password') && hasReacaptcha) {
+                continue; // skip username/password if there's a recaptcha
+            }
+            if (item.type != 'recaptcha') {
+                var setupValueTemplate = Handlebars.compile($("#setup-item-" + item.type).html());
+                item.value_element = setupValueTemplate(item);
+                var template = setupItemTemplate(item);
+                $formItemContainer.append(template);
+            }
             if (item.type === 'recaptcha') {
+                // inject cookie dialog until recaptcha can be solved again
+                var setupValueTemplate = Handlebars.compile($("#setup-item-nonlocalrecaptcha").html());
+                captchaItem.value_element = setupValueTemplate(captchaItem);
+                var template = setupItemTemplate(captchaItem);
+                $formItemContainer.append(template);
+                /*
                 var jackettrecaptcha = $('.jackettrecaptcha');
                 jackettrecaptcha.data("version", item.version);
                 switch (item.version) {
@@ -541,6 +558,7 @@ function populateConfigItems(configForm, config) {
                         });
                         break;
                 }
+                */
             }
         }
     }
@@ -632,7 +650,7 @@ function populateSetupForm(indexerId, name, config, caps, link, alternativesitel
             }
         }).fail(function (data) {
             if(data.responseJSON.error !== undefined) {
-                doNotify("An error occured while updating this indexer<br /><b>" + data.responseJSON.error + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + indexerId + "] " + data.responseJSON.error + " (Config)\" target=\"_blank\">Click here to open an issue on Github for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
+                doNotify("An error occured while updating this indexer<br /><b>" + data.responseJSON.error + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + indexerId + "] " + data.responseJSON.error + " (Config)\" target=\"_blank\">Click here to open an issue on GitHub for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
             } else {
                 doNotify("An error occured while updating this indexer, request to Jackett server failed, is server running ?", "danger", "glyphicon glyphicon-alert");
             }
@@ -1134,6 +1152,7 @@ function bindUIButtons() {
         var jackett_omdb_key = $("#jackett-omdbkey").val();
 
         var jackett_proxy_url = $("#jackett-proxy-url").val();
+        var jackett_proxy_type = $("#jackett-proxy-type").val();
         var jackett_proxy_port = $("#jackett-proxy-port").val();
         var jackett_proxy_username = $("#jackett-proxy-username").val();
         var jackett_proxy_password = $("#jackett-proxy-password").val();
@@ -1147,6 +1166,7 @@ function bindUIButtons() {
             logging: jackett_logging,
             basepathoverride: jackett_basepathoverride,
             omdbkey: jackett_omdb_key,
+            proxy_type: jackett_proxy_type,
             proxy_url: jackett_proxy_url,
             proxy_port: jackett_proxy_port,
             proxy_username: jackett_proxy_username,

src/Jackett.Common/Content/index.html

@@ -7,6 +7,7 @@
     <meta name="mobile-web-app-capable" content="yes" />
     <meta name="apple-mobile-web-app-capable" content="yes" />
     <meta charset="utf-8" />
+    <meta name="referrer" content="no-referrer" /> <!-- Don't send referrer when loading third party ressources (E.g. Empornium banner images won't load) -->
     <link rel="apple-touch-icon" href="../apple-touch-icon.png" />
     <link rel="apple-touch-icon" sizes="57x57" href="../apple-touch-icon-57x57.png" />
     <link rel="apple-touch-icon" sizes="72x72" href="../apple-touch-icon-72x72.png" />
@@ -29,14 +30,14 @@
     <script type="text/javascript" src="../bootstrap/bootstrap.min.js?changed=2017083001"></script>
     <script type="text/javascript" src="../libs/bootstrap-notify.js?changed=2017083001"></script>
     <script type="text/javascript" src="../libs/bootstrap-multiselect.js?changed=2017083001"></script>
-    <script type="text/javascript" src="https://www.google.com/recaptcha/api.js?render=explicit" async defer></script>
+    <!--<script type="text/javascript" src="https://www.google.com/recaptcha/api.js?render=explicit" async defer></script>-->
 
     <link rel="stylesheet" type="text/css" href="../bootstrap/bootstrap.min.css?changed=2017083001">
     <link rel="stylesheet" type="text/css" href="../animate.css?changed=2017083001">
     <link rel="stylesheet" type="text/css" href="../custom.css?changed=2017083001" media="only screen and (min-device-width: 480px)">
     <link rel="stylesheet" type="text/css" href="../custom_mobile.css?changed=2017083001" media="only screen and (max-device-width: 480px)">
     <link rel="stylesheet" type="text/css" href="../css/jquery.dataTables.min.css?changed=2017083001">
-    <link rel="stylesheet" type="text/css" href="../css/bootstrap-multiselect.css?changed=2017083001"/>
+    <link rel="stylesheet" type="text/css" href="../css/bootstrap-multiselect.css?changed=2017083001" />
     <link rel="stylesheet" type="text/css" href="../css/font-awesome.min.css?changed=2017083001">
     <title>Jackett</title>
 </head>
@@ -74,24 +75,30 @@
                 <li>Go to <b>Settings > Indexers > Add > Torznab > Custom</b>.</li>
                 <li>Click on the indexers corresponding <button type="button" class="btn btn-xs btn-info">Copy Torznab Feed</button> button and paste it into the Sonarr/Radarr <b>URL</b> field.</li>
                 <li>For the <b>API key</b> use <b class="api-key-text"></b>.</li>
+                <li>Configure the correct category IDs via the <b>(Anime) Categories</b> options. See the Jackett indexer configuration for a list of supported categories.</li>
             </ol>
             <h4>Adding a Jackett indexer in CouchPotato</h4>
             <ol>
                 <li>Go to <b>Settings > Searchers</b>.</li>
                 <li>Enable <b>TorrentPotato</b>.
-                <li>Click on the indexers corresponding <button type="button" class="btn btn-xs btn-info">Copy Potato Feed</button> button and past it into the CouchPotato <b>host</b> field.</li>
+                <li>Click on the indexers corresponding <button type="button" class="btn btn-xs btn-info">Copy Potato Feed</button> button and paste it into the CouchPotato <b>host</b> field.</li>
                 <li>For the <b>Passkey</b> use <b class="api-key-text"></b>. Leave the <b>username</b> field blank.</li>
             </ol>
-
+            <h4>Adding a Jackett indexer to RSS clients (RSS feed)</h4>
+            <ol>
+                <li>Click on the indexers corresponding <button type="button" class="btn btn-xs btn-info">Copy RSS Feed</button> button and paste it into the URL field of the RSS client.</li>
+                <li>You can adjust the <b>q</b> (search string) and <b>cat</b> (categories) arguments accordingly.
+                E.g. <b>...&cat=2030,2040&q=big+buck+bunny</b> will search for "big buck bunny" in the Movies/SD (2030) and Movies/HD (2040) categories (See the indexer configuration for available categories).</li>
+            </ol>
         </div>
         <hr />
         <h3>Jackett Configuration</h3>
         <div class="text-center">
-            <div class="btn-group">
+            <div class="btn-toolbar">
                 <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">
+                <button id="view-jackett-logs" class="btn btn-success 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">
@@ -123,6 +130,14 @@
             <input id="jackett-savedir" class="form-control input-right" type="text" value="" placeholder="c:\torrents\">
         </div>
 
+        <div class="input-area">
+            <span class="input-header">Proxy type: </span>
+            <select id="jackett-proxy-type" class="form-control input-right">
+                <option value="0">http</option>
+                <option value="1">socks4</option>
+                <option value="2">socks5</option>
+            </select>
+        </div>
         <div class="input-area">
             <span class="input-header">Proxy url: </span>
             <input id="jackett-proxy-url" class="form-control input-right" type="text" value="" placeholder="Blank to disable">
@@ -164,7 +179,7 @@
         </div>
         <hr />
         <div id="footer">
-            Jackett Version <span id="app-version"></span>
+            <a href="https://github.com/Jackett/Jackett" target="_blank" title="Jackett on GitHub">Jackett</a> Version <span id="app-version"></span>
         </div>
     </div>
 
@@ -174,7 +189,7 @@
         <div class="setup-item-recaptcha">
             <p>This site requires you to solve a ReCaptcha. It's no longer possible to solve the captcha in Jackett. Please enter the cookie for the site manually. <a href="https://github.com/Jackett/Jackett/wiki/Finding-cookies" target="_blank">See here</a> on how get the cookies.</p>
             <div class="setup-item-label">Full cookie header</div>
-            <input class="form-control" type="text" value="" />
+            <input class="form-control" type="text" value="{{cookieheader}}" />
         </div>
     </script>
     <script id="setup-item" type="text/x-handlebars-template">
@@ -257,6 +272,7 @@
                         <td><a target="_blank" href="{{site_link}}" title="{{description}}">{{name}}</a> <span title="{{type}}" class="label label-{{type_label}}" style="text-transform: capitalize;">{{type}}</span></td>
                         <td class="fit">
                             <div class="indexer-buttons">
+                                <a href="{{rss_host}}" title="{{rss_host}}" role="button" class="indexer-button-copy btn btn-xs btn-info">Copy RSS Feed</i></a>
                                 <a href="{{torznab_host}}" title="{{torznab_host}}" role="button" class="indexer-button-copy btn btn-xs btn-info">Copy Torznab Feed</a>
                                 <a href="{{potato_host}}" title="{{potato_host}}" role="button" class="indexer-button-copy btn btn-xs btn-info{{#unless potatoenabled}} disabled{{/unless}}">Copy Potato Feed</a>
 
@@ -458,14 +474,14 @@
 
     <script id="jackett-search-results" type="text/x-handlebars-template">
         <hr />
-        <p>Your search was done using: 
-        {{#each Indexers}}{{Name}}
-        {{#if Error}}
+        <p>Your search was done using:
+            {{#each Indexers}}{{Name}}
+            {{#if Error}}
             (<span title="{{Error}}"><b>Error</b></span>)
-        {{else}}
-        ({{Results}})
-        {{/if}}
-        , {{/each}}
+            {{else}}
+            ({{Results}})
+            {{/if}}
+            , {{/each}}
         </p>
         <table id="jackett-search-results-datatable" class="dataTable compact cell-border hover stripe">
             <thead>
@@ -643,6 +659,6 @@
     </script>
 
     <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=2017103101"></script>
+    <script type="text/javascript" src="../custom.js?changed=2017110603"></script>
 </body>
 </html>