Removed old CDH Migration checker.

.gitignore

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

src/LogentriesNLog/LogentriesNLog.csproj

@@ -52,7 +52,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

src/LogentriesNLog/packages.config

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

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/Config/IndexerConfigModule.cs

@@ -13,9 +13,6 @@ 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);
 
@@ -28,4 +25,4 @@ namespace NzbDrone.Api.Config
             return IndexerConfigResourceMapper.ToResource(model);
         }
     }
-}
+}

src/NzbDrone.Api/Config/IndexerConfigResource.cs

@@ -6,7 +6,6 @@ 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; }
     }
@@ -18,7 +17,6 @@ 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,7 +10,6 @@ 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; }
@@ -36,7 +35,6 @@ 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,7 +15,6 @@ 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 bool QualityCutoffNotMet { get; set; }
     }
@@ -38,7 +37,6 @@ namespace NzbDrone.Api.EpisodeFiles
                 DateAdded = model.DateAdded,
                 SceneName = model.SceneName,
                 Quality = model.Quality,
-                MediaInfo = model.MediaInfo.ToResource(model.SceneName)
                 //QualityCutoffNotMet
             };
         }
@@ -59,8 +57,7 @@ namespace NzbDrone.Api.EpisodeFiles
                 DateAdded = model.DateAdded,
                 SceneName = model.SceneName,
                 Quality = model.Quality,
-                QualityCutoffNotMet = qualityUpgradableSpecification.CutoffNotMet(series.Profile.Value, model.Quality),
-                MediaInfo = model.MediaInfo.ToResource(model.SceneName),
+                QualityCutoffNotMet = qualityUpgradableSpecification.CutoffNotMet(series.Profile.Value, model.Quality)
             };
         }
     }

src/NzbDrone.Api/EpisodeFiles/MediaInfoResource.cs

@@ -1,30 +0,0 @@
-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/Extensions/RequestExtensions.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Nancy;
 
 namespace NzbDrone.Api.Extensions
@@ -42,17 +42,5 @@ namespace NzbDrone.Api.Extensions
             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/NzbDrone.Api.csproj

@@ -70,7 +70,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.12\lib\net40\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>
@@ -104,7 +104,6 @@
     <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/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,9 +17,7 @@ namespace NzbDrone.Api.RootFolders
                                 DroneFactoryValidator droneFactoryValidator,
                                 MappedNetworkDriveValidator mappedNetworkDriveValidator,
                                 StartupFolderValidator startupFolderValidator,
-                                SystemFolderValidator systemFolderValidator,
-                                FolderWritableValidator folderWritableValidator
-            )
+                                FolderWritableValidator folderWritableValidator)
             : base(signalRBroadcaster)
         {
             _rootFolderService = rootFolderService;
@@ -37,7 +35,6 @@ namespace NzbDrone.Api.RootFolders
                            .SetValidator(mappedNetworkDriveValidator)
                            .SetValidator(startupFolderValidator)
                            .SetValidator(pathExistsValidator)
-                           .SetValidator(systemFolderValidator)
                            .SetValidator(folderWritableValidator);
         }
 
@@ -63,4 +60,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,7 +9,6 @@ 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; }
     }
@@ -26,7 +25,6 @@ namespace NzbDrone.Api.RootFolders
 
                 Path = model.Path,
                 FreeSpace = model.FreeSpace,
-                TotalSpace = model.TotalSpace,
                 UnmappedFolders = model.UnmappedFolders
             };
         }
@@ -50,4 +48,4 @@ namespace NzbDrone.Api.RootFolders
             return models.Select(ToResource).ToList();
         }
     }
-}
+}

src/NzbDrone.Api/Series/SeasonResource.cs

@@ -1,6 +1,5 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using NzbDrone.Core.MediaCover;
 using NzbDrone.Core.Tv;
 namespace NzbDrone.Api.Series
 {
@@ -9,20 +8,18 @@ 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, bool includeImages = false)
+        public static SeasonResource ToResource(this Season model)
         {
             if (model == null) return null;
 
             return new SeasonResource
             {
                 SeasonNumber = model.SeasonNumber,
-                Monitored = model.Monitored,
-                Images = includeImages ? model.Images : null
+                Monitored = model.Monitored
             };
         }
 
@@ -33,14 +30,13 @@ namespace NzbDrone.Api.Series
             return new Season
             {
                 SeasonNumber = resource.SeasonNumber,
-                Monitored = resource.Monitored,
-                Images = resource.Images
+                Monitored = resource.Monitored
             };
         }
 
-        public static List<SeasonResource> ToResource(this IEnumerable<Season> models, bool includeImages = false)
+        public static List<SeasonResource> ToResource(this IEnumerable<Season> models)
         {
-            return models.Select(s => ToResource(s, includeImages)).ToList();
+            return models.Select(ToResource).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(false)
+                                 .ToResource()
                                  .AsResponse(HttpStatusCode.Accepted);
         }
     }

src/NzbDrone.Api/Series/SeriesModule.cs

@@ -1,8 +1,7 @@
-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;
@@ -46,7 +45,6 @@ namespace NzbDrone.Api.Series
                             SeriesExistsValidator seriesExistsValidator,
                             DroneFactoryValidator droneFactoryValidator,
                             SeriesAncestorValidator seriesAncestorValidator,
-                            SystemFolderValidator systemFolderValidator,
                             ProfileExistsValidator profileExistsValidator
             )
             : base(signalRBroadcaster)
@@ -73,7 +71,6 @@ namespace NzbDrone.Api.Series
                            .SetValidator(seriesPathValidator)
                            .SetValidator(droneFactoryValidator)
                            .SetValidator(seriesAncestorValidator)
-                           .SetValidator(systemFolderValidator)
                            .When(s => !s.Path.IsNullOrWhiteSpace());
 
             SharedValidator.RuleFor(s => s.ProfileId).SetValidator(profileExistsValidator);
@@ -87,17 +84,26 @@ namespace NzbDrone.Api.Series
 
         private SeriesResource GetSeries(int id)
         {
-            var includeSeasonImages = Context != null && Request.GetBooleanQueryParameter("includeSeasonImages");
-
             var series = _seriesService.GetSeries(id);
-            return MapToResource(series, includeSeasonImages);
+            return MapToResource(series);
+        }
+
+        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().Select(s => s.ToResource(includeSeasonImages)).ToList();
+            var seriesResources = _seriesService.GetAllSeries().ToResource();
 
             MapCoversToLocal(seriesResources.ToArray());
             LinkSeriesStatistics(seriesResources, seriesStats);
@@ -135,18 +141,6 @@ 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, bool includeSeasonImages = false)
+        public static SeriesResource ToResource(this Core.Tv.Series model)
         {
             if (model == null) return null;
 
@@ -121,7 +121,7 @@ namespace NzbDrone.Api.Series
                 AirTime = model.AirTime,
                 Images = model.Images,
                 
-                Seasons = model.Seasons.ToResource(includeSeasonImages),
+                Seasons = model.Seasons.ToResource(),
                 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, bool includeSeasonImages)
+        public static List<SeriesResource> ToResource(this IEnumerable<Core.Tv.Series> series)
         {
-            return series.Select(s => ToResource(s, includeSeasonImages)).ToList();
+            return series.Select(ToResource).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.5.0-rc06" targetFramework="net40" />
+  <package id="NLog" version="4.4.12" targetFramework="net40" />
 </packages>

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

@@ -52,7 +52,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.12\lib\net40\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>

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.5.0-rc06" targetFramework="net40" />
+  <package id="NLog" version="4.4.12" targetFramework="net40" />
   <package id="NUnit" version="3.6.0" targetFramework="net40" />
 </packages>

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

@@ -45,7 +45,7 @@
       <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.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.12\lib\net40\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>

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.5.0-rc06" targetFramework="net40" />
+  <package id="NLog" version="4.4.12" 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/NzbDrone.Common.Test.csproj

@@ -48,7 +48,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.12\lib\net40\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>

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.5.0-rc06" targetFramework="net40" />
+  <package id="NLog" version="4.4.12" targetFramework="net40" />
   <package id="NUnit" version="3.6.0" targetFramework="net40" />
 </packages>

src/NzbDrone.Common/Disk/DiskProviderBase.cs

@@ -200,11 +200,6 @@ 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);
         }
 
@@ -224,11 +219,6 @@ namespace NzbDrone.Common.Disk
             }
 
             RemoveReadOnly(source);
-            MoveFileInternal(source, destination);
-        }
-
-        protected virtual void MoveFileInternal(string source, string destination)
-        {
             File.Move(source, destination);
         }
 

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(logEvent.Properties.ToDictionary(v => v.Key, v => v.Value))
+                             .Properties((Dictionary<object, object>)logEvent.Properties)
                              .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 interrupted");
+                Logger.Warn("SignalR Heartbeat interupted");
                 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.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.12\lib\net40\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>
@@ -212,13 +212,14 @@
     <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" />
+    <Compile Include="Timeline\TimelineContext.cs" />
     <Compile Include="TinyIoC.cs" />
     <Compile Include="TPL\Debouncer.cs" />
     <Compile Include="TPL\LimitedConcurrencyLevelTaskScheduler.cs" />
+    <Compile Include="Timeline\ProgressReporter.cs" />
     <Compile Include="TPL\RateLimitService.cs" />
     <Compile Include="TPL\TaskExtensions.cs" />
     <Compile Include="Extensions\TryParseExtensions.cs" />

src/NzbDrone.Common/Serializer/UnderscoreStringEnumConverter.cs

@@ -1,58 +0,0 @@
-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/Timeline/ProgressReporter.cs

@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NzbDrone.Common.Timeline
+{
+    public interface IProgressReporter
+    {
+        long Raw { get; }
+        long Total { get; }
+        double Progress { get; }
+
+        void UpdateProgress(long currentProgress, long maxProgress);
+        void FinishProgress();
+    }
+
+    public class ProgressReporter : IProgressReporter
+    {
+        private readonly int _maxSteps;
+
+        public long Raw { get; protected set; }
+        public long Total { get; private set; }
+
+        public double Progress => Total == 0 ? 1.0 : Math.Min(Raw, Total) / Total;
+
+        //public TimeSpan? EstimatedDurationRemaining { get; private set; }
+
+        public ProgressReporter(long initialProgress, long maxProgress, int maxSteps = 100)
+        {
+            _maxSteps = maxSteps;
+
+            Raw = initialProgress;
+            Total = maxProgress;
+        }
+
+        public void UpdateProgress(long currentProgress, long maxProgress)
+        {
+            bool shouldRaiseEvent;
+
+            lock (this)
+            {
+                var oldRaw = Raw;
+                var oldTotal = Total;
+
+                Raw = currentProgress;
+                Total = Total;
+
+                var oldStep = oldTotal <= 0 ? _maxSteps : oldRaw * _maxSteps / oldTotal;
+                var newStep = Total <= 0 ? _maxSteps : Raw * _maxSteps / Total;
+
+                shouldRaiseEvent = (oldStep != newStep);
+            }
+
+            if (shouldRaiseEvent)
+            {
+                RaiseEvent();
+            }
+        }
+
+        public void FinishProgress()
+        {
+            lock (this)
+            {
+                Raw = Total;
+            }
+
+            RaiseEvent();
+        }
+
+        protected virtual void RaiseEvent()
+        {
+            // TODO
+        }
+
+    }
+}

src/NzbDrone.Common/Timeline/TimelineContext.cs

@@ -0,0 +1,100 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NzbDrone.Common.Timeline
+{
+    public enum TimelineState
+    {
+        Pending,
+        Started,
+        Completed,
+        Failed
+    }
+
+    public interface ITimelineContext : IProgressReporter
+    {
+        string Name { get; }
+        TimelineState State { get; }
+
+        void UpdateState(TimelineState state);
+        ITimelineContext AppendTimeline(string name, long initialProgress = 0, long maxProgress = 1);
+        void AppendTimeline(ITimelineContext timeline);
+    }
+
+    public class TimelineContext : ProgressReporter, ITimelineContext
+    {
+        private List<ITimelineContext> _timelines = new List<ITimelineContext>();
+
+        public string Name { get; private set; }
+        public TimelineState State { get; private set; }
+
+        public IEnumerable<ITimelineContext> Timelines
+        {
+            get
+            {
+                lock (this)
+                {
+                    return _timelines.ToArray();
+                }
+            }
+        }
+
+        public TimelineContext(string name, long initialProgress, long maxProgress)
+            : base(initialProgress, maxProgress)
+        {
+            Name = name;
+        }
+
+        public void UpdateState(TimelineState state)
+        {
+            lock (this)
+            {
+                State = state;
+
+                if (State == TimelineState.Completed || State == TimelineState.Failed)
+                {
+                    Raw = Total;
+                }
+            }
+
+            RaiseEvent();
+        }
+
+        public ITimelineContext AppendTimeline(string name, long initialProgress = 0, long maxProgress = 1)
+        {
+            lock (this)
+            {
+                var timeline = new TimelineContext(name, initialProgress, maxProgress);
+                _timelines.Add(timeline);
+                return timeline;
+            }
+        }
+
+        public void AppendTimeline(ITimelineContext timeline)
+        {
+            lock (this)
+            {
+                _timelines.Add(timeline);
+            }
+        }
+
+        protected override void RaiseEvent()
+        {
+            lock (this)
+            {
+                if (Raw == Total)
+                {
+                    State = TimelineState.Completed;
+                }
+                else
+                {
+                    State = TimelineState.Started;
+                }
+            }
+
+            base.RaiseEvent();
+        }
+    }
+}

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.5.0-rc06" targetFramework="net40" />
+  <package id="NLog" version="4.4.12" targetFramework="net40" />
   <package id="SharpRaven" version="2.2.0" targetFramework="net40" />
 </packages>

src/NzbDrone.Console/ConsoleApp.cs

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

src/NzbDrone.Console/NzbDrone.Console.csproj

@@ -79,7 +79,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

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.5.0-rc06" targetFramework="net40" />
+  <package id="NLog" version="4.4.12" targetFramework="net40" />
   <package id="Owin" version="1.0" targetFramework="net40" />
 </packages>

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

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

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

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

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

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

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

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

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

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

@@ -1,51 +0,0 @@
-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/DecisionEngineTests/MaximumSizeSpecificationFixture.cs

@@ -1,75 +0,0 @@
-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/Download/DownloadClientTests/DownloadStationTests/DownloadStationsTaskStatusJsonConverterFixture.cs

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

@@ -605,12 +605,9 @@ 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,12 +414,8 @@ 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/TrackedDownloads/TrackedDownloadServiceFixture.cs

@@ -104,7 +104,7 @@ namespace NzbDrone.Core.Test.Download.TrackedDownloads
                   .Returns(remoteEpisode);
 
             Mocker.GetMock<IParsingService>()
-                  .Setup(s => s.ParseSpecialEpisodeTitle(It.IsAny<ParsedEpisodeInfo>(), It.IsAny<string>(), It.IsAny<int>(), It.IsAny<int>(), null))
+                  .Setup(s => s.ParseSpecialEpisodeTitle(It.IsAny<string>(), It.IsAny<int>(), It.IsAny<int>(), null))
                   .Returns(remoteEpisode.ParsedEpisodeInfo);
 
             var client = new DownloadClientDefinition()

src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/Specifications/EpisodeTitleSpecificationFixture.cs

@@ -1,85 +0,0 @@
-using System;
-using System.Linq;
-using FizzWare.NBuilder;
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Core.MediaFiles.EpisodeImport.Specifications;
-using NzbDrone.Core.Organizer;
-using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.Tv;
-using NzbDrone.Test.Common;
-
-namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Specifications
-{
-    [TestFixture]
-    public class EpisodeTitleSpecificationFixture : CoreTest<EpisodeTitleSpecification>
-    {
-        private Series _series;
-        private LocalEpisode _localEpisode;
-
-        [SetUp]
-        public void Setup()
-        {
-            _series = Builder<Series>.CreateNew()
-                                     .With(s => s.SeriesType = SeriesTypes.Standard)
-                                     .With(s => s.Path = @"C:\Test\TV\30 Rock".AsOsAgnostic())
-                                     .Build();
-
-            var episodes = Builder<Episode>.CreateListOfSize(1)
-                                           .All()
-                                           .With(e => e.SeasonNumber = 1)
-                                           .With(e => e.AirDateUtc = DateTime.UtcNow)
-                                           .Build()
-                                           .ToList();
-
-            _localEpisode = new LocalEpisode
-                                {
-                                    Path = @"C:\Test\Unsorted\30 Rock\30.rock.s01e01.avi".AsOsAgnostic(),
-                                    Episodes = episodes,
-                                    Series = _series
-                                };
-
-            Mocker.GetMock<IBuildFileNames>()
-                  .Setup(s => s.RequiresEpisodeTitle(_series, episodes))
-                  .Returns(true);
-        }
-
-        [Test]
-        public void should_reject_when_title_is_null()
-        {
-            _localEpisode.Episodes.First().Title = null;
-
-            Subject.IsSatisfiedBy(_localEpisode, null).Accepted.Should().BeFalse();
-        }
-
-        [Test]
-        public void should_reject_when_title_is_TBA()
-        {
-            _localEpisode.Episodes.First().Title = "TBA";
-
-            Subject.IsSatisfiedBy(_localEpisode, null).Accepted.Should().BeFalse();
-        }
-
-        [Test]
-        public void should_accept_when_did_not_air_recently_but_title_is_TBA()
-        {
-            _localEpisode.Episodes.First().AirDateUtc = DateTime.UtcNow.AddDays(-7);
-            _localEpisode.Episodes.First().Title = "TBA";
-
-            Subject.IsSatisfiedBy(_localEpisode, null).Accepted.Should().BeTrue();
-        }
-
-        [Test]
-        public void should_accept_when_episode_title_is_not_required()
-        {
-            _localEpisode.Episodes.First().Title = "TBA";
-
-            Mocker.GetMock<IBuildFileNames>()
-                  .Setup(s => s.RequiresEpisodeTitle(_series, _localEpisode.Episodes))
-                  .Returns(false);
-
-            Subject.IsSatisfiedBy(_localEpisode, null).Accepted.Should().BeTrue();
-        }
-    }
-}

src/NzbDrone.Core.Test/MediaFiles/MediaFileDeletionService/DeleteEpisodeFileFixture.cs

@@ -64,16 +64,13 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaFileDeletionService
         public void should_throw_if_root_folder_does_not_exist()
         {
             Assert.Throws<NzbDroneClientException>(() => Subject.DeleteEpisodeFile(_series, _episodeFile));
-            ExceptionVerification.ExpectedWarns(1);
         }
 
         [Test]
         public void should_should_throw_if_root_folder_is_empty()
         {
             GivenRootFolderExists();
-
             Assert.Throws<NzbDroneClientException>(() => Subject.DeleteEpisodeFile(_series, _episodeFile));
-            ExceptionVerification.ExpectedWarns(1);
         }
 
         [Test]

src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj

@@ -90,7 +90,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.12\lib\net40\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>
@@ -115,16 +115,6 @@
     <Compile Include="DataAugmentation\Scene\SceneMappingServiceFixture.cs" />
     <Compile Include="DataAugmentation\DailySeries\DailySeriesDataProxyFixture.cs" />
     <Compile Include="Datastore\BasicRepositoryFixture.cs" />
-    <Compile Include="Datastore\Converters\UtcConverterFixture.cs" />
-    <Compile Include="Datastore\Converters\TimeSpanConverterFixture.cs" />
-    <Compile Include="Datastore\Converters\QualityIntConverterFixture.cs" />
-    <Compile Include="Datastore\Converters\OsPathConverterFixture.cs" />
-    <Compile Include="Datastore\Converters\Int32ConverterFixture.cs" />
-    <Compile Include="Datastore\Converters\GuidConverterFixture.cs" />
-    <Compile Include="Datastore\Converters\EnumIntConverterFixture.cs" />
-    <Compile Include="Datastore\Converters\DoubleConverterFixture.cs" />
-    <Compile Include="Datastore\Converters\CommandConverterFixture.cs" />
-    <Compile Include="Datastore\Converters\BooleanIntConverterFixture.cs" />
     <Compile Include="Datastore\Converters\ProviderSettingConverterFixture.cs" />
     <Compile Include="Datastore\DatabaseFixture.cs" />
     <Compile Include="Datastore\DatabaseRelationshipFixture.cs" />
@@ -156,7 +146,6 @@
     <Compile Include="DecisionEngineTests\AcceptableSizeSpecificationFixture.cs" />
     <Compile Include="DecisionEngineTests\AnimeVersionUpgradeSpecificationFixture.cs" />
     <Compile Include="DecisionEngineTests\FullSeasonSpecificationFixture.cs" />
-    <Compile Include="DecisionEngineTests\MaximumSizeSpecificationFixture.cs" />
     <Compile Include="DecisionEngineTests\ProtocolSpecificationFixture.cs" />
     <Compile Include="DecisionEngineTests\CutoffSpecificationFixture.cs" />
     <Compile Include="DecisionEngineTests\DownloadDecisionMakerFixture.cs" />
@@ -187,7 +176,6 @@
     <Compile Include="Download\DownloadClientTests\Blackhole\UsenetBlackholeFixture.cs" />
     <Compile Include="Download\DownloadClientTests\DelugeTests\DelugeFixture.cs" />
     <Compile Include="Download\DownloadClientTests\DownloadClientFixtureBase.cs" />
-    <Compile Include="Download\DownloadClientTests\DownloadStationTests\DownloadStationsTaskStatusJsonConverterFixture.cs" />
     <Compile Include="Download\DownloadClientTests\DownloadStationTests\TorrentDownloadStationFixture.cs" />
     <Compile Include="Download\DownloadClientTests\DownloadStationTests\SerialNumberProviderFixture.cs" />
     <Compile Include="Download\DownloadClientTests\DownloadStationTests\SharedFolderResolverFixture.cs" />
@@ -300,7 +288,6 @@
     <Compile Include="MediaFiles\EpisodeFileMovingServiceTests\MoveEpisodeFileFixture.cs" />
     <Compile Include="MediaFiles\EpisodeImport\ImportDecisionMakerFixture.cs" />
     <Compile Include="MediaFiles\EpisodeImport\DetectSampleFixture.cs" />
-    <Compile Include="MediaFiles\EpisodeImport\Specifications\EpisodeTitleSpecificationFixture.cs" />
     <Compile Include="MediaFiles\EpisodeImport\Specifications\FreeSpaceSpecificationFixture.cs" />
     <Compile Include="MediaFiles\EpisodeImport\Specifications\FullSeasonSpecificationFixture.cs" />
     <Compile Include="MediaFiles\EpisodeImport\Specifications\SameFileSpecificationFixture.cs" />
@@ -321,7 +308,6 @@
     <Compile Include="MetadataSource\SkyHook\SkyHookProxyFixture.cs" />
     <Compile Include="NotificationTests\NotificationBaseFixture.cs" />
     <Compile Include="NotificationTests\SynologyIndexerFixture.cs" />
-    <Compile Include="OrganizerTests\FileNameBuilderTests\RequiresEpisodeTitleFixture.cs" />
     <Compile Include="OrganizerTests\FileNameBuilderTests\CleanTitleFixture.cs" />
     <Compile Include="OrganizerTests\FileNameBuilderTests\EpisodeTitleCollapseFixture.cs" />
     <Compile Include="OrganizerTests\FileNameBuilderTests\MultiEpisodeFixture.cs" />
@@ -416,7 +402,6 @@
     <Compile Include="TvTests\ShouldRefreshSeriesFixture.cs" />
     <Compile Include="UpdateTests\UpdatePackageProviderFixture.cs" />
     <Compile Include="UpdateTests\UpdateServiceFixture.cs" />
-    <Compile Include="ValidationTests\SystemFolderValidatorFixture.cs" />
     <Compile Include="XbmcVersionTests.cs" />
   </ItemGroup>
   <ItemGroup>

src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/RequiresEpisodeTitleFixture.cs

@@ -1,57 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using FizzWare.NBuilder;
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Core.MediaFiles;
-using NzbDrone.Core.Organizer;
-using NzbDrone.Core.Qualities;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.Tv;
-
-namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
-{
-    [TestFixture]
-    public class RequiresEpisodeTitleFixture : CoreTest<FileNameBuilder>
-    {
-        private Series _series;
-        private Episode _episode;
-        private EpisodeFile _episodeFile;
-        private NamingConfig _namingConfig;
-
-        [SetUp]
-        public void Setup()
-        {
-            _series = Builder<Series>
-                    .CreateNew()
-                    .With(s => s.Title = "South Park")
-                    .Build();
-
-            _episode = Builder<Episode>.CreateNew()
-                            .With(e => e.Title = "City Sushi")
-                            .With(e => e.SeasonNumber = 15)
-                            .With(e => e.EpisodeNumber = 6)
-                            .With(e => e.AbsoluteEpisodeNumber = 100)
-                            .Build();
-
-            _namingConfig = NamingConfig.Default;
-            _namingConfig.RenameEpisodes = true;
-
-            Mocker.GetMock<INamingConfigService>()
-                  .Setup(c => c.GetConfig()).Returns(_namingConfig);
-        }
-
-        [Test]
-        public void should_return_false_when_episode_title_is_not_part_of_the_pattern()
-        {
-            _namingConfig.StandardEpisodeFormat = "{Series Title} S{season:00}E{episode:00}";
-            Subject.RequiresEpisodeTitle(_series, new List<Episode> { _episode }).Should().BeFalse();
-        }
-
-        [Test]
-        public void should_return_true_when_episode_title_is_part_of_the_pattern()
-        {
-            Subject.RequiresEpisodeTitle(_series, new List<Episode> { _episode }).Should().BeTrue();
-        }
-    }
-}

src/NzbDrone.Core.Test/ParserTests/IsPossibleSpecialEpisodeFixture.cs

@@ -39,12 +39,5 @@ namespace NzbDrone.Core.Test.ParserTests
         {
             Parser.Parser.ParseTitle(title).IsPossibleSpecialEpisode.Should().BeTrue();
         }
-
-
-        [TestCase("Dr.S11E00.A.Christmas.Carol.Special.720p.HDTV-FieldOfView")]
-        public void IsPossibleSpecialEpisode_should_be_true_if_e00_special(string title)
-        {
-            Parser.Parser.ParseTitle(title).IsPossibleSpecialEpisode.Should().BeTrue();
-        }
     }
 }

src/NzbDrone.Core.Test/ParserTests/MultiEpisodeParserFixture.cs

@@ -57,8 +57,6 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Series Title.S6.E1-E2-E3.Episode Name.1080p.WEB-DL", "Series Title", 6, new[] { 1, 2, 3 })]
         [TestCase("Mad.Men.S05E01-E02.720p.5.1Ch.BluRay", "Mad Men", 5, new[] { 1, 2 })]
         [TestCase("Mad.Men.S05E01-02.720p.5.1Ch.BluRay", "Mad Men", 5, new[] { 1, 2 })]
-        [TestCase("S01E01-E03 - Episode Title.HDTV-720p", "", 1, new [] { 1, 2, 3 })]
-        [TestCase("1x01-x03 - Episode Title.HDTV-720p", "", 1, new [] { 1, 2, 3 })]
         //[TestCase("", "", , new [] {  })]
         public void should_parse_multiple_episodes(string postTitle, string title, int season, int[] episodes)
         {

src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs

@@ -152,8 +152,6 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Incorporated.S01E08.Das.geloeschte.Ich.German.DD51.Dubbed.DL.720p.AmazonHD.x264-TVS", false)]
         [TestCase("Marco.Polo.S01E11.One.Hundred.Eyes.2015.German.DD51.DL.720p.NetflixUHD.x264.NewUp.by.Wunschtante", false)]
         [TestCase("Hush 2016 German DD51 DL 720p NetflixHD x264-TVS", false)]
-        [TestCase("Community.6x10.Basic.RV.Repair.and.Palmistry.ITA.ENG.720p.WEB-DLMux.H.264-GiuseppeTnT", false)]
-        [TestCase("Community.6x11.Modern.Espionage.ITA.ENG.720p.WEB.DLMux.H.264-GiuseppeTnT", false)]
         public void should_parse_webdl720p_quality(string title, bool proper)
         {
             ParseAndVerifyQuality(title, Quality.WEBDL720p, proper);

src/NzbDrone.Core.Test/ParserTests/ReleaseGroupParserFixture.cs

@@ -26,9 +26,6 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("[ www.Torrenting.com ] - Revenge.S03E14.720p.HDTV.X264-DIMENSION", "DIMENSION")]
         [TestCase("Seed S02E09 HDTV x264-2HD [eztv]-[rarbg.com]", "2HD")]
         [TestCase("7s-atlantis-s02e01-720p.mkv", null)]
-        [TestCase("The.Middle.S09E13.720p.HEVC.x265-MeGusta-Pre", "MeGusta")]
-        [TestCase("Ghosted.S01E08.Haunted.Hayride.720p.AMZN.WEBRip.DDP5.1.x264-NTb-postbot", "NTb")]
-        [TestCase("Ghosted.S01E08.Haunted.Hayride.720p.AMZN.WEBRip.DDP5.1.x264-NTb-xpost", "NTb")]
         //[TestCase("", "")]
         public void should_parse_release_group(string title, string expected)
         {

src/NzbDrone.Core.Test/Profiles/ProfileServiceFixture.cs

@@ -41,20 +41,15 @@ namespace NzbDrone.Core.Test.Profiles
         [Test]
         public void should_not_be_able_to_delete_profile_if_assigned_to_series()
         {
-            var profile = Builder<Profile>.CreateNew()
-                                          .With(p => p.Id = 2)
-                                          .Build();
-
             var seriesList = Builder<Series>.CreateListOfSize(3)
                                             .Random(1)
-                                            .With(c => c.ProfileId = profile.Id)
+                                            .With(c => c.ProfileId = 2)
                                             .Build().ToList();
 
 
             Mocker.GetMock<ISeriesService>().Setup(c => c.GetAllSeries()).Returns(seriesList);
-            Mocker.GetMock<IProfileRepository>().Setup(c => c.Get(profile.Id)).Returns(profile);
 
-            Assert.Throws<ProfileInUseException>(() => Subject.Delete(profile.Id));
+            Assert.Throws<ProfileInUseException>(() => Subject.Delete(2));
 
             Mocker.GetMock<IProfileRepository>().Verify(c => c.Delete(It.IsAny<int>()), Times.Never());
 
@@ -77,4 +72,4 @@ namespace NzbDrone.Core.Test.Profiles
             Mocker.GetMock<IProfileRepository>().Verify(c => c.Delete(1), Times.Once());
         }
     }
-}
+}

src/NzbDrone.Core.Test/TvTests/EpisodeServiceTests/FindEpisodeByTitleFixture.cs

@@ -67,31 +67,5 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeServiceTests
                    .Should()
                    .BeNull();
         }
-
-        [Test]
-        public void should_handle_e00_specials()
-        {
-            const string expectedTitle = "Inside The Walking Dead: Walker University";
-            GivenEpisodesWithTitles("Inside The Walking Dead", expectedTitle, "Inside The Walking Dead Walker University 2");
-
-            Subject.FindEpisodeByTitle(1, 1, "The.Walking.Dead.S04E00.Inside.The.Walking.Dead.Walker.University.720p.HDTV.x264-W4F")
-                   .Title
-                   .Should()
-                   .Be(expectedTitle);
-        }
-
-        [TestCase("Dead.Man.Walking.S04E00.Inside.The.Walking.Dead.Walker.University.720p.HDTV.x264-W4F", "Inside The Walking Dead: Walker University", new[] { "Inside The Walking Dead", "Inside The Walking Dead Walker University 2" })]
-        [TestCase("Who.1999.S11E00.Twice.Upon.A.Time.1080p.AMZN.WEB-DL.DDP5.1.H.264-NTb", "Twice Upon A Time", new[] { "Last Christmas" })]
-        [TestCase("Who.1999.S11E00.Twice.Upon.A.Time.Christmas.Special.720p.HDTV.x264-FoV", "Twice Upon A Time", new[] { "Last Christmas" })]
-        [TestCase("Who.1999.S10E00.Christmas.Special.The.Return.Of.Doctor.Mysterio.1080p.BluRay.x264-OUIJA", "The Return Of Doctor Mysterio", new[] { "Doctor Mysterio" })]
-        public void should_handle_special(string releaseTitle, string expectedTitle, string[] rejectedTitles)
-        {
-            GivenEpisodesWithTitles(rejectedTitles.Concat(new[] { expectedTitle }).ToArray());
-
-            var episode = Subject.FindEpisodeByTitle(1, 0, releaseTitle);
-
-            episode.Should().NotBeNull();
-            episode.Title.Should().Be(expectedTitle);
-        }
     }
 }

src/NzbDrone.Core.Test/TvTests/ShouldRefreshSeriesFixture.cs

@@ -51,7 +51,7 @@ namespace NzbDrone.Core.Test.TvTests
 
         private void GivenSeriesLastRefreshedRecently()
         {
-            _series.LastInfoSync = DateTime.UtcNow.AddMinutes(-30);
+            _series.LastInfoSync = DateTime.UtcNow.AddHours(-1);
         }
 
         private void GivenRecentlyAired()

src/NzbDrone.Core.Test/ValidationTests/SystemFolderValidatorFixture.cs

@@ -1,74 +0,0 @@
-using System;
-using System.IO;
-using FizzWare.NBuilder;
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.Tv;
-using NzbDrone.Core.Validation.Paths;
-using NzbDrone.Test.Common;
-
-namespace NzbDrone.Core.Test.ValidationTests
-{
-    public class SystemFolderValidatorFixture : CoreTest<SystemFolderValidator>
-    {
-        private TestValidator<Series> _validator;
-
-        [SetUp]
-        public void Setup()
-        {
-            _validator = new TestValidator<Series>
-                            {
-                                v => v.RuleFor(s => s.Path).SetValidator(Subject)
-                            };
-        }
-
-        [Test]
-        public void should_not_be_valid_if_set_to_windows_folder()
-        {
-            WindowsOnly();
-
-            var series = Builder<Series>.CreateNew()
-                                        .With(s => s.Path = Environment.GetFolderPath(Environment.SpecialFolder.Windows))
-                                        .Build();
-
-            _validator.Validate(series).IsValid.Should().BeFalse();
-        }
-
-        [Test]
-        public void should_not_be_valid_if_child_of_windows_folder()
-        {
-            WindowsOnly();
-
-            var series = Builder<Series>.CreateNew()
-                                        .With(s => s.Path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), "Test"))
-                                        .Build();
-
-            _validator.Validate(series).IsValid.Should().BeFalse();
-        }
-
-        [Test]
-        public void should_not_be_valid_if_set_to_bin_folder()
-        {
-            MonoOnly();
-
-            var series = Builder<Series>.CreateNew()
-                                        .With(s => s.Path = "/bin")
-                                        .Build();
-
-            _validator.Validate(series).IsValid.Should().BeFalse();
-        }
-
-        [Test]
-        public void should_not_be_valid_if_child_of_bin_folder()
-        {
-            MonoOnly();
-
-            var series = Builder<Series>.CreateNew()
-                                        .With(s => s.Path = "/bin/test")
-                                        .Build();
-
-            _validator.Validate(series).IsValid.Should().BeFalse();
-        }
-    }
-}

src/NzbDrone.Core.Test/packages.config

@@ -9,7 +9,7 @@
   <package id="Moq" version="4.0.10827" targetFramework="net40" />
   <package id="NBuilder" version="4.0.0" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net40" />
-  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
+  <package id="NLog" version="4.4.12" targetFramework="net40" />
   <package id="NUnit" version="3.6.0" targetFramework="net40" />
   <package id="Prowlin" version="0.9.4456.26422" targetFramework="net40" />
   <package id="Unity" version="2.1.505.2" targetFramework="net40" />

src/NzbDrone.Core/Configuration/ConfigService.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -106,12 +106,6 @@ namespace NzbDrone.Core.Configuration
             set { SetValue("RssSyncInterval", value); }
         }
 
-        public int MaximumSize
-        {
-            get { return GetValueInt("MaximumSize", 0); }
-            set { SetValue("MaximumSize", value); }
-        }
-
         public int MinimumAge
         {
             get { return GetValueInt("MinimumAge", 0); }
@@ -161,13 +155,6 @@ namespace NzbDrone.Core.Configuration
             set { SetValue("CreateEmptySeriesFolders", value); }
         }
 
-        public bool DeleteEmptyFolders
-        {
-            get { return GetValueBoolean("DeleteEmptyFolders", false); }
-
-            set { SetValue("DeleteEmptyFolders", value); }
-        }
-
         public FileDateType FileDate
         {
             get { return GetValueEnum("FileDate", FileDateType.None); }

src/NzbDrone.Core/Configuration/IConfigService.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Common.Http.Proxy;
 
@@ -28,7 +28,6 @@ namespace NzbDrone.Core.Configuration
         string RecycleBin { get; set; }
         bool AutoDownloadPropers { get; set; }
         bool CreateEmptySeriesFolders { get; set; }
-        bool DeleteEmptyFolders { get; set; }
         FileDateType FileDate { get; set; }
         bool SkipFreeSpaceCheckWhenImporting { get; set; }
         bool CopyUsingHardlinks { get; set; }
@@ -46,7 +45,6 @@ namespace NzbDrone.Core.Configuration
         //Indexers
         int Retention { get; set; }
         int RssSyncInterval { get; set; }
-        int MaximumSize { get; set; }
         int MinimumAge { get; set; }
 
         //UI

src/NzbDrone.Core/Datastore/Converters/GuidConverter.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Marr.Data.Converters;
 using Marr.Data.Mapping;
 
@@ -25,11 +25,6 @@ namespace NzbDrone.Core.Datastore.Converters
 
         public object ToDB(object clrValue)
         {
-            if (clrValue == null)
-            {
-                return DBNull.Value;
-            }
-
             var value = clrValue;
 
             return value.ToString();

src/NzbDrone.Core/Datastore/Converters/Int32Converter.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Marr.Data.Converters;
 using Marr.Data.Mapping;
 
@@ -23,7 +23,17 @@ namespace NzbDrone.Core.Datastore.Converters
 
         public object FromDB(ColumnMap map, object dbValue)
         {
-            return FromDB(new ConverterContext { ColumnMap = map, DbValue = dbValue });
+            if (dbValue == DBNull.Value)
+            {
+                return DBNull.Value;
+            }
+
+            if (dbValue is int)
+            {
+                return dbValue;
+            }
+
+            return Convert.ToInt32(dbValue);
         }
 
         public object ToDB(object clrValue)
@@ -33,4 +43,4 @@ namespace NzbDrone.Core.Datastore.Converters
 
         public Type DbType { get; private set; }
     }
-}
+}

src/NzbDrone.Core/Datastore/Converters/QualityIntConverter.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Marr.Data.Converters;
 using Marr.Data.Mapping;
 using NzbDrone.Core.Qualities;
@@ -27,9 +27,9 @@ namespace NzbDrone.Core.Datastore.Converters
 
         public object ToDB(object clrValue)
         {
-            if (clrValue == DBNull.Value) return 0;
+            if(clrValue == DBNull.Value) return 0;
 
-            if (clrValue as Quality == null)
+            if(clrValue as Quality == null)
             {
                 throw new InvalidOperationException("Attempted to save a quality that isn't really a quality");
             }
@@ -56,4 +56,4 @@ namespace NzbDrone.Core.Datastore.Converters
             writer.WriteValue(ToDB(value));
         }
     }
-}
+}

src/NzbDrone.Core/Datastore/Converters/TimeSpanConverter.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Globalization;
 using Marr.Data.Converters;
 using Marr.Data.Mapping;
@@ -15,17 +15,22 @@ namespace NzbDrone.Core.Datastore.Converters
                 return TimeSpan.Zero;
             }
 
-            if (context.DbValue is TimeSpan)
-            {
-                return context.DbValue;
-            }
-
-            return TimeSpan.Parse(context.DbValue.ToString(), CultureInfo.InvariantCulture);
+            return TimeSpan.Parse(context.DbValue.ToString());
         }
 
         public object FromDB(ColumnMap map, object dbValue)
         {
-            return FromDB(new ConverterContext { ColumnMap = map, DbValue = dbValue });
+            if (dbValue == DBNull.Value)
+            {
+                return DBNull.Value;
+            }
+
+            if (dbValue is TimeSpan)
+            {
+                return dbValue;
+            }
+
+            return TimeSpan.Parse(dbValue.ToString(), CultureInfo.InvariantCulture);
         }
 
         public object ToDB(object clrValue)
@@ -40,4 +45,4 @@ namespace NzbDrone.Core.Datastore.Converters
 
         public Type DbType { get; private set; }
     }
-}
+}

src/NzbDrone.Core/Datastore/TableMapping.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Marr.Data;
 using Marr.Data.Mapping;
@@ -15,7 +15,6 @@ using NzbDrone.Core.Instrumentation;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Profiles.Delay;
-using NzbDrone.Core.RemotePathMappings;
 using NzbDrone.Core.Notifications;
 using NzbDrone.Core.Organizer;
 using NzbDrone.Core.Parser.Model;
@@ -46,11 +45,7 @@ namespace NzbDrone.Core.Datastore
             RegisterMappers();
 
             Mapper.Entity<Config>().RegisterModel("Config");
-
-            Mapper.Entity<RootFolder>().RegisterModel("RootFolders")
-                  .Ignore(r => r.FreeSpace)
-                  .Ignore(r => r.TotalSpace);
-
+            Mapper.Entity<RootFolder>().RegisterModel("RootFolders").Ignore(r => r.FreeSpace);
             Mapper.Entity<ScheduledTask>().RegisterModel("ScheduledTasks");
 
             Mapper.Entity<IndexerDefinition>().RegisterDefinition("Indexers")
@@ -109,8 +104,7 @@ namespace NzbDrone.Core.Datastore
 
             Mapper.Entity<PendingRelease>().RegisterModel("PendingReleases")
                   .Ignore(e => e.RemoteEpisode);
-
-            Mapper.Entity<RemotePathMapping>().RegisterModel("RemotePathMappings");
+            
             Mapper.Entity<Tag>().RegisterModel("Tags");
             Mapper.Entity<Restriction>().RegisterModel("Restrictions");
 

src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs

@@ -58,7 +58,6 @@ namespace NzbDrone.Core.DecisionEngine
             {
                 DownloadDecision decision = null;
                 _logger.ProgressTrace("Processing release {0}/{1}", reportNumber, reports.Count);
-                _logger.Debug("Processing release '{0}' from '{1}'", report.Title, report.Indexer);
 
                 try
                 {
@@ -66,7 +65,7 @@ namespace NzbDrone.Core.DecisionEngine
 
                     if (parsedEpisodeInfo == null || parsedEpisodeInfo.IsPossibleSpecialEpisode)
                     {
-                        var specialEpisodeInfo = _parsingService.ParseSpecialEpisodeTitle(parsedEpisodeInfo, report.Title, report.TvdbId, report.TvRageId, searchCriteria);
+                        var specialEpisodeInfo = _parsingService.ParseSpecialEpisodeTitle(report.Title, report.TvdbId, report.TvRageId, searchCriteria);
 
                         if (specialEpisodeInfo != null)
                         {

src/NzbDrone.Core/DecisionEngine/Specifications/MaximumSizeSpecification.cs

@@ -1,53 +0,0 @@
-using NLog;
-using NzbDrone.Common.Extensions;
-using NzbDrone.Core.Configuration;
-using NzbDrone.Core.IndexerSearch.Definitions;
-using NzbDrone.Core.Parser.Model;
-
-namespace NzbDrone.Core.DecisionEngine.Specifications
-{
-    public class MaximumSizeSpecification : IDecisionEngineSpecification
-    {
-        private readonly IConfigService _configService;
-        private readonly Logger _logger;
-
-        public MaximumSizeSpecification(IConfigService configService, Logger logger)
-        {
-            _configService = configService;
-            _logger = logger;
-        }
-
-        public SpecificationPriority Priority => SpecificationPriority.Default;
-        public RejectionType Type => RejectionType.Permanent;
-
-        public Decision IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
-        {
-            var size = subject.Release.Size;
-            var maximumSize = _configService.MaximumSize.Megabytes();
-
-            if (maximumSize == 0)
-            {
-                _logger.Debug("Maximum size is not set.");
-                return Decision.Accept();
-            }
-
-            if (size == 0)
-            {
-                _logger.Debug("Release has unknown size, skipping size check.");
-                return Decision.Accept();
-            }
-
-            _logger.Debug("Checking if release meets maximum size requirements. {0}", size.SizeSuffix());
-
-            if (size > maximumSize)
-            {
-                var message = $"{size.SizeSuffix()} is too big, maximum size is {maximumSize.SizeSuffix()}";
-
-                _logger.Debug(message);
-                return Decision.Reject(message);
-            }
-
-            return Decision.Accept();
-        }
-    }
-}

src/NzbDrone.Core/DecisionEngine/Specifications/Search/DailyEpisodeMatchSpecification.cs

@@ -0,0 +1,44 @@
+using NLog;
+using NzbDrone.Core.IndexerSearch.Definitions;
+using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.Tv;
+
+namespace NzbDrone.Core.DecisionEngine.Specifications.Search
+{
+    public class DailyEpisodeMatchSpecification : IDecisionEngineSpecification
+    {
+        private readonly Logger _logger;
+        private readonly IEpisodeService _episodeService;
+
+        public DailyEpisodeMatchSpecification(Logger logger, IEpisodeService episodeService)
+        {
+            _logger = logger;
+            _episodeService = episodeService;
+        }
+
+        public SpecificationPriority Priority => SpecificationPriority.Database;
+        public RejectionType Type => RejectionType.Permanent;
+
+        public Decision IsSatisfiedBy(RemoteEpisode remoteEpisode, SearchCriteriaBase searchCriteria)
+        {
+            if (searchCriteria == null)
+            {
+                return Decision.Accept();
+            }
+
+            var dailySearchSpec = searchCriteria as DailyEpisodeSearchCriteria;
+
+            if (dailySearchSpec == null) return Decision.Accept();
+
+            var episode = _episodeService.GetEpisode(dailySearchSpec.Series.Id, dailySearchSpec.AirDate.ToString(Episode.AIR_DATE_FORMAT));
+
+            if (!remoteEpisode.ParsedEpisodeInfo.IsDaily || remoteEpisode.ParsedEpisodeInfo.AirDate != episode.AirDate)
+            {
+                _logger.Debug("Episode AirDate does not match searched episode number, skipping.");
+                return Decision.Reject("Episode does not match");
+            }
+
+            return Decision.Accept();
+        }
+    }
+}

src/NzbDrone.Core/Download/Clients/Blackhole/TorrentBlackhole.cs

@@ -11,7 +11,6 @@ using NzbDrone.Core.Configuration;
 using NzbDrone.Core.MediaFiles.TorrentInfo;
 using NzbDrone.Core.Organizer;
 using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.RemotePathMappings;
 using NzbDrone.Core.ThingiProvider;
 
 namespace NzbDrone.Core.Download.Clients.Blackhole
@@ -29,9 +28,8 @@ namespace NzbDrone.Core.Download.Clients.Blackhole
                                 IHttpClient httpClient,
                                 IConfigService configService,
                                 IDiskProvider diskProvider,
-                                IRemotePathMappingService remotePathMappingService,
                                 Logger logger)
-            : base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, logger)
+            : base(torrentFileInfoReader, httpClient, configService, diskProvider, logger)
         {
             _scanWatchFolder = scanWatchFolder;
 
@@ -99,7 +97,7 @@ namespace NzbDrone.Core.Download.Clients.Blackhole
                     TotalSize = item.TotalSize,
                     RemainingTime = item.RemainingTime,
 
-                    OutputPath = item.OutputPath,
+                    OutputPath = new DownloadClientPath(Definition.Id, item.OutputPath),
 
                     Status = item.Status,
 
@@ -124,7 +122,7 @@ namespace NzbDrone.Core.Download.Clients.Blackhole
             return new DownloadClientInfo
             {
                 IsLocalhost = true,
-                OutputRootFolders = new List<OsPath> { new OsPath(Settings.WatchFolder) }
+                OutputRootFolders = new List<DownloadClientPath> { new DownloadClientPath(Definition.Id, new OsPath(Settings.WatchFolder)) }
             };
         }
 

src/NzbDrone.Core/Download/Clients/Blackhole/UsenetBlackhole.cs

@@ -9,7 +9,6 @@ using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Organizer;
 using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.RemotePathMappings;
 
 namespace NzbDrone.Core.Download.Clients.Blackhole
 {
@@ -23,10 +22,9 @@ namespace NzbDrone.Core.Download.Clients.Blackhole
                                IHttpClient httpClient,
                                IConfigService configService,
                                IDiskProvider diskProvider,
-                               IRemotePathMappingService remotePathMappingService,
                                IValidateNzbs nzbValidationService,
                                Logger logger)
-            : base(httpClient, configService, diskProvider, remotePathMappingService, nzbValidationService, logger)
+            : base(httpClient, configService, diskProvider, nzbValidationService, logger)
         {
             _scanWatchFolder = scanWatchFolder;
 
@@ -67,7 +65,7 @@ namespace NzbDrone.Core.Download.Clients.Blackhole
                     TotalSize = item.TotalSize,
                     RemainingTime = item.RemainingTime,
 
-                    OutputPath = item.OutputPath,
+                    OutputPath = new DownloadClientPath(Definition.Id, item.OutputPath),
 
                     Status = item.Status,
 
@@ -92,7 +90,7 @@ namespace NzbDrone.Core.Download.Clients.Blackhole
             return new DownloadClientInfo
             {
                 IsLocalhost = true,
-                OutputRootFolders = new List<OsPath> { new OsPath(Settings.WatchFolder) }
+                OutputRootFolders = new List<DownloadClientPath> { new DownloadClientPath(Definition.Id, new OsPath(Settings.WatchFolder)) }
             };
         }
 

src/NzbDrone.Core/Download/Clients/Deluge/Deluge.cs

@@ -11,7 +11,6 @@ using NzbDrone.Core.Validation;
 using NLog;
 using FluentValidation.Results;
 using System.Net;
-using NzbDrone.Core.RemotePathMappings;
 
 namespace NzbDrone.Core.Download.Clients.Deluge
 {
@@ -24,9 +23,8 @@ namespace NzbDrone.Core.Download.Clients.Deluge
                       IHttpClient httpClient,
                       IConfigService configService,
                       IDiskProvider diskProvider,
-                      IRemotePathMappingService remotePathMappingService,
                       Logger logger)
-            : base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, logger)
+            : base(torrentFileInfoReader, httpClient, configService, diskProvider, logger)
         {
             _proxy = proxy;
         }
@@ -40,6 +38,8 @@ namespace NzbDrone.Core.Download.Clients.Deluge
                 _proxy.SetLabel(actualHash, Settings.TvCategory, Settings);
             }
 
+            _proxy.SetTorrentConfiguration(actualHash, "remove_at_ratio", false, Settings);
+
             var isRecentEpisode = remoteEpisode.IsRecentEpisode();
 
             if (isRecentEpisode && Settings.RecentTvPriority == (int)DelugePriority.First ||
@@ -65,6 +65,8 @@ namespace NzbDrone.Core.Download.Clients.Deluge
                 _proxy.SetLabel(actualHash, Settings.TvCategory, Settings);
             }
 
+            _proxy.SetTorrentConfiguration(actualHash, "remove_at_ratio", false, Settings);
+
             var isRecentEpisode = remoteEpisode.IsRecentEpisode();
 
             if (isRecentEpisode && Settings.RecentTvPriority == (int)DelugePriority.First ||
@@ -102,8 +104,8 @@ namespace NzbDrone.Core.Download.Clients.Deluge
 
                 item.DownloadClient = Definition.Name;
 
-                var outputPath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(torrent.DownloadPath));
-                item.OutputPath = outputPath + torrent.Name;
+                var outputPath = new OsPath(torrent.DownloadPath) + torrent.Name;
+                item.OutputPath = new DownloadClientPath(Definition.Id, outputPath);
                 item.RemainingSize = torrent.Size - torrent.BytesDownloaded;
 
                 try
@@ -172,7 +174,7 @@ namespace NzbDrone.Core.Download.Clients.Deluge
 
             if (!destDir.IsEmpty)
             {
-                status.OutputRootFolders = new List<OsPath> { _remotePathMappingService.RemapRemoteToLocal(Settings.Host, destDir) };
+                status.OutputRootFolders = new List<DownloadClientPath> { new DownloadClientPath(Definition.Id, destDir) };
             }
 
             return status;

src/NzbDrone.Core/Download/Clients/Deluge/DelugeProxy.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
@@ -84,33 +84,21 @@ namespace NzbDrone.Core.Download.Clients.Deluge
 
         public string AddTorrentFromMagnet(string magnetLink, DelugeSettings settings)
         {
-            var options = new
-                          {
-                              add_paused = settings.AddPaused,
-                              remove_at_ratio = false
-                          };
-
-            var response = ProcessRequest<string>(settings, "core.add_torrent_magnet", magnetLink, options);
+            var response = ProcessRequest<string>(settings, "core.add_torrent_magnet", magnetLink, new JObject());
 
             return response;
         }
 
         public string AddTorrentFromFile(string filename, byte[] fileContent, DelugeSettings settings)
         {
-            var options = new
-                          {
-                              add_paused = settings.AddPaused,
-                              remove_at_ratio = false
-                          };
-
-            var response = ProcessRequest<string>(settings, "core.add_torrent_file", filename, fileContent, options);
+            var response = ProcessRequest<string>(settings, "core.add_torrent_file", filename, fileContent, new JObject());
 
             return response;
         }
 
-        public bool RemoveTorrent(string hash, bool removeData, DelugeSettings settings)
+        public bool RemoveTorrent(string hashString, bool removeData, DelugeSettings settings)
         {
-            var response = ProcessRequest<bool>(settings, "core.remove_torrent", hash, removeData);
+            var response = ProcessRequest<bool>(settings, "core.remove_torrent", hashString, removeData);
 
             return response;
         }

src/NzbDrone.Core/Download/Clients/Deluge/DelugeSettings.cs

@@ -1,4 +1,4 @@
-using FluentValidation;
+using FluentValidation;
 using NzbDrone.Core.Annotations;
 using NzbDrone.Core.ThingiProvider;
 using NzbDrone.Core.Validation;
@@ -49,10 +49,7 @@ namespace NzbDrone.Core.Download.Clients.Deluge
         [FieldDefinition(6, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(DelugePriority), HelpText = "Priority to use when grabbing episodes that aired over 14 days ago")]
         public int OlderTvPriority { get; set; }
 
-        [FieldDefinition(7, Label = "Add Paused", Type = FieldType.Checkbox)]
-        public bool AddPaused { get; set; }
-
-        [FieldDefinition(8, Label = "Use SSL", Type = FieldType.Checkbox)]
+        [FieldDefinition(7, Label = "Use SSL", Type = FieldType.Checkbox)]
         public bool UseSsl { get; set; }
 
         public NzbDroneValidationResult Validate()

src/NzbDrone.Core/Download/Clients/DownloadStation/DownloadStationTask.cs

@@ -1,6 +1,7 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Newtonsoft.Json;
-using NzbDrone.Common.Serializer;
+using Newtonsoft.Json.Converters;
 
 namespace NzbDrone.Core.Download.Clients.DownloadStation
 {
@@ -22,7 +23,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
         [JsonProperty(PropertyName = "status_extra")]
         public Dictionary<string, string> StatusExtra { get; set; }
 
-        [JsonConverter(typeof(UnderscoreStringEnumConverter), DownloadStationTaskStatus.Unknown)]
+        [JsonConverter(typeof(StringEnumConverter))]
         public DownloadStationTaskStatus Status { get; set; }
 
         public DownloadStationTaskAdditional Additional { get; set; }
@@ -40,7 +41,6 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
 
     public enum DownloadStationTaskStatus
     {
-        Unknown,
         Waiting,
         Downloading,
         Paused,
@@ -48,10 +48,9 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
         Finished,
         HashChecking,
         Seeding,
-        FilehostingWaiting,
+        FileHostingWaiting,
         Extracting,
-        Error,
-        CaptchaNeeded
+        Error
     }
 
     public enum DownloadStationPriority

src/NzbDrone.Core/Download/Clients/DownloadStation/TorrentDownloadStation.cs

@@ -12,7 +12,6 @@ using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Download.Clients.DownloadStation.Proxies;
 using NzbDrone.Core.MediaFiles.TorrentInfo;
 using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.RemotePathMappings;
 using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Download.Clients.DownloadStation
@@ -34,9 +33,8 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
                                       IHttpClient httpClient,
                                       IConfigService configService,
                                       IDiskProvider diskProvider,
-                                      IRemotePathMappingService remotePathMappingService,
                                       Logger logger)
-            : base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, logger)
+            : base(torrentFileInfoReader, httpClient, configService, diskProvider, logger)
         {
             _dsInfoProxy = dsInfoProxy;
             _dsTaskProxy = dsTaskProxy;
@@ -96,7 +94,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
 
                 if (item.Status == DownloadItemStatus.Completed || item.Status == DownloadItemStatus.Failed)
                 {
-                    item.OutputPath = GetOutputPath(outputPath, torrent, serialNumber);
+                    item.OutputPath = new DownloadClientPath(Definition.Id, GetOutputPath(outputPath, torrent, serialNumber));
                 }
 
                 items.Add(item);
@@ -114,7 +112,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
                 return new DownloadClientInfo
                 {
                     IsLocalhost = Settings.Host == "127.0.0.1" || Settings.Host == "localhost",
-                    OutputRootFolders = new List<OsPath> { _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(path)) }
+                    OutputRootFolders = new List<DownloadClientPath> { new DownloadClientPath(Definition.Id, new OsPath(path)) }
                 };
             }
             catch (DownloadClientException e)
@@ -140,9 +138,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
         {
             var fullPath = _sharedFolderResolver.RemapToFullPath(outputPath, Settings, serialNumber);
 
-            var remotePath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, fullPath);
-
-            var finalPath = remotePath + torrent.Title;
+            var finalPath = fullPath + torrent.Title;
 
             return finalPath;
         }
@@ -227,9 +223,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
         {
             switch (torrent.Status)
             {
-                case DownloadStationTaskStatus.Unknown:
                 case DownloadStationTaskStatus.Waiting:
-                case DownloadStationTaskStatus.FilehostingWaiting:
                     return torrent.Size == 0 || GetRemainingSize(torrent) > 0 ? DownloadItemStatus.Queued : DownloadItemStatus.Completed;
                 case DownloadStationTaskStatus.Paused:
                     return DownloadItemStatus.Paused;

src/NzbDrone.Core/Download/Clients/DownloadStation/UsenetDownloadStation.cs

@@ -10,7 +10,6 @@ using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Download.Clients.DownloadStation.Proxies;
 using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.RemotePathMappings;
 using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Download.Clients.DownloadStation
@@ -31,11 +30,10 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
                                      IHttpClient httpClient,
                                      IConfigService configService,
                                      IDiskProvider diskProvider,
-                                     IRemotePathMappingService remotePathMappingService,
                                      IValidateNzbs nzbValidationService,
                                      Logger logger
                                      )
-            : base(httpClient, configService, diskProvider, remotePathMappingService, nzbValidationService, logger)
+            : base(httpClient, configService, diskProvider, nzbValidationService, logger)
         {
             _dsInfoProxy = dsInfoProxy;
             _dsTaskProxy = dsTaskProxy;
@@ -111,7 +109,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
 
                 if (item.Status == DownloadItemStatus.Completed || item.Status == DownloadItemStatus.Failed)
                 {
-                    item.OutputPath = GetOutputPath(outputPath, nzb, serialNumber);
+                    item.OutputPath = new DownloadClientPath(Definition.Id, GetOutputPath(outputPath, nzb, serialNumber));
                 }
 
                 items.Add(item);
@@ -124,7 +122,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
         {
             var fullPath = _sharedFolderResolver.RemapToFullPath(outputPath, Settings, serialNumber);
 
-            var remotePath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, fullPath);
+            var remotePath = fullPath;
 
             var finalPath = remotePath + task.Title;
 
@@ -140,7 +138,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
                 return new DownloadClientInfo
                 {
                     IsLocalhost = Settings.Host == "127.0.0.1" || Settings.Host == "localhost",
-                    OutputRootFolders = new List<OsPath> { _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(path)) }
+                    OutputRootFolders = new List<DownloadClientPath> { new DownloadClientPath(Definition.Id, new OsPath(path)) }
                 };
             }
             catch (DownloadClientException e)
@@ -315,9 +313,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
         {
             switch (task.Status)
             {
-                case DownloadStationTaskStatus.Unknown:
                 case DownloadStationTaskStatus.Waiting:
-                case DownloadStationTaskStatus.FilehostingWaiting:
                     return task.Size == 0 || GetRemainingSize(task) > 0 ? DownloadItemStatus.Queued : DownloadItemStatus.Completed;
                 case DownloadStationTaskStatus.Paused:
                     return DownloadItemStatus.Paused;

src/NzbDrone.Core/Download/Clients/Hadouken/Hadouken.cs

@@ -10,7 +10,6 @@ using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Download.Clients.Hadouken.Models;
 using NzbDrone.Core.MediaFiles.TorrentInfo;
 using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.RemotePathMappings;
 using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Download.Clients.Hadouken
@@ -24,9 +23,8 @@ namespace NzbDrone.Core.Download.Clients.Hadouken
                         IHttpClient httpClient,
                         IConfigService configService,
                         IDiskProvider diskProvider,
-                        IRemotePathMappingService remotePathMappingService,
                         Logger logger)
-            : base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, logger)
+            : base(torrentFileInfoReader, httpClient, configService, diskProvider, logger)
         {
             _proxy = proxy;
         }
@@ -46,7 +44,7 @@ namespace NzbDrone.Core.Download.Clients.Hadouken
                     continue;
                 }
 
-                var outputPath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(torrent.SavePath));
+                var outputPath = new OsPath(torrent.SavePath);
                 var eta = TimeSpan.FromSeconds(0);
 
                 if (torrent.DownloadRate > 0 && torrent.TotalSize > 0)
@@ -58,7 +56,7 @@ namespace NzbDrone.Core.Download.Clients.Hadouken
                 {
                     DownloadClient = Definition.Name,
                     DownloadId = torrent.InfoHash.ToUpper(),
-                    OutputPath = outputPath + torrent.Name,
+                    OutputPath = new DownloadClientPath(Definition.Id, outputPath + torrent.Name),
                     RemainingSize = torrent.TotalSize - torrent.DownloadedBytes,
                     RemainingTime = eta,
                     Title = torrent.Name,
@@ -119,7 +117,7 @@ namespace NzbDrone.Core.Download.Clients.Hadouken
 
             if (!destDir.IsEmpty)
             {
-                status.OutputRootFolders = new List<OsPath> { _remotePathMappingService.RemapRemoteToLocal(Settings.Host, destDir) };
+                status.OutputRootFolders = new List<DownloadClientPath> { new DownloadClientPath(Definition.Id, destDir) };
             }
 
             return status;

src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortex.cs

@@ -10,7 +10,6 @@ using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Validation;
-using NzbDrone.Core.RemotePathMappings;
 
 namespace NzbDrone.Core.Download.Clients.NzbVortex
 {
@@ -22,10 +21,9 @@ namespace NzbDrone.Core.Download.Clients.NzbVortex
                        IHttpClient httpClient,
                        IConfigService configService,
                        IDiskProvider diskProvider,
-                       IRemotePathMappingService remotePathMappingService,
                        IValidateNzbs nzbValidationService,
                        Logger logger)
-            : base(httpClient, configService, diskProvider, remotePathMappingService, nzbValidationService, logger)
+            : base(httpClient, configService, diskProvider, nzbValidationService, logger)
         {
             _proxy = proxy;
         }
@@ -88,7 +86,7 @@ namespace NzbDrone.Core.Download.Clients.NzbVortex
                         break;
                 }
 
-                queueItem.OutputPath = GetOutputPath(vortexQueueItem, queueItem);
+                queueItem.OutputPath = new DownloadClientPath(Definition.Id, GetOutputPath(vortexQueueItem, queueItem));
 
                 if (vortexQueueItem.State == NzbVortexStateType.PasswordRequest)
                 {
@@ -221,7 +219,7 @@ namespace NzbDrone.Core.Download.Clients.NzbVortex
 
         private OsPath GetOutputPath(NzbVortexQueueItem vortexQueueItem, DownloadClientItem queueItem)
         {
-            var outputPath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(vortexQueueItem.DestinationPath));
+            var outputPath = new OsPath(vortexQueueItem.DestinationPath);
 
             if (outputPath.FileName == vortexQueueItem.UiTitle)
             {

src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs

@@ -10,7 +10,6 @@ using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.RemotePathMappings;
 using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Download.Clients.Nzbget
@@ -25,10 +24,9 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
                       IHttpClient httpClient,
                       IConfigService configService,
                       IDiskProvider diskProvider,
-                      IRemotePathMappingService remotePathMappingService,
                       IValidateNzbs nzbValidationService,
                       Logger logger)
-            : base(httpClient, configService, diskProvider, remotePathMappingService, nzbValidationService, logger)
+            : base(httpClient, configService, diskProvider, nzbValidationService, logger)
         {
             _proxy = proxy;
         }
@@ -123,7 +121,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
                 historyItem.DownloadId = droneParameter == null ? item.Id.ToString() : droneParameter.Value.ToString();
                 historyItem.Title = item.Name;
                 historyItem.TotalSize = MakeInt64(item.FileSizeHi, item.FileSizeLo);
-                historyItem.OutputPath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(item.DestDir));
+                historyItem.OutputPath = new DownloadClientPath(Definition.Id, new OsPath(item.DestDir));
                 historyItem.Category = item.Category;
                 historyItem.Message = $"PAR Status: {item.ParStatus} - Unpack Status: {item.UnpackStatus} - Move Status: {item.MoveStatus} - Script Status: {item.ScriptStatus} - Delete Status: {item.DeleteStatus} - Mark Status: {item.MarkStatus}";
                 historyItem.Status = DownloadItemStatus.Completed;
@@ -208,7 +206,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
 
             if (category != null)
             {
-                status.OutputRootFolders = new List<OsPath> { _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(category.DestDir)) };
+                status.OutputRootFolders = new List<DownloadClientPath> { new DownloadClientPath(Definition.Id, new OsPath(category.DestDir)) };
             }
 
             return status;

src/NzbDrone.Core/Download/Clients/Nzbget/NzbgetSettings.cs

@@ -1,4 +1,4 @@
-using FluentValidation;
+using FluentValidation;
 using NzbDrone.Core.Annotations;
 using NzbDrone.Core.ThingiProvider;
 using NzbDrone.Core.Validation;
@@ -52,12 +52,12 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
         [FieldDefinition(6, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(NzbgetPriority), HelpText = "Priority to use when grabbing episodes that aired over 14 days ago")]
         public int OlderTvPriority { get; set; }
 
-        [FieldDefinition(7, Label = "Add Paused", Type = FieldType.Checkbox, HelpText = "This option requires at least NzbGet version 16.0")]
-        public bool AddPaused { get; set; }
-
-        [FieldDefinition(8, Label = "Use SSL", Type = FieldType.Checkbox)]
+        [FieldDefinition(7, Label = "Use SSL", Type = FieldType.Checkbox)]
         public bool UseSsl { get; set; }
 
+        [FieldDefinition(8, Label = "Add Paused", Type = FieldType.Checkbox, HelpText = "This option requires at least NzbGet version 16.0")]
+        public bool AddPaused { get; set; }
+
         public NzbDroneValidationResult Validate()
         {
             return new NzbDroneValidationResult(Validator.Validate(this));

src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs

@@ -8,7 +8,6 @@ using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Indexers;
-using NzbDrone.Core.RemotePathMappings;
 using NzbDrone.Core.Organizer;
 using NzbDrone.Core.Parser.Model;
 
@@ -21,9 +20,8 @@ namespace NzbDrone.Core.Download.Clients.Pneumatic
         public Pneumatic(IHttpClient httpClient,
                          IConfigService configService,
                          IDiskProvider diskProvider,
-                         IRemotePathMappingService remotePathMappingService,
                          Logger logger)
-            : base(configService, diskProvider, remotePathMappingService, logger)
+            : base(configService, diskProvider, logger)
         {
             _httpClient = httpClient;
         }
@@ -82,7 +80,7 @@ namespace NzbDrone.Core.Download.Clients.Pneumatic
 
                     TotalSize = _diskProvider.GetFileSize(file),
 
-                    OutputPath = new OsPath(file)
+                    OutputPath = new DownloadClientPath(Definition.Id, new OsPath(file))
                 };
 
                 if (_diskProvider.IsFileLocked(file))

src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrent.cs

@@ -11,7 +11,6 @@ using NzbDrone.Core.Validation;
 using FluentValidation.Results;
 using System.Net;
 using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.RemotePathMappings;
 
 namespace NzbDrone.Core.Download.Clients.QBittorrent
 {
@@ -24,9 +23,8 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
                            IHttpClient httpClient,
                            IConfigService configService,
                            IDiskProvider diskProvider,
-                           IRemotePathMappingService remotePathMappingService,
                            Logger logger)
-            : base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, logger)
+            : base(torrentFileInfoReader, httpClient, configService, diskProvider, logger)
         {
             _proxy = proxy;
         }
@@ -109,16 +107,17 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
                 item.RemainingSize = (long)(torrent.Size * (1.0 - torrent.Progress));
                 item.RemainingTime = TimeSpan.FromSeconds(torrent.Eta);
 
-                item.OutputPath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(torrent.SavePath));
+                var outputPath = new OsPath(torrent.SavePath);
+                if (!outputPath.IsEmpty && outputPath.FileName != torrent.Name)
+                {
+                    outputPath += torrent.Name;
+                }
+                item.OutputPath = new DownloadClientPath(Definition.Id, outputPath);
 
                 // Avoid removing torrents that haven't reached the global max ratio.
                 // Removal also requires the torrent to be paused, in case a higher max ratio was set on the torrent itself (which is not exposed by the api).
                 item.CanMoveFiles = item.CanBeRemoved = (!config.MaxRatioEnabled || config.MaxRatio <= torrent.Ratio) && torrent.State == "pausedUP";
 
-                if (!item.OutputPath.IsEmpty && item.OutputPath.FileName != torrent.Name)
-                {
-                    item.OutputPath += torrent.Name;
-                }
 
                 switch (torrent.State)
                 {
@@ -176,7 +175,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
             return new DownloadClientInfo
             {
                 IsLocalhost = Settings.Host == "127.0.0.1" || Settings.Host == "localhost",
-                OutputRootFolders = new List<OsPath> { _remotePathMappingService.RemapRemoteToLocal(Settings.Host, destDir) }
+                OutputRootFolders = new List<DownloadClientPath> { new DownloadClientPath(Definition.Id, destDir) }
             };
         }
 

src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrentProxy.cs

@@ -75,11 +75,6 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
                                                 .Post()
                                                 .AddFormParameter("urls", torrentUrl);
 
-            if (settings.TvCategory.IsNotNullOrWhiteSpace())
-            {
-                request.AddFormParameter("category", settings.TvCategory);
-            }
-
             var result = ProcessRequest(request, settings);
 
             // Note: Older qbit versions returned nothing, so we can't do != "Ok." here.
@@ -110,11 +105,6 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
                                                 .Post()
                                                 .AddFormParameter("hashes", hash);
 
-            if (settings.TvCategory.IsNotNullOrWhiteSpace())
-            {
-                request.AddFormParameter("category", settings.TvCategory);
-            }
-
             ProcessRequest(request, settings);
         }
 

src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs

@@ -10,7 +10,6 @@ using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Validation;
-using NzbDrone.Core.RemotePathMappings;
 
 namespace NzbDrone.Core.Download.Clients.Sabnzbd
 {
@@ -22,10 +21,9 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
                        IHttpClient httpClient,
                        IConfigService configService,
                        IDiskProvider diskProvider,
-                       IRemotePathMappingService remotePathMappingService,
                        IValidateNzbs nzbValidationService,
                        Logger logger)
-            : base(httpClient, configService, diskProvider, remotePathMappingService, nzbValidationService, logger)
+            : base(httpClient, configService, diskProvider, nzbValidationService, logger)
         {
             _proxy = proxy;
         }
@@ -163,23 +161,22 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
                     historyItem.Status = DownloadItemStatus.Downloading;
                 }
 
-                var outputPath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(sabHistoryItem.Storage));
+                var outputPath = new OsPath(sabHistoryItem.Storage);
 
                 if (!outputPath.IsEmpty)
                 {
-                    historyItem.OutputPath = outputPath;
-
                     var parent = outputPath.Directory;
                     while (!parent.IsEmpty)
                     {
                         if (parent.FileName == sabHistoryItem.Title)
                         {
-                            historyItem.OutputPath = parent;
+                            outputPath = parent;
                         }
                         parent = parent.Directory;
                     }
-                }
 
+                    historyItem.OutputPath = new DownloadClientPath(Definition.Id, outputPath);
+                }
 
                 historyItems.Add(historyItem);
             }
@@ -261,7 +258,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
 
             if (category != null)
             {
-                status.OutputRootFolders = new List<OsPath> { _remotePathMappingService.RemapRemoteToLocal(Settings.Host, category.FullPath) };
+                status.OutputRootFolders = new List<DownloadClientPath> { new DownloadClientPath(Definition.Id, category.FullPath) };
             }
 
             return status;

src/NzbDrone.Core/Download/Clients/Transmission/Transmission.cs

@@ -6,7 +6,6 @@ using NzbDrone.Core.Configuration;
 using NLog;
 using FluentValidation.Results;
 using NzbDrone.Core.MediaFiles.TorrentInfo;
-using NzbDrone.Core.RemotePathMappings;
 
 namespace NzbDrone.Core.Download.Clients.Transmission
 {
@@ -17,9 +16,8 @@ namespace NzbDrone.Core.Download.Clients.Transmission
                             IHttpClient httpClient,
                             IConfigService configService,
                             IDiskProvider diskProvider,
-                            IRemotePathMappingService remotePathMappingService,
                             Logger logger)
-            : base(proxy, torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, logger)
+            : base(proxy, torrentFileInfoReader, httpClient, configService, diskProvider, logger)
         {
         }
 

src/NzbDrone.Core/Download/Clients/Transmission/TransmissionBase.cs

@@ -10,7 +10,6 @@ using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.MediaFiles.TorrentInfo;
 using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.RemotePathMappings;
 using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Download.Clients.Transmission
@@ -24,9 +23,8 @@ namespace NzbDrone.Core.Download.Clients.Transmission
             IHttpClient httpClient,
             IConfigService configService,
             IDiskProvider diskProvider,
-            IRemotePathMappingService remotePathMappingService,
             Logger logger)
-            : base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, logger)
+            : base(torrentFileInfoReader, httpClient, configService, diskProvider, logger)
         {
             _proxy = proxy;
         }
@@ -54,8 +52,6 @@ namespace NzbDrone.Core.Download.Clients.Transmission
                     if (!directories.Contains(Settings.TvCategory)) continue;
                 }
 
-                outputPath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, outputPath);
-
                 var item = new DownloadClientItem();
                 item.DownloadId = torrent.HashString.ToUpper();
                 item.Category = Settings.TvCategory;
@@ -63,7 +59,7 @@ namespace NzbDrone.Core.Download.Clients.Transmission
 
                 item.DownloadClient = Definition.Name;
 
-                item.OutputPath = GetOutputPath(outputPath, torrent);
+                item.OutputPath = new DownloadClientPath(Definition.Id, GetOutputPath(outputPath, torrent));
                 item.TotalSize = torrent.TotalSize;
                 item.RemainingSize = torrent.LeftUntilDone;
                 if (torrent.Eta >= 0)
@@ -122,7 +118,7 @@ namespace NzbDrone.Core.Download.Clients.Transmission
             return new DownloadClientInfo
             {
                 IsLocalhost = Settings.Host == "127.0.0.1" || Settings.Host == "localhost",
-                OutputRootFolders = new List<OsPath> { _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(destDir)) }
+                OutputRootFolders = new List<DownloadClientPath> { new DownloadClientPath(Definition.Id, new OsPath(destDir)) }
             };
         }
 

src/NzbDrone.Core/Download/Clients/Transmission/TransmissionProxy.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Net;
 using System.Collections.Generic;
 using NzbDrone.Common.Extensions;
@@ -51,7 +51,6 @@ namespace NzbDrone.Core.Download.Clients.Transmission
         {
             var arguments = new Dictionary<string, object>();
             arguments.Add("filename", torrentUrl);
-            arguments.Add("paused", settings.AddPaused);
 
             if (!downloadDirectory.IsNullOrWhiteSpace())
             {
@@ -65,7 +64,6 @@ namespace NzbDrone.Core.Download.Clients.Transmission
         {
             var arguments = new Dictionary<string, object>();
             arguments.Add("metainfo", Convert.ToBase64String(torrentData));
-            arguments.Add("paused", settings.AddPaused);
 
             if (!downloadDirectory.IsNullOrWhiteSpace())
             {

src/NzbDrone.Core/Download/Clients/Transmission/TransmissionSettings.cs

@@ -1,4 +1,4 @@
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;
 using FluentValidation;
 using NzbDrone.Core.Annotations;
 using NzbDrone.Core.ThingiProvider;
@@ -62,10 +62,7 @@ namespace NzbDrone.Core.Download.Clients.Transmission
         [FieldDefinition(8, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(TransmissionPriority), HelpText = "Priority to use when grabbing episodes that aired over 14 days ago")]
         public int OlderTvPriority { get; set; }
 
-        [FieldDefinition(9, Label = "Add Paused", Type = FieldType.Checkbox)]
-        public bool AddPaused { get; set; }
-
-        [FieldDefinition(10, Label = "Use SSL", Type = FieldType.Checkbox)]
+        [FieldDefinition(9, Label = "Use SSL", Type = FieldType.Checkbox)]
         public bool UseSsl { get; set; }
 
         public NzbDroneValidationResult Validate()

src/NzbDrone.Core/Download/Clients/Vuze/Vuze.cs

@@ -5,7 +5,6 @@ using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Download.Clients.Transmission;
 using NzbDrone.Core.MediaFiles.TorrentInfo;
-using NzbDrone.Core.RemotePathMappings;
 
 namespace NzbDrone.Core.Download.Clients.Vuze
 {
@@ -18,9 +17,8 @@ namespace NzbDrone.Core.Download.Clients.Vuze
                     IHttpClient httpClient,
                     IConfigService configService,
                     IDiskProvider diskProvider,
-                    IRemotePathMappingService remotePathMappingService,
                     Logger logger)
-            : base(proxy, torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, logger)
+            : base(proxy, torrentFileInfoReader, httpClient, configService, diskProvider, logger)
         {
         }
 

src/NzbDrone.Core/Download/Clients/rTorrent/RTorrent.cs

@@ -13,7 +13,6 @@ using FluentValidation.Results;
 using NzbDrone.Core.Download.Clients.rTorrent;
 using NzbDrone.Core.Exceptions;
 using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.RemotePathMappings;
 using NzbDrone.Core.ThingiProvider;
 
 namespace NzbDrone.Core.Download.Clients.RTorrent
@@ -28,10 +27,9 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
                         IHttpClient httpClient,
                         IConfigService configService,
                         IDiskProvider diskProvider,
-                        IRemotePathMappingService remotePathMappingService,
                         IRTorrentDirectoryValidator rTorrentDirectoryValidator,
                         Logger logger)
-            : base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, logger)
+            : base(torrentFileInfoReader, httpClient, configService, diskProvider, logger)
         {
             _proxy = proxy;
             _rTorrentDirectoryValidator = rTorrentDirectoryValidator;
@@ -100,7 +98,7 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
                 item.DownloadClient = Definition.Name;
                 item.Title = torrent.Name;
                 item.DownloadId = torrent.Hash;
-                item.OutputPath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(torrent.Path));
+                item.OutputPath = new DownloadClientPath(Definition.Id, new OsPath(torrent.Path));
                 item.TotalSize = torrent.TotalSize;
                 item.RemainingSize = torrent.RemainingSize;
                 item.Category = torrent.Category;

src/NzbDrone.Core/Download/Clients/uTorrent/UTorrent.cs

@@ -11,7 +11,6 @@ using NzbDrone.Core.Validation;
 using FluentValidation.Results;
 using System.Net;
 using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.RemotePathMappings;
 using NzbDrone.Common.Cache;
 
 namespace NzbDrone.Core.Download.Clients.UTorrent
@@ -27,9 +26,8 @@ namespace NzbDrone.Core.Download.Clients.UTorrent
                         IHttpClient httpClient,
                         IConfigService configService,
                         IDiskProvider diskProvider,
-                        IRemotePathMappingService remotePathMappingService,
                         Logger logger)
-            : base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, logger)
+            : base(torrentFileInfoReader, httpClient, configService, diskProvider, logger)
         {
             _proxy = proxy;
 
@@ -99,16 +97,13 @@ namespace NzbDrone.Core.Download.Clients.UTorrent
                     item.RemainingTime = TimeSpan.FromSeconds(torrent.Eta);
                 }
 
-                var outputPath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(torrent.RootDownloadPath));
+                var outputPath = new OsPath(torrent.RootDownloadPath);
 
-                if (outputPath == null || outputPath.FileName == torrent.Name)
+                if (outputPath != null && outputPath.FileName != torrent.Name)
                 {
-                    item.OutputPath = outputPath;
-                }
-                else
-                {
-                    item.OutputPath = outputPath + torrent.Name;
+                    outputPath += torrent.Name;
                 }
+                item.OutputPath = new DownloadClientPath(Definition.Id, outputPath);
 
                 if (torrent.Status.HasFlag(UTorrentTorrentStatus.Error))
                 {
@@ -209,7 +204,7 @@ namespace NzbDrone.Core.Download.Clients.UTorrent
 
             if (!destDir.IsEmpty)
             {
-                status.OutputRootFolders = new List<OsPath> { _remotePathMappingService.RemapRemoteToLocal(Settings.Host, destDir) };
+                status.OutputRootFolders = new List<DownloadClientPath> { new DownloadClientPath(Definition.Id, destDir) };
             }
 
             return status;

src/NzbDrone.Core/Download/DownloadClientBase.cs

@@ -8,7 +8,6 @@ using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.RemotePathMappings;
 using NzbDrone.Core.ThingiProvider;
 using NzbDrone.Core.Validation;
 
@@ -19,7 +18,6 @@ namespace NzbDrone.Core.Download
     {
         protected readonly IConfigService _configService;
         protected readonly IDiskProvider _diskProvider;
-        protected readonly IRemotePathMappingService _remotePathMappingService;
         protected readonly Logger _logger;
 
         public abstract string Name { get; }
@@ -36,14 +34,12 @@ namespace NzbDrone.Core.Download
 
         protected TSettings Settings => (TSettings)Definition.Settings;
 
-        protected DownloadClientBase(IConfigService configService, 
-            IDiskProvider diskProvider, 
-            IRemotePathMappingService remotePathMappingService,
+        protected DownloadClientBase(IConfigService configService,
+            IDiskProvider diskProvider,
             Logger logger)
         {
             _configService = configService;
             _diskProvider = diskProvider;
-            _remotePathMappingService = remotePathMappingService;
             _logger = logger;
         }
 
@@ -76,6 +72,9 @@ namespace NzbDrone.Core.Download
                 return;
             }
 
+            // FIXME: Doesn't work if remote.
+            throw new NotSupportedException();
+            /*
             if (item.OutputPath.IsEmpty)
             {
                 _logger.Trace("[{0}] Doesn't have an outputPath, skipping delete data.", item.Title);
@@ -104,7 +103,7 @@ namespace NzbDrone.Core.Download
             catch (Exception ex)
             {
                 _logger.Warn(ex, string.Format("[{0}] Error occurred while trying to delete data from '{1}'.", item.Title, item.OutputPath));
-            }
+            }*/
         }
 
         public ValidationResult Test()

src/NzbDrone.Core/Download/DownloadClientInfo.cs

@@ -6,6 +6,6 @@ namespace NzbDrone.Core.Download
     public class DownloadClientInfo
     {
         public bool IsLocalhost { get; set; }
-        public List<OsPath> OutputRootFolders { get; set; }
+        public List<DownloadClientPath> OutputRootFolders { get; set; }
     }
 }

src/NzbDrone.Core/Download/DownloadClientItem.cs

@@ -16,7 +16,7 @@ namespace NzbDrone.Core.Download
         public long RemainingSize { get; set; }
         public TimeSpan? RemainingTime { get; set; }
 
-        public OsPath OutputPath { get; set; }
+        public DownloadClientPath OutputPath { get; set; }
         public string Message { get; set; }
 
         public DownloadItemStatus Status { get; set; }

src/NzbDrone.Core/Download/DownloadClientPath.cs

@@ -0,0 +1,16 @@
+using NzbDrone.Common.Disk;
+
+namespace NzbDrone.Core.Download
+{
+    public class DownloadClientPath
+    {
+        public int DownloadClientId { get; set; }
+        public OsPath Path { get; set; }
+
+        public DownloadClientPath(int downloadClientId, OsPath path)
+        {
+            DownloadClientId = downloadClientId;
+            Path = path;
+        }
+    }
+}