Fixed: Sabnzbd/NzbGet not processing history items properly after last update.

Closes #401

.gitignore

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

.idea/encodings.xml

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

.idea/jsLibraryMappings.xml

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

CONTRIBUTING.md

@@ -8,8 +8,8 @@ Setup guides, FAQ, the more information we have on the wiki the better.
 ## Development ##
 
 ### Tools required ###
-- Visual Studio 2013
+- Visual Studio 2015
-- HTML/Javascript editor of choice (Sublime Text/Webstorm/etc)
+- HTML/Javascript editor of choice (Sublime Text/Webstorm/Atom/etc)
 - npm (node package manager)
 - git
 

README.md

@@ -0,0 +1,52 @@
+# Sonarr
+
+Sonarr is a PVR for Usenet and BitTorrent users. It can monitor multiple RSS feeds for new episodes of your favorite shows and will grab, sort and rename them. It can also be configured to automatically upgrade the quality of files already downloaded when a better quality format becomes available.
+
+## Major Features Include:
+
+* Support for major platforms: Windows, Linux, macOS, Raspberry Pi, etc.
+* Automatically detects new episodes
+* Can scan your existing library and download any missing episodes
+* Can watch for better quality of the episodes you already have and do an automatic upgrade. *eg. from DVD to Blu-Ray*
+* Automatic failed download handling will try another release if one fails
+* Manual search so you can pick any release or to see why a release was not downloaded automatically
+* Fully configurable episode renaming
+* Full integration with SABnzbd and NZBGet
+* Full integration with Kodi, Plex (notification, library update, metadata)
+* Full support for specials and multi-episode releases
+* And a beautiful UI
+
+## Configuring Development Environment:
+
+### Requirements
+
+* Visual Studio 2015 (https://www.visualstudio.com/vs/)
+* [Git](https://git-scm.com/downloads)
+* [NodeJS](https://nodejs.org/en/download/)
+
+### Setup
+
+* Make sure all the required software mentioned above are installed.
+* 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.
+
+*Please note gulp must be running at all times while you are working with Sonarr client source files.*
+
+### Development
+
+* Open `NzbDrone.sln` in Visual Studio
+* Make sure `NzbDrone.Console` is set as the startup project
+
+### License
+
+* [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)
+* Copyright 2010-2017
+
+### Sponsors
+
+* [JetBrains](http://www.jetbrains.com/) for providing us with free licenses to their great tools
+    * [ReSharper](http://www.jetbrains.com/resharper/)
+    * [WebStorm](http://www.jetbrains.com/webstorm/)
+    * [TeamCity](http://www.jetbrains.com/teamcity/)

readme.md

@@ -1,53 +0,0 @@
-# Sonarr #
-
-
-Sonarr is a PVR for Usenet and BitTorrent users. It can monitor multiple RSS feeds for new episodes of your favorite shows and will grab, sort and rename them. It can also be configured to automatically upgrade the quality of files already downloaded when a better quality format becomes available.
-
-## Major Features Include: ##
-
-* Support for major platforms: Windows, Linux, OSX, Raspberry Pi, etc.
-* Automatically detects new episodes
-* Can scan your existing library and download any missing episodes
-* Can watch for better quality of the episodes you already have and do an automatic upgrade. *eg. from DVD to Blu-Ray*
-* Automatic failed download handling will try another release if one fails
-* Manual search so you can pick any release or to see why a release was not downloaded automatically
-* Fully configurable episode renaming
-* Full integration with SABNzbd and NzbGet
-* Full integration with XBMC, Plex (notification, library update, metadata)
-* Full support for specials and multi-episode releases
-* And a beautiful UI
-
-
-## Configuring Development Environment: ##
-
-### Requirements ###
-- 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/)
-
-### Setup ###
-
-- Make sure all the required software mentioned above are installed.
-- 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.
-
-*Please note gulp must be running at all times while you are working with Sonarr client source files.*
-
-
-### Development ###
-- Open `NzbDrone.sln` in Visual Studio
-- Make sure `NzbDrone.Console` is set as the startup project
-
-
-### License ###
-* [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)
-Copyright 2010-2016
-
-
-### Sponsors ###
-- [JetBrains](http://www.jetbrains.com/) for providing us with free licenses to their great tools
-    - [ReSharper](http://www.jetbrains.com/resharper/)
-    - [WebStorm](http://www.jetbrains.com/webstorm/)
-    - [TeamCity](http://www.jetbrains.com/teamcity/)

schemas/torznab.xsd

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

src/LogentriesCore/Properties/AssemblyInfo.cs

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

@@ -52,8 +52,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.3.4\lib\net40\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.3\lib\net40\NLog.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

src/LogentriesNLog/Properties/AssemblyInfo.cs

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

src/LogentriesNLog/packages.config

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

src/Marr.Data/Mapping/FluentMappings.cs

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

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

@@ -1,9 +1,6 @@
 // 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
 {
-    internal class NoOpPerformanceCounter : IPerformanceCounter
+    public class NoOpPerformanceCounter : IPerformanceCounter
     {
         public string CounterName
         {

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

@@ -43,9 +43,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
-      <HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -281,4 +281,4 @@
   <Target Name="BeforeBuild">
   </Target>
   -->
-</Project>
+</Project>

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

@@ -6,7 +6,6 @@ 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,13 +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.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,7 +3,6 @@
 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.Core/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net40" />
 </packages>

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

@@ -5,13 +5,10 @@ using System.Collections.Generic;
 using System.Collections.Specialized;
 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/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj

@@ -38,17 +38,21 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FluentAssertions, Version=4.2.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+    <Reference Include="FizzWare.NBuilder, Version=4.0.0.115, Culture=neutral, PublicKeyToken=5651b03e12e42c12, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.2.1\lib\net40\FluentAssertions.dll</HintPath>
+      <HintPath>..\packages\NBuilder.4.0.0\lib\net40\FizzWare.NBuilder.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FluentAssertions.Core, Version=4.2.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+    <Reference Include="FluentAssertions, Version=4.19.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.2.1\lib\net40\FluentAssertions.Core.dll</HintPath>
+      <HintPath>..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.dll</HintPath>
-      <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+    <Reference Include="FluentAssertions.Core, Version=4.19.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.2.0\lib\net40\nunit.framework.dll</HintPath>
+      <HintPath>..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.Core.dll</HintPath>
-      <Private>True</Private>
+    </Reference>
+    <Reference Include="Moq, Version=4.2.1510.2205, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -57,9 +61,6 @@
     <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>

src/NzbDrone.Api.Test/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FluentAssertions" version="4.2.1" targetFramework="net40" />
+  <package id="FluentAssertions" version="4.19.0" targetFramework="net40" />
   <package id="Moq" version="4.0.10827" />
-  <package id="NBuilder" version="3.0.1.1" targetFramework="net40" />
+  <package id="NBuilder" version="4.0.0" targetFramework="net40" />
-  <package id="NUnit" version="3.2.0" targetFramework="net40" />
+  <package id="NUnit" version="3.6.0" 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);
+            return this.LoginAndRedirect(user.Identifier, expiry, _configFileProvider.UrlBase + "/");
         }
 
         private Response Logout()

src/NzbDrone.Api/Authentication/EnableAuthInNancy.cs

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

src/NzbDrone.Api/Blacklist/BlacklistModule.cs

@@ -1,5 +1,4 @@
-using System;
+using NzbDrone.Core.Blacklisting;
-using NzbDrone.Core.Blacklisting;
 using NzbDrone.Core.Datastore;
 
 namespace NzbDrone.Api.Blacklist

src/NzbDrone.Api/Calendar/CalendarFeedModule.cs

@@ -2,31 +2,43 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using DDay.iCal;
+using Ical.Net;
+using Ical.Net.DataTypes;
+using Ical.Net.Interfaces.Serialization;
+using Ical.Net.Serialization;
+using Ical.Net.Serialization.iCalendar.Factory;
 using NzbDrone.Core.Tv;
 using Nancy.Responses;
+using NzbDrone.Core.Tags;
+using NzbDrone.Common.Extensions;
 
 namespace NzbDrone.Api.Calendar
 {
     public class CalendarFeedModule : NzbDroneFeedModule
     {
         private readonly IEpisodeService _episodeService;
+        private readonly ITagService _tagService;
 
-        public CalendarFeedModule(IEpisodeService episodeService)
+        public CalendarFeedModule(IEpisodeService episodeService, ITagService tagService)
             : base("calendar")
         {
             _episodeService = episodeService;
+            _tagService = tagService;
 
             Get["/NzbDrone.ics"] = options => GetCalendarFeed();
+            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 asAllDay = 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;
@@ -34,6 +46,9 @@ namespace NzbDrone.Api.Calendar
             var queryPastDays = Request.Query.PastDays;
             var queryFutureDays = Request.Query.FutureDays;
             var queryUnmonitored = Request.Query.Unmonitored;
+            var queryPremiersOnly = Request.Query.PremiersOnly;
+            var queryAsAllDay = Request.Query.AsAllDay;
+            var queryTags = Request.Query.Tags;
 
             if (queryStart.HasValue) start = DateTime.Parse(queryStart.Value);
             if (queryEnd.HasValue) end = DateTime.Parse(queryEnd.Value);
@@ -55,33 +70,71 @@ namespace NzbDrone.Api.Calendar
                 unmonitored = bool.Parse(queryUnmonitored.Value);
             }
 
+            if (queryPremiersOnly.HasValue)
+            {
+                premiersOnly = bool.Parse(queryPremiersOnly.Value);
+            }
+
+            if (queryAsAllDay.HasValue)
+            {
+                asAllDay = bool.Parse(queryAsAllDay.Value);
+            }
+
+            if (queryTags.HasValue)
+            {
+                var tagInput = (string)queryTags.Value.ToString();
+                tags.AddRange(tagInput.Split(',').Select(_tagService.GetTag).Select(t => t.Id));
+            }
+
             var episodes = _episodeService.EpisodesBetweenDates(start, end, unmonitored);
-            var icalCalendar = new iCalendar();
+            var calendar = new Ical.Net.Calendar
+            {
+                ProductId = "-//sonarr.tv//Sonarr//EN"
+            };
+
+
 
             foreach (var episode in episodes.OrderBy(v => v.AirDateUtc.Value))
             {
-                var occurrence = icalCalendar.Create<Event>();
+                if (premiersOnly && (episode.SeasonNumber == 0 || episode.EpisodeNumber != 1))
-                occurrence.UID = "NzbDrone_episode_" + episode.Id.ToString();
+                {
+                    continue;
+                }
+
+                if (tags.Any() && tags.None(episode.Series.Tags.Contains))
+                {
+                    continue;
+                }
+
+                var occurrence = calendar.Create<Event>();
+                occurrence.Uid = "NzbDrone_episode_" + episode.Id;
                 occurrence.Status = episode.HasFile ? EventStatus.Confirmed : EventStatus.Tentative;
-                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 };
 
+                if (asAllDay)
+                {
+                    occurrence.Start = new CalDateTime(episode.AirDateUtc.Value) { HasTime = false };
+                }
+                else
+                {
+                    occurrence.Start = new CalDateTime(episode.AirDateUtc.Value) { HasTime = true };
+                    occurrence.End = new CalDateTime(episode.AirDateUtc.Value.AddMinutes(episode.Series.Runtime)) { HasTime = true };
+                }
+
                 switch (episode.Series.SeriesType)
                 {
                     case SeriesTypes.Daily:
-                        occurrence.Summary = string.Format("{0} - {1}", episode.Series.Title, episode.Title);
+                        occurrence.Summary = $"{episode.Series.Title} - {episode.Title}";
                         break;
-
                     default:
-                        occurrence.Summary = string.Format("{0} - {1}x{2:00} - {3}", episode.Series.Title, episode.SeasonNumber, episode.EpisodeNumber, episode.Title);
+                        occurrence.Summary =$"{episode.Series.Title} - {episode.SeasonNumber}x{episode.EpisodeNumber:00} - {episode.Title}";
                         break;
                 }
             }
 
-            var serializer = new DDay.iCal.Serialization.iCalendar.SerializerFactory().Build(icalCalendar.GetType(), new DDay.iCal.Serialization.SerializationContext()) as DDay.iCal.Serialization.IStringSerializer;
+            var serializer = (IStringSerializer) new SerializerFactory().Build(calendar.GetType(), new SerializationContext());
-            var icalendar = serializer.SerializeToString(icalCalendar);
+            var icalendar = serializer.SerializeToString(calendar);
 
             return new TextResponse(icalendar, "text/calendar");
         }

src/NzbDrone.Api/ClientSchema/Field.cs

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

src/NzbDrone.Api/ClientSchema/SchemaBuilder.cs

@@ -73,14 +73,14 @@ namespace NzbDrone.Api.ClientSchema
 
                     if (propertyInfo.PropertyType == typeof(int))
                     {
-                        var value = Convert.ToInt32(field.Value);
+                        var value = field.Value.ToString().ParseInt32();
-                        propertyInfo.SetValue(target, value, null);
+                        propertyInfo.SetValue(target, value ?? 0, null);
                     }
 
                     else if (propertyInfo.PropertyType == typeof(long))
                     {
-                        var value = Convert.ToInt64(field.Value);
+                        var value = field.Value.ToString().ParseInt64();
-                        propertyInfo.SetValue(target, value, null);
+                        propertyInfo.SetValue(target, value ?? 0, null);
                     }
 
                     else if (propertyInfo.PropertyType == typeof(int?))

src/NzbDrone.Api/Config/DownloadClientConfigModule.cs

@@ -1,5 +1,4 @@
-using System;
+using FluentValidation;
-using FluentValidation;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Validation.Paths;
 

src/NzbDrone.Api/Config/DownloadClientConfigResource.cs

@@ -1,5 +1,4 @@
-using System;
+using NzbDrone.Api.REST;
-using NzbDrone.Api.REST;
 using NzbDrone.Core.Configuration;
 
 namespace NzbDrone.Api.Config

src/NzbDrone.Api/Config/HostConfigResource.cs

@@ -1,5 +1,4 @@
-using System;
+using NzbDrone.Api.REST;
-using NzbDrone.Api.REST;
 using NzbDrone.Core.Authentication;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Update;

src/NzbDrone.Api/Config/IndexerConfigModule.cs

@@ -1,5 +1,4 @@
-using System;
+using FluentValidation;
-using FluentValidation;
 using NzbDrone.Api.Validation;
 using NzbDrone.Core.Configuration;
 

src/NzbDrone.Api/Config/IndexerConfigResource.cs

@@ -1,5 +1,4 @@
-using System;
+using NzbDrone.Api.REST;
-using NzbDrone.Api.REST;
 using NzbDrone.Core.Configuration;
 
 namespace NzbDrone.Api.Config

src/NzbDrone.Api/Config/MediaManagementConfigModule.cs

@@ -1,5 +1,4 @@
-using System;
+using FluentValidation;
-using FluentValidation;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Validation.Paths;
 

src/NzbDrone.Api/Config/MediaManagementConfigResource.cs

@@ -1,5 +1,4 @@
-using System;
+using NzbDrone.Api.REST;
-using NzbDrone.Api.REST;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.MediaFiles;
 
@@ -21,6 +20,8 @@ namespace NzbDrone.Api.Config
 
         public bool SkipFreeSpaceCheckWhenImporting { get; set; }
         public bool CopyUsingHardlinks { get; set; }
+        public bool ImportExtraFiles { get; set; }
+        public string ExtraFileExtensions { get; set; }
         public bool EnableMediaInfo { get; set; }
     }
 
@@ -44,7 +45,9 @@ namespace NzbDrone.Api.Config
 
                 SkipFreeSpaceCheckWhenImporting = model.SkipFreeSpaceCheckWhenImporting,
                 CopyUsingHardlinks = model.CopyUsingHardlinks,
-                EnableMediaInfo = model.EnableMediaInfo,
+                ImportExtraFiles = model.ImportExtraFiles,
+                ExtraFileExtensions = model.ExtraFileExtensions,
+                EnableMediaInfo = model.EnableMediaInfo
             };
         }
     }

src/NzbDrone.Api/Config/NamingConfigModule.cs

@@ -1,5 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.Linq;
 using FluentValidation;
 using FluentValidation.Results;

src/NzbDrone.Api/Config/NamingConfigResource.cs

@@ -1,5 +1,4 @@
-using System;
+using NzbDrone.Api.REST;
-using NzbDrone.Api.REST;
 using NzbDrone.Core.Organizer;
 
 namespace NzbDrone.Api.Config

src/NzbDrone.Api/Config/UiConfigModule.cs

@@ -1,7 +1,4 @@
-using System;
+using NzbDrone.Core.Configuration;
-using System.Linq;
-using System.Reflection;
-using NzbDrone.Core.Configuration;
 
 namespace NzbDrone.Api.Config
 {

src/NzbDrone.Api/Config/UiConfigResource.cs

@@ -1,5 +1,4 @@
-using System;
+using NzbDrone.Api.REST;
-using NzbDrone.Api.REST;
 using NzbDrone.Core.Configuration;
 
 namespace NzbDrone.Api.Config

src/NzbDrone.Api/DiskSpace/DiskSpaceModule.cs

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

src/NzbDrone.Api/DiskSpace/DiskSpaceResource.cs

@@ -1,5 +1,4 @@
-using System;
+using NzbDrone.Api.REST;
-using NzbDrone.Api.REST;
 
 namespace NzbDrone.Api.DiskSpace
 {

src/NzbDrone.Api/DownloadClient/DownloadClientModule.cs

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

src/NzbDrone.Api/DownloadClient/DownloadClientResource.cs

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

src/NzbDrone.Api/EpisodeFiles/EpisodeFileModule.cs

@@ -1,8 +1,9 @@
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using NLog;
 using NzbDrone.Api.REST;
+using NzbDrone.Common.Disk;
+using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Datastore.Events;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.MediaFiles.Events;
@@ -17,6 +18,7 @@ namespace NzbDrone.Api.EpisodeFiles
                                  IHandle<EpisodeFileAddedEvent>
     {
         private readonly IMediaFileService _mediaFileService;
+        private readonly IDiskProvider _diskProvider;
         private readonly IRecycleBinProvider _recycleBinProvider;
         private readonly ISeriesService _seriesService;
         private readonly IQualityUpgradableSpecification _qualityUpgradableSpecification;
@@ -24,6 +26,7 @@ namespace NzbDrone.Api.EpisodeFiles
 
         public EpisodeFileModule(IBroadcastSignalRMessage signalRBroadcaster,
                              IMediaFileService mediaFileService,
+                             IDiskProvider diskProvider,
                              IRecycleBinProvider recycleBinProvider,
                              ISeriesService seriesService,
                              IQualityUpgradableSpecification qualityUpgradableSpecification,
@@ -31,6 +34,7 @@ namespace NzbDrone.Api.EpisodeFiles
             : base(signalRBroadcaster)
         {
             _mediaFileService = mediaFileService;
+            _diskProvider = diskProvider;
             _recycleBinProvider = recycleBinProvider;
             _seriesService = seriesService;
             _qualityUpgradableSpecification = qualityUpgradableSpecification;
@@ -75,9 +79,10 @@ namespace NzbDrone.Api.EpisodeFiles
             var episodeFile = _mediaFileService.Get(id);
             var series = _seriesService.GetSeries(episodeFile.SeriesId);
             var fullPath = Path.Combine(series.Path, episodeFile.RelativePath);
+            var subfolder = _diskProvider.GetParentFolder(series.Path).GetRelativePath(_diskProvider.GetParentFolder(fullPath));
 
             _logger.Info("Deleting episode file: {0}", fullPath);
-            _recycleBinProvider.DeleteFile(fullPath);
+            _recycleBinProvider.DeleteFile(fullPath, subfolder);
             _mediaFileService.Delete(episodeFile, DeleteMediaFileReason.Manual);
         }
 

src/NzbDrone.Api/Episodes/EpisodeModuleWithSignalR.cs

@@ -1,10 +1,6 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Api.EpisodeFiles;
-using NzbDrone.Api.Extensions;
 using NzbDrone.Api.Series;
 using NzbDrone.Core.Datastore.Events;
 using NzbDrone.Core.DecisionEngine;

src/NzbDrone.Api/Episodes/RenameEpisodeResource.cs

@@ -1,5 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Api.REST;
 

src/NzbDrone.Api/ErrorManagement/NzbDroneErrorPipeline.cs

@@ -63,18 +63,16 @@ namespace NzbDrone.Api.ErrorManagement
                         }.AsResponse(HttpStatusCode.Conflict);
                 }
 
-                var sqlErrorMessage = string.Format("[{0} {1}]", context.Request.Method, context.Request.Path);
+                _logger.Error(sqLiteException, "[{0} {1}]", context.Request.Method, context.Request.Path);
-
-                _logger.Error(sqLiteException, sqlErrorMessage);
             }
-            
+
-            _logger.Fatal(exception, "Request Failed");
+            _logger.Fatal(exception, "Request Failed. {0} {1}", context.Request.Method, context.Request.Path);
 
             return new ErrorModel
-                {
+            {
-                    Message = exception.Message,
+                Message = exception.Message,
-                    Description = exception.ToString()
+                Description = exception.ToString()
-                }.AsResponse(HttpStatusCode.InternalServerError);
+            }.AsResponse(HttpStatusCode.InternalServerError);
         }
     }
 }

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

@@ -14,7 +14,7 @@ namespace NzbDrone.Api.Extensions.Pipelines
             _cacheableSpecification = cacheableSpecification;
         }
 
-        public int Order { get { return 0; } }
+        public int Order => 0;
 
         public void Register(IPipelines pipelines)
         {

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

@@ -7,7 +7,7 @@ namespace NzbDrone.Api.Extensions.Pipelines
 {
     public class CorsPipeline : IRegisterNancyPipeline
     {
-        public int Order { get { return 0; } }
+        public int Order => 0;
 
         public void Register(IPipelines pipelines)
         {

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

@@ -13,7 +13,7 @@ namespace NzbDrone.Api.Extensions.Pipelines
     {
         private readonly Logger _logger;
 
-        public int Order { get { return 0; } }
+        public int Order => 0;
 
         public GzipCompressionPipeline(Logger logger)
         {

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

@@ -14,7 +14,7 @@ namespace NzbDrone.Api.Extensions.Pipelines
             _cacheableSpecification = cacheableSpecification;
         }
 
-        public int Order { get { return 0; } }
+        public int Order => 0;
 
         public void Register(IPipelines pipelines)
         {

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

@@ -7,7 +7,7 @@ namespace NzbDrone.Api.Extensions.Pipelines
 {
     public class NzbDroneVersionPipeline : IRegisterNancyPipeline
     {
-        public int Order { get { return 0; } }
+        public int Order => 0;
 
         public void Register(IPipelines pipelines)
         {

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

@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using System.Threading;
 using Nancy;
 using Nancy.Bootstrapper;
@@ -23,7 +22,7 @@ namespace NzbDrone.Api.Extensions.Pipelines
             _errorPipeline = errorPipeline;
         }
 
-        public int Order { get { return 100; } }
+        public int Order => 100;
 
         public void Register(IPipelines pipelines)
         {
@@ -40,7 +39,7 @@ namespace NzbDrone.Api.Extensions.Pipelines
             context.Items["ApiRequestStartTime"] = DateTime.UtcNow;
 
             var reqPath = GetRequestPathAndQuery(context.Request);
-            
+
             _loggerHttp.Trace("Req: {0} [{1}] {2}", id, context.Request.Method, reqPath);
 
             return null;
@@ -81,7 +80,7 @@ namespace NzbDrone.Api.Extensions.Pipelines
         {
             if (request.Url.Query.IsNotNullOrWhiteSpace())
             {
-                return string.Concat(request.Url.Path, "?", request.Url.Query);
+                return string.Concat(request.Url.Path, request.Url.Query);
             }
             else
             {
@@ -89,4 +88,4 @@ namespace NzbDrone.Api.Extensions.Pipelines
             }
         }
     }
-}
+}

src/NzbDrone.Api/Frontend/CacheableSpecification.cs

@@ -14,7 +14,7 @@ namespace NzbDrone.Api.Frontend
     {
         public bool IsCacheable(NancyContext context)
         {
-            if (!RuntimeInfoBase.IsProduction)
+            if (!RuntimeInfo.IsProduction)
             {
                 return false;
             }

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

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

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

@@ -74,7 +74,7 @@ namespace NzbDrone.Api.Frontend.Mappers
 
         private string GetIndexText()
         {
-            if (RuntimeInfoBase.IsProduction && _generatedContent != null)
+            if (RuntimeInfo.IsProduction && _generatedContent != null)
             {
                 return _generatedContent;
             }
@@ -106,7 +106,7 @@ namespace NzbDrone.Api.Frontend.Mappers
             text = text.Replace("APP_BRANCH", _configFileProvider.Branch.ToLower());
             text = text.Replace("APP_ANALYTICS", _analyticsService.IsEnabled.ToString().ToLowerInvariant());
             text = text.Replace("URL_BASE", URL_BASE);
-            text = text.Replace("PRODUCTION", RuntimeInfoBase.IsProduction.ToString().ToLowerInvariant());
+            text = text.Replace("PRODUCTION", RuntimeInfo.IsProduction.ToString().ToLowerInvariant());
 
             _generatedContent = text;
 

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

@@ -67,7 +67,7 @@ namespace NzbDrone.Api.Frontend.Mappers
 
         private string GetLoginText()
         {
-            if (RuntimeInfoBase.IsProduction && _generatedContent != null)
+            if (RuntimeInfo.IsProduction && _generatedContent != null)
             {
                 return _generatedContent;
             }

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

@@ -1,6 +1,5 @@
 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,5 +1,4 @@
-using System;
+using System.IO;
-using System.IO;
 using NLog;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.EnvironmentInfo;

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using NLog;
 using Nancy;
@@ -21,7 +21,7 @@ namespace NzbDrone.Api.Frontend.Mappers
             _diskProvider = diskProvider;
             _logger = logger;
 
-            if (!RuntimeInfoBase.IsProduction)
+            if (!RuntimeInfo.IsProduction)
             {
                 _caseSensitive = StringComparison.OrdinalIgnoreCase;
             }
@@ -38,7 +38,7 @@ namespace NzbDrone.Api.Frontend.Mappers
             if (_diskProvider.FileExists(filePath, _caseSensitive))
             {
                 var response = new StreamResponse(() => GetContentStream(filePath), MimeTypes.GetMimeType(filePath));
-                return response;
+                return new MaterialisingResponse(response);
             }
 
             _logger.Warn("File {0} not found", filePath);

src/NzbDrone.Api/Health/HealthResource.cs

@@ -1,5 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Api.REST;
 using NzbDrone.Common.Http;

src/NzbDrone.Api/Indexers/IndexerModule.cs

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

src/NzbDrone.Api/Indexers/IndexerResource.cs

@@ -1,5 +1,4 @@
-using System;
+using NzbDrone.Core.Indexers;
-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.Error(ex);
                 throw new NzbDroneClientException(HttpStatusCode.Conflict, "Getting release from indexer failed");
             }
 
@@ -96,7 +96,7 @@ namespace NzbDrone.Api.Indexers
             }
             catch (Exception ex)
             {
-                _logger.Error(ex, "Episode search failed: " + ex.Message);
+                _logger.Error(ex, "Episode search failed");
             }
 
             return new List<ReleaseResource>();

src/NzbDrone.Api/Indexers/ReleaseModuleBase.cs

@@ -1,8 +1,5 @@
 using System.Collections.Generic;
 using NzbDrone.Core.DecisionEngine;
-using NzbDrone.Core.Indexers;
-using NzbDrone.Core.Parser.Model;
-using System.Linq;
 
 namespace NzbDrone.Api.Indexers
 {

src/NzbDrone.Api/Indexers/ReleasePushModule.cs

@@ -8,7 +8,6 @@ using System.Linq;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Api.Extensions;
 using NLog;
-using NzbDrone.Core.Indexers;
 
 namespace NzbDrone.Api.Indexers
 {

src/NzbDrone.Api/Logs/LogFileModule.cs

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

src/NzbDrone.Api/Logs/LogFileModuleBase.cs

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

src/NzbDrone.Api/Logs/LogModule.cs

@@ -1,5 +1,4 @@
-using NzbDrone.Core.Datastore;
+using NzbDrone.Core.Instrumentation;
-using NzbDrone.Core.Instrumentation;
 
 namespace NzbDrone.Api.Logs
 {

src/NzbDrone.Api/Logs/UpdateLogFileModule.cs

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

src/NzbDrone.Api/Metadata/MetadataModule.cs

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

src/NzbDrone.Api/Metadata/MetadataResource.cs

@@ -1,6 +1,4 @@
-using System;
+namespace NzbDrone.Api.Metadata
-
-namespace NzbDrone.Api.Metadata
 {
     public class MetadataResource : ProviderResource
     {

src/NzbDrone.Api/NancyBootstrapper.cs

@@ -1,10 +1,7 @@
-using System;
+using System.Linq;
-using System.Linq;
-using Nancy;
 using Nancy.Bootstrapper;
 using Nancy.Diagnostics;
 using NLog;
-using NzbDrone.Api.ErrorManagement;
 using NzbDrone.Api.Extensions.Pipelines;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Instrumentation;
@@ -27,9 +24,9 @@ namespace NzbDrone.Api
 
         protected override void ApplicationStartup(TinyIoCContainer container, IPipelines pipelines)
         {
-            Logger.Info("Starting NzbDrone API");
+            Logger.Info("Starting Web Server");
 
-            if (RuntimeInfoBase.IsProduction)
+            if (RuntimeInfo.IsProduction)
             {
                 DiagnosticsHook.Disable(pipelines);
             }
@@ -55,17 +52,8 @@ namespace NzbDrone.Api
             return _tinyIoCContainer;
         }
 
-        protected override DiagnosticsConfiguration DiagnosticsConfiguration
+        protected override DiagnosticsConfiguration DiagnosticsConfiguration => new DiagnosticsConfiguration { Password = @"password" };
-        {
-            get { return new DiagnosticsConfiguration { Password = @"password" }; }
-        }
 
-        protected override byte[] FavIcon
+        protected override byte[] FavIcon => null;
-        {
-            get
-            {
-                return null;
-            }
-        }
     }
 }

src/NzbDrone.Api/Notifications/NotificationModule.cs

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

src/NzbDrone.Api/NzbDrone.Api.csproj

@@ -40,36 +40,45 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="antlr.runtime, Version=2.7.6.2, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Ical.Net.2.2.32\lib\net40\antlr.runtime.dll</HintPath>
+    </Reference>
     <Reference Include="FluentValidation, Version=6.2.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\FluentValidation.6.2.1.0\lib\portable-net40+sl50+wp80+win8+wpa81\FluentValidation.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Nancy, Version=0.23.2.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Ical.Net, Version=2.1.0.18776, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Ical.Net.2.2.32\lib\net40\Ical.Net.dll</HintPath>
-      <HintPath>..\packages\Nancy.0.23.2\lib\net40\Nancy.dll</HintPath>
     </Reference>
-    <Reference Include="Nancy.Authentication.Basic, Version=0.23.2.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Ical.Net.Collections, Version=2.1.0.18775, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Ical.Net.2.2.32\lib\net40\Ical.Net.Collections.dll</HintPath>
-      <HintPath>..\packages\Nancy.Authentication.Basic.0.23.2\lib\net40\Nancy.Authentication.Basic.dll</HintPath>
     </Reference>
-    <Reference Include="Nancy.Authentication.Forms">
+    <Reference Include="Nancy, Version=1.4.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Nancy.Authentication.Forms.0.23.2\lib\net40\Nancy.Authentication.Forms.dll</HintPath>
+      <HintPath>..\packages\Nancy.1.4.3\lib\net40\Nancy.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference Include="Nancy.Authentication.Basic, Version=1.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Nancy.Authentication.Basic.1.4.1\lib\net40\Nancy.Authentication.Basic.dll</HintPath>
-      <HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Nancy.Authentication.Forms, Version=1.4.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Nancy.Authentication.Forms.1.4.1\lib\net40\Nancy.Authentication.Forms.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.3.4\lib\net40\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.3\lib\net40\NLog.dll</HintPath>
-      <Private>True</Private>
+    </Reference>
+    <Reference Include="NodaTime, Version=1.3.0.0, Culture=neutral, PublicKeyToken=4226afe0d9b296d1, processorArchitecture=MSIL">
+      <HintPath>..\packages\Ical.Net.2.2.32\lib\net40\NodaTime.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="DDay.iCal">
-      <HintPath>..\packages\DDay.iCal.1.0.2.575\lib\DDay.iCal.dll</HintPath>
-    </Reference>
     <Reference Include="System.Data.SQLite, Version=1.0.84.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Libraries\Sqlite\System.Data.SQLite.dll</HintPath>

src/NzbDrone.Api/NzbDroneRestModule.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Linq;
-using System.Collections.Generic;
 using NzbDrone.Api.REST;
 using NzbDrone.Api.Validation;
 using NzbDrone.Core.Datastore;

src/NzbDrone.Api/Parse/ParseResource.cs

@@ -1,5 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using NzbDrone.Api.Episodes;
 using NzbDrone.Api.REST;
 using NzbDrone.Api.Series;

src/NzbDrone.Api/Profiles/Languages/LanguageResource.cs

@@ -1,5 +1,4 @@
-using System;
+using Newtonsoft.Json;
-using Newtonsoft.Json;
 using NzbDrone.Api.REST;
 
 namespace NzbDrone.Api.Profiles.Languages
@@ -9,6 +8,6 @@ namespace NzbDrone.Api.Profiles.Languages
         [JsonProperty(DefaultValueHandling = DefaultValueHandling.Include)]
         public new int Id { get; set; }
         public string Name { get; set; }
-        public string NameLower { get { return Name.ToLowerInvariant(); } }
+        public string NameLower => Name.ToLowerInvariant();
     }
 }

src/NzbDrone.Api/Profiles/LegacyProfileModule.cs

@@ -1,5 +1,4 @@
-using System;
+using System.Text;
-using System.Text;
 using Nancy;
 
 namespace NzbDrone.Api.Profiles

src/NzbDrone.Api/Profiles/ProfileModule.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using FluentValidation;
 using NzbDrone.Core.Profiles;
-using NzbDrone.Core.Qualities;
 using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Api.Profiles

src/NzbDrone.Api/Profiles/ProfileResource.cs

@@ -1,5 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Api.REST;
 using NzbDrone.Core.Parser;

src/NzbDrone.Api/ProviderModuleBase.cs

@@ -1,5 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.Linq;
 using FluentValidation;
 using FluentValidation.Results;

src/NzbDrone.Api/Qualities/QualityDefinitionResource.cs

@@ -1,5 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Api.REST;
 using NzbDrone.Core.Qualities;

src/NzbDrone.Api/REST/RestResource.cs

@@ -8,12 +8,6 @@ namespace NzbDrone.Api.REST
         public int Id { get; set; }
 
         [JsonIgnore]
-        public virtual string ResourceName
+        public virtual string ResourceName => GetType().Name.ToLowerInvariant().Replace("resource", "");
-        {
-            get
-            {
-                return GetType().Name.ToLower().Replace("resource", "");
-            }
-        }
     }
 }

src/NzbDrone.Api/RemotePathMappings/RemotePathMappingResource.cs

@@ -1,5 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Api.REST;
 using NzbDrone.Core.RemotePathMappings;

src/NzbDrone.Api/Restrictions/RestrictionModule.cs

@@ -1,5 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using FluentValidation.Results;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Restrictions;

src/NzbDrone.Api/Restrictions/RestrictionResource.cs

@@ -1,5 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Api.REST;
 using NzbDrone.Core.Restrictions;