WIP: Statistics API endpoint.

.editorconfig

@@ -1,25 +0,0 @@
-# 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

@@ -1,5 +0,0 @@
-
-
-
-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

@@ -1,14 +0,0 @@
-#### 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

@@ -10,7 +10,6 @@ src/**/[Oo]bj/
 *.suo
 *.user
 *.sln.docstates
-.vs/
 
 # Build results
 *_i.c
@@ -42,9 +41,6 @@ src/**/[Oo]bj/
 _ReSharper*
 _dotCover*
 
-# DevExpress CodeRush
-src/.cr/
-
 # NCrunch
 *.ncrunch*
 .*crunch*.local.xml
@@ -132,4 +128,3 @@ output/*
 ._*
 
 _start
-_temp_*/**/*

.idea/encodings.xml

@@ -1,6 +0,0 @@
-<?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,7 @@
 <?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.
+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>.
 
 ## Documentation ##
 Setup guides, FAQ, the more information we have on the wiki the better.
@@ -8,8 +8,8 @@ Setup guides, FAQ, the more information we have on the wiki the better.
 ## Development ##
 
 ### Tools required ###
-- Visual Studio 2015
-- HTML/Javascript editor of choice (Sublime Text/Webstorm/Atom/etc)
+- Visual Studio 2013
+- HTML/Javascript editor of choice (Sublime Text/Webstorm/etc)
 - npm (node package manager)
 - git
 
@@ -18,9 +18,7 @@ Setup guides, FAQ, the more information we have on the wiki the better.
 1.  Fork Sonarr
 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 `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
+4.  Run `gulp watch` - Used to compile the UI components and copy them (leave this window open)
 5.  Compile in Visual Studio
 
 ### Contributing Code ###

build.sh

@@ -1,5 +1,5 @@
 #! /bin/bash
-msBuild='/c/Program Files (x86)/MSBuild/14.0/Bin'
+msBuild='/c/Windows/Microsoft.NET/Framework64/v4.0.30319/'
 outputFolder='./_output'
 outputFolderMono='./_output_mono'
 outputFolderOsx='./_output_osx'
@@ -102,12 +102,12 @@ Build()
 RunGulp()
 {
     echo "##teamcity[progressStart 'npm install']"
-    npm-cache install npm || CheckExitCode npm install
+    CheckExitCode npm install
     echo "##teamcity[progressFinish 'npm install']"
 
-    echo "##teamcity[progressStart 'Running gulp']"
-    CheckExitCode npm run build
-    echo "##teamcity[progressFinish 'Running gulp']"
+    echo "##teamcity[progressStart 'Running Gulp']"
+    CheckExitCode gulp build
+    echo "##teamcity[progressFinish 'Running Gulp']"
 }
 
 CreateMdbs()
@@ -208,9 +208,9 @@ PackageTests()
     find $sourceFolder -path $testSearchPattern -exec cp -r -u -T "{}" $testPackageFolder \;
 
     if [ $runtime = "dotnet" ] ; then
-        $nuget install NUnit.ConsoleRunner -Version 3.2.0 -Output $testPackageFolder
+        $nuget install NUnit.Runners -Version 2.6.1 -Output $testPackageFolder
     else
-        mono $nuget install NUnit.ConsoleRunner -Version 3.2.0 -Output $testPackageFolder
+        mono $nuget install NUnit.Runners -Version 2.6.1 -Output $testPackageFolder
     fi
 
     cp $outputFolder/*.dll $testPackageFolder

integration_mono.sh

@@ -0,0 +1,8 @@
+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

@@ -1,31 +1,17 @@
 #!/bin/sh
-
+ 
 #get the bundle's MacOS directory full path
 DIR=$(cd "$(dirname "$0")"; pwd)
-
+ 
 #change these values to match your app
 EXE_PATH="$DIR/NzbDrone.exe"
 APPNAME="Sonarr"
  
 #set up environment
-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_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"
+ 
 #mono version check
 REQUIRED_MAJOR=3
 REQUIRED_MINOR=10
@@ -35,9 +21,6 @@ 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,15 +4,14 @@
   "description": "Sonarr",
   "main": "main.js",
   "scripts": {
-    "build": "gulp build",
-    "start": "gulp watch"
+    "preinstall": ""
   },
   "repository": {
     "type": "git",
     "url": "git://github.com/Sonarr/Sonarr.git"
   },
   "author": "",
-  "license": "GPL-3.0",
+  "license": "BSD",
   "gitHead": "9ff7aa1bf7fe38c4c5bdb92f56c8ad556916ed67",
   "readmeFilename": "readme.md",
   "dependencies": {

readme.md

@@ -24,6 +24,7 @@ Sonarr is a PVR for Usenet and BitTorrent users. It can monitor multiple RSS fee
 - 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 ###
 
@@ -31,7 +32,8 @@ 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`
-- start gulp to monitor your dev environment for any changes that need post processing using `npm start` command.
+- install gulp `npm install gulp -g`
+- start gulp to monitor your dev environment for any changes that need post processing using `gulp watch` command.
 
 *Please note gulp must be running at all times while you are working with Sonarr client source files.*
 

schemas/torznab.xsd

@@ -75,8 +75,6 @@
       <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/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)
+                        catch (InvalidOperationException ex)
                         {
                             // Cannot get host name automatically, so assume that HostName is not used
                             // and log message is sent without it.

src/LogentriesCore/Properties/AssemblyInfo.cs

@@ -1,4 +1,5 @@
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

src/LogentriesNLog/LogentriesNLog.csproj

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

src/LogentriesNLog/Properties/AssemblyInfo.cs

@@ -1,4 +1,5 @@
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

src/LogentriesNLog/fastJSON/JSON.cs

@@ -24,7 +24,6 @@ namespace LogentriesNLog.fastJSON
             SerializeNullValues = false;
             UseOptimizedDatasetSchema = false;
             UsingGlobalTypes = false;
-            UseUTCDateTime = true;
         }
         public bool UseOptimizedDatasetSchema = true;
         public bool UseFastGuid = true;
@@ -40,7 +39,7 @@ namespace LogentriesNLog.fastJSON
             return ToJSON(obj, UseSerializerExtension, UseFastGuid, UseOptimizedDatasetSchema, SerializeNullValues);
         }
 
-
+      
         public string ToJSON(object obj,
                              bool enableSerializerExtensions,
                              bool enableFastGuid,
@@ -50,13 +49,13 @@ namespace LogentriesNLog.fastJSON
             return new JSONSerializer(enableOptimizedDatasetSchema, enableFastGuid, enableSerializerExtensions, serializeNullValues, IndentOutput).ConvertToJSON(obj);
         }
 
-
+      
         public T ToObject<T>(string json)
         {
             return (T)ToObject(json, typeof(T));
         }
 
-
+      
         public object ToObject(string json, Type type)
         {
             var ht = new JsonParser(json).Decode() as Dictionary<string, object>;
@@ -321,7 +320,7 @@ namespace LogentriesNLog.fastJSON
                 }
             }
 
-
+           
             _getterscache.Add(type, getters);
             return getters;
         }
@@ -449,7 +448,7 @@ namespace LogentriesNLog.fastJSON
 #if !SILVERLIGHT
                         else if (pi.isDictionary || pi.isHashtable)
                             oset = CreateDictionary((ArrayList)v, pi.pt, pi.GenericTypes, globaltypes);
-#else
+#else 
                         else if (pi.isDictionary)
                             oset = CreateDictionary((List<object>)v, pi.pt, pi.GenericTypes, globaltypes);
 #endif
@@ -818,4 +817,4 @@ namespace LogentriesNLog.fastJSON
         }
 #endif
     }
-}
+}

src/LogentriesNLog/fastJSON/JsonSerializer.cs

@@ -170,8 +170,6 @@ 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="4.3.11" targetFramework="net40" />
-</packages>
+  <package id="NLog" version="2.1.0" targetFramework="net40" />
+</packages>

src/Marr.Data/Mapping/FluentMappings.cs

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

src/Microsoft.AspNet.SignalR.Core/Infrastructure/CancellationTokenExtensions.cs

@@ -1,6 +1,9 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.md in the project root for license information.
 
 using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq.Expressions;
+using System.Reflection;
 using System.Threading;
 
 namespace Microsoft.AspNet.SignalR.Infrastructure

src/Microsoft.AspNet.SignalR.Core/Infrastructure/NoOpPerformanceCounter.cs

@@ -4,7 +4,7 @@ using System.Diagnostics;
 
 namespace Microsoft.AspNet.SignalR.Infrastructure
 {
-    public class NoOpPerformanceCounter : IPerformanceCounter
+    internal class NoOpPerformanceCounter : IPerformanceCounter
     {
         public string CounterName
         {

src/Microsoft.AspNet.SignalR.Core/PersistentConnection.cs

@@ -6,6 +6,7 @@ using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.SignalR.Configuration;
 using Microsoft.AspNet.SignalR.Hosting;

src/Microsoft.AspNet.SignalR.Core/TaskAsyncHelper.cs

@@ -1,9 +1,13 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.md in the project root for license information.
 
 using System;
+using System.Collections;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
 using System.Linq;
+using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.SignalR.Infrastructure;

src/Microsoft.AspNet.SignalR.Core/Transports/LongPollingTransport.cs

@@ -3,6 +3,7 @@
 using System;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.SignalR.Hosting;
 using Microsoft.AspNet.SignalR.Infrastructure;

src/Microsoft.AspNet.SignalR.Owin/ServerRequest.cs

@@ -7,9 +7,11 @@ using System.Security.Principal;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.SignalR.Owin.Infrastructure;
+using Microsoft.AspNet.SignalR.Hosting;
 
 namespace Microsoft.AspNet.SignalR.Owin
 {
+    using WebSocketFunc = Func<IDictionary<string, object>, Task>;
     public partial class ServerRequest : 
 #if NET45
         IWebSocketRequest

src/MonoTorrent/Torrent.cs

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

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

@@ -0,0 +1,168 @@
+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,21 +38,17 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FizzWare.NBuilder, Version=4.0.0.115, Culture=neutral, PublicKeyToken=5651b03e12e42c12, processorArchitecture=MSIL">
-      <HintPath>..\packages\NBuilder.4.0.0\lib\net40\FizzWare.NBuilder.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, Version=4.18.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.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="FluentAssertions.Core, Version=4.18.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll</HintPath>
-      <Private>True</Private>
+    <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>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -61,12 +57,19 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="FizzWare.NBuilder">
+      <HintPath>..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll</HintPath>
+    </Reference>
     <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>
@@ -108,4 +111,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

src/NzbDrone.Api.Test/packages.config

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FluentAssertions" version="4.18.0" targetFramework="net40" />
+  <package id="FluentAssertions" version="4.2.1" targetFramework="net40" />
   <package id="Moq" version="4.0.10827" />
-  <package id="NBuilder" version="4.0.0" targetFramework="net40" />
-  <package id="NUnit" version="3.5.0" targetFramework="net40" />
+  <package id="NBuilder" version="3.0.1.1" targetFramework="net40" />
+  <package id="NUnit" version="2.6.3" targetFramework="net40" />
+  <package id="ValueInjecter" version="2.3.3" targetFramework="net40" />
 </packages>

src/NzbDrone.Api/Authentication/AuthenticationModule.cs

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

src/NzbDrone.Api/Authentication/EnableAuthInNancy.cs

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

src/NzbDrone.Api/Blacklist/BlacklistModule.cs

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

src/NzbDrone.Api/Blacklist/BlacklistResource.cs

@@ -20,28 +20,4 @@ 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

@@ -2,51 +2,36 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Ical.Net;
-using Ical.Net.DataTypes;
-using Ical.Net.Interfaces.Serialization;
-using Ical.Net.Serialization;
-using Ical.Net.Serialization.iCalendar.Factory;
+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, ITagService tagService)
+        public CalendarFeedModule(IEpisodeService episodeService)
             : base("calendar")
         {
             _episodeService = episodeService;
-            _tagService = tagService;
 
             Get["/NzbDrone.ics"] = options => GetCalendarFeed();
-            Get["/Sonarr.ics"] = options => GetCalendarFeed();
         }
 
         private Response GetCalendarFeed()
         {
             var pastDays = 7;
-            var futureDays = 28;
+            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);
@@ -63,63 +48,33 @@ namespace NzbDrone.Api.Calendar
                 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 calendar = new Ical.Net.Calendar
-            {
-                ProductId = "-//sonarr.tv//Sonarr//EN"
-            };
-
-
+            var episodes = _episodeService.EpisodesBetweenDates(start, end, false);
+            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 = calendar.Create<Event>();
-                occurrence.Uid = "NzbDrone_episode_" + episode.Id;
+                var occurrence = icalCalendar.Create<Event>();
+                occurrence.UID = "NzbDrone_episode_" + episode.Id.ToString();
                 occurrence.Status = episode.HasFile ? EventStatus.Confirmed : EventStatus.Tentative;
-                occurrence.Start = new CalDateTime(episode.AirDateUtc.Value) { HasTime = true };
-                occurrence.End = new CalDateTime(episode.AirDateUtc.Value.AddMinutes(episode.Series.Runtime)) { HasTime = true };
+                occurrence.Start = new iCalDateTime(episode.AirDateUtc.Value) { HasTime = true };
+                occurrence.End = new iCalDateTime(episode.AirDateUtc.Value.AddMinutes(episode.Series.Runtime)) { HasTime = true };
                 occurrence.Description = episode.Overview;
                 occurrence.Categories = new List<string>() { episode.Series.Network };
 
                 switch (episode.Series.SeriesType)
                 {
                     case SeriesTypes.Daily:
-                        occurrence.Summary = $"{episode.Series.Title} - {episode.Title}";
+                        occurrence.Summary = string.Format("{0} - {1}", episode.Series.Title, episode.Title);
                         break;
+
                     default:
-                        occurrence.Summary =$"{episode.Series.Title} - {episode.SeasonNumber}x{episode.EpisodeNumber:00} - {episode.Title}";
+                        occurrence.Summary = string.Format("{0} - {1}x{2:00} - {3}", episode.Series.Title, episode.SeasonNumber, episode.EpisodeNumber, episode.Title);
                         break;
                 }
             }
 
-            var serializer = (IStringSerializer) new SerializerFactory().Build(calendar.GetType(), new SerializationContext());
-            var icalendar = serializer.SerializeToString(calendar);
+            var serializer = new DDay.iCal.Serialization.iCalendar.SerializerFactory().Build(icalCalendar.GetType(), new DDay.iCal.Serialization.SerializationContext()) as DDay.iCal.Serialization.IStringSerializer;
+            var icalendar = serializer.SerializeToString(icalCalendar);
 
             return new TextResponse(icalendar, "text/calendar");
         }

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 = MapToResource(_episodeService.EpisodesBetweenDates(start, end, includeUnmonitored), true, true);
+            var resources = ToListResource(() => _episodeService.EpisodesBetweenDates(start, end, includeUnmonitored));
 
             return resources.OrderBy(e => e.AirDateUtc).ToList();
         }

src/NzbDrone.Api/ClientSchema/Field.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 
 namespace NzbDrone.Api.ClientSchema
 {

src/NzbDrone.Api/ClientSchema/SchemaBuilder.cs

@@ -6,6 +6,7 @@ using NzbDrone.Common.EnsureThat;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Reflection;
 using NzbDrone.Core.Annotations;
+using Omu.ValueInjecter;
 
 namespace NzbDrone.Api.ClientSchema
 {
@@ -55,7 +56,7 @@ namespace NzbDrone.Api.ClientSchema
             return result.OrderBy(r => r.Order).ToList();
         }
 
-        public static object ReadFromSchema(List<Field> fields, Type targetType)
+        public static object ReadFormSchema(List<Field> fields, Type targetType, object defaults = null)
         {
             Ensure.That(targetType, () => targetType).IsNotNull();
 
@@ -63,6 +64,11 @@ 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);
@@ -140,9 +146,9 @@ namespace NzbDrone.Api.ClientSchema
 
         }
 
-        public static T ReadFromSchema<T>(List<Field> fields)
+        public static T ReadFormSchema<T>(List<Field> fields)
         {
-            return (T)ReadFromSchema(fields, typeof(T));
+            return (T)ReadFormSchema(fields, typeof(T));
         }
 
         private static List<SelectOption> GetSelectOptions(Type selectOptions)

src/NzbDrone.Api/Commands/CommandModule.cs

@@ -2,6 +2,7 @@
 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;
@@ -35,13 +36,15 @@ namespace NzbDrone.Api.Commands
 
         private CommandResource GetCommand(int id)
         {
-            return _commandQueueManager.Get(id).ToResource();
+            return _commandQueueManager.Get(id).InjectTo<CommandResource>();
         }
 
         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;
@@ -52,14 +55,14 @@ namespace NzbDrone.Api.Commands
 
         private List<CommandResource> GetStartedCommands()
         {
-            return _commandQueueManager.GetStarted().ToResource();
+            return ToListResource(_commandQueueManager.GetStarted());
         }
 
         public void Handle(CommandUpdatedEvent message)
         {
             if (message.Command.Body.SendUpdatesToClient)
             {
-                BroadcastResourceChange(ModelAction.Updated, message.Command.ToResource());
+                BroadcastResourceChange(ModelAction.Updated, message.Command.InjectTo<CommandResource>());
             }
         }
     }

src/NzbDrone.Api/Commands/CommandResource.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using Newtonsoft.Json;
 using NzbDrone.Api.REST;
 using NzbDrone.Core.Messaging.Commands;
@@ -11,7 +9,7 @@ namespace NzbDrone.Api.Commands
     {
         public string Name { get; set; }
         public string Message { get; set; }
-        public object Body { get; set; }
+        public Command Body { get; set; }
         public CommandPriority Priority { get; set; }
         public CommandStatus Status { get; set; }
         public DateTime Queued { get; set; }
@@ -72,7 +70,7 @@ namespace NzbDrone.Api.Commands
         {
             get
             {
-                if (Body != null) return (Body as Command).SendUpdatesToClient;
+                if (Body != null) return Body.SendUpdatesToClient;
 
                 return false;
             }
@@ -84,7 +82,7 @@ namespace NzbDrone.Api.Commands
         {
             get
             {
-                if (Body != null) return (Body as Command).UpdateScheduledTask;
+                if (Body != null) return Body.UpdateScheduledTask;
 
                 return false;
             }
@@ -94,37 +92,4 @@ 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

@@ -1,4 +1,5 @@
-using FluentValidation;
+using System;
+using FluentValidation;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Validation.Paths;
 
@@ -20,10 +21,5 @@ 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,5 @@
-using NzbDrone.Api.REST;
-using NzbDrone.Core.Configuration;
+using System;
+using NzbDrone.Api.REST;
 
 namespace NzbDrone.Api.Config
 {
@@ -15,23 +15,4 @@ 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,20 +8,19 @@ 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, IConfigService configService, IUserService userService)
+        public HostConfigModule(IConfigFileProvider configFileProvider, IUserService userService)
             : base("/config/host")
         {
             _configFileProvider = configFileProvider;
-            _configService = configService;
             _userService = userService;
 
             GetResourceSingle = GetHostConfig;
@@ -49,10 +48,12 @@ namespace NzbDrone.Api.Config
 
         private HostConfigResource GetHostConfig()
         {
-            var resource = _configFileProvider.ToResource(_configService);
+            var resource = new HostConfigResource();
+            resource.InjectFrom(_configFileProvider);
             resource.Id = 1;
 
             var user = _userService.FindUser();
+
             if (user != null)
             {
                 resource.Username = user.Username;
@@ -74,7 +75,6 @@ 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,8 +1,7 @@
-using NzbDrone.Api.REST;
+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
 {
@@ -20,54 +19,11 @@ 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

@@ -19,10 +19,5 @@ namespace NzbDrone.Api.Config
             SharedValidator.RuleFor(c => c.RssSyncInterval)
                            .IsValidRssSyncInterval();
         }
-
-        protected override IndexerConfigResource ToResource(IConfigService model)
-        {
-            return IndexerConfigResourceMapper.ToResource(model);
-        }
     }
 }

src/NzbDrone.Api/Config/IndexerConfigResource.cs

@@ -1,5 +1,5 @@
-using NzbDrone.Api.REST;
-using NzbDrone.Core.Configuration;
+using System;
+using NzbDrone.Api.REST;
 
 namespace NzbDrone.Api.Config
 {
@@ -9,17 +9,4 @@ 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,4 +1,5 @@
-using FluentValidation;
+using System;
+using FluentValidation;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Validation.Paths;
 
@@ -13,10 +14,5 @@ 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 NzbDrone.Api.REST;
-using NzbDrone.Core.Configuration;
+using System;
+using NzbDrone.Api.REST;
 using NzbDrone.Core.MediaFiles;
 
 namespace NzbDrone.Api.Config
@@ -20,33 +20,6 @@ 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

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using FluentValidation;
 using FluentValidation.Results;
@@ -6,7 +7,9 @@ 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
 {
@@ -43,7 +46,7 @@ namespace NzbDrone.Api.Config
 
         private void UpdateNamingConfig(NamingConfigResource resource)
         {
-            var nameSpec = resource.ToModel();
+            var nameSpec = resource.InjectTo<NamingConfig>();
             ValidateFormatResult(nameSpec);
 
             _namingConfigService.Save(nameSpec);
@@ -52,14 +55,16 @@ namespace NzbDrone.Api.Config
         private NamingConfigResource GetNamingConfig()
         {
             var nameSpec = _namingConfigService.GetConfig();
-            var resource = nameSpec.ToResource();
+            var resource = nameSpec.InjectTo<NamingConfigResource>();
 
-            if (resource.StandardEpisodeFormat.IsNotNullOrWhiteSpace())
+            if (string.IsNullOrWhiteSpace(resource.StandardEpisodeFormat))
             {
-                var basicConfig = _filenameBuilder.GetBasicNamingConfig(nameSpec);
-                basicConfig.AddToResource(resource);
+                return resource;
             }
 
+            var basicConfig = _filenameBuilder.GetBasicNamingConfig(nameSpec);
+            resource.InjectFrom(basicConfig);
+
             return resource;
         }
 
@@ -70,7 +75,7 @@ namespace NzbDrone.Api.Config
 
         private JsonResponse<NamingSampleResource> GetExamples(NamingConfigResource config)
         {
-            var nameSpec = config.ToModel();
+            var nameSpec = config.InjectTo<NamingConfig>();
             var sampleResource = new NamingSampleResource();
             
             var singleEpisodeSampleResult = _filenameSampleService.GetStandardSample(nameSpec);

src/NzbDrone.Api/Config/NamingConfigResource.cs

@@ -1,5 +1,5 @@
-using NzbDrone.Api.REST;
-using NzbDrone.Core.Organizer;
+using System;
+using NzbDrone.Api.REST;
 
 namespace NzbDrone.Api.Config
 {
@@ -20,57 +20,4 @@ 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,6 +2,7 @@
 using System.Reflection;
 using NzbDrone.Api.REST;
 using NzbDrone.Core.Configuration;
+using Omu.ValueInjecter;
 
 namespace NzbDrone.Api.Config
 {
@@ -26,14 +27,13 @@ namespace NzbDrone.Api.Config
 
         private TResource GetConfig()
         {
-            var resource = ToResource(_configService);
+            var resource = new TResource();
+            resource.InjectFrom(_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,18 +1,45 @@
-using NzbDrone.Core.Configuration;
+using System.Linq;
+using System.Reflection;
+using NzbDrone.Core.Configuration;
+using Omu.ValueInjecter;
 
 namespace NzbDrone.Api.Config
 {
-    public class UiConfigModule : NzbDroneConfigModule<UiConfigResource>
+    public class UiConfigModule : NzbDroneRestModule<UiConfigResource>
     {
-        public UiConfigModule(IConfigService configService)
-            : base(configService)
-        {
+        private readonly IConfigService _configService;
 
+        public UiConfigModule(IConfigService configService)
+            : base("/config/ui")
+        {
+            _configService = configService;
+
+            GetResourceSingle = GetUiConfig;
+            GetResourceById = GetUiConfig;
+            UpdateResource = SaveUiConfig;
         }
 
-        protected override UiConfigResource ToResource(IConfigService model)
+        private UiConfigResource GetUiConfig()
         {
-            return UiConfigResourceMapper.ToResource(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);
         }
     }
 }

src/NzbDrone.Api/Config/UiConfigResource.cs

@@ -1,5 +1,5 @@
-using NzbDrone.Api.REST;
-using NzbDrone.Core.Configuration;
+using System;
+using NzbDrone.Api.REST;
 
 namespace NzbDrone.Api.Config
 {
@@ -17,23 +17,4 @@ 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

@@ -8,16 +8,15 @@ 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 _diskSpaceService.GetFreeSpace().ConvertAll(DiskSpaceResourceMapper.MapToResource);
+            return ToListResource(_diskSpaceService.GetFreeSpace);
         }
     }
 }

src/NzbDrone.Api/DiskSpace/DiskSpaceResource.cs

@@ -1,4 +1,5 @@
-using NzbDrone.Api.REST;
+using System;
+using NzbDrone.Api.REST;
 
 namespace NzbDrone.Api.DiskSpace
 {
@@ -9,20 +10,4 @@ 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

@@ -9,22 +9,6 @@ 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/DownloadClient/DownloadClientResource.cs

@@ -1,4 +1,5 @@
-using NzbDrone.Core.Indexers;
+using System;
+using NzbDrone.Core.Indexers;
 
 namespace NzbDrone.Api.DownloadClient
 {

src/NzbDrone.Api/EpisodeFiles/EpisodeFileModule.cs

@@ -1,9 +1,11 @@
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 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;
@@ -12,7 +14,7 @@ using NzbDrone.SignalR;
 
 namespace NzbDrone.Api.EpisodeFiles
 {
-    public class EpisodeFileModule : NzbDroneRestModuleWithSignalR<EpisodeFileResource, EpisodeFile>,
+    public class EpisodeModule : NzbDroneRestModuleWithSignalR<EpisodeFileResource, EpisodeFile>,
                                  IHandle<EpisodeFileAddedEvent>
     {
         private readonly IMediaFileService _mediaFileService;
@@ -21,7 +23,7 @@ namespace NzbDrone.Api.EpisodeFiles
         private readonly IQualityUpgradableSpecification _qualityUpgradableSpecification;
         private readonly Logger _logger;
 
-        public EpisodeFileModule(IBroadcastSignalRMessage signalRBroadcaster,
+        public EpisodeModule(IBroadcastSignalRMessage signalRBroadcaster,
                              IMediaFileService mediaFileService,
                              IRecycleBinProvider recycleBinProvider,
                              ISeriesService seriesService,
@@ -45,7 +47,7 @@ namespace NzbDrone.Api.EpisodeFiles
             var episodeFile = _mediaFileService.Get(id);
             var series = _seriesService.GetSeries(episodeFile.SeriesId);
 
-            return episodeFile.ToResource(series, _qualityUpgradableSpecification);
+            return MapToResource(series, episodeFile);
         }
 
         private List<EpisodeFileResource> GetEpisodeFiles()
@@ -59,7 +61,8 @@ namespace NzbDrone.Api.EpisodeFiles
 
             var series = _seriesService.GetSeries(seriesId);
 
-            return _mediaFileService.GetFilesBySeries(seriesId).ConvertAll(f => f.ToResource(series, _qualityUpgradableSpecification));
+            return _mediaFileService.GetFilesBySeries(seriesId)
+                                    .Select(f => MapToResource(series, f)).ToList();
         }
 
         private void SetQuality(EpisodeFileResource episodeFileResource)
@@ -80,6 +83,16 @@ 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,5 +1,4 @@
 using System;
-using System.IO;
 using NzbDrone.Api.REST;
 using NzbDrone.Core.Qualities;
 
@@ -18,47 +17,4 @@ 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

@@ -3,7 +3,6 @@ using NzbDrone.Api.REST;
 using NzbDrone.Core.Tv;
 using NzbDrone.Core.DecisionEngine;
 using NzbDrone.SignalR;
-using Nancy;
 
 namespace NzbDrone.Api.Episodes
 {
@@ -28,7 +27,7 @@ namespace NzbDrone.Api.Episodes
 
             var seriesId = (int)Request.Query.SeriesId;
 
-            var resources = MapToResource(_episodeService.GetEpisodeBySeries(seriesId), false, true);
+            var resources = ToListResource(_episodeService.GetEpisodeBySeries(seriesId));
 
             return resources;
         }
@@ -37,5 +36,10 @@ namespace NzbDrone.Api.Episodes
         {
             _episodeService.SetEpisodeMonitored(episodeResource.Id, episodeResource.Monitored);
         }
+
+        protected override List<EpisodeResource> LoadSeries(List<EpisodeResource> resources)
+        {
+            return resources;
+        }
     }
 }

src/NzbDrone.Api/Episodes/EpisodeModuleWithSignalR.cs

@@ -1,6 +1,9 @@
-using System.Collections.Generic;
-using NzbDrone.Common.Extensions;
-using NzbDrone.Api.EpisodeFiles;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using NzbDrone.Api.Extensions;
+using NzbDrone.Api.Mapping;
 using NzbDrone.Api.Series;
 using NzbDrone.Core.Datastore.Events;
 using NzbDrone.Core.DecisionEngine;
@@ -50,65 +53,41 @@ namespace NzbDrone.Api.Episodes
         protected EpisodeResource GetEpisode(int id)
         {
             var episode = _episodeService.GetEpisode(id);
-            var resource = MapToResource(episode, true, true);
-            return resource;
+            episode.EpisodeFile.LazyLoad();
+            episode.Series = _seriesService.GetSeries(episode.SeriesId);
+            return ToResource(episode);
         }
 
-        protected EpisodeResource MapToResource(Episode episode, bool includeSeries, bool includeEpisodeFile)
+        protected override EpisodeResource ToResource<TModel>(TModel model)
         {
-            var resource = episode.ToResource();
+            var resource = base.ToResource(model);
 
-            if (includeSeries || includeEpisodeFile)
+            var episode = model as Episode;
+            if (episode != null)
             {
-                var series = episode.Series ?? _seriesService.GetSeries(episode.SeriesId);
-
-                if (includeSeries)
+                if (episode.EpisodeFile.IsLoaded && episode.EpisodeFile.Value != null)
                 {
-                    resource.Series = series.ToResource();
-                }
-                if (includeEpisodeFile && episode.EpisodeFileId != 0)
-                {
-                    resource.EpisodeFile = episode.EpisodeFile.Value.ToResource(series, _qualityUpgradableSpecification);
+                    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);
                 }
             }
 
             return resource;
         }
 
-        protected List<EpisodeResource> MapToResource(List<Episode> episodes, bool includeSeries, bool includeEpisodeFile)
+        protected override List<EpisodeResource> ToListResource<TModel>(IEnumerable<TModel> modelList)
         {
-            var result = episodes.ToResource();
+            var resources =  base.ToListResource(modelList);
 
-            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];
+            return LoadSeries(resources);
 
-                    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.ToResource();
+                var resource = episode.InjectTo<EpisodeResource>();
                 resource.Grabbed = true;
 
                 BroadcastResourceChange(ModelAction.Updated, resource);
@@ -122,5 +101,10 @@ namespace NzbDrone.Api.Episodes
                 BroadcastResourceChange(ModelAction.Updated, episode.Id);
             }
         }
+
+        protected virtual List<EpisodeResource> LoadSeries(List<EpisodeResource> resources)
+        {
+            return resources.LoadSubtype<EpisodeResource, SeriesResource, Core.Tv.Series>(e => e.SeriesId, _seriesService.GetSeries).ToList();
+        }
     }
 }

src/NzbDrone.Api/Episodes/EpisodeResource.cs

@@ -1,11 +1,8 @@
 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
 {
@@ -28,6 +25,8 @@ 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; }
 
@@ -35,44 +34,4 @@ 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

@@ -28,10 +28,10 @@ namespace NzbDrone.Api.Episodes
             if (Request.Query.SeasonNumber.HasValue)
             {
                 var seasonNumber = (int)Request.Query.SeasonNumber;
-                return _renameEpisodeFileService.GetRenamePreviews(seriesId, seasonNumber).ToResource();
+                return ToListResource(() => _renameEpisodeFileService.GetRenamePreviews(seriesId, seasonNumber));
             }
 
-            return _renameEpisodeFileService.GetRenamePreviews(seriesId).ToResource();
+            return ToListResource(() => _renameEpisodeFileService.GetRenamePreviews(seriesId));
         }
     }
 }

src/NzbDrone.Api/Episodes/RenameEpisodeResource.cs

@@ -1,5 +1,5 @@
-using System.Collections.Generic;
-using System.Linq;
+using System;
+using System.Collections.Generic;
 using NzbDrone.Api.REST;
 
 namespace NzbDrone.Api.Episodes
@@ -13,27 +13,4 @@ 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.Warn(apiException, "API Error");
+                _logger.WarnException("API Error", apiException);
                 return apiException.ToErrorResponse();
             }
 
@@ -65,10 +65,10 @@ namespace NzbDrone.Api.ErrorManagement
 
                 var sqlErrorMessage = string.Format("[{0} {1}]", context.Request.Method, context.Request.Path);
 
-                _logger.Error(sqLiteException, sqlErrorMessage);
+                _logger.ErrorException(sqlErrorMessage, sqLiteException);
             }
             
-            _logger.Fatal(exception, "Request Failed");
+            _logger.FatalException("Request Failed", exception);
 
             return new ErrorModel
                 {

src/NzbDrone.Api/Extensions/LazyExtensions.cs

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

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

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

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

@@ -5,7 +5,6 @@ using System.Linq;
 using Nancy;
 using Nancy.Bootstrapper;
 using NLog;
-using NzbDrone.Common.Extensions;
 
 namespace NzbDrone.Api.Extensions.Pipelines
 {
@@ -13,8 +12,6 @@ namespace NzbDrone.Api.Extensions.Pipelines
     {
         private readonly Logger _logger;
 
-        public int Order => 0;
-
         public GzipCompressionPipeline(Logger logger)
         {
             _logger = logger;
@@ -22,62 +19,50 @@ namespace NzbDrone.Api.Extensions.Pipelines
 
         public void Register(IPipelines pipelines)
         {
-            pipelines.AfterRequest.AddItemToEndOfPipeline(CompressResponse);
+            pipelines.AfterRequest.AddItemToEndOfPipeline(c => CompressResponse(c.Request, c.Response));
         }
 
-        private void CompressResponse(NancyContext context)
+        private Response CompressResponse(Request request, Response response)
         {
-            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"))
-                && !AlreadyGzipEncoded(response)
-                && !ContentLengthIsTooSmall(response))
+                && (!response.Headers.ContainsKey("Content-Encoding") || response.Headers["Content-Encoding"] != "gzip"))
                 {
-                    var contents = response.Contents;
-
-                    response.Headers["Content-Encoding"] = "gzip";
-                    response.Contents = responseStream =>
+                    var data = new MemoryStream();
+                    response.Contents.Invoke(data);
+                    data.Position = 0;
+                    if (data.Length < 1024)
                     {
-                        using (var gzip = new GZipStream(responseStream, CompressionMode.Compress, true))
-                        using (var buffered = new BufferedStream(gzip, 8192))
+                        response.Contents = stream =>
                         {
-                            contents.Invoke(buffered);
-                        }
-                    };
+                            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();
+                        };
+                    }
                 }
+
+                return response;
             }
 
             catch (Exception ex)
             {
-                _logger.Error(ex, "Unable to gzip response");
+                _logger.ErrorException("Unable to gzip response", ex);
                 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,8 +4,6 @@ namespace NzbDrone.Api.Extensions.Pipelines
 {
     public interface IRegisterNancyPipeline
     {
-        int Order { get; }
-
         void Register(IPipelines pipelines);
     }
 }

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

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

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

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

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

@@ -1,91 +0,0 @@
-using System;
-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 => 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/Frontend/Mappers/FaviconMapper.cs

@@ -1,3 +1,4 @@
+using System;
 using System.IO;
 using NLog;
 using NzbDrone.Common.Disk;

src/NzbDrone.Api/Frontend/Mappers/MediaCoverMapper.cs

@@ -1,5 +1,6 @@
 using System.IO;
 using System.Text.RegularExpressions;
+using Nancy;
 using NLog;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.EnvironmentInfo;

src/NzbDrone.Api/Frontend/Mappers/RobotsTxtMapper.cs

@@ -1,4 +1,5 @@
-using System.IO;
+using System;
+using System.IO;
 using NLog;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.EnvironmentInfo;

src/NzbDrone.Api/Health/HealthModule.cs

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

src/NzbDrone.Api/Health/HealthResource.cs

@@ -1,7 +1,5 @@
-using System.Collections.Generic;
-using System.Linq;
+using System;
 using NzbDrone.Api.REST;
-using NzbDrone.Common.Http;
 using NzbDrone.Core.HealthCheck;
 
 namespace NzbDrone.Api.Health
@@ -10,28 +8,6 @@ namespace NzbDrone.Api.Health
     {
         public HealthCheckResult Type { get; set; }
         public string Message { 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();
-        }
+        public Uri WikiUrl { get; set; }
     }
 }

src/NzbDrone.Api/History/HistoryModule.cs

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

src/NzbDrone.Api/History/HistoryResource.cs

@@ -17,6 +17,8 @@ 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; }
@@ -26,31 +28,4 @@ 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

@@ -9,25 +9,6 @@ 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/IndexerResource.cs

@@ -1,4 +1,5 @@
-using NzbDrone.Core.Indexers;
+using System;
+using NzbDrone.Core.Indexers;
 
 namespace NzbDrone.Api.Indexers
 {

src/NzbDrone.Api/Indexers/ReleaseModule.cs

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

src/NzbDrone.Api/Indexers/ReleaseModuleBase.cs

@@ -1,5 +1,9 @@
 using System.Collections.Generic;
 using NzbDrone.Core.DecisionEngine;
+using NzbDrone.Core.Indexers;
+using NzbDrone.Core.Parser.Model;
+using Omu.ValueInjecter;
+using System.Linq;
 
 namespace NzbDrone.Api.Indexers
 {
@@ -21,20 +25,42 @@ namespace NzbDrone.Api.Indexers
 
         protected virtual ReleaseResource MapDecision(DownloadDecision decision, int initialWeight)
         {
-            var release = decision.ToResource();
+            var release = new ReleaseResource();
 
+            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,6 +6,7 @@ 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;
 
@@ -29,7 +30,7 @@ namespace NzbDrone.Api.Indexers
 
             PostValidator.RuleFor(s => s.Title).NotEmpty();
             PostValidator.RuleFor(s => s.DownloadUrl).NotEmpty();
-            PostValidator.RuleFor(s => s.Protocol).NotEmpty();
+            PostValidator.RuleFor(s => s.DownloadProtocol).NotEmpty();
             PostValidator.RuleFor(s => s.PublishDate).NotEmpty();
         }
 
@@ -37,12 +38,11 @@ namespace NzbDrone.Api.Indexers
         {
             _logger.Info("Release pushed: {0} - {1}", release.Title, release.DownloadUrl);
 
-            var info = release.ToModel();
-
+            var info = release.InjectTo<ReleaseInfo>();
             info.Guid = "PUSH-" + info.DownloadUrl;
 
             var decisions = _downloadDecisionMaker.GetRssDecision(new List<ReleaseInfo> { info });
-            _downloadDecisionProcessor.ProcessDecisions(decisions);
+            var processed = _downloadDecisionProcessor.ProcessDecisions(decisions);
 
             return MapDecisions(decisions).First().AsResponse();
         }

src/NzbDrone.Api/Indexers/ReleaseResource.cs

@@ -1,13 +1,9 @@
 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
 {
@@ -23,9 +19,11 @@ 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; }
@@ -46,129 +44,16 @@ 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: 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;
-                }
-            }
-        }
+        //TODO: besides a test I don't think this is used...
+        public DownloadProtocol DownloadProtocol { get; set; }
 
         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/LogFileModule.cs

@@ -31,6 +31,13 @@ namespace NzbDrone.Api.Logs
             return Path.Combine(_appFolderInfo.GetLogFolder(), filename);
         }
 
-        protected override string DownloadUrlRoot => "logfile";
+        protected override string DownloadUrlRoot
+        {
+            get
+            {
+                return "logfile";
+            }
+        }
+
     }
 }

src/NzbDrone.Api/Logs/LogFileModuleBase.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using NzbDrone.Common.Disk;

src/NzbDrone.Api/Logs/LogModule.cs

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

src/NzbDrone.Api/Logs/LogResource.cs

@@ -11,25 +11,6 @@ namespace NzbDrone.Api.Logs
         public string Level { get; set; }
         public string Logger { get; set; }
         public string Message { 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
-            };
-        }
+        public string Method { get; set; }
     }
 }

src/NzbDrone.Api/Logs/UpdateLogFileModule.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -37,6 +38,12 @@ namespace NzbDrone.Api.Logs
             return Path.Combine(_appFolderInfo.GetUpdateLogFolder(), filename);
         }
 
-        protected override string DownloadUrlRoot => "updatelogfile";
+        protected override string DownloadUrlRoot
+        {
+            get
+            {
+                return "updatelogfile";
+            }
+        }
     }
 }

src/NzbDrone.Api/ManualImport/ManualImportModule.cs

@@ -25,7 +25,7 @@ namespace NzbDrone.Api.ManualImport
             var downloadIdQuery = Request.Query.downloadId;
             var downloadId = (string)downloadIdQuery.Value;
 
-            return _manualImportService.GetMediaFiles(folder, downloadId).ToResource().Select(AddQualityWeight).ToList();
+            return ToListResource(_manualImportService.GetMediaFiles(folder, downloadId)).Select(AddQualityWeight).ToList();
         }
 
         private ManualImportResource AddQualityWeight(ManualImportResource item)

src/NzbDrone.Api/ManualImport/ManualImportResource.cs

@@ -1,9 +1,7 @@
 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;
 
@@ -22,35 +20,13 @@ namespace NzbDrone.Api.ManualImport
         public int QualityWeight { get; set; }
         public string DownloadId { get; set; }
         public IEnumerable<Rejection> Rejections { get; set; }
-    }
 
-    public static class ManualImportResourceMapper
-    {
-        public static ManualImportResource ToResource(this Core.MediaFiles.EpisodeImport.Manual.ManualImportItem model)
+        public int Id
         {
-            if (model == null) return null;
-
-            return new ManualImportResource
+            get
             {
-                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();
+                return Path.GetHashCode();
+            }
         }
     }
 }

src/NzbDrone.Api/Mapping/CloneInjection.cs

@@ -0,0 +1,125 @@
+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

@@ -0,0 +1,54 @@
+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

@@ -0,0 +1,15 @@
+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

@@ -0,0 +1,42 @@
+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);
+        }
+    }
+}