Fixed failing test

closes #2366

.github/ISSUE_TEMPLATE.md

@@ -3,6 +3,7 @@ Before opening a new issue, please ensure:
 - You use the forums for support/questions
 - You search for existing bugs/feature requests
 - Remove extraneous template details
+- Do not prefix title with type of issue (Feature Request, Bug, etc.) The appropriate labels will be added during triage.
 -->
 
 ## Support / Questions

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,28 @@
+---
+name: Bug report
+about: Create a report to help us improve Sonarr
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Logs**
+Link to debug or trace log files.
+
+**System Information**
+
+ - Sonarr Version: [e.g. 2.0.0.1]
+ - Operating System: [e.g. Windows 10]
+ - .net Framework (Windows) or mono (macOS/Linux) Version: [e.g. 4.5 or 5.12]
+
+**UI Bugs:**
+ - OS: [e.g. Windows]
+ - Browser: [e.g. chrome, firefox]
+ - Version: [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,14 @@
+---
+name: Feature request
+about: Suggest an idea for Sonarr
+
+---
+
+**Describe the problem**
+A clear and concise description of the problem you're looking to solve.
+
+**Describe any solutions you think might work**
+A clear and concise description of any solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/other-issues.md

@@ -0,0 +1,7 @@
+---
+name: Other issues
+about: How to get support or ask questions
+
+---
+
+Please use https://forums.sonarr.tv/ for support. Support requests or questions will be redirected to the forums and the issue will be closed.

.gitignore

@@ -130,6 +130,7 @@ output/*
 
 #OS X metadata files
 ._*
+.DS_Store
 
 _start
 _temp_*/**/*

build.sh

@@ -52,15 +52,6 @@ CleanFolder()
     find $path -depth -empty -type d -exec rm -r "{}" \;
 }
 
-
-
-AddJsonNet()
-{
-    rm $outputFolder/Newtonsoft.Json.*
-    cp $sourceFolder/packages/Newtonsoft.Json.*/lib/net35/*.dll $outputFolder
-    cp $sourceFolder/packages/Newtonsoft.Json.*/lib/net35/*.dll $outputFolder/NzbDrone.Update
-}
-
 BuildWithMSBuild()
 {
     export PATH=$msBuild:$PATH
@@ -91,8 +82,6 @@ Build()
 
     CleanFolder $outputFolder false
 
-    AddJsonNet
-
     echo "Removing Mono.Posix.dll"
     rm $outputFolder/Mono.Posix.dll
 

osx/Sonarr

@@ -9,7 +9,11 @@ APPNAME="Sonarr"
  
 #set up environment
 if [[ -x '/opt/local/bin/mono' ]]; then
+    # Macports and mono-supplied installer path
     export PATH="/opt/local/bin:$PATH"
+elif [[ -x '/usr/local/bin/mono' ]]; then
+    # Homebrew-supplied path to mono
+    export PATH="/usr/local/bin:$PATH"
 fi
 
 export DYLD_FALLBACK_LIBRARY_PATH="$DIR"

src/LogentriesNLog/LogentriesNLog.csproj

@@ -52,10 +52,14 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.5.3\lib\net40-client\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />

src/LogentriesNLog/packages.config

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

src/Marr.Data/Mapping/MappingHelper.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Data.Common;
@@ -91,9 +91,11 @@ namespace Marr.Data.Mapping
             Type entType = ent.GetType();
             if (_repos.Relationships.ContainsKey(entType))
             {
+                var provider = _db.ProviderFactory;
+                var connectionString = _db.ConnectionString;
                 Func<IDataMapper> dbCreate = () =>
                 {
-                    var db = new DataMapper(_db.ProviderFactory, _db.ConnectionString);
+                    var db = new DataMapper(provider, connectionString);
                     db.SqlMode = SqlModes.Text;
                     return db;
                 };

src/Marr.Data/Reflection/SimpleReflectionStrategy.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
 using System.Reflection;

src/NzbDrone.Api.Test/ClientSchemaTests/SchemaBuilderFixture.cs

@@ -21,19 +21,32 @@ namespace NzbDrone.Api.Test.ClientSchemaTests
         public void schema_should_have_proper_fields()
         {
             var model = new TestModel
-                {
+            {
-                    FirstName = "Bob",
+                FirstName = "Bob",
-                    LastName = "Poop"
+                LastName = "Poop"
-                };
+            };
 
             var schema = SchemaBuilder.ToSchema(model);
 
-            schema.Should().Contain(c => c.Order == 1 && c.Name == "LastName" && c.Label == "Last Name" && c.HelpText == "Your Last Name" && (string) c.Value == "Poop");
+            schema.Should().Contain(c => c.Order == 1 && c.Name == "LastName" && c.Label == "Last Name" && c.HelpText == "Your Last Name" && (string)c.Value == "Poop");
-            schema.Should().Contain(c => c.Order == 0 && c.Name == "FirstName" && c.Label == "First Name" && c.HelpText == "Your First Name" && (string) c.Value == "Bob");
+            schema.Should().Contain(c => c.Order == 0 && c.Name == "FirstName" && c.Label == "First Name" && c.HelpText == "Your First Name" && (string)c.Value == "Bob");
         }
 
-    }
 
+        [Test]
+        public void schema_should_have_nested_fields()
+        {
+            var model = new NestedTestModel();
+            model.Name.FirstName = "Bob";
+            model.Name.LastName = "Poop";
+
+            var schema = SchemaBuilder.ToSchema(model);
+
+            schema.Should().Contain(c => c.Order == 0 && c.Name == "Name.FirstName" && c.Label == "First Name" && c.HelpText == "Your First Name" && (string)c.Value == "Bob");
+            schema.Should().Contain(c => c.Order == 1 && c.Name == "Name.LastName" && c.Label == "Last Name" && c.HelpText == "Your Last Name" && (string)c.Value == "Poop");
+            schema.Should().Contain(c => c.Order == 2 && c.Name == "Quote" && c.Label == "Quote" && c.HelpText == "Your Favorite Quote");
+        }
+    }
 
     public class TestModel
     {
@@ -45,4 +58,13 @@ namespace NzbDrone.Api.Test.ClientSchemaTests
 
         public string Other { get; set; }
     }
-}
+
+    public class NestedTestModel
+    {
+        [FieldDefinition(0)]
+        public TestModel Name { get; set; } = new TestModel();
+
+        [FieldDefinition(1, Label = "Quote", HelpText = "Your Favorite Quote")]
+        public string Quote { get; set; }
+    }
+}

src/NzbDrone.Api/ClientSchema/Field.cs

@@ -7,11 +7,17 @@ namespace NzbDrone.Api.ClientSchema
         public int Order { get; set; }
         public string Name { get; set; }
         public string Label { get; set; }
+        public string Unit { get; set; }
         public string HelpText { get; set; }
         public string HelpLink { get; set; }
         public object Value { get; set; }
         public string Type { get; set; }
         public bool Advanced { get; set; }
         public List<SelectOption> SelectOptions { get; set; }
+
+        public Field Clone()
+        {
+            return (Field)MemberwiseClone();
+        }
     }
-}
+}

src/NzbDrone.Api/ClientSchema/FieldMapping.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NzbDrone.Api.ClientSchema
+{
+    public class FieldMapping
+    {
+        public Field Field { get; set; }
+        public Type PropertyType { get; set; }
+        public Func<object, object> GetterFunc { get; set; }
+        public Action<object, object> SetterFunc { get; set; }
+    }
+}

src/NzbDrone.Api/ClientSchema/SchemaBuilder.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using Newtonsoft.Json.Linq;
 using NzbDrone.Common.EnsureThat;
 using NzbDrone.Common.Extensions;
@@ -11,45 +12,22 @@ namespace NzbDrone.Api.ClientSchema
 {
     public static class SchemaBuilder
     {
+        private static Dictionary<Type, FieldMapping[]> _mappings = new Dictionary<Type, FieldMapping[]>();
+
         public static List<Field> ToSchema(object model)
         {
             Ensure.That(model, () => model).IsNotNull();
 
-            var properties = model.GetType().GetSimpleProperties();
+            var mappings = GetFieldMappings(model.GetType());
 
-            var result = new List<Field>(properties.Count);
+            var result = new List<Field>(mappings.Length);
 
-            foreach (var propertyInfo in properties)
+            foreach (var mapping in mappings)
             {
-                var fieldAttribute = propertyInfo.GetAttribute<FieldDefinitionAttribute>(false);
+                var field = mapping.Field.Clone();
+                field.Value = mapping.GetterFunc(model);
 
-                if (fieldAttribute != null)
+                result.Add(field);
-                {
-
-                    var field = new Field
-                    {
-                        Name = propertyInfo.Name,
-                        Label = fieldAttribute.Label,
-                        HelpText = fieldAttribute.HelpText,
-                        HelpLink = fieldAttribute.HelpLink,
-                        Order = fieldAttribute.Order,
-                        Advanced = fieldAttribute.Advanced,
-                        Type = fieldAttribute.Type.ToString().ToLowerInvariant()
-                    };
-
-                    var value = propertyInfo.GetValue(model, null);
-                    if (value != null)
-                    {
-                        field.Value = value;
-                    }
-
-                    if (fieldAttribute.Type == FieldType.Select)
-                    {
-                        field.SelectOptions = GetSelectOptions(fieldAttribute.SelectOptions);
-                    }
-
-                    result.Add(field);
-                }
             }
 
             return result.OrderBy(r => r.Order).ToList();
@@ -59,81 +37,16 @@ namespace NzbDrone.Api.ClientSchema
         {
             Ensure.That(targetType, () => targetType).IsNotNull();
 
-            var properties = targetType.GetSimpleProperties();
+            var mappings = GetFieldMappings(targetType);
 
             var target = Activator.CreateInstance(targetType);
 
-            foreach (var propertyInfo in properties)
+            foreach (var mapping in mappings)
             {
-                var fieldAttribute = propertyInfo.GetAttribute<FieldDefinitionAttribute>(false);
+                var propertyType = mapping.PropertyType;
+                var field = fields.Find(f => f.Name == mapping.Field.Name);
 
-                if (fieldAttribute != null)
+                mapping.SetterFunc(target, field.Value);
-                {
-                    var field = fields.Find(f => f.Name == propertyInfo.Name);
-
-                    if (propertyInfo.PropertyType == typeof(int))
-                    {
-                        var value = field.Value.ToString().ParseInt32();
-                        propertyInfo.SetValue(target, value ?? 0, null);
-                    }
-
-                    else if (propertyInfo.PropertyType == typeof(long))
-                    {
-                        var value = field.Value.ToString().ParseInt64();
-                        propertyInfo.SetValue(target, value ?? 0, null);
-                    }
-
-                    else if (propertyInfo.PropertyType == typeof(int?))
-                    {
-                        var value = field.Value.ToString().ParseInt32();
-                        propertyInfo.SetValue(target, value, null);
-                    }
-
-                    else if (propertyInfo.PropertyType == typeof(Nullable<Int64>))
-                    {
-                        var value = field.Value.ToString().ParseInt64();
-                        propertyInfo.SetValue(target, value, null);
-                    }
-
-                    else if (propertyInfo.PropertyType == typeof(IEnumerable<int>))
-                    {
-                        IEnumerable<int> value;
-
-                        if (field.Value.GetType() == typeof(JArray))
-                        {
-                            value = ((JArray)field.Value).Select(s => s.Value<int>());
-                        }
-
-                        else
-                        {
-                            value = field.Value.ToString().Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(s => Convert.ToInt32(s));
-                        }
-
-                        propertyInfo.SetValue(target, value, null);
-                    }
-
-                    else if (propertyInfo.PropertyType == typeof(IEnumerable<string>))
-                    {
-                        IEnumerable<string> value;
-
-                        if (field.Value.GetType() == typeof(JArray))
-                        {
-                            value = ((JArray)field.Value).Select(s => s.Value<string>());
-                        }
-
-                        else
-                        {
-                            value = field.Value.ToString().Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-                        }
-
-                        propertyInfo.SetValue(target, value, null);
-                    }
-
-                    else
-                    {
-                        propertyInfo.SetValue(target, field.Value, null);
-                    }
-                }
             }
 
             return target;
@@ -145,6 +58,84 @@ namespace NzbDrone.Api.ClientSchema
             return (T)ReadFromSchema(fields, typeof(T));
         }
 
+
+        // Ideally this function should begin a System.Linq.Expression expression tree since it's faster.
+        // But it's probably not needed till performance issues pop up.
+        public static FieldMapping[] GetFieldMappings(Type type)
+        {
+            lock (_mappings)
+            {
+                FieldMapping[] result;
+                if (!_mappings.TryGetValue(type, out result))
+                {
+                    result = GetFieldMapping(type, "", v => v);
+
+                    // Renumber al the field Orders since nested settings will have dupe Orders.
+                    for (int i = 0; i < result.Length; i++)
+                    {
+                        result[i].Field.Order = i;
+                    }
+
+                    _mappings[type] = result;
+                }
+                return result;
+            }
+        }
+
+        private static FieldMapping[] GetFieldMapping(Type type, string prefix, Func<object, object> targetSelector)
+        {
+            var result = new List<FieldMapping>();
+            foreach (var property in GetProperties(type))
+            {
+                var propertyInfo = property.Item1;
+                if (propertyInfo.PropertyType.IsSimpleType())
+                {
+                    var fieldAttribute = property.Item2;
+                    var field = new Field
+                    {
+                        Name = prefix + propertyInfo.Name,
+                        Label = fieldAttribute.Label,
+                        Unit = fieldAttribute.Unit,
+                        HelpText = fieldAttribute.HelpText,
+                        HelpLink = fieldAttribute.HelpLink,
+                        Order = fieldAttribute.Order,
+                        Advanced = fieldAttribute.Advanced,
+                        Type = fieldAttribute.Type.ToString().ToLowerInvariant()
+                    };
+
+                    if (fieldAttribute.Type == FieldType.Select)
+                    {
+                        field.SelectOptions = GetSelectOptions(fieldAttribute.SelectOptions);
+                    }
+
+                    var valueConverter = GetValueConverter(propertyInfo.PropertyType);
+
+                    result.Add(new FieldMapping
+                    {
+                        Field = field,
+                        PropertyType = propertyInfo.PropertyType,
+                        GetterFunc = t => propertyInfo.GetValue(targetSelector(t), null),
+                        SetterFunc = (t, v) => propertyInfo.SetValue(targetSelector(t), valueConverter(v), null)
+                    });
+                }
+                else
+                {
+                    result.AddRange(GetFieldMapping(propertyInfo.PropertyType, propertyInfo.Name + ".", t => propertyInfo.GetValue(targetSelector(t), null)));
+                }
+            }
+
+            return result.ToArray();
+        }
+
+        private static Tuple<PropertyInfo, FieldDefinitionAttribute>[] GetProperties(Type type)
+        {
+            return type.GetProperties()
+                .Select(v => Tuple.Create(v, v.GetAttribute<FieldDefinitionAttribute>(false)))
+                .Where(v => v.Item2 != null)
+                .OrderBy(v => v.Item2.Order)
+                .ToArray();
+        }
+
         private static List<SelectOption> GetSelectOptions(Type selectOptions)
         {
             var options = from Enum e in Enum.GetValues(selectOptions)
@@ -152,5 +143,73 @@ namespace NzbDrone.Api.ClientSchema
 
             return options.OrderBy(o => o.Value).ToList();
         }
+
+        private static Func<object, object> GetValueConverter(Type propertyType)
+        {
+            if (propertyType == typeof(int))
+            {
+                return fieldValue => fieldValue?.ToString().ParseInt32() ?? 0;
+            }
+
+            else if (propertyType == typeof(long))
+            {
+                return fieldValue => fieldValue?.ToString().ParseInt64() ?? 0;
+            }
+
+            else if (propertyType == typeof(double))
+            {
+                return fieldValue => fieldValue?.ToString().ParseDouble() ?? 0.0;
+            }
+
+            else if (propertyType == typeof(int?))
+            {
+                return fieldValue => fieldValue?.ToString().ParseInt32();
+            }
+
+            else if (propertyType == typeof(Int64?))
+            {
+                return fieldValue => fieldValue?.ToString().ParseInt64();
+            }
+
+            else if (propertyType == typeof(double?))
+            {
+                return fieldValue => fieldValue?.ToString().ParseDouble();
+            }
+
+            else if (propertyType == typeof(IEnumerable<int>))
+            {
+                return fieldValue =>
+                {
+                    if (fieldValue.GetType() == typeof(JArray))
+                    {
+                        return ((JArray)fieldValue).Select(s => s.Value<int>());
+                    }
+                    else
+                    {
+                        return fieldValue.ToString().Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(s => Convert.ToInt32(s));
+                    }
+                };
+            }
+
+            else if (propertyType == typeof(IEnumerable<string>))
+            {
+                return fieldValue =>
+                {
+                    if (fieldValue.GetType() == typeof(JArray))
+                    {
+                        return ((JArray)fieldValue).Select(s => s.Value<string>());
+                    }
+                    else
+                    {
+                        return fieldValue.ToString().Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+                    }
+                };
+            }
+
+            else
+            {
+                return fieldValue => fieldValue;
+            }
+        }
     }
 }

src/NzbDrone.Api/Commands/CommandModule.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using NzbDrone.Api.Extensions;
 using NzbDrone.Api.Validation;
 using NzbDrone.Common;
+using NzbDrone.Common.TPL;
 using NzbDrone.Core.Datastore.Events;
 using NzbDrone.Core.Messaging.Commands;
 using NzbDrone.Core.Messaging.Events;
@@ -17,6 +18,8 @@ namespace NzbDrone.Api.Commands
     {
         private readonly IManageCommandQueue _commandQueueManager;
         private readonly IServiceFactory _serviceFactory;
+        private readonly Debouncer _debouncer;
+        private readonly Dictionary<int, CommandResource> _pendingUpdates;
 
         public CommandModule(IManageCommandQueue commandQueueManager,
                              IBroadcastSignalRMessage signalRBroadcaster,
@@ -31,6 +34,10 @@ namespace NzbDrone.Api.Commands
             GetResourceAll = GetStartedCommands;
 
             PostValidator.RuleFor(c => c.Name).NotBlank();
+
+            _debouncer = new Debouncer(SendUpdates, TimeSpan.FromSeconds(0.1));
+            _pendingUpdates = new Dictionary<int, CommandResource>();
+
         }
 
         private CommandResource GetCommand(int id)
@@ -59,8 +66,26 @@ namespace NzbDrone.Api.Commands
         {
             if (message.Command.Body.SendUpdatesToClient)
             {
-                BroadcastResourceChange(ModelAction.Updated, message.Command.ToResource());
+                lock (_pendingUpdates)
+                {
+                    _pendingUpdates[message.Command.Id] = message.Command.ToResource();
+                }
+                _debouncer.Execute();
+            }
+        }
+
+        private void SendUpdates()
+        {
+            lock (_pendingUpdates)
+            {
+                var pendingUpdates = _pendingUpdates.Values.ToArray();
+                _pendingUpdates.Clear();
+
+                foreach (var pendingUpdate in pendingUpdates)
+                {
+                    BroadcastResourceChange(ModelAction.Updated, pendingUpdate);
+                }
             }
         }
     }
-}
+}

src/NzbDrone.Api/Config/IndexerConfigModule.cs

@@ -13,6 +13,9 @@ namespace NzbDrone.Api.Config
             SharedValidator.RuleFor(c => c.MinimumAge)
                            .GreaterThanOrEqualTo(0);
 
+            SharedValidator.RuleFor(c => c.MaximumSize)
+                           .GreaterThanOrEqualTo(0);
+
             SharedValidator.RuleFor(c => c.Retention)
                            .GreaterThanOrEqualTo(0);
 
@@ -25,4 +28,4 @@ namespace NzbDrone.Api.Config
             return IndexerConfigResourceMapper.ToResource(model);
         }
     }
-}
+}

src/NzbDrone.Api/Config/IndexerConfigResource.cs

@@ -6,6 +6,7 @@ namespace NzbDrone.Api.Config
     public class IndexerConfigResource : RestResource
     {
         public int MinimumAge { get; set; }
+        public int MaximumSize { get; set; }
         public int Retention { get; set; }
         public int RssSyncInterval { get; set; }
     }
@@ -17,6 +18,7 @@ namespace NzbDrone.Api.Config
             return new IndexerConfigResource
             {
                 MinimumAge = model.MinimumAge,
+                MaximumSize = model.MaximumSize,
                 Retention = model.Retention,
                 RssSyncInterval = model.RssSyncInterval,
             };

src/NzbDrone.Api/Config/MediaManagementConfigResource.cs

@@ -1,4 +1,4 @@
-using NzbDrone.Api.REST;
+using NzbDrone.Api.REST;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.MediaFiles;
 
@@ -10,6 +10,7 @@ namespace NzbDrone.Api.Config
         public string RecycleBin { get; set; }
         public bool AutoDownloadPropers { get; set; }
         public bool CreateEmptySeriesFolders { get; set; }
+        public bool DeleteEmptyFolders { get; set; }
         public FileDateType FileDate { get; set; }
 
         public bool SetPermissionsLinux { get; set; }
@@ -35,6 +36,7 @@ namespace NzbDrone.Api.Config
                 RecycleBin = model.RecycleBin,
                 AutoDownloadPropers = model.AutoDownloadPropers,
                 CreateEmptySeriesFolders = model.CreateEmptySeriesFolders,
+                DeleteEmptyFolders = model.DeleteEmptyFolders,
                 FileDate = model.FileDate,
 
                 SetPermissionsLinux = model.SetPermissionsLinux,

src/NzbDrone.Api/EpisodeFiles/EpisodeFileResource.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using NzbDrone.Api.REST;
 using NzbDrone.Core.Qualities;
@@ -15,6 +15,8 @@ namespace NzbDrone.Api.EpisodeFiles
         public DateTime DateAdded { get; set; }
         public string SceneName { get; set; }
         public QualityModel Quality { get; set; }
+        public MediaInfoResource MediaInfo { get; set; }
+        public string OriginalFilePath { get; set; }
 
         public bool QualityCutoffNotMet { get; set; }
     }
@@ -37,7 +39,8 @@ namespace NzbDrone.Api.EpisodeFiles
                 DateAdded = model.DateAdded,
                 SceneName = model.SceneName,
                 Quality = model.Quality,
-                //QualityCutoffNotMet
+                MediaInfo = model.MediaInfo.ToResource(model.SceneName),
+                OriginalFilePath = model.OriginalFilePath
             };
         }
 
@@ -57,7 +60,9 @@ namespace NzbDrone.Api.EpisodeFiles
                 DateAdded = model.DateAdded,
                 SceneName = model.SceneName,
                 Quality = model.Quality,
-                QualityCutoffNotMet = qualityUpgradableSpecification.CutoffNotMet(series.Profile.Value, model.Quality)
+                QualityCutoffNotMet = qualityUpgradableSpecification.CutoffNotMet(series.Profile.Value, model.Quality),
+                MediaInfo = model.MediaInfo.ToResource(model.SceneName),
+                OriginalFilePath = model.OriginalFilePath
             };
         }
     }

src/NzbDrone.Api/EpisodeFiles/MediaInfoResource.cs

@@ -0,0 +1,30 @@
+using NzbDrone.Api.REST;
+using NzbDrone.Core.MediaFiles.MediaInfo;
+
+namespace NzbDrone.Api.EpisodeFiles
+{
+    public class MediaInfoResource : RestResource
+    {
+        public decimal AudioChannels { get; set; }
+        public string AudioCodec { get; set; }
+        public string VideoCodec { get; set; }
+    }
+
+    public static class MediaInfoResourceMapper
+    {
+        public static MediaInfoResource ToResource(this MediaInfoModel model, string sceneName)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+
+            return new MediaInfoResource
+                   {
+                       AudioChannels = MediaInfoFormatter.FormatAudioChannels(model),
+                       AudioCodec = MediaInfoFormatter.FormatAudioCodec(model, sceneName),
+                       VideoCodec = MediaInfoFormatter.FormatVideoCodec(model, sceneName)
+                   };
+        }
+    }
+}

src/NzbDrone.Api/Episodes/EpisodeResource.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
@@ -30,6 +30,7 @@ namespace NzbDrone.Api.Episodes
         public bool UnverifiedSceneNumbering { get; set; }
         public string SeriesTitle { get; set; }
         public SeriesResource Series { get; set; }
+        public DateTime? LastSearchTime { get; set; }
 
         //Hiding this so people don't think its usable (only used to set the initial state)
         [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
@@ -65,6 +66,7 @@ namespace NzbDrone.Api.Episodes
                 UnverifiedSceneNumbering = model.UnverifiedSceneNumbering,
                 SeriesTitle = model.SeriesTitle,
                 //Series = model.Series.MapToResource(),
+                LastSearchTime = model.LastSearchTime
             };
         }
 

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

@@ -23,6 +23,8 @@ namespace NzbDrone.Api.Extensions.Pipelines
 
         private void Handle(NancyContext context)
         {
+            if (context.Request.Method == "OPTIONS") return;
+
             if (_cacheableSpecification.IsCacheable(context))
             {
                 context.Response.Headers.EnableCache();
@@ -33,4 +35,4 @@ namespace NzbDrone.Api.Extensions.Pipelines
             }
         }
     }
-}
+}

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

@@ -2,6 +2,7 @@
 using System.Linq;
 using Nancy;
 using Nancy.Bootstrapper;
+using NzbDrone.Common.Extensions;
 
 namespace NzbDrone.Api.Extensions.Pipelines
 {
@@ -11,10 +12,25 @@ namespace NzbDrone.Api.Extensions.Pipelines
 
         public void Register(IPipelines pipelines)
         {
-            pipelines.AfterRequest.AddItemToEndOfPipeline((Action<NancyContext>) Handle);
+            pipelines.BeforeRequest.AddItemToEndOfPipeline(HandleRequest);
+            pipelines.AfterRequest.AddItemToEndOfPipeline(HandleResponse);
         }
 
-        private void Handle(NancyContext context)
+        private Response HandleRequest(NancyContext context)
+        {
+            if (context == null || context.Request.Method != "OPTIONS")
+            {
+                return null;
+            }
+
+            var response = new Response()
+                .WithStatusCode(HttpStatusCode.OK)
+                .WithContentType("");
+            ApplyResponseHeaders(response, context.Request);
+            return response;
+        }
+
+        private void HandleResponse(NancyContext context)
         {
             if (context == null || context.Response.Headers.ContainsKey(AccessControlHeaders.AllowOrigin))
             {
@@ -26,21 +42,39 @@ namespace NzbDrone.Api.Extensions.Pipelines
 
         private static void ApplyResponseHeaders(Response response, Request request)
         {
-            var allowedMethods = "GET, OPTIONS, PATCH, POST, PUT, DELETE";
+            if (request.IsApiRequest())
-
-            if (response.Headers.ContainsKey("Allow"))
             {
-                allowedMethods = response.Headers["Allow"];
+                // Allow Cross-Origin access to the API since it's protected with the apikey, and nothing else.
+                ApplyCorsResponseHeaders(response, request, "*", "GET, OPTIONS, PATCH, POST, PUT, DELETE");
             }
-            
+            else if (request.IsSharedContentRequest())
-            var requestedHeaders = string.Join(", ", request.Headers[AccessControlHeaders.RequestHeaders]);
-
-            response.Headers.Add(AccessControlHeaders.AllowOrigin, "*");
-            response.Headers.Add(AccessControlHeaders.AllowMethods, allowedMethods);
-
-            if (request.Headers[AccessControlHeaders.RequestHeaders].Any())
             {
-                response.Headers.Add(AccessControlHeaders.AllowHeaders, requestedHeaders);
+                // Allow Cross-Origin access to specific shared content such as mediacovers and images.
+                ApplyCorsResponseHeaders(response, request, "*", "GET, OPTIONS");
+            }
+
+            // Disallow Cross-Origin access for any other route.
+        }
+
+        private static void ApplyCorsResponseHeaders(Response response, Request request, string allowOrigin, string allowedMethods)
+        {
+            response.Headers.Add(AccessControlHeaders.AllowOrigin, allowOrigin);
+
+            if (request.Method == "OPTIONS")
+            {
+                if (response.Headers.ContainsKey("Allow"))
+                {
+                    allowedMethods = response.Headers["Allow"];
+                }
+
+                response.Headers.Add(AccessControlHeaders.AllowMethods, allowedMethods);
+
+                if (request.Headers[AccessControlHeaders.RequestHeaders].Any())
+                {
+                    var requestedHeaders = request.Headers[AccessControlHeaders.RequestHeaders].Join(", ");
+
+                    response.Headers.Add(AccessControlHeaders.AllowHeaders, requestedHeaders);
+                }
             }
         }
     }

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

@@ -5,6 +5,7 @@ using System.Linq;
 using Nancy;
 using Nancy.Bootstrapper;
 using NLog;
+using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Extensions;
 
 namespace NzbDrone.Api.Extensions.Pipelines
@@ -15,9 +16,14 @@ namespace NzbDrone.Api.Extensions.Pipelines
 
         public int Order => 0;
 
+        private readonly Action<Action<Stream>, Stream> _writeGZipStream;
+
         public GzipCompressionPipeline(Logger logger)
         {
             _logger = logger;
+
+            // On Mono GZipStream/DeflateStream leaks memory if an exception is thrown, use an intermediate buffer in that case.
+            _writeGZipStream = PlatformInfo.IsMono ? WriteGZipStreamMono : (Action<Action<Stream>, Stream>)WriteGZipStream;
         }
 
         public void Register(IPipelines pipelines)
@@ -33,7 +39,8 @@ namespace NzbDrone.Api.Extensions.Pipelines
             try
             {
                 if (
-                   !response.ContentType.Contains("image")
+                   response.Contents != Response.NoBody
+                && !response.ContentType.Contains("image")
                 && !response.ContentType.Contains("font")
                 && request.Headers.AcceptEncoding.Any(x => x.Contains("gzip"))
                 && !AlreadyGzipEncoded(response)
@@ -42,14 +49,7 @@ namespace NzbDrone.Api.Extensions.Pipelines
                     var contents = response.Contents;
 
                     response.Headers["Content-Encoding"] = "gzip";
-                    response.Contents = responseStream =>
+                    response.Contents = responseStream => _writeGZipStream(contents, responseStream);
-                    {
-                        using (var gzip = new GZipStream(responseStream, CompressionMode.Compress, true))
-                        using (var buffered = new BufferedStream(gzip, 8192))
-                        {
-                            contents.Invoke(buffered);
-                        }
-                    };
                 }
             }
 
@@ -60,6 +60,25 @@ namespace NzbDrone.Api.Extensions.Pipelines
             }
         }
 
+        private static void WriteGZipStreamMono(Action<Stream> innerContent, Stream targetStream)
+        {
+            using (var membuffer = new MemoryStream())
+            {
+                WriteGZipStream(innerContent, membuffer);
+                membuffer.Position = 0;
+                membuffer.CopyTo(targetStream);
+            }
+        }
+
+        private static void WriteGZipStream(Action<Stream> innerContent, Stream targetStream)
+        {
+            using (var gzip = new GZipStream(targetStream, CompressionMode.Compress, true))
+            using (var buffered = new BufferedStream(gzip, 8192))
+            {
+                innerContent.Invoke(buffered);
+            }
+        }
+
         private static bool ContentLengthIsTooSmall(Response response)
         {
             var contentLength = response.Headers.GetValueOrDefault("Content-Length");
@@ -80,4 +99,4 @@ namespace NzbDrone.Api.Extensions.Pipelines
             return false;
         }
     }
-}
+}

src/NzbDrone.Api/Extensions/RequestExtensions.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Nancy;
 
 namespace NzbDrone.Api.Extensions
@@ -36,5 +36,23 @@ namespace NzbDrone.Api.Extensions
         {
             return request.Path.StartsWith("/Content/", StringComparison.InvariantCultureIgnoreCase);
         }
+
+        public static bool IsSharedContentRequest(this Request request)
+        {
+            return request.Path.StartsWith("/MediaCover/", StringComparison.InvariantCultureIgnoreCase) ||
+                   request.Path.StartsWith("/Content/Images/", StringComparison.InvariantCultureIgnoreCase);
+        }
+
+        public static bool GetBooleanQueryParameter(this Request request, string parameter, bool defaultValue = false)
+        {
+            var parameterValue = request.Query[parameter];
+
+            if (parameterValue.HasValue)
+            {
+                return bool.Parse(parameterValue.Value);
+            }
+
+            return defaultValue;
+        }
     }
 }

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

@@ -49,7 +49,12 @@ namespace NzbDrone.Api.Frontend.Mappers
 
         public override bool CanHandle(string resourceUrl)
         {
-            return !resourceUrl.Contains(".") && !resourceUrl.StartsWith("/login");
+            resourceUrl = resourceUrl.ToLowerInvariant();
+
+            return !resourceUrl.StartsWith("/content") &&
+                   !resourceUrl.StartsWith("/mediacover") &&
+                   !resourceUrl.Contains(".") &&
+                   !resourceUrl.StartsWith("/login");
         }
 
         public override Response GetResponse(string resourceUrl)
@@ -113,4 +118,4 @@ namespace NzbDrone.Api.Frontend.Mappers
             return _generatedContent;
         }
     }
-}
+}

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

@@ -1,3 +1,4 @@
+using System;
 using System.IO;
 using System.Text.RegularExpressions;
 using NLog;
@@ -42,7 +43,7 @@ namespace NzbDrone.Api.Frontend.Mappers
 
         public override bool CanHandle(string resourceUrl)
         {
-            return resourceUrl.StartsWith("/MediaCover");
+            return resourceUrl.StartsWith("/MediaCover", StringComparison.InvariantCultureIgnoreCase);
         }
     }
-}
+}

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

@@ -1,3 +1,4 @@
+using System;
 using System.IO;
 using NLog;
 using NzbDrone.Common.Disk;
@@ -28,7 +29,9 @@ namespace NzbDrone.Api.Frontend.Mappers
 
         public override bool CanHandle(string resourceUrl)
         {
-            return resourceUrl.StartsWith("/Content") ||
+            resourceUrl = resourceUrl.ToLowerInvariant();
+
+            return resourceUrl.StartsWith("/content") ||
                    resourceUrl.EndsWith(".js") ||
                    resourceUrl.EndsWith(".map") ||
                    resourceUrl.EndsWith(".css") ||
@@ -37,4 +40,4 @@ namespace NzbDrone.Api.Frontend.Mappers
                    resourceUrl.EndsWith("oauth.html");
         }
     }
-}
+}

src/NzbDrone.Api/Frontend/StaticResourceModule.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Nancy.Responses;
 using NLog;
 using Nancy;
 using NzbDrone.Api.Frontend.Mappers;

src/NzbDrone.Api/Indexers/ReleasePushModule.cs

@@ -1,13 +1,16 @@
-using Nancy;
+using System.Collections.Generic;
-using Nancy.ModelBinding;
+using System.Linq;
 using FluentValidation;
+using Nancy;
+using Nancy.ModelBinding;
+using NLog;
+using NzbDrone.Api.Extensions;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.Datastore;
 using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.Download;
-using System.Collections.Generic;
+using NzbDrone.Core.Indexers;
-using System.Linq;
 using NzbDrone.Core.Parser.Model;
-using NzbDrone.Api.Extensions;
-using NLog;
 
 namespace NzbDrone.Api.Indexers
 {
@@ -15,14 +18,17 @@ namespace NzbDrone.Api.Indexers
     {
         private readonly IMakeDownloadDecision _downloadDecisionMaker;
         private readonly IProcessDownloadDecisions _downloadDecisionProcessor;
+        private readonly IIndexerFactory _indexerFactory;
         private readonly Logger _logger;
 
         public ReleasePushModule(IMakeDownloadDecision downloadDecisionMaker,
                                  IProcessDownloadDecisions downloadDecisionProcessor,
+                                 IIndexerFactory indexerFactory,
                                  Logger logger)
         {
             _downloadDecisionMaker = downloadDecisionMaker;
             _downloadDecisionProcessor = downloadDecisionProcessor;
+            _indexerFactory = indexerFactory;
             _logger = logger;
 
             Post["/push"] = x => ProcessRelease(this.Bind<ReleaseResource>());
@@ -41,10 +47,47 @@ namespace NzbDrone.Api.Indexers
 
             info.Guid = "PUSH-" + info.DownloadUrl;
 
+            ResolveIndexer(info);
+
             var decisions = _downloadDecisionMaker.GetRssDecision(new List<ReleaseInfo> { info });
             _downloadDecisionProcessor.ProcessDecisions(decisions);
 
             return MapDecisions(decisions).First().AsResponse();
         }
+
+        private void ResolveIndexer(ReleaseInfo release)
+        {
+            if (release.IndexerId == 0 && release.Indexer.IsNotNullOrWhiteSpace())
+            {
+                var indexer = _indexerFactory.All().FirstOrDefault(v => v.Name == release.Indexer);
+                if (indexer != null)
+                {
+                    release.IndexerId = indexer.Id;
+                    _logger.Debug("Push Release {0} associated with indexer {1} - {2}.", release.Title, release.IndexerId, release.Indexer);
+                }
+                else
+                {
+                    _logger.Debug("Push Release {0} not associated with unknown indexer {1}.", release.Title, release.Indexer);
+                }
+            }
+            else if (release.IndexerId != 0 && release.Indexer.IsNullOrWhiteSpace())
+            {
+                try
+                {
+                    var indexer = _indexerFactory.Get(release.IndexerId);
+                    release.Indexer = indexer.Name;
+                    _logger.Debug("Push Release {0} associated with indexer {1} - {2}.", release.Title, release.IndexerId, release.Indexer);
+                }
+                catch (ModelNotFoundException)
+                {
+                    _logger.Debug("Push Release {0} not associated with unknown indexer {0}.", release.Title, release.IndexerId);
+                    release.IndexerId = 0;
+                }
+            }
+            else
+            {
+                _logger.Debug("Push Release {0} not associated with an indexer.", release.Title);
+            }
+        }
     }
 }

src/NzbDrone.Api/ManualImport/ManualImportResource.cs

@@ -13,6 +13,7 @@ namespace NzbDrone.Api.ManualImport
     {
         public string Path { get; set; }
         public string RelativePath { get; set; }
+        public string FolderName { get; set; }
         public string Name { get; set; }
         public long Size { get; set; }
         public SeriesResource Series { get; set; }
@@ -36,6 +37,7 @@ namespace NzbDrone.Api.ManualImport
 
                 Path = model.Path,
                 RelativePath = model.RelativePath,
+                FolderName = model.FolderName,
                 Name = model.Name,
                 Size = model.Size,
                 Series = model.Series.ToResource(),

src/NzbDrone.Api/NzbDrone.Api.csproj

@@ -70,12 +70,13 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.5.3\lib\net40-client\NLog.dll</HintPath>
     </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.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="Microsoft.CSharp" />
@@ -83,6 +84,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Libraries\Sqlite\System.Data.SQLite.dll</HintPath>
     </Reference>
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\NzbDrone.Common\Properties\SharedAssemblyInfo.cs">
@@ -99,11 +104,13 @@
     <Compile Include="Calendar\CalendarModule.cs" />
     <Compile Include="ClientSchema\Field.cs" />
     <Compile Include="ClientSchema\FieldDefinitionAttribute.cs" />
+    <Compile Include="ClientSchema\FieldMapping.cs" />
     <Compile Include="ClientSchema\SchemaBuilder.cs" />
     <Compile Include="ClientSchema\SchemaDeserializer.cs" />
     <Compile Include="ClientSchema\SelectOption.cs" />
     <Compile Include="Commands\CommandModule.cs" />
     <Compile Include="Commands\CommandResource.cs" />
+    <Compile Include="EpisodeFiles\MediaInfoResource.cs" />
     <Compile Include="Extensions\AccessControlHeaders.cs" />
     <Compile Include="Extensions\Pipelines\CorsPipeline.cs" />
     <Compile Include="Extensions\Pipelines\UrlBasePipeline.cs" />

src/NzbDrone.Api/ProviderModuleBase.cs

@@ -210,7 +210,12 @@ namespace NzbDrone.Api
 
         protected void VerifyValidationResult(ValidationResult validationResult, bool includeWarnings)
         {
-            var result = new NzbDroneValidationResult(validationResult.Errors);
+            var result = validationResult as NzbDroneValidationResult;
+
+            if (result == null)
+            {
+                result = new NzbDroneValidationResult(validationResult.Errors);
+            }
 
             if (includeWarnings && (!result.IsValid || result.HasWarnings))
             {

src/NzbDrone.Api/RootFolders/RootFolderModule.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using FluentValidation;
 using NzbDrone.Core.RootFolders;
 using NzbDrone.Core.Validation.Paths;
@@ -17,7 +17,9 @@ namespace NzbDrone.Api.RootFolders
                                 DroneFactoryValidator droneFactoryValidator,
                                 MappedNetworkDriveValidator mappedNetworkDriveValidator,
                                 StartupFolderValidator startupFolderValidator,
-                                FolderWritableValidator folderWritableValidator)
+                                SystemFolderValidator systemFolderValidator,
+                                FolderWritableValidator folderWritableValidator
+            )
             : base(signalRBroadcaster)
         {
             _rootFolderService = rootFolderService;
@@ -35,6 +37,7 @@ namespace NzbDrone.Api.RootFolders
                            .SetValidator(mappedNetworkDriveValidator)
                            .SetValidator(startupFolderValidator)
                            .SetValidator(pathExistsValidator)
+                           .SetValidator(systemFolderValidator)
                            .SetValidator(folderWritableValidator);
         }
 
@@ -60,4 +63,4 @@ namespace NzbDrone.Api.RootFolders
             _rootFolderService.Remove(id);
         }
     }
-}
+}

src/NzbDrone.Api/RootFolders/RootFolderResource.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Api.REST;
 using NzbDrone.Core.RootFolders;
@@ -9,6 +9,7 @@ namespace NzbDrone.Api.RootFolders
     {
         public string Path { get; set; }
         public long? FreeSpace { get; set; }
+        public long? TotalSpace { get; set; }
 
         public List<UnmappedFolder> UnmappedFolders { get; set; }
     }
@@ -25,6 +26,7 @@ namespace NzbDrone.Api.RootFolders
 
                 Path = model.Path,
                 FreeSpace = model.FreeSpace,
+                TotalSpace = model.TotalSpace,
                 UnmappedFolders = model.UnmappedFolders
             };
         }
@@ -48,4 +50,4 @@ namespace NzbDrone.Api.RootFolders
             return models.Select(ToResource).ToList();
         }
     }
-}
+}

src/NzbDrone.Api/Series/SeasonResource.cs

@@ -1,5 +1,6 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
+using NzbDrone.Core.MediaCover;
 using NzbDrone.Core.Tv;
 namespace NzbDrone.Api.Series
 {
@@ -8,18 +9,20 @@ namespace NzbDrone.Api.Series
         public int SeasonNumber { get; set; }
         public bool Monitored { get; set; }
         public SeasonStatisticsResource Statistics { get; set; }
+        public List<MediaCover> Images { get; set; }
     }
 
     public static class SeasonResourceMapper
     {
-        public static SeasonResource ToResource(this Season model)
+        public static SeasonResource ToResource(this Season model, bool includeImages = false)
         {
             if (model == null) return null;
 
             return new SeasonResource
             {
                 SeasonNumber = model.SeasonNumber,
-                Monitored = model.Monitored
+                Monitored = model.Monitored,
+                Images = includeImages ? model.Images : null
             };
         }
 
@@ -30,13 +33,14 @@ namespace NzbDrone.Api.Series
             return new Season
             {
                 SeasonNumber = resource.SeasonNumber,
-                Monitored = resource.Monitored
+                Monitored = resource.Monitored,
+                Images = resource.Images
             };
         }
 
-        public static List<SeasonResource> ToResource(this IEnumerable<Season> models)
+        public static List<SeasonResource> ToResource(this IEnumerable<Season> models, bool includeImages = false)
         {
-            return models.Select(ToResource).ToList();
+            return models.Select(s => ToResource(s, includeImages)).ToList();
         }
 
         public static List<Season> ToModel(this IEnumerable<SeasonResource> resources)

src/NzbDrone.Api/Series/SeriesEditorModule.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Nancy;
 using NzbDrone.Api.Extensions;
@@ -24,7 +24,7 @@ namespace NzbDrone.Api.Series
             var series = resources.Select(seriesResource => seriesResource.ToModel(_seriesService.GetSeries(seriesResource.Id))).ToList();
 
             return _seriesService.UpdateSeries(series)
-                                 .ToResource()
+                                 .ToResource(false)
                                  .AsResponse(HttpStatusCode.Accepted);
         }
     }

src/NzbDrone.Api/Series/SeriesModule.cs

@@ -1,7 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using FluentValidation;
+using NzbDrone.Api.Extensions;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Datastore.Events;
 using NzbDrone.Core.MediaCover;
@@ -45,6 +46,7 @@ namespace NzbDrone.Api.Series
                             SeriesExistsValidator seriesExistsValidator,
                             DroneFactoryValidator droneFactoryValidator,
                             SeriesAncestorValidator seriesAncestorValidator,
+                            SystemFolderValidator systemFolderValidator,
                             ProfileExistsValidator profileExistsValidator
             )
             : base(signalRBroadcaster)
@@ -71,6 +73,7 @@ namespace NzbDrone.Api.Series
                            .SetValidator(seriesPathValidator)
                            .SetValidator(droneFactoryValidator)
                            .SetValidator(seriesAncestorValidator)
+                           .SetValidator(systemFolderValidator)
                            .When(s => !s.Path.IsNullOrWhiteSpace());
 
             SharedValidator.RuleFor(s => s.ProfileId).SetValidator(profileExistsValidator);
@@ -84,26 +87,17 @@ namespace NzbDrone.Api.Series
 
         private SeriesResource GetSeries(int id)
         {
+            var includeSeasonImages = Context != null && Request.GetBooleanQueryParameter("includeSeasonImages");
+
             var series = _seriesService.GetSeries(id);
-            return MapToResource(series);
+            return MapToResource(series, includeSeasonImages);
-        }
-
-        private SeriesResource MapToResource(Core.Tv.Series series)
-        {
-            if (series == null) return null;
-
-            var resource = series.ToResource();
-            MapCoversToLocal(resource);
-            FetchAndLinkSeriesStatistics(resource);
-            PopulateAlternateTitles(resource);
-
-            return resource;
         }
 
         private List<SeriesResource> AllSeries()
         {
+            var includeSeasonImages = Request.GetBooleanQueryParameter("includeSeasonImages");
             var seriesStats = _seriesStatisticsService.SeriesStatistics();
-            var seriesResources = _seriesService.GetAllSeries().ToResource();
+            var seriesResources = _seriesService.GetAllSeries().Select(s => s.ToResource(includeSeasonImages)).ToList();
 
             MapCoversToLocal(seriesResources.ToArray());
             LinkSeriesStatistics(seriesResources, seriesStats);
@@ -141,6 +135,18 @@ namespace NzbDrone.Api.Series
             _seriesService.DeleteSeries(id, deleteFiles);
         }
 
+        private SeriesResource MapToResource(Core.Tv.Series series, bool includeSeasonImages)
+        {
+            if (series == null) return null;
+
+            var resource = series.ToResource(includeSeasonImages);
+            MapCoversToLocal(resource);
+            FetchAndLinkSeriesStatistics(resource);
+            PopulateAlternateTitles(resource);
+
+            return resource;
+        }
+
         private void MapCoversToLocal(params SeriesResource[] series)
         {
             foreach (var seriesResource in series)

src/NzbDrone.Api/Series/SeriesResource.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Api.REST;
@@ -97,7 +97,7 @@ namespace NzbDrone.Api.Series
 
     public static class SeriesResourceMapper
     {
-        public static SeriesResource ToResource(this Core.Tv.Series model)
+        public static SeriesResource ToResource(this Core.Tv.Series model, bool includeSeasonImages = false)
         {
             if (model == null) return null;
 
@@ -121,7 +121,7 @@ namespace NzbDrone.Api.Series
                 AirTime = model.AirTime,
                 Images = model.Images,
                 
-                Seasons = model.Seasons.ToResource(),
+                Seasons = model.Seasons.ToResource(includeSeasonImages),
                 Year = model.Year,
                 
                 Path = model.Path,
@@ -214,9 +214,9 @@ namespace NzbDrone.Api.Series
             return series;
         }
 
-        public static List<SeriesResource> ToResource(this IEnumerable<Core.Tv.Series> series)
+        public static List<SeriesResource> ToResource(this IEnumerable<Core.Tv.Series> series, bool includeSeasonImages)
         {
-            return series.Select(ToResource).ToList();
+            return series.Select(s => ToResource(s, includeSeasonImages)).ToList();
         }
     }
 }

src/NzbDrone.Api/packages.config

@@ -6,5 +6,5 @@
   <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="9.0.1" targetFramework="net40" />
-  <package id="NLog" version="4.4.12" targetFramework="net40" />
+  <package id="NLog" version="4.5.3" targetFramework="net40" />
 </packages>

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

@@ -47,19 +47,25 @@
     <Reference Include="FluentAssertions.Core, Version=4.19.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
       <HintPath>..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.Core.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="Moq, Version=4.0.10827.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
       <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.5.3\lib\net40-client\NLog.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.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.ServiceProcess" />
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>

src/NzbDrone.App.Test/packages.config

@@ -3,6 +3,6 @@
   <package id="FluentAssertions" version="4.19.0" targetFramework="net40" />
   <package id="Moq" version="4.0.10827" targetFramework="net40" />
   <package id="NBuilder" version="4.0.0" targetFramework="net40" />
-  <package id="NLog" version="4.4.12" targetFramework="net40" />
+  <package id="NLog" version="4.5.3" targetFramework="net40" />
   <package id="NUnit" version="3.6.0" targetFramework="net40" />
 </packages>

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

@@ -45,16 +45,20 @@
       <HintPath>..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.Core.dll</HintPath>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.5.3\lib\net40-client\NLog.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.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="Microsoft.CSharp" />

src/NzbDrone.Automation.Test/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="FluentAssertions" version="4.19.0" targetFramework="net40" />
-  <package id="NLog" version="4.4.12" targetFramework="net40" />
+  <package id="NLog" version="4.5.3" targetFramework="net40" />
   <package id="NUnit" version="3.6.0" targetFramework="net40" />
   <package id="Selenium.Support" version="3.2.0" targetFramework="net40" />
   <package id="Selenium.WebDriver" version="3.2.0" targetFramework="net40" />

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

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Threading;
 using FluentAssertions;
@@ -24,13 +25,60 @@ namespace NzbDrone.Common.Test.Http
     [TestFixture(typeof(CurlHttpDispatcher))]
     public class HttpClientFixture<TDispatcher> : TestBase<HttpClient> where TDispatcher : IHttpDispatcher
     {
-        private static string[] _httpBinHosts = new[] { "eu.httpbin.org", "httpbin.org" };
+        private string[] _httpBinHosts;
-        private static int _httpBinRandom;
+        private int _httpBinSleep;
+        private int _httpBinRandom;
         private string _httpBinHost;
+        private string _httpBinHost2;
+
+        [OneTimeSetUp]
+        public void FixtureSetUp()
+        {
+            var candidates = new[] { "eu.httpbin.org", /*"httpbin.org",*/ "www.httpbin.org" };
+            // httpbin.org is broken right now, occassionally redirecting to https if it's unavailable.
+            _httpBinHosts = candidates.Where(IsTestSiteAvailable).ToArray();
+
+            TestLogger.Info($"{candidates.Length} TestSites available.");
+
+            _httpBinSleep = _httpBinHosts.Count() < 2 ? 100 : 10;
+        }
+
+        private bool IsTestSiteAvailable(string site)
+        {
+            try
+            {
+                var req = WebRequest.Create($"http://{site}/get") as HttpWebRequest;
+                var res = req.GetResponse() as HttpWebResponse;
+                if (res.StatusCode != HttpStatusCode.OK) return false;
+
+                try
+                {
+                    req = WebRequest.Create($"http://{site}/status/429") as HttpWebRequest;
+                    res = req.GetResponse() as HttpWebResponse;
+                }
+                catch (WebException ex)
+                {
+                    res = ex.Response as HttpWebResponse;
+                }
+
+                if (res == null || res.StatusCode != (HttpStatusCode)429) return false;
+
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
+        }
 
         [SetUp]
         public void SetUp()
         {
+            if (!_httpBinHosts.Any())
+            {
+                Assert.Inconclusive("No TestSites available");
+            }
+
             Mocker.GetMock<IPlatformInfo>().Setup(c => c.Version).Returns(new Version("1.0.0"));
             Mocker.GetMock<IOsInfo>().Setup(c => c.Name).Returns("TestOS");
             Mocker.GetMock<IOsInfo>().Setup(c => c.Version).Returns("9.0.0");
@@ -50,6 +98,13 @@ namespace NzbDrone.Common.Test.Http
 
             // Roundrobin over the two servers, to reduce the chance of hitting the ratelimiter.
             _httpBinHost = _httpBinHosts[_httpBinRandom++ % _httpBinHosts.Length];
+            _httpBinHost2 = _httpBinHosts[_httpBinRandom % _httpBinHosts.Length];
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            Thread.Sleep(_httpBinSleep);
         }
 
         [Test]
@@ -245,7 +300,12 @@ namespace NzbDrone.Common.Test.Http
 
         public void GivenOldCookie()
         {
-            var oldRequest = new HttpRequest("http://eu.httpbin.org/get");
+            if (_httpBinHost == _httpBinHost2)
+            {
+                Assert.Inconclusive("Need both httpbin.org and eu.httpbin.org to run this test.");
+            }
+
+            var oldRequest = new HttpRequest($"http://{_httpBinHost2}/get");
             oldRequest.Cookies["my"] = "cookie";
 
             var oldClient = new HttpClient(new IHttpRequestInterceptor[0], Mocker.Resolve<ICacheManager>(), Mocker.Resolve<IRateLimitService>(), Mocker.Resolve<IHttpDispatcher>(), Mocker.GetMock<IUserAgentBuilder>().Object, Mocker.Resolve<Logger>());
@@ -262,7 +322,7 @@ namespace NzbDrone.Common.Test.Http
         {
             GivenOldCookie();
 
-            var request = new HttpRequest("http://eu.httpbin.org/get");
+            var request = new HttpRequest($"http://{_httpBinHost2}/get");
 
             var response = Subject.Get<HttpBinResource>(request);
 
@@ -278,26 +338,103 @@ namespace NzbDrone.Common.Test.Http
         {
             GivenOldCookie();
 
-            var request = new HttpRequest("http://httpbin.org/get");
+            var request = new HttpRequest($"http://{_httpBinHost}/get");
 
             var response = Subject.Get<HttpBinResource>(request);
 
             response.Resource.Headers.Should().NotContainKey("Cookie");
         }
 
+        [Test]
+        public void should_not_store_request_cookie()
+        {
+            var requestGet = new HttpRequest($"http://{_httpBinHost}/get");
+            requestGet.Cookies.Add("my", "cookie");
+            requestGet.AllowAutoRedirect = false;
+            requestGet.StoreRequestCookie = false;
+            requestGet.StoreResponseCookie = false;
+            var responseGet = Subject.Get<HttpBinResource>(requestGet);
+
+            var requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
+            requestCookies.AllowAutoRedirect = false;
+            var responseCookies = Subject.Get<HttpCookieResource>(requestCookies);
+
+            responseCookies.Resource.Cookies.Should().BeEmpty();
+
+            ExceptionVerification.IgnoreErrors();
+        }
+
+        [Test]
+        public void should_store_request_cookie()
+        {
+            var requestGet = new HttpRequest($"http://{_httpBinHost}/get");
+            requestGet.Cookies.Add("my", "cookie");
+            requestGet.AllowAutoRedirect = false;
+            requestGet.StoreRequestCookie.Should().BeTrue();
+            requestGet.StoreResponseCookie = false;
+            var responseGet = Subject.Get<HttpBinResource>(requestGet);
+
+            var requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
+            requestCookies.AllowAutoRedirect = false;
+            var responseCookies = Subject.Get<HttpCookieResource>(requestCookies);
+
+            responseCookies.Resource.Cookies.Should().HaveCount(1).And.Contain("my", "cookie");
+
+            ExceptionVerification.IgnoreErrors();
+        }
+
+        [Test]
+        public void should_delete_request_cookie()
+        {
+            var requestDelete = new HttpRequest($"http://{_httpBinHost}/cookies/delete?my");
+            requestDelete.Cookies.Add("my", "cookie");
+            requestDelete.AllowAutoRedirect = true;
+            requestDelete.StoreRequestCookie = false;
+            requestDelete.StoreResponseCookie = false;
+
+            // Delete and redirect since that's the only way to check the internal temporary cookie container
+            var responseCookies = Subject.Get<HttpCookieResource>(requestDelete);
+
+            responseCookies.Resource.Cookies.Should().BeEmpty();
+        }
+
+        [Test]
+        public void should_clear_request_cookie()
+        {
+            var requestSet = new HttpRequest($"http://{_httpBinHost}/cookies");
+            requestSet.Cookies.Add("my", "cookie");
+            requestSet.AllowAutoRedirect = false;
+            requestSet.StoreRequestCookie = true;
+            requestSet.StoreResponseCookie = false;
+
+            var responseSet = Subject.Get<HttpCookieResource>(requestSet);
+
+            var requestClear = new HttpRequest($"http://{_httpBinHost}/cookies");
+            requestClear.Cookies.Add("my", null);
+            requestClear.AllowAutoRedirect = false;
+            requestClear.StoreRequestCookie = true;
+            requestClear.StoreResponseCookie = false;
+
+            var responseClear = Subject.Get<HttpCookieResource>(requestClear);
+
+            responseClear.Resource.Cookies.Should().BeEmpty();
+        }
+
         [Test]
         public void should_not_store_response_cookie()
         {
             var requestSet = new HttpRequest($"http://{_httpBinHost}/cookies/set?my=cookie");
             requestSet.AllowAutoRedirect = false;
+            requestSet.StoreRequestCookie = false;
+            requestSet.StoreResponseCookie.Should().BeFalse();
 
             var responseSet = Subject.Get(requestSet);
 
-            var request = new HttpRequest($"http://{_httpBinHost}/get");
+            var requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
 
-            var response = Subject.Get<HttpBinResource>(request);
+            var responseCookies = Subject.Get<HttpCookieResource>(requestCookies);
 
-            response.Resource.Headers.Should().NotContainKey("Cookie");
+            responseCookies.Resource.Cookies.Should().BeEmpty();
 
             ExceptionVerification.IgnoreErrors();
         }
@@ -307,19 +444,31 @@ namespace NzbDrone.Common.Test.Http
         {
             var requestSet = new HttpRequest($"http://{_httpBinHost}/cookies/set?my=cookie");
             requestSet.AllowAutoRedirect = false;
+            requestSet.StoreRequestCookie = false;
             requestSet.StoreResponseCookie = true;
 
             var responseSet = Subject.Get(requestSet);
 
-            var request = new HttpRequest($"http://{_httpBinHost}/get");
+            var requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
 
-            var response = Subject.Get<HttpBinResource>(request);
+            var responseCookies = Subject.Get<HttpCookieResource>(requestCookies);
 
-            response.Resource.Headers.Should().ContainKey("Cookie");
+            responseCookies.Resource.Cookies.Should().HaveCount(1).And.Contain("my", "cookie");
 
-            var cookie = response.Resource.Headers["Cookie"].ToString();
+            ExceptionVerification.IgnoreErrors();
+        }
 
-            cookie.Should().Contain("my=cookie");
+        [Test]
+        public void should_temp_store_response_cookie()
+        {
+            var requestSet = new HttpRequest($"http://{_httpBinHost}/cookies/set?my=cookie");
+            requestSet.AllowAutoRedirect = true;
+            requestSet.StoreRequestCookie = false;
+            requestSet.StoreResponseCookie.Should().BeFalse();
+            var responseSet = Subject.Get<HttpCookieResource>(requestSet);
+
+            // Set and redirect since that's the only way to check the internal temporary cookie container
+            responseSet.Resource.Cookies.Should().HaveCount(1).And.Contain("my", "cookie");
 
             ExceptionVerification.IgnoreErrors();
         }
@@ -328,21 +477,129 @@ namespace NzbDrone.Common.Test.Http
         public void should_overwrite_response_cookie()
         {
             var requestSet = new HttpRequest($"http://{_httpBinHost}/cookies/set?my=cookie");
+            requestSet.Cookies.Add("my", "oldcookie");
             requestSet.AllowAutoRedirect = false;
+            requestSet.StoreRequestCookie = false;
             requestSet.StoreResponseCookie = true;
-            requestSet.Cookies["my"] = "oldcookie";
 
             var responseSet = Subject.Get(requestSet);
 
-            var request = new HttpRequest($"http://{_httpBinHost}/get");
+            var requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
 
-            var response = Subject.Get<HttpBinResource>(request);
+            var responseCookies = Subject.Get<HttpCookieResource>(requestCookies);
 
-            response.Resource.Headers.Should().ContainKey("Cookie");
+            responseCookies.Resource.Cookies.Should().HaveCount(1).And.Contain("my", "cookie");
 
-            var cookie = response.Resource.Headers["Cookie"].ToString();
+            ExceptionVerification.IgnoreErrors();
+        }
 
-            cookie.Should().Contain("my=cookie");
+        [Test]
+        public void should_overwrite_temp_response_cookie()
+        {
+            var requestSet = new HttpRequest($"http://{_httpBinHost}/cookies/set?my=cookie");
+            requestSet.Cookies.Add("my", "oldcookie");
+            requestSet.AllowAutoRedirect = true;
+            requestSet.StoreRequestCookie = true;
+            requestSet.StoreResponseCookie = false;
+
+            var responseSet = Subject.Get<HttpCookieResource>(requestSet);
+
+            responseSet.Resource.Cookies.Should().HaveCount(1).And.Contain("my", "cookie");
+
+            var requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
+
+            var responseCookies = Subject.Get<HttpCookieResource>(requestCookies);
+
+            responseCookies.Resource.Cookies.Should().HaveCount(1).And.Contain("my", "oldcookie");
+
+            ExceptionVerification.IgnoreErrors();
+        }
+
+        [Test]
+        public void should_not_delete_response_cookie()
+        {
+            var requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
+            requestCookies.Cookies.Add("my", "cookie");
+            requestCookies.AllowAutoRedirect = false;
+            requestCookies.StoreRequestCookie = true;
+            requestCookies.StoreResponseCookie = false;
+            var responseCookies = Subject.Get<HttpCookieResource>(requestCookies);
+
+            responseCookies.Resource.Cookies.Should().HaveCount(1).And.Contain("my", "cookie");
+
+            var requestDelete = new HttpRequest($"http://{_httpBinHost}/cookies/delete?my");
+            requestDelete.AllowAutoRedirect = false;
+            requestDelete.StoreRequestCookie = false;
+            requestDelete.StoreResponseCookie = false;
+
+            var responseDelete = Subject.Get(requestDelete);
+
+            requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
+            requestCookies.StoreRequestCookie = false;
+            requestCookies.StoreResponseCookie = false;
+
+            responseCookies = Subject.Get<HttpCookieResource>(requestCookies);
+
+            responseCookies.Resource.Cookies.Should().HaveCount(1).And.Contain("my", "cookie");
+
+            ExceptionVerification.IgnoreErrors();
+        }
+
+        [Test]
+        public void should_delete_response_cookie()
+        {
+            var requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
+            requestCookies.Cookies.Add("my", "cookie");
+            requestCookies.AllowAutoRedirect = false;
+            requestCookies.StoreRequestCookie = true;
+            requestCookies.StoreResponseCookie = false;
+            var responseCookies = Subject.Get<HttpCookieResource>(requestCookies);
+
+            responseCookies.Resource.Cookies.Should().HaveCount(1).And.Contain("my", "cookie");
+
+            var requestDelete = new HttpRequest($"http://{_httpBinHost}/cookies/delete?my");
+            requestDelete.AllowAutoRedirect = false;
+            requestDelete.StoreRequestCookie = false;
+            requestDelete.StoreResponseCookie = true;
+
+            var responseDelete = Subject.Get(requestDelete);
+
+            requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
+            requestCookies.StoreRequestCookie = false;
+            requestCookies.StoreResponseCookie = false;
+
+            responseCookies = Subject.Get<HttpCookieResource>(requestCookies);
+
+            responseCookies.Resource.Cookies.Should().BeEmpty();
+
+            ExceptionVerification.IgnoreErrors();
+        }
+
+        [Test]
+        public void should_delete_temp_response_cookie()
+        {
+            var requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
+            requestCookies.Cookies.Add("my", "cookie");
+            requestCookies.AllowAutoRedirect = false;
+            requestCookies.StoreRequestCookie = true;
+            requestCookies.StoreResponseCookie = false;
+            var responseCookies = Subject.Get<HttpCookieResource>(requestCookies);
+
+            responseCookies.Resource.Cookies.Should().HaveCount(1).And.Contain("my", "cookie");
+
+            var requestDelete = new HttpRequest($"http://{_httpBinHost}/cookies/delete?my");
+            requestDelete.AllowAutoRedirect = true;
+            requestDelete.StoreRequestCookie = false;
+            requestDelete.StoreResponseCookie = false;
+            var responseDelete = Subject.Get<HttpCookieResource>(requestDelete);
+
+            responseDelete.Resource.Cookies.Should().BeEmpty();
+
+            requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
+            requestCookies.StoreRequestCookie = false;
+            requestCookies.StoreResponseCookie = false;
+
+            responseCookies.Resource.Cookies.Should().HaveCount(1).And.Contain("my", "cookie");
 
             ExceptionVerification.IgnoreErrors();
         }
@@ -454,4 +711,9 @@ namespace NzbDrone.Common.Test.Http
         public string Url { get; set; }
         public string Data { get; set; }
     }
+
+    public class HttpCookieResource
+    {
+        public Dictionary<string, string> Cookies { get; set; }
+    }
 }

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

@@ -48,16 +48,20 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.5.3\lib\net40-client\NLog.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.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.ServiceProcess" />
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="Microsoft.CSharp" />

src/NzbDrone.Common.Test/packages.config

@@ -2,6 +2,6 @@
 <packages>
   <package id="FluentAssertions" version="4.19.0" targetFramework="net40" />
   <package id="Moq" version="4.0.10827" targetFramework="net40" />
-  <package id="NLog" version="4.4.12" targetFramework="net40" />
+  <package id="NLog" version="4.5.3" targetFramework="net40" />
   <package id="NUnit" version="3.6.0" targetFramework="net40" />
 </packages>

src/NzbDrone.Common/Disk/DiskProviderBase.cs

@@ -200,6 +200,11 @@ namespace NzbDrone.Common.Disk
                 throw new IOException(string.Format("Source and destination can't be the same {0}", source));
             }
 
+            CopyFileInternal(source, destination, overwrite);
+        }
+
+        protected virtual void CopyFileInternal(string source, string destination, bool overwrite = false)
+        {
             File.Copy(source, destination, overwrite);
         }
 
@@ -219,6 +224,11 @@ namespace NzbDrone.Common.Disk
             }
 
             RemoveReadOnly(source);
+            MoveFileInternal(source, destination);
+        }
+
+        protected virtual void MoveFileInternal(string source, string destination)
+        {
             File.Move(source, destination);
         }
 

src/NzbDrone.Common/EnvironmentInfo/AppFolderFactory.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Security.AccessControl;
 using System.Security.Principal;
 using NLog;
@@ -28,7 +28,15 @@ namespace NzbDrone.Common.EnvironmentInfo
 
         public void Register()
         {
-            _diskProvider.EnsureFolder(_appFolderInfo.AppDataFolder);
+            try
+            {
+                _diskProvider.EnsureFolder(_appFolderInfo.AppDataFolder);
+            }
+            catch (UnauthorizedAccessException)
+            {
+                throw new SonarrStartupException("Cannot create AppFolder, Access to the path {0} is denied", _appFolderInfo.AppDataFolder);
+            }
+            
 
             if (OsInfo.IsWindows)
             {

src/NzbDrone.Common/EnvironmentInfo/IRuntimeInfo.cs

@@ -1,7 +1,10 @@
+using System;
+
 namespace NzbDrone.Common.EnvironmentInfo
 {
     public interface IRuntimeInfo
     {
+        DateTime StartTime { get; }
         bool IsUserInteractive { get; }
         bool IsAdmin { get; }
         bool IsWindowsService { get; }

src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs

@@ -12,6 +12,7 @@ namespace NzbDrone.Common.EnvironmentInfo
     public class RuntimeInfo : IRuntimeInfo
     {
         private readonly Logger _logger;
+        private readonly DateTime _startTime = DateTime.UtcNow;
 
         public RuntimeInfo(IServiceProvider serviceProvider, Logger logger)
         {
@@ -37,6 +38,14 @@ namespace NzbDrone.Common.EnvironmentInfo
             IsProduction = InternalIsProduction();
         }
 
+        public DateTime StartTime
+        {
+            get
+            {
+                return _startTime;
+            }
+        }
+
         public static bool IsUserInteractive => Environment.UserInteractive;
 
         bool IRuntimeInfo.IsUserInteractive => IsUserInteractive;

src/NzbDrone.Common/Extensions/ExceptionExtensions.cs

@@ -32,7 +32,19 @@ namespace NzbDrone.Common.Extensions
         {
             if (response == null || response.Content == null) return ex;
 
-            var contentSample = response.Content.Substring(0, Math.Min(response.Content.Length, 512));
+            var contentSample = response.Content.Substring(0, Math.Min(response.Content.Length, maxSampleLength));
+
+            if (response.Request != null)
+            {
+                ex.AddData("RequestUri", response.Request.Url.ToString());
+
+                if (response.Request.ContentSummary != null)
+                {
+                    ex.AddData("RequestSummary", response.Request.ContentSummary);
+                }
+            }
+
+            ex.AddData("StatusCode", response.StatusCode.ToString());
 
             if (response.Headers != null)
             {

src/NzbDrone.Common/Extensions/IEnumerableExtensions.cs

@@ -51,6 +51,34 @@ namespace NzbDrone.Common.Extensions
             }
         }
 
+        public static Dictionary<TKey, TItem> ToDictionaryIgnoreDuplicates<TItem, TKey>(this IEnumerable<TItem> src, Func<TItem, TKey> keySelector)
+        {
+            var result = new Dictionary<TKey, TItem>();
+            foreach (var item in src)
+            {
+                var key = keySelector(item);
+                if (!result.ContainsKey(key))
+                {
+                    result[key] = item;
+                }
+            }
+            return result;
+        }
+
+        public static Dictionary<TKey, TValue> ToDictionaryIgnoreDuplicates<TItem, TKey, TValue>(this IEnumerable<TItem> src, Func<TItem, TKey> keySelector, Func<TItem, TValue> valueSelector)
+        {
+            var result = new Dictionary<TKey, TValue>();
+            foreach (var item in src)
+            {
+                var key = keySelector(item);
+                if (!result.ContainsKey(key))
+                {
+                    result[key] = valueSelector(item);
+                }
+            }
+            return result;
+        }
+
         public static void AddIfNotNull<TSource>(this List<TSource> source, TSource item)
         {
             if (item == null)
@@ -81,4 +109,4 @@ namespace NzbDrone.Common.Extensions
             return source.Select(predicate).ToList();
         }
     }
-}
+}

src/NzbDrone.Common/Extensions/PathExtensions.cs

@@ -191,6 +191,24 @@ namespace NzbDrone.Common.Extensions
             return directories;
         }
 
+        public static string GetAncestorPath(this string path, string ancestorName)
+        {
+            var parent = Path.GetDirectoryName(path);
+
+            while (parent != null)
+            {
+                var currentPath = parent;
+                parent = Path.GetDirectoryName(parent);
+
+                if (Path.GetFileName(currentPath) == ancestorName)
+                {
+                    return currentPath;
+                }
+            }
+
+            return null;
+        }
+
         public static string GetAppDataPath(this IAppFolderInfo appFolderInfo)
         {
             return appFolderInfo.AppDataFolder;

src/NzbDrone.Common/Extensions/TryParseExtensions.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 
 namespace NzbDrone.Common.Extensions
 {
@@ -6,7 +7,7 @@ namespace NzbDrone.Common.Extensions
     {
         public static int? ParseInt32(this string source)
         {
-            int result = 0;
+            int result;
 
             if (int.TryParse(source, out result))
             {
@@ -16,9 +17,9 @@ namespace NzbDrone.Common.Extensions
             return null;
         }
 
-        public static Nullable<long> ParseInt64(this string source)
+        public static long? ParseInt64(this string source)
         {
-            long result = 0;
+            long result;
 
             if (long.TryParse(source, out result))
             {
@@ -27,5 +28,17 @@ namespace NzbDrone.Common.Extensions
 
             return null;
         }
+
+        public static double? ParseDouble(this string source)
+        {
+            double result;
+
+            if (double.TryParse(source.Replace(',', '.'), NumberStyles.Number, CultureInfo.InvariantCulture, out result))
+            {
+                return result;
+            }
+
+            return null;
+        }
     }
-}
+}

src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs

@@ -1,4 +1,6 @@
 using System;
+using System.IO;
+using System.IO.Compression;
 using System.Net;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Extensions;
@@ -24,11 +26,20 @@ namespace NzbDrone.Common.Http.Dispatchers
         {
             var webRequest = (HttpWebRequest)WebRequest.Create((Uri)request.Url);
 
-            // Deflate is not a standard and could break depending on implementation.
+            if (PlatformInfo.IsMono)
-            // we should just stick with the more compatible Gzip
+            {
-            //http://stackoverflow.com/questions/8490718/how-to-decompress-stream-deflated-with-java-util-zip-deflater-in-net
+                // On Mono GZipStream/DeflateStream leaks memory if an exception is thrown, use an intermediate buffer in that case.
-            webRequest.AutomaticDecompression = DecompressionMethods.GZip;
+                webRequest.AutomaticDecompression = DecompressionMethods.None;
-
+                webRequest.Headers.Add("Accept-Encoding", "gzip");
+            }
+            else
+            {
+                // Deflate is not a standard and could break depending on implementation.
+                // we should just stick with the more compatible Gzip
+                //http://stackoverflow.com/questions/8490718/how-to-decompress-stream-deflated-with-java-util-zip-deflater-in-net
+                webRequest.AutomaticDecompression = DecompressionMethods.GZip;
+            }
+            
             webRequest.Method = request.Method.ToString();
             webRequest.UserAgent = _userAgentBuilder.GetUserAgent(request.UseSimplifiedUserAgent);
             webRequest.KeepAlive = request.ConnectionKeepAlive;
@@ -101,11 +112,24 @@ namespace NzbDrone.Common.Http.Dispatchers
 
             using (var responseStream = httpWebResponse.GetResponseStream())
             {
-                if (responseStream != null)
+                if (responseStream != null && responseStream != Stream.Null)
                 {
                     try
                     {
                         data = responseStream.ToBytes();
+
+                        if (PlatformInfo.IsMono && httpWebResponse.ContentEncoding == "gzip")
+                        {
+                            using (var compressedStream = new MemoryStream(data))
+                            using (var gzip = new GZipStream(compressedStream, CompressionMode.Decompress))
+                            using (var decompressedStream = new MemoryStream())
+                            {
+                                gzip.CopyTo(decompressedStream);
+                                data = decompressedStream.ToArray();
+                            }
+
+                            httpWebResponse.Headers.Remove("Content-Encoding");
+                        }
                     }
                     catch (Exception ex)
                     {

src/NzbDrone.Common/Http/HttpClient.cs

@@ -52,7 +52,9 @@ namespace NzbDrone.Common.Http
 
         public HttpResponse Execute(HttpRequest request)
         {
-            var response = ExecuteRequest(request);
+            var cookieContainer = InitializeRequestCookies(request);
+
+            var response = ExecuteRequest(request, cookieContainer);
 
             if (request.AllowAutoRedirect && response.HasHttpRedirect)
             {
@@ -71,7 +73,7 @@ namespace NzbDrone.Common.Http
                         throw new WebException($"Too many automatic redirections were attempted for {autoRedirectChain.Join(" -> ")}", WebExceptionStatus.ProtocolError);
                     }
 
-                    response = ExecuteRequest(request);
+                    response = ExecuteRequest(request, cookieContainer);
                 }
                 while (response.HasHttpRedirect);
             }
@@ -98,7 +100,7 @@ namespace NzbDrone.Common.Http
             return response;
         }
 
-        private HttpResponse ExecuteRequest(HttpRequest request)
+        private HttpResponse ExecuteRequest(HttpRequest request, CookieContainer cookieContainer)
         {
             foreach (var interceptor in _requestInterceptors)
             {
@@ -114,11 +116,11 @@ namespace NzbDrone.Common.Http
 
             var stopWatch = Stopwatch.StartNew();
 
-            var cookies = PrepareRequestCookies(request);
+            PrepareRequestCookies(request, cookieContainer);
 
-            var response = _httpDispatcher.GetResponse(request, cookies);
+            var response = _httpDispatcher.GetResponse(request, cookieContainer);
 
-            HandleResponseCookies(request, cookies);
+            HandleResponseCookies(response, cookieContainer);
 
             stopWatch.Stop();
 
@@ -137,49 +139,91 @@ namespace NzbDrone.Common.Http
             return response;
         }
 
-        private CookieContainer PrepareRequestCookies(HttpRequest request)
+        private CookieContainer InitializeRequestCookies(HttpRequest request)
         {
             lock (_cookieContainerCache)
             {
-                var persistentCookieContainer = _cookieContainerCache.Get("container", () => new CookieContainer());
+                var sourceContainer = new CookieContainer();
+
+                var presistentContainer = _cookieContainerCache.Get("container", () => new CookieContainer());
+                var persistentCookies = presistentContainer.GetCookies((Uri)request.Url);
+                sourceContainer.Add(persistentCookies);
 
                 if (request.Cookies.Count != 0)
                 {
                     foreach (var pair in request.Cookies)
                     {
-                        persistentCookieContainer.Add(new Cookie(pair.Key, pair.Value, "/", request.Url.Host)
+                        Cookie cookie;
+                        if (pair.Value == null)
                         {
-                            // Use Now rather than UtcNow to work around Mono cookie expiry bug.
+                            cookie = new Cookie(pair.Key, "", "/")
-                            // See https://gist.github.com/ta264/7822b1424f72e5b4c961
+                            {
-                            Expires = DateTime.Now.AddHours(1)
+                                Expires = DateTime.Now.AddDays(-1)
-                        });
+                            };
+                        }
+                        else
+                        {
+                            cookie = new Cookie(pair.Key, pair.Value, "/")
+                            {
+                                // Use Now rather than UtcNow to work around Mono cookie expiry bug.
+                                // See https://gist.github.com/ta264/7822b1424f72e5b4c961
+                                Expires = DateTime.Now.AddHours(1)
+                            };
+                        }
+
+                        sourceContainer.Add((Uri)request.Url, cookie);
+
+                        if (request.StoreRequestCookie)
+                        {
+                            presistentContainer.Add((Uri)request.Url, cookie);
+                        }
                     }
                 }
 
-                var requestCookies = persistentCookieContainer.GetCookies((Uri)request.Url);
+                return sourceContainer;
-
-                var cookieContainer = new CookieContainer();
-
-                cookieContainer.Add(requestCookies);
-
-                return cookieContainer;
             }
         }
 
-        private void HandleResponseCookies(HttpRequest request, CookieContainer cookieContainer)
+        private void PrepareRequestCookies(HttpRequest request, CookieContainer cookieContainer)
         {
-            if (!request.StoreResponseCookie)
+            // Don't collect persistnet cookies for intermediate/redirected urls.
+            /*lock (_cookieContainerCache)
+            {
+                var presistentContainer = _cookieContainerCache.Get("container", () => new CookieContainer());
+                var persistentCookies = presistentContainer.GetCookies((Uri)request.Url);
+                var existingCookies = cookieContainer.GetCookies((Uri)request.Url);
+
+                cookieContainer.Add(persistentCookies);
+                cookieContainer.Add(existingCookies);
+            }*/
+        }
+
+        private void HandleResponseCookies(HttpResponse response, CookieContainer cookieContainer)
+        {
+            var cookieHeaders = response.GetCookieHeaders();
+            if (cookieHeaders.Empty())
             {
                 return;
             }
 
-            lock (_cookieContainerCache)
+            if (response.Request.StoreResponseCookie)
             {
-                var persistentCookieContainer = _cookieContainerCache.Get("container", () => new CookieContainer());
+                lock (_cookieContainerCache)
+                {
+                    var persistentCookieContainer = _cookieContainerCache.Get("container", () => new CookieContainer());
 
-                var cookies = cookieContainer.GetCookies((Uri)request.Url);
+                    foreach (var cookieHeader in cookieHeaders)
-
+                    {
-                persistentCookieContainer.Add(cookies);
+                        try
+                        {
+                            persistentCookieContainer.SetCookies((Uri)response.Request.Url, cookieHeader);
+                        }
+                        catch (Exception ex)
+                        {
+                            _logger.Debug(ex, "Invalid cookie in {0}", response.Request.Url);
+                        }
+                    }
+                }
             }
         }
 
@@ -223,6 +267,7 @@ namespace NzbDrone.Common.Http
         public HttpResponse<T> Get<T>(HttpRequest request) where T : new()
         {
             var response = Get(request);
+            CheckResponseContentType(response);
             return new HttpResponse<T>(response);
         }
 
@@ -241,7 +286,16 @@ namespace NzbDrone.Common.Http
         public HttpResponse<T> Post<T>(HttpRequest request) where T : new()
         {
             var response = Post(request);
+            CheckResponseContentType(response);
             return new HttpResponse<T>(response);
         }
+
+        private void CheckResponseContentType(HttpResponse response)
+        {
+            if (response.Headers.ContentType != null && response.Headers.ContentType.Contains("text/html"))
+            {
+                throw new UnexpectedHtmlContentException(response);
+            }
+        }
     }
 }

src/NzbDrone.Common/Http/HttpException.cs

@@ -7,13 +7,19 @@ namespace NzbDrone.Common.Http
         public HttpRequest Request { get; private set; }
         public HttpResponse Response { get; private set; }
 
-        public HttpException(HttpRequest request, HttpResponse response)
+        public HttpException(HttpRequest request, HttpResponse response, string message)
-            : base(string.Format("HTTP request failed: [{0}:{1}] [{2}] at [{3}]", (int)response.StatusCode, response.StatusCode, request.Method, request.Url))
+            : base(message)
         {
             Request = request;
             Response = response;
         }
 
+        public HttpException(HttpRequest request, HttpResponse response)
+            : this(request, response, string.Format("HTTP request failed: [{0}:{1}] [{2}] at [{3}]", (int)response.StatusCode, response.StatusCode, request.Method, request.Url))
+        {
+
+        }
+
         public HttpException(HttpResponse response)
             : this(response.Request, response)
         {
@@ -30,4 +36,4 @@ namespace NzbDrone.Common.Http
             return base.ToString();
         }
     }
-}
+}

src/NzbDrone.Common/Http/HttpRequest.cs

@@ -13,8 +13,10 @@ namespace NzbDrone.Common.Http
             Url = new HttpUri(url);
             Headers = new HttpHeader();
             AllowAutoRedirect = true;
+            StoreRequestCookie = true;
             Cookies = new Dictionary<string, string>();
-            
+
+
             if (!RuntimeInfo.IsProduction)
             {
                 AllowAutoRedirect = false;
@@ -37,6 +39,7 @@ namespace NzbDrone.Common.Http
         public bool ConnectionKeepAlive { get; set; }
         public bool LogResponseContent { get; set; }
         public Dictionary<string, string> Cookies { get; private set; }
+        public bool StoreRequestCookie { get; set; }
         public bool StoreResponseCookie { get; set; }
         public TimeSpan RequestTimeout { get; set; }
         public TimeSpan RateLimit { get; set; }
@@ -76,5 +79,12 @@ namespace NzbDrone.Common.Http
             var encoding = HttpHeader.GetEncodingFromContentType(Headers.ContentType);
             ContentData = encoding.GetBytes(data);
         }
+
+        public void AddBasicAuthentication(string username, string password)
+        {
+            var authInfo = Convert.ToBase64String(Encoding.GetEncoding("ISO-8859-1").GetBytes($"{username}:{password}"));
+
+            Headers.Set("Authorization", "Basic " + authInfo);
+        }
     }
-}
+}

src/NzbDrone.Common/Http/HttpResponse.cs

@@ -55,20 +55,22 @@ namespace NzbDrone.Common.Http
                                        StatusCode == HttpStatusCode.MovedPermanently ||
                                        StatusCode == HttpStatusCode.Found;
 
+        public string[] GetCookieHeaders()
+        {
+            return Headers.GetValues("Set-Cookie") ?? new string[0];
+        }
+
         public Dictionary<string, string> GetCookies()
         {
             var result = new Dictionary<string, string>();
 
-            var setCookieHeaders = Headers.GetValues("Set-Cookie");
+            var setCookieHeaders = GetCookieHeaders();
-            if (setCookieHeaders != null)
+            foreach (var cookie in setCookieHeaders)
             {
-                foreach (var cookie in setCookieHeaders)
+                var match = RegexSetCookie.Match(cookie);
+                if (match.Success)
                 {
-                    var match = RegexSetCookie.Match(cookie);
+                    result[match.Groups[1].Value] = match.Groups[2].Value;
-                    if (match.Success)
-                    {
-                        result[match.Groups[1].Value] = match.Groups[2].Value;
-                    }
                 }
             }
 

src/NzbDrone.Common/Http/HttpUri.cs

@@ -135,7 +135,7 @@ namespace NzbDrone.Common.Http
             return new HttpUri(Scheme, Host, Port, CombinePath(Path, path), Query, Fragment);
         }
 
-        private static string CombinePath(string basePath, string relativePath)
+        public static string CombinePath(string basePath, string relativePath)
         {
             if (relativePath.IsNullOrWhiteSpace())
             {

src/NzbDrone.Common/Http/UnexpectedHtmlContentException.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace NzbDrone.Common.Http
+{
+    public class UnexpectedHtmlContentException : HttpException
+    {
+        public UnexpectedHtmlContentException(HttpResponse response)
+            : base(response.Request, response, $"Site responded with browser content instead of api data. This disruption may be temporary, please try again later. [{response.Request.Url}]")
+        {
+
+        }
+    }
+}

src/NzbDrone.Common/Instrumentation/Extensions/SentryLoggerExtensions.cs

@@ -51,7 +51,7 @@ namespace NzbDrone.Common.Instrumentation.Extensions
             return logBuilder.LoggerName(logEvent.LoggerName)
                              .TimeStamp(logEvent.TimeStamp)
                              .Message(logEvent.Message, logEvent.Parameters)
-                             .Properties((Dictionary<object, object>)logEvent.Properties)
+                             .Properties(logEvent.Properties.ToDictionary(v => v.Key, v => v.Value))
                              .Exception(logEvent.Exception);
         }
     }

src/NzbDrone.Common/Instrumentation/GlobalExceptionHandlers.cs

@@ -31,7 +31,7 @@ namespace NzbDrone.Common.Instrumentation
             if (exception is NullReferenceException &&
                 exception.ToString().Contains("Microsoft.AspNet.SignalR.Transports.TransportHeartbeat.ProcessServerCommand"))
             {
-                Logger.Warn("SignalR Heartbeat interupted");
+                Logger.Warn("SignalR Heartbeat interrupted");
                 return;
             }
 
@@ -49,4 +49,4 @@ namespace NzbDrone.Common.Instrumentation
             Logger.Fatal(exception, "EPIC FAIL.");
         }
     }
-}
+}

src/NzbDrone.Common/NzbDrone.Common.csproj

@@ -44,7 +44,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.5.3\lib\net40-client\NLog.dll</HintPath>
     </Reference>
     <Reference Include="Org.Mentalis, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\DotNet4.SocksProxy.1.3.4.0\lib\net40\Org.Mentalis.dll</HintPath>
@@ -60,11 +60,14 @@
     <Reference Include="System.Configuration.Install" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.ServiceProcess" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="ICSharpCode.SharpZipLib">
       <HintPath>..\packages\ICSharpCode.SharpZipLib.Patched.0.86.5\lib\net20\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
@@ -174,6 +177,7 @@
     <Compile Include="Http\HttpRequestBuilderFactory.cs" />
     <Compile Include="Http\Proxy\ProxyType.cs" />
     <Compile Include="Http\TlsFailureException.cs" />
+    <Compile Include="Http\UnexpectedHtmlContentException.cs" />
     <Compile Include="Http\TooManyRequestsException.cs" />
     <Compile Include="Extensions\IEnumerableExtensions.cs" />
     <Compile Include="Http\UserAgentBuilder.cs" />
@@ -212,6 +216,7 @@
     <Compile Include="Serializer\IntConverter.cs" />
     <Compile Include="Serializer\Json.cs" />
     <Compile Include="Serializer\JsonVisitor.cs" />
+    <Compile Include="Serializer\UnderscoreStringEnumConverter.cs" />
     <Compile Include="ServiceFactory.cs" />
     <Compile Include="ServiceProvider.cs" />
     <Compile Include="Extensions\StringExtensions.cs" />

src/NzbDrone.Common/Serializer/Json.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Reflection;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Serialization;
@@ -14,13 +15,13 @@ namespace NzbDrone.Common.Serializer
         static Json()
         {
             SerializerSetting = new JsonSerializerSettings
-                        {
+            {
-                            DateTimeZoneHandling = DateTimeZoneHandling.Utc,
+                DateTimeZoneHandling = DateTimeZoneHandling.Utc,
-                            NullValueHandling = NullValueHandling.Ignore,
+                NullValueHandling = NullValueHandling.Ignore,
-                            Formatting = Formatting.Indented,
+                Formatting = Formatting.Indented,
-                            DefaultValueHandling = DefaultValueHandling.Include,
+                DefaultValueHandling = DefaultValueHandling.Include,
-                            ContractResolver = new CamelCasePropertyNamesContractResolver()
+                ContractResolver = new CamelCasePropertyNamesContractResolver()
-                        };
+            };
 
 
             SerializerSetting.Converters.Add(new StringEnumConverter { CamelCaseText = true });
@@ -34,12 +35,61 @@ namespace NzbDrone.Common.Serializer
 
         public static T Deserialize<T>(string json) where T : new()
         {
-            return JsonConvert.DeserializeObject<T>(json, SerializerSetting);
+            try
+            {
+                return JsonConvert.DeserializeObject<T>(json, SerializerSetting);
+            }
+            catch (JsonReaderException ex)
+            {
+                throw DetailedJsonReaderException(ex, json);
+            }
         }
 
         public static object Deserialize(string json, Type type)
         {
-            return JsonConvert.DeserializeObject(json, type, SerializerSetting);
+            try
+            {
+                return JsonConvert.DeserializeObject(json, type, SerializerSetting);
+            }
+            catch (JsonReaderException ex)
+            {
+                throw DetailedJsonReaderException(ex, json);
+            }
+        }
+
+        private static JsonReaderException DetailedJsonReaderException(JsonReaderException ex, string json)
+        {
+            var lineNumber = ex.LineNumber == 0 ? 0 : (ex.LineNumber - 1);
+            var linePosition = ex.LinePosition;
+
+            var lines = json.Split('\n');
+            if (lineNumber >= 0 && lineNumber < lines.Length &&
+                linePosition >= 0 && linePosition < lines[lineNumber].Length)
+            {
+                var line = lines[lineNumber];
+                var start = Math.Max(0, linePosition - 20);
+                var end = Math.Min(line.Length, linePosition + 20);
+
+                var snippetBefore = line.Substring(start, linePosition - start);
+                var snippetAfter = line.Substring(linePosition, end - linePosition);
+                var message = ex.Message + " (Json snippet '" + snippetBefore + "<--error-->" + snippetAfter + "')";
+
+                // Not risking updating JSON.net from 9.x to 10.x just to get this as public ctor.
+                var ctor = typeof(JsonReaderException).GetConstructor(BindingFlags.NonPublic | BindingFlags.Instance, null, new Type[] { typeof(string), typeof(Exception), typeof(string), typeof(int), typeof(int) }, null);
+                if (ctor != null)
+                {
+                    return (JsonReaderException)ctor.Invoke(new object[] { message, ex, ex.Path, ex.LineNumber, linePosition });
+                }
+
+                // JSON.net 10.x ctor in case we update later.
+                ctor = typeof(JsonReaderException).GetConstructor(BindingFlags.Public | BindingFlags.Instance, null, new Type[] { typeof(string), typeof(string), typeof(int), typeof(int), typeof(Exception) }, null);
+                if (ctor != null)
+                {
+                    return (JsonReaderException)ctor.Invoke(new object[] { message, ex.Path, ex.LineNumber, linePosition, ex });
+                }
+            }
+
+            return ex;
         }
 
         public static bool TryDeserialize<T>(string json, out T result) where T : new()
@@ -78,4 +128,4 @@ namespace NzbDrone.Common.Serializer
             Serialize(model, new StreamWriter(outputStream));
         }
     }
-}
+}

src/NzbDrone.Common/Serializer/UnderscoreStringEnumConverter.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Text;
+using Newtonsoft.Json;
+
+namespace NzbDrone.Common.Serializer
+{
+    public class UnderscoreStringEnumConverter : JsonConverter
+    {
+        public object UnknownValue { get; set; }
+
+        public UnderscoreStringEnumConverter(object unknownValue)
+        {
+            UnknownValue = unknownValue;
+        }
+
+        public override bool CanConvert(Type objectType)
+        {
+            return objectType.IsEnum;
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            var enumString = reader.Value.ToString().Replace("_", string.Empty);
+
+            try
+            {
+                return Enum.Parse(objectType, enumString, true);
+            }
+            catch
+            {
+                if (UnknownValue == null)
+                {
+                    throw;
+                }
+
+                return UnknownValue;
+            }
+        }
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            var enumText = value.ToString();
+            var builder = new StringBuilder(enumText.Length + 4);
+            builder.Append(char.ToLower(enumText[0]));
+            for (int i = 1; i < enumText.Length; i++)
+            {
+                if (char.IsUpper(enumText[i]))
+                {
+                    builder.Append('_');
+                }
+                builder.Append(char.ToLower(enumText[i]));
+            }
+            enumText = builder.ToString();
+
+            writer.WriteValue(enumText);
+        }
+    }
+}

src/NzbDrone.Common/packages.config

@@ -3,6 +3,6 @@
   <package id="DotNet4.SocksProxy" version="1.3.4.0" targetFramework="net40" />
   <package id="ICSharpCode.SharpZipLib.Patched" version="0.86.5" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net40" />
-  <package id="NLog" version="4.4.12" targetFramework="net40" />
+  <package id="NLog" version="4.5.3" targetFramework="net40" />
   <package id="SharpRaven" version="2.2.0" targetFramework="net40" />
 </packages>

src/NzbDrone.Console/ConsoleApp.cs

@@ -25,7 +25,15 @@ namespace NzbDrone.Console
             try
             {
                 var startupArgs = new StartupContext(args);
-                NzbDroneLogger.Register(startupArgs, false, true);
+                try
+                {
+                    NzbDroneLogger.Register(startupArgs, false, true);
+                }
+                catch (Exception ex)
+                {
+                    System.Console.WriteLine("NLog Exception: " + ex.ToString());
+                    throw;
+                }
                 Bootstrap.Start(startupArgs, new ConsoleAlerts());
             }
             catch (SonarrStartupException ex)

src/NzbDrone.Console/NzbDrone.Console.csproj

@@ -66,6 +66,7 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Owin, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Microsoft.Owin.2.1.0\lib\net40\Microsoft.Owin.dll</HintPath>
@@ -79,13 +80,19 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.5.3\lib\net40-client\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="Owin">
       <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
     </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\NzbDrone.Common\Properties\SharedAssemblyInfo.cs">

src/NzbDrone.Console/packages.config

@@ -3,6 +3,6 @@
   <package id="Microsoft.Owin" version="2.1.0" targetFramework="net40" />
   <package id="Microsoft.Owin.Hosting" version="2.1.0" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net40" />
-  <package id="NLog" version="4.4.12" targetFramework="net40" />
+  <package id="NLog" version="4.5.3" targetFramework="net40" />
   <package id="Owin" version="1.0" targetFramework="net40" />
 </packages>

src/NzbDrone.Core.Test/Datastore/Converters/BooleanIntConverterFixture.cs

@@ -0,0 +1,59 @@
+using System;
+using FluentAssertions;
+using Marr.Data.Converters;
+using NUnit.Framework;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.Datastore.Converters
+{
+    [TestFixture]
+    public class BooleanIntConverterFixture : CoreTest<Core.Datastore.Converters.BooleanIntConverter>
+    {
+        [TestCase(true, 1)]
+        [TestCase(false, 0)]
+        public void should_return_int_when_saving_boolean_to_db(bool input, int expected)
+        {
+            Subject.ToDB(input).Should().Be(expected);
+        }
+
+        [Test]
+        public void should_return_db_null_for_null_value_when_saving_to_db()
+        {
+            Subject.ToDB(null).Should().Be(DBNull.Value);
+        }
+
+        [TestCase(1, true)]
+        [TestCase(0, false)]
+        public void should_return_bool_when_getting_int_from_db(int input, bool expected)
+        {
+            var context = new ConverterContext
+                          {
+                              DbValue = (long)input
+                          };
+
+            Subject.FromDB(context).Should().Be(expected);
+        }
+
+        [Test]
+        public void should_return_db_null_for_null_value_when_getting_from_db()
+        {
+            var context = new ConverterContext
+                          {
+                              DbValue = DBNull.Value
+                          };
+
+            Subject.FromDB(context).Should().Be(DBNull.Value);
+        }
+
+        [Test]
+        public void should_throw_for_non_boolean_equivalent_number_value_when_getting_from_db()
+        {
+            var context = new ConverterContext
+                          {
+                              DbValue = (long)2
+                          };
+
+            Assert.Throws<ConversionException>(() => Subject.FromDB(context));
+        }
+    }
+}

src/NzbDrone.Core.Test/Datastore/Converters/CommandConverterFixture.cs

@@ -0,0 +1,64 @@
+using System;
+using System.Data;
+using FluentAssertions;
+using Marr.Data.Converters;
+using Moq;
+using NUnit.Framework;
+using NzbDrone.Common.Serializer;
+using NzbDrone.Core.Datastore.Converters;
+using NzbDrone.Core.Test.Framework;
+using NzbDrone.Core.Tv.Commands;
+
+namespace NzbDrone.Core.Test.Datastore.Converters
+{
+    [TestFixture]
+    public class CommandConverterFixture : CoreTest<CommandConverter>
+    {
+        [Test]
+        public void should_return_json_string_when_saving_boolean_to_db()
+        {
+            var command = new RefreshSeriesCommand();
+
+            Subject.ToDB(command).Should().BeOfType<string>();
+        }
+
+        [Test]
+        public void should_return_null_for_null_value_when_saving_to_db()
+        {
+            Subject.ToDB(null).Should().Be(null);
+        }
+
+        [Test]
+        public void should_return_db_null_for_db_null_value_when_saving_to_db()
+        {
+            Subject.ToDB(DBNull.Value).Should().Be(DBNull.Value);
+        }
+
+        [Test]
+        public void should_return_command_when_getting_json_from_db()
+        {
+            var dataRecordMock = new Mock<IDataRecord>();
+            dataRecordMock.Setup(s => s.GetOrdinal("Name")).Returns(0);
+            dataRecordMock.Setup(s => s.GetString(0)).Returns("RefreshSeries");
+
+            var context = new ConverterContext
+                          {
+                              DataRecord = dataRecordMock.Object,
+                              DbValue = new RefreshSeriesCommand().ToJson()
+                          };
+
+            Subject.FromDB(context).Should().BeOfType<RefreshSeriesCommand>();
+        }
+
+        [Test]
+        public void should_return_null_for_null_value_when_getting_from_db()
+        {
+            var context = new ConverterContext
+                          {
+                              DbValue = DBNull.Value
+                          };
+
+            Subject.FromDB(context).Should().Be(null);
+        }
+    }
+}

src/NzbDrone.Core.Test/Datastore/Converters/DoubleConverterFixture.cs

@@ -0,0 +1,70 @@
+using System;
+using FluentAssertions;
+using Marr.Data.Converters;
+using NUnit.Framework;
+using NzbDrone.Core.Datastore.Converters;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.Datastore.Converters
+{
+    [TestFixture]
+    public class DoubleConverterFixture : CoreTest<DoubleConverter>
+    {
+        [Test]
+        public void should_return_double_when_saving_double_to_db()
+        {
+            var input = 10.5D;
+
+            Subject.ToDB(input).Should().Be(input);
+        }
+
+        [Test]
+        public void should_return_null_for_null_value_when_saving_to_db()
+        {
+            Subject.ToDB(null).Should().Be(null);
+        }
+
+        [Test]
+        public void should_return_db_null_for_db_null_value_when_saving_to_db()
+        {
+            Subject.ToDB(DBNull.Value).Should().Be(DBNull.Value);
+        }
+
+        [Test]
+        public void should_return_double_when_getting_double_from_db()
+        {
+            var expected = 10.5D;
+
+            var context = new ConverterContext
+                          {
+                              DbValue = expected
+                          };
+
+            Subject.FromDB(context).Should().Be(expected);
+        }
+
+        [Test]
+        public void should_return_double_when_getting_string_from_db()
+        {
+            var expected = 10.5D;
+
+            var context = new ConverterContext
+                          {
+                              DbValue = $"{expected}"
+                          };
+
+            Subject.FromDB(context).Should().Be(expected);
+        }
+
+        [Test]
+        public void should_return_null_for_null_value_when_getting_from_db()
+        {
+            var context = new ConverterContext
+                          {
+                              DbValue = DBNull.Value
+                          };
+
+            Subject.FromDB(context).Should().Be(DBNull.Value);
+        }
+    }
+}

src/NzbDrone.Core.Test/Datastore/Converters/EnumIntConverterFixture.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Reflection;
+using FluentAssertions;
+using Marr.Data.Converters;
+using Marr.Data.Mapping;
+using Moq;
+using NUnit.Framework;
+using NzbDrone.Core.Test.Framework;
+using NzbDrone.Core.Tv;
+
+namespace NzbDrone.Core.Test.Datastore.Converters
+{
+    [TestFixture]
+    public class EnumIntConverterFixture : CoreTest<Core.Datastore.Converters.EnumIntConverter>
+    {
+        [Test]
+        public void should_return_int_when_saving_enum_to_db()
+        {
+            Subject.ToDB(SeriesTypes.Standard).Should().Be((int)SeriesTypes.Standard);
+        }
+
+        [Test]
+        public void should_return_db_null_for_null_value_when_saving_to_db()
+        {
+            Subject.ToDB(null).Should().Be(DBNull.Value);
+        }
+
+        [Test]
+        public void should_return_enum_when_getting_int_from_db()
+        {
+            var mockMemberInfo = new Mock<MemberInfo>();
+            mockMemberInfo.SetupGet(s => s.DeclaringType).Returns(typeof(Series));
+            mockMemberInfo.SetupGet(s => s.Name).Returns("SeriesType");
+
+            var expected = SeriesTypes.Standard;
+
+            var context = new ConverterContext
+                          {
+                              ColumnMap = new ColumnMap(mockMemberInfo.Object) { FieldType = typeof(SeriesTypes) },
+                              DbValue = (long)expected
+                          };
+
+            Subject.FromDB(context).Should().Be(expected);
+        }
+
+        [Test]
+        public void should_return_null_for_null_value_when_getting_from_db()
+        {
+            var context = new ConverterContext
+                          {
+                              DbValue = DBNull.Value
+                          };
+
+            Subject.FromDB(context).Should().Be(null);
+        }
+    }
+}

src/NzbDrone.Core.Test/Datastore/Converters/GuidConverterFixture.cs

@@ -0,0 +1,51 @@
+using System;
+using FluentAssertions;
+using Marr.Data.Converters;
+using NUnit.Framework;
+using NzbDrone.Core.Datastore.Converters;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.Datastore.Converters
+{
+    [TestFixture]
+    public class GuidConverterFixture : CoreTest<GuidConverter>
+    {
+        [Test]
+        public void should_return_string_when_saving_guid_to_db()
+        {
+            var guid = Guid.NewGuid();
+
+            Subject.ToDB(guid).Should().Be(guid.ToString());
+        }
+
+        [Test]
+        public void should_return_db_null_for_null_value_when_saving_to_db()
+        {
+            Subject.ToDB(null).Should().Be(DBNull.Value);
+        }
+
+        [Test]
+        public void should_return_guid_when_getting_string_from_db()
+        {
+            var guid = Guid.NewGuid();
+
+            var context = new ConverterContext
+                          {
+                              DbValue = guid.ToString()
+                          };
+
+            Subject.FromDB(context).Should().Be(guid);
+        }
+
+        [Test]
+        public void should_return_empty_guid_for_db_null_value_when_getting_from_db()
+        {
+            var context = new ConverterContext
+                          {
+                              DbValue = DBNull.Value
+                          };
+
+            Subject.FromDB(context).Should().Be(Guid.Empty);
+        }
+    }
+}

src/NzbDrone.Core.Test/Datastore/Converters/Int32ConverterFixture.cs

@@ -0,0 +1,58 @@
+using System;
+using FluentAssertions;
+using Marr.Data.Converters;
+using NUnit.Framework;
+using NzbDrone.Core.Datastore.Converters;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.Datastore.Converters
+{
+    [TestFixture]
+    public class Int32ConverterFixture : CoreTest<Int32Converter>
+    {
+        [Test]
+        public void should_return_int_when_saving_int_to_db()
+        {
+            var i = 5;
+
+            Subject.ToDB(5).Should().Be(5);
+        }
+
+        [Test]
+        public void should_return_int_when_getting_int_from_db()
+        {
+            var i = 5;
+
+            var context = new ConverterContext
+                          {
+                              DbValue = i
+                          };
+
+            Subject.FromDB(context).Should().Be(i);
+        }
+
+        [Test]
+        public void should_return_int_when_getting_string_from_db()
+        {
+            var i = 5;
+
+            var context = new ConverterContext
+                          {
+                              DbValue = i.ToString()
+                          };
+
+            Subject.FromDB(context).Should().Be(i);
+        }
+
+        [Test]
+        public void should_return_db_null_for_db_null_value_when_getting_from_db()
+        {
+            var context = new ConverterContext
+                          {
+                              DbValue = DBNull.Value
+                          };
+
+            Subject.FromDB(context).Should().Be(DBNull.Value);
+        }
+    }
+}

src/NzbDrone.Core.Test/Datastore/Converters/OsPathConverterFixture.cs

@@ -0,0 +1,49 @@
+using System;
+using FluentAssertions;
+using Marr.Data.Converters;
+using NUnit.Framework;
+using NzbDrone.Common.Disk;
+using NzbDrone.Core.Datastore.Converters;
+using NzbDrone.Core.Test.Framework;
+using NzbDrone.Test.Common;
+
+namespace NzbDrone.Core.Test.Datastore.Converters
+{
+    [TestFixture]
+    public class OsPathConverterFixture : CoreTest<OsPathConverter>
+    {
+        [Test]
+        public void should_return_string_when_saving_os_path_to_db()
+        {
+            var path = @"C:\Test\TV".AsOsAgnostic();
+            var osPath = new OsPath(path);
+
+            Subject.ToDB(osPath).Should().Be(path);
+        }
+
+        [Test]
+        public void should_return_os_path_when_getting_string_from_db()
+        {
+            var path = @"C:\Test\TV".AsOsAgnostic();
+            var osPath = new OsPath(path);
+
+            var context = new ConverterContext
+                          {
+                              DbValue = path
+                          };
+
+            Subject.FromDB(context).Should().Be(osPath);
+        }
+
+        [Test]
+        public void should_return_db_null_for_db_null_value_when_getting_from_db()
+        {
+            var context = new ConverterContext
+                          {
+                              DbValue = DBNull.Value
+                          };
+
+            Subject.FromDB(context).Should().Be(DBNull.Value);
+        }
+    }
+}

src/NzbDrone.Core.Test/Datastore/Converters/QualityIntConverterFixture.cs

@@ -0,0 +1,58 @@
+using System;
+using FluentAssertions;
+using Marr.Data.Converters;
+using NUnit.Framework;
+using NzbDrone.Core.Datastore.Converters;
+using NzbDrone.Core.Qualities;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.Datastore.Converters
+{
+    [TestFixture]
+    public class QualityIntConverterFixture : CoreTest<QualityIntConverter>
+    {
+        [Test]
+        public void should_return_int_when_saving_quality_to_db()
+        {
+            var quality = Quality.Bluray1080p;
+
+            Subject.ToDB(quality).Should().Be(quality.Id);
+        }
+
+        [Test]
+        public void should_return_0_when_saving_db_null_to_db()
+        {
+            Subject.ToDB(DBNull.Value).Should().Be(0);
+        }
+
+        [Test]
+        public void should_throw_when_saving_another_object_to_db()
+        {
+            Assert.Throws<InvalidOperationException>(() => Subject.ToDB("Not a quality"));
+        }
+
+        [Test]
+        public void should_return_quality_when_getting_string_from_db()
+        {
+            var quality = Quality.Bluray1080p;
+
+            var context = new ConverterContext
+                          {
+                              DbValue = quality.Id
+                          };
+
+            Subject.FromDB(context).Should().Be(quality);
+        }
+
+        [Test]
+        public void should_return_db_null_for_db_null_value_when_getting_from_db()
+        {
+            var context = new ConverterContext
+                          {
+                              DbValue = DBNull.Value
+                          };
+
+            Subject.FromDB(context).Should().Be(Quality.Unknown);
+        }
+    }
+}

src/NzbDrone.Core.Test/Datastore/Converters/TimeSpanConverterFixture.cs

@@ -0,0 +1,65 @@
+using System;
+using System.Globalization;
+using FluentAssertions;
+using Marr.Data.Converters;
+using NUnit.Framework;
+using NzbDrone.Core.Datastore.Converters;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.Datastore.Converters
+{
+    [TestFixture]
+    public class TimeSpanConverterFixture : CoreTest<TimeSpanConverter>
+    {
+        [Test]
+        public void should_return_string_when_saving_timespan_to_db()
+        {
+            var timeSpan = TimeSpan.FromMinutes(5);
+
+            Subject.ToDB(timeSpan).Should().Be(timeSpan.ToString("c", CultureInfo.InvariantCulture));
+        }
+
+        [Test]
+        public void should_return_null_when_saving_empty_string_to_db()
+        {
+            Subject.ToDB("").Should().Be(null);
+        }
+
+        [Test]
+        public void should_return_time_span_when_getting_time_span_from_db()
+        {
+            var timeSpan = TimeSpan.FromMinutes(5);
+
+            var context = new ConverterContext
+                          {
+                              DbValue = timeSpan
+                          };
+
+            Subject.FromDB(context).Should().Be(timeSpan);
+        }
+
+        [Test]
+        public void should_return_time_span_when_getting_string_from_db()
+        {
+            var timeSpan = TimeSpan.FromMinutes(5);
+
+            var context = new ConverterContext
+                          {
+                              DbValue = timeSpan.ToString("c", CultureInfo.InvariantCulture)
+                          };
+
+            Subject.FromDB(context).Should().Be(timeSpan);
+        }
+
+        [Test]
+        public void should_return_time_span_zero_for_db_null_value_when_getting_from_db()
+        {
+            var context = new ConverterContext
+                          {
+                              DbValue = DBNull.Value
+                          };
+
+            Subject.FromDB(context).Should().Be(TimeSpan.Zero);
+        }
+    }
+}

src/NzbDrone.Core.Test/Datastore/Converters/UtcConverterFixture.cs

@@ -0,0 +1,51 @@
+using System;
+using FluentAssertions;
+using Marr.Data.Converters;
+using NUnit.Framework;
+using NzbDrone.Core.Datastore.Converters;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.Datastore.Converters
+{
+    [TestFixture]
+    public class UtcConverterFixture : CoreTest<UtcConverter>
+    {
+        [Test]
+        public void should_return_date_time_when_saving_date_time_to_db()
+        {
+            var dateTime = DateTime.Now;
+
+            Subject.ToDB(dateTime).Should().Be(dateTime.ToUniversalTime());
+        }
+
+        [Test]
+        public void should_return_db_null_when_saving_db_null_to_db()
+        {
+            Subject.ToDB(DBNull.Value).Should().Be(DBNull.Value);
+        }
+
+        [Test]
+        public void should_return_time_span_when_getting_time_span_from_db()
+        {
+            var dateTime = DateTime.Now.ToUniversalTime();
+
+            var context = new ConverterContext
+                          {
+                              DbValue = dateTime
+            };
+
+            Subject.FromDB(context).Should().Be(dateTime);
+        }
+
+        [Test]
+        public void should_return_db_null_for_db_null_value_when_getting_from_db()
+        {
+            var context = new ConverterContext
+                          {
+                              DbValue = DBNull.Value
+                          };
+
+            Subject.FromDB(context).Should().Be(DBNull.Value);
+        }
+    }
+}

src/NzbDrone.Core.Test/Datastore/Migration/121_update_animetosho_urlFixture.cs

@@ -0,0 +1,41 @@
+using System.Linq;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Common.Serializer;
+using NzbDrone.Core.Datastore.Migration;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.Datastore.Migration
+{
+    [TestFixture]
+    public class update_animetosho_urlFixture : MigrationTest<update_animetosho_url>
+    {
+        [TestCase("Newznab", "https://animetosho.org")]
+        [TestCase("Newznab", "http://animetosho.org")]
+        [TestCase("Torznab", "https://animetosho.org")]
+        [TestCase("Torznab", "http://animetosho.org")]
+        public void should_replace_old_url(string impl, string baseUrl)
+        {
+            var db = WithMigrationTestDb(c =>
+            {
+                c.Insert.IntoTable("Indexers").Row(new
+                {
+                    Name = "AnimeTosho",
+                    Implementation = impl,
+                    Settings = new NewznabSettings121
+                    {
+                        BaseUrl = baseUrl,
+                        ApiPath = "/feed/nabapi"
+
+                    }.ToJson(),
+                    ConfigContract = impl + "Settings"
+                });
+            });
+
+            var items = db.Query<IndexerDefinition90>("SELECT * FROM Indexers");
+
+            items.Should().HaveCount(1);
+            items.First().Settings.ToObject<NewznabSettings121>().BaseUrl.Should().Be(baseUrl.Replace("animetosho", "feed.animetosho"));
+        }
+    }
+}

src/NzbDrone.Core.Test/DecisionEngineTests/AlreadyImportedSpecificationFixture.cs

@@ -0,0 +1,163 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using FizzWare.NBuilder;
+using FluentAssertions;
+using Moq;
+using NUnit.Framework;
+using NzbDrone.Core.Configuration;
+using NzbDrone.Core.History;
+using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.Qualities;
+using NzbDrone.Core.Tv;
+using NzbDrone.Core.DecisionEngine.Specifications;
+using NzbDrone.Core.Indexers;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.DecisionEngineTests
+{
+    [TestFixture]
+    public class AlreadyImportedSpecificationFixture : CoreTest<AlreadyImportedSpecification>
+    {
+        private const int FIRST_EPISODE_ID = 1;
+        private const string TITLE = "Series.Title.S01E01.720p.HDTV.x264-Sonarr";
+
+        private Series _series;
+        private QualityModel _hdtv720p;
+        private QualityModel _hdtv1080p;
+        private RemoteEpisode _remoteEpisode;
+        private List<History.History> _history;
+
+        [SetUp]
+        public void Setup()
+        {
+            var singleEpisodeList = new List<Episode>
+                                    {
+                                        new Episode
+                                        {
+                                            Id = FIRST_EPISODE_ID,
+                                            SeasonNumber = 12,
+                                            EpisodeNumber = 3,
+                                            EpisodeFileId = 1
+                                        }
+                                    };
+
+            _series = Builder<Series>.CreateNew()
+                                     .Build();
+
+            _hdtv720p = new QualityModel(Quality.HDTV720p, new Revision(version: 1));
+            _hdtv1080p = new QualityModel(Quality.HDTV1080p, new Revision(version: 1));
+
+            _remoteEpisode = new RemoteEpisode
+            {
+                Series = _series,
+                ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = _hdtv720p },
+                Episodes = singleEpisodeList,
+                Release = Builder<ReleaseInfo>.CreateNew()
+                                              .Build()
+            };
+
+            _history = new List<History.History>();
+
+            Mocker.GetMock<IConfigService>()
+                  .SetupGet(s => s.EnableCompletedDownloadHandling)
+                  .Returns(true);
+
+            Mocker.GetMock<IHistoryService>()
+                  .Setup(s => s.FindByEpisodeId(It.IsAny<int>()))
+                  .Returns(_history);
+        }
+
+        private void GivenCdhDisabled()
+        {
+            Mocker.GetMock<IConfigService>()
+                  .SetupGet(s => s.EnableCompletedDownloadHandling)
+                  .Returns(false);
+        }
+
+        private void GivenHistoryItem(string downloadId, string sourceTitle, QualityModel quality, HistoryEventType eventType)
+        {
+            _history.Add(new History.History
+                         {
+                             DownloadId = downloadId,
+                             SourceTitle = sourceTitle,
+                             Quality = quality,
+                             Date = DateTime.UtcNow,
+                             EventType = eventType
+                         });
+        }
+
+        [Test]
+        public void should_be_accepted_if_CDH_is_disabled()
+        {
+            GivenCdhDisabled();
+
+            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_be_accepted_if_episode_does_not_have_a_file()
+        {
+            _remoteEpisode.Episodes.First().EpisodeFileId = 0;
+
+            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_be_accepted_if_episode_does_not_have_grabbed_event()
+        {
+            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_be_accepted_if_episode_does_not_have_imported_event()
+        {
+            GivenHistoryItem(Guid.NewGuid().ToString().ToUpper(), TITLE, _hdtv720p, HistoryEventType.Grabbed);
+
+            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_be_accepted_if_grabbed_and_imported_quality_is_the_same()
+        {
+            var downloadId = Guid.NewGuid().ToString().ToUpper();
+
+            GivenHistoryItem(downloadId, TITLE, _hdtv720p, HistoryEventType.Grabbed);
+            GivenHistoryItem(downloadId, TITLE, _hdtv720p, HistoryEventType.DownloadFolderImported);
+
+            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_be_rejected_if_grabbed_download_id_matches_release_torrent_hash()
+        {
+            var downloadId = Guid.NewGuid().ToString().ToUpper();
+
+            GivenHistoryItem(downloadId, TITLE, _hdtv720p, HistoryEventType.Grabbed);
+            GivenHistoryItem(downloadId, TITLE, _hdtv1080p, HistoryEventType.DownloadFolderImported);
+
+            _remoteEpisode.Release = Builder<TorrentInfo>.CreateNew()
+                                                         .With(t => t.DownloadProtocol = DownloadProtocol.Torrent)
+                                                         .With(t => t.InfoHash = downloadId)
+                                                         .Build();
+
+            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeFalse();
+        }
+
+        [Test]
+        public void should_be_rejected_if_release_title_matches_grabbed_event_source_title()
+        {
+            var downloadId = Guid.NewGuid().ToString().ToUpper();
+
+            GivenHistoryItem(downloadId, TITLE, _hdtv720p, HistoryEventType.Grabbed);
+            GivenHistoryItem(downloadId, TITLE, _hdtv1080p, HistoryEventType.DownloadFolderImported);
+
+            _remoteEpisode.Release = Builder<TorrentInfo>.CreateNew()
+                                                         .With(t => t.DownloadProtocol = DownloadProtocol.Torrent)
+                                                         .With(t => t.InfoHash = downloadId)
+                                                         .Build();
+
+            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeFalse();
+        }
+    }
+}

src/NzbDrone.Core.Test/DecisionEngineTests/MaximumSizeSpecificationFixture.cs

@@ -0,0 +1,75 @@
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.Configuration;
+using NzbDrone.Core.DecisionEngine.Specifications;
+using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.DecisionEngineTests
+{
+    public class MaximumSizeSpecificationFixture : CoreTest<MaximumSizeSpecification>
+    {
+        private RemoteEpisode _remoteEpisode;
+
+        [SetUp]
+        public void Setup()
+        {
+            _remoteEpisode = new RemoteEpisode() { Release = new ReleaseInfo() };
+        }
+
+        private void WithMaximumSize(int size)
+        {
+            Mocker.GetMock<IConfigService>().SetupGet(c => c.MaximumSize).Returns(size);
+        }
+
+        private void WithSize(int size)
+        {
+            _remoteEpisode.Release.Size = size * 1024 * 1024;
+        }
+
+        [Test]
+        public void should_return_true_when_maximum_size_is_set_to_zero()
+        {
+            WithMaximumSize(0);
+            WithSize(1000);
+
+            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_return_true_when_size_is_smaller_than_maximum_size()
+        {
+            WithMaximumSize(2000);
+            WithSize(1999);
+
+            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_return_true_when_size_is_equals_to_maximum_size()
+        {
+            WithMaximumSize(2000);
+            WithSize(2000);
+
+            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_return_false_when_size_is_bigger_than_maximum_size()
+        {
+            WithMaximumSize(2000);
+            WithSize(2001);
+
+            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeFalse();
+        }
+
+        [Test]
+        public void should_return_true_when_size_is_zero()
+        {
+            WithMaximumSize(2000);
+            WithSize(0);
+
+            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
+        }
+    }
+}

src/NzbDrone.Core.Test/DecisionEngineTests/ReleaseRestrictionsSpecificationFixture.cs

@@ -29,6 +29,8 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                                              Title = "Dexter.S08E01.EDITED.WEBRip.x264-KYR"
                                          }
                            };
+
+            Mocker.SetConstant<ITermMatcher>(Mocker.Resolve<TermMatcher>());
         }
 
         private void GivenRestictions(string required, string ignored)
@@ -123,5 +125,16 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
             Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeFalse();
         }
+
+        [TestCase("/WEB/", true)]
+        [TestCase("/WEB\b/", false)]
+        [TestCase("/WEb/", false)]
+        [TestCase(@"/\.WEB/", true)]
+        public void should_match_perl_regex(string pattern, bool expected)
+        {
+            GivenRestictions(pattern, null);
+
+            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().Be(expected);
+        }
     }
 }

src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/HistorySpecificationFixture.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using FizzWare.NBuilder;
 using FluentAssertions;
@@ -16,7 +16,7 @@ using NzbDrone.Core.DecisionEngine;
 
 using NzbDrone.Core.Test.Framework;
 
-namespace NzbDrone.Core.Test.DecisionEngineTests
+namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
 {
     [TestFixture]
     public class HistorySpecificationFixture : CoreTest<HistorySpecification>

src/NzbDrone.Core.Test/DecisionEngineTests/Search/TorrentSeedingSpecificationFixture.cs

@@ -1,12 +1,11 @@
-using FizzWare.NBuilder;
+using FizzWare.NBuilder;
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Core.Datastore;
-using NzbDrone.Core.DecisionEngine.Specifications.Search;
+using NzbDrone.Core.DecisionEngine.Specifications;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Indexers.TorrentRss;
-using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Tv;
 using NzbDrone.Test.Common;

src/NzbDrone.Core.Test/DiskSpace/DiskSpaceServiceFixture.cs

@@ -137,6 +137,7 @@ namespace NzbDrone.Core.Test.DiskSpace
         [TestCase("/var/lib/kubelet")]
         [TestCase("/var/lib/docker")]
         [TestCase("/some/place/docker/aufs")]
+        [TestCase("/etc/network")]
         public void should_not_check_diskspace_for_irrelevant_mounts(string path)
         {
             var mount = new Mock<IMount>();

src/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/DownloadApprovedFixture.cs

@@ -212,7 +212,7 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests
             decisions.Add(new DownloadDecision(remoteEpisode, new Rejection("Failure!", RejectionType.Temporary)));
 
             Subject.ProcessDecisions(decisions);
-            Mocker.GetMock<IPendingReleaseService>().Verify(v => v.Add(It.IsAny<DownloadDecision>(), It.IsAny<PendingReleaseReason>()), Times.Never());
+            Mocker.GetMock<IPendingReleaseService>().Verify(v => v.AddMany(It.IsAny<List<Tuple<DownloadDecision, PendingReleaseReason>>>()), Times.Never());
         }
 
         [Test]
@@ -226,7 +226,7 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests
             decisions.Add(new DownloadDecision(remoteEpisode, new Rejection("Failure!", RejectionType.Temporary)));
 
             Subject.ProcessDecisions(decisions);
-            Mocker.GetMock<IPendingReleaseService>().Verify(v => v.Add(It.IsAny<DownloadDecision>(), It.IsAny<PendingReleaseReason>()), Times.Exactly(2));
+            Mocker.GetMock<IPendingReleaseService>().Verify(v => v.AddMany(It.IsAny<List<Tuple<DownloadDecision, PendingReleaseReason>>>()), Times.Once());
         }
 
         [Test]

src/NzbDrone.Core.Test/Download/DownloadClientStatusServiceFixture.cs

@@ -1,8 +1,9 @@
-using System;
+using System;
 using System.Linq;
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.Test.Framework;
 
@@ -16,6 +17,10 @@ namespace NzbDrone.Core.Test.Download
         public void SetUp()
         {
             _epoch = DateTime.UtcNow;
+
+            Mocker.GetMock<IRuntimeInfo>()
+                .SetupGet(v => v.StartTime)
+                .Returns(_epoch - TimeSpan.FromHours(1));
         }
 
         private DownloadClientStatus WithStatus(DownloadClientStatus status)

src/NzbDrone.Core.Test/Download/DownloadClientTests/DelugeTests/DelugeFixture.cs

@@ -290,6 +290,24 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DelugeTests
             item.CanBeRemoved.Should().Be(canBeRemoved);
         }
 
+        [Test]
+        public void GetItems_should_ignore_items_without_hash()
+        {
+            _downloading.Hash = null;
+
+            GivenTorrents(new List<DelugeTorrent>
+                {
+                    _downloading,
+                    _queued
+                });
+
+            var items = Subject.GetItems();
+
+            items.Should().HaveCount(1);
+
+            items.First().Status.Should().Be(DownloadItemStatus.Queued);
+        }
+
         [Test]
         public void should_return_status_with_outputdirs()
         {

src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/DownloadStationsTaskStatusJsonConverterFixture.cs

@@ -0,0 +1,49 @@
+using FluentAssertions;
+using Newtonsoft.Json;
+using NUnit.Framework;
+using NzbDrone.Core.Download.Clients.DownloadStation;
+
+namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
+{
+    [TestFixture]
+    public class DownloadStationsTaskStatusJsonConverterFixture
+    {
+        [TestCase("captcha_needed", DownloadStationTaskStatus.CaptchaNeeded)]
+        [TestCase("filehosting_waiting", DownloadStationTaskStatus.FilehostingWaiting)]
+        [TestCase("hash_checking", DownloadStationTaskStatus.HashChecking)]
+        [TestCase("error", DownloadStationTaskStatus.Error)]
+        [TestCase("downloading", DownloadStationTaskStatus.Downloading)]
+        public void should_parse_enum_correctly(string value, DownloadStationTaskStatus expected)
+        {
+            var task = "{\"Status\": \"" + value + "\"}";
+
+            var item = JsonConvert.DeserializeObject<DownloadStationTask>(task);
+
+            item.Status.Should().Be(expected);
+        }
+
+        [TestCase("captcha_needed", DownloadStationTaskStatus.CaptchaNeeded)]
+        [TestCase("filehosting_waiting", DownloadStationTaskStatus.FilehostingWaiting)]
+        [TestCase("hash_checking", DownloadStationTaskStatus.HashChecking)]
+        [TestCase("error", DownloadStationTaskStatus.Error)]
+        [TestCase("downloading", DownloadStationTaskStatus.Downloading)]
+        public void should_serialize_enum_correctly(string expected, DownloadStationTaskStatus value)
+        {
+            var task = new DownloadStationTask { Status = value };
+
+            var item = JsonConvert.SerializeObject(task);
+
+            item.Should().Contain(expected);
+        }
+
+        [Test]
+        public void should_return_unknown_if_unknown_enum_value()
+        {
+            var task = "{\"Status\": \"some_unknown_value\"}";
+
+            var item = JsonConvert.DeserializeObject<DownloadStationTask>(task);
+
+            item.Status.Should().Be(DownloadStationTaskStatus.Unknown);
+        }
+    }
+}

src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/TorrentDownloadStationFixture.cs

@@ -73,6 +73,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
                     Transfer = new Dictionary<string, string>
                     {
                         { "size_downloaded", "0"},
+                        { "size_uploaded", "0"},
                         { "speed_download", "0" }
                     }
                 }
@@ -96,6 +97,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
                     Transfer = new Dictionary<string, string>
                     {
                         { "size_downloaded", "1000"},
+                        { "size_uploaded", "100"},
                         { "speed_download", "0" }
                     },
                 }
@@ -119,6 +121,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
                     Transfer = new Dictionary<string, string>
                     {
                         { "size_downloaded", "1000"},
+                        { "size_uploaded", "100"},
                         { "speed_download", "0" }
                     }
                 }
@@ -142,6 +145,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
                     Transfer = new Dictionary<string, string>
                     {
                         { "size_downloaded", "100"},
+                        { "size_uploaded", "10"},
                         { "speed_download", "50" }
                     }
                 }
@@ -165,6 +169,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
                     Transfer = new Dictionary<string, string>
                     {
                         { "size_downloaded", "10"},
+                        { "size_uploaded", "1"},
                         { "speed_download", "0" }
                     }
                 }
@@ -188,6 +193,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
                     Transfer = new Dictionary<string, string>
                     {
                         { "size_downloaded", "1000"},
+                        { "size_uploaded", "100"},
                         { "speed_download", "0" }
                     }
                 }
@@ -211,6 +217,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
                     Transfer = new Dictionary<string, string>
                     {
                         { "size_downloaded", "1000"},
+                        { "size_uploaded", "100"},
                         { "speed_download", "0" }
                     }
                 }
@@ -234,6 +241,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
                     Transfer = new Dictionary<string, string>
                     {
                         { "size_downloaded", "1000"},
+                        { "size_uploaded", "100"},
                         { "speed_download", "0" }
                     }
                 }
@@ -257,6 +265,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
                     Transfer = new Dictionary<string, string>
                     {
                         { "size_downloaded", "1000"},
+                        { "size_uploaded", "100"},
                         { "speed_download", "0" }
                     }
                 }
@@ -605,9 +614,12 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
         [TestCase(DownloadStationTaskStatus.Finished, DownloadItemStatus.Completed)]
         [TestCase(DownloadStationTaskStatus.Finishing, DownloadItemStatus.Downloading)]
         [TestCase(DownloadStationTaskStatus.HashChecking, DownloadItemStatus.Downloading)]
+        [TestCase(DownloadStationTaskStatus.CaptchaNeeded, DownloadItemStatus.Downloading)]
         [TestCase(DownloadStationTaskStatus.Paused, DownloadItemStatus.Paused)]
         [TestCase(DownloadStationTaskStatus.Seeding, DownloadItemStatus.Completed)]
+        [TestCase(DownloadStationTaskStatus.FilehostingWaiting, DownloadItemStatus.Queued)]
         [TestCase(DownloadStationTaskStatus.Waiting, DownloadItemStatus.Queued)]
+        [TestCase(DownloadStationTaskStatus.Unknown, DownloadItemStatus.Queued)]
         public void GetItems_should_return_item_as_downloadItemStatus(DownloadStationTaskStatus apiStatus, DownloadItemStatus expectedItemStatus)
         {
             GivenSerialNumber();

src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/UsenetDownloadStationFixture.cs

@@ -414,8 +414,12 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
         [TestCase(DownloadStationTaskStatus.Finished, DownloadItemStatus.Completed)]
         [TestCase(DownloadStationTaskStatus.Finishing, DownloadItemStatus.Downloading)]
         [TestCase(DownloadStationTaskStatus.HashChecking, DownloadItemStatus.Downloading)]
+        [TestCase(DownloadStationTaskStatus.CaptchaNeeded, DownloadItemStatus.Downloading)]
         [TestCase(DownloadStationTaskStatus.Paused, DownloadItemStatus.Paused)]
+        [TestCase(DownloadStationTaskStatus.Seeding, DownloadItemStatus.Completed)]
+        [TestCase(DownloadStationTaskStatus.FilehostingWaiting, DownloadItemStatus.Queued)]
         [TestCase(DownloadStationTaskStatus.Waiting, DownloadItemStatus.Queued)]
+        [TestCase(DownloadStationTaskStatus.Unknown, DownloadItemStatus.Queued)]
         public void GetItems_should_return_item_as_downloadItemStatus(DownloadStationTaskStatus apiStatus, DownloadItemStatus expectedItemStatus)
         {
             GivenSerialNumber();

src/NzbDrone.Core.Test/Download/DownloadClientTests/QBittorrentTests/QBittorrentFixture.cs

@@ -162,6 +162,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
         [TestCase("uploading")]
         [TestCase("stalledUP")]
         [TestCase("checkingUP")]
+        [TestCase("forcedUP")]
         public void completed_item_should_have_required_properties(string state)
         {
             var torrent = new QBittorrentTorrent
@@ -494,5 +495,18 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
             var item = Subject.GetItems().Single();
             item.Category.Should().Be(category);
         }
+
+        [Test]
+        public void should_handle_eta_biginteger()
+        {
+            // Let this stand as a lesson to never write temporary unit tests on your dev machine and claim it works.
+            // Commit the tests and let it run with the official build on the official build agents.
+            // (Also don't replace library versions in your build script)
+
+            var json = "{ \"eta\": 18446744073709335000 }";
+            var torrent = Newtonsoft.Json.JsonConvert.DeserializeObject<QBittorrentTorrent>(json);
+            torrent.Eta.ToString().Should().Be("18446744073709335000");
+
+        }
     }
 }

src/NzbDrone.Core.Test/Download/DownloadServiceFixture.cs

@@ -205,18 +205,26 @@ namespace NzbDrone.Core.Test.Download
         }
 
         [Test]
-        public void should_not_attempt_download_if_client_is_disabled()
+        public void should_attempt_download_even_if_client_is_disabled()
         {
-            WithUsenetClient();
+            var mockUsenet = WithUsenetClient();
 
             Mocker.GetMock<IDownloadClientStatusService>()
-                  .Setup(v => v.IsDisabled(It.IsAny<int>()))
+                  .Setup(v => v.GetBlockedProviders())
-                  .Returns(true);
+                  .Returns(new List<DownloadClientStatus>
+                  {
+                      new DownloadClientStatus
+                      {
+                          ProviderId = _downloadClients.First().Definition.Id,
+                          DisabledTill = DateTime.UtcNow.AddHours(3)
+                      }
+                  });
 
-            Assert.Throws<DownloadClientUnavailableException>(() => Subject.DownloadReport(_parseResult));
+            Subject.DownloadReport(_parseResult);
 
-            Mocker.GetMock<IDownloadClient>().Verify(c => c.Download(It.IsAny<RemoteEpisode>()), Times.Never());
+            Mocker.GetMock<IDownloadClientStatusService>().Verify(c => c.GetBlockedProviders(), Times.Never());
-            VerifyEventNotPublished<EpisodeGrabbedEvent>();
+            mockUsenet.Verify(c => c.Download(It.IsAny<RemoteEpisode>()), Times.Once());
+            VerifyEventPublished<EpisodeGrabbedEvent>();
         }
 
         [Test]

src/NzbDrone.Core.Test/Download/NzbValidationServiceFixture.cs

@@ -0,0 +1,43 @@
+using System.IO;
+using NUnit.Framework;
+using NzbDrone.Core.Download;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.Download
+{
+    [TestFixture]
+    public class NzbValidationServiceFixture : CoreTest<NzbValidationService>
+    {
+        private byte[] GivenNzbFile(string name)
+        {
+            return File.ReadAllBytes(GetTestPath("Files/Nzbs/" + name + ".nzb"));
+        }
+
+        [Test]
+        public void should_throw_on_invalid_nzb()
+        {
+            var filename = "NotNzb";
+            var fileContent = GivenNzbFile(filename);
+
+            Assert.Throws<InvalidNzbException>(() => Subject.Validate(filename, fileContent));
+        }
+
+        [Test]
+        public void should_throw_when_no_files()
+        {
+            var filename = "NoFiles";
+            var fileContent = GivenNzbFile(filename);
+
+            Assert.Throws<InvalidNzbException>(() => Subject.Validate(filename, fileContent));
+        }
+
+        [Test]
+        public void should_validate_nzb()
+        {
+            var filename = "ValidNzb";
+            var fileContent = GivenNzbFile(filename);
+
+            Subject.Validate(filename, fileContent);
+        }
+    }
+}