Searching for movie now works with downloading. They also get imported fine.

Additionally, a whole series (or movie in this case) can now be
downloaded manually.
Note: It probably won't start downloading missed releases. Only manually
clicking search for is working ATM.

.gitignore

@@ -10,6 +10,7 @@ src/**/[Oo]bj/
 *.suo
 *.user
 *.sln.docstates
+.vs/
 
 # Build results
 *_i.c

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
-- HTML/Javascript editor of choice (Sublime Text/Webstorm/etc)
+- Visual Studio 2015
+- HTML/Javascript editor of choice (Sublime Text/Webstorm/Atom/etc)
 - npm (node package manager)
 - git
 

readme.md

@@ -1,7 +1,7 @@
 # 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.
+This fork of Sonarr aims to turn it into something like Couchpotato.
+At the moment almost nothing is implemented.
 
 ## Major Features Include: ##
 

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,7 +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.3.11\lib\net40\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

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.3.11" targetFramework="net40" />
 </packages>

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/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.Owin/ServerRequest.cs

@@ -7,11 +7,9 @@ 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,16 +38,20 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <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>
+    <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>
       <Private>True</Private>
     </Reference>
-    <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>
+    <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>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.2.0\lib\net40\nunit.framework.dll</HintPath>
+    <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>
     <Reference Include="System" />
@@ -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.18.0" targetFramework="net40" />
   <package id="Moq" version="4.0.10827" />
-  <package id="NBuilder" version="3.0.1.1" targetFramework="net40" />
-  <package id="NUnit" version="3.2.0" targetFramework="net40" />
+  <package id="NBuilder" version="4.0.0" targetFramework="net40" />
+  <package id="NUnit" version="3.5.0" targetFramework="net40" />
 </packages>

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

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,7 +2,11 @@
 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;
@@ -22,6 +26,7 @@ namespace NzbDrone.Api.Calendar
             _tagService = tagService;
 
             Get["/NzbDrone.ics"] = options => GetCalendarFeed();
+            Get["/Sonarr.ics"] = options => GetCalendarFeed();
         }
 
         private Response GetCalendarFeed()
@@ -75,7 +80,12 @@ namespace NzbDrone.Api.Calendar
             }
 
             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))
             {
@@ -89,28 +99,27 @@ namespace NzbDrone.Api.Calendar
                     continue;
                 }
 
-                var occurrence = icalCalendar.Create<Event>();
-                occurrence.UID = "NzbDrone_episode_" + episode.Id.ToString();
+                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.Start = new CalDateTime(episode.AirDateUtc.Value) { HasTime = true };
+                occurrence.End = new CalDateTime(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 = 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 icalendar = serializer.SerializeToString(icalCalendar);
+            var serializer = (IStringSerializer) new SerializerFactory().Build(calendar.GetType(), new SerializationContext());
+            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/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/MediaManagementConfigResource.cs

@@ -44,7 +44,8 @@ namespace NzbDrone.Api.Config
 
                 SkipFreeSpaceCheckWhenImporting = model.SkipFreeSpaceCheckWhenImporting,
                 CopyUsingHardlinks = model.CopyUsingHardlinks,
-                EnableMediaInfo = model.EnableMediaInfo,
+                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 System.Linq;
-using System.Reflection;
-using NzbDrone.Core.Configuration;
+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,6 +1,5 @@
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using NLog;
 using NzbDrone.Api.REST;
 using NzbDrone.Core.Datastore.Events;

src/NzbDrone.Api/Episodes/EpisodeModule.cs

@@ -3,6 +3,7 @@ using NzbDrone.Api.REST;
 using NzbDrone.Core.Tv;
 using NzbDrone.Core.DecisionEngine;
 using NzbDrone.SignalR;
+using Nancy;
 
 namespace NzbDrone.Api.Episodes
 {

src/NzbDrone.Api/Episodes/EpisodeModuleWithSignalR.cs

@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
+using System.Collections.Generic;
 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/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)
         {

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/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/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/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
-        {
-            get
-            {
-                return "logfile";
-            }
-        }
-
+        protected override string DownloadUrlRoot => "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
-        {
-            get
-            {
-                return "updatelogfile";
-            }
-        }
+        protected override string DownloadUrlRoot => "updatelogfile";
     }
 }

src/NzbDrone.Api/Metadata/MetadataModule.cs

@@ -1,5 +1,4 @@
-using System;
-using NzbDrone.Core.Extras.Metadata;
+using NzbDrone.Core.Extras.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 Nancy;
+using System.Linq;
 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;
@@ -55,17 +52,8 @@ namespace NzbDrone.Api
             return _tinyIoCContainer;
         }
 
-        protected override DiagnosticsConfiguration DiagnosticsConfiguration
-        {
-            get { return new DiagnosticsConfiguration { Password = @"password" }; }
-        }
+        protected override DiagnosticsConfiguration DiagnosticsConfiguration => new DiagnosticsConfiguration { Password = @"password" };
 
-        protected override byte[] FavIcon
-        {
-            get
-            {
-                return null;
-            }
-        }
+        protected override byte[] FavIcon => 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,50 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="antlr.runtime, Version=2.7.6.2, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Ical.Net.2.2.25\lib\net40\antlr.runtime.dll</HintPath>
+      <Private>True</Private>
+    </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">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Nancy.0.23.2\lib\net40\Nancy.dll</HintPath>
+    <Reference Include="Ical.Net, Version=2.1.0.30332, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Ical.Net.2.2.25\lib\net40\Ical.Net.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Nancy.Authentication.Basic, Version=0.23.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Nancy.Authentication.Basic.0.23.2\lib\net40\Nancy.Authentication.Basic.dll</HintPath>
+    <Reference Include="Ical.Net.Collections, Version=2.1.0.30331, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Ical.Net.2.2.25\lib\net40\Ical.Net.Collections.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Nancy.Authentication.Forms">
-      <HintPath>..\packages\Nancy.Authentication.Forms.0.23.2\lib\net40\Nancy.Authentication.Forms.dll</HintPath>
+    <Reference Include="Nancy, Version=1.4.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Nancy.1.4.3\lib\net40\Nancy.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Nancy.Authentication.Basic, Version=1.4.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Nancy.Authentication.Basic.1.4.1\lib\net40\Nancy.Authentication.Basic.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=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
     </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.3.11\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.25\lib\net40\NodaTime.dll</HintPath>
       <Private>True</Private>
     </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
-        {
-            get
-            {
-                return GetType().Name.ToLowerInvariant().Replace("resource", "");
-            }
-        }
+        public virtual string ResourceName => GetType().Name.ToLowerInvariant().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;

src/NzbDrone.Api/RootFolders/RootFolderResource.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.RootFolders;

src/NzbDrone.Api/SeasonPass/SeasonPassModule.cs

@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Nancy;
+using Nancy;
 using NzbDrone.Api.Extensions;
 using NzbDrone.Core.Tv;
 

src/NzbDrone.Api/Series/AlternateTitleResource.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace NzbDrone.Api.Series
+namespace NzbDrone.Api.Series
 {
     public class AlternateTitleResource
     {

src/NzbDrone.Api/Tags/TagModule.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using NzbDrone.Core.Datastore.Events;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.Tags;

src/NzbDrone.Api/Tags/TagResource.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.Tags;

src/NzbDrone.Api/TinyIoCNancyBootstrapper.cs

@@ -1,34 +1,37 @@
-using System;
+using TinyIoC;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using Nancy;
-using Nancy.Bootstrapper;
 using Nancy.Diagnostics;
-using TinyIoC;
+using Nancy.Bootstrapper;
 
 namespace NzbDrone.Api
 {
+
+
+    /// <summary>
+    /// TinyIoC bootstrapper - registers default route resolver and registers itself as
+    /// INancyModuleCatalog for resolving modules but behaviour can be overridden if required.
+    /// </summary>
     public class TinyIoCNancyBootstrapper : NancyBootstrapperWithRequestContainerBase<TinyIoCContainer>
     {
-        // <summary>
+        /// <summary>
         /// Default assemblies that are ignored for autoregister
         /// </summary>
-        private static readonly IEnumerable<Func<Assembly, bool>> DefaultAutoRegisterIgnoredAssemblies = new Func<Assembly, bool>[]
+        public static IEnumerable<Func<Assembly, bool>> DefaultAutoRegisterIgnoredAssemblies = new Func<Assembly, bool>[]
             {
                 asm => !asm.FullName.StartsWith("Nancy.", StringComparison.InvariantCulture),
             };
 
         /// <summary>
         /// Gets the assemblies to ignore when autoregistering the application container
-        /// Return true from the delegate to ignore that particular assembly, returning true
-        /// does not mean the assembly *will* be included, a false from another delegate will
+        /// Return true from the delegate to ignore that particular assembly, returning false
+        /// does not mean the assembly *will* be included, a true from another delegate will
         /// take precedence.
         /// </summary>
-        protected virtual IEnumerable<Func<Assembly, bool>> AutoRegisterIgnoredAssemblies
-        {
-            get { return DefaultAutoRegisterIgnoredAssemblies; }
-        }
+        protected virtual IEnumerable<Func<Assembly, bool>> AutoRegisterIgnoredAssemblies => DefaultAutoRegisterIgnoredAssemblies;
 
         /// <summary>
         /// Configures the container using AutoRegister followed by registration
@@ -49,11 +52,6 @@ namespace NzbDrone.Api
             return this.ApplicationContainer.Resolve<INancyEngine>();
         }
 
-        /*        protected override IModuleKeyGenerator GetModuleKeyGenerator()
-                {
-                    return ApplicationContainer.Resolve<IModuleKeyGenerator>();
-                }*/
-
         /// <summary>
         /// Create a default, unconfigured, container
         /// </summary>
@@ -93,6 +91,7 @@ namespace NzbDrone.Api
                         break;
                     case Lifetime.PerRequest:
                         throw new InvalidOperationException("Unable to directly register a per request lifetime.");
+                        break;
                     default:
                         throw new ArgumentOutOfRangeException();
                 }
@@ -104,10 +103,10 @@ namespace NzbDrone.Api
         /// by IEnumerable{Type} constructor dependencies.
         /// </summary>
         /// <param name="container">Container to register into</param>
-        /// <param name="collectionTypeRegistrationsn">Collection type registrations to register</param>
-        protected override sealed void RegisterCollectionTypes(TinyIoCContainer container, IEnumerable<CollectionTypeRegistration> collectionTypeRegistrationsn)
+        /// <param name="collectionTypeRegistrations">Collection type registrations to register</param>
+        protected override sealed void RegisterCollectionTypes(TinyIoCContainer container, IEnumerable<CollectionTypeRegistration> collectionTypeRegistrations)
         {
-            foreach (var collectionTypeRegistration in collectionTypeRegistrationsn)
+            foreach (var collectionTypeRegistration in collectionTypeRegistrations)
             {
                 switch (collectionTypeRegistration.Lifetime)
                 {
@@ -119,6 +118,7 @@ namespace NzbDrone.Api
                         break;
                     case Lifetime.PerRequest:
                         throw new InvalidOperationException("Unable to directly register a per request lifetime.");
+                        break;
                     default:
                         throw new ArgumentOutOfRangeException();
                 }
@@ -160,8 +160,9 @@ namespace NzbDrone.Api
         /// <summary>
         /// Creates a per request child/nested container
         /// </summary>
+        /// <param name="context">Current context</param>
         /// <returns>Request container instance</returns>
-        protected override sealed TinyIoCContainer CreateRequestContainer()
+        protected override TinyIoCContainer CreateRequestContainer(NancyContext context)
         {
             return this.ApplicationContainer.GetChildContainer();
         }
@@ -216,7 +217,7 @@ namespace NzbDrone.Api
         }
 
         /// <summary>
-        /// Retreive a specific module instance from the container
+        /// Retrieve a specific module instance from the container
         /// </summary>
         /// <param name="container">Container to use</param>
         /// <param name="moduleType">Type of the module</param>
@@ -239,4 +240,4 @@ namespace NzbDrone.Api
             container.AutoRegister(AppDomain.CurrentDomain.GetAssemblies().Where(a => !ignoredAssemblies.Any(ia => ia(a))), DuplicateImplementationActions.RegisterMultiple, t => t.Assembly != assembly);
         }
     }
-}
+}

src/NzbDrone.Api/Wanted/LegacyMissingModule.cs

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

src/NzbDrone.Api/packages.config

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="DDay.iCal" version="1.0.2.575" targetFramework="net40" />
   <package id="FluentValidation" version="6.2.1.0" targetFramework="net40" />
-  <package id="Nancy" version="0.23.2" targetFramework="net40" />
-  <package id="Nancy.Authentication.Basic" version="0.23.2" targetFramework="net40" />
-  <package id="Nancy.Authentication.Forms" version="0.23.2" targetFramework="net40" />
+  <package id="Ical.Net" version="2.2.25" targetFramework="net40" />
+  <package id="Nancy" version="1.4.3" targetFramework="net40" />
+  <package id="Nancy.Authentication.Basic" version="1.4.1" targetFramework="net40" />
+  <package id="Nancy.Authentication.Forms" version="1.4.1" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net40" />
-  <package id="NLog" version="4.3.4" targetFramework="net40" />
+  <package id="NLog" version="4.3.11" targetFramework="net40" />
 </packages>

src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj

@@ -37,20 +37,24 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <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>
+    <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>
       <Private>True</Private>
     </Reference>
-    <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>
+    <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>
+      <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="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.3.11\lib\net40\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.2.0\lib\net40\nunit.framework.dll</HintPath>
+    <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>
     <Reference Include="System" />
@@ -58,9 +62,6 @@
     <Reference Include="System.ServiceProcess" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="FizzWare.NBuilder, Version=3.0.1.0, Culture=neutral, PublicKeyToken=5651b03e12e42c12">
-      <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.App.Test/NzbDroneProcessServiceFixture.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common.Model;

src/NzbDrone.App.Test/packages.config

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

src/NzbDrone.Automation.Test/AutomationTest.cs

@@ -28,7 +28,7 @@ namespace NzbDrone.Automation.Test
             LogManager.Configuration = new LoggingConfiguration();
             var consoleTarget = new ConsoleTarget { Layout = "${level}: ${message} ${exception}" };
             LogManager.Configuration.AddTarget(consoleTarget.GetType().Name, consoleTarget);
-            LogManager.Configuration.LoggingRules.Add(new LoggingRule("*", LogLevel.Trace, consoleTarget));
+            LogManager.Configuration.LoggingRules.Add(new LoggingRule("*", NLog.LogLevel.Trace, consoleTarget));
         }
 
         [TestFixtureSetUp]

src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj

@@ -38,20 +38,20 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <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>
+    <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>
       <Private>True</Private>
     </Reference>
-    <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>
+    <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="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.3.11\lib\net40\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.2.0\lib\net40\nunit.framework.dll</HintPath>
+    <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>
     <Reference Include="System" />
@@ -62,13 +62,13 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="WebDriver, Version=2.48.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Selenium.WebDriver.2.48.0\lib\net40\WebDriver.dll</HintPath>
+    <Reference Include="WebDriver, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Selenium.WebDriver.3.0.1\lib\net40\WebDriver.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="WebDriver.Support, Version=2.48.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Selenium.Support.2.48.0\lib\net40\WebDriver.Support.dll</HintPath>
+    <Reference Include="WebDriver.Support, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Selenium.Support.3.0.1\lib\net40\WebDriver.Support.dll</HintPath>
+      <Private>True</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>

src/NzbDrone.Automation.Test/PageModel/PageBase.cs

@@ -47,52 +47,16 @@ namespace NzbDrone.Automation.Test.PageModel
             });
         }
 
-        public IWebElement SeriesNavIcon
-        {
-            get
-            {
-                return FindByClass("x-series-nav");
-            }
-        }
+        public IWebElement SeriesNavIcon => FindByClass("x-series-nav");
 
-        public IWebElement CalendarNavIcon
-        {
-            get
-            {
-                return FindByClass("x-calendar-nav");
-            }
-        }
+        public IWebElement CalendarNavIcon => FindByClass("x-calendar-nav");
 
-        public IWebElement ActivityNavIcon
-        {
-            get
-            {
-                return FindByClass("x-activity-nav");
-            }
-        }
+        public IWebElement ActivityNavIcon => FindByClass("x-activity-nav");
 
-        public IWebElement WantedNavIcon
-        {
-            get
-            {
-                return FindByClass("x-wanted-nav");
-            }
-        }
+        public IWebElement WantedNavIcon => FindByClass("x-wanted-nav");
 
-        public IWebElement SettingNavIcon
-        {
-            get
-            {
-                return FindByClass("x-settings-nav");
-            }
-        }
+        public IWebElement SettingNavIcon => FindByClass("x-settings-nav");
 
-        public IWebElement SystemNavIcon
-        {
-            get
-            {
-                return FindByClass("x-system-nav");
-            }
-        }
+        public IWebElement SystemNavIcon => FindByClass("x-system-nav");
     }
 }

src/NzbDrone.Automation.Test/packages.config

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FluentAssertions" version="4.2.1" targetFramework="net40" />
-  <package id="NLog" version="4.3.4" targetFramework="net40" />
-  <package id="NUnit" version="3.2.0" targetFramework="net40" />
-  <package id="Selenium.Support" version="2.48.0" targetFramework="net40" />
-  <package id="Selenium.WebDriver" version="2.48.0" targetFramework="net40" />
+  <package id="FluentAssertions" version="4.18.0" targetFramework="net40" />
+  <package id="NLog" version="4.3.11" targetFramework="net40" />
+  <package id="NUnit" version="3.5.0" targetFramework="net40" />
+  <package id="Selenium.Support" version="3.0.1" targetFramework="net40" />
+  <package id="Selenium.WebDriver" version="3.0.1" targetFramework="net40" />
 </packages>

src/NzbDrone.Common.Test/ConfigFileProviderTest.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.IO;
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;

src/NzbDrone.Common.Test/DiskTests/DirectoryLookupServiceFixture.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using FluentAssertions;

src/NzbDrone.Common.Test/DiskTests/DiskProviderFixtureBase.cs

@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using System.Linq;
 using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Common.Disk;

src/NzbDrone.Common.Test/DiskTests/DiskTransferServiceFixture.cs

@@ -1,8 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common.Disk;

src/NzbDrone.Common.Test/Http/HttpHeaderFixture.cs

@@ -0,0 +1,40 @@
+using NUnit.Framework;
+using FluentAssertions;
+using NzbDrone.Test.Common;
+using System;
+using System.Text;
+using NzbDrone.Common.Http;
+using System.Collections.Specialized;
+
+namespace NzbDrone.Common.Test.Http
+{
+    [TestFixture]
+    public class HttpHeaderFixture : TestBase
+    {
+        [TestCase("text/html; charset=\"utf-8\"", "utf-8")]
+        [TestCase("text/html; charset=utf-8", "utf-8")]
+        public void should_get_encoding_from_content_type_header(string contentType, string charsetExpected)
+        {
+            var headers = new NameValueCollection();
+
+            headers.Add("Content-Type", contentType);
+
+            var httpheader = new HttpHeader(headers);
+
+            httpheader.GetEncodingFromContentType().Should().Be(Encoding.GetEncoding(charsetExpected));
+        }
+
+        [TestCase("text/html; charset=asdasd")]
+        public void should_throw_when_invalid_encoding_is_in_content_type_header(string contentType)
+        {
+            var headers = new NameValueCollection();
+
+            headers.Add("Content-Type", contentType);
+
+            var httpheader = new HttpHeader(headers);
+
+            Action action = () => httpheader.GetEncodingFromContentType();
+            action.ShouldThrow<ArgumentException>();
+        }
+    }
+}

src/NzbDrone.Common.Test/Http/HttpRequestFixture.cs

@@ -1,7 +1,4 @@
-using System;
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Common.Http;
+using NUnit.Framework;
 
 namespace NzbDrone.Common.Test.Http
 {

src/NzbDrone.Common.Test/InstrumentationTests/CleanseLogMessageFixture.cs

@@ -1,5 +1,4 @@
-using System;
-using NUnit.Framework;
+using NUnit.Framework;
 using NzbDrone.Common.Instrumentation;
 using FluentAssertions;
 

src/NzbDrone.Common.Test/LevenshteinDistanceFixture.cs

@@ -1,5 +1,4 @@
-using System;
-using FluentAssertions;
+using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Test.Common;

src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj

@@ -37,20 +37,20 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <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>
+    <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>
       <Private>True</Private>
     </Reference>
-    <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>
+    <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="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.3.11\lib\net40\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.2.0\lib\net40\nunit.framework.dll</HintPath>
+    <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>
     <Reference Include="System" />
@@ -84,6 +84,7 @@
     <Compile Include="ExtensionTests\IEnumerableExtensionTests\IntersectByFixture.cs" />
     <Compile Include="ExtensionTests\Int64ExtensionFixture.cs" />
     <Compile Include="Http\HttpClientFixture.cs" />
+    <Compile Include="Http\HttpHeaderFixture.cs" />
     <Compile Include="Http\HttpRequestBuilderFixture.cs" />
     <Compile Include="Http\HttpRequestFixture.cs" />
     <Compile Include="Http\HttpUriFixture.cs" />

src/NzbDrone.Common.Test/OsPathFixture.cs

@@ -1,5 +1,4 @@
-using System;
-using NUnit.Framework;
+using NUnit.Framework;
 using NzbDrone.Common.Disk;
 using NzbDrone.Test.Common;
 using FluentAssertions;

src/NzbDrone.Common.Test/PathExtensionFixture.cs

@@ -196,7 +196,7 @@ namespace NzbDrone.Common.Test
         public void get_actual_casing_should_return_actual_casing_for_local_file_in_windows()
         {
             WindowsOnly();
-            var path = Environment.ExpandEnvironmentVariables("%SystemRoot%\\System32");
+            var path = Directory.GetDirectories("C:\\")[3];
             path.ToUpper().GetActualCasing().Should().Be(path);
             path.ToLower().GetActualCasing().Should().Be(path);
         }
@@ -243,7 +243,7 @@ namespace NzbDrone.Common.Test
         }
 
         [Test]
-        public void Sanbox()
+        public void Sandbox()
         {
             GetIAppDirectoryInfo().GetUpdateSandboxFolder().Should().BeEquivalentTo(@"C:\Temp\nzbdrone_update\".AsOsAgnostic());
         }
@@ -271,5 +271,33 @@ namespace NzbDrone.Common.Test
         {
             GetIAppDirectoryInfo().GetUpdateLogFolder().Should().BeEquivalentTo(@"C:\NzbDrone\UpdateLogs\".AsOsAgnostic());
         }
+
+        [Test]
+        public void GetAncestorFolders_should_return_all_ancestors_in_path_Windows()
+        {
+            WindowsOnly();
+            var path = @"C:\Test\TV\Series Title";
+            var result = path.GetAncestorFolders();
+
+            result.Count.Should().Be(4);
+            result[0].Should().Be(@"C:\");
+            result[1].Should().Be(@"Test");
+            result[2].Should().Be(@"TV");
+            result[3].Should().Be(@"Series Title");
+        }
+
+        [Test]
+        public void GetAncestorFolders_should_return_all_ancestors_in_path_Linux()
+        {
+            MonoOnly();
+            var path = @"/Test/TV/Series Title";
+            var result = path.GetAncestorFolders();
+
+            result.Count.Should().Be(4);
+            result[0].Should().Be(@"/");
+            result[1].Should().Be(@"Test");
+            result[2].Should().Be(@"TV");
+            result[3].Should().Be(@"Series Title");
+        }
     }
 }