New: Validate PMS version before performing a library update

Closes #1355

.editorconfig

@@ -0,0 +1,25 @@
+# This file is for unifying the coding style for different editors and IDEs
+# editorconfig.org
+root = true
+
+[*.{cs,html,js,hbs}]
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+
+[*.less]
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+
+# They have troubles with TABS. Use 2 spaces
+[{package.json,.travis.yml}]
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 2

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,5 @@
+
+
+
+Provide a description of the feature request or bug, the more details the better.
+Please use https://forums.sonarr.tv/ for support or other questions. (When in doubt, use the forums)

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,14 @@
+#### Database Migration
+YES | NO
+
+#### Description
+A few sentences describing the overall goals of the pull request's commits.
+
+#### Todos
+- [ ] Tests
+- [ ] Documentation
+
+
+#### Issues Fixed or Closed by this PR
+
+* 

.gitignore

@@ -41,6 +41,9 @@ src/**/[Oo]bj/
 _ReSharper*
 _dotCover*
 
+# DevExpress CodeRush
+src/.cr/
+
 # NCrunch
 *.ncrunch*
 .*crunch*.local.xml
@@ -128,3 +131,4 @@ output/*
 ._*
 
 _start
+_temp_*/**/*

.idea/encodings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>

.idea/jsLibraryMappings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="JavaScriptLibraryMappings">
-    <file url="file://$PROJECT_DIR$" libraries="{Sonarr node_modules}" />
+    <includedPredefinedLibrary name="ECMAScript 6" />
   </component>
 </project>

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # How to Contribute #
 
-We're always looking for people to help make Sonarr even better, there are a number of ways to contribute. To get started, <a href="http://www.clahub.com/agreements/NzbDrone/NzbDrone">sign the Contributor License Agreement</a>.
+We're always looking for people to help make Sonarr even better, there are a number of ways to contribute.
 
 ## Documentation ##
 Setup guides, FAQ, the more information we have on the wiki the better.
@@ -8,17 +8,19 @@ Setup guides, FAQ, the more information we have on the wiki the better.
 ## Development ##
 
 ### Tools required ###
-- Visual Studio 2013
-- HTML/Javascript editor of choice (Sublime Text/Webstorm/etc)
+- Visual Studio 2015
+- HTML/Javascript editor of choice (Sublime Text/Webstorm/Atom/etc)
 - npm (node package manager)
 - git
 
 ### Getting started ###
 
 1.  Fork Sonarr
-2.  Clone (develop branch)
+2.  Clone (develop branch) *you may need pull in submodules separately if you client doesn't clone them automatically (CurlSharp)*
 3.  Run `npm install`
-4.  Run `gulp watch` - Used to compile the UI components and copy them (leave this window open)
+4.  Run `npm start` - Used to compile the UI components and copy them.
+    Leave this window open.
+    If you have gulp globally installed you can use `gulp watch` instead
 5.  Compile in Visual Studio
 
 ### Contributing Code ###

build.ps1

@@ -1,263 +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"
-
-    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
-
-   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."

build.sh

@@ -1,15 +1,17 @@
 #! /bin/bash
-msBuild='/c/Windows/Microsoft.NET/Framework64/v4.0.30319/'
+msBuild='/c/Program Files (x86)/MSBuild/14.0/Bin'
 outputFolder='./_output'
 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()
@@ -107,19 +101,29 @@ Build()
 
 RunGulp()
 {
-    echo "##teamcity[progressStart 'Running Gulp']"
+    echo "##teamcity[progressStart 'npm install']"
+    npm-cache install npm || CheckExitCode npm install
+    echo "##teamcity[progressFinish 'npm install']"
 
-    CheckExitCode npm install
-    CheckExitCode gulp build
-
-    echo "##teamcity[progressFinish 'Running Gulp']"
+    echo "##teamcity[progressStart 'Running gulp']"
+    CheckExitCode npm run build
+    echo "##teamcity[progressFinish 'Running gulp']"
 }
 
 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.ConsoleRunner -Version 3.2.0 -Output $testPackageFolder
     else
-        mono $sourceFolder/.nuget/NuGet.exe install NUnit.Runners -Version 2.6.1 -Output $testPackageFolder
+        mono $nuget install NUnit.ConsoleRunner -Version 3.2.0 -Output $testPackageFolder
     fi
 
     cp $outputFolder/*.dll $testPackageFolder

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+
 

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())

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;

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;

integration_mono.sh

@@ -1,8 +0,0 @@
-EXCLUDE="-exclude:Windows -include:IntegrationTest"
-TESTDIR="."
-NUNIT="$TESTDIR/NUnit.Runners.2.6.1/tools/nunit-console-x86.exe"
-
-mono --debug --runtime=v4.0 $NUNIT $EXCLUDE -xml:NzbDrone.Api.Result.xml $TESTDIR/NzbDrone.Api.Test.dll
-mono --debug --runtime=v4.0 $NUNIT $EXCLUDE -xml:NzbDrone.Core.Result.xml $TESTDIR/NzbDrone.Core.Test.dll
-mono --debug --runtime=v4.0 $NUNIT $EXCLUDE -xml:NzbDrone.Integration.Result.xml $TESTDIR/NzbDrone.Integration.Test.dll
-mono --debug --runtime=v4.0 $NUNIT $EXCLUDE -xml:NzbDrone.Common.Result.xml $TESTDIR/NzbDrone.Common.Test.dll

osx/Sonarr

@@ -8,9 +8,23 @@ EXE_PATH="$DIR/NzbDrone.exe"
 APPNAME="Sonarr"
  
 #set up environment
-MONO_FRAMEWORK_PATH=/Library/Frameworks/Mono.framework/Versions/Current
-export DYLD_FALLBACK_LIBRARY_PATH="$DIR:$MONO_FRAMEWORK_PATH/lib:/lib:/usr/lib"
-export PATH="$MONO_FRAMEWORK_PATH/bin:$PATH"
+if [[ -x '/opt/local/bin/mono' ]]; then
+    export PATH="/opt/local/bin:$PATH"
+fi
+
+export DYLD_FALLBACK_LIBRARY_PATH="$DIR"
+
+if [ -e /Library/Frameworks/Mono.framework ]; then
+	MONO_FRAMEWORK_PATH=/Library/Frameworks/Mono.framework/Versions/Current
+	export PATH="$MONO_FRAMEWORK_PATH/bin:$PATH"
+	export DYLD_FALLBACK_LIBRARY_PATH="$DYLD_FALLBACK_LIBRARY_PATH:$MONO_FRAMEWORK_PATH/lib"
+fi
+
+if [[ -f '/opt/local/lib/libsqlite3.0.dylib' ]]; then
+	export DYLD_FALLBACK_LIBRARY_PATH="/opt/local/lib:$DYLD_FALLBACK_LIBRARY_PATH"
+fi
+
+export DYLD_FALLBACK_LIBRARY_PATH="$DYLD_FALLBACK_LIBRARY_PATH:$HOME/lib:/usr/local/lib:/lib:/usr/lib"
 
 #mono version check
 REQUIRED_MAJOR=3
@@ -21,6 +35,9 @@ VERSION_MSG="$APPNAME requires Mono Runtime Environment(MRE) $REQUIRED_MAJOR.$RE
 DOWNLOAD_URL="http://www.mono-project.com/download/#download-mac"
  
 MONO_VERSION="$(mono --version | grep 'Mono JIT compiler version ' |  cut -f5 -d\ )"
+# if [[ -o DEBUG ]]; then osascript -e "display dialog \"MONO_VERSION: $MONO_VERSION\""; fi
+
+
 MONO_VERSION_MAJOR="$(echo $MONO_VERSION | cut -f1 -d.)"
 MONO_VERSION_MINOR="$(echo $MONO_VERSION | cut -f2 -d.)"
 if [ -z "$MONO_VERSION" ] \

package.json

@@ -4,14 +4,15 @@
   "description": "Sonarr",
   "main": "main.js",
   "scripts": {
-    "preinstall": ""
+    "build": "gulp build",
+    "start": "gulp watch"
   },
   "repository": {
     "type": "git",
     "url": "git://github.com/Sonarr/Sonarr.git"
   },
   "author": "",
-  "license": "BSD",
+  "license": "GPL-3.0",
   "gitHead": "9ff7aa1bf7fe38c4c5bdb92f56c8ad556916ed67",
   "readmeFilename": "readme.md",
   "dependencies": {

readme.md

@@ -21,10 +21,9 @@ Sonarr is a PVR for Usenet and BitTorrent users. It can monitor multiple RSS fee
 ## Configuring Development Environment: ##
 
 ### Requirements ###
-- Visual Studio 2013 [Free Community Edition](https://www.visualstudio.com/en-us/products/visual-studio-community-vs.aspx)
+- Visual Studio 2015 [Free Community Edition](https://www.visualstudio.com/en-us/products/visual-studio-community-vs.aspx)
 - [Git](http://git-scm.com/downloads)
 - [NodeJS](http://nodejs.org/download/)
-- [Gulp](http://gulpjs.com)
 
 ### Setup ###
 
@@ -32,8 +31,7 @@ Sonarr is a PVR for Usenet and BitTorrent users. It can monitor multiple RSS fee
 - Clone the repository into your development machine. [*info*](https://help.github.com/articles/working-with-repositories)
 - Grab the submodules `git submodule init && git submodule update`
 - install the required Node Packages `npm install`
-- install gulp `npm install gulp -g`
-- start gulp to monitor your dev environment for any changes that need post processing using `gulp watch` command.
+- start gulp to monitor your dev environment for any changes that need post processing using `npm start` command.
 
 *Please note gulp must be running at all times while you are working with Sonarr client source files.*
 
@@ -45,7 +43,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 ###

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"

schemas/torznab.xsd

@@ -75,6 +75,8 @@
       <xs:enumeration value="seedtype" /> <!-- TBD, which criteria must be met. was going for 'ratio,seedtime,both' but afaik it's always 'either' -->
       <xs:enumeration value="minimumratio" />
       <xs:enumeration value="minimumseedtime" />
+      <xs:enumeration value="downloadvolumefactor" /> <!-- factor for the download volume, in most cases it should be set to 1, if a torrent is set to freeleech set it to 0, if only 50% is counted set it to 0.5 -->
+      <xs:enumeration value="uploadvolumefactor" /> <!-- factor for the upload volume, in most cases it should be set to 1, if a torrent is set to neutral leech (upload is not counted) set it to 0, if it's set to double upload set it to 2 -->
     </xs:restriction>
   </xs:simpleType>
   <xs:element name="attr">

src/.nuget/NuGet.Config

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <solution>
-    <add key="disableSourceControlIntegration" value="true" />
-  </solution>
-</configuration>

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>

src/Libraries/Manifest Tool/mt.exe.config

@@ -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>

src/LogentriesCore/AsyncLogger.cs

@@ -296,7 +296,7 @@ namespace LogentriesCore
                             WriteDebugMessages("HostName parameter is not defined - trying to get it from System.Environment.MachineName");
                             m_HostName = "HostName=" + System.Environment.MachineName + " ";
                         }
-                        catch (InvalidOperationException ex)
+                        catch (InvalidOperationException)
                         {
                             // Cannot get host name automatically, so assume that HostName is not used
                             // and log message is sent without it.

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">

src/LogentriesNLog/LogentriesNLog.csproj

@@ -51,8 +51,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="NLog">
-      <HintPath>..\packages\NLog.2.1.0\lib\net40\NLog.dll</HintPath>
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.4.3.4\lib\net40\NLog.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -79,19 +80,13 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="fastJSON\license.txt" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <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">

src/LogentriesNLog/fastJSON/JSON.cs

@@ -24,6 +24,7 @@ namespace LogentriesNLog.fastJSON
             SerializeNullValues = false;
             UseOptimizedDatasetSchema = false;
             UsingGlobalTypes = false;
+            UseUTCDateTime = true;
         }
         public bool UseOptimizedDatasetSchema = true;
         public bool UseFastGuid = true;

src/LogentriesNLog/fastJSON/JsonSerializer.cs

@@ -170,6 +170,8 @@ namespace LogentriesNLog.fastJSON
             _output.Append(dt.Minute.ToString("00", NumberFormatInfo.InvariantInfo));
             _output.Append(":");
             _output.Append(dt.Second.ToString("00", NumberFormatInfo.InvariantInfo));
+            _output.Append(".");
+            _output.Append(dt.Millisecond.ToString("000", NumberFormatInfo.InvariantInfo));
 
             if (JSON.Instance.UseUTCDateTime)
                 _output.Append("Z");

src/LogentriesNLog/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="2.1.0" targetFramework="net40" />
+  <package id="NLog" version="4.3.4" targetFramework="net40" />
 </packages>

src/Marr.Data/Mapping/FluentMappings.cs

@@ -198,7 +198,8 @@ namespace Marr.Data.Mapping
             {
                 return AutoMapPropertiesWhere(m =>
                     m.MemberType == MemberTypes.Property &&
-                    !DataHelper.IsSimpleType((m as PropertyInfo).PropertyType));
+                    !DataHelper.IsSimpleType((m as PropertyInfo).PropertyType) &&
+                    !MapRepository.Instance.TypeConverters.ContainsKey((m as PropertyInfo).PropertyType));
             }
 
             /// <summary>

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">

src/Microsoft.AspNet.SignalR.Core/Microsoft.AspNet.SignalR.Core.csproj

@@ -276,7 +276,6 @@
   <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">

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">

src/MonoTorrent/Torrent.cs

@@ -774,7 +774,8 @@ namespace MonoTorrent
                             break;
 
                         case ("nodes"):
-                            this.nodes = (BEncodedList)keypair.Value;
+                            if (keypair.Value.ToString().Length != 0)
+                                this.nodes = (BEncodedList)keypair.Value;
                             break;
 
                         case ("comment.utf-8"):

src/NzbDrone.Api.Test/MappingTests/ResourceMappingFixture.cs

@@ -1,168 +0,0 @@
-using System;
-using System.Collections.Generic;
-using FizzWare.NBuilder;
-using FluentAssertions;
-using Marr.Data;
-using NUnit.Framework;
-using NzbDrone.Api.Commands;
-using NzbDrone.Api.Config;
-using NzbDrone.Api.Episodes;
-using NzbDrone.Api.History;
-using NzbDrone.Api.Indexers;
-using NzbDrone.Api.Logs;
-using NzbDrone.Api.Mapping;
-using NzbDrone.Api.Profiles;
-using NzbDrone.Api.RootFolders;
-using NzbDrone.Api.Series;
-using NzbDrone.Core.DecisionEngine;
-using NzbDrone.Core.Instrumentation;
-using NzbDrone.Core.Messaging.Commands;
-using NzbDrone.Core.Organizer;
-using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Profiles;
-using NzbDrone.Core.Qualities;
-using NzbDrone.Core.RootFolders;
-using NzbDrone.Core.Tv;
-using NzbDrone.Core.Update.Commands;
-using NzbDrone.Test.Common;
-using System.Linq;
-
-namespace NzbDrone.Api.Test.MappingTests
-{
-    [TestFixture]
-    public class ResourceMappingFixture : TestBase
-    {
-        [TestCase(typeof(Core.Tv.Series), typeof(SeriesResource))]
-        [TestCase(typeof(Episode), typeof(EpisodeResource))]
-        [TestCase(typeof(RootFolder), typeof(RootFolderResource))]
-        [TestCase(typeof(NamingConfig), typeof(NamingConfigResource))]
-//        [TestCase(typeof(IndexerDefinition), typeof(IndexerResource))] //TODO: Ignoring because we don't have a good way to ignore properties with value injector
-        [TestCase(typeof(ReleaseInfo), typeof(ReleaseResource))]
-        [TestCase(typeof(ParsedEpisodeInfo), typeof(ReleaseResource))]
-        [TestCase(typeof(DownloadDecision), typeof(ReleaseResource))]
-        [TestCase(typeof(Core.History.History), typeof(HistoryResource))]
-        [TestCase(typeof(Profile), typeof(ProfileResource))]
-        [TestCase(typeof(ProfileQualityItem), typeof(ProfileQualityItemResource))]
-        [TestCase(typeof(Log), typeof(LogResource))]
-        [TestCase(typeof(Command), typeof(CommandResource))]
-        public void matching_fields(Type modelType, Type resourceType)
-        {
-            MappingValidation.ValidateMapping(modelType, resourceType);
-        }
-
-        [Test]
-        public void should_map_lazy_loaded_values_should_not_be_inject_if_not_loaded()
-        {
-            var modelWithLazy = new ModelWithLazy()
-                {
-                    Guid = new TestLazyLoaded<Guid>()
-                };
-
-            modelWithLazy.InjectTo<ModelWithNoLazy>().Guid.Should().BeEmpty();
-
-            modelWithLazy.Guid.IsLoaded.Should().BeFalse();
-        }
-
-        [Test]
-        public void should_map_lay_loaded_values_should_be_inject_if_loaded()
-        {
-
-            var guid = Guid.NewGuid();
-
-            var modelWithLazy = new ModelWithLazy()
-            {
-                Guid = new LazyLoaded<Guid>(guid)
-            };
-
-            modelWithLazy.InjectTo<ModelWithNoLazy>().Guid.Should().Be(guid);
-
-            modelWithLazy.Guid.IsLoaded.Should().BeTrue();
-        }
-
-        [Test]
-        public void should_be_able_to_map_lists()
-        {
-            var modelList = Builder<TestModel>.CreateListOfSize(10).Build();
-
-            var resourceList = modelList.InjectTo<List<TestResource>>();
-
-            resourceList.Should().HaveSameCount(modelList);
-        }
-
-        [Test]
-        public void should_map_wrapped_models()
-        {
-            var modelList = Builder<TestModel>.CreateListOfSize(10).Build().ToList();
-
-            var wrapper = new TestModelWrapper
-                {
-                    TestlList = modelList
-                };
-
-            wrapper.InjectTo<TestResourceWrapper>();
-        }
-
-
-        [Test]
-        public void should_map_profile()
-        {
-            var profileResource = new ProfileResource
-                {
-                    Cutoff = Quality.WEBDL1080p,
-                    Items = new List<ProfileQualityItemResource> { new ProfileQualityItemResource { Quality = Quality.WEBDL1080p, Allowed = true } }
-                };
-
-
-            profileResource.InjectTo<Profile>();
-
-        }
-        
-        [Test]
-        public void should_map_tracked_command()
-        {
-            var commandResource = new CommandModel { Body = new ApplicationUpdateCommand() };
-            commandResource.InjectTo<CommandResource>();
-        }
-    }
-
-    public class ModelWithLazy
-    {
-        public LazyLoaded<Guid> Guid { get; set; }
-    }
-
-    public class ModelWithNoLazy
-    {
-        public Guid Guid { get; set; }
-    }
-
-    public class TestLazyLoaded<T> : LazyLoaded<T>
-    {
-        public override void Prepare(Func<IDataMapper> dataMapperFactory, object parent)
-        {
-            throw new InvalidOperationException();
-        }
-    }
-
-
-    public class TestModelWrapper
-    {
-        public List<TestModel> TestlList { get; set; }
-    }
-
-    public class TestResourceWrapper
-    {
-        public List<TestResource> TestList { get; set; }
-    }
-
-    public class TestModel
-    {
-        public string Field1 { get; set; }
-        public string Field2 { get; set; }
-    }
-
-    public class TestResource
-    {
-        public string Field1 { get; set; }
-        public string Field2 { get; set; }
-    }
-}

src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj

@@ -38,17 +38,17 @@
     <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">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.2.0\lib\net40\nunit.framework.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -63,13 +63,9 @@
     <Reference Include="Moq">
       <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
     </Reference>
-    <Reference Include="Omu.ValueInjecter">
-      <HintPath>..\packages\ValueInjecter.2.3.3\lib\net35\Omu.ValueInjecter.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ClientSchemaTests\SchemaBuilderFixture.cs" />
-    <Compile Include="MappingTests\ResourceMappingFixture.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -104,7 +100,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">

src/NzbDrone.Api.Test/packages.config

@@ -1,8 +1,7 @@
 <?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" />
+  <package id="NUnit" version="3.2.0" targetFramework="net40" />
 </packages>

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)
@@ -37,7 +43,7 @@ namespace NzbDrone.Api.Authentication
                 expiry = DateTime.UtcNow.AddDays(7);
             }
 
-            return this.LoginAndRedirect(user.Identifier, expiry);
+            return this.LoginAndRedirect(user.Identifier, expiry, _configFileProvider.UrlBase + "/");
         }
 
         private Response Logout()

src/NzbDrone.Api/Authentication/EnableAuthInNancy.cs

@@ -27,6 +27,8 @@ namespace NzbDrone.Api.Authentication
             _configFileProvider = configFileProvider;
         }
 
+        public int Order { get { return 10; } }
+
         public void Register(IPipelines pipelines)
         {
             if (_configFileProvider.AuthenticationMethod == AuthenticationType.Forms)
@@ -75,7 +77,7 @@ namespace NzbDrone.Api.Authentication
             if (context.Request.IsApiRequest())
             {
                 if ((context.Response.StatusCode == HttpStatusCode.SeeOther &&
-                     context.Response.Headers["Location"].StartsWith("/login", StringComparison.InvariantCultureIgnoreCase)) ||
+                     context.Response.Headers["Location"].StartsWith($"{_configFileProvider.UrlBase}/login", StringComparison.InvariantCultureIgnoreCase)) ||
                     context.Response.StatusCode == HttpStatusCode.Unauthorized)
                 {
                     context.Response = new { Error = "Unauthorized" }.AsResponse(HttpStatusCode.Unauthorized);

src/NzbDrone.Api/Blacklist/BlacklistModule.cs

@@ -1,4 +1,5 @@
-using NzbDrone.Core.Blacklisting;
+using System;
+using NzbDrone.Core.Blacklisting;
 using NzbDrone.Core.Datastore;
 
 namespace NzbDrone.Api.Blacklist
@@ -16,15 +17,9 @@ namespace NzbDrone.Api.Blacklist
 
         private PagingResource<BlacklistResource> GetBlacklist(PagingResource<BlacklistResource> pagingResource)
         {
-            var pagingSpec = new PagingSpec<Core.Blacklisting.Blacklist>
-                                 {
-                                     Page = pagingResource.Page,
-                                     PageSize = pagingResource.PageSize,
-                                     SortKey = pagingResource.SortKey,
-                                     SortDirection = pagingResource.SortDirection
-                                 };
+            var pagingSpec = pagingResource.MapToPagingSpec<BlacklistResource, Core.Blacklisting.Blacklist>("id", SortDirection.Ascending);
 
-            return ApplyToPage(_blacklistService.Paged, pagingSpec);
+            return ApplyToPage(_blacklistService.Paged, pagingSpec, BlacklistResourceMapper.MapToResource);
         }
 
         private void DeleteBlacklist(int id)

src/NzbDrone.Api/Blacklist/BlacklistResource.cs

@@ -20,4 +20,28 @@ namespace NzbDrone.Api.Blacklist
 
         public SeriesResource Series { get; set; }
     }
+
+    public static class BlacklistResourceMapper
+    {
+        public static BlacklistResource MapToResource(this Core.Blacklisting.Blacklist model)
+        {
+            if (model == null) return null;
+
+            return new BlacklistResource
+            {
+                Id = model.Id,
+
+                SeriesId = model.SeriesId,
+                EpisodeIds = model.EpisodeIds,
+                SourceTitle = model.SourceTitle,
+                Quality = model.Quality,
+                Date = model.Date,
+                Protocol = model.Protocol,
+                Indexer = model.Indexer,
+                Message = model.Message,
+
+                Series = model.Series.ToResource()
+            };
+        }
+    }
 }

src/NzbDrone.Api/Calendar/CalendarFeedModule.cs

@@ -5,37 +5,90 @@ using System.Linq;
 using DDay.iCal;
 using NzbDrone.Core.Tv;
 using Nancy.Responses;
+using NzbDrone.Core.Tags;
+using NzbDrone.Common.Extensions;
 
 namespace NzbDrone.Api.Calendar
 {
     public class CalendarFeedModule : NzbDroneFeedModule
     {
         private readonly IEpisodeService _episodeService;
+        private readonly ITagService _tagService;
 
-        public CalendarFeedModule(IEpisodeService episodeService)
+        public CalendarFeedModule(IEpisodeService episodeService, ITagService tagService)
             : base("calendar")
         {
             _episodeService = episodeService;
+            _tagService = tagService;
 
             Get["/NzbDrone.ics"] = options => GetCalendarFeed();
         }
 
         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);
+            var unmonitored = false;
+            var premiersOnly = false;
+            var tags = new List<int>();
 
+            // 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;
+            var queryUnmonitored = Request.Query.Unmonitored;
+            var queryPremiersOnly = Request.Query.PremiersOnly;
+            var queryTags = Request.Query.Tags;
 
             if (queryStart.HasValue) start = DateTime.Parse(queryStart.Value);
             if (queryEnd.HasValue) end = DateTime.Parse(queryEnd.Value);
 
-            var episodes = _episodeService.EpisodesBetweenDates(start, end, false);
+            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);
+            }
+
+            if (queryUnmonitored.HasValue)
+            {
+                unmonitored = bool.Parse(queryUnmonitored.Value);
+            }
+
+            if (queryPremiersOnly.HasValue)
+            {
+                premiersOnly = bool.Parse(queryPremiersOnly.Value);
+            }
+
+            if (queryTags.HasValue)
+            {
+                var tagInput = (string)queryTags.Value.ToString();
+                tags.AddRange(tagInput.Split(',').Select(_tagService.GetTag).Select(t => t.Id));
+            }
+
+            var episodes = _episodeService.EpisodesBetweenDates(start, end, unmonitored);
             var icalCalendar = new iCalendar();
 
             foreach (var episode in episodes.OrderBy(v => v.AirDateUtc.Value))
             {
+                if (premiersOnly && (episode.SeasonNumber == 0 || episode.EpisodeNumber != 1))
+                {
+                    continue;
+                }
+
+                if (tags.Any() && tags.None(episode.Series.Tags.Contains))
+                {
+                    continue;
+                }
+
                 var occurrence = icalCalendar.Create<Event>();
                 occurrence.UID = "NzbDrone_episode_" + episode.Id.ToString();
                 occurrence.Status = episode.HasFile ? EventStatus.Confirmed : EventStatus.Tentative;

src/NzbDrone.Api/Calendar/CalendarModule.cs

@@ -33,7 +33,7 @@ namespace NzbDrone.Api.Calendar
             if (queryEnd.HasValue) end = DateTime.Parse(queryEnd.Value);
             if (queryIncludeUnmonitored.HasValue) includeUnmonitored = Convert.ToBoolean(queryIncludeUnmonitored.Value);
 
-            var resources = ToListResource(() => _episodeService.EpisodesBetweenDates(start, end, includeUnmonitored));
+            var resources = MapToResource(_episodeService.EpisodesBetweenDates(start, end, includeUnmonitored), true, true);
 
             return resources.OrderBy(e => e.AirDateUtc).ToList();
         }

src/NzbDrone.Api/ClientSchema/SchemaBuilder.cs

@@ -6,7 +6,6 @@ using NzbDrone.Common.EnsureThat;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Reflection;
 using NzbDrone.Core.Annotations;
-using Omu.ValueInjecter;
 
 namespace NzbDrone.Api.ClientSchema
 {
@@ -56,7 +55,7 @@ namespace NzbDrone.Api.ClientSchema
             return result.OrderBy(r => r.Order).ToList();
         }
 
-        public static object ReadFormSchema(List<Field> fields, Type targetType, object defaults = null)
+        public static object ReadFromSchema(List<Field> fields, Type targetType)
         {
             Ensure.That(targetType, () => targetType).IsNotNull();
 
@@ -64,11 +63,6 @@ namespace NzbDrone.Api.ClientSchema
 
             var target = Activator.CreateInstance(targetType);
 
-            if (defaults != null)
-            {
-                target.InjectFrom(defaults);
-            }
-
             foreach (var propertyInfo in properties)
             {
                 var fieldAttribute = propertyInfo.GetAttribute<FieldDefinitionAttribute>(false);
@@ -146,9 +140,9 @@ namespace NzbDrone.Api.ClientSchema
 
         }
 
-        public static T ReadFormSchema<T>(List<Field> fields)
+        public static T ReadFromSchema<T>(List<Field> fields)
         {
-            return (T)ReadFormSchema(fields, typeof(T));
+            return (T)ReadFromSchema(fields, typeof(T));
         }
 
         private static List<SelectOption> GetSelectOptions(Type selectOptions)

src/NzbDrone.Api/Commands/CommandModule.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Api.Extensions;
-using NzbDrone.Api.Mapping;
 using NzbDrone.Api.Validation;
 using NzbDrone.Common;
 using NzbDrone.Core.Datastore.Events;
@@ -36,15 +35,13 @@ namespace NzbDrone.Api.Commands
 
         private CommandResource GetCommand(int id)
         {
-            return _commandQueueManager.Get(id).InjectTo<CommandResource>();
+            return _commandQueueManager.Get(id).ToResource();
         }
 
         private int StartCommand(CommandResource commandResource)
         {
-            var commandType =
-                _serviceFactory.GetImplementations(typeof (Command))
-                               .Single(c => c.Name.Replace("Command", "")
-                                             .Equals(commandResource.Name, StringComparison.InvariantCultureIgnoreCase));
+            var commandType = _serviceFactory.GetImplementations(typeof(Command))
+                                             .Single(c => c.Name.Replace("Command", "").Equals(commandResource.Name, StringComparison.InvariantCultureIgnoreCase));
 
             dynamic command = Request.Body.FromJson(commandType);
             command.Trigger = CommandTrigger.Manual;
@@ -55,14 +52,14 @@ namespace NzbDrone.Api.Commands
 
         private List<CommandResource> GetStartedCommands()
         {
-            return ToListResource(_commandQueueManager.GetStarted());
+            return _commandQueueManager.GetStarted().ToResource();
         }
 
         public void Handle(CommandUpdatedEvent message)
         {
             if (message.Command.Body.SendUpdatesToClient)
             {
-                BroadcastResourceChange(ModelAction.Updated, message.Command.InjectTo<CommandResource>());
+                BroadcastResourceChange(ModelAction.Updated, message.Command.ToResource());
             }
         }
     }

src/NzbDrone.Api/Commands/CommandResource.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using Newtonsoft.Json;
 using NzbDrone.Api.REST;
 using NzbDrone.Core.Messaging.Commands;
@@ -9,7 +11,7 @@ namespace NzbDrone.Api.Commands
     {
         public string Name { get; set; }
         public string Message { get; set; }
-        public Command Body { get; set; }
+        public object Body { get; set; }
         public CommandPriority Priority { get; set; }
         public CommandStatus Status { get; set; }
         public DateTime Queued { get; set; }
@@ -70,7 +72,7 @@ namespace NzbDrone.Api.Commands
         {
             get
             {
-                if (Body != null) return Body.SendUpdatesToClient;
+                if (Body != null) return (Body as Command).SendUpdatesToClient;
 
                 return false;
             }
@@ -82,7 +84,7 @@ namespace NzbDrone.Api.Commands
         {
             get
             {
-                if (Body != null) return Body.UpdateScheduledTask;
+                if (Body != null) return (Body as Command).UpdateScheduledTask;
 
                 return false;
             }
@@ -92,4 +94,37 @@ namespace NzbDrone.Api.Commands
 
         public DateTime? LastExecutionTime { get; set; }
     }
+
+    public static class CommandResourceMapper
+    {
+        public static CommandResource ToResource(this CommandModel model)
+        {
+            if (model == null) return null;
+
+            return new CommandResource
+            {
+                Id = model.Id,
+
+                Name = model.Name,
+                Message = model.Message,
+                Body = model.Body,
+                Priority = model.Priority,
+                Status = model.Status,
+                Queued = model.QueuedAt,
+                Started = model.StartedAt,
+                Ended = model.EndedAt,
+                Duration = model.Duration,
+                Exception = model.Exception,
+                Trigger = model.Trigger,
+
+                CompletionMessage = model.Body.CompletionMessage,
+                LastExecutionTime = model.Body.LastExecutionTime
+            };
+        }
+
+        public static List<CommandResource> ToResource(this IEnumerable<CommandModel> models)
+        {
+            return models.Select(ToResource).ToList();
+        }
+    }
 }

src/NzbDrone.Api/Config/DownloadClientConfigModule.cs

@@ -21,5 +21,10 @@ namespace NzbDrone.Api.Config
                            .SetValidator(pathExistsValidator)
                            .When(c => !string.IsNullOrWhiteSpace(c.DownloadedEpisodesFolder));
         }
+
+        protected override DownloadClientConfigResource ToResource(IConfigService model)
+        {
+            return DownloadClientConfigResourceMapper.ToResource(model);
+        }
     }
 }

src/NzbDrone.Api/Config/DownloadClientConfigResource.cs

@@ -1,5 +1,6 @@
 using System;
 using NzbDrone.Api.REST;
+using NzbDrone.Core.Configuration;
 
 namespace NzbDrone.Api.Config
 {
@@ -15,4 +16,23 @@ namespace NzbDrone.Api.Config
         public bool AutoRedownloadFailed { get; set; }
         public bool RemoveFailedDownloads { get; set; }
     }
+
+    public static class DownloadClientConfigResourceMapper
+    {
+        public static DownloadClientConfigResource ToResource(IConfigService model)
+        {
+            return new DownloadClientConfigResource
+            {
+                DownloadedEpisodesFolder = model.DownloadedEpisodesFolder,
+                DownloadClientWorkingFolders = model.DownloadClientWorkingFolders,
+                DownloadedEpisodesScanInterval = model.DownloadedEpisodesScanInterval,
+
+                EnableCompletedDownloadHandling = model.EnableCompletedDownloadHandling,
+                RemoveCompletedDownloads = model.RemoveCompletedDownloads,
+
+                AutoRedownloadFailed = model.AutoRedownloadFailed,
+                RemoveFailedDownloads = model.RemoveFailedDownloads
+            };
+        }
+    }
 }

src/NzbDrone.Api/Config/HostConfigModule.cs

@@ -8,19 +8,20 @@ using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Update;
 using NzbDrone.Core.Validation;
 using NzbDrone.Core.Validation.Paths;
-using Omu.ValueInjecter;
 
 namespace NzbDrone.Api.Config
 {
     public class HostConfigModule : NzbDroneRestModule<HostConfigResource>
     {
         private readonly IConfigFileProvider _configFileProvider;
+        private readonly IConfigService _configService;
         private readonly IUserService _userService;
 
-        public HostConfigModule(IConfigFileProvider configFileProvider, IUserService userService)
+        public HostConfigModule(IConfigFileProvider configFileProvider, IConfigService configService, IUserService userService)
             : base("/config/host")
         {
             _configFileProvider = configFileProvider;
+            _configService = configService;
             _userService = userService;
 
             GetResourceSingle = GetHostConfig;
@@ -48,12 +49,10 @@ namespace NzbDrone.Api.Config
 
         private HostConfigResource GetHostConfig()
         {
-            var resource = new HostConfigResource();
-            resource.InjectFrom(_configFileProvider);
+            var resource = _configFileProvider.ToResource(_configService);
             resource.Id = 1;
 
             var user = _userService.FindUser();
-
             if (user != null)
             {
                 resource.Username = user.Username;
@@ -75,6 +74,7 @@ namespace NzbDrone.Api.Config
                                      .ToDictionary(prop => prop.Name, prop => prop.GetValue(resource, null));
 
             _configFileProvider.SaveConfigDictionary(dictionary);
+            _configService.SaveConfigDictionary(dictionary);
 
             if (resource.Username.IsNotNullOrWhiteSpace() && resource.Password.IsNotNullOrWhiteSpace())
             {

src/NzbDrone.Api/Config/HostConfigResource.cs

@@ -1,7 +1,9 @@
 using System;
 using NzbDrone.Api.REST;
 using NzbDrone.Core.Authentication;
+using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Update;
+using NzbDrone.Common.Http.Proxy;
 
 namespace NzbDrone.Api.Config
 {
@@ -19,11 +21,54 @@ namespace NzbDrone.Api.Config
         public string LogLevel { get; set; }
         public string Branch { get; set; }
         public string ApiKey { get; set; }
-        public bool Torrent { get; set; }
         public string SslCertHash { get; set; }
         public string UrlBase { get; set; }
         public bool UpdateAutomatically { get; set; }
         public UpdateMechanism UpdateMechanism { get; set; }
         public string UpdateScriptPath { get; set; }
+        public bool ProxyEnabled { get; set; }
+        public ProxyType ProxyType { get; set; }
+        public string ProxyHostname { get; set; }
+        public int ProxyPort { get; set; }
+        public string ProxyUsername { get; set; }
+        public string ProxyPassword { get; set; }
+        public string ProxyBypassFilter { get; set; }
+        public bool ProxyBypassLocalAddresses { get; set; }
+    }
+
+    public static class HostConfigResourceMapper
+    {
+        public static HostConfigResource ToResource(this IConfigFileProvider model, IConfigService configService)
+        {
+            // TODO: Clean this mess up. don't mix data from multiple classes, use sub-resources instead?
+            return new HostConfigResource
+            {
+                BindAddress = model.BindAddress,
+                Port = model.Port,
+                SslPort = model.SslPort,
+                EnableSsl = model.EnableSsl,
+                LaunchBrowser = model.LaunchBrowser,
+                AuthenticationMethod = model.AuthenticationMethod,
+                AnalyticsEnabled = model.AnalyticsEnabled,
+                //Username
+                //Password
+                LogLevel = model.LogLevel,
+                Branch = model.Branch,
+                ApiKey = model.ApiKey,
+                SslCertHash = model.SslCertHash,
+                UrlBase = model.UrlBase,
+                UpdateAutomatically = model.UpdateAutomatically,
+                UpdateMechanism = model.UpdateMechanism,
+                UpdateScriptPath = model.UpdateScriptPath,
+                ProxyEnabled = configService.ProxyEnabled,
+                ProxyType = configService.ProxyType,
+                ProxyHostname = configService.ProxyHostname,
+                ProxyPort = configService.ProxyPort,
+                ProxyUsername = configService.ProxyUsername,
+                ProxyPassword = configService.ProxyPassword,
+                ProxyBypassFilter = configService.ProxyBypassFilter,
+                ProxyBypassLocalAddresses = configService.ProxyBypassLocalAddresses
+            };
+        }
     }
 }

src/NzbDrone.Api/Config/IndexerConfigModule.cs

@@ -1,4 +1,6 @@
-using FluentValidation;
+using System;
+using FluentValidation;
+using NzbDrone.Api.Validation;
 using NzbDrone.Core.Configuration;
 
 namespace NzbDrone.Api.Config
@@ -16,8 +18,12 @@ namespace NzbDrone.Api.Config
                            .GreaterThanOrEqualTo(0);
 
             SharedValidator.RuleFor(c => c.RssSyncInterval)
-                .InclusiveBetween(10, 120)
-                .When(c => c.RssSyncInterval > 0);
+                           .IsValidRssSyncInterval();
+        }
+
+        protected override IndexerConfigResource ToResource(IConfigService model)
+        {
+            return IndexerConfigResourceMapper.ToResource(model);
         }
     }
 }

src/NzbDrone.Api/Config/IndexerConfigResource.cs

@@ -1,5 +1,6 @@
 using System;
 using NzbDrone.Api.REST;
+using NzbDrone.Core.Configuration;
 
 namespace NzbDrone.Api.Config
 {
@@ -9,4 +10,17 @@ namespace NzbDrone.Api.Config
         public int Retention { get; set; }
         public int RssSyncInterval { get; set; }
     }
+
+    public static class IndexerConfigResourceMapper
+    {
+        public static IndexerConfigResource ToResource(IConfigService model)
+        {
+            return new IndexerConfigResource
+            {
+                MinimumAge = model.MinimumAge,
+                Retention = model.Retention,
+                RssSyncInterval = model.RssSyncInterval,
+            };
+        }
+    }
 }

src/NzbDrone.Api/Config/MediaManagementConfigModule.cs

@@ -1,5 +1,4 @@
-using System;
-using FluentValidation;
+using FluentValidation;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Validation.Paths;
 
@@ -14,5 +13,10 @@ namespace NzbDrone.Api.Config
             SharedValidator.RuleFor(c => c.FolderChmod).NotEmpty();
             SharedValidator.RuleFor(c => c.RecycleBin).IsValidPath().SetValidator(pathExistsValidator).When(c => !string.IsNullOrWhiteSpace(c.RecycleBin));
         }
+
+        protected override MediaManagementConfigResource ToResource(IConfigService model)
+        {
+            return MediaManagementConfigResourceMapper.ToResource(model);
+        }
     }
 }

src/NzbDrone.Api/Config/MediaManagementConfigResource.cs

@@ -1,5 +1,5 @@
-using System;
-using NzbDrone.Api.REST;
+using NzbDrone.Api.REST;
+using NzbDrone.Core.Configuration;
 using NzbDrone.Core.MediaFiles;
 
 namespace NzbDrone.Api.Config
@@ -20,6 +20,33 @@ namespace NzbDrone.Api.Config
 
         public bool SkipFreeSpaceCheckWhenImporting { get; set; }
         public bool CopyUsingHardlinks { get; set; }
+        public string ExtraFileExtensions { get; set; }
         public bool EnableMediaInfo { get; set; }
     }
+
+    public static class MediaManagementConfigResourceMapper
+    {
+        public static MediaManagementConfigResource ToResource(IConfigService model)
+        {
+            return new MediaManagementConfigResource
+            {
+                AutoUnmonitorPreviouslyDownloadedEpisodes = model.AutoUnmonitorPreviouslyDownloadedEpisodes,
+                RecycleBin = model.RecycleBin,
+                AutoDownloadPropers = model.AutoDownloadPropers,
+                CreateEmptySeriesFolders = model.CreateEmptySeriesFolders,
+                FileDate = model.FileDate,
+
+                SetPermissionsLinux = model.SetPermissionsLinux,
+                FileChmod = model.FileChmod,
+                FolderChmod = model.FolderChmod,
+                ChownUser = model.ChownUser,
+                ChownGroup = model.ChownGroup,
+
+                SkipFreeSpaceCheckWhenImporting = model.SkipFreeSpaceCheckWhenImporting,
+                CopyUsingHardlinks = model.CopyUsingHardlinks,
+                ExtraFileExtensions = model.ExtraFileExtensions,
+                EnableMediaInfo = model.EnableMediaInfo
+            };
+        }
+    }
 }

src/NzbDrone.Api/Config/NamingConfigModule.cs

@@ -7,9 +7,7 @@ using Nancy.Responses;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Organizer;
 using Nancy.ModelBinding;
-using NzbDrone.Api.Mapping;
 using NzbDrone.Api.Extensions;
-using Omu.ValueInjecter;
 
 namespace NzbDrone.Api.Config
 {
@@ -46,7 +44,7 @@ namespace NzbDrone.Api.Config
 
         private void UpdateNamingConfig(NamingConfigResource resource)
         {
-            var nameSpec = resource.InjectTo<NamingConfig>();
+            var nameSpec = resource.ToModel();
             ValidateFormatResult(nameSpec);
 
             _namingConfigService.Save(nameSpec);
@@ -55,16 +53,14 @@ namespace NzbDrone.Api.Config
         private NamingConfigResource GetNamingConfig()
         {
             var nameSpec = _namingConfigService.GetConfig();
-            var resource = nameSpec.InjectTo<NamingConfigResource>();
+            var resource = nameSpec.ToResource();
 
-            if (string.IsNullOrWhiteSpace(resource.StandardEpisodeFormat))
+            if (resource.StandardEpisodeFormat.IsNotNullOrWhiteSpace())
             {
-                return resource;
+                var basicConfig = _filenameBuilder.GetBasicNamingConfig(nameSpec);
+                basicConfig.AddToResource(resource);
             }
 
-            var basicConfig = _filenameBuilder.GetBasicNamingConfig(nameSpec);
-            resource.InjectFrom(basicConfig);
-
             return resource;
         }
 
@@ -75,7 +71,7 @@ namespace NzbDrone.Api.Config
 
         private JsonResponse<NamingSampleResource> GetExamples(NamingConfigResource config)
         {
-            var nameSpec = config.InjectTo<NamingConfig>();
+            var nameSpec = config.ToModel();
             var sampleResource = new NamingSampleResource();
             
             var singleEpisodeSampleResult = _filenameSampleService.GetStandardSample(nameSpec);

src/NzbDrone.Api/Config/NamingConfigResource.cs

@@ -1,5 +1,6 @@
 using System;
 using NzbDrone.Api.REST;
+using NzbDrone.Core.Organizer;
 
 namespace NzbDrone.Api.Config
 {
@@ -20,4 +21,57 @@ namespace NzbDrone.Api.Config
         public string Separator { get; set; }
         public string NumberStyle { get; set; }
     }
+
+    public static class NamingConfigResourceMapper
+    {
+        public static NamingConfigResource ToResource(this NamingConfig model)
+        {
+            return new NamingConfigResource
+            {
+                Id = model.Id,
+
+                RenameEpisodes = model.RenameEpisodes,
+                ReplaceIllegalCharacters = model.ReplaceIllegalCharacters,
+                MultiEpisodeStyle = model.MultiEpisodeStyle,
+                StandardEpisodeFormat = model.StandardEpisodeFormat,
+                DailyEpisodeFormat = model.DailyEpisodeFormat,
+                AnimeEpisodeFormat = model.AnimeEpisodeFormat,
+                SeriesFolderFormat = model.SeriesFolderFormat,
+                SeasonFolderFormat = model.SeasonFolderFormat
+                //IncludeSeriesTitle
+                //IncludeEpisodeTitle
+                //IncludeQuality
+                //ReplaceSpaces
+                //Separator
+                //NumberStyle
+            };
+        }
+
+        public static void AddToResource(this BasicNamingConfig basicNamingConfig, NamingConfigResource resource)
+        {
+            resource.IncludeSeriesTitle = basicNamingConfig.IncludeSeriesTitle;
+            resource.IncludeEpisodeTitle = basicNamingConfig.IncludeEpisodeTitle;
+            resource.IncludeQuality = basicNamingConfig.IncludeQuality;
+            resource.ReplaceSpaces = basicNamingConfig.ReplaceSpaces;
+            resource.Separator = basicNamingConfig.Separator;
+            resource.NumberStyle = basicNamingConfig.NumberStyle;
+        }
+
+        public static NamingConfig ToModel(this NamingConfigResource resource)
+        {
+            return new NamingConfig
+            {
+                Id = resource.Id,
+
+                RenameEpisodes = resource.RenameEpisodes,
+                ReplaceIllegalCharacters = resource.ReplaceIllegalCharacters,
+                MultiEpisodeStyle = resource.MultiEpisodeStyle,
+                StandardEpisodeFormat = resource.StandardEpisodeFormat,
+                DailyEpisodeFormat = resource.DailyEpisodeFormat,
+                AnimeEpisodeFormat = resource.AnimeEpisodeFormat,
+                SeriesFolderFormat = resource.SeriesFolderFormat,
+                SeasonFolderFormat = resource.SeasonFolderFormat
+            };
+        }
+    }
 }

src/NzbDrone.Api/Config/NzbDroneConfigModule.cs

@@ -2,7 +2,6 @@
 using System.Reflection;
 using NzbDrone.Api.REST;
 using NzbDrone.Core.Configuration;
-using Omu.ValueInjecter;
 
 namespace NzbDrone.Api.Config
 {
@@ -27,13 +26,14 @@ namespace NzbDrone.Api.Config
 
         private TResource GetConfig()
         {
-            var resource = new TResource();
-            resource.InjectFrom(_configService);
+            var resource = ToResource(_configService);
             resource.Id = 1;
 
             return resource;
         }
 
+        protected abstract TResource ToResource(IConfigService model);
+
         private TResource GetConfig(int id)
         {
             return GetConfig();

src/NzbDrone.Api/Config/UiConfigModule.cs

@@ -1,45 +1,21 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Reflection;
 using NzbDrone.Core.Configuration;
-using Omu.ValueInjecter;
 
 namespace NzbDrone.Api.Config
 {
-    public class UiConfigModule : NzbDroneRestModule<UiConfigResource>
+    public class UiConfigModule : NzbDroneConfigModule<UiConfigResource>
     {
-        private readonly IConfigService _configService;
-
         public UiConfigModule(IConfigService configService)
-            : base("/config/ui")
+            : base(configService)
         {
-            _configService = configService;
 
-            GetResourceSingle = GetUiConfig;
-            GetResourceById = GetUiConfig;
-            UpdateResource = SaveUiConfig;
         }
 
-        private UiConfigResource GetUiConfig()
+        protected override UiConfigResource ToResource(IConfigService model)
         {
-            var resource = new UiConfigResource();
-            resource.InjectFrom(_configService);
-            resource.Id = 1;
-
-            return resource;
-        }
-
-        private UiConfigResource GetUiConfig(int id)
-        {
-            return GetUiConfig();
-        }
-
-        private void SaveUiConfig(UiConfigResource resource)
-        {
-            var dictionary = resource.GetType()
-                                     .GetProperties(BindingFlags.Instance | BindingFlags.Public)
-                                     .ToDictionary(prop => prop.Name, prop => prop.GetValue(resource, null));
-
-            _configService.SaveConfigDictionary(dictionary);
+            return UiConfigResourceMapper.ToResource(model);
         }
     }
 }

src/NzbDrone.Api/Config/UiConfigResource.cs

@@ -1,5 +1,6 @@
 using System;
 using NzbDrone.Api.REST;
+using NzbDrone.Core.Configuration;
 
 namespace NzbDrone.Api.Config
 {
@@ -17,4 +18,23 @@ namespace NzbDrone.Api.Config
 
         public bool EnableColorImpairedMode { get; set; }
     }
+
+    public static class UiConfigResourceMapper
+    {
+        public static UiConfigResource ToResource(IConfigService model)
+        {
+            return new UiConfigResource
+            {
+                FirstDayOfWeek = model.FirstDayOfWeek,
+                CalendarWeekColumnHeader = model.CalendarWeekColumnHeader,
+                
+                ShortDateFormat = model.ShortDateFormat,
+                LongDateFormat = model.LongDateFormat,
+                TimeFormat = model.TimeFormat,
+                ShowRelativeDates = model.ShowRelativeDates,
+
+                EnableColorImpairedMode = model.EnableColorImpairedMode,
+            };
+        }
+    }
 }

src/NzbDrone.Api/DiskSpace/DiskSpaceModule.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using NzbDrone.Core.DiskSpace;
 
 namespace NzbDrone.Api.DiskSpace
@@ -8,15 +9,16 @@ namespace NzbDrone.Api.DiskSpace
         private readonly IDiskSpaceService _diskSpaceService;
 
         public DiskSpaceModule(IDiskSpaceService diskSpaceService)
-            :base("diskspace")
+            : base("diskspace")
         {
             _diskSpaceService = diskSpaceService;
             GetResourceAll = GetFreeSpace;
         }
 
+
         public List<DiskSpaceResource> GetFreeSpace()
         {
-            return ToListResource(_diskSpaceService.GetFreeSpace);
+            return _diskSpaceService.GetFreeSpace().ConvertAll(DiskSpaceResourceMapper.MapToResource);
         }
     }
 }

src/NzbDrone.Api/DiskSpace/DiskSpaceResource.cs

@@ -10,4 +10,20 @@ namespace NzbDrone.Api.DiskSpace
         public long FreeSpace { get; set; }
         public long TotalSpace { get; set; }
     }
+
+    public static class DiskSpaceResourceMapper
+    {
+        public static DiskSpaceResource MapToResource(this Core.DiskSpace.DiskSpace model)
+        {
+            if (model == null) return null;
+
+            return new DiskSpaceResource
+            {
+                Path = model.Path,
+                Label = model.Label,
+                FreeSpace = model.FreeSpace,
+                TotalSpace = model.TotalSpace
+            };
+        }
+    }
 }

src/NzbDrone.Api/DownloadClient/DownloadClientModule.cs

@@ -1,4 +1,5 @@
-using NzbDrone.Core.Download;
+using System;
+using NzbDrone.Core.Download;
 
 namespace NzbDrone.Api.DownloadClient
 {
@@ -9,6 +10,22 @@ namespace NzbDrone.Api.DownloadClient
         {
         }
 
+        protected override void MapToResource(DownloadClientResource resource, DownloadClientDefinition definition)
+        {
+            base.MapToResource(resource, definition);
+
+            resource.Enable = definition.Enable;
+            resource.Protocol = definition.Protocol;
+        }
+
+        protected override void MapToModel(DownloadClientDefinition definition, DownloadClientResource resource)
+        {
+            base.MapToModel(definition, resource);
+
+            definition.Enable = resource.Enable;
+            definition.Protocol = resource.Protocol;
+        }
+
         protected override void Validate(DownloadClientDefinition definition, bool includeWarnings)
         {
             if (!definition.Enable) return;

src/NzbDrone.Api/EpisodeFiles/EpisodeFileModule.cs

@@ -5,7 +5,6 @@ using NLog;
 using NzbDrone.Api.REST;
 using NzbDrone.Core.Datastore.Events;
 using NzbDrone.Core.MediaFiles;
-using NzbDrone.Api.Mapping;
 using NzbDrone.Core.MediaFiles.Events;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.Tv;
@@ -14,7 +13,7 @@ using NzbDrone.SignalR;
 
 namespace NzbDrone.Api.EpisodeFiles
 {
-    public class EpisodeModule : NzbDroneRestModuleWithSignalR<EpisodeFileResource, EpisodeFile>,
+    public class EpisodeFileModule : NzbDroneRestModuleWithSignalR<EpisodeFileResource, EpisodeFile>,
                                  IHandle<EpisodeFileAddedEvent>
     {
         private readonly IMediaFileService _mediaFileService;
@@ -23,7 +22,7 @@ namespace NzbDrone.Api.EpisodeFiles
         private readonly IQualityUpgradableSpecification _qualityUpgradableSpecification;
         private readonly Logger _logger;
 
-        public EpisodeModule(IBroadcastSignalRMessage signalRBroadcaster,
+        public EpisodeFileModule(IBroadcastSignalRMessage signalRBroadcaster,
                              IMediaFileService mediaFileService,
                              IRecycleBinProvider recycleBinProvider,
                              ISeriesService seriesService,
@@ -47,22 +46,21 @@ namespace NzbDrone.Api.EpisodeFiles
             var episodeFile = _mediaFileService.Get(id);
             var series = _seriesService.GetSeries(episodeFile.SeriesId);
 
-            return MapToResource(series, episodeFile);
+            return episodeFile.ToResource(series, _qualityUpgradableSpecification);
         }
 
         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)
-                                    .Select(f => MapToResource(series, f)).ToList();
+            var series = _seriesService.GetSeries(seriesId);
+
+            return _mediaFileService.GetFilesBySeries(seriesId).ConvertAll(f => f.ToResource(series, _qualityUpgradableSpecification));
         }
 
         private void SetQuality(EpisodeFileResource episodeFileResource)
@@ -83,16 +81,6 @@ namespace NzbDrone.Api.EpisodeFiles
             _mediaFileService.Delete(episodeFile, DeleteMediaFileReason.Manual);
         }
 
-        private EpisodeFileResource MapToResource(Core.Tv.Series series, EpisodeFile episodeFile)
-        {
-            var resource = episodeFile.InjectTo<EpisodeFileResource>();
-            resource.Path = Path.Combine(series.Path, episodeFile.RelativePath);
-
-            resource.QualityCutoffNotMet = _qualityUpgradableSpecification.CutoffNotMet(series.Profile.Value, episodeFile.Quality);
-
-            return resource;
-        }
-
         public void Handle(EpisodeFileAddedEvent message)
         {
             BroadcastResourceChange(ModelAction.Updated, message.EpisodeFile.Id);

src/NzbDrone.Api/EpisodeFiles/EpisodeFileResource.cs

@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using NzbDrone.Api.REST;
 using NzbDrone.Core.Qualities;
 
@@ -17,4 +18,47 @@ namespace NzbDrone.Api.EpisodeFiles
 
         public bool QualityCutoffNotMet { get; set; }
     }
+
+    public static class EpisodeFileResourceMapper
+    {
+        private static EpisodeFileResource ToResource(this Core.MediaFiles.EpisodeFile model)
+        {
+            if (model == null) return null;
+
+            return new EpisodeFileResource
+            {
+                Id = model.Id,
+
+                SeriesId = model.SeriesId,
+                SeasonNumber = model.SeasonNumber,
+                RelativePath = model.RelativePath,
+                //Path
+                Size = model.Size,
+                DateAdded = model.DateAdded,
+                SceneName = model.SceneName,
+                Quality = model.Quality,
+                //QualityCutoffNotMet
+            };
+        }
+
+        public static EpisodeFileResource ToResource(this Core.MediaFiles.EpisodeFile model, Core.Tv.Series series, Core.DecisionEngine.IQualityUpgradableSpecification qualityUpgradableSpecification)
+        {
+            if (model == null) return null;
+
+            return new EpisodeFileResource
+            {
+                Id = model.Id,
+
+                SeriesId = model.SeriesId,
+                SeasonNumber = model.SeasonNumber,
+                RelativePath = model.RelativePath,
+                Path = Path.Combine(series.Path, model.RelativePath),
+                Size = model.Size,
+                DateAdded = model.DateAdded,
+                SceneName = model.SceneName,
+                Quality = model.Quality,
+                QualityCutoffNotMet = qualityUpgradableSpecification.CutoffNotMet(series.Profile.Value, model.Quality)
+            };
+        }
+    }
 }

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 = MapToResource(_episodeService.GetEpisodeBySeries(seriesId), false, true);
 
             return resources;
         }

src/NzbDrone.Api/Episodes/EpisodeModuleWithSignalR.cs

@@ -2,8 +2,9 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Api.EpisodeFiles;
 using NzbDrone.Api.Extensions;
-using NzbDrone.Api.Mapping;
 using NzbDrone.Api.Series;
 using NzbDrone.Core.Datastore.Events;
 using NzbDrone.Core.DecisionEngine;
@@ -53,40 +54,65 @@ namespace NzbDrone.Api.Episodes
         protected EpisodeResource GetEpisode(int id)
         {
             var episode = _episodeService.GetEpisode(id);
-            episode.EpisodeFile.LazyLoad();
-            episode.Series = _seriesService.GetSeries(episode.SeriesId);
-            return ToResource(episode);
+            var resource = MapToResource(episode, true, true);
+            return resource;
         }
 
-        protected override EpisodeResource ToResource<TModel>(TModel model)
+        protected EpisodeResource MapToResource(Episode episode, bool includeSeries, bool includeEpisodeFile)
         {
-            var resource = base.ToResource(model);
+            var resource = episode.ToResource();
 
-            var episode = model as Episode;
-            if (episode != null)
+            if (includeSeries || includeEpisodeFile)
             {
-                if (episode.EpisodeFile.IsLoaded && episode.EpisodeFile.Value != null)
+                var series = episode.Series ?? _seriesService.GetSeries(episode.SeriesId);
+
+                if (includeSeries)
                 {
-                    resource.EpisodeFile.Path = Path.Combine(episode.Series.Path, episode.EpisodeFile.Value.RelativePath);
-                    resource.EpisodeFile.QualityCutoffNotMet = _qualityUpgradableSpecification.CutoffNotMet(episode.Series.Profile.Value, episode.EpisodeFile.Value.Quality);
+                    resource.Series = series.ToResource();
+                }
+                if (includeEpisodeFile && episode.EpisodeFileId != 0)
+                {
+                    resource.EpisodeFile = episode.EpisodeFile.Value.ToResource(series, _qualityUpgradableSpecification);
                 }
             }
 
             return resource;
         }
 
-        protected override List<EpisodeResource> ToListResource<TModel>(IEnumerable<TModel> modelList)
+        protected List<EpisodeResource> MapToResource(List<Episode> episodes, bool includeSeries, bool includeEpisodeFile)
         {
-            var resources =  base.ToListResource(modelList);
+            var result = episodes.ToResource();
 
-            return resources.LoadSubtype<EpisodeResource, SeriesResource, Core.Tv.Series>(e => e.SeriesId, _seriesService.GetSeries).ToList();
+            if (includeSeries || includeEpisodeFile)
+            {
+                var seriesDict = new Dictionary<int, Core.Tv.Series>();
+                for (var i = 0; i < episodes.Count; i++)
+                {
+                    var episode = episodes[i];
+                    var resource = result[i];
+
+                    var series = episode.Series ?? seriesDict.GetValueOrDefault(episodes[i].SeriesId) ?? _seriesService.GetSeries(episodes[i].SeriesId);
+                    seriesDict[series.Id] = series;
+                    
+                    if (includeSeries)
+                    {
+                        resource.Series = series.ToResource();
+                    }
+                    if (includeEpisodeFile && episodes[i].EpisodeFileId != 0)
+                    {
+                        resource.EpisodeFile = episodes[i].EpisodeFile.Value.ToResource(series, _qualityUpgradableSpecification);
+                    }
+                }
+            }
+
+            return result;
         }
 
         public void Handle(EpisodeGrabbedEvent message)
         {
             foreach (var episode in message.Episode.Episodes)
             {
-                var resource = episode.InjectTo<EpisodeResource>();
+                var resource = episode.ToResource();
                 resource.Grabbed = true;
 
                 BroadcastResourceChange(ModelAction.Updated, resource);

src/NzbDrone.Api/Episodes/EpisodeResource.cs

@@ -1,8 +1,11 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using Newtonsoft.Json;
 using NzbDrone.Api.EpisodeFiles;
 using NzbDrone.Api.REST;
 using NzbDrone.Api.Series;
+using NzbDrone.Core.Tv;
 
 namespace NzbDrone.Api.Episodes
 {
@@ -25,8 +28,6 @@ namespace NzbDrone.Api.Episodes
         public int? SceneEpisodeNumber { get; set; }
         public int? SceneSeasonNumber { get; set; }
         public bool UnverifiedSceneNumbering { get; set; }
-        public DateTime? EndTime { get; set; }
-        public DateTime? GrabDate { get; set; }
         public string SeriesTitle { get; set; }
         public SeriesResource Series { get; set; }
 
@@ -34,4 +35,44 @@ namespace NzbDrone.Api.Episodes
         [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public bool Grabbed { get; set; }
     }
+
+    public static class EpisodeResourceMapper
+    {
+        public static EpisodeResource ToResource(this Episode model)
+        {
+            if (model == null) return null;
+
+            return new EpisodeResource
+            {
+                Id = model.Id,
+
+                SeriesId = model.SeriesId,
+                EpisodeFileId = model.EpisodeFileId,
+                SeasonNumber = model.SeasonNumber,
+                EpisodeNumber = model.EpisodeNumber,
+                Title = model.Title,
+                AirDate = model.AirDate,
+                AirDateUtc = model.AirDateUtc,
+                Overview = model.Overview,
+                //EpisodeFile
+
+                HasFile = model.HasFile,
+                Monitored = model.Monitored,
+                AbsoluteEpisodeNumber = model.AbsoluteEpisodeNumber,
+                SceneAbsoluteEpisodeNumber = model.SceneAbsoluteEpisodeNumber,
+                SceneEpisodeNumber = model.SceneEpisodeNumber,
+                SceneSeasonNumber = model.SceneSeasonNumber,
+                UnverifiedSceneNumbering = model.UnverifiedSceneNumbering,
+                SeriesTitle = model.SeriesTitle,
+                //Series = model.Series.MapToResource(),
+            };
+        }
+
+        public static List<EpisodeResource> ToResource(this IEnumerable<Episode> models)
+        {
+            if (models == null) return null;
+
+            return models.Select(ToResource).ToList();
+        }
+    }
 }

src/NzbDrone.Api/Episodes/RenameEpisodeModule.cs

@@ -18,25 +18,20 @@ 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;
-                return ToListResource(() => _renameEpisodeFileService.GetRenamePreviews(seriesId, seasonNumber));
+                return _renameEpisodeFileService.GetRenamePreviews(seriesId, seasonNumber).ToResource();
             }
 
-            return ToListResource(() => _renameEpisodeFileService.GetRenamePreviews(seriesId));
+            return _renameEpisodeFileService.GetRenamePreviews(seriesId).ToResource();
         }
     }
 }

src/NzbDrone.Api/Episodes/RenameEpisodeResource.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using NzbDrone.Api.REST;
 
 namespace NzbDrone.Api.Episodes
@@ -13,4 +14,27 @@ namespace NzbDrone.Api.Episodes
         public string ExistingPath { get; set; }
         public string NewPath { get; set; }
     }
+
+    public static class RenameEpisodeResourceMapper
+    {
+        public static RenameEpisodeResource ToResource(this Core.MediaFiles.RenameEpisodeFilePreview model)
+        {
+            if (model == null) return null;
+
+            return new RenameEpisodeResource
+            {
+                SeriesId = model.SeriesId,
+                SeasonNumber = model.SeasonNumber,
+                EpisodeNumbers = model.EpisodeNumbers.ToList(),
+                EpisodeFileId = model.EpisodeFileId,
+                ExistingPath = model.ExistingPath,
+                NewPath = model.NewPath
+            };
+        }
+
+        public static List<RenameEpisodeResource> ToResource(this IEnumerable<Core.MediaFiles.RenameEpisodeFilePreview> models)
+        {
+            return models.Select(ToResource).ToList();
+        }
+    }
 }

src/NzbDrone.Api/ErrorManagement/NzbDroneErrorPipeline.cs

@@ -26,7 +26,7 @@ namespace NzbDrone.Api.ErrorManagement
 
             if (apiException != null)
             {
-                _logger.WarnException("API Error", apiException);
+                _logger.Warn(apiException, "API Error");
                 return apiException.ToErrorResponse();
             }
 
@@ -65,10 +65,10 @@ namespace NzbDrone.Api.ErrorManagement
 
                 var sqlErrorMessage = string.Format("[{0} {1}]", context.Request.Method, context.Request.Path);
 
-                _logger.ErrorException(sqlErrorMessage, sqLiteException);
+                _logger.Error(sqLiteException, sqlErrorMessage);
             }
             
-            _logger.FatalException("Request Failed", exception);
+            _logger.Fatal(exception, "Request Failed");
 
             return new ErrorModel
                 {

src/NzbDrone.Api/Extensions/LazyExtensions.cs

@@ -1,55 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using NzbDrone.Api.Mapping;
-using NzbDrone.Api.REST;
-using NzbDrone.Common.Cache;
-using NzbDrone.Core.Datastore;
-
-namespace NzbDrone.Api.Extensions
-{
-    public static class LazyExtensions
-    {
-        private static readonly ICached<MethodInfo> SetterCache = new Cached<MethodInfo>();
-
-        public static IEnumerable<TParent> LoadSubtype<TParent, TChild, TSourceChild>(this IEnumerable<TParent> parents, Func<TParent, int> foreignKeySelector, Func<IEnumerable<int>, IEnumerable<TSourceChild>> sourceChildSelector)
-            where TSourceChild : ModelBase, new()
-            where TChild : RestResource, new()
-            where TParent : RestResource
-        {
-            var parentList = parents.Where(p => foreignKeySelector(p) != 0).ToList();
-
-            if (!parentList.Any())
-            {
-                return parents;
-            }
-
-            var ids = parentList.Select(foreignKeySelector).Distinct();
-            var childDictionary = sourceChildSelector(ids).ToDictionary(child => child.Id, child => child);
-
-            var childSetter = GetChildSetter<TParent, TChild>();
-
-            foreach (var episode in parentList)
-            {
-                childSetter.Invoke(episode, new object[] { childDictionary[foreignKeySelector(episode)].InjectTo<TChild>() });
-            }
-
-            return parents;
-        }
-
-
-        private static MethodInfo GetChildSetter<TParent, TChild>()
-            where TChild : RestResource
-            where TParent : RestResource
-        {
-            var key = typeof(TChild).FullName + typeof(TParent).FullName;
-
-            return SetterCache.Get(key, () =>
-                {
-                    var property = typeof(TParent).GetProperties().Single(c => c.PropertyType == typeof(TChild));
-                    return property.GetSetMethod();
-                });
-        }
-    }
-}

src/NzbDrone.Api/Extensions/Pipelines/CacheHeaderPipeline.cs

@@ -14,6 +14,8 @@ namespace NzbDrone.Api.Extensions.Pipelines
             _cacheableSpecification = cacheableSpecification;
         }
 
+        public int Order { get { return 0; } }
+
         public void Register(IPipelines pipelines)
         {
             pipelines.AfterRequest.AddItemToStartOfPipeline((Action<NancyContext>) Handle);

src/NzbDrone.Api/Extensions/Pipelines/CorsPipeline.cs

@@ -7,6 +7,8 @@ namespace NzbDrone.Api.Extensions.Pipelines
 {
     public class CorsPipeline : IRegisterNancyPipeline
     {
+        public int Order { get { return 0; } }
+
         public void Register(IPipelines pipelines)
         {
             pipelines.AfterRequest.AddItemToEndOfPipeline((Action<NancyContext>) Handle);

src/NzbDrone.Api/Extensions/Pipelines/GZipPipeline.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using Nancy;
 using Nancy.Bootstrapper;
 using NLog;
+using NzbDrone.Common.Extensions;
 
 namespace NzbDrone.Api.Extensions.Pipelines
 {
@@ -12,6 +13,8 @@ namespace NzbDrone.Api.Extensions.Pipelines
     {
         private readonly Logger _logger;
 
+        public int Order { get { return 0; } }
+
         public GzipCompressionPipeline(Logger logger)
         {
             _logger = logger;
@@ -19,50 +22,62 @@ namespace NzbDrone.Api.Extensions.Pipelines
 
         public void Register(IPipelines pipelines)
         {
-            pipelines.AfterRequest.AddItemToEndOfPipeline(c => CompressResponse(c.Request, c.Response));
+            pipelines.AfterRequest.AddItemToEndOfPipeline(CompressResponse);
         }
 
-        private Response CompressResponse(Request request, Response response)
+        private void CompressResponse(NancyContext context)
         {
+            var request = context.Request;
+            var response = context.Response;
+
             try
             {
                 if (
                    !response.ContentType.Contains("image")
                 && !response.ContentType.Contains("font")
                 && request.Headers.AcceptEncoding.Any(x => x.Contains("gzip"))
-                && (!response.Headers.ContainsKey("Content-Encoding") || response.Headers["Content-Encoding"] != "gzip"))
+                && !AlreadyGzipEncoded(response)
+                && !ContentLengthIsTooSmall(response))
                 {
-                    var data = new MemoryStream();
-                    response.Contents.Invoke(data);
-                    data.Position = 0;
-                    if (data.Length < 1024)
-                    {
-                        response.Contents = stream =>
-                        {
-                            data.CopyTo(stream);
-                            stream.Flush();
-                        };
-                    }
-                    else
-                    {
-                        response.Headers["Content-Encoding"] = "gzip";
-                        response.Contents = s =>
-                        {
-                            var gzip = new GZipStream(s, CompressionMode.Compress, true);
-                            data.CopyTo(gzip);
-                            gzip.Close();
-                        };
-                    }
-                }
+                    var contents = response.Contents;
 
-                return response;
+                    response.Headers["Content-Encoding"] = "gzip";
+                    response.Contents = responseStream =>
+                    {
+                        using (var gzip = new GZipStream(responseStream, CompressionMode.Compress, true))
+                        using (var buffered = new BufferedStream(gzip, 8192))
+                        {
+                            contents.Invoke(buffered);
+                        }
+                    };
+                }
             }
 
             catch (Exception ex)
             {
-                _logger.ErrorException("Unable to gzip response", ex);
+                _logger.Error(ex, "Unable to gzip response");
                 throw;
             }
         }
+
+        private static bool ContentLengthIsTooSmall(Response response)
+        {
+            var contentLength = response.Headers.GetValueOrDefault("Content-Length");
+            if (contentLength != null && long.Parse(contentLength) < 1024)
+            {
+                return true;
+            }
+            return false;
+        }
+
+        private static bool AlreadyGzipEncoded(Response response)
+        {
+            var contentEncoding = response.Headers.GetValueOrDefault("Content-Encoding");
+            if (contentEncoding == "gzip")
+            {
+                return true;
+            }
+            return false;
+        }
     }
 }

src/NzbDrone.Api/Extensions/Pipelines/IRegisterNancyPipeline.cs

@@ -4,6 +4,8 @@ namespace NzbDrone.Api.Extensions.Pipelines
 {
     public interface IRegisterNancyPipeline
     {
+        int Order { get; }
+
         void Register(IPipelines pipelines);
     }
 }

src/NzbDrone.Api/Extensions/Pipelines/IfModifiedPipeline.cs

@@ -14,6 +14,8 @@ namespace NzbDrone.Api.Extensions.Pipelines
             _cacheableSpecification = cacheableSpecification;
         }
 
+        public int Order { get { return 0; } }
+
         public void Register(IPipelines pipelines)
         {
             pipelines.BeforeRequest.AddItemToStartOfPipeline((Func<NancyContext, Response>) Handle);

src/NzbDrone.Api/Extensions/Pipelines/NzbDroneVersionPipeline.cs

@@ -7,6 +7,8 @@ namespace NzbDrone.Api.Extensions.Pipelines
 {
     public class NzbDroneVersionPipeline : IRegisterNancyPipeline
     {
+        public int Order { get { return 0; } }
+
         public void Register(IPipelines pipelines)
         {
             pipelines.AfterRequest.AddItemToStartOfPipeline((Action<NancyContext>) Handle);

src/NzbDrone.Api/Extensions/Pipelines/RequestLoggingPipeline.cs

@@ -0,0 +1,92 @@
+using System;
+using System.Linq;
+using System.Threading;
+using Nancy;
+using Nancy.Bootstrapper;
+using NLog;
+using NzbDrone.Api.ErrorManagement;
+using NzbDrone.Common.Extensions;
+
+namespace NzbDrone.Api.Extensions.Pipelines
+{
+    public class RequestLoggingPipeline : IRegisterNancyPipeline
+    {
+        private static readonly Logger _loggerHttp = LogManager.GetLogger("Http");
+        private static readonly Logger _loggerApi = LogManager.GetLogger("Api");
+
+        private static int _requestSequenceID;
+
+        private readonly NzbDroneErrorPipeline _errorPipeline;
+
+        public RequestLoggingPipeline(NzbDroneErrorPipeline errorPipeline)
+        {
+            _errorPipeline = errorPipeline;
+        }
+
+        public int Order { get { return 100; } }
+
+        public void Register(IPipelines pipelines)
+        {
+            pipelines.BeforeRequest.AddItemToStartOfPipeline(LogStart);
+            pipelines.AfterRequest.AddItemToEndOfPipeline(LogEnd);
+            pipelines.OnError.AddItemToEndOfPipeline(LogError);
+        }
+
+        private Response LogStart(NancyContext context)
+        {
+            var id = Interlocked.Increment(ref _requestSequenceID);
+
+            context.Items["ApiRequestSequenceID"] = id;
+            context.Items["ApiRequestStartTime"] = DateTime.UtcNow;
+
+            var reqPath = GetRequestPathAndQuery(context.Request);
+            
+            _loggerHttp.Trace("Req: {0} [{1}] {2}", id, context.Request.Method, reqPath);
+
+            return null;
+        }
+
+        private void LogEnd(NancyContext context)
+        {
+            var id = (int)context.Items["ApiRequestSequenceID"];
+            var startTime = (DateTime)context.Items["ApiRequestStartTime"];
+
+            var endTime = DateTime.UtcNow;
+            var duration = endTime - startTime;
+
+            var reqPath = GetRequestPathAndQuery(context.Request);
+
+            _loggerHttp.Trace("Res: {0} [{1}] {2}: {3}.{4} ({5} ms)", id, context.Request.Method, reqPath, (int)context.Response.StatusCode, context.Response.StatusCode, (int)duration.TotalMilliseconds);
+
+            if (context.Request.IsApiRequest())
+            {
+                _loggerApi.Debug("[{0}] {1}: {2}.{3} ({4} ms)", context.Request.Method, reqPath, (int)context.Response.StatusCode, context.Response.StatusCode, (int)duration.TotalMilliseconds);
+            }
+        }
+
+        private Response LogError(NancyContext context, Exception exception)
+        {
+            var response = _errorPipeline.HandleException(context, exception);
+
+            context.Response = response;
+
+            LogEnd(context);
+
+            context.Response = null;
+
+            return response;
+        }
+
+        private static string GetRequestPathAndQuery(Request request)
+        {
+            if (request.Url.Query.IsNotNullOrWhiteSpace())
+            {
+                return string.Concat(request.Url.Path, "?", request.Url.Query);
+            }
+            else
+            {
+                return request.Url.Path;
+            }
+        }
+    }
+}

src/NzbDrone.Api/Health/HealthModule.cs

@@ -20,7 +20,7 @@ namespace NzbDrone.Api.Health
 
         private List<HealthResource> GetHealth()
         {
-            return ToListResource(_healthCheckService.Results);
+            return _healthCheckService.Results().ToResource();
         }
 
         public void Handle(HealthCheckCompleteEvent message)

src/NzbDrone.Api/Health/HealthResource.cs

@@ -1,5 +1,8 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using NzbDrone.Api.REST;
+using NzbDrone.Common.Http;
 using NzbDrone.Core.HealthCheck;
 
 namespace NzbDrone.Api.Health
@@ -8,6 +11,28 @@ namespace NzbDrone.Api.Health
     {
         public HealthCheckResult Type { get; set; }
         public string Message { get; set; }
-        public Uri WikiUrl { get; set; }
+        public HttpUri WikiUrl { get; set; }
+    }
+
+    public static class HealthResourceMapper
+    {
+        public static HealthResource ToResource(this HealthCheck model)
+        {
+            if (model == null) return null;
+
+            return new HealthResource
+            {
+                Id = model.Id,
+
+                Type = model.Type,
+                Message = model.Message,
+                WikiUrl = model.WikiUrl
+            };
+        }
+
+        public static List<HealthResource> ToResource(this IEnumerable<HealthCheck> models)
+        {
+            return models.Select(ToResource).ToList();
+        }
     }
 }

src/NzbDrone.Api/History/HistoryModule.cs

@@ -1,6 +1,8 @@
 using System;
 using Nancy;
+using NzbDrone.Api.Episodes;
 using NzbDrone.Api.Extensions;
+using NzbDrone.Api.Series;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.Download;
@@ -26,15 +28,16 @@ namespace NzbDrone.Api.History
             Post["/failed"] = x => MarkAsFailed();
         }
 
-        protected override HistoryResource ToResource<TModel>(TModel model)
+        protected HistoryResource MapToResource(Core.History.History model)
         {
-            var resource = base.ToResource(model);
+            var resource = model.ToResource();
 
-            var history = model as Core.History.History;
+            resource.Series = model.Series.ToResource();
+            resource.Episode = model.Episode.ToResource();
 
-            if (history != null && history.Series != null)
+            if (model.Series != null)
             {
-                resource.QualityCutoffNotMet = _qualityUpgradableSpecification.CutoffNotMet(history.Series.Profile.Value, history.Quality);
+                resource.QualityCutoffNotMet = _qualityUpgradableSpecification.CutoffNotMet(model.Series.Profile.Value, model.Quality);
             }
 
             return resource;
@@ -44,13 +47,7 @@ namespace NzbDrone.Api.History
         {
             var episodeId = Request.Query.EpisodeId;
 
-            var pagingSpec = new PagingSpec<Core.History.History>
-                                 {
-                                     Page = pagingResource.Page,
-                                     PageSize = pagingResource.PageSize,
-                                     SortKey = pagingResource.SortKey,
-                                     SortDirection = pagingResource.SortDirection
-                                 };
+            var pagingSpec = pagingResource.MapToPagingSpec<HistoryResource, Core.History.History>("date", SortDirection.Descending);
 
             if (pagingResource.FilterKey == "eventType")
             {
@@ -64,7 +61,7 @@ namespace NzbDrone.Api.History
                 pagingSpec.FilterExpression = h => h.EpisodeId == i;
             }
 
-            return ApplyToPage(_historyService.Paged, pagingSpec);
+            return ApplyToPage(_historyService.Paged, pagingSpec, MapToResource);
         }
 
         private Response MarkAsFailed()

src/NzbDrone.Api/History/HistoryResource.cs

@@ -17,8 +17,6 @@ namespace NzbDrone.Api.History
         public QualityModel Quality { get; set; }
         public bool QualityCutoffNotMet { get; set; }
         public DateTime Date { get; set; }
-        public string Indexer { get; set; }
-        public string ReleaseGroup { get; set; }
         public string DownloadId { get; set; }
 
         public HistoryEventType EventType { get; set; }
@@ -28,4 +26,31 @@ namespace NzbDrone.Api.History
         public EpisodeResource Episode { get; set; }
         public SeriesResource Series { get; set; }
     }
+
+    public static class HistoryResourceMapper
+    {
+        public static HistoryResource ToResource(this Core.History.History model)
+        {
+            if (model == null) return null;
+
+            return new HistoryResource
+            {
+                Id = model.Id,
+
+                EpisodeId = model.EpisodeId,
+                SeriesId = model.SeriesId,
+                SourceTitle = model.SourceTitle,
+                Quality = model.Quality,
+                //QualityCutoffNotMet
+                Date = model.Date,
+                DownloadId = model.DownloadId,
+
+                EventType = model.EventType,
+
+                Data  = model.Data
+                //Episode
+                //Series
+            };
+        }
+    }
 }

src/NzbDrone.Api/Indexers/IndexerModule.cs

@@ -1,4 +1,5 @@
-using NzbDrone.Core.Indexers;
+using System;
+using NzbDrone.Core.Indexers;
 
 namespace NzbDrone.Api.Indexers
 {
@@ -9,6 +10,25 @@ namespace NzbDrone.Api.Indexers
         {
         }
 
+        protected override void MapToResource(IndexerResource resource, IndexerDefinition definition)
+        {
+            base.MapToResource(resource, definition);
+            
+            resource.EnableRss = definition.EnableRss;
+            resource.EnableSearch = definition.EnableSearch;
+            resource.SupportsRss = definition.SupportsRss;
+            resource.SupportsSearch = definition.SupportsSearch;
+            resource.Protocol = definition.Protocol;
+        }
+
+        protected override void MapToModel(IndexerDefinition definition, IndexerResource resource)
+        {
+            base.MapToModel(definition, resource);
+
+            definition.EnableRss = resource.EnableRss;
+            definition.EnableSearch = resource.EnableSearch;
+        }
+
         protected override void Validate(IndexerDefinition definition, bool includeWarnings)
         {
             if (!definition.Enable) return;

src/NzbDrone.Api/Indexers/ReleaseModule.cs

@@ -68,7 +68,7 @@ namespace NzbDrone.Api.Indexers
             }
             catch (ReleaseDownloadException ex)
             {
-                _logger.ErrorException(ex.Message, ex);
+                _logger.Error(ex, ex.Message);
                 throw new NzbDroneClientException(HttpStatusCode.Conflict, "Getting release from indexer failed");
             }
 
@@ -89,14 +89,14 @@ namespace NzbDrone.Api.Indexers
         {
             try
             {
-                var decisions = _nzbSearchService.EpisodeSearch(episodeId);
+                var decisions = _nzbSearchService.EpisodeSearch(episodeId, true);
                 var prioritizedDecisions = _prioritizeDownloadDecision.PrioritizeDecisions(decisions);
 
                 return MapDecisions(prioritizedDecisions);
             }
             catch (Exception ex)
             {
-                _logger.ErrorException("Episode search failed: " + ex.Message, ex);
+                _logger.Error(ex, "Episode search failed: " + ex.Message);
             }
 
             return new List<ReleaseResource>();

src/NzbDrone.Api/Indexers/ReleaseModuleBase.cs

@@ -2,7 +2,6 @@
 using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Parser.Model;
-using Omu.ValueInjecter;
 using System.Linq;
 
 namespace NzbDrone.Api.Indexers
@@ -25,42 +24,20 @@ namespace NzbDrone.Api.Indexers
 
         protected virtual ReleaseResource MapDecision(DownloadDecision decision, int initialWeight)
         {
-            var release = new ReleaseResource();
+            var release = decision.ToResource();
 
-            release.InjectFrom(decision.RemoteEpisode.Release);
-            release.InjectFrom(decision.RemoteEpisode.ParsedEpisodeInfo);
-            release.InjectFrom(decision);
-            release.Rejections = decision.Rejections.Select(r => r.Reason).ToList();
-            release.DownloadAllowed = decision.RemoteEpisode.DownloadAllowed;
             release.ReleaseWeight = initialWeight;
 
             if (decision.RemoteEpisode.Series != null)
             {
-                release.QualityWeight = decision.RemoteEpisode
-                                                        .Series
-                                                        .Profile
-                                                        .Value
-                                                        .Items
-                                                        .FindIndex(v => v.Quality == release.Quality.Quality) * 100;
+                release.QualityWeight = decision.RemoteEpisode.Series
+                                                              .Profile.Value
+                                                              .Items.FindIndex(v => v.Quality == release.Quality.Quality) * 100;
             }
 
             release.QualityWeight += release.Quality.Revision.Real * 10;
             release.QualityWeight += release.Quality.Revision.Version;
 
-            var torrentRelease = decision.RemoteEpisode.Release as TorrentInfo;
-
-            if (torrentRelease != null)
-            {
-                release.Protocol = DownloadProtocol.Torrent;
-                release.Seeders = torrentRelease.Seeders;
-                //TODO: move this up the chains
-                release.Leechers = torrentRelease.Peers - torrentRelease.Seeders;
-            }
-            else
-            {
-                release.Protocol = DownloadProtocol.Usenet;
-            }
-
             return release;
         }
     }

src/NzbDrone.Api/Indexers/ReleasePushModule.cs

@@ -6,9 +6,9 @@ using NzbDrone.Core.Download;
 using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Core.Parser.Model;
-using NzbDrone.Api.Mapping;
 using NzbDrone.Api.Extensions;
 using NLog;
+using NzbDrone.Core.Indexers;
 
 namespace NzbDrone.Api.Indexers
 {
@@ -30,7 +30,7 @@ namespace NzbDrone.Api.Indexers
 
             PostValidator.RuleFor(s => s.Title).NotEmpty();
             PostValidator.RuleFor(s => s.DownloadUrl).NotEmpty();
-            PostValidator.RuleFor(s => s.DownloadProtocol).NotEmpty();
+            PostValidator.RuleFor(s => s.Protocol).NotEmpty();
             PostValidator.RuleFor(s => s.PublishDate).NotEmpty();
         }
 
@@ -38,11 +38,12 @@ namespace NzbDrone.Api.Indexers
         {
             _logger.Info("Release pushed: {0} - {1}", release.Title, release.DownloadUrl);
 
-            var info = release.InjectTo<ReleaseInfo>();
+            var info = release.ToModel();
+
             info.Guid = "PUSH-" + info.DownloadUrl;
 
             var decisions = _downloadDecisionMaker.GetRssDecision(new List<ReleaseInfo> { info });
-            var processed = _downloadDecisionProcessor.ProcessDecisions(decisions);
+            _downloadDecisionProcessor.ProcessDecisions(decisions);
 
             return MapDecisions(decisions).First().AsResponse();
         }

src/NzbDrone.Api/Indexers/ReleaseResource.cs

@@ -1,9 +1,13 @@
 using System;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 using NzbDrone.Api.REST;
 using NzbDrone.Core.Parser;
 using NzbDrone.Core.Qualities;
 using NzbDrone.Core.Indexers;
+using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.DecisionEngine;
+using System.Linq;
 
 namespace NzbDrone.Api.Indexers
 {
@@ -19,11 +23,9 @@ namespace NzbDrone.Api.Indexers
         public int IndexerId { get; set; }
         public string Indexer { get; set; }
         public string ReleaseGroup { get; set; }
-        public string SubGroup { get; set; }
         public string ReleaseHash { get; set; }
         public string Title { get; set; }
         public bool FullSeason { get; set; }
-        public bool SceneSource { get; set; }
         public int SeasonNumber { get; set; }
         public Language Language { get; set; }
         public string AirDate { get; set; }
@@ -44,16 +46,129 @@ namespace NzbDrone.Api.Indexers
         public int ReleaseWeight { get; set; }
 
 
+        public string MagnetUrl { get; set; }
+        public string InfoHash { get; set; }
         public int? Seeders { get; set; }
         public int? Leechers { get; set; }
         public DownloadProtocol Protocol { get; set; }
 
-        //TODO: besides a test I don't think this is used...
-        public DownloadProtocol DownloadProtocol { get; set; }
+
+        // TODO: Remove in v3
+        // Used to support the original Release Push implementation
+        // JsonIgnore so we don't serialize it, but can still parse it
+        [JsonIgnore]
+        public DownloadProtocol DownloadProtocol
+        {
+            get
+            {
+                return Protocol;
+            }
+            set
+            {
+                if (value > 0 && Protocol == 0)
+                {
+                    Protocol = value;
+                }
+            }
+        }
 
         public bool IsDaily { get; set; }
         public bool IsAbsoluteNumbering { get; set; }
         public bool IsPossibleSpecialEpisode { get; set; }
         public bool Special { get; set; }
     }
+
+    public static class ReleaseResourceMapper
+    {
+        public static ReleaseResource ToResource(this DownloadDecision model)
+        {
+            var releaseInfo = model.RemoteEpisode.Release;
+            var parsedEpisodeInfo = model.RemoteEpisode.ParsedEpisodeInfo;
+            var remoteEpisode = model.RemoteEpisode;
+            var torrentInfo = (model.RemoteEpisode.Release as TorrentInfo) ?? new TorrentInfo();
+
+            // TODO: Clean this mess up. don't mix data from multiple classes, use sub-resources instead? (Got a huge Deja Vu, didn't we talk about this already once?)
+            return new ReleaseResource
+            {
+                Guid = releaseInfo.Guid,
+                Quality = parsedEpisodeInfo.Quality,
+                //QualityWeight
+                Age = releaseInfo.Age,
+                AgeHours = releaseInfo.AgeHours,
+                AgeMinutes = releaseInfo.AgeMinutes,
+                Size = releaseInfo.Size,
+                IndexerId = releaseInfo.IndexerId,
+                Indexer = releaseInfo.Indexer,
+                ReleaseGroup = parsedEpisodeInfo.ReleaseGroup,
+                ReleaseHash = parsedEpisodeInfo.ReleaseHash,
+                Title = releaseInfo.Title,
+                FullSeason = parsedEpisodeInfo.FullSeason,
+                SeasonNumber = parsedEpisodeInfo.SeasonNumber,
+                Language = parsedEpisodeInfo.Language,
+                AirDate = parsedEpisodeInfo.AirDate,
+                SeriesTitle = parsedEpisodeInfo.SeriesTitle,
+                EpisodeNumbers = parsedEpisodeInfo.EpisodeNumbers,
+                AbsoluteEpisodeNumbers = parsedEpisodeInfo.AbsoluteEpisodeNumbers,
+                Approved = model.Approved,
+                TemporarilyRejected = model.TemporarilyRejected,
+                Rejected = model.Rejected,
+                TvdbId = releaseInfo.TvdbId,
+                TvRageId = releaseInfo.TvRageId,
+                Rejections = model.Rejections.Select(r => r.Reason).ToList(),
+                PublishDate = releaseInfo.PublishDate,
+                CommentUrl = releaseInfo.CommentUrl,
+                DownloadUrl = releaseInfo.DownloadUrl,
+                InfoUrl = releaseInfo.InfoUrl,
+                DownloadAllowed = remoteEpisode.DownloadAllowed,
+                //ReleaseWeight
+
+                MagnetUrl = torrentInfo.MagnetUrl,
+                InfoHash = torrentInfo.InfoHash,
+                Seeders = torrentInfo.Seeders,
+                Leechers = (torrentInfo.Peers.HasValue && torrentInfo.Seeders.HasValue) ? (torrentInfo.Peers.Value - torrentInfo.Seeders.Value) : (int?)null,
+                Protocol = releaseInfo.DownloadProtocol,
+
+                IsDaily = parsedEpisodeInfo.IsDaily,
+                IsAbsoluteNumbering = parsedEpisodeInfo.IsAbsoluteNumbering,
+                IsPossibleSpecialEpisode = parsedEpisodeInfo.IsPossibleSpecialEpisode,
+                Special = parsedEpisodeInfo.Special,
+            };
+
+        }
+
+        public static ReleaseInfo ToModel(this ReleaseResource resource)
+        {
+            ReleaseInfo model;
+
+            if (resource.Protocol == DownloadProtocol.Torrent)
+            {
+                model = new TorrentInfo
+                {
+                    MagnetUrl = resource.MagnetUrl,
+                    InfoHash = resource.InfoHash,
+                    Seeders = resource.Seeders,
+                    Peers = (resource.Seeders.HasValue && resource.Leechers.HasValue) ? (resource.Seeders + resource.Leechers) : null
+                };
+            }
+            else
+            {
+                model = new ReleaseInfo();
+            }
+
+            model.Guid = resource.Guid;
+            model.Title = resource.Title;
+            model.Size = resource.Size;
+            model.DownloadUrl = resource.DownloadUrl;
+            model.InfoUrl = resource.InfoUrl;
+            model.CommentUrl = resource.CommentUrl;
+            model.IndexerId = resource.IndexerId;
+            model.Indexer = resource.Indexer;
+            model.DownloadProtocol = resource.DownloadProtocol;
+            model.TvdbId = resource.TvdbId;
+            model.TvRageId = resource.TvRageId;
+            model.PublishDate = resource.PublishDate;
+
+            return model;
+        }
+    }
 }

src/NzbDrone.Api/Logs/LogModule.cs

@@ -1,6 +1,5 @@
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Instrumentation;
-using NzbDrone.Api.Mapping;
 
 namespace NzbDrone.Api.Logs
 {
@@ -16,7 +15,7 @@ namespace NzbDrone.Api.Logs
 
         private PagingResource<LogResource> GetLogs(PagingResource<LogResource> pagingResource)
         {
-            var pageSpec = pagingResource.InjectTo<PagingSpec<Log>>();
+            var pageSpec = pagingResource.MapToPagingSpec<LogResource, Log>();
 
             if (pageSpec.SortKey == "time")
             {
@@ -48,7 +47,7 @@ namespace NzbDrone.Api.Logs
                 }
             }
 
-            return ApplyToPage(_logService.Paged, pageSpec);
+            return ApplyToPage(_logService.Paged, pageSpec, LogResourceMapper.ToResource);
         }
     }
 }

src/NzbDrone.Api/Logs/LogResource.cs

@@ -11,6 +11,25 @@ namespace NzbDrone.Api.Logs
         public string Level { get; set; }
         public string Logger { get; set; }
         public string Message { get; set; }
-        public string Method { get; set; }
+    }
+
+    public static class LogResourceMapper
+    {
+        public static LogResource ToResource(this Core.Instrumentation.Log model)
+        {
+            if (model == null) return null;
+
+            return new LogResource
+            {
+                Id = model.Id,
+
+                Time = model.Time,
+                Exception = model.Exception,
+                ExceptionType = model.ExceptionType,
+                Level = model.Level,
+                Logger = model.Logger,
+                Message = model.Message
+            };
+        }
     }
 }

src/NzbDrone.Api/ManualImport/ManualImportModule.cs

@@ -25,14 +25,17 @@ namespace NzbDrone.Api.ManualImport
             var downloadIdQuery = Request.Query.downloadId;
             var downloadId = (string)downloadIdQuery.Value;
 
-            return ToListResource(_manualImportService.GetMediaFiles(folder, downloadId)).Select(AddQualityWeight).ToList();
+            return _manualImportService.GetMediaFiles(folder, downloadId).ToResource().Select(AddQualityWeight).ToList();
         }
 
         private ManualImportResource AddQualityWeight(ManualImportResource item)
         {
-            item.QualityWeight = Quality.DefaultQualityDefinitions.Single(q => q.Quality == item.Quality.Quality).Weight;
-            item.QualityWeight += item.Quality.Revision.Real * 10;
-            item.QualityWeight += item.Quality.Revision.Version;
+            if (item.Quality != null)
+            {
+                item.QualityWeight = Quality.DefaultQualityDefinitions.Single(q => q.Quality == item.Quality.Quality).Weight;
+                item.QualityWeight += item.Quality.Revision.Real * 10;
+                item.QualityWeight += item.Quality.Revision.Version;
+            }
            
             return item;
         }

src/NzbDrone.Api/ManualImport/ManualImportResource.cs

@@ -1,7 +1,9 @@
 using System.Collections.Generic;
+using System.Linq;
 using NzbDrone.Api.Episodes;
 using NzbDrone.Api.REST;
 using NzbDrone.Api.Series;
+using NzbDrone.Common.Crypto;
 using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.Qualities;
 
@@ -20,13 +22,35 @@ namespace NzbDrone.Api.ManualImport
         public int QualityWeight { get; set; }
         public string DownloadId { get; set; }
         public IEnumerable<Rejection> Rejections { get; set; }
+    }
 
-        public int Id
+    public static class ManualImportResourceMapper
+    {
+        public static ManualImportResource ToResource(this Core.MediaFiles.EpisodeImport.Manual.ManualImportItem model)
         {
-            get
+            if (model == null) return null;
+
+            return new ManualImportResource
             {
-                return Path.GetHashCode();
-            }
+                Id = HashConverter.GetHashInt31(model.Path),
+
+                Path = model.Path,
+                RelativePath = model.RelativePath,
+                Name = model.Name,
+                Size = model.Size,
+                Series = model.Series.ToResource(),
+                SeasonNumber = model.SeasonNumber,
+                Episodes = model.Episodes.ToResource(),
+                Quality = model.Quality,
+                //QualityWeight
+                DownloadId = model.DownloadId,
+                Rejections = model.Rejections
+            };
+        }
+
+        public static List<ManualImportResource> ToResource(this IEnumerable<Core.MediaFiles.EpisodeImport.Manual.ManualImportItem> models)
+        {
+            return models.Select(ToResource).ToList();
         }
     }
 }

src/NzbDrone.Api/Mapping/CloneInjection.cs

@@ -1,125 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using Marr.Data;
-using Omu.ValueInjecter;
-
-namespace NzbDrone.Api.Mapping
-{
-    public class CloneInjection : ConventionInjection
-    {
-        protected override bool Match(ConventionInfo conventionInfo)
-        {
-            return conventionInfo.SourceProp.Name == conventionInfo.TargetProp.Name &&
-                   conventionInfo.SourceProp.Value != null;
-        }
-
-        protected override object SetValue(ConventionInfo conventionInfo)
-        {
-            if (conventionInfo.SourceProp.Type == conventionInfo.TargetProp.Type)
-                return conventionInfo.SourceProp.Value;
-
-
-            if (conventionInfo.SourceProp.Type.IsArray)
-            {
-                var array = (Array)conventionInfo.SourceProp.Value;
-                var clone = (Array)array.Clone();
-
-                for (var index = 0; index < array.Length; index++)
-                {
-                    var item = array.GetValue(index);
-                    if (!item.GetType().IsValueType && !(item is string))
-                    {
-                        clone.SetValue(Activator.CreateInstance(item.GetType()).InjectFrom<CloneInjection>(item), index);
-                    }
-                }
-
-                return clone;
-            }
-
-            if (conventionInfo.SourceProp.Type.IsGenericType)
-            {
-                var genericInterfaces = conventionInfo.SourceProp.Type.GetGenericTypeDefinition().GetInterfaces();
-                if (genericInterfaces.Any(d => d == typeof(IEnumerable)))
-                {
-                    return MapLists(conventionInfo);
-                }
-
-                if (genericInterfaces.Any(i => i == typeof(ILazyLoaded)))
-                {
-                    return MapLazy(conventionInfo);
-                }
-
-                //unhandled generic type, you could also return null or throw
-                return conventionInfo.SourceProp.Value;
-            }
-
-            //for simple object types create a new instace and apply the clone injection on it
-            return Activator.CreateInstance(conventionInfo.TargetProp.Type)
-                            .InjectFrom<CloneInjection>(conventionInfo.SourceProp.Value);
-        }
-
-        private static object MapLazy(ConventionInfo conventionInfo)
-        {
-            var sourceArgument = conventionInfo.SourceProp.Type.GetGenericArguments()[0];
-
-            dynamic lazy = conventionInfo.SourceProp.Value;
-
-            if (lazy.IsLoaded && lazy.Value != null)
-            {
-                if (conventionInfo.TargetProp.Type.IsAssignableFrom(sourceArgument))
-                {
-                    return lazy.Value;
-                }
-
-                var genericArgument = conventionInfo.TargetProp.Type;
-
-                if (genericArgument.IsValueType || genericArgument == typeof(string))
-                {
-                    return lazy.Value;
-                }
-
-                if (genericArgument.IsGenericType)
-                {
-                    if (conventionInfo.SourceProp.Type.GetGenericTypeDefinition().GetInterfaces().Any(d => d == typeof(IEnumerable)))
-                    {
-                        return MapLists(genericArgument, lazy.Value);
-                    }
-                }
-
-                return Activator.CreateInstance(genericArgument).InjectFrom((object)lazy.Value);
-            }
-
-            return null;
-        }
-
-        private static object MapLists(ConventionInfo conventionInfo)
-        {
-            var genericArgument = conventionInfo.TargetProp.Type.GetGenericArguments()[0];
-
-            return MapLists(genericArgument, conventionInfo.SourceProp.Value);
-        }
-
-        private static object MapLists(Type targetType, object sourceValue)
-        {
-            if (targetType.IsValueType || targetType == typeof(string))
-            {
-                return sourceValue;
-            }
-
-            var listType = typeof(List<>).MakeGenericType(targetType);
-            var addMethod = listType.GetMethod("Add");
-
-            var result = Activator.CreateInstance(listType);
-
-            foreach (var sourceItem in (IEnumerable)sourceValue)
-            {
-                var e = Activator.CreateInstance(targetType).InjectFrom<CloneInjection>(sourceItem);
-                addMethod.Invoke(result, new[] { e });
-            }
-
-            return result;
-        }
-    }
-}

src/NzbDrone.Api/Mapping/MappingValidation.cs

@@ -1,54 +0,0 @@
-using System;
-using System.Linq;
-using System.Reflection;
-using NzbDrone.Api.REST;
-using NzbDrone.Common.Reflection;
-
-namespace NzbDrone.Api.Mapping
-{
-    public static class MappingValidation
-    {
-        public static void ValidateMapping(Type modelType, Type resourceType)
-        {
-            var errors = modelType.GetSimpleProperties().Where(c=>!c.GetGetMethod().IsStatic).Select(p => GetError(resourceType, p)).Where(c => c != null).ToList();
-
-            if (errors.Any())
-            {
-                throw new ResourceMappingException(errors);
-            }
-
-            PrintExtraProperties(modelType, resourceType);
-        }
-
-        private static void PrintExtraProperties(Type modelType, Type resourceType)
-        {
-            var resourceBaseProperties = typeof(RestResource).GetProperties().Select(c => c.Name);
-            var resourceProperties = resourceType.GetProperties().Select(c => c.Name).Except(resourceBaseProperties);
-            var modelProperties = modelType.GetProperties().Select(c => c.Name);
-
-            var extra = resourceProperties.Except(modelProperties);
-
-            foreach (var extraProp in extra)
-            {
-                Console.WriteLine("Extra: [{0}]", extraProp);
-            }
-        }
-
-        private static string GetError(Type resourceType, PropertyInfo modelProperty)
-        {
-            var resourceProperty = resourceType.GetProperties().FirstOrDefault(c => c.Name == modelProperty.Name);
-
-            if (resourceProperty == null)
-            {
-                return string.Format("public {0} {1} {{ get; set; }}", modelProperty.PropertyType.Name, modelProperty.Name);
-            }
-
-            if (resourceProperty.PropertyType != modelProperty.PropertyType && !typeof(RestResource).IsAssignableFrom(resourceProperty.PropertyType))
-            {
-                return string.Format("Expected {0}.{1} to have type of {2} but found {3}", resourceType.Name, resourceProperty.Name, modelProperty.PropertyType, resourceProperty.PropertyType);
-            }
-
-            return null;
-        }
-    }
-}

src/NzbDrone.Api/Mapping/ResourceMappingException.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace NzbDrone.Api.Mapping
-{
-    public class ResourceMappingException : ApplicationException
-    {
-        public ResourceMappingException(IEnumerable<string> error)
-            : base(Environment.NewLine + string.Join(Environment.NewLine, error.OrderBy(c => c)))
-        {
-
-        }
-    }
-}

src/NzbDrone.Api/Mapping/ValueInjectorExtensions.cs

@@ -1,42 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using Omu.ValueInjecter;
-
-namespace NzbDrone.Api.Mapping
-{
-    public static class ValueInjectorExtensions
-    {
-        public static TTarget InjectTo<TTarget>(this object source) where TTarget : new()
-        {
-            if (source == null) return default(TTarget);
-
-            var targetType = typeof(TTarget);
-
-            if (targetType.IsGenericType &&
-                targetType.GetGenericTypeDefinition() != null &&
-                targetType.GetGenericTypeDefinition().GetInterfaces().Contains(typeof(IEnumerable)) &&
-                source.GetType().IsGenericType &&
-                source.GetType().GetGenericTypeDefinition() != null &&
-                source.GetType().GetGenericTypeDefinition().GetInterfaces().Contains(typeof(IEnumerable)))
-            {
-                var result = new TTarget();
-
-                var listSubType = targetType.GetGenericArguments()[0];
-                var listType = typeof(List<>).MakeGenericType(listSubType);
-                var addMethod = listType.GetMethod("Add");
-
-                foreach (var sourceItem in (IEnumerable)source)
-                {
-                    var e = Activator.CreateInstance(listSubType).InjectFrom<CloneInjection>(sourceItem);
-                    addMethod.Invoke(result, new[] { e });
-                }
-
-                return result;
-            }
-
-            return (TTarget)new TTarget().InjectFrom<CloneInjection>(source);
-        }
-    }
-}

src/NzbDrone.Api/Metadata/MetadataModule.cs

@@ -1,4 +1,5 @@
-using NzbDrone.Core.Metadata;
+using System;
+using NzbDrone.Core.Extras.Metadata;
 
 namespace NzbDrone.Api.Metadata
 {
@@ -9,6 +10,20 @@ namespace NzbDrone.Api.Metadata
         {
         }
 
+        protected override void MapToResource(MetadataResource resource, MetadataDefinition definition)
+        {
+            base.MapToResource(resource, definition);
+
+            resource.Enable = definition.Enable;
+        }
+
+        protected override void MapToModel(MetadataDefinition definition, MetadataResource resource)
+        {
+            base.MapToModel(definition, resource);
+
+            definition.Enable = resource.Enable;
+        }
+
         protected override void Validate(MetadataDefinition definition, bool includeWarnings)
         {
             if (!definition.Enable) return;

src/NzbDrone.Api/NancyBootstrapper.cs

@@ -1,8 +1,9 @@
 using System;
-using NLog;
+using System.Linq;
 using Nancy;
 using Nancy.Bootstrapper;
 using Nancy.Diagnostics;
+using NLog;
 using NzbDrone.Api.ErrorManagement;
 using NzbDrone.Api.Extensions.Pipelines;
 using NzbDrone.Common.EnvironmentInfo;
@@ -37,13 +38,11 @@ namespace NzbDrone.Api
 
             container.Resolve<DatabaseTarget>().Register();
             container.Resolve<IEventAggregator>().PublishEvent(new ApplicationStartedEvent());
-
-            ApplicationPipelines.OnError.AddItemToEndOfPipeline((Func<NancyContext, Exception, Response>) container.Resolve<NzbDroneErrorPipeline>().HandleException);
         }
 
         private void RegisterPipelines(IPipelines pipelines)
         {
-            var pipelineRegistrars = _tinyIoCContainer.ResolveAll<IRegisterNancyPipeline>();
+            var pipelineRegistrars = _tinyIoCContainer.ResolveAll<IRegisterNancyPipeline>().OrderBy(v => v.Order).ToList();
 
             foreach (var registerNancyPipeline in pipelineRegistrars)
             {

src/NzbDrone.Api/Notifications/NotificationModule.cs

@@ -1,4 +1,5 @@
-using NzbDrone.Core.Notifications;
+using System;
+using NzbDrone.Core.Notifications;
 
 namespace NzbDrone.Api.Notifications
 {
@@ -9,6 +10,36 @@ namespace NzbDrone.Api.Notifications
         {
         }
 
+        protected override void MapToResource(NotificationResource resource, NotificationDefinition definition)
+        {
+            base.MapToResource(resource, definition);
+            
+            resource.OnGrab = definition.OnGrab;
+            resource.OnDownload = definition.OnDownload;
+            resource.OnUpgrade = definition.OnUpgrade;
+            resource.OnRename = definition.OnRename;
+            resource.SupportsOnGrab = definition.SupportsOnGrab;
+            resource.SupportsOnDownload = definition.SupportsOnDownload;
+            resource.SupportsOnUpgrade = definition.SupportsOnUpgrade;
+            resource.SupportsOnRename = definition.SupportsOnRename;
+            resource.Tags = definition.Tags;
+        }
+
+        protected override void MapToModel(NotificationDefinition definition, NotificationResource resource)
+        {
+            base.MapToModel(definition, resource);
+
+            definition.OnGrab = resource.OnGrab;
+            definition.OnDownload = resource.OnDownload;
+            definition.OnUpgrade = resource.OnUpgrade;
+            definition.OnRename = resource.OnRename;
+            definition.SupportsOnGrab = resource.SupportsOnGrab;
+            definition.SupportsOnDownload = resource.SupportsOnDownload;
+            definition.SupportsOnUpgrade = resource.SupportsOnUpgrade;
+            definition.SupportsOnRename = resource.SupportsOnRename;
+            definition.Tags = resource.Tags;
+        }
+
         protected override void Validate(NotificationDefinition definition, bool includeWarnings)
         {
             if (!definition.OnGrab && !definition.OnDownload) return;

src/NzbDrone.Api/Notifications/NotificationResource.cs

@@ -4,7 +4,6 @@ namespace NzbDrone.Api.Notifications
 {
     public class NotificationResource : ProviderResource
     {
-        public string Link { get; set; }
         public bool OnGrab { get; set; }
         public bool OnDownload { get; set; }
         public bool OnUpgrade { get; set; }
@@ -13,7 +12,6 @@ namespace NzbDrone.Api.Notifications
         public bool SupportsOnDownload { get; set; }
         public bool SupportsOnUpgrade { get; set; }
         public bool SupportsOnRename { get; set; }
-        public string TestCommand { get; set; }
         public HashSet<int> Tags { get; set; }
     }
 }