WIP: Statistics API endpoint.

Added additional tier to search for daily series type on BTN to find faux-daily series with SxxExx groups instead of date groups.
fixes #1111
2026-03-17 16:14:17 -04:00 · 2016-01-31 15:33:13 +01:00 · 2016-01-30 21:16:45 +01:00 · 2016-01-30 11:16:59 -08:00 · 2016-01-28 14:52:19 -08:00 · 2016-01-28 14:49:47 -08:00
191 changed files with 3392 additions and 1443 deletions
--- a/.idea/jsLibraryMappings.xml
+++ b/.idea/jsLibraryMappings.xml
@@ -2,5 +2,6 @@
 <project version="4">
  <component name="JavaScriptLibraryMappings">
    <file url="file://$PROJECT_DIR$" libraries="{Sonarr node_modules}" />
+    <includedPredefinedLibrary name="ECMAScript 6" />
  </component>
 </project>
--- a/build.ps1
+++ b/build.ps1
@@ -1,267 +1 @@
-$msBuild = 'C:\Windows\Microsoft.NET\Framework64\v4.0.30319\msbuild.exe'
-$outputFolder = '.\_output'
-$outputFolderMono = '.\_output_mono'
-$outputFolderOsx = '.\_output_osx'
-$outputFolderOsxApp = '.\_output_osx_app'
-$testPackageFolder = '.\_tests\'
-$testSearchPattern = '*.Test\bin\x86\Release'
-$sourceFolder = '.\src'
-$updateFolder = $outputFolder + '\NzbDrone.Update'
-$updateFolderMono = $outputFolderMono + '\NzbDrone.Update'
-
-Function Build()
-{
-    Write-Host "##teamcity[progressStart 'Build']"
-
-    $clean = $msbuild + " src\nzbdrone.sln /t:Clean /m"
-    $build = $msbuild + " src\nzbdrone.sln /p:Configuration=Release /p:Platform=x86 /t:Build /m"
-
-    if(Test-Path $outputFolder)
-    {
-        Remove-Item -Recurse -Force $outputFolder -ErrorAction Continue
-    }
-
-    Invoke-Expression $clean
-    CheckExitCode
-
-    Invoke-Expression $build
-    CheckExitCode
-
-    CleanFolder $outputFolder
-
-    AddJsonNet
-
-    Write-Host "Removing Mono.Posix.dll"
-    Remove-Item "$outputFolder\Mono.Posix.dll"
-    Get-ChildItem $outputFolder -File -Filter "*.dylib" -Recurse | foreach ($_) {Remove-Item $_.Fullname}
-
-    Write-Host "##teamcity[progressFinish 'Build']"
-}
-
-Function CleanFolder($path, $keepConfigFiles)
-{
-    Write-Host Removing XMLDoc files
-    get-childitem $path -File -Filter *.xml -Recurse | foreach ($_) {
-
-        $filename = $_.FullName
-        $exeFilename = $filename -replace "xml", "exe"
-        $dllFilename = $filename -replace "xml", "dll"
-
-        if (Test-Path $exeFilename) {
-            remove-item $_.fullname
-        }
-
-        if (Test-Path $dllFilename) {
-            remove-item $_.fullname
-        }
-    }
-
-    get-childitem $path -File -Filter *.transform -Recurse | foreach ($_) {remove-item $_.fullname}
-
-    if($keepConfigFiles -ne $true)
-    {
-        get-childitem $path -File -Filter *.dll.config -Recurse | foreach ($_) {remove-item $_.fullname}
-    }
-
-    Write-Host Removing FluentValidation.Resources  files
-    get-childitem $path -File -Filter FluentValidation.resources.dll -recurse | foreach ($_) {remove-item $_.fullname}
-
-    get-childitem $path -File -Filter app.config -Recurse | foreach ($_) {remove-item $_.fullname}
-
-    Write-Host Removing .less files
-    get-childitem $path -File -Filter *.less -Recurse | foreach ($_) {remove-item $_.fullname}
-
-    Write-Host Removing vshost files
-    get-childitem $path -File -Filter *.vshost.exe -Recurse | foreach ($_) {remove-item $_.fullname}
-
-    if(Test-Path $$path\NuGet)
-    {
-        Write-Host Removing NuGet
-        Remove-Item -Recurse -Force "$path\NuGet"
-    }
-
-    Write-Host Removing Empty folders
-    while (Get-ChildItem $path -recurse | where {!@(Get-ChildItem -force $_.fullname)} | Test-Path)
-    {
-        Get-ChildItem $path -Directory -recurse | where {!@(Get-ChildItem -force $_.fullname)} | Remove-Item
-    }
-}
-
-Function PackageMono()
-{
-    Write-Host "##teamcity[progressStart 'Creating Mono Package']"
-
-    if(Test-Path $outputFolderMono)
-    {
-        Remove-Item -Recurse -Force $outputFolderMono -ErrorAction Continue
-    }
-
-    Copy-Item $outputFolder $outputFolderMono -recurse
-
-    Write-Host Creating MDBs
-    get-childitem $outputFolderMono -File -Include @("*.exe", "*.dll") -Exclude @("MediaInfo.dll", "sqlite3.dll") -Recurse | foreach ($_) {
-        Write-Host "Creating .mdb for $_"
-        & "tools\pdb2mdb\pdb2mdb.exe" $_.fullname
-    }
-
-    Write-Host Removing PDBs
-    get-childitem $outputFolderMono -File -Filter *.pdb -Recurse | foreach ($_) {remove-item $_.fullname}
-
-    Write-Host Removing Service helpers
-    get-childitem $outputFolderMono -File -Filter ServiceUninstall.* -Recurse | foreach ($_) {remove-item $_.fullname}
-    get-childitem $outputFolderMono -File -Filter ServiceInstall.* -Recurse | foreach ($_) {remove-item $_.fullname}
-
-    Write-Host Removing native windows binaries Sqlite, MediaInfo
-    get-childitem $outputFolderMono -File -Filter sqlite3.* -Recurse | foreach ($_) {remove-item $_.fullname}
-    get-childitem $outputFolderMono -File -Filter MediaInfo.* -Recurse | foreach ($_) {remove-item $_.fullname}
-
-    Write-Host "Adding NzbDrone.Core.dll.config (for dllmap)"
-    Copy-Item "$sourceFolder\NzbDrone.Core\NzbDrone.Core.dll.config" $outputFolderMono
-    
-    Write-Host "Adding CurlSharp.dll.config (for dllmap)"
-    Copy-Item "$sourceFolder\NzbDrone.Common\CurlSharp.dll.config" $outputFolderMono
-
-    Write-Host Renaming NzbDrone.Console.exe to NzbDrone.exe
-    Get-ChildItem $outputFolderMono -File -Filter "NzbDrone.exe*" -Recurse | foreach ($_) {remove-item $_.fullname}
-
-    Write-Host Removing NzbDrone.Windows
-    get-childitem $outputFolderMono -File -Filter NzbDrone.Windows.* -Recurse | foreach ($_) {remove-item $_.fullname}
-
-    Get-ChildItem $outputFolderMono -File -Filter "NzbDrone.Console.exe*" -Recurse | foreach ($_) {
-        $newName = $_.fullname -Replace ".Console",""
-
-        Rename-Item $_.fullname $newName
-    }
-
-    Write-Host Adding NzbDrone.Mono to UpdatePackage
-    Copy-Item $outputFolderMono\* $updateFolderMono -Filter NzbDrone.Mono.*
-
-    Write-Host "##teamcity[progressFinish 'Creating Mono Package']"
-}
-
-Function PackageOsx()
-{
-    Write-Host "##teamcity[progressStart 'Creating OS X Package']"
-
-    if(Test-Path $outputFolderOsx)
-    {
-        Remove-Item -Recurse -Force $outputFolderOsx -ErrorAction Continue
-    }
-
-    Copy-Item $outputFolderMono $outputFolderOsx -recurse
-
-    Write-Host "Adding sqlite dylibs"
-    Copy-Item "$sourceFolder\Libraries\sqlite\*.dylib" "$outputFolderOsx"
-
-    Write-Host "Adding MediaInfo dylib"
-    Copy-Item "$sourceFolder\Libraries\MediaInfo\*.dylib" "$outputFolderOsx"
-
-    Write-Host "Adding Startup script"
-    Copy-Item  .\osx\Sonarr "$outputFolderOsx"
-
-    Write-Host "##teamcity[progressFinish 'Creating OS X Package']"
-}
-
-
-Function PackageOsxApp()
-{
-    Write-Host "##teamcity[progressStart 'Creating OS X App Package']"
-
-    if(Test-Path $outputFolderOsxApp)
-    {
-        Remove-Item -Recurse -Force $outputFolderOsxApp -ErrorAction Continue
-    }
-
-    Copy-Item .\osx\Sonarr.app $outputFolderOsxApp\Sonarr.app -recurse
-    Copy-Item $outputFolderOsx $outputFolderOsxApp\Sonarr.app\Contents\MacOS -recurse
-
-    Write-Host "##teamcity[progressFinish 'Creating OS X App Package']"
-}
-
-Function AddJsonNet()
-{
-    get-childitem $outputFolder -File -Filter Newtonsoft.Json.* -Recurse | foreach ($_) {remove-item $_.fullname}
-    Copy-Item .\src\packages\Newtonsoft.Json.*.*\lib\net35\*.dll -Destination $outputFolder
-    Copy-Item .\src\packages\Newtonsoft.Json.*.*\lib\net35\*.dll -Destination $outputFolder\NzbDrone.Update
-}
-
-Function PackageTests()
-{
-
-    Write-Host Packaging Tests
-    Write-Host "##teamcity[progressStart 'Creating Test Package']"
-
-    if(Test-Path $testPackageFolder)
-    {
-        Remove-Item -Recurse -Force $testPackageFolder -ErrorAction Continue
-    }
-
-    Get-ChildItem -Recurse -Directory | Where-Object {$_.FullName -like $testSearchPattern} |  foreach($_){
-        Copy-Item -Recurse ($_.FullName + "\*")  $testPackageFolder -ErrorAction Ignore
-    }
-
-    .\src\.nuget\NuGet.exe install NUnit.Runners -Version 2.6.1 -Output $testPackageFolder
-
-    Copy-Item $outputFolder\*.dll -Destination $testPackageFolder -Force
-    Copy-Item $outputFolder\*.pdb -Destination $testPackageFolder -Force
-    Copy-Item .\*.sh              -Destination $testPackageFolder -Force
-
-    Write-Host Creating MDBs for tests
-    get-childitem $testPackageFolder -File -Include @("*.exe", "*.dll") -Exclude @("MediaInfo.dll", "sqlite3.dll") -Recurse | foreach ($_) {
-        Write-Host "Creating .mdb for $_"
-        & "tools\pdb2mdb\pdb2mdb.exe" $_.fullname
-    }
-
-    get-childitem $testPackageFolder -File -Filter *log.config | foreach ($_) {remove-item $_.fullname}
-
-    CleanFolder $testPackageFolder $true
-
-    Write-Host "Adding NzbDrone.Core.dll.config (for dllmap)"
-    Copy-Item "$sourceFolder\NzbDrone.Core\NzbDrone.Core.dll.config" -Destination $testPackageFolder -Force
-
-    Write-Host "Copying CurlSharp libraries"
-    Copy-Item $sourceFolder\ExternalModules\CurlSharp\libs\i386\* $testPackageFolder
-
-    Write-Host "##teamcity[progressFinish 'Creating Test Package']"
-}
-
-Function RunGulp()
-{
-   Write-Host "##teamcity[progressStart 'Running Gulp']"
-   Invoke-Expression  'npm install'
-   CheckExitCode
-
-   Invoke-Expression 'gulp build' -ErrorAction Continue -Verbose
-   CheckExitCode
-
-   Invoke-Expression 'gulp build --phantom' -ErrorAction Continue -Verbose
-   CheckExitCode
-
-   Write-Host "##teamcity[progressFinish 'Running Gulp']"
-}
-
-Function CheckExitCode()
-{
-        if ($lastexitcode -ne 0)
-        {
-            Write-Host $errorMessage
-            exit 1
-        }
-}
-
-Function CleanupWindowsPackage()
-{
-    Write-Host Removing NzbDrone.Mono
-    get-childitem $outputFolder -File -Filter NzbDrone.Mono.* -Recurse | foreach ($_) {remove-item $_.fullname}
-
-    Write-Host Adding NzbDrone.Windows to UpdatePackage
-    Copy-Item $outputFolder\* $updateFolder -Filter NzbDrone.Windows.*
-}
-
-Build
-RunGulp
-PackageMono
-PackageOsx
-PackageOsxApp
-PackageTests
-CleanupWindowsPackage
+Write-Warning "DEPRECATED -- Please use build.sh instead."
--- a/build.sh
+++ b/build.sh
@@ -5,11 +5,13 @@ outputFolderMono='./_output_mono'
 outputFolderOsx='./_output_osx'
 outputFolderOsxApp='./_output_osx_app'
 testPackageFolder='./_tests/'
-testSearchPattern='*.Test/bin/x86/Release/*'
+testSearchPattern='*.Test/bin/x86/Release'
 sourceFolder='./src'
+slnFile=$sourceFolder/NzbDrone.sln
 updateFolder=$outputFolder/NzbDrone.Update
 updateFolderMono=$outputFolderMono/NzbDrone.Update

+nuget='tools/nuget/nuget.exe';
 CheckExitCode()
 {
    "$@"
@@ -26,14 +28,6 @@ CleanFolder()
    local path=$1
    local keepConfigFiles=$2

-    echo "Removing XMLDoc files"
-    local xmlfiles=( $(find $path -name "*.xml") )
-    for filename in "${xmlfiles[@]}"
-    do
-        if [ -e ${filename%.xml}.dll ] || [ -e ${filename%.xml}.exe ]  ; then
-            rm $filename
-        fi
-    done

    find $path -name "*.transform" -exec rm "{}" \;

@@ -51,10 +45,8 @@ CleanFolder()
    echo "Removing vshost files"
    find $path -name "*.vshost.exe" -exec rm "{}" \;

-    if [ -d $path/NuGet ] ; then
-        echo "Removing NuGet"
-        rm -rf $path/NuGet
-    fi
+    echo "Removing dylib files"
+    find $path -name "*.dylib" -exec rm "{}" \;

    echo "Removing Empty folders"
    find $path -depth -empty -type d -exec rm -r "{}" \;
@@ -72,15 +64,17 @@ AddJsonNet()
 BuildWithMSBuild()
 {
    export PATH=$msBuild:$PATH
-    CheckExitCode MSBuild.exe $sourceFolder/NzbDrone.sln //t:Clean //m
-    CheckExitCode MSBuild.exe $sourceFolder/NzbDrone.sln //p:Configuration=Release //p:Platform=x86 //t:Build //m
+    CheckExitCode MSBuild.exe $slnFile //t:Clean //m
+    $nuget restore $slnFile
+    CheckExitCode MSBuild.exe $slnFile //p:Configuration=Release //p:Platform=x86 //t:Build //m //p:AllowedReferenceRelatedFileExtensions=.pdb
 }

 BuildWithXbuild()
 {
    export MONO_IOMAP=case
-    CheckExitCode xbuild /t:Clean $sourceFolder/NzbDrone.sln
-    CheckExitCode xbuild /p:Configuration=Release /p:Platform=x86 /t:Build $sourceFolder/NzbDrone.sln
+    CheckExitCode xbuild /t:Clean $slnFile
+    mono $nuget restore $slnFile
+    CheckExitCode xbuild /p:Configuration=Release /p:Platform=x86 /t:Build /p:AllowedReferenceRelatedFileExtensions=.pdb $slnFile
 }

 Build()
@@ -94,9 +88,9 @@ Build()
    else
        BuildWithXbuild
    fi
-    
+
    CleanFolder $outputFolder false
-    
+
    AddJsonNet

    echo "Removing Mono.Posix.dll"
@@ -107,11 +101,12 @@ Build()

 RunGulp()
 {
-    echo "##teamcity[progressStart 'Running Gulp']"
-
+    echo "##teamcity[progressStart 'npm install']"
    CheckExitCode npm install
-    CheckExitCode gulp build
+    echo "##teamcity[progressFinish 'npm install']"

+    echo "##teamcity[progressStart 'Running Gulp']"
+    CheckExitCode gulp build
    echo "##teamcity[progressFinish 'Running Gulp']"
 }

@@ -119,7 +114,16 @@ CreateMdbs()
 {
    local path=$1
    if [ $runtime = "dotnet" ] ; then
-        find $path \( -name "*.exe" -o -name "*.dll" \) -not -name "MediaInfo.dll" -not -name "sqlite3.dll" -exec tools/pdb2mdb/pdb2mdb.exe "{}" \;
+        local pdbFiles=( $(find $path -name "*.pdb") )
+        for filename in "${pdbFiles[@]}"
+        do
+          if [ -e ${filename%.pdb}.dll ]  ; then
+            tools/pdb2mdb/pdb2mdb.exe ${filename%.pdb}.dll
+          fi
+          if [ -e ${filename%.pdb}.exe ]  ; then
+            tools/pdb2mdb/pdb2mdb.exe ${filename%.pdb}.exe
+          fi
+        done
    fi
 }

@@ -160,6 +164,8 @@ PackageMono()

    echo "Adding NzbDrone.Mono to UpdatePackage"
    cp $outputFolderMono/NzbDrone.Mono.* $updateFolderMono
+
+    echo "##teamcity[progressFinish 'Creating Mono Package']"
 }

 PackageOsx()
@@ -199,13 +205,12 @@ PackageTests()
    rm -rf $testPackageFolder
    mkdir $testPackageFolder

-    find . -maxdepth 6 -path $testSearchPattern -exec cp -r "{}" $testPackageFolder \;
+    find $sourceFolder -path $testSearchPattern -exec cp -r -u -T "{}" $testPackageFolder \;

    if [ $runtime = "dotnet" ] ; then
-        $sourceFolder/.nuget/NuGet.exe install NUnit.Runners -Version 2.6.1 -Output $testPackageFolder
-        cp $outputFolder/*.pdb $testPackageFolder
+        $nuget install NUnit.Runners -Version 2.6.1 -Output $testPackageFolder
    else
-        mono $sourceFolder/.nuget/NuGet.exe install NUnit.Runners -Version 2.6.1 -Output $testPackageFolder
+        mono $nuget install NUnit.Runners -Version 2.6.1 -Output $testPackageFolder
    fi

    cp $outputFolder/*.dll $testPackageFolder
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: nzbdrone
 Source: https://github.com/Sonarr/Sonarr

 Files: *
-Copyright: 2010-2014 Sonarr <hello@sonarr.tv>
+Copyright: 2010-2016 Sonarr <hello@sonarr.tv>

 License: GPL-3.0+

--- a/gulp/less.js
+++ b/gulp/less.js
@@ -7,7 +7,6 @@ var autoprefixer = require('autoprefixer-core');
 var livereload = require('gulp-livereload');

 var print = require('gulp-print');
-var phantom = require('./phantom');
 var paths = require('./paths');
 var errorHandler = require('./errorHandler');

@@ -29,14 +28,6 @@ gulp.task('less', function() {
        paths.src.root + 'System/Info/info.less'
    ];

-    if (phantom) {
-        src = [
-            paths.src.content + 'Bootstrap/bootstrap.less',
-            paths.src.content + 'Vendor/vendor.less',
-            paths.src.content + 'sonarr.less'
-        ];
-    }
-
    return gulp.src(src)
        .pipe(print())
        .pipe(sourcemaps.init())
--- a/gulp/paths.js
+++ b/gulp/paths.js
@@ -1,5 +1,3 @@
-var phantom = require('./phantom');
-
 var paths = {
    src  : {
        root      : './src/UI/',
@@ -20,26 +18,4 @@ var paths = {
    }
 };

-if (phantom) {
-    paths = {
-        src  : {
-            root      : './UI.Phantom/',
-            templates : './UI.Phantom/**/*.hbs',
-            html      : './UI.Phantom/*.html',
-            partials  : './UI.Phantom/**/*Partial.hbs',
-            scripts   : './UI.Phantom/**/*.js',
-            less      : ['./UI.Phantom/**/*.less'],
-            content   : './UI.Phantom/Content/',
-            images    : './UI.Phantom/Content/Images/**/*',
-            exclude   : {
-                libs : '!./UI.Phantom/JsLibraries/**'
-            }
-        },
-        dest : {
-            root    : './_output/UI.Phantom/',
-            content : './_output/UI.Phantom/Content/'
-        }
-    };
-}
-
 module.exports = paths;
--- a/gulp/phantom.js
+++ b/gulp/phantom.js
@@ -1,14 +0,0 @@
-// Switch to phantom.
-// Example:
-//    gulp --phantom
-
-var phantom = false;
-process.argv.forEach(function(val, index, array) {
-    if (val === '--phantom') {
-        phantom = true;
-    }
-});
-
-console.log('Phantom:', phantom);
-
-module.exports = phantom;
--- a/readme.md
+++ b/readme.md
@@ -45,7 +45,7 @@ Sonarr is a PVR for Usenet and BitTorrent users. It can monitor multiple RSS fee

 ### License ###
 * [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)
-Copyright 2010-2015
+Copyright 2010-2016


 ### Sponsors ###
--- a/rename.ps1
+++ b/rename.ps1
@@ -1,17 +0,0 @@
-Param( 
-    [Parameter(Mandatory=$true, Position=0, HelpMessage="A branch name is #requires required")] 
-    [string]$branch, 
-    [Parameter(Mandatory=$true, Position=1, HelpMessage="A version is required")] 
-    [string]$version
-)
-
-if ($branch -eq "<default>")
-{
-    $branch = "teamcity";
-}
-
-Write-Host $branch;
-Write-Host $version;
-Write-Host "NzbDrone.$branch.$version.zip";
-
-Rename-Item "nzbdrone.zip" "NzbDrone.$branch.$version.zip"
--- a/src/.nuget/NuGet.Config
+++ b/src/.nuget/NuGet.Config
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <solution>
-    <add key="disableSourceControlIntegration" value="true" />
-  </solution>
-</configuration>
--- a/src/.nuget/NuGet.exe
+++ b/src/.nuget/NuGet.exe
--- a/src/.nuget/NuGet.targets
+++ b/src/.nuget/NuGet.targets
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup>
-        <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
-        
-        <!-- Enable the restore command to run before builds -->
-        <RestorePackages Condition="  '$(RestorePackages)' == '' ">false</RestorePackages>
-
-        <!-- Property that enables building a package from a project -->
-        <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
-
-        <!-- Determines if package restore consent is required to restore packages -->
-        <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
-        
-        <!-- Download NuGet.exe if it does not already exist -->
-        <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
-    </PropertyGroup>
-    
-    <ItemGroup Condition=" '$(PackageSources)' == '' ">
-        <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
-        <!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
-        <!--
-            <PackageSource Include="https://www.nuget.org/api/v2/" />
-            <PackageSource Include="https://my-nuget-source/nuget/" />
-        -->
-    </ItemGroup>
-
-    <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
-        <!-- Windows specific commands -->
-        <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
-        <PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
-    </PropertyGroup>
-    
-    <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
-        <!-- We need to launch nuget.exe with the mono command if we're not on windows -->
-        <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
-        <PackagesConfig>packages.config</PackagesConfig>
-    </PropertyGroup>
-    
-    <PropertyGroup>
-        <!-- NuGet command -->
-        <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
-        <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
-        
-        <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
-        <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
-
-        <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
-        
-        <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
-        <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
-        
-        <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
-        <PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>
-
-        <!-- Commands -->
-        <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)"  $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>
-        <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
-
-        <!-- We need to ensure packages are restored prior to assembly resolve -->
-        <BuildDependsOn Condition="$(RestorePackages) == 'true'">
-            RestorePackages;
-            $(BuildDependsOn);
-        </BuildDependsOn>
-
-        <!-- Make the build depend on restore packages -->
-        <BuildDependsOn Condition="$(BuildPackage) == 'true'">
-            $(BuildDependsOn);
-            BuildPackage;
-        </BuildDependsOn>
-    </PropertyGroup>
-
-    <Target Name="CheckPrerequisites">
-        <!-- Raise an error if we're unable to locate nuget.exe  -->
-        <Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
-        <!--
-        Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
-        This effectively acts as a lock that makes sure that the download operation will only happen once and all
-        parallel builds will have to wait for it to complete.
-        -->
-        <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
-    </Target>
-
-    <Target Name="_DownloadNuGet">
-        <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
-    </Target>
-
-    <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
-        <Exec Command="$(RestoreCommand)"
-              Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
-              
-        <Exec Command="$(RestoreCommand)"
-              LogStandardErrorAsError="true"
-              Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
-    </Target>
-
-    <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
-        <Exec Command="$(BuildCommand)" 
-              Condition=" '$(OS)' != 'Windows_NT' " />
-              
-        <Exec Command="$(BuildCommand)"
-              LogStandardErrorAsError="true"
-              Condition=" '$(OS)' == 'Windows_NT' " />
-    </Target>
-    
-    <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
-        <ParameterGroup>
-            <OutputFilename ParameterType="System.String" Required="true" />
-        </ParameterGroup>
-        <Task>
-            <Reference Include="System.Core" />
-            <Using Namespace="System" />
-            <Using Namespace="System.IO" />
-            <Using Namespace="System.Net" />
-            <Using Namespace="Microsoft.Build.Framework" />
-            <Using Namespace="Microsoft.Build.Utilities" />
-            <Code Type="Fragment" Language="cs">
-                <![CDATA[
-                try {
-                    OutputFilename = Path.GetFullPath(OutputFilename);
-
-                    Log.LogMessage("Downloading latest version of NuGet.exe...");
-                    WebClient webClient = new WebClient();
-                    webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);
-
-                    return true;
-                }
-                catch (Exception ex) {
-                    Log.LogErrorFromException(ex);
-                    return false;
-                }
-            ]]>
-            </Code>
-        </Task>
-    </UsingTask>
-</Project>
--- a/src/Libraries/Manifest
+++ b/src/Libraries/Manifest
--- a/src/Libraries/Manifest
+++ b/src/Libraries/Manifest
@@ -1,9 +0,0 @@
-<?xml version ="1.0"?> 
-<!-- This allows mt.exe to run on machines with the CLR v4 installed but not 1.1 or 2.0 -->
-<configuration> 
-    <startup useLegacyV2RuntimeActivationPolicy="true"> 
-        <supportedRuntime version="v4.0"/> 
-        <supportedRuntime version="v2.0.50727"/>
-        <supportedRuntime version="v1.1.4322"/>
-    </startup> 
-</configuration>
--- a/src/LogentriesCore/LogentriesCore.csproj
+++ b/src/LogentriesCore/LogentriesCore.csproj
@@ -73,13 +73,6 @@
    <PostBuildEvent>
    </PostBuildEvent>
  </PropertyGroup>
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
  <!-- 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">
--- a/src/LogentriesNLog/LogentriesNLog.csproj
+++ b/src/LogentriesNLog/LogentriesNLog.csproj
@@ -85,13 +85,6 @@
    <PostBuildEvent>
    </PostBuildEvent>
  </PropertyGroup>
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
  <!-- 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">
--- a/src/Marr.Data/Marr.Data.csproj
+++ b/src/Marr.Data/Marr.Data.csproj
@@ -144,7 +144,6 @@
    <PreBuildEvent>
    </PreBuildEvent>
  </PropertyGroup>
-  <Import Project="$(SolutionDir)\.nuget\NuGet.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">
--- a/src/Microsoft.AspNet.SignalR.Core/Microsoft.AspNet.SignalR.Core.csproj
+++ b/src/Microsoft.AspNet.SignalR.Core/Microsoft.AspNet.SignalR.Core.csproj
@@ -276,10 +276,9 @@
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <Target Name="AfterBuild">
  </Target>
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.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>
  -->
 </Project>
--- a/src/Microsoft.AspNet.SignalR.Owin/Microsoft.AspNet.SignalR.Owin.csproj
+++ b/src/Microsoft.AspNet.SignalR.Owin/Microsoft.AspNet.SignalR.Owin.csproj
@@ -102,7 +102,6 @@
  </ItemGroup>
  <Import Project="..\Common\Microsoft.AspNet.SignalR.targets" />
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.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">
@@ -110,4 +109,4 @@
  <Target Name="AfterBuild">
  </Target>
  -->
-</Project>
+</Project>
--- a/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj
+++ b/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj
@@ -38,12 +38,12 @@
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="FluentAssertions, Version=3.4.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.3.4.0\lib\net40\FluentAssertions.dll</HintPath>
+    <Reference Include="FluentAssertions, Version=4.2.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.2.1\lib\net40\FluentAssertions.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="FluentAssertions.Core, Version=3.4.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.3.4.0\lib\net40\FluentAssertions.Core.dll</HintPath>
+    <Reference Include="FluentAssertions.Core, Version=4.2.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.2.1\lib\net40\FluentAssertions.Core.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
@@ -104,7 +104,6 @@
    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.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">
@@ -112,4 +111,4 @@
  <Target Name="AfterBuild">
  </Target>
  -->
-</Project>
+</Project>
--- a/src/NzbDrone.Api.Test/packages.config
+++ b/src/NzbDrone.Api.Test/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FluentAssertions" version="3.4.0" targetFramework="net40" />
+  <package id="FluentAssertions" version="4.2.1" targetFramework="net40" />
  <package id="Moq" version="4.0.10827" />
  <package id="NBuilder" version="3.0.1.1" targetFramework="net40" />
  <package id="NUnit" version="2.6.3" targetFramework="net40" />
  <package id="ValueInjecter" version="2.3.3" targetFramework="net40" />
-</packages>
+</packages>
--- a/src/NzbDrone.Api/Authentication/AuthenticationModule.cs
+++ b/src/NzbDrone.Api/Authentication/AuthenticationModule.cs
@@ -3,6 +3,7 @@ using Nancy;
 using Nancy.Authentication.Forms;
 using Nancy.Extensions;
 using Nancy.ModelBinding;
+using NzbDrone.Common.EnsureThat;
 using NzbDrone.Core.Authentication;
 using NzbDrone.Core.Configuration;

@@ -23,6 +24,11 @@ namespace NzbDrone.Api.Authentication

        private Response Login(LoginResource resource)
        {
+            Ensure.That(resource.Username, () => resource.Username).IsNotNullOrWhiteSpace();
+
+            // TODO: A null or empty password should not be allowed, uncomment in v3
+            //Ensure.That(resource.Password, () => resource.Password).IsNotNullOrWhiteSpace();
+
            var user = _userService.FindUser(resource.Username, resource.Password);

            if (user == null)
--- a/src/NzbDrone.Api/Calendar/CalendarFeedModule.cs
+++ b/src/NzbDrone.Api/Calendar/CalendarFeedModule.cs
@@ -22,15 +22,32 @@ namespace NzbDrone.Api.Calendar

        private Response GetCalendarFeed()
        {
-            var start = DateTime.Today.AddDays(-7);
-            var end = DateTime.Today.AddDays(28);
+            var pastDays = 7;
+            var futureDays = 28;            
+            var start = DateTime.Today.AddDays(-pastDays);
+            var end = DateTime.Today.AddDays(futureDays);

+            // TODO: Remove start/end parameters in v3, they don't work well for iCal
            var queryStart = Request.Query.Start;
            var queryEnd = Request.Query.End;
+            var queryPastDays = Request.Query.PastDays;
+            var queryFutureDays = Request.Query.FutureDays;

            if (queryStart.HasValue) start = DateTime.Parse(queryStart.Value);
            if (queryEnd.HasValue) end = DateTime.Parse(queryEnd.Value);

+            if (queryPastDays.HasValue)
+            {
+                pastDays = int.Parse(queryPastDays.Value);
+                start = DateTime.Today.AddDays(-pastDays);
+            }
+
+            if (queryFutureDays.HasValue)
+            {
+                futureDays = int.Parse(queryFutureDays.Value);
+                end = DateTime.Today.AddDays(futureDays);
+            }
+
            var episodes = _episodeService.EpisodesBetweenDates(start, end, false);
            var icalCalendar = new iCalendar();

--- a/src/NzbDrone.Api/Config/IndexerConfigModule.cs
+++ b/src/NzbDrone.Api/Config/IndexerConfigModule.cs
@@ -1,4 +1,5 @@
 using FluentValidation;
+using NzbDrone.Api.Validation;
 using NzbDrone.Core.Configuration;

 namespace NzbDrone.Api.Config
@@ -16,8 +17,7 @@ namespace NzbDrone.Api.Config
                           .GreaterThanOrEqualTo(0);

            SharedValidator.RuleFor(c => c.RssSyncInterval)
-                .InclusiveBetween(10, 120)
-                .When(c => c.RssSyncInterval > 0);
+                           .IsValidRssSyncInterval();
        }
    }
 }
--- a/src/NzbDrone.Api/EpisodeFiles/EpisodeFileModule.cs
+++ b/src/NzbDrone.Api/EpisodeFiles/EpisodeFileModule.cs
@@ -52,16 +52,16 @@ namespace NzbDrone.Api.EpisodeFiles

        private List<EpisodeFileResource> GetEpisodeFiles()
        {
-            var seriesId = (int?)Request.Query.SeriesId;
-
-            if (seriesId == null)
+            if (!Request.Query.SeriesId.HasValue)
            {
                throw new BadRequestException("seriesId is missing");
            }

-            var series = _seriesService.GetSeries(seriesId.Value);
+            var seriesId = (int)Request.Query.SeriesId;

-            return _mediaFileService.GetFilesBySeries(seriesId.Value)
+            var series = _seriesService.GetSeries(seriesId);
+
+            return _mediaFileService.GetFilesBySeries(seriesId)
                                    .Select(f => MapToResource(series, f)).ToList();
        }

--- a/src/NzbDrone.Api/Episodes/EpisodeModule.cs
+++ b/src/NzbDrone.Api/Episodes/EpisodeModule.cs
@@ -20,14 +20,14 @@ namespace NzbDrone.Api.Episodes

        private List<EpisodeResource> GetEpisodes()
        {
-            var seriesId = (int?)Request.Query.SeriesId;
-
-            if (seriesId == null)
+            if (!Request.Query.SeriesId.HasValue)
            {
                throw new BadRequestException("seriesId is missing");
            }

-            var resources = ToListResource(_episodeService.GetEpisodeBySeries(seriesId.Value));
+            var seriesId = (int)Request.Query.SeriesId;
+
+            var resources = ToListResource(_episodeService.GetEpisodeBySeries(seriesId));

            return resources;
        }
@@ -36,5 +36,10 @@ namespace NzbDrone.Api.Episodes
        {
            _episodeService.SetEpisodeMonitored(episodeResource.Id, episodeResource.Monitored);
        }
+
+        protected override List<EpisodeResource> LoadSeries(List<EpisodeResource> resources)
+        {
+            return resources;
+        }
    }
-}
+}
--- a/src/NzbDrone.Api/Episodes/EpisodeModuleWithSignalR.cs
+++ b/src/NzbDrone.Api/Episodes/EpisodeModuleWithSignalR.cs
@@ -79,7 +79,8 @@ namespace NzbDrone.Api.Episodes
        {
            var resources =  base.ToListResource(modelList);

-            return resources.LoadSubtype<EpisodeResource, SeriesResource, Core.Tv.Series>(e => e.SeriesId, _seriesService.GetSeries).ToList();
+            return LoadSeries(resources);
+
        }

        public void Handle(EpisodeGrabbedEvent message)
@@ -100,5 +101,10 @@ namespace NzbDrone.Api.Episodes
                BroadcastResourceChange(ModelAction.Updated, episode.Id);
            }
        }
+
+        protected virtual List<EpisodeResource> LoadSeries(List<EpisodeResource> resources)
+        {
+            return resources.LoadSubtype<EpisodeResource, SeriesResource, Core.Tv.Series>(e => e.SeriesId, _seriesService.GetSeries).ToList();
+        }
    }
-}
+}
--- a/src/NzbDrone.Api/Episodes/RenameEpisodeModule.cs
+++ b/src/NzbDrone.Api/Episodes/RenameEpisodeModule.cs
@@ -18,18 +18,13 @@ namespace NzbDrone.Api.Episodes

        private List<RenameEpisodeResource> GetEpisodes()
        {
-            int seriesId;
-
-            if (Request.Query.SeriesId.HasValue)
-            {
-                seriesId = (int)Request.Query.SeriesId;
-            }
-
-            else
+            if (!Request.Query.SeriesId.HasValue)
            {
                throw new BadRequestException("seriesId is missing");
            }

+            var seriesId = (int)Request.Query.SeriesId;
+
            if (Request.Query.SeasonNumber.HasValue)
            {
                var seasonNumber = (int)Request.Query.SeasonNumber;
--- a/src/NzbDrone.Api/NzbDrone.Api.csproj
+++ b/src/NzbDrone.Api/NzbDrone.Api.csproj
@@ -40,9 +40,9 @@
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="FluentValidation, Version=5.5.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\FluentValidation.5.5.0.0\lib\Net40\FluentValidation.dll</HintPath>
+    <Reference Include="FluentValidation, Version=6.0.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentValidation.6.0.2.0\lib\portable-net40+sl50+wp80+win8+wpa81\FluentValidation.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="Nancy, Version=0.23.2.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
@@ -230,6 +230,7 @@
    <Compile Include="Series\SeasonStatisticsResource.cs" />
    <Compile Include="System\Backup\BackupModule.cs" />
    <Compile Include="System\Backup\BackupResource.cs" />
+    <Compile Include="System\Statistics\StatisticsModule.cs" />
    <Compile Include="System\Tasks\TaskModule.cs" />
    <Compile Include="System\Tasks\TaskResource.cs" />
    <Compile Include="System\SystemModule.cs" />
@@ -238,6 +239,7 @@
    <Compile Include="TinyIoCNancyBootstrapper.cs" />
    <Compile Include="Update\UpdateModule.cs" />
    <Compile Include="Update\UpdateResource.cs" />
+    <Compile Include="Validation\RssSyncIntervalValidator.cs" />
    <Compile Include="Validation\EmptyCollectionValidator.cs" />
    <Compile Include="Validation\RuleBuilderExtensions.cs" />
    <Compile Include="Wanted\CutoffModule.cs" />
@@ -270,7 +272,6 @@
  </ItemGroup>
  <ItemGroup />
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.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">
--- a/src/NzbDrone.Api/System/Statistics/StatisticsModule.cs
+++ b/src/NzbDrone.Api/System/Statistics/StatisticsModule.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Linq;
+using Nancy;
+using Nancy.Routing;
+using NLog;
+using NzbDrone.Api.Extensions;
+using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Datastore;
+using NzbDrone.Core.History;
+using NzbDrone.Core.Lifecycle;
+using NzbDrone.Core.Statistics;
+
+namespace NzbDrone.Api.System
+{
+    public class StatisticsModule : NzbDroneApiModule
+    {
+        private readonly IStatisticsService _statisticsService;
+        private readonly Logger _logger;
+
+        public StatisticsModule(IStatisticsService statisticsService, Logger logger)
+            : base("system/statistics")
+        {
+            _statisticsService = statisticsService;
+            _logger = logger;
+
+            Get["/"] = x => GetGlobalStatistics();
+            Get["/indexer"] = x => GetIndexerStatistics();
+        }
+
+        private Response GetGlobalStatistics()
+        {
+            return new
+                {
+                    Generated = DateTime.UtcNow,
+                    Uptime = GetUpTime(),
+                    History = _statisticsService.GetGlobalStatistics()
+                }.AsResponse();
+        }
+
+        private Response GetIndexerStatistics()
+        {
+            var stats = _statisticsService.GetIndexerStatistics();
+
+            return stats.AsResponse();
+        }
+
+        private TimeSpan? GetUpTime()
+        {
+            try
+            {
+                return DateTime.Now - global::System.Diagnostics.Process.GetCurrentProcess().StartTime;
+            }
+            catch (Exception ex)
+            {
+                _logger.DebugException("Failed to get uptime", ex);
+                return null;
+            }
+        }
+    }
+}
--- a/src/NzbDrone.Api/Validation/RssSyncIntervalValidator.cs
+++ b/src/NzbDrone.Api/Validation/RssSyncIntervalValidator.cs
@@ -0,0 +1,34 @@
+using FluentValidation.Validators;
+
+namespace NzbDrone.Api.Validation
+{
+    public class RssSyncIntervalValidator : PropertyValidator
+    {
+        public RssSyncIntervalValidator()
+            : base("Must be between 10 and 120 or 0 to disable")
+        {
+        }
+
+        protected override bool IsValid(PropertyValidatorContext context)
+        {
+            if (context.PropertyValue == null)
+            {
+                return true;
+            }
+
+            var value = (int)context.PropertyValue;
+
+            if (value == 0)
+            {
+                return true;
+            }
+
+            if (value >= 10 && value <= 120)
+            {
+                return true;
+            }
+
+            return false;
+        }
+    }
+}
--- a/src/NzbDrone.Api/Validation/RuleBuilderExtensions.cs
+++ b/src/NzbDrone.Api/Validation/RuleBuilderExtensions.cs
@@ -31,5 +31,10 @@ namespace NzbDrone.Api.Validation
        {
            return ruleBuilder.SetValidator(new EmptyCollectionValidator<TProp>());
        }
+
+        public static IRuleBuilderOptions<T, int> IsValidRssSyncInterval<T>(this IRuleBuilder<T, int> ruleBuilder)
+        {
+            return ruleBuilder.SetValidator(new RssSyncIntervalValidator());
+        }
    }
 }
--- a/src/NzbDrone.Api/packages.config
+++ b/src/NzbDrone.Api/packages.config
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="DDay.iCal" version="1.0.2.575" targetFramework="net40" />
-  <package id="FluentValidation" version="5.5.0.0" targetFramework="net40" />
+  <package id="FluentValidation" version="6.0.2.0" targetFramework="net40" />
  <package id="Nancy" version="0.23.2" targetFramework="net40" />
  <package id="Nancy.Authentication.Basic" version="0.23.2" targetFramework="net40" />
  <package id="Nancy.Authentication.Forms" version="0.23.2" targetFramework="net40" />
  <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net40" />
  <package id="NLog" version="2.1.0" targetFramework="net40" />
  <package id="ValueInjecter" version="2.3.3" targetFramework="net40" />
-</packages>
+</packages>
--- a/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj
+++ b/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj
@@ -37,12 +37,12 @@
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="FluentAssertions, Version=3.4.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.3.4.0\lib\net40\FluentAssertions.dll</HintPath>
+    <Reference Include="FluentAssertions, Version=4.2.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.2.1\lib\net40\FluentAssertions.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="FluentAssertions.Core, Version=3.4.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.3.4.0\lib\net40\FluentAssertions.Core.dll</HintPath>
+    <Reference Include="FluentAssertions.Core, Version=4.2.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.2.1\lib\net40\FluentAssertions.Core.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
@@ -104,7 +104,6 @@
    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
  <PropertyGroup>
    <PostBuildEvent Condition="('$(OS)' == 'Windows_NT')">
      xcopy /s /y "$(SolutionDir)\..\_output\NzbDrone.Mono.*"   "$(TargetDir)"
--- a/src/NzbDrone.App.Test/packages.config
+++ b/src/NzbDrone.App.Test/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FluentAssertions" version="3.4.0" targetFramework="net40" />
+  <package id="FluentAssertions" version="4.2.1" targetFramework="net40" />
  <package id="Moq" version="4.0.10827" />
  <package id="NBuilder" version="3.0.1.1" />
  <package id="NLog" version="2.1.0" targetFramework="net40" />
--- a/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj
+++ b/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj
@@ -38,12 +38,12 @@
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="FluentAssertions, Version=3.4.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.3.4.0\lib\net40\FluentAssertions.dll</HintPath>
+    <Reference Include="FluentAssertions, Version=4.2.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.2.1\lib\net40\FluentAssertions.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="FluentAssertions.Core, Version=3.4.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.3.4.0\lib\net40\FluentAssertions.Core.dll</HintPath>
+    <Reference Include="FluentAssertions.Core, Version=4.2.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.2.1\lib\net40\FluentAssertions.Core.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
@@ -95,7 +95,6 @@
    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.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">
@@ -103,4 +102,4 @@
  <Target Name="AfterBuild">
  </Target>
  -->
-</Project>
+</Project>
--- a/src/NzbDrone.Automation.Test/packages.config
+++ b/src/NzbDrone.Automation.Test/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FluentAssertions" version="3.4.0" targetFramework="net40" />
+  <package id="FluentAssertions" version="4.2.1" targetFramework="net40" />
  <package id="NLog" version="2.1.0" targetFramework="net40" />
  <package id="NUnit" version="2.6.3" targetFramework="net40" />
  <package id="Selenium.Support" version="2.48.0" targetFramework="net40" />
--- a/src/NzbDrone.Common.Test/Http/HttpClientFixture.cs
+++ b/src/NzbDrone.Common.Test/Http/HttpClientFixture.cs
@@ -349,6 +349,33 @@ namespace NzbDrone.Common.Test.Http
                Thread.CurrentThread.CurrentUICulture = origCulture;
            }
        }
+
+        [TestCase("lang_code=en; expires=Fri, 23-Dec-2016 18:09:14 GMT; Max-Age=31536000; path=/; domain=.abc.com")]
+        public void should_reject_malformed_domain_cookie(string malformedCookie)
+        {
+            try
+            {
+                // the date is bad in the below - should be 13-Jul-2016
+                string url = "http://eu.httpbin.org/response-headers?Set-Cookie=" + Uri.EscapeUriString(malformedCookie);
+
+                var requestSet = new HttpRequest(url);
+                requestSet.AllowAutoRedirect = false;
+                requestSet.StoreResponseCookie = true;
+
+                var responseSet = Subject.Get(requestSet);
+
+                var request = new HttpRequest("http://eu.httpbin.org/get");
+
+                var response = Subject.Get<HttpBinResource>(request);
+
+                response.Resource.Headers.Should().NotContainKey("Cookie");
+
+                ExceptionVerification.IgnoreErrors();
+            }
+            finally
+            {
+            }
+        }
    }

    public class HttpBinResource
--- a/src/NzbDrone.Common.Test/InstrumentationTests/CleanseLogMessageFixture.cs
+++ b/src/NzbDrone.Common.Test/InstrumentationTests/CleanseLogMessageFixture.cs
@@ -11,9 +11,11 @@ namespace NzbDrone.Common.Test.InstrumentationTests
        // Indexer Urls
        [TestCase(@"https://iptorrents.com/torrents/rss?u=mySecret;tp=mySecret;l5;download")]
        [TestCase(@"http://rss.torrentleech.org/mySecret")]
+        [TestCase(@"http://rss.torrentleech.org/rss/download/12345/01233210/filename.torrent")]
        [TestCase(@"http://www.bitmetv.org/rss.php?uid=mySecret&passkey=mySecret")]
        [TestCase(@"https://rss.omgwtfnzbs.org/rss-search.php?catid=19,20&user=sonarr&api=mySecret&eng=1")]
        [TestCase(@"https://dognzb.cr/fetch/2b51db35e1912ffc138825a12b9933d2/2b51db35e1910123321025a12b9933d2")]
+        [TestCase(@"https://baconbits.org/feeds.php?feed=torrents_tv&user=12345&auth=2b51db35e1910123321025a12b9933d2&passkey=mySecret&authkey=2b51db35e1910123321025a12b9933d2")]
        // NzbGet
        [TestCase(@"{ ""Name"" : ""ControlUsername"", ""Value"" : ""mySecret"" }, { ""Name"" : ""ControlPassword"", ""Value"" : ""mySecret"" }, ")]
        [TestCase(@"{ ""Name"" : ""Server1.Username"", ""Value"" : ""mySecret"" }, { ""Name"" : ""Server1.Password"", ""Value"" : ""mySecret"" }, ")]
--- a/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj
+++ b/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -37,12 +37,12 @@
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="FluentAssertions, Version=3.4.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.3.4.0\lib\net40\FluentAssertions.dll</HintPath>
+    <Reference Include="FluentAssertions, Version=4.2.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.2.1\lib\net40\FluentAssertions.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="FluentAssertions.Core, Version=3.4.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.3.4.0\lib\net40\FluentAssertions.Core.dll</HintPath>
+    <Reference Include="FluentAssertions.Core, Version=4.2.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.2.1\lib\net40\FluentAssertions.Core.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
@@ -141,11 +141,10 @@
    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
  <PropertyGroup>
    <PostBuildEvent Condition="'$(Configuration)|$(OS)' == 'Debug|Windows_NT'">xcopy /s /y "$(SolutionDir)\ExternalModules\CurlSharp\libs\i386\*" "$(TargetDir)"</PostBuildEvent>
  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- 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>
--- a/src/NzbDrone.Common.Test/OsPathFixture.cs
+++ b/src/NzbDrone.Common.Test/OsPathFixture.cs
@@ -24,6 +24,7 @@ namespace NzbDrone.Common.Test
        [TestCase("/rooted/linux/path", OsPathKind.Unix)]
        [TestCase("/", OsPathKind.Unix)]
        [TestCase("linux/path", OsPathKind.Unix)]
+        [TestCase(@"Castle:unrooted+linux+path", OsPathKind.Unknown)]
        public void should_auto_detect_kind(string path, OsPathKind kind)
        {
            var result = new OsPath(path);
@@ -94,6 +95,8 @@ namespace NzbDrone.Common.Test
        [TestCase(@"rooted\windows\path")]
        [TestCase(@"path")]
        [TestCase("linux/path")]
+        [TestCase(@"Castle:unrooted+linux+path")]
+        [TestCase(@"C:unrooted+linux+path")]
        public void should_detect_unrooted_ospaths(string path)
        {
            var osPath = new OsPath(path);
--- a/src/NzbDrone.Common.Test/packages.config
+++ b/src/NzbDrone.Common.Test/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FluentAssertions" version="3.4.0" targetFramework="net40" />
+  <package id="FluentAssertions" version="4.2.1" targetFramework="net40" />
  <package id="Moq" version="4.0.10827" />
  <package id="NLog" version="2.1.0" targetFramework="net40" />
  <package id="NUnit" version="2.6.3" targetFramework="net40" />
--- a/src/NzbDrone.Common/Disk/OsPath.cs
+++ b/src/NzbDrone.Common/Disk/OsPath.cs
@@ -44,7 +44,7 @@ namespace NzbDrone.Common.Disk
            {
                return OsPathKind.Unix;
            }
-            if (path.Contains(':') || path.Contains('\\'))
+            if (HasWindowsDriveLetter(path) || path.Contains('\\'))
            {
                return OsPathKind.Windows;
            }
@@ -55,6 +55,15 @@ namespace NzbDrone.Common.Disk
            return OsPathKind.Unknown;
        }

+        private static bool HasWindowsDriveLetter(string path)
+        {
+            if (path.Length < 2)    return false;
+            if (!char.IsLetter(path[0]) || path[1] != ':') return false;
+            if (path.Length > 2 && path[2] != '\\' && path[2] != '/') return false;
+
+            return true;
+        }
+
        private static string FixSlashes(string path, OsPathKind kind)
        {
            switch (kind)
@@ -97,7 +106,7 @@ namespace NzbDrone.Common.Disk
            {
                if (IsWindowsPath)
                {
-                    return _path.StartsWith(@"\\") || _path.Contains(':');
+                    return _path.StartsWith(@"\\") || HasWindowsDriveLetter(_path);
                }
                if (IsUnixPath)
                {
--- a/src/NzbDrone.Common/Extensions/StringExtensions.cs
+++ b/src/NzbDrone.Common/Extensions/StringExtensions.cs
@@ -92,5 +92,13 @@ namespace NzbDrone.Common.Extensions

            return "\"" + text + "\"";
        }
+
+        public static byte[] HexToByteArray(this string input)
+        {
+            return Enumerable.Range(0, input.Length)
+                             .Where(x => x%2 == 0)
+                             .Select(x => Convert.ToByte(input.Substring(x, 2), 16))
+                             .ToArray();
+        }
    }
 }
--- a/src/NzbDrone.Common/Http/Dispatchers/CurlHttpDispatcher.cs
+++ b/src/NzbDrone.Common/Http/Dispatchers/CurlHttpDispatcher.cs
@@ -165,7 +165,14 @@ namespace NzbDrone.Common.Http.Dispatchers
            var setCookie = webHeaderCollection.Get("Set-Cookie");
            if (setCookie != null && setCookie.Length > 0 && cookies != null)
            {
-                cookies.SetCookies(request.Url, FixSetCookieHeader(setCookie));
+                try
+                {
+                    cookies.SetCookies(request.Url, FixSetCookieHeader(setCookie));
+                }
+                catch (CookieException ex)
+                {
+                    _logger.Debug("Rejected cookie {0}: {1}", ex.InnerException.Message, setCookie);
+                }
            }

            return webHeaderCollection;
--- a/src/NzbDrone.Common/Http/TooManyRequestsException.cs
+++ b/src/NzbDrone.Common/Http/TooManyRequestsException.cs
@@ -14,7 +14,18 @@ namespace NzbDrone.Common.Http
        {
            if (response.Headers.ContainsKey("Retry-After"))
            {
-                RetryAfter = TimeSpan.FromSeconds(int.Parse(response.Headers["Retry-After"].ToString()));
+                var retryAfter = response.Headers["Retry-After"].ToString();
+                int seconds;
+                DateTime date;
+
+                if (int.TryParse(retryAfter, out seconds))
+                {
+                    RetryAfter = TimeSpan.FromSeconds(seconds);
+                }
+                else if (DateTime.TryParse(retryAfter, out date))
+                {
+                    RetryAfter = date.ToUniversalTime() - DateTime.UtcNow;
+                }
            }
        }
    }
--- a/src/NzbDrone.Common/Instrumentation/CleanseLogMessage.cs
+++ b/src/NzbDrone.Common/Instrumentation/CleanseLogMessage.cs
@@ -9,11 +9,12 @@ namespace NzbDrone.Common.Instrumentation
        private static readonly Regex[] CleansingRules = new[] 
            {
                // Url
-                new Regex(@"(?<=\?|&)(apikey|token|passkey|uid|api)=(?<secret>[^&=]+?)(?= |&|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
+                new Regex(@"(?<=\?|&)(apikey|token|passkey|auth|authkey|user|uid|api)=(?<secret>[^&=]+?)(?= |&|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                new Regex(@"(?<=\?|&)[^=]*?(username|password)=(?<secret>[^&=]+?)(?= |&|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
-                new Regex(@"torrentleech\.org/(?<secret>[0-9a-z]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
+                new Regex(@"torrentleech\.org/(?!rss)(?<secret>[0-9a-z]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
+                new Regex(@"torrentleech\.org/rss/download/[0-9]+/(?<secret>[0-9a-z]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                new Regex(@"iptorrents\.com/[/a-z0-9?&;]*?(?:[?&;](u|tp)=(?<secret>[^&=;]+?))+(?= |;|&|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
-                new Regex(@"/fetch/[a-z0-9]{32}/(?<secret>[a-z0-9]{32})", RegexOptions.Compiled | RegexOptions.IgnoreCase),
+                new Regex(@"/fetch/[a-z0-9]{32}/(?<secret>[a-z0-9]{32})", RegexOptions.Compiled),

                // Path
                new Regex(@"""C:\\Users\\(?<secret>[^\""]+?)(\\|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
@@ -27,7 +28,7 @@ namespace NzbDrone.Common.Instrumentation
                new Regex(@"""email_(account|to|from|pwd)""\s*:\s*""(?<secret>[^""]+?)""", RegexOptions.Compiled | RegexOptions.IgnoreCase),

                // uTorrent
-                new Regex(@"\[""[a-z._]*(|username|password)"",\d,""(?<secret>[^""]+?)""", RegexOptions.Compiled | RegexOptions.IgnoreCase),
+                new Regex(@"\[""[a-z._]*(username|password)"",\d,""(?<secret>[^""]+?)""", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                new Regex(@"\[""(boss_key|boss_key_salt|proxy\.proxy)"",\d,""(?<secret>[^""]+?)""", RegexOptions.Compiled | RegexOptions.IgnoreCase),

                // BroadcastheNet
--- a/src/NzbDrone.Common/NzbDrone.Common.csproj
+++ b/src/NzbDrone.Common/NzbDrone.Common.csproj
@@ -51,7 +51,7 @@
    <Reference Include="System.ServiceProcess" />
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="ICSharpCode.SharpZipLib">
-      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
+      <HintPath>..\packages\ICSharpCode.SharpZipLib.Patched.0.86.5\lib\net20\ICSharpCode.SharpZipLib.dll</HintPath>
    </Reference>
    <Reference Include="NLog">
      <HintPath>..\packages\NLog.2.1.0\lib\net40\NLog.dll</HintPath>
@@ -229,7 +229,6 @@
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.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">
--- a/src/NzbDrone.Common/packages.config
+++ b/src/NzbDrone.Common/packages.config
@@ -2,5 +2,5 @@
 <packages>
  <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net40" />
  <package id="NLog" version="2.1.0" targetFramework="net40" />
-  <package id="SharpZipLib" version="0.86.0" targetFramework="net40" />
+  <package id="ICSharpCode.SharpZipLib.Patched" version="0.86.5" targetFramework="net40" />
 </packages>
--- a/src/NzbDrone.Console/NzbDrone.Console.csproj
+++ b/src/NzbDrone.Console/NzbDrone.Console.csproj
@@ -143,7 +143,6 @@
    <PreBuildEvent>
    </PreBuildEvent>
  </PropertyGroup>
-  <Import Project="$(SolutionDir)\.nuget\NuGet.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">
@@ -151,4 +150,4 @@
  <Target Name="AfterBuild">
  </Target>
  -->
-</Project>
+</Project>
--- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbVortexTests/NzbVortexFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbVortexTests/NzbVortexFixture.cs
@@ -0,0 +1,300 @@
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using FluentAssertions;
+using Moq;
+using NUnit.Framework;
+using NzbDrone.Core.Download;
+using NzbDrone.Core.Download.Clients.Nzbget;
+using NzbDrone.Test.Common;
+using NzbDrone.Core.RemotePathMappings;
+using NzbDrone.Common.Disk;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.Download.Clients;
+using NzbDrone.Core.Download.Clients.NzbVortex;
+using NzbDrone.Core.Download.Clients.NzbVortex.Responses;
+
+namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbVortexTests
+{
+    [TestFixture]
+    public class NzbVortexFixture : DownloadClientFixtureBase<NzbVortex>
+    {
+        private NzbVortexQueueItem _queued;
+        private NzbVortexQueueItem _failed;
+        private NzbVortexQueueItem _completed;
+
+        [SetUp]
+        public void Setup()
+        {
+            Subject.Definition = new DownloadClientDefinition();
+            Subject.Definition.Settings = new NzbVortexSettings
+                                          {
+                                              Host = "127.0.0.1",
+                                              Port = 2222,
+                                              ApiKey = "1234-ABCD",
+                                              TvCategory = "tv",
+                                              RecentTvPriority = (int)NzbgetPriority.High
+                                          };
+
+            _queued = new NzbVortexQueueItem
+                {
+                    Id = RandomNumber,
+                    DownloadedSize = 1000,
+                    TotalDownloadSize = 10,
+                    GroupName = "tv",
+                    UiTitle = "Droned.S01E01.Pilot.1080p.WEB-DL-DRONE"
+                };
+
+            _failed = new NzbVortexQueueItem
+                {
+                    DownloadedSize = 1000,
+                    TotalDownloadSize = 1000,
+                    GroupName = "tv",
+                    UiTitle = "Droned.S01E01.Pilot.1080p.WEB-DL-DRONE",
+                    DestinationPath = "somedirectory",
+                    State =  NzbVortexStateType.UncompressFailed,
+                };
+
+            _completed = new NzbVortexQueueItem
+                {
+                    DownloadedSize = 1000,
+                    TotalDownloadSize = 1000,
+                    GroupName = "tv",
+                    UiTitle = "Droned.S01E01.Pilot.1080p.WEB-DL-DRONE",
+                    DestinationPath = "/remote/mount/tv/Droned.S01E01.Pilot.1080p.WEB-DL-DRONE",
+                    State = NzbVortexStateType.Done
+                };
+        }
+
+        protected void GivenFailedDownload()
+        {
+            Mocker.GetMock<INzbVortexProxy>()
+                .Setup(s => s.DownloadNzb(It.IsAny<byte[]>(), It.IsAny<string>(), It.IsAny<int>(), It.IsAny<NzbVortexSettings>()))
+                .Returns((string)null);
+        }
+
+        protected void GivenSuccessfulDownload()
+        {
+            Mocker.GetMock<INzbVortexProxy>()
+                .Setup(s => s.DownloadNzb(It.IsAny<byte[]>(), It.IsAny<string>(), It.IsAny<int>(), It.IsAny<NzbVortexSettings>()))
+                .Returns(Guid.NewGuid().ToString().Replace("-", ""));
+        }
+
+        protected virtual void GivenQueue(NzbVortexQueueItem queue)
+        {
+            var list = new List<NzbVortexQueueItem>();
+
+            list.AddIfNotNull(queue);
+
+            Mocker.GetMock<INzbVortexProxy>()
+                .Setup(s => s.GetQueue(It.IsAny<int>(), It.IsAny<NzbVortexSettings>()))
+                .Returns(new NzbVortexQueue
+                         {
+                             Items = list
+                         });
+        }
+
+        [Test]
+        public void GetItems_should_return_no_items_when_queue_is_empty()
+        {
+            GivenQueue(null);
+
+            Subject.GetItems().Should().BeEmpty();
+        }
+
+        [Test]
+        public void queued_item_should_have_required_properties()
+        {
+            GivenQueue(_queued);
+            
+            var result = Subject.GetItems().Single();
+
+            VerifyQueued(result);
+        }
+
+        [Test]
+        public void paused_item_should_have_required_properties()
+        {
+            _queued.IsPaused = true;
+            GivenQueue(_queued);
+
+            var result = Subject.GetItems().Single();
+
+            VerifyPaused(result);
+        }
+
+        [Test]
+        public void downloading_item_should_have_required_properties()
+        {
+            _queued.State = NzbVortexStateType.Downloading;
+            GivenQueue(_queued);
+
+            var result = Subject.GetItems().Single();
+
+            VerifyDownloading(result);
+        }
+
+        [Test]
+        public void completed_download_should_have_required_properties()
+        {
+            GivenQueue(_completed);
+
+            var result = Subject.GetItems().Single();
+
+            VerifyCompleted(result);
+        }
+
+        [Test]
+        public void failed_item_should_have_required_properties()
+        {
+            GivenQueue(_failed);
+
+            var result = Subject.GetItems().Single();
+
+            VerifyFailed(result);
+        }
+
+        [Test]
+        public void should_report_UncompressFailed_as_failed()
+        {
+            _queued.State = NzbVortexStateType.UncompressFailed;
+            GivenQueue(_failed);
+
+            var items = Subject.GetItems();
+
+            items.First().Status.Should().Be(DownloadItemStatus.Failed);
+        }
+
+        [Test]
+        public void should_report_CheckFailedDataCorrupt_as_failed()
+        {
+            _queued.State = NzbVortexStateType.CheckFailedDataCorrupt;
+            GivenQueue(_failed);
+
+            var result = Subject.GetItems().Single();
+
+            result.Status.Should().Be(DownloadItemStatus.Failed);
+        }
+
+        [Test]
+        public void should_report_BadlyEncoded_as_failed()
+        {
+            _queued.State = NzbVortexStateType.BadlyEncoded;
+            GivenQueue(_failed);
+
+            var items = Subject.GetItems();
+
+            items.First().Status.Should().Be(DownloadItemStatus.Failed);
+        }
+
+        [Test]
+        public void Download_should_return_unique_id()
+        {
+            GivenSuccessfulDownload();
+
+            var remoteEpisode = CreateRemoteEpisode();
+
+            var id = Subject.Download(remoteEpisode);
+
+            id.Should().NotBeNullOrEmpty();
+        }
+
+        [Test]
+        public void Download_should_throw_if_failed()
+        {
+            GivenFailedDownload();
+
+            var remoteEpisode = CreateRemoteEpisode();
+
+            Assert.Throws<DownloadClientException>(() => Subject.Download(remoteEpisode));
+        }
+
+        [Test]
+        public void GetItems_should_ignore_downloads_from_other_categories()
+        {
+            _completed.GroupName = "mycat";
+
+            GivenQueue(null);
+
+            var items = Subject.GetItems();
+
+            items.Should().BeEmpty();
+        }
+
+        [Test]
+        public void should_remap_storage_if_mounted()
+        {
+            Mocker.GetMock<IRemotePathMappingService>()
+                  .Setup(v => v.RemapRemoteToLocal("127.0.0.1", It.IsAny<OsPath>()))
+                  .Returns(new OsPath(@"O:\mymount\Droned.S01E01.Pilot.1080p.WEB-DL-DRONE".AsOsAgnostic()));
+
+            GivenQueue(_completed);
+
+            var result = Subject.GetItems().Single();
+
+            result.OutputPath.Should().Be(@"O:\mymount\Droned.S01E01.Pilot.1080p.WEB-DL-DRONE".AsOsAgnostic());
+        }
+
+        [Test]
+        public void should_get_files_if_completed_download_is_not_in_a_job_folder()
+        {
+            Mocker.GetMock<IRemotePathMappingService>()
+                  .Setup(v => v.RemapRemoteToLocal("127.0.0.1", It.IsAny<OsPath>()))
+                  .Returns(new OsPath(@"O:\mymount\".AsOsAgnostic()));
+
+            Mocker.GetMock<INzbVortexProxy>()
+                  .Setup(s => s.GetFiles(It.IsAny<int>(), It.IsAny<NzbVortexSettings>()))
+                  .Returns(new NzbVortexFiles{ Files = new List<NzbVortexFile> { new NzbVortexFile { FileName = "Droned.S01E01.Pilot.1080p.WEB-DL-DRONE.mkv" } } });
+
+            _completed.State = NzbVortexStateType.Done;
+            GivenQueue(_completed);
+
+            var result = Subject.GetItems().Single();
+
+            result.OutputPath.Should().Be(@"O:\mymount\Droned.S01E01.Pilot.1080p.WEB-DL-DRONE.mkv".AsOsAgnostic());
+        }
+
+        [Test]
+        public void should_be_warning_if_more_than_one_file_is_not_in_a_job_folder()
+        {
+            Mocker.GetMock<IRemotePathMappingService>()
+                  .Setup(v => v.RemapRemoteToLocal("127.0.0.1", It.IsAny<OsPath>()))
+                  .Returns(new OsPath(@"O:\mymount\".AsOsAgnostic()));
+
+            Mocker.GetMock<INzbVortexProxy>()
+                  .Setup(s => s.GetFiles(It.IsAny<int>(), It.IsAny<NzbVortexSettings>()))
+                  .Returns(new NzbVortexFiles { Files = new List<NzbVortexFile>
+                                                        {
+                                                            new NzbVortexFile { FileName = "Droned.S01E01.Pilot.1080p.WEB-DL-DRONE.mkv" },
+                                                            new NzbVortexFile { FileName = "Droned.S01E01.Pilot.1080p.WEB-DL-DRONE.nfo" }
+                                                        } });
+
+            _completed.State = NzbVortexStateType.Done;
+            GivenQueue(_completed);
+
+            var result = Subject.GetItems().Single();
+
+            result.Status.Should().Be(DownloadItemStatus.Warning);
+        }
+
+        [TestCase("1.0", false)]
+        [TestCase("2.2", false)]
+        [TestCase("2.3", true)]
+        [TestCase("2.4", true)]
+        [TestCase("3.0", true)]
+        public void should_test_api_version(string version, bool expected)
+        {
+            Mocker.GetMock<INzbVortexProxy>()
+                .Setup(v => v.GetGroups(It.IsAny<NzbVortexSettings>()))
+                .Returns(new List<NzbVortexGroup> { new NzbVortexGroup { GroupName = ((NzbVortexSettings)Subject.Definition.Settings).TvCategory } });
+
+            Mocker.GetMock<INzbVortexProxy>()
+                .Setup(v => v.GetApiVersion(It.IsAny<NzbVortexSettings>()))
+                .Returns(new NzbVortexApiVersionResponse { ApiLevel = version });
+
+            var error = Subject.Test();
+
+            error.IsValid.Should().Be(expected);
+        }
+    }
+}
--- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/QBittorrentTests/QBittorrentFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/QBittorrentTests/QBittorrentFixture.cs
@@ -0,0 +1,297 @@
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using FluentAssertions;
+using Moq;
+using NUnit.Framework;
+using NzbDrone.Common.Http;
+using NzbDrone.Core.MediaFiles.TorrentInfo;
+using NzbDrone.Core.Download;
+using NzbDrone.Core.Download.Clients.QBittorrent;
+using NzbDrone.Test.Common;
+
+namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
+{
+    [TestFixture]
+    public class QBittorrentFixture : DownloadClientFixtureBase<QBittorrent>
+    {
+        [SetUp]
+        public void Setup()
+        {
+            Subject.Definition = new DownloadClientDefinition();
+            Subject.Definition.Settings = new QBittorrentSettings
+                                          {
+                                              Host = "127.0.0.1",
+                                              Port = 2222,
+                                              Username = "admin",
+                                              Password = "pass",
+                                              TvCategory = "tv"
+                                          };
+
+            Mocker.GetMock<ITorrentFileInfoReader>()
+                  .Setup(s => s.GetHashFromTorrentFile(It.IsAny<Byte[]>()))
+                  .Returns("CBC2F069FE8BB2F544EAE707D75BCD3DE9DCF951");
+
+            Mocker.GetMock<IHttpClient>()
+                  .Setup(s => s.Get(It.IsAny<HttpRequest>()))
+                  .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), new Byte[0]));
+        }
+
+        protected void GivenRedirectToMagnet()
+        {
+            var httpHeader = new HttpHeader();
+            httpHeader["Location"] = "magnet:?xt=urn:btih:ZPBPA2P6ROZPKRHK44D5OW6NHXU5Z6KR&tr=udp";
+
+            Mocker.GetMock<IHttpClient>()
+                  .Setup(s => s.Get(It.IsAny<HttpRequest>()))
+                  .Returns<HttpRequest>(r => new HttpResponse(r, httpHeader, new Byte[0], System.Net.HttpStatusCode.SeeOther));
+        }
+
+        protected void GivenRedirectToTorrent()
+        {
+            var httpHeader = new HttpHeader();
+            httpHeader["Location"] = "http://test.sonarr.tv/not-a-real-torrent.torrent";
+
+            Mocker.GetMock<IHttpClient>()
+                  .Setup(s => s.Get(It.Is<HttpRequest>(h => h.Url.AbsoluteUri == _downloadUrl)))
+                  .Returns<HttpRequest>(r => new HttpResponse(r, httpHeader, new Byte[0], System.Net.HttpStatusCode.Found));
+        }
+
+        protected void GivenFailedDownload()
+        {
+            Mocker.GetMock<IQBittorrentProxy>()
+                .Setup(s => s.AddTorrentFromUrl(It.IsAny<string>(), It.IsAny<QBittorrentSettings>()))
+                .Throws<InvalidOperationException>();
+        }
+
+        protected void GivenSuccessfulDownload()
+        {
+            Mocker.GetMock<IQBittorrentProxy>()
+                .Setup(s => s.AddTorrentFromUrl(It.IsAny<string>(), It.IsAny<QBittorrentSettings>()))
+                .Callback(() =>
+                {
+                    var torrent = new QBittorrentTorrent
+                    {
+                        Hash = "HASH",
+                        Name = _title,
+                        Size = 1000,
+                        Progress = 1.0,
+                        Eta = 8640000,
+                        State = "queuedUP",
+                        Label = "",
+                        SavePath = ""
+                    };
+                    GivenTorrents(new List<QBittorrentTorrent> { torrent });
+                });
+        }
+
+        protected virtual void GivenTorrents(List<QBittorrentTorrent> torrents)
+        {
+            if (torrents == null)
+                torrents = new List<QBittorrentTorrent>();
+
+            Mocker.GetMock<IQBittorrentProxy>()
+                .Setup(s => s.GetTorrents(It.IsAny<QBittorrentSettings>()))
+                .Returns(torrents);
+        }
+
+        [Test]
+        public void error_item_should_have_required_properties()
+        {
+            var torrent = new QBittorrentTorrent
+            {
+                Hash = "HASH",
+                Name = _title,
+                Size = 1000,
+                Progress = 0.7,
+                Eta = 8640000,
+                State = "error",
+                Label = "",
+                SavePath = ""
+            };
+            GivenTorrents(new List<QBittorrentTorrent> { torrent });
+
+            var item = Subject.GetItems().Single();
+            VerifyFailed(item);
+        }
+
+        [Test]
+        public void paused_item_should_have_required_properties()
+        {
+            var torrent = new QBittorrentTorrent
+            {
+                Hash = "HASH",
+                Name = _title,
+                Size = 1000,
+                Progress = 0.7,
+                Eta = 8640000,
+                State = "pausedDL",
+                Label = "",
+                SavePath = ""
+            };
+            GivenTorrents(new List<QBittorrentTorrent> { torrent });
+
+            var item = Subject.GetItems().Single();
+            VerifyPaused(item);
+            item.RemainingTime.Should().NotBe(TimeSpan.Zero);
+        }
+
+        [TestCase("pausedUP")]
+        [TestCase("queuedUP")]
+        [TestCase("uploading")]
+        [TestCase("stalledUP")]
+        [TestCase("checkingUP")]
+        public void completed_item_should_have_required_properties(string state)
+        {
+            var torrent = new QBittorrentTorrent
+            {
+                Hash = "HASH",
+                Name = _title,
+                Size = 1000,
+                Progress = 1.0,
+                Eta = 8640000,
+                State = state,
+                Label = "",
+                SavePath = ""
+            };
+            GivenTorrents(new List<QBittorrentTorrent> { torrent });
+
+            var item = Subject.GetItems().Single();
+            VerifyCompleted(item);
+            item.RemainingTime.Should().Be(TimeSpan.Zero);
+        }
+
+        [TestCase("queuedDL")]
+        [TestCase("checkingDL")]
+        public void queued_item_should_have_required_properties(string state)
+        {
+            var torrent = new QBittorrentTorrent
+            {
+                Hash = "HASH",
+                Name = _title,
+                Size = 1000,
+                Progress = 0.7,
+                Eta = 8640000,
+                State = state,
+                Label = "",
+                SavePath = ""
+            };
+            GivenTorrents(new List<QBittorrentTorrent> { torrent });
+
+            var item = Subject.GetItems().Single();
+            VerifyQueued(item);
+            item.RemainingTime.Should().NotBe(TimeSpan.Zero);
+        }
+
+        [Test]
+        public void downloading_item_should_have_required_properties()
+        {
+            var torrent = new QBittorrentTorrent
+            {
+                Hash = "HASH",
+                Name = _title,
+                Size = 1000,
+                Progress = 0.7,
+                Eta = 60,
+                State = "downloading",
+                Label = "",
+                SavePath = ""
+            };
+            GivenTorrents(new List<QBittorrentTorrent> { torrent });
+
+            var item = Subject.GetItems().Single();
+            VerifyDownloading(item);
+            item.RemainingTime.Should().NotBe(TimeSpan.Zero);
+        }
+
+        [Test]
+        public void stalledDL_item_should_have_required_properties()
+        {
+            var torrent = new QBittorrentTorrent
+            {
+                Hash = "HASH",
+                Name = _title,
+                Size = 1000,
+                Progress = 0.7,
+                Eta = 8640000,
+                State = "stalledDL",
+                Label = "",
+                SavePath = ""
+            };
+            GivenTorrents(new List<QBittorrentTorrent> { torrent });
+
+            var item = Subject.GetItems().Single();
+            VerifyWarning(item);
+            item.RemainingTime.Should().NotBe(TimeSpan.Zero);
+        }
+
+        [Test]
+        public void Download_should_return_unique_id()
+        {
+            GivenSuccessfulDownload();
+
+            var remoteEpisode = CreateRemoteEpisode();
+
+            var id = Subject.Download(remoteEpisode);
+
+            id.Should().NotBeNullOrEmpty();
+        }
+
+        [TestCase("magnet:?xt=urn:btih:ZPBPA2P6ROZPKRHK44D5OW6NHXU5Z6KR&tr=udp", "CBC2F069FE8BB2F544EAE707D75BCD3DE9DCF951")]
+        public void Download_should_get_hash_from_magnet_url(string magnetUrl, string expectedHash)
+        {
+            GivenSuccessfulDownload();
+
+            var remoteEpisode = CreateRemoteEpisode();
+            remoteEpisode.Release.DownloadUrl = magnetUrl;
+
+            var id = Subject.Download(remoteEpisode);
+
+            id.Should().Be(expectedHash);
+        }
+
+        [Test]
+        public void should_return_status_with_outputdirs()
+        {
+            var configItems = new Dictionary<string, Object>();
+
+            configItems.Add("save_path", @"C:\Downloads\Finished\QBittorrent".AsOsAgnostic());
+
+            Mocker.GetMock<IQBittorrentProxy>()
+                .Setup(v => v.GetConfig(It.IsAny<QBittorrentSettings>()))
+                .Returns(configItems);
+
+            var result = Subject.GetStatus();
+
+            result.IsLocalhost.Should().BeTrue();
+            result.OutputRootFolders.Should().NotBeNull();
+            result.OutputRootFolders.First().Should().Be(@"C:\Downloads\Finished\QBittorrent".AsOsAgnostic());
+        }
+
+        [Test]
+        public void Download_should_handle_http_redirect_to_magnet()
+        {
+            GivenRedirectToMagnet();
+            GivenSuccessfulDownload();
+
+            var remoteEpisode = CreateRemoteEpisode();
+
+            var id = Subject.Download(remoteEpisode);
+
+            id.Should().NotBeNullOrEmpty();
+        }
+
+        [Test]
+        public void Download_should_handle_http_redirect_to_torrent()
+        {
+            GivenRedirectToTorrent();
+            GivenSuccessfulDownload();
+
+            var remoteEpisode = CreateRemoteEpisode();
+
+            var id = Subject.Download(remoteEpisode);
+
+            id.Should().NotBeNullOrEmpty();
+        }
+    }
+}
--- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/SabnzbdTests/SabnzbdFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/SabnzbdTests/SabnzbdFixture.cs
@@ -144,7 +144,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
                history = new SabnzbdHistory() { Items = new List<SabnzbdHistoryItem>() };

            Mocker.GetMock<ISabnzbdProxy>()
-                .Setup(s => s.GetHistory(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<SabnzbdSettings>()))
+                .Setup(s => s.GetHistory(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<string>(), It.IsAny<SabnzbdSettings>()))
                .Returns(history);
        }

--- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/TransmissionTests/TransmissionFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/TransmissionTests/TransmissionFixture.cs
@@ -19,6 +19,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
        protected TransmissionTorrent _downloading;
        protected TransmissionTorrent _failed;
        protected TransmissionTorrent _completed;
+        protected TransmissionTorrent _magnet;
        protected Dictionary<string, object> _transmissionConfigItems;

        [SetUp]
@@ -80,6 +81,17 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
                        DownloadDir = "somepath"
                    };

+            _magnet = new TransmissionTorrent
+            {
+                HashString = "HASH",
+                IsFinished = false,
+                Status = TransmissionTorrentStatus.Downloading,
+                Name = _title,
+                TotalSize = 0,
+                LeftUntilDone = 100,
+                DownloadDir = "somepath"
+            };
+
            Mocker.GetMock<ITorrentFileInfoReader>()
                  .Setup(s => s.GetHashFromTorrentFile(It.IsAny<byte[]>()))
                  .Returns("CBC2F069FE8BB2F544EAE707D75BCD3DE9DCF951");
@@ -105,6 +117,11 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
            _settings.TvCategory = "sonarr";
        }

+        protected void GivenTvDirectory()
+        {
+            _settings.TvDirectory = @"C:/Downloads/Finished/sonarr";
+        }
+
        protected void GivenFailedDownload()
        {
            Mocker.GetMock<ITransmissionProxy>()
@@ -171,6 +188,14 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
                });
        }

+        protected void PrepareClientToReturnMagnetItem()
+        {
+            GivenTorrents(new List<TransmissionTorrent>
+                {
+                    _magnet
+                });
+        }
+
        [Test]
        public void queued_item_should_have_required_properties()
        {
@@ -203,6 +228,13 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
            VerifyCompleted(item);
        }

+        [Test]
+        public void magnet_download_should_not_return_the_item()
+        {
+            PrepareClientToReturnMagnetItem();
+            Subject.GetItems().Count().Should().Be(0);
+        }
+
        [Test]
        public void Download_should_return_unique_id()
        {
@@ -215,6 +247,22 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
            id.Should().NotBeNullOrEmpty();
        }

+        [Test]
+        public void Download_with_TvDirectory_should_force_directory()
+        {
+            GivenTvDirectory();
+            GivenSuccessfulDownload();
+
+            var remoteEpisode = CreateRemoteEpisode();
+
+            var id = Subject.Download(remoteEpisode);
+
+            id.Should().NotBeNullOrEmpty();
+
+            Mocker.GetMock<ITransmissionProxy>()
+                .Verify(v => v.AddTorrentFromData(It.IsAny<byte[]>(), @"C:/Downloads/Finished/sonarr", It.IsAny<TransmissionSettings>()), Times.Once());
+        }
+
        [Test]
        public void Download_with_category_should_force_directory()
        {
@@ -249,6 +297,21 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
                .Verify(v => v.AddTorrentFromData(It.IsAny<byte[]>(), @"C:/Downloads/Finished/transmission/sonarr", It.IsAny<TransmissionSettings>()), Times.Once());
        }

+        [Test]
+        public void Download_without_TvDirectory_and_Category_should_use_default()
+        {
+            GivenSuccessfulDownload();
+
+            var remoteEpisode = CreateRemoteEpisode();
+
+            var id = Subject.Download(remoteEpisode);
+
+            id.Should().NotBeNullOrEmpty();
+
+            Mocker.GetMock<ITransmissionProxy>()
+                .Verify(v => v.AddTorrentFromData(It.IsAny<byte[]>(), null, It.IsAny<TransmissionSettings>()), Times.Once());
+        }
+
        [TestCase("magnet:?xt=urn:btih:ZPBPA2P6ROZPKRHK44D5OW6NHXU5Z6KR&tr=udp", "CBC2F069FE8BB2F544EAE707D75BCD3DE9DCF951")]
        public void Download_should_get_hash_from_magnet_url(string magnetUrl, string expectedHash)
        {
@@ -341,6 +404,24 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
            items.First().Status.Should().Be(DownloadItemStatus.Downloading);
        }

+        public void should_exclude_items_not_in_TvDirectory()
+        {
+            GivenTvDirectory();
+
+            _downloading.DownloadDir = @"C:/Downloads/Finished/sonarr/subdir";
+
+            GivenTorrents(new List<TransmissionTorrent> 
+                {
+                    _downloading,
+                    _queued
+                });
+
+            var items = Subject.GetItems().ToList();
+
+            items.Count.Should().Be(1);
+            items.First().Status.Should().Be(DownloadItemStatus.Downloading);
+        }
+
        [Test]
        public void should_fix_forward_slashes()
        {
--- a/src/NzbDrone.Core.Test/Download/DownloadServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/DownloadServiceFixture.cs
@@ -143,7 +143,28 @@ namespace NzbDrone.Core.Test.Download
            Assert.Throws<ReleaseDownloadException>(() => Subject.DownloadReport(_parseResult));

            Mocker.GetMock<IIndexerStatusService>()
-                .Verify(v => v.RecordFailure(It.IsAny<int>(), TimeSpan.FromMinutes(5)), Times.Once());
+                .Verify(v => v.RecordFailure(It.IsAny<int>(), TimeSpan.FromMinutes(5.0)), Times.Once());
+        }
+
+        [Test]
+        public void Download_report_should_trigger_indexer_backoff_on_http429_based_on_date()
+        {
+            var request = new HttpRequest("http://my.indexer.com");
+            var response = new HttpResponse(request, new HttpHeader(), new byte[0], (HttpStatusCode)429);
+            response.Headers["Retry-After"] = DateTime.UtcNow.AddSeconds(300).ToString("r");
+
+            var mock = WithUsenetClient();
+            mock.Setup(s => s.Download(It.IsAny<RemoteEpisode>()))
+                .Callback<RemoteEpisode>(v =>
+                {
+                    throw new ReleaseDownloadException(v.Release, "Error", new TooManyRequestsException(request, response));
+                });
+
+            Assert.Throws<ReleaseDownloadException>(() => Subject.DownloadReport(_parseResult));
+
+            Mocker.GetMock<IIndexerStatusService>()
+                .Verify(v => v.RecordFailure(It.IsAny<int>(),
+                    It.IsInRange<TimeSpan>(TimeSpan.FromMinutes(4.9), TimeSpan.FromMinutes(5.1), Range.Inclusive)), Times.Once());
        }

        [Test]
--- a/src/NzbDrone.Core.Test/Download/TrackedDownloads/TrackedDownloadServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/TrackedDownloads/TrackedDownloadServiceFixture.cs
@@ -48,8 +48,8 @@ namespace NzbDrone.Core.Test.Download.TrackedDownloads
            };

            Mocker.GetMock<IParsingService>()
-               .Setup(s => s.Map(It.Is<ParsedEpisodeInfo>(i => i.SeasonNumber == 1 && i.SeriesTitle == "TV Series"), It.IsAny<int>(), It.IsAny<IEnumerable<int>>()))
-               .Returns(remoteEpisode);
+                  .Setup(s => s.Map(It.Is<ParsedEpisodeInfo>(i => i.SeasonNumber == 1 && i.SeriesTitle == "TV Series"), It.IsAny<int>(), It.IsAny<IEnumerable<int>>()))
+                  .Returns(remoteEpisode);

            var client = new DownloadClientDefinition()
            {
@@ -72,5 +72,61 @@ namespace NzbDrone.Core.Test.Download.TrackedDownloads
            trackedDownload.RemoteEpisode.Episodes.First().Id.Should().Be(4);
            trackedDownload.RemoteEpisode.ParsedEpisodeInfo.SeasonNumber.Should().Be(1);
        }
+
+        [Test]
+        public void should_parse_as_special_when_source_title_parsing_fails()
+        {
+            var remoteEpisode = new RemoteEpisode
+            {
+                Series = new Series() { Id = 5 },
+                Episodes = new List<Episode> { new Episode { Id = 4 } },
+                ParsedEpisodeInfo = new ParsedEpisodeInfo()
+                {
+                    SeriesTitle = "TV Series",
+                    SeasonNumber = 0,
+                    EpisodeNumbers = new []{ 1 }
+                }
+            };
+
+            Mocker.GetMock<IHistoryService>()
+                .Setup(s => s.FindByDownloadId(It.Is<string>(sr => sr == "35238")))
+                .Returns(new List<History.History>(){
+                 new History.History(){
+                     DownloadId = "35238",
+                     SourceTitle = "TV Series Special",
+                     SeriesId = 5,
+                     EpisodeId = 4
+                 }
+                });
+
+            Mocker.GetMock<IParsingService>()
+                  .Setup(s => s.Map(It.Is<ParsedEpisodeInfo>(i => i.SeasonNumber == 0 && i.SeriesTitle == "TV Series"), It.IsAny<int>(), It.IsAny<IEnumerable<int>>()))
+                  .Returns(remoteEpisode);
+
+            Mocker.GetMock<IParsingService>()
+                  .Setup(s => s.ParseSpecialEpisodeTitle(It.IsAny<string>(), It.IsAny<int>(), It.IsAny<int>(), null))
+                  .Returns(remoteEpisode.ParsedEpisodeInfo);
+
+            var client = new DownloadClientDefinition()
+            {
+                Id = 1,
+                Protocol = DownloadProtocol.Torrent
+            };
+
+            var item = new DownloadClientItem()
+            {
+                Title = "The torrent release folder",
+                DownloadId = "35238",
+            };
+
+            var trackedDownload = Subject.TrackDownload(client, item);
+
+            trackedDownload.Should().NotBeNull();
+            trackedDownload.RemoteEpisode.Should().NotBeNull();
+            trackedDownload.RemoteEpisode.Series.Should().NotBeNull();
+            trackedDownload.RemoteEpisode.Series.Id.Should().Be(5);
+            trackedDownload.RemoteEpisode.Episodes.First().Id.Should().Be(4);
+            trackedDownload.RemoteEpisode.ParsedEpisodeInfo.SeasonNumber.Should().Be(0);
+        }
    }
 }
--- a/src/NzbDrone.Core.Test/Files/Indexers/TitansOfTv/RecentFeed.json
+++ b/src/NzbDrone.Core.Test/Files/Indexers/TitansOfTv/RecentFeed.json
@@ -1,67 +0,0 @@
-{
-    "code": "SUCCESSFUL",
-    "http_code": 200,
-    "limit": "2",
-    "offset": 0,
-    "results": [
-        {
-            "air_date": "20150623",
-            "anonymous": 1,
-            "codec": "x264",
-            "container": "MKV",
-            "created_at": "2015-06-25 04:13:44",
-            "download": "https://titansof.tv/api/torrents/19445/download?apikey=abc",
-            "ecommentUrl": "https://titansof.tv/series/287053/episode/5453241#comments",
-            "episode": "S02E04",
-            "episodeUrl": "https://titansof.tv/series/287053/episode/5453241",
-            "episode_id": "5453241",
-            "id": "19445",
-            "language": "en",
-            "leechers": 5,
-            "network": "truTV",
-            "origin": "Scene",
-            "release_name": "Series.Title.S02E04.720p.HDTV.x264-W4F",
-            "resolution": "720p",
-            "season": "",
-            "season_id": 0,
-            "seeders": 2,
-            "series": "Series Title",
-            "series_id": "287053",
-            "size": 435402993,
-            "snatched": 0,
-            "source": "HDTV",
-            "updated_at": "2015-06-25 04:13:44",
-            "user_id": 0
-        },
-        {
-            "air_date": "20150624",
-            "anonymous": 1,
-            "codec": "x264",
-            "container": "MKV",
-            "created_at": "2015-06-25 04:11:59",
-            "download": "https://titansof.tv/api/torrents/19444/download?apikey=abc",
-            "ecommentUrl": "https://titansof.tv/series/75382/episode/5443517#comments",
-            "episode": "S21E10",
-            "episodeUrl": "https://titansof.tv/series/75382/episode/5443517",
-            "episode_id": "5443517",
-            "id": "19444",
-            "language": "en",
-            "leechers": 0,
-            "network": "FX",
-            "origin": "User",
-            "release_name": "Series.Title.S21E10.720p.HDTV.x264-KOENiG",
-            "resolution": "720p",
-            "season": "",
-            "season_id": 0,
-            "seeders": 1,
-            "series": "Series Title",
-            "series_id": "75382",
-            "size": 949968933,
-            "snatched": 0,
-            "source": "HDTV",
-            "updated_at": "2015-06-25 04:11:59",
-            "user_id": 0
-        }
-    ],
-    "total": 18546
-}
--- a/src/NzbDrone.Core.Test/HealthCheck/Checks/UpdateCheckFixture.cs
+++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/UpdateCheckFixture.cs
@@ -6,6 +6,7 @@ using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.HealthCheck.Checks;
 using NzbDrone.Core.Test.Framework;
+using NzbDrone.Core.Update;

 namespace NzbDrone.Core.Test.HealthCheck.Checks
 {
@@ -21,8 +22,8 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
                  .Setup(s => s.StartUpFolder)
                  .Returns(@"C:\NzbDrone");

-            Mocker.GetMock<NzbDrone.Common.Disk.IDiskProvider>()
-                  .Setup(c => c.FolderWritable(Moq.It.IsAny<string>()))
+            Mocker.GetMock<IDiskProvider>()
+                  .Setup(c => c.FolderWritable(It.IsAny<string>()))
                  .Returns(false);

            Subject.Check().ShouldBeError();
@@ -33,19 +34,71 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
        {
            MonoOnly();

+            const string startupFolder = @"/opt/nzbdrone";
+
            Mocker.GetMock<IConfigFileProvider>()
                  .Setup(s => s.UpdateAutomatically)
                  .Returns(true);

            Mocker.GetMock<IAppFolderInfo>()
                  .Setup(s => s.StartUpFolder)
-                  .Returns(@"/opt/nzbdrone");
+                  .Returns(startupFolder);

-            Mocker.GetMock<NzbDrone.Common.Disk.IDiskProvider>()
-                  .Setup(c => c.FolderWritable(Moq.It.IsAny<string>()))
+            Mocker.GetMock<IDiskProvider>()
+                  .Setup(c => c.FolderWritable(startupFolder))
                  .Returns(false);

            Subject.Check().ShouldBeError();
        }
+
+        [Test]
+        public void should_return_error_when_ui_folder_is_write_protected_and_update_automatically_is_enabled()
+        {
+            MonoOnly();
+
+            const string startupFolder = @"/opt/nzbdrone";
+            const string uiFolder = @"/opt/nzbdrone/UI";
+
+            Mocker.GetMock<IConfigFileProvider>()
+                  .Setup(s => s.UpdateAutomatically)
+                  .Returns(true);
+
+            Mocker.GetMock<IAppFolderInfo>()
+                  .Setup(s => s.StartUpFolder)
+                  .Returns(startupFolder);
+
+            Mocker.GetMock<IDiskProvider>()
+                  .Setup(c => c.FolderWritable(startupFolder))
+                  .Returns(true);
+
+            Mocker.GetMock<IDiskProvider>()
+                  .Setup(c => c.FolderWritable(uiFolder))
+                  .Returns(false);
+
+            Subject.Check().ShouldBeError();
+        }
+
+        [Test]
+        public void should_not_return_error_when_app_folder_is_write_protected_and_external_script_enabled()
+        {
+            MonoOnly();
+
+            Mocker.GetMock<IConfigFileProvider>()
+                  .Setup(s => s.UpdateAutomatically)
+                  .Returns(true);
+
+            Mocker.GetMock<IConfigFileProvider>()
+                  .Setup(s => s.UpdateMechanism)
+                  .Returns(UpdateMechanism.Script);
+
+            Mocker.GetMock<IAppFolderInfo>()
+                  .Setup(s => s.StartUpFolder)
+                  .Returns(@"/opt/nzbdrone");
+
+            Mocker.GetMock<IDiskProvider>()
+                  .Verify(c => c.FolderWritable(It.IsAny<string>()), Times.Never());
+
+            Subject.Check().ShouldBeOk();
+        }
    }
 }
--- a/src/NzbDrone.Core.Test/Http/TorCacheHttpRequestInterceptorFixture.cs
+++ b/src/NzbDrone.Core.Test/Http/TorCacheHttpRequestInterceptorFixture.cs
@@ -23,6 +23,16 @@ namespace NzbDrone.Core.Test.Http
            newRequest.Url.AbsoluteUri.Should().Be("http://torcache.net/download/123.torrent");
        }

+        [Test]
+        public void should_add_referrer_torcache_request()
+        {
+            var request = new HttpRequest("http://torcache.net/download/123.torrent?title=something");
+
+            var newRequest = Subject.PreRequest(request);
+
+            newRequest.Headers.Should().Contain("Referer", "http://torcache.net/");
+        }
+
        [TestCase("http://site.com/download?url=torcache.net&blaat=1")]
        [TestCase("http://torcache.net.com/download?url=123")]
        public void should_not_remove_query_params_from_other_requests(string url)
--- a/src/NzbDrone.Core.Test/IndexerTests/TitansOfTvTests/TitansOfTvFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/TitansOfTvTests/TitansOfTvFixture.cs
@@ -1,157 +0,0 @@
-using System;
-using System.Linq;
-using FluentAssertions;
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Common.Http;
-using NzbDrone.Core.Indexers;
-using NzbDrone.Core.Indexers.TitansOfTv;
-using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Test.Common;
-
-namespace NzbDrone.Core.Test.IndexerTests.TitansOfTvTests
-{
-    [TestFixture]
-    public class TitansOfTvFixture : CoreTest<TitansOfTv>
-    {
-        [SetUp]
-        public void Setup()
-        {
-            Subject.Definition = new IndexerDefinition
-                {
-                    Name = "TitansOfTV",
-                    Settings = new TitansOfTvSettings { ApiKey = "abc", BaseUrl = "https://titansof.tv/api" }
-                };
-        }
-
-        [Test]
-        public void should_parse_recent_feed_from_TitansOfTv()
-        {
-            var recentFeed = ReadAllText(@"Files/Indexers/TitansOfTv/RecentFeed.json");
-
-            Mocker.GetMock<IHttpClient>()
-                  .Setup(o => o.Execute(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET)))
-                  .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), recentFeed));
-
-            var releases = Subject.FetchRecent();
-
-            releases.Should().HaveCount(2);
-            releases.First().Should().BeOfType<TorrentInfo>();
-
-            var torrentInfo = releases.First() as TorrentInfo;
-
-            torrentInfo.Guid.Should().Be("ToTV-19445");
-            torrentInfo.Title.Should().Be("Series.Title.S02E04.720p.HDTV.x264-W4F");
-            torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
-            torrentInfo.DownloadUrl.Should().Be("https://titansof.tv/api/torrents/19445/download?apikey=abc");
-            torrentInfo.InfoUrl.Should().Be("https://titansof.tv/series/287053/episode/5453241");
-            torrentInfo.CommentUrl.Should().BeNullOrEmpty();
-            torrentInfo.Indexer.Should().Be(Subject.Definition.Name);
-            torrentInfo.PublishDate.Should().Be(DateTime.Parse("2015-06-25 04:13:44"));
-            torrentInfo.Size.Should().Be(435402993);
-            torrentInfo.InfoHash.Should().BeNullOrEmpty();
-            torrentInfo.TvdbId.Should().Be(0);
-            torrentInfo.TvRageId.Should().Be(0);
-            torrentInfo.MagnetUrl.Should().BeNullOrEmpty();
-            torrentInfo.Peers.Should().Be(2+5);
-            torrentInfo.Seeders.Should().Be(2);
-        }
-
-        private void VerifyBackOff()
-        {
-            Mocker.GetMock<IIndexerStatusService>()
-                .Verify(v => v.RecordFailure(It.IsAny<int>(), It.IsAny<TimeSpan>()), Times.Once());
-        }
-
-        [Test]
-        public void should_back_off_on_bad_request()
-        {
-            Mocker.GetMock<IHttpClient>()
-                  .Setup(v => v.Execute(It.IsAny<HttpRequest>()))
-                  .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), new byte[0], System.Net.HttpStatusCode.BadRequest));
-
-            var results = Subject.FetchRecent();
-
-            results.Should().BeEmpty();
-
-            VerifyBackOff();
-
-            ExceptionVerification.ExpectedWarns(1);
-        }
-
-        [Test]
-        public void should_back_off_and_report_api_key_invalid()
-        {
-            Mocker.GetMock<IHttpClient>()
-                  .Setup(v => v.Execute(It.IsAny<HttpRequest>()))
-                  .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), new byte[0], System.Net.HttpStatusCode.Unauthorized));
-
-            var results = Subject.FetchRecent();
-
-            results.Should().BeEmpty();
-
-            results.Should().BeEmpty();
-
-            VerifyBackOff();
-
-            ExceptionVerification.ExpectedWarns(1);
-        }
-
-        [Test]
-        public void should_back_off_on_unknown_method()
-        {
-            Mocker.GetMock<IHttpClient>()
-                  .Setup(v => v.Execute(It.IsAny<HttpRequest>()))
-                  .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), new byte[0], System.Net.HttpStatusCode.NotFound));
-
-            var results = Subject.FetchRecent();
-
-            results.Should().BeEmpty();
-
-            VerifyBackOff();
-
-            ExceptionVerification.ExpectedWarns(1);
-        }
-
-        [Test]
-        public void should_back_off_api_limit_reached()
-        {
-            Mocker.GetMock<IHttpClient>()
-                  .Setup(v => v.Execute(It.IsAny<HttpRequest>()))
-                  .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), new byte[0], System.Net.HttpStatusCode.ServiceUnavailable));
-
-            var results = Subject.FetchRecent();
-
-            results.Should().BeEmpty();
-
-            VerifyBackOff();
-
-            ExceptionVerification.ExpectedWarns(1);
-        }
-
-        [Test]
-        public void should_replace_https_http_as_needed()
-        {
-            var recentFeed = ReadAllText(@"Files/Indexers/TitansOfTv/RecentFeed.json");
-
-            (Subject.Definition.Settings as TitansOfTvSettings).BaseUrl = "http://titansof.tv/api/torrents";
-
-            recentFeed = recentFeed.Replace("http:", "https:");
-
-            Mocker.GetMock<IHttpClient>()
-                  .Setup(o => o.Execute(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET)))
-                  .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), recentFeed));
-
-            var releases = Subject.FetchRecent();
-
-            releases.Should().HaveCount(2);
-            releases.First().Should().BeOfType<TorrentInfo>();
-
-            var torrentInfo = releases.First() as TorrentInfo;
-
-            torrentInfo.DownloadUrl.Should().Be("http://titansof.tv/api/torrents/19445/download?apikey=abc");
-            torrentInfo.InfoUrl.Should().Be("http://titansof.tv/series/287053/episode/5453241");
-        }
-    }
-}
--- a/src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/ImportDecisionMakerFixture.cs
+++ b/src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/ImportDecisionMakerFixture.cs
@@ -185,7 +185,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
            GivenSpecifications(_pass1, _pass2, _pass3);
            var expectedQuality = QualityParser.ParseQuality(_videoFiles.Single());

-            var result = Subject.GetImportDecisions(_videoFiles, _series, new ParsedEpisodeInfo{Quality = new QualityModel(Quality.Bluray1080p)}, true);
+            var result = Subject.GetImportDecisions(_videoFiles, _series, new ParsedEpisodeInfo{Quality = new QualityModel(Quality.SDTV)}, true);

            result.Single().LocalEpisode.Quality.Should().Be(expectedQuality);
        }
@@ -207,6 +207,22 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
            result.Single().LocalEpisode.Quality.Should().Be(expectedQuality);
        }

+        [Test]
+        public void should_use_folder_quality_when_greater_than_file_quality()
+        {
+            GivenSpecifications(_pass1, _pass2, _pass3);
+            GivenVideoFiles(new string[] { @"C:\Test\Unsorted\The.Office.S03E115.mkv".AsOsAgnostic() });
+
+            _localEpisode.Path = _videoFiles.Single();
+            _localEpisode.Quality.Quality = Quality.HDTV720p;
+
+            var expectedQuality = new QualityModel(Quality.Bluray720p);
+
+            var result = Subject.GetImportDecisions(_videoFiles, _series, new ParsedEpisodeInfo { Quality = expectedQuality }, true);
+
+            result.Single().LocalEpisode.Quality.Should().Be(expectedQuality);
+        }
+
        [Test]
        public void should_not_throw_if_episodes_are_not_found()
        {
--- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
+++ b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
@@ -44,25 +44,25 @@
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\packages\AutoMoq.1.6.2.0\lib\net35\AutoMoq.dll</HintPath>
    </Reference>
-    <Reference Include="FluentAssertions, Version=3.4.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.3.4.0\lib\net40\FluentAssertions.dll</HintPath>
+    <Reference Include="FluentAssertions, Version=4.2.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.2.1\lib\net40\FluentAssertions.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="FluentAssertions.Core, Version=3.4.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.3.4.0\lib\net40\FluentAssertions.Core.dll</HintPath>
+    <Reference Include="FluentAssertions.Core, Version=4.2.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.2.1\lib\net40\FluentAssertions.Core.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="FluentMigrator, Version=1.3.1.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\FluentMigrator.1.3.1.0\lib\40\FluentMigrator.dll</HintPath>
+    <Reference Include="FluentMigrator, Version=1.6.1.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentMigrator.1.6.1\lib\40\FluentMigrator.dll</HintPath>
+      <Private>True</Private>
    </Reference>
-    <Reference Include="FluentMigrator.Runner, Version=1.3.1.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\FluentMigrator.Runner.1.3.1.0\lib\40\FluentMigrator.Runner.dll</HintPath>
+    <Reference Include="FluentMigrator.Runner, Version=1.6.1.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentMigrator.Runner.1.6.1\lib\40\FluentMigrator.Runner.dll</HintPath>
+      <Private>True</Private>
    </Reference>
-    <Reference Include="FluentValidation, Version=5.5.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\FluentValidation.5.5.0.0\lib\Net40\FluentValidation.dll</HintPath>
+    <Reference Include="FluentValidation, Version=6.0.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentValidation.6.0.2.0\lib\portable-net40+sl50+wp80+win8+wpa81\FluentValidation.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
@@ -161,8 +161,10 @@
    <Compile Include="Download\DownloadClientTests\DelugeTests\DelugeFixture.cs" />
    <Compile Include="Download\DownloadClientTests\DownloadClientFixtureBase.cs" />
    <Compile Include="Download\DownloadClientTests\NzbgetTests\NzbgetFixture.cs" />
+    <Compile Include="Download\DownloadClientTests\NzbVortexTests\NzbVortexFixture.cs" />
    <Compile Include="Download\DownloadClientTests\PneumaticProviderFixture.cs" />
    <Compile Include="Download\DownloadClientTests\RTorrentTests\RTorrentFixture.cs" />
+    <Compile Include="Download\DownloadClientTests\QBittorrentTests\QBittorrentFixture.cs" />
    <Compile Include="Download\DownloadClientTests\SabnzbdTests\SabnzbdFixture.cs" />
    <Compile Include="Download\DownloadClientTests\TransmissionTests\TransmissionFixture.cs" />
    <Compile Include="Download\DownloadClientTests\UTorrentTests\UTorrentFixture.cs" />
@@ -222,7 +224,6 @@
    <Compile Include="IndexerTests\IndexerStatusServiceFixture.cs" />
    <Compile Include="IndexerTests\IntegrationTests\IndexerIntegrationTests.cs" />
    <Compile Include="IndexerTests\RarbgTests\RarbgFixture.cs" />
-    <Compile Include="IndexerTests\TitansOfTvTests\TitansOfTvFixture.cs" />
    <Compile Include="IndexerTests\TorrentRssIndexerTests\TorrentRssParserFactoryFixture.cs" />
    <Compile Include="IndexerTests\TorrentRssIndexerTests\TorrentRssSettingsDetectorFixture.cs" />
    <Compile Include="IndexerTests\TorznabTests\TorznabFixture.cs" />
@@ -508,9 +509,6 @@
    </Content>
  </ItemGroup>
  <ItemGroup>
-    <None Include="Files\Indexers\TitansOfTv\RecentFeed.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
    <None Include="Files\TestArchive.tar.gz">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </None>
@@ -546,7 +544,6 @@
    <PostBuildEvent>
    </PostBuildEvent>
  </PropertyGroup>
-  <Import Project="$(SolutionDir)\.nuget\NuGet.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">
@@ -554,4 +551,4 @@
  <Target Name="AfterBuild">
  </Target>
  -->
-</Project>
+</Project>
--- a/src/NzbDrone.Core.Test/ParserTests/MultiEpisodeParserFixture.cs
+++ b/src/NzbDrone.Core.Test/ParserTests/MultiEpisodeParserFixture.cs
@@ -45,6 +45,17 @@ namespace NzbDrone.Core.Test.ParserTests
        [TestCase("RWBY.S01E02E03.1080p.BluRay.x264-DeBTViD", "RWBY", 1, new [] { 2, 3 })]
        [TestCase("grp-zoos01e11e12-1080p", "grp-zoo", 1, new [] { 11, 12 })]
        [TestCase("grp-zoo-s01e11e12-1080p", "grp-zoo", 1, new [] { 11, 12 })]
+        [TestCase("Series Title.S6.E1.E2.Episode Name.1080p.WEB-DL", "Series Title", 6, new [] { 1, 2 })]
+        [TestCase("Series Title.S6E1-E2.Episode Name.1080p.WEB-DL", "Series Title", 6, new [] { 1, 2 })]
+        [TestCase("Series Title.S6E1-S6E2.Episode Name.1080p.WEB-DL", "Series Title", 6, new [] { 1, 2 })]
+        [TestCase("Series Title.S6E1E2.Episode Name.1080p.WEB-DL", "Series Title", 6, new [] { 1, 2 })]
+        [TestCase("Series Title.S6E1-E2-E3.Episode Name.1080p.WEB-DL", "Series Title", 6, new [] { 1, 2, 3})]
+        [TestCase("Series Title.S6.E1E3.Episode Name.1080p.WEB-DL", "Series Title", 6, new [] { 1, 2, 3 })]
+        [TestCase("Series Title.S6.E1-E2.Episode Name.1080p.WEB-DL", "Series Title", 6, new[] { 1, 2 })]
+        [TestCase("Series Title.S6.E1-S6E2.Episode Name.1080p.WEB-DL", "Series Title", 6, new[] { 1, 2 })]
+        [TestCase("Series Title.S6.E1E2.Episode Name.1080p.WEB-DL", "Series Title", 6, new[] { 1, 2 })]
+        [TestCase("Series Title.S6.E1-E2-E3.Episode Name.1080p.WEB-DL", "Series Title", 6, new[] { 1, 2, 3 })]
+        [TestCase("Series Title.S6.E1E3.Episode Name.1080p.WEB-DL", "Series Title", 6, new[] { 1, 2, 3 })]
        //[TestCase("", "", , new [] {  })]
        public void should_parse_multiple_episodes(string postTitle, string title, int season, int[] episodes)
        {
--- a/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs
+++ b/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs
@@ -204,6 +204,7 @@ namespace NzbDrone.Core.Test.ParserTests

        [TestCase("Sonny.With.a.Chance.S02E15", false)]
        [TestCase("Law & Order: Special Victims Unit - 11x11 - Quickie", false)]
+        [TestCase("Series.Title.S01E01.webm", false)]
        public void quality_parse(string title, bool proper)
        {
            ParseAndVerifyQuality(title, Quality.Unknown, proper);
--- a/src/NzbDrone.Core.Test/ParserTests/SingleEpisodeParserFixture.cs
+++ b/src/NzbDrone.Core.Test/ParserTests/SingleEpisodeParserFixture.cs
@@ -116,6 +116,8 @@ namespace NzbDrone.Core.Test.ParserTests
        [TestCase("Castle (2009) - [06x16] - Room 147.mp4", "Castle (2009)", 6, 16)]
        [TestCase("grp-zoos01e11-1080p", "grp-zoo", 1, 11)]
        [TestCase("grp-zoo-s01e11-1080p", "grp-zoo", 1, 11)]
+        [TestCase("Jeopardy!.S2016E14.2016-01-20.avi", "Jeopardy!", 2016, 14)]
+        [TestCase("Ken.Burns.The.Civil.War.5of9.The.Universe.Of.Battle.1990.DVDRip.x264-HANDJOB", "Ken Burns The Civil War", 1, 5)]
        //[TestCase("", "", 0, 0)]
        public void should_parse_single_episode(string postTitle, string title, int seasonNumber, int episodeNumber)
        {
--- a/src/NzbDrone.Core.Test/packages.config
+++ b/src/NzbDrone.Core.Test/packages.config
@@ -2,10 +2,10 @@
 <packages>
  <package id="AutoMoq" version="1.6.2.0" targetFramework="net40" />
  <package id="CommonServiceLocator" version="1.0" targetFramework="net40" />
-  <package id="FluentAssertions" version="3.4.0" targetFramework="net40" />
-  <package id="FluentMigrator" version="1.3.1.0" targetFramework="net40" />
-  <package id="FluentMigrator.Runner" version="1.3.1.0" targetFramework="net40" />
-  <package id="FluentValidation" version="5.5.0.0" targetFramework="net40" />
+  <package id="FluentAssertions" version="4.2.1" targetFramework="net40" />
+  <package id="FluentMigrator" version="1.6.1" targetFramework="net40" />
+  <package id="FluentMigrator.Runner" version="1.6.1" targetFramework="net40" />
+  <package id="FluentValidation" version="6.0.2.0" targetFramework="net40" />
  <package id="Moq" version="4.0.10827" />
  <package id="NBuilder" version="3.0.1.1" />
  <package id="NCrunch.Framework" version="1.46.0.9" targetFramework="net40" />
--- a/src/NzbDrone.Core/Annotations/FieldDefinitionAttribute.cs
+++ b/src/NzbDrone.Core/Annotations/FieldDefinitionAttribute.cs
@@ -26,6 +26,7 @@ namespace NzbDrone.Core.Annotations
        Checkbox,
        Select,
        Path,
+        FilePath,
        Hidden,
        Tag,
        Action,
--- a/src/NzbDrone.Core/Datastore/Migration/098_remove_titans_of_tv.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/098_remove_titans_of_tv.cs
@@ -0,0 +1,14 @@
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(98)]
+    public class remove_titans_of_tv : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            Delete.FromTable("Indexers").Row(new { Implementation = "TitansOfTv" });
+        }
+    }
+}
--- a/src/NzbDrone.Core/Datastore/Migration/Framework/NzbDroneSqliteProcessor.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/Framework/NzbDroneSqliteProcessor.cs
@@ -10,7 +10,7 @@ using FluentMigrator.Runner.Processors.SQLite;

 namespace NzbDrone.Core.Datastore.Migration.Framework
 {
-    public class NzbDroneSqliteProcessor : SqliteProcessor
+    public class NzbDroneSqliteProcessor : SQLiteProcessor
    {
        public NzbDroneSqliteProcessor(IDbConnection connection, IMigrationGenerator generator, IAnnouncer announcer, IMigrationProcessorOptions options, FluentMigrator.Runner.Processors.IDbFactory factory)
            : base(connection, generator, announcer, options, factory)
@@ -70,7 +70,7 @@ namespace NzbDrone.Core.Datastore.Migration.Framework

        protected virtual TableDefinition GetTableSchema(string tableName)
        {
-            var schemaDumper = new SqliteSchemaDumper(this, Announcer);
+            var schemaDumper = new  SqliteSchemaDumper(this, Announcer);
            var schema = schemaDumper.ReadDbSchema();

            return schema.Single(v => v.Name == tableName);
@@ -88,7 +88,7 @@ namespace NzbDrone.Core.Datastore.Migration.Framework
            }

            // What is the cleanest way to do this? Add function to Generator?
-            var quoter = new SqliteQuoter();
+            var quoter = new SQLiteQuoter();
            var columnsToTransfer = string.Join(", ", tableDefinition.Columns.Select(c => quoter.QuoteColumnName(c.Name)));

            Process(new CreateTableExpression() { TableName = tempTableName, Columns = tableDefinition.Columns.ToList() });
--- a/src/NzbDrone.Core/Datastore/Migration/Framework/NzbDroneSqliteProcessorFactory.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/Framework/NzbDroneSqliteProcessorFactory.cs
@@ -6,13 +6,13 @@ using FluentMigrator.Runner.Processors.SQLite;

 namespace NzbDrone.Core.Datastore.Migration.Framework
 {
-    public class NzbDroneSqliteProcessorFactory : SqliteProcessorFactory
+    public class NzbDroneSqliteProcessorFactory : SQLiteProcessorFactory
    {
        public override IMigrationProcessor Create(string connectionString, IAnnouncer announcer, IMigrationProcessorOptions options)
        {
            var factory = new MigrationDbFactory();
            var connection = factory.CreateConnection(connectionString);
-            var generator = new SqliteGenerator() { compatabilityMode = CompatabilityMode.STRICT };
+            var generator = new SQLiteGenerator { compatabilityMode = CompatabilityMode.STRICT };
            return new NzbDroneSqliteProcessor(connection, generator, announcer, options, factory);
        }
    }
--- a/src/NzbDrone.Core/Datastore/Migration/Framework/SqliteSchemaDumper.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/Framework/SqliteSchemaDumper.cs
@@ -11,14 +11,14 @@ namespace NzbDrone.Core.Datastore.Migration.Framework
    // The original implementation had bad support for escaped identifiers, amongst other things.
    public class SqliteSchemaDumper
    {
-        public SqliteSchemaDumper(SqliteProcessor processor, IAnnouncer announcer)
+        public SqliteSchemaDumper(SQLiteProcessor processor, IAnnouncer announcer)
        {
            Announcer = announcer;
            Processor = processor;
        }

        public virtual IAnnouncer Announcer { get; set; }
-        public SqliteProcessor Processor { get; set; }
+        public SQLiteProcessor Processor { get; set; }

        protected internal virtual TableDefinition ReadTableSchema(string sqlSchema)
        {
--- a/src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs
+++ b/src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs
@@ -78,14 +78,18 @@ namespace NzbDrone.Core.DecisionEngine
                        var remoteEpisode = _parsingService.Map(parsedEpisodeInfo, report.TvdbId, report.TvRageId, searchCriteria);
                        remoteEpisode.Release = report;

-                        if (remoteEpisode.Series != null)
+                        if (remoteEpisode.Series == null)
                        {
-                            remoteEpisode.DownloadAllowed = remoteEpisode.Episodes.Any();
-                            decision = GetDecisionForReport(remoteEpisode, searchCriteria);
+                            decision = new DownloadDecision(remoteEpisode, new Rejection("Unknown Series"));
+                        }
+                        else if (remoteEpisode.Episodes.Empty())
+                        {
+                            decision = new DownloadDecision(remoteEpisode, new Rejection("Unable to parse episodes from release name"));                            
                        }
                        else
                        {
-                            decision = new DownloadDecision(remoteEpisode, new Rejection("Unknown Series"));
+                            remoteEpisode.DownloadAllowed = remoteEpisode.Episodes.Any();
+                            decision = GetDecisionForReport(remoteEpisode, searchCriteria);
                        }
                    }
                }
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/AcceptableSizeSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/AcceptableSizeSpecification.cs
@@ -57,7 +57,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
                    return Decision.Reject("{0} is smaller than minimum allowed: {1}", subject.Release.Size.SizeSuffix(), minSize.SizeSuffix());
                }
            }
-            if (!qualityDefinition.MaxSize.HasValue)
+            if (!qualityDefinition.MaxSize.HasValue || qualityDefinition.MaxSize.Value == 0)
            {
                _logger.Debug("Max size is unlimited - skipping check.");
            }
--- a/src/NzbDrone.Core/Download/Clients/Deluge/DelugeProxy.cs
+++ b/src/NzbDrone.Core/Download/Clients/Deluge/DelugeProxy.cs
@@ -243,7 +243,7 @@ namespace NzbDrone.Core.Download.Clients.Deluge
            }

            var restClient = RestClientFactory.BuildClient(url);
-            restClient.Timeout = 4000;
+            restClient.Timeout = 15000;

            if (_authPassword != settings.Password || _authCookieContainer == null)
            {
--- a/src/NzbDrone.Core/Download/Clients/NzbVortex/JsonConverters/NzbVortexLoginResultTypeConverter.cs
+++ b/src/NzbDrone.Core/Download/Clients/NzbVortex/JsonConverters/NzbVortexLoginResultTypeConverter.cs
@@ -0,0 +1,29 @@
+using System;
+using Newtonsoft.Json;
+
+namespace NzbDrone.Core.Download.Clients.NzbVortex.JsonConverters
+{
+    public class NzbVortexLoginResultTypeConverter : JsonConverter
+    {
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            var priorityType = (NzbVortexLoginResultType)value;
+            writer.WriteValue(priorityType.ToString().ToLower());
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            var result = reader.Value.ToString().Replace("_", string.Empty);
+
+            NzbVortexLoginResultType output;
+            Enum.TryParse(result, true, out output);
+
+            return output;
+        }
+
+        public override bool CanConvert(Type objectType)
+        {
+            return objectType == typeof(NzbVortexLoginResultType);
+        }
+    }
+}
--- a/src/NzbDrone.Core/Download/Clients/NzbVortex/JsonConverters/NzbVortexResultTypeConverter.cs
+++ b/src/NzbDrone.Core/Download/Clients/NzbVortex/JsonConverters/NzbVortexResultTypeConverter.cs
@@ -0,0 +1,29 @@
+using System;
+using Newtonsoft.Json;
+
+namespace NzbDrone.Core.Download.Clients.NzbVortex.JsonConverters
+{
+    public class NzbVortexResultTypeConverter : JsonConverter
+    {
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            var priorityType = (NzbVortexResultType)value;
+            writer.WriteValue(priorityType.ToString().ToLower());
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            var result = reader.Value.ToString().Replace("_", string.Empty);
+
+            NzbVortexResultType output;
+            Enum.TryParse(result, true, out output);
+
+            return output;
+        }
+
+        public override bool CanConvert(Type objectType)
+        {
+            return objectType == typeof(NzbVortexResultType);
+        }
+    }
+}
--- a/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortex.cs
+++ b/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortex.cs
@@ -0,0 +1,265 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using FluentValidation.Results;
+using NLog;
+using NzbDrone.Common.Disk;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Common.Http;
+using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.Validation;
+using NzbDrone.Core.RemotePathMappings;
+
+namespace NzbDrone.Core.Download.Clients.NzbVortex
+{
+    public class NzbVortex : UsenetClientBase<NzbVortexSettings>
+    {
+        private readonly INzbVortexProxy _proxy;
+
+        public NzbVortex(INzbVortexProxy proxy,
+                       IHttpClient httpClient,
+                       IConfigService configService,
+                       IDiskProvider diskProvider,
+                       IRemotePathMappingService remotePathMappingService,
+                       Logger logger)
+            : base(httpClient, configService, diskProvider, remotePathMappingService, logger)
+        {
+            _proxy = proxy;
+        }
+
+        protected override string AddFromNzbFile(RemoteEpisode remoteEpisode, string filename, byte[] fileContent)
+        {
+            var priority = remoteEpisode.IsRecentEpisode() ? Settings.RecentTvPriority : Settings.OlderTvPriority;
+
+            var response = _proxy.DownloadNzb(fileContent, filename, priority, Settings);
+
+            if (response == null)
+            {
+                throw new DownloadClientException("Failed to add nzb {0}", filename);
+            }
+
+            return response;
+        }
+
+        public override string Name
+        {
+            get
+            {
+                return "NZBVortex";
+            }
+        }
+
+        public override IEnumerable<DownloadClientItem> GetItems()
+        {
+            NzbVortexQueue vortexQueue;
+
+            try
+            {
+                vortexQueue = _proxy.GetQueue(30, Settings);
+            }
+            catch (DownloadClientException ex)
+            {
+                _logger.Warn("Couldn't get download queue. {0}", ex.Message);
+                return Enumerable.Empty<DownloadClientItem>();
+            }
+
+            var queueItems = new List<DownloadClientItem>();
+
+            foreach (var vortexQueueItem in vortexQueue.Items)
+            {
+                var queueItem = new DownloadClientItem();
+
+                queueItem.DownloadClient = Definition.Name;
+                queueItem.DownloadId = vortexQueueItem.AddUUID ?? vortexQueueItem.Id.ToString();
+                queueItem.Category = vortexQueueItem.GroupName;
+                queueItem.Title = vortexQueueItem.UiTitle;
+                queueItem.TotalSize = vortexQueueItem.TotalDownloadSize;
+                queueItem.RemainingSize = vortexQueueItem.TotalDownloadSize - vortexQueueItem.DownloadedSize;
+                queueItem.RemainingTime = null;
+                
+                if (vortexQueueItem.IsPaused)
+                {
+                    queueItem.Status = DownloadItemStatus.Paused;
+                }
+                else switch (vortexQueueItem.State)
+                {
+                    case NzbVortexStateType.Waiting:
+                        queueItem.Status = DownloadItemStatus.Queued;
+                        break;
+                    case NzbVortexStateType.Done:
+                        queueItem.Status = DownloadItemStatus.Completed;
+                        break;
+                    case NzbVortexStateType.UncompressFailed:
+                    case NzbVortexStateType.CheckFailedDataCorrupt:
+                    case NzbVortexStateType.BadlyEncoded:
+                        queueItem.Status = DownloadItemStatus.Failed;
+                        break;
+                    default:
+                        queueItem.Status = DownloadItemStatus.Downloading;
+                        break;
+                }
+
+                queueItem.OutputPath = GetOutputPath(vortexQueueItem, queueItem);
+
+                if (vortexQueueItem.State == NzbVortexStateType.PasswordRequest)
+                {
+                    queueItem.IsEncrypted = true;
+                }
+
+                if (queueItem.Status == DownloadItemStatus.Completed)
+                {
+                    queueItem.RemainingTime = TimeSpan.Zero;
+                }
+
+                queueItems.Add(queueItem);
+            }
+
+            return queueItems;
+        }
+
+        public override void RemoveItem(string downloadId, bool deleteData)
+        {
+            // Try to find the download by numerical ID, otherwise try by AddUUID
+            int id;
+
+            if (int.TryParse(downloadId, out id))
+            {
+                _proxy.Remove(id, deleteData, Settings);
+            }
+
+            else
+            {
+                var queue = _proxy.GetQueue(30, Settings);
+                var queueItem = queue.Items.FirstOrDefault(c => c.AddUUID == downloadId);
+
+                if (queueItem != null)
+                {
+                    _proxy.Remove(queueItem.Id, deleteData, Settings);
+                }
+            }            
+        }
+
+        protected List<NzbVortexGroup> GetGroups()
+        {
+            return _proxy.GetGroups(Settings);
+        }
+
+        public override DownloadClientStatus GetStatus()
+        {
+            var status = new DownloadClientStatus
+            {
+                IsLocalhost = Settings.Host == "127.0.0.1" || Settings.Host == "localhost"
+            };
+
+            return status;
+        }
+
+        protected override void Test(List<ValidationFailure> failures)
+        {
+            failures.AddIfNotNull(TestConnection());
+            failures.AddIfNotNull(TestApiVersion());
+            failures.AddIfNotNull(TestAuthentication());
+            failures.AddIfNotNull(TestCategory());
+        }
+
+        private ValidationFailure TestConnection()
+        {
+            try
+            {
+                _proxy.GetVersion(Settings);
+            }
+            catch (Exception ex)
+            {
+                _logger.ErrorException(ex.Message, ex);
+                return new ValidationFailure("Host", "Unable to connect to NZBVortex");
+            }
+
+            return null;
+        }
+
+        private ValidationFailure TestApiVersion()
+        {
+            try
+            {
+                var response = _proxy.GetApiVersion(Settings);
+                var version = new Version(response.ApiLevel);
+
+                if (version.Major < 2 || (version.Major == 2 && version.Minor < 3))
+                {
+                    return new ValidationFailure("Host", "NZBVortex needs to be updated");
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.ErrorException(ex.Message, ex);
+                return new ValidationFailure("Host", "Unable to connect to NZBVortex");
+            }
+
+            return null;
+        }
+
+        private ValidationFailure TestAuthentication()
+        {
+            try
+            {
+                _proxy.GetQueue(1, Settings);
+            }
+            catch (NzbVortexAuthenticationException ex)
+            {
+                return new ValidationFailure("ApiKey", "API Key Incorrect");
+            }
+
+            return null;
+        }
+
+        private ValidationFailure TestCategory()
+        {
+            var group = GetGroups().FirstOrDefault(c => c.GroupName == Settings.TvCategory);
+
+            if (group == null)
+            {
+                if (Settings.TvCategory.IsNotNullOrWhiteSpace())
+                {
+                    return new NzbDroneValidationFailure("TvCategory", "Group does not exist")
+                    {
+                        DetailedDescription = "The Group you entered doesn't exist in NzbVortex. Go to NzbVortex to create it."
+                    };
+                }
+            }
+
+            return null;
+        }
+
+        private OsPath GetOutputPath(NzbVortexQueueItem vortexQueueItem, DownloadClientItem queueItem)
+        {
+            var outputPath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(vortexQueueItem.DestinationPath));
+
+            if (outputPath.FileName == vortexQueueItem.UiTitle)
+            {
+                return outputPath;
+            }
+
+            // If the release isn't done yet, skip the files check and return null
+            if (vortexQueueItem.State != NzbVortexStateType.Done)
+            {
+                return new OsPath(null);
+            }
+
+            var filesResponse = _proxy.GetFiles(vortexQueueItem.Id, Settings);
+
+            if (filesResponse.Files.Count > 1)
+            {
+                var message = string.Format("Download contains multiple files and is not in a job folder: {0}", outputPath);
+
+                queueItem.Status = DownloadItemStatus.Warning;
+                queueItem.Message = message;
+
+                _logger.Debug(message);
+            }
+
+            return new OsPath(Path.Combine(outputPath.FullPath, filesResponse.Files.First().FileName));
+        }
+    }
+}
--- a/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexAuthenticationException.cs
+++ b/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexAuthenticationException.cs
@@ -0,0 +1,23 @@
+using System;
+
+namespace NzbDrone.Core.Download.Clients.NzbVortex
+{
+    class NzbVortexAuthenticationException : DownloadClientException
+    {
+        public NzbVortexAuthenticationException(string message, params object[] args) : base(message, args)
+        {
+        }
+
+        public NzbVortexAuthenticationException(string message) : base(message)
+        {
+        }
+
+        public NzbVortexAuthenticationException(string message, Exception innerException, params object[] args) : base(message, innerException, args)
+        {
+        }
+
+        public NzbVortexAuthenticationException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+    }
+}
--- a/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexFile.cs
+++ b/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexFile.cs
@@ -0,0 +1,16 @@
+namespace NzbDrone.Core.Download.Clients.NzbVortex
+{
+    public class NzbVortexFile
+    {
+        public int Id { get; set; }
+        public string FileName { get; set; }
+        public NzbVortexStateType State { get; set; }
+        public long DileSize { get; set; }
+        public long DownloadedSize { get; set; }
+        public long TotalDownloadedSize { get; set; }
+        public bool ExtractPasswordRequired { get; set; }
+        public string ExtractPassword { get; set; }
+        public long PostDate { get; set; }
+        public bool Crc32CheckFailed { get; set; }
+    }
+}
--- a/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexFiles.cs
+++ b/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexFiles.cs
@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace NzbDrone.Core.Download.Clients.NzbVortex
+{
+    public class NzbVortexFiles
+    {
+        public List<NzbVortexFile> Files { get; set; }
+    }
+}
--- a/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexGroup.cs
+++ b/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexGroup.cs
@@ -0,0 +1,7 @@
+namespace NzbDrone.Core.Download.Clients.NzbVortex
+{
+    public class NzbVortexGroup
+    {
+        public string GroupName { get; set; }
+    }
+}
--- a/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexJsonError.cs
+++ b/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexJsonError.cs
@@ -0,0 +1,19 @@
+using System;
+
+namespace NzbDrone.Core.Download.Clients.NzbVortex
+{
+    public class NzbVortexJsonError
+    {
+        public string Status { get; set; }
+        public string Error { get; set; }
+
+        public bool Failed
+        {
+            get
+            {
+                return !string.IsNullOrWhiteSpace(Status) &&
+                       Status.Equals("false", StringComparison.InvariantCultureIgnoreCase);
+            }
+        }
+    }
+}
--- a/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexLoginResultType.cs
+++ b/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexLoginResultType.cs
@@ -0,0 +1,8 @@
+namespace NzbDrone.Core.Download.Clients.NzbVortex
+{
+    public enum NzbVortexLoginResultType
+    {
+        Successful,
+        Failed
+    }
+}
--- a/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexNotLoggedInException.cs
+++ b/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexNotLoggedInException.cs
@@ -0,0 +1,27 @@
+using System;
+
+namespace NzbDrone.Core.Download.Clients.NzbVortex
+{
+    class NzbVortexNotLoggedInException : DownloadClientException
+    {
+        public NzbVortexNotLoggedInException() : this("Authentication is required")
+        {
+        }
+
+        public NzbVortexNotLoggedInException(string message, params object[] args) : base(message, args)
+        {
+        }
+
+        public NzbVortexNotLoggedInException(string message) : base(message)
+        {
+        }
+
+        public NzbVortexNotLoggedInException(string message, Exception innerException, params object[] args) : base(message, innerException, args)
+        {
+        }
+
+        public NzbVortexNotLoggedInException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+    }
+}
--- a/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexPriority.cs
+++ b/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexPriority.cs
@@ -0,0 +1,9 @@
+namespace NzbDrone.Core.Download.Clients.NzbVortex
+{
+    public enum NzbVortexPriority
+    {
+        Low = -1,
+        Normal = 0,
+        High = 1,
+    }
+}
--- a/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexProxy.cs
+++ b/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexProxy.cs
@@ -0,0 +1,235 @@
+using System;
+using System.CodeDom;
+using System.Collections.Generic;
+using System.Security.Cryptography;
+using Newtonsoft.Json.Linq;
+using NLog;
+using NzbDrone.Common.Cache;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Common.Serializer;
+using NzbDrone.Core.Rest;
+using NzbDrone.Core.Download.Clients.NzbVortex.Responses;
+using RestSharp;
+
+namespace NzbDrone.Core.Download.Clients.NzbVortex
+{
+    public interface INzbVortexProxy
+    {
+        string DownloadNzb(byte[] nzbData, string filename, int priority, NzbVortexSettings settings);
+        void Remove(int id, bool deleteData, NzbVortexSettings settings);
+        NzbVortexVersionResponse GetVersion(NzbVortexSettings settings);
+        NzbVortexApiVersionResponse GetApiVersion(NzbVortexSettings settings);
+        List<NzbVortexGroup> GetGroups(NzbVortexSettings settings);
+        NzbVortexQueue GetQueue(int doneLimit, NzbVortexSettings settings);
+        NzbVortexFiles GetFiles(int id, NzbVortexSettings settings);
+    }
+
+    public class NzbVortexProxy : INzbVortexProxy
+    {
+        private readonly ICached<string> _authCache;
+        private readonly Logger _logger;
+
+        public NzbVortexProxy(ICacheManager cacheManager, Logger logger)
+        {
+            _authCache = cacheManager.GetCache<string>(GetType(), "authCache");
+            _logger = logger;
+        }
+
+        public string DownloadNzb(byte[] nzbData, string filename, int priority, NzbVortexSettings settings)
+        {
+            var request = BuildRequest("nzb/add", Method.POST, true, settings);
+
+            request.AddFile("name", nzbData, filename, "application/x-nzb");
+            request.AddQueryParameter("priority", priority.ToString());
+
+            if (settings.TvCategory.IsNotNullOrWhiteSpace())
+            {
+                request.AddQueryParameter("groupname", settings.TvCategory);                
+            }
+
+            var response = ProcessRequest<NzbVortexAddResponse>(request, settings);
+
+            return response.Id;
+        }
+
+        public void Remove(int id, bool deleteData, NzbVortexSettings settings)
+        {
+            var request = BuildRequest(string.Format("nzb/{0}/cancel", id), Method.GET, true, settings);
+
+            if (deleteData)
+            {
+                request.Resource += "Delete";
+            }
+
+            ProcessRequest(request, settings);
+        }
+
+        public NzbVortexVersionResponse GetVersion(NzbVortexSettings settings)
+        {
+            var request = BuildRequest("app/appversion", Method.GET, false, settings);
+            var response = ProcessRequest<NzbVortexVersionResponse>(request, settings);
+
+            return response;
+        }
+
+        public NzbVortexApiVersionResponse GetApiVersion(NzbVortexSettings settings)
+        {
+            var request = BuildRequest("app/apilevel", Method.GET, false, settings);
+            var response = ProcessRequest<NzbVortexApiVersionResponse>(request, settings);
+
+            return response;
+        }
+
+        public List<NzbVortexGroup> GetGroups(NzbVortexSettings settings)
+        {
+            var request = BuildRequest("group", Method.GET, true, settings);
+            var response = ProcessRequest<NzbVortexGroupResponse>(request, settings);
+
+            return response.Groups;
+        }
+
+        public NzbVortexQueue GetQueue(int doneLimit, NzbVortexSettings settings)
+        {
+            var request = BuildRequest("nzb", Method.GET, true, settings);
+
+            if (settings.TvCategory.IsNotNullOrWhiteSpace())
+            {
+                request.AddQueryParameter("groupName", settings.TvCategory);
+            }
+
+            request.AddQueryParameter("limitDone", doneLimit.ToString());
+
+            var response = ProcessRequest<NzbVortexQueue>(request, settings);
+
+            return response;
+        }
+
+        public NzbVortexFiles GetFiles(int id, NzbVortexSettings settings)
+        {
+            var request = BuildRequest(string.Format("file/{0}", id), Method.GET, true, settings);
+            var response = ProcessRequest<NzbVortexFiles>(request, settings);
+
+            return response;
+        }
+
+        private string GetSessionId(bool force, NzbVortexSettings settings)
+        {
+            var authCacheKey = string.Format("{0}_{1}_{2}", settings.Host, settings.Port, settings.ApiKey);
+
+            if (force)
+            {
+                _authCache.Remove(authCacheKey);
+            }
+
+            var sessionId = _authCache.Get(authCacheKey, () => Authenticate(settings));
+
+            return sessionId;
+        }
+
+        private string Authenticate(NzbVortexSettings settings)
+        {
+            var nonce = GetNonce(settings);
+            var cnonce = Guid.NewGuid().ToString();
+            var hashString = string.Format("{0}:{1}:{2}", nonce, cnonce, settings.ApiKey);
+            var sha256 = hashString.SHA256Hash();
+            var base64 = Convert.ToBase64String(sha256.HexToByteArray());
+            var request = BuildRequest("auth/login", Method.GET, false, settings);
+
+            request.AddQueryParameter("nonce", nonce);
+            request.AddQueryParameter("cnonce", cnonce);
+            request.AddQueryParameter("hash", base64);
+
+            var response = ProcessRequest(request, settings);
+            var result = Json.Deserialize<NzbVortexAuthResponse>(response);
+
+            if (result.LoginResult == NzbVortexLoginResultType.Failed)
+            {
+                throw new NzbVortexAuthenticationException("Authentication failed, check your API Key");
+            }
+
+            return result.SessionId;
+        }
+
+        private string GetNonce(NzbVortexSettings settings)
+        {
+            var request = BuildRequest("auth/nonce", Method.GET, false, settings);
+            
+            return ProcessRequest<NzbVortexAuthNonceResponse>(request, settings).AuthNonce;
+        }
+
+        private IRestClient BuildClient(NzbVortexSettings settings)
+        {
+            var url = string.Format(@"https://{0}:{1}/api", settings.Host, settings.Port);
+
+            return RestClientFactory.BuildClient(url);
+        }
+
+        private IRestRequest BuildRequest(string resource, Method method, bool requiresAuthentication, NzbVortexSettings settings)
+        {
+            var request = new RestRequest(resource, method);
+
+            if (requiresAuthentication)
+            {
+                request.AddQueryParameter("sessionid", GetSessionId(false, settings));
+            }
+
+            return request;
+        }
+
+        private T ProcessRequest<T>(IRestRequest request, NzbVortexSettings settings) where T : new()
+        {
+            return Json.Deserialize<T>(ProcessRequest(request, settings));
+        }
+
+        private string ProcessRequest(IRestRequest request, NzbVortexSettings settings)
+        {
+            var client = BuildClient(settings);
+
+            try
+            {
+                return ProcessRequest(client, request).Content;
+            }
+            catch (NzbVortexNotLoggedInException ex)
+            {
+                _logger.Warn("Not logged in response received, reauthenticating and retrying");
+                request.AddQueryParameter("sessionid", GetSessionId(true, settings));
+
+                return ProcessRequest(client, request).Content;
+            }
+        }
+
+        private IRestResponse ProcessRequest(IRestClient client, IRestRequest request)
+        {
+            _logger.Debug("URL: {0}/{1}", client.BaseUrl, request.Resource);
+            var response = client.Execute(request);
+
+            _logger.Trace("Response: {0}", response.Content);
+            CheckForError(response);
+
+            return response;
+        }
+
+        private void CheckForError(IRestResponse response)
+        {
+            if (response.ResponseStatus != ResponseStatus.Completed)
+            {
+                throw new DownloadClientException("Unable to connect to NZBVortex, please check your settings", response.ErrorException);
+            }
+
+            NzbVortexResponseBase result;
+
+            if (Json.TryDeserialize<NzbVortexResponseBase>(response.Content, out result))
+            {
+                if (result.Result == NzbVortexResultType.NotLoggedIn)
+                {
+                    throw new NzbVortexNotLoggedInException();
+                }
+            }
+
+            else
+            {
+                throw new DownloadClientException("Response could not be processed: {0}", response.Content);
+            }
+        }
+    }
+}
--- a/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexQueue.cs
+++ b/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexQueue.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace NzbDrone.Core.Download.Clients.NzbVortex
+{
+    public class NzbVortexQueue
+    {
+        [JsonProperty(PropertyName = "nzbs")]
+        public List<NzbVortexQueueItem> Items { get; set; }
+    }
+}
--- a/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexQueueItem.cs
+++ b/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexQueueItem.cs
@@ -0,0 +1,23 @@
+namespace NzbDrone.Core.Download.Clients.NzbVortex
+{
+    public class NzbVortexQueueItem
+    {
+        public int Id { get; set; }
+        public string UiTitle { get; set; }
+        public string DestinationPath { get; set; }
+        public string NzbFilename { get; set; }
+        public bool IsPaused { get; set; }
+        public NzbVortexStateType State { get; set; }
+        public string StatusText { get; set; }
+        public int TransferedSpeed { get; set; }
+        public double Progress { get; set; }
+        public long DownloadedSize { get; set; }
+        public long TotalDownloadSize { get; set; }
+        public long PostDate { get; set; }
+        public int TotalArticleCount { get; set; }
+        public int FailedArticleCount { get; set; }
+        public string GroupUUID { get; set; }
+        public string AddUUID { get; set; }
+        public string GroupName { get; set; }
+    }
+}
--- a/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexResultType.cs
+++ b/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexResultType.cs
@@ -0,0 +1,9 @@
+namespace NzbDrone.Core.Download.Clients.NzbVortex
+{
+    public enum NzbVortexResultType
+    {
+        Ok,
+        NotLoggedIn,
+        UnknownCommand
+    }
+}
--- a/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexSettings.cs
+++ b/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexSettings.cs
@@ -0,0 +1,60 @@
+using FluentValidation;
+using NzbDrone.Core.Annotations;
+using NzbDrone.Core.ThingiProvider;
+using NzbDrone.Core.Validation;
+
+namespace NzbDrone.Core.Download.Clients.NzbVortex
+{
+    public class NzbVortexSettingsValidator : AbstractValidator<NzbVortexSettings>
+    {
+        public NzbVortexSettingsValidator()
+        {
+            RuleFor(c => c.Host).ValidHost();
+            RuleFor(c => c.Port).GreaterThan(0);
+
+            RuleFor(c => c.ApiKey).NotEmpty()
+                                  .WithMessage("API Key is required");
+
+            RuleFor(c => c.TvCategory).NotEmpty()
+                                      .WithMessage("A category is recommended")
+                                      .AsWarning();
+        }
+    }
+
+    public class NzbVortexSettings : IProviderConfig
+    {
+        private static readonly NzbVortexSettingsValidator Validator = new NzbVortexSettingsValidator();
+
+        public NzbVortexSettings()
+        {
+            Host = "localhost";
+            Port = 4321;
+            TvCategory = "TV Shows";
+            RecentTvPriority = (int)NzbVortexPriority.Normal;
+            OlderTvPriority = (int)NzbVortexPriority.Normal;
+        }
+
+        [FieldDefinition(0, Label = "Host", Type = FieldType.Textbox)]
+        public string Host { get; set; }
+
+        [FieldDefinition(1, Label = "Port", Type = FieldType.Textbox)]
+        public int Port { get; set; }
+
+        [FieldDefinition(2, Label = "API Key", Type = FieldType.Textbox)]
+        public string ApiKey { get; set; }
+
+        [FieldDefinition(3, Label = "Group", Type = FieldType.Textbox, HelpText = "Adding a category specific to Sonarr avoids conflicts with unrelated downloads, but it's optional")]
+        public string TvCategory { get; set; }
+
+        [FieldDefinition(4, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(NzbVortexPriority), HelpText = "Priority to use when grabbing episodes that aired within the last 14 days")]
+        public int RecentTvPriority { get; set; }
+
+        [FieldDefinition(5, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(NzbVortexPriority), HelpText = "Priority to use when grabbing episodes that aired over 14 days ago")]
+        public int OlderTvPriority { get; set; }
+
+        public NzbDroneValidationResult Validate()
+        {
+            return new NzbDroneValidationResult(Validator.Validate(this));
+        }
+    }
+}
--- a/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexStateType.cs
+++ b/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexStateType.cs
@@ -0,0 +1,31 @@
+namespace NzbDrone.Core.Download.Clients.NzbVortex
+{
+    public enum NzbVortexStateType
+    {
+        Waiting = 0,
+        Downloading = 1,
+        WaitingForSave = 2,
+        Saving = 3,
+        Saved = 4,
+        PasswordRequest = 5,
+        QuaedForProcessing = 6,
+        UserWaitForProcessing = 7,
+        Checking = 8,
+        Repairing = 9,
+        Joining = 10,
+        WaitForFurtherProcessing = 11,
+        Joining2 = 12,
+        WaitForUncompress = 13,
+        Uncompressing = 14,
+        WaitForCleanup = 15,
+        CleaningUp = 16,
+        CleanedUp = 17,
+        MovingToCompleted = 18,
+        MoveCompleted = 19,
+        Done = 20,
+        UncompressFailed = 21,
+        CheckFailedDataCorrupt = 22,
+        MoveFailed = 23,
+        BadlyEncoded = 24
+    }
+}
--- a/src/NzbDrone.Core/Download/Clients/NzbVortex/Responses/NzbVortexAddResponse.cs
+++ b/src/NzbDrone.Core/Download/Clients/NzbVortex/Responses/NzbVortexAddResponse.cs
@@ -0,0 +1,10 @@
+using Newtonsoft.Json;
+
+namespace NzbDrone.Core.Download.Clients.NzbVortex.Responses
+{
+    public class NzbVortexAddResponse : NzbVortexResponseBase
+    {
+        [JsonProperty(PropertyName = "add_uuid")]
+        public string Id { get; set; }
+    }
+}
--- a/src/NzbDrone.Core/Download/Clients/NzbVortex/Responses/NzbVortexApiVersionResponse.cs
+++ b/src/NzbDrone.Core/Download/Clients/NzbVortex/Responses/NzbVortexApiVersionResponse.cs
@@ -0,0 +1,7 @@
+namespace NzbDrone.Core.Download.Clients.NzbVortex.Responses
+{
+    public class NzbVortexApiVersionResponse : NzbVortexResponseBase
+    {
+        public string ApiLevel { get; set; }
+    }
+}
--- a/src/NzbDrone.Core/Download/Clients/NzbVortex/Responses/NzbVortexAuthNonceResponse.cs
+++ b/src/NzbDrone.Core/Download/Clients/NzbVortex/Responses/NzbVortexAuthNonceResponse.cs
@@ -0,0 +1,7 @@
+namespace NzbDrone.Core.Download.Clients.NzbVortex.Responses
+{
+    public class NzbVortexAuthNonceResponse
+    {
+        public string AuthNonce { get; set; }
+    }
+}
--- a/src/NzbDrone.Core/Download/Clients/NzbVortex/Responses/NzbVortexAuthResponse.cs
+++ b/src/NzbDrone.Core/Download/Clients/NzbVortex/Responses/NzbVortexAuthResponse.cs
@@ -0,0 +1,13 @@
+using Newtonsoft.Json;
+using NzbDrone.Core.Download.Clients.NzbVortex.JsonConverters;
+
+namespace NzbDrone.Core.Download.Clients.NzbVortex.Responses
+{
+    public class NzbVortexAuthResponse : NzbVortexResponseBase
+    {
+        [JsonConverter(typeof(NzbVortexLoginResultTypeConverter))]
+        public NzbVortexLoginResultType LoginResult { get; set; }
+
+        public string SessionId { get; set; }
+    }
+}
--- a/src/NzbDrone.Core/Download/Clients/NzbVortex/Responses/NzbVortexGroupResponse.cs
+++ b/src/NzbDrone.Core/Download/Clients/NzbVortex/Responses/NzbVortexGroupResponse.cs
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace NzbDrone.Core.Download.Clients.NzbVortex.Responses
+{
+    public class NzbVortexGroupResponse : NzbVortexResponseBase
+    {
+        public List<NzbVortexGroup> Groups { get; set; }
+    }
+}
--- a/src/NzbDrone.Core/Download/Clients/NzbVortex/Responses/NzbVortexResponseBase.cs
+++ b/src/NzbDrone.Core/Download/Clients/NzbVortex/Responses/NzbVortexResponseBase.cs
@@ -0,0 +1,11 @@
+using Newtonsoft.Json;
+using NzbDrone.Core.Download.Clients.NzbVortex.JsonConverters;
+
+namespace NzbDrone.Core.Download.Clients.NzbVortex.Responses
+{
+    public class NzbVortexResponseBase
+    {
+        [JsonConverter(typeof(NzbVortexResultTypeConverter))]
+        public NzbVortexResultType Result { get; set; }
+    }
+}
--- a/src/NzbDrone.Core/Download/Clients/NzbVortex/Responses/NzbVortexRetryResponse.cs
+++ b/src/NzbDrone.Core/Download/Clients/NzbVortex/Responses/NzbVortexRetryResponse.cs
@@ -0,0 +1,12 @@
+using Newtonsoft.Json;
+
+namespace NzbDrone.Core.Download.Clients.NzbVortex.Responses
+{
+    public class NzbVortexRetryResponse
+    {
+        public bool Status { get; set; }
+
+        [JsonProperty(PropertyName = "nzo_id")]
+        public string Id { get; set; }
+    }
+}
--- a/src/NzbDrone.Core/Download/Clients/NzbVortex/Responses/NzbVortexVersionResponse.cs
+++ b/src/NzbDrone.Core/Download/Clients/NzbVortex/Responses/NzbVortexVersionResponse.cs
@@ -0,0 +1,7 @@
+namespace NzbDrone.Core.Download.Clients.NzbVortex.Responses
+{
+    public class NzbVortexVersionResponse : NzbVortexResponseBase
+    {
+        public string Version { get; set; }
+    }
+}
--- a/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs
+++ b/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs
@@ -103,7 +103,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd

            try
            {
-                sabHistory = _proxy.GetHistory(0, _configService.DownloadClientHistoryLimit, Settings);
+                sabHistory = _proxy.GetHistory(0, _configService.DownloadClientHistoryLimit, Settings.TvCategory, Settings);
            }
            catch (DownloadClientException ex)
            {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Taloth Saldono	a19776553e	WIP: Statistics API endpoint.	2016-01-31 15:33:13 +01:00
Taloth Saldono	c20e0667d4	Added additional tier to search for daily series type on BTN to find faux-daily series with SxxExx groups instead of date groups. fixes #1111	2016-01-30 21:16:45 +01:00
Mark McDowall	4771b1c1b2	New: Parsing of XofY mini series format Closes #1091	2016-01-30 11:16:59 -08:00
Mark McDowall	8e07a39ec0	Merge pull request #1095 from ta264/fix-build-sh xbuild doesn't support /m parameter	2016-01-28 14:52:19 -08:00
Mark McDowall	9895b5bc1d	Merge pull request #1100 from IvanBrazza/develop Pushbullet: Source device support	2016-01-28 14:49:47 -08:00
Mark McDowall	e89a1bc0fb	Fixed: Delete confirmation message for Restriction Closes #1102	2016-01-28 14:04:10 -08:00
Ivan Brazza	9b0654c7f2	New: Setting Pushbullet source device	2016-01-28 21:33:11 +00:00
Mark McDowall	56da824e98	AutoComplete and file browser will show files when appropriate Fixed: File browser for Custom Script shows files Closes #1084	2016-01-27 19:24:41 -08:00
ta264	f84b7904e6	Fix: xbuild doesn't support /m parameter	2016-01-27 14:11:29 +00:00
Mark McDowall	9f523bb167	New: Prevent automatic update if UI folder is not writable	2016-01-24 19:22:07 -08:00
Taloth Saldono	f38d5de946	Fixed: Regression in parser incorrectly parsing S2015Exx.2015-01-01 notation. fixes #1080	2016-01-21 22:43:48 +01:00
Taloth Saldono	de379b2e47	Do or do not, there is no try.	2016-01-21 21:10:22 +01:00
Taloth Saldono	64e90f35c8	Ensure rTorrent download is started even if the user doesn't have schedule=...,start_tied= in their rtorrent.rc.	2016-01-21 08:40:10 +01:00
Taloth Saldono	bbfe8c27c6	Fixed: Misleading error message when Kickass/Torrent Rss indexer returned invalid xml. fixes #1058	2016-01-20 21:58:23 +01:00
Taloth Saldono	2f50074123	Fixed: Incorrect api error when calling /api/episode without seriesId queryparam. fixes #1070	2016-01-20 21:58:02 +01:00
Taloth Saldono	5cfaed7b26	Fixed: Added support for Sabnzbd 0.8 history category queryparam. fixes #1077	2016-01-20 21:57:40 +01:00
Taloth Saldono	0d19f645e8	Fixed: Don't apply indexer backoff on DNS and connection issues. Fixes #751	2016-01-20 21:57:39 +01:00
Taloth Saldono	45d4371328	Fixed: Additional log cleanse Regex to keep even more sensitive information out of the logs. fixes #1051	2016-01-20 21:57:10 +01:00
Taloth Saldono	889933cb41	New: Set full Download Directory in Transmission instead of just a Category. fixes #744	2016-01-20 21:26:59 +01:00
Taloth Saldono	958b294152	Updated URL rewriter to handle torcache Referer weirdness.	2016-01-20 21:26:58 +01:00
Taloth Saldono	cf25097cd1	Fixed: Magnet downloads weren't being started on RTorrent.	2016-01-20 21:26:57 +01:00
Taloth Saldono	902e0dd5d6	Updated SharpZipLib to include patches made since the last official release.	2016-01-20 21:16:02 +01:00
Keivan Beigi	d943551a7f	fixed build.sh	2016-01-16 16:39:45 -08:00
Keivan Beigi	46304b8a71	use build config to exclude xml doc rather than deleting them later	2016-01-16 16:36:40 -08:00
Keivan Beigi	6e2fc186ca	added nuget.exe to tools	2016-01-16 16:19:28 -08:00
Keivan Beigi	845689401d	removed msbuild integerated nuget restore	2016-01-16 16:17:36 -08:00
Keivan Beigi	4fb9cc5e8d	cleanup app.manifest for Service helpers, upgraded compat to windows 8.1	2016-01-16 15:52:00 -08:00
Keivan Beigi	487581a01a	apparently new compilers alraedy embed the app.manifest into the app, no need for mt.exe anymore	2016-01-16 15:51:26 -08:00
Keivan Beigi	2bc771d91e	Merge pull request #1066 from pra85/2016 Update year range to 2016	2016-01-16 00:37:43 -08:00
Keivan Beigi	8bd7969328	cleanup	2016-01-16 00:36:43 -08:00
Keivan Beigi	5876ab487c	fixed gulp build	2016-01-15 22:13:00 -08:00
Keivan Beigi	9c14ca0f39	Replaced build.ps1 with warning	2016-01-15 22:06:33 -08:00
Keivan Beigi	81ca352b2f	smarted mdb generation	2016-01-15 21:50:09 -08:00
Keivan Beigi	0edfed5b95	upgraded pdb2mdb.exe to mono 4.2 Stable (4.2.1.102)	2016-01-15 21:50:09 -08:00
Prayag Verma	0ff053415c	Update year range to 2016	2016-01-16 09:40:24 +05:30
Mark McDowall	a0ee607ae6	Remove double slash in NZBVortex add URL	2016-01-15 09:04:18 -08:00
Keivan Beigi	2723e2a7b8	faster test packaging in build.sh	2016-01-15 00:27:59 -08:00
Keivan Beigi	6e105ce2c6	upgraded nuget packages	2016-01-14 23:07:39 -08:00
Keivan Beigi	9fc7fceda4	updated npm packages	2016-01-14 18:56:14 -08:00
Mark McDowall	2b72c0e328	Fixed: Manual Import Series selection Closes #996	2016-01-09 13:16:34 -08:00
Mark McDowall	536aa350f0	Merge pull request #960 from Sonarr/nzb-vortex NZBVortex Download Client	2016-01-07 15:53:57 -08:00
Mark McDowall	7c382c0e0c	NZBVortex Download Client New: NZBVortex Download Client Closes #360	2016-01-07 15:50:52 -08:00
Mark McDowall	dda0d3259f	Fixed broken test	2016-01-07 15:49:51 -08:00
Mark McDowall	a96718f7b3	Fixed Twitter notifications New: Twitter notifications now require a Twitter (see settings for details) Closes #1049	2016-01-06 22:32:12 -08:00
Mark McDowall	7ca67fe57a	New: Special searching on RARBG	2016-01-05 23:07:49 -08:00
Mark McDowall	8373024f9d	Fixed: Parsing of queued specials from download client queue	2016-01-05 22:56:34 -08:00
Mark McDowall	b62ef0c40c	Fixed: Use folder quality when better than file quality (regression) Closes #1022	2016-01-04 23:12:14 -08:00
Mark McDowall	376481eda5	Merge pull request #981 from Sonarr/ical-parameters iCal parameters	2016-01-02 10:31:12 -08:00
Mark McDowall	800fa42982	Selectable range for iCal New: Support for pastDays and fututeDays query parameters on iCal requests Closes #974	2016-01-02 10:21:06 -08:00
Taloth Saldono	4e728c3a02	Increased timeout for Deluge to prevent timeout errors when posting large torrent files.	2015-12-30 22:50:17 +01:00
Taloth Saldono	663d254ced	Fixed Ospath incorrectly detecting arbitrary colon as windows path.	2015-12-30 21:01:29 +01:00
vawen	8753c232c7	Fix: Paths with colons prevent Sonarr from communicating with Transmission Issue #954	2015-12-29 13:25:36 +01:00
Taloth Saldono	221f3ef08c	Safety net to handle MaxSize=0. Some users still have 0 = unlimited in their db and migration failed for them.	2015-12-28 20:24:24 +01:00
Taloth Saldono	b59175a87c	Fixed: Indexer sites returning date as Retry-After header. fixes #994	2015-12-28 20:24:23 +01:00
Taloth Saldono	37c621dcdb	Fixed: Health Check produced warning if Sonarr binaries folder was not writable even when the external script update mechanism was selected. fixes #964	2015-12-28 20:24:22 +01:00
Taloth Saldono	eaf3228bb7	Fixed Regex mistake in CleanLogMessage.	2015-12-28 20:24:21 +01:00
Jake Pusateri	c8debbf470	New: Better resolution posters on retina screens.	2015-12-28 11:12:12 -08:00
Mark McDowall	8dcd8d17b5	Fixed: Username must not be null or empty when logging in	2015-12-27 00:59:28 -08:00
Mark McDowall	cfe121c777	Don't return series as subtype for /api/episode Fixed: Sped up loading episodes from server	2015-12-27 00:45:20 -08:00
Mark McDowall	b4f83d8a4e	New: Media file extension .webm	2015-12-25 18:35:42 -08:00
Mark McDowall	9039d7e694	Fixed: Show a better error message when no episodes are parsed in a release	2015-12-25 18:32:03 -08:00
Taloth Saldono	7a25717da6	Fixed donate button.	2015-12-24 19:51:36 +01:00
Taloth Saldono	7e1c444c02	Fixed: Curl Fallback should ignore invalid cookies.	2015-12-24 19:30:16 +01:00
Mark McDowall	dc3f7c9bda	Fixed: Improved parsing for single digit multi-episode titles Closes #965	2015-12-20 00:11:41 -08:00
Mark McDowall	de754169fb	Fixed: RSS Sync Interval validation	2015-12-19 18:02:38 -08:00
Mark McDowall	2d3c3bbb0c	Changed torrent blackhole message	2015-12-19 17:49:54 -08:00
Mark McDowall	15cefe4a43	New: Option to Hardlink or Copy instead of move for Torrent Blackhole Closes #1011	2015-12-19 17:18:22 -08:00
Mark McDowall	95da301975	A few UI Fixes Closes #1009 Closes #1010	2015-12-18 23:41:30 -08:00
Mark McDowall	e03906b294	Fixed: Hardlink/Copy files from QBittorrent	2015-12-17 22:16:38 -08:00
Mark McDowall	7921dd3f96	Fixed: Removed Titans of TV tracker Closes #992	2015-12-17 00:46:02 -08:00
Mark McDowall	9f066f7a6b	New: Newznab preset for Usenet Crawler	2015-12-17 00:24:51 -08:00
Mark McDowall	81d131e732	Merge pull request #779 from cbodley/qbittorrent Download client for qBittorrent	2015-12-15 23:10:20 -08:00
Casey Bodley	0552b56b71	qbittorrent: client plugin based heavily on uTorrent supports a minimum qBittorrent version of 3.2.4, and uses labels for v3.3.0 and later Signed-off-by: Casey Bodley <cbodley@gmail.com>	2015-12-14 00:20:14 -05:00