Warn if users attempt to store database on a network share, but also force database into journal mode.

src/Marr.Data/Mapping/MappingHelper.cs

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

src/NzbDrone.Api/EpisodeFiles/EpisodeFileResource.cs

@@ -16,7 +16,6 @@ namespace NzbDrone.Api.EpisodeFiles
         public string SceneName { get; set; }
         public QualityModel Quality { get; set; }
         public MediaInfoResource MediaInfo { get; set; }
-        public string OriginalFilePath { get; set; }
 
         public bool QualityCutoffNotMet { get; set; }
     }
@@ -39,8 +38,8 @@ namespace NzbDrone.Api.EpisodeFiles
                 DateAdded = model.DateAdded,
                 SceneName = model.SceneName,
                 Quality = model.Quality,
-                MediaInfo = model.MediaInfo.ToResource(model.SceneName),
-                OriginalFilePath = model.OriginalFilePath
+                MediaInfo = model.MediaInfo.ToResource(model.SceneName)
+                //QualityCutoffNotMet
             };
         }
 
@@ -62,7 +61,6 @@ namespace NzbDrone.Api.EpisodeFiles
                 Quality = model.Quality,
                 QualityCutoffNotMet = qualityUpgradableSpecification.CutoffNotMet(series.Profile.Value, model.Quality),
                 MediaInfo = model.MediaInfo.ToResource(model.SceneName),
-                OriginalFilePath = model.OriginalFilePath
             };
         }
     }

src/NzbDrone.Api/Episodes/EpisodeResource.cs

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

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

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

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
@@ -130,12 +130,11 @@ namespace NzbDrone.Common.Test.Http
         [Test]
         public void should_execute_typed_get()
         {
-            var request = new HttpRequest($"http://{_httpBinHost}/get?test=1");
+            var request = new HttpRequest($"http://{_httpBinHost}/get");
 
             var response = Subject.Get<HttpBinResource>(request);
 
-            response.Resource.Url.EndsWith("/get?test=1");
-            response.Resource.Args.Should().Contain("test", "1");
+            response.Resource.Url.Should().Be(request.Url.FullUri);
         }
 
         [Test]
@@ -707,7 +706,6 @@ namespace NzbDrone.Common.Test.Http
 
     public class HttpBinResource
     {
-        public Dictionary<string, object> Args { get; set; }
         public Dictionary<string, object> Headers { get; set; }
         public string Origin { get; set; }
         public string Url { get; set; }

src/NzbDrone.Common.Test/PathExtensionFixture.cs

@@ -138,34 +138,18 @@ namespace NzbDrone.Common.Test
         }
 
         [TestCase(@"C:\Test\mydir", @"C:\Test")]
-        [TestCase(@"C:\Test\", @"C:\")]
+        [TestCase(@"C:\Test\", @"C:")]
         [TestCase(@"C:\", null)]
-        [TestCase(@"\\server\share", null)]
-        [TestCase(@"\\server\share\test", @"\\server\share")]
-        public void path_should_return_parent_windows(string path, string parentPath)
+        public void path_should_return_parent(string path, string parentPath)
         {
-            WindowsOnly();
-            path.GetParentPath().Should().Be(parentPath);
-        }
-
-        [TestCase(@"/", null)]
-        [TestCase(@"/test", "/")]
-        public void path_should_return_parent_mono(string path, string parentPath)
-        {
-            MonoOnly();
             path.GetParentPath().Should().Be(parentPath);
         }
 
         [Test]
         public void path_should_return_parent_for_oversized_path()
         {
-            MonoOnly();
-
-            // This test will fail on Windows if long path support is not enabled: https://www.howtogeek.com/266621/how-to-make-windows-10-accept-file-paths-over-260-characters/
-            // It will also fail if the app isn't configured to use long path (such as resharper): https://blogs.msdn.microsoft.com/jeremykuhne/2016/07/30/net-4-6-2-and-long-paths-on-windows-10/
-
-            var path       = @"C:\media\2e168617-f2ae-43fb-b88c-3663af1c8eea\downloads\sabnzbd\nzbdrone\Some.Real.Big.Thing\With.Alot.Of.Nested.Directories\Some.Real.Big.Thing\With.Alot.Of.Nested.Directories\Some.Real.Big.Thing\With.Alot.Of.Nested.Directories\Some.Real.Big.Thing\With.Alot.Of.Nested.Directories\Some.Real.Big.Thing\With.Alot.Of.Nested.Directories".AsOsAgnostic();
-            var parentPath = @"C:\media\2e168617-f2ae-43fb-b88c-3663af1c8eea\downloads\sabnzbd\nzbdrone\Some.Real.Big.Thing\With.Alot.Of.Nested.Directories\Some.Real.Big.Thing\With.Alot.Of.Nested.Directories\Some.Real.Big.Thing\With.Alot.Of.Nested.Directories\Some.Real.Big.Thing\With.Alot.Of.Nested.Directories\Some.Real.Big.Thing".AsOsAgnostic();
+            var path       = @"/media/2e168617-f2ae-43fb-b88c-3663af1c8eea/downloads/sabnzbd/nzbdrone/Some.Real.Big.Thing/With.Alot.Of.Nested.Directories/Some.Real.Big.Thing/With.Alot.Of.Nested.Directories/Some.Real.Big.Thing/With.Alot.Of.Nested.Directories/Some.Real.Big.Thing/With.Alot.Of.Nested.Directories/Some.Real.Big.Thing/With.Alot.Of.Nested.Directories";
+            var parentPath = @"/media/2e168617-f2ae-43fb-b88c-3663af1c8eea/downloads/sabnzbd/nzbdrone/Some.Real.Big.Thing/With.Alot.Of.Nested.Directories/Some.Real.Big.Thing/With.Alot.Of.Nested.Directories/Some.Real.Big.Thing/With.Alot.Of.Nested.Directories/Some.Real.Big.Thing/With.Alot.Of.Nested.Directories/Some.Real.Big.Thing";
 
             path.GetParentPath().Should().Be(parentPath);
         }

src/NzbDrone.Common/EnvironmentInfo/IRuntimeInfo.cs

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

src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs

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

src/NzbDrone.Common/Extensions/PathExtensions.cs

@@ -24,8 +24,6 @@ namespace NzbDrone.Common.Extensions
         private static readonly string UPDATE_CLIENT_FOLDER_NAME = "NzbDrone.Update" + Path.DirectorySeparatorChar;
         private static readonly string UPDATE_LOG_FOLDER_NAME = "UpdateLogs" + Path.DirectorySeparatorChar;
 
-        private static readonly Regex PARENT_PATH_END_SLASH_REGEX = new Regex(@"(?<!:)\\$", RegexOptions.Compiled);
-
         public static string CleanFilePath(this string path)
         {
             Ensure.That(path, () => path).IsNotNullOrWhiteSpace();
@@ -69,16 +67,15 @@ namespace NzbDrone.Common.Extensions
 
         public static string GetParentPath(this string childPath)
         {
-            var cleanPath = OsInfo.IsWindows
-                ? PARENT_PATH_END_SLASH_REGEX.Replace(childPath, "")
-                : childPath.TrimEnd(Path.DirectorySeparatorChar);
+            var parentPath = childPath.TrimEnd('\\', '/');
 
-            if (cleanPath.IsNullOrWhiteSpace())
+            var index = parentPath.LastIndexOfAny(new[] { '\\', '/' });
+
+            if (index != -1)
             {
-                return null;
+                return parentPath.Substring(0, index);
             }
-
-            return Directory.GetParent(cleanPath)?.FullName;
+            return null;
         }
 
         public static bool IsParentPath(this string parentPath, string childPath)
@@ -194,24 +191,6 @@ namespace NzbDrone.Common.Extensions
             return directories;
         }
 
-        public static string GetAncestorPath(this string path, string ancestorName)
-        {
-            var parent = Path.GetDirectoryName(path);
-
-            while (parent != null)
-            {
-                var currentPath = parent;
-                parent = Path.GetDirectoryName(parent);
-
-                if (Path.GetFileName(currentPath) == ancestorName)
-                {
-                    return currentPath;
-                }
-            }
-
-            return null;
-        }
-
         public static string GetAppDataPath(this IAppFolderInfo appFolderInfo)
         {
             return appFolderInfo.AppDataFolder;

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

@@ -1,14 +1,9 @@
 using System;
 using System.IO;
-using System.IO.Compression;
 using System.Net;
-using System.Reflection;
-using NLog;
-using NLog.Fluent;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http.Proxy;
-using NzbDrone.Common.Instrumentation.Extensions;
 using NzbDrone.Common.Security;
 
 namespace NzbDrone.Common.Http.Dispatchers
@@ -18,35 +13,22 @@ namespace NzbDrone.Common.Http.Dispatchers
         private readonly IHttpProxySettingsProvider _proxySettingsProvider;
         private readonly ICreateManagedWebProxy _createManagedWebProxy;
         private readonly IUserAgentBuilder _userAgentBuilder;
-        private readonly IPlatformInfo _platformInfo;
-        private readonly Logger _logger;
 
-        public ManagedHttpDispatcher(IHttpProxySettingsProvider proxySettingsProvider, ICreateManagedWebProxy createManagedWebProxy, IUserAgentBuilder userAgentBuilder, IPlatformInfo platformInfo, Logger logger)
+        public ManagedHttpDispatcher(IHttpProxySettingsProvider proxySettingsProvider, ICreateManagedWebProxy createManagedWebProxy, IUserAgentBuilder userAgentBuilder)
         {
             _proxySettingsProvider = proxySettingsProvider;
             _createManagedWebProxy = createManagedWebProxy;
             _userAgentBuilder = userAgentBuilder;
-            _platformInfo = platformInfo;
-            _logger = logger;
         }
 
         public HttpResponse GetResponse(HttpRequest request, CookieContainer cookies)
         {
             var webRequest = (HttpWebRequest)WebRequest.Create((Uri)request.Url);
 
-            if (PlatformInfo.IsMono)
-            {
-                // On Mono GZipStream/DeflateStream leaks memory if an exception is thrown, use an intermediate buffer in that case.
-                webRequest.AutomaticDecompression = DecompressionMethods.None;
-                webRequest.Headers.Add("Accept-Encoding", "gzip");
-            }
-            else
-            {
-                // Deflate is not a standard and could break depending on implementation.
-                // we should just stick with the more compatible Gzip
-                //http://stackoverflow.com/questions/8490718/how-to-decompress-stream-deflated-with-java-util-zip-deflater-in-net
-                webRequest.AutomaticDecompression = DecompressionMethods.GZip;
-            }
+            // Deflate is not a standard and could break depending on implementation.
+            // we should just stick with the more compatible Gzip
+            //http://stackoverflow.com/questions/8490718/how-to-decompress-stream-deflated-with-java-util-zip-deflater-in-net
+            webRequest.AutomaticDecompression = DecompressionMethods.GZip;
 
             webRequest.Method = request.Method.ToString();
             webRequest.UserAgent = _userAgentBuilder.GetUserAgent(request.UseSimplifiedUserAgent);
@@ -92,9 +74,6 @@ namespace NzbDrone.Common.Http.Dispatchers
 
                 if (httpWebResponse == null)
                 {
-                    // Workaround for mono not closing connections properly in certain situations.
-                    AbortWebRequest(webRequest);
-
                     // The default messages for WebException on mono are pretty horrible.
                     if (e.Status == WebExceptionStatus.NameResolutionFailure)
                     {
@@ -128,19 +107,6 @@ namespace NzbDrone.Common.Http.Dispatchers
                     try
                     {
                         data = responseStream.ToBytes();
-
-                        if (PlatformInfo.IsMono && httpWebResponse.ContentEncoding == "gzip")
-                        {
-                            using (var compressedStream = new MemoryStream(data))
-                            using (var gzip = new GZipStream(compressedStream, CompressionMode.Decompress))
-                            using (var decompressedStream = new MemoryStream())
-                            {
-                                gzip.CopyTo(decompressedStream);
-                                data = decompressedStream.ToArray();
-                            }
-
-                            httpWebResponse.Headers.Remove("Content-Encoding");
-                        }
                     }
                     catch (Exception ex)
                     {
@@ -209,36 +175,5 @@ namespace NzbDrone.Common.Http.Dispatchers
                 }
             }
         }
-
-        // Workaround for mono not closing connections properly on timeouts
-        private void AbortWebRequest(HttpWebRequest webRequest)
-        {
-            // First affected version was mono 5.16
-            if (OsInfo.IsNotWindows && _platformInfo.Version >= new Version(5, 16))
-            {
-                try
-                {
-                    var currentOperationInfo = webRequest.GetType().GetField("currentOperation", BindingFlags.NonPublic | BindingFlags.Instance);
-                    var currentOperation = currentOperationInfo.GetValue(webRequest);
-
-                    if (currentOperation != null)
-                    {
-                        var responseStreamInfo = currentOperation.GetType().GetField("responseStream", BindingFlags.NonPublic | BindingFlags.Instance);
-                        var responseStream = responseStreamInfo.GetValue(currentOperation) as Stream;
-                        // Note that responseStream will likely be null once mono fixes it.
-                        responseStream?.Dispose();
-                    }
-                }
-                catch (Exception ex)
-                {
-                    // This can fail randomly on future mono versions that have been changed/fixed. Log to sentry and ignore.
-                    _logger.Trace()
-                           .Exception(ex)
-                           .Message("Unable to dispose responseStream on mono {0}", _platformInfo.Version)
-                           .WriteSentryWarn("MonoCloseWaitPatchFailed", ex.Message)
-                           .Write();
-                }
-            }
-        }
     }
 }

src/NzbDrone.Common/Http/HttpRequestBuilder.cs

@@ -355,7 +355,7 @@ namespace NzbDrone.Common.Http
             FormData.Add(new HttpFormData
             {
                 Name = key,
-                ContentData = Encoding.UTF8.GetBytes(Convert.ToString(value, System.Globalization.CultureInfo.InvariantCulture))
+                ContentData = Encoding.UTF8.GetBytes(value.ToString())
             });
 
             return this;

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

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

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

@@ -9,7 +9,6 @@ using NzbDrone.Core.MediaFiles.TorrentInfo;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.Download.Clients.QBittorrent;
 using NzbDrone.Test.Common;
-using NzbDrone.Core.Exceptions;
 
 namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
 {
@@ -21,13 +20,13 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
         {
             Subject.Definition = new DownloadClientDefinition();
             Subject.Definition.Settings = new QBittorrentSettings
-            {
-                Host = "127.0.0.1",
-                Port = 2222,
-                Username = "admin",
-                Password = "pass",
-                TvCategory = "tv"
-            };
+                                          {
+                                              Host = "127.0.0.1",
+                                              Port = 2222,
+                                              Username = "admin",
+                                              Password = "pass",
+                                              TvCategory = "tv"
+                                          };
 
             Mocker.GetMock<ITorrentFileInfoReader>()
                   .Setup(s => s.GetHashFromTorrentFile(It.IsAny<Byte[]>()))
@@ -38,12 +37,8 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
                   .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), new Byte[0]));
 
             Mocker.GetMock<IQBittorrentProxy>()
-                  .Setup(s => s.GetConfig(It.IsAny<QBittorrentSettings>()))
-                  .Returns(new QBittorrentPreferences() { DhtEnabled = true });
-
-            Mocker.GetMock<IQBittorrentProxySelector>()
-                  .Setup(s => s.GetProxy(It.IsAny<QBittorrentSettings>(), It.IsAny<bool>()))
-                  .Returns(Mocker.GetMock<IQBittorrentProxy>().Object);
+                .Setup(s => s.GetConfig(It.IsAny<QBittorrentSettings>()))
+                .Returns(new QBittorrentPreferences());
         }
 
         protected void GivenRedirectToMagnet()
@@ -100,18 +95,15 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
             Subject.Definition.Settings.As<QBittorrentSettings>().RecentTvPriority = (int)QBittorrentPriority.First;
         }
 
-        protected void GivenGlobalSeedLimits(float maxRatio, int maxSeedingTime = -1, bool removeOnMaxRatio = false)
+        protected void GivenMaxRatio(float maxRatio, bool removeOnMaxRatio = true)
         {
             Mocker.GetMock<IQBittorrentProxy>()
-                  .Setup(s => s.GetConfig(It.IsAny<QBittorrentSettings>()))
-                  .Returns(new QBittorrentPreferences
-                  {
-                      RemoveOnMaxRatio = removeOnMaxRatio,
-                      MaxRatio = maxRatio,
-                      MaxRatioEnabled = maxRatio >= 0,
-                      MaxSeedingTime = maxSeedingTime,
-                      MaxSeedingTimeEnabled = maxSeedingTime >= 0
-                  });
+                .Setup(s => s.GetConfig(It.IsAny<QBittorrentSettings>()))
+                .Returns(new QBittorrentPreferences
+                         {
+                             RemoveOnMaxRatio = removeOnMaxRatio,
+                             MaxRatio = maxRatio
+                         });
         }
 
         protected virtual void GivenTorrents(List<QBittorrentTorrent> torrents)
@@ -162,7 +154,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
 
             var item = Subject.GetItems().Single();
             VerifyPaused(item);
-            item.RemainingTime.Should().NotHaveValue();
+            item.RemainingTime.Should().NotBe(TimeSpan.Zero);
         }
 
         [TestCase("pausedUP")]
@@ -193,7 +185,6 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
 
         [TestCase("queuedDL")]
         [TestCase("checkingDL")]
-        [TestCase("metaDL")]
         public void queued_item_should_have_required_properties(string state)
         {
             var torrent = new QBittorrentTorrent
@@ -211,7 +202,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
 
             var item = Subject.GetItems().Single();
             VerifyQueued(item);
-            item.RemainingTime.Should().NotHaveValue();
+            item.RemainingTime.Should().NotBe(TimeSpan.Zero);
         }
 
         [Test]
@@ -253,7 +244,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
 
             var item = Subject.GetItems().Single();
             VerifyWarning(item);
-            item.RemainingTime.Should().NotHaveValue();
+            item.RemainingTime.Should().NotBe(TimeSpan.Zero);
         }
 
         [Test]
@@ -281,35 +272,6 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
             id.Should().Be(expectedHash);
         }
 
-        [Test]
-        public void Download_should_refuse_magnet_if_no_trackers_provided_and_dht_is_disabled()
-        {
-            Mocker.GetMock<IQBittorrentProxy>()
-                  .Setup(s => s.GetConfig(It.IsAny<QBittorrentSettings>()))
-                  .Returns(new QBittorrentPreferences() { DhtEnabled = false });
-
-            var remoteEpisode = CreateRemoteEpisode();
-            remoteEpisode.Release.DownloadUrl = "magnet:?xt=urn:btih:ZPBPA2P6ROZPKRHK44D5OW6NHXU5Z6KR";
-
-            Assert.Throws<ReleaseDownloadException>(() => Subject.Download(remoteEpisode));
-        }
-
-        [Test]
-        public void Download_should_accept_magnet_if_trackers_provided_and_dht_is_disabled()
-        {
-            Mocker.GetMock<IQBittorrentProxy>()
-                  .Setup(s => s.GetConfig(It.IsAny<QBittorrentSettings>()))
-                  .Returns(new QBittorrentPreferences() { DhtEnabled = false });
-
-            var remoteEpisode = CreateRemoteEpisode();
-            remoteEpisode.Release.DownloadUrl = "magnet:?xt=urn:btih:ZPBPA2P6ROZPKRHK44D5OW6NHXU5Z6KR&tr=udp://abc";
-
-            Assert.DoesNotThrow(() => Subject.Download(remoteEpisode));
-
-            Mocker.GetMock<IQBittorrentProxy>()
-                  .Verify(s => s.AddTorrentFromUrl(It.IsAny<string>(), It.IsAny<QBittorrentSettings>()), Times.Once());
-        }
-
         [Test]
         public void Download_should_set_top_priority()
         {
@@ -391,7 +353,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
         [Test]
         public void should_not_be_removable_and_should_not_allow_move_files_if_max_ratio_not_reached()
         {
-            GivenGlobalSeedLimits(1.0f);
+            GivenMaxRatio(1.0f);
 
             var torrent = new QBittorrentTorrent
             {
@@ -412,11 +374,11 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
             item.CanMoveFiles.Should().BeFalse();
         }
 
-        protected virtual QBittorrentTorrent GivenCompletedTorrent(
-            string state = "pausedUP",
-            float ratio = 0.1f, float ratioLimit = -2,
-            int seedingTime = 1, int seedingTimeLimit = -2)
+        [Test]
+        public void should_not_be_removable_and_should_not_allow_move_files_if_max_ratio_reached_and_not_paused()
         {
+            GivenMaxRatio(1.0f);
+
             var torrent = new QBittorrentTorrent
             {
                 Hash = "HASH",
@@ -424,32 +386,12 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
                 Size = 1000,
                 Progress = 1.0,
                 Eta = 8640000,
-                State = state,
+                State = "uploading",
                 Label = "",
                 SavePath = "",
-                Ratio = ratio,
-                RatioLimit = ratioLimit,
-                SeedingTimeLimit = seedingTimeLimit
+                Ratio = 1.0f
             };
-
-            GivenTorrents(new List<QBittorrentTorrent>() { torrent });
-
-            Mocker.GetMock<IQBittorrentProxy>()
-                .Setup(s => s.GetTorrentProperties("HASH", It.IsAny<QBittorrentSettings>()))
-                .Returns(new QBittorrentTorrentProperties
-                {
-                    Hash = "HASH",
-                    SeedingTime = seedingTime
-                });
-
-            return torrent;
-        }
-
-        [Test]
-        public void should_not_be_removable_and_should_not_allow_move_files_if_max_ratio_reached_and_not_paused()
-        {
-            GivenGlobalSeedLimits(1.0f);
-            GivenCompletedTorrent("uploading", ratio: 1.0f);
+            GivenTorrents(new List<QBittorrentTorrent> { torrent });
 
             var item = Subject.GetItems().Single();
             item.CanBeRemoved.Should().BeFalse();
@@ -459,8 +401,21 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
         [Test]
         public void should_not_be_removable_and_should_not_allow_move_files_if_max_ratio_is_not_set()
         {
-            GivenGlobalSeedLimits(-1);
-            GivenCompletedTorrent("pausedUP", ratio: 1.0f);
+            GivenMaxRatio(1.0f, false);
+
+            var torrent = new QBittorrentTorrent
+            {
+                Hash = "HASH",
+                Name = _title,
+                Size = 1000,
+                Progress = 1.0,
+                Eta = 8640000,
+                State = "uploading",
+                Label = "",
+                SavePath = "",
+                Ratio = 1.0f
+            };
+            GivenTorrents(new List<QBittorrentTorrent> { torrent });
 
             var item = Subject.GetItems().Single();
             item.CanBeRemoved.Should().BeFalse();
@@ -470,86 +425,21 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
         [Test]
         public void should_be_removable_and_should_allow_move_files_if_max_ratio_reached_and_paused()
         {
-            GivenGlobalSeedLimits(1.0f);
-            GivenCompletedTorrent("pausedUP", ratio: 1.0f);
+            GivenMaxRatio(1.0f);
 
-            var item = Subject.GetItems().Single();
-            item.CanBeRemoved.Should().BeTrue();
-            item.CanMoveFiles.Should().BeTrue();
-        }
-
-        [Test]
-        public void should_be_removable_and_should_allow_move_files_if_overridden_max_ratio_reached_and_paused()
-        {
-            GivenGlobalSeedLimits(2.0f);
-            GivenCompletedTorrent("pausedUP", ratio: 1.0f, ratioLimit: 0.8f);
-
-            var item = Subject.GetItems().Single();
-            item.CanBeRemoved.Should().BeTrue();
-            item.CanMoveFiles.Should().BeTrue();
-        }
-
-        [Test]
-        public void should_not_be_removable_if_overridden_max_ratio_not_reached_and_paused()
-        {
-            GivenGlobalSeedLimits(0.2f);
-            GivenCompletedTorrent("pausedUP", ratio: 0.5f, ratioLimit: 0.8f);
-
-            var item = Subject.GetItems().Single();
-            item.CanBeRemoved.Should().BeFalse();
-            item.CanMoveFiles.Should().BeFalse();
-        }
-
-
-        [Test]
-        public void should_not_be_removable_and_should_not_allow_move_files_if_max_seedingtime_reached_and_not_paused()
-        {
-            GivenGlobalSeedLimits(-1, 20);
-            GivenCompletedTorrent("uploading", ratio: 2.0f, seedingTime: 30);
-
-            var item = Subject.GetItems().Single();
-            item.CanBeRemoved.Should().BeFalse();
-            item.CanMoveFiles.Should().BeFalse();
-        }
-
-        [Test]
-        public void should_be_removable_and_should_allow_move_files_if_max_seedingtime_reached_and_paused()
-        {
-            GivenGlobalSeedLimits(-1, 20);
-            GivenCompletedTorrent("pausedUP", ratio: 2.0f, seedingTime: 20);
-
-            var item = Subject.GetItems().Single();
-            item.CanBeRemoved.Should().BeTrue();
-            item.CanMoveFiles.Should().BeTrue();
-        }
-
-        [Test]
-        public void should_be_removable_and_should_allow_move_files_if_overridden_max_seedingtime_reached_and_paused()
-        {
-            GivenGlobalSeedLimits(-1, 40);
-            GivenCompletedTorrent("pausedUP", ratio: 2.0f, seedingTime: 20, seedingTimeLimit: 10);
-
-            var item = Subject.GetItems().Single();
-            item.CanBeRemoved.Should().BeTrue();
-            item.CanMoveFiles.Should().BeTrue();
-        }
-
-        [Test]
-        public void should_not_be_removable_if_overridden_max_seedingtime_not_reached_and_paused()
-        {
-            GivenGlobalSeedLimits(-1, 20);
-            GivenCompletedTorrent("pausedUP", ratio: 2.0f, seedingTime: 30, seedingTimeLimit: 40);
-
-            var item = Subject.GetItems().Single();
-            item.CanBeRemoved.Should().BeFalse();
-            item.CanMoveFiles.Should().BeFalse();
-        }
-
-        [Test]
-        public void should_be_removable_and_should_allow_move_files_if_max_seedingtime_reached_but_ratio_not_and_paused()
-        {
-            GivenGlobalSeedLimits(2.0f, 20);
-            GivenCompletedTorrent("pausedUP", ratio: 1.0f, seedingTime: 30);
+            var torrent = new QBittorrentTorrent
+            {
+                Hash = "HASH",
+                Name = _title,
+                Size = 1000,
+                Progress = 1.0,
+                Eta = 8640000,
+                State = "pausedUP",
+                Label = "",
+                SavePath = "",
+                Ratio = 1.0f
+            };
+            GivenTorrents(new List<QBittorrentTorrent> { torrent });
 
             var item = Subject.GetItems().Single();
             item.CanBeRemoved.Should().BeTrue();
@@ -560,7 +450,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
         public void should_get_category_from_the_category_if_set()
         {
             const string category = "tv-sonarr";
-            GivenGlobalSeedLimits(1.0f);
+            GivenMaxRatio(1.0f);
 
             var torrent = new QBittorrentTorrent
             {
@@ -585,7 +475,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
         public void should_get_category_from_the_label_if_the_category_is_not_available()
         {
             const string category = "tv-sonarr";
-            GivenGlobalSeedLimits(1.0f);
+            GivenMaxRatio(1.0f);
 
             var torrent = new QBittorrentTorrent
             {
@@ -618,19 +508,5 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
             torrent.Eta.ToString().Should().Be("18446744073709335000");
 
         }
-
-        [Test]
-        public void Test_should_force_api_version_check()
-        {
-            // Set TestConnection up to fail quick
-            Mocker.GetMock<IQBittorrentProxy>()
-                  .Setup(v => v.GetApiVersion(It.IsAny<QBittorrentSettings>()))
-                  .Returns(new Version(1, 0));
-
-            Subject.Test();
-
-            Mocker.GetMock<IQBittorrentProxySelector>()
-                  .Verify(v => v.GetProxy(It.IsAny<QBittorrentSettings>(), true), Times.Once());
-        }
     }
 }

src/NzbDrone.Core.Test/Framework/CoreTest.cs

@@ -23,8 +23,8 @@ namespace NzbDrone.Core.Test.Framework
 
             Mocker.SetConstant<IHttpProxySettingsProvider>(new HttpProxySettingsProvider(Mocker.Resolve<ConfigService>()));
             Mocker.SetConstant<ICreateManagedWebProxy>(new ManagedWebProxyFactory(Mocker.Resolve<CacheManager>()));
-            Mocker.SetConstant<ManagedHttpDispatcher>(new ManagedHttpDispatcher(Mocker.Resolve<IHttpProxySettingsProvider>(), Mocker.Resolve<ICreateManagedWebProxy>(), Mocker.Resolve<UserAgentBuilder>(), Mocker.Resolve<IPlatformInfo>(), TestLogger));
-            Mocker.SetConstant<CurlHttpDispatcher>(new CurlHttpDispatcher(Mocker.Resolve<IHttpProxySettingsProvider>(), Mocker.Resolve<UserAgentBuilder>(), TestLogger));
+            Mocker.SetConstant<ManagedHttpDispatcher>(new ManagedHttpDispatcher(Mocker.Resolve<IHttpProxySettingsProvider>(), Mocker.Resolve<ICreateManagedWebProxy>(), Mocker.Resolve<UserAgentBuilder>()));
+            Mocker.SetConstant<CurlHttpDispatcher>(new CurlHttpDispatcher(Mocker.Resolve<IHttpProxySettingsProvider>(), Mocker.Resolve<UserAgentBuilder>(), Mocker.Resolve<NLog.Logger>()));
             Mocker.SetConstant<IHttpProvider>(new HttpProvider(TestLogger));
             Mocker.SetConstant<IHttpClient>(new HttpClient(new IHttpRequestInterceptor[0], Mocker.Resolve<CacheManager>(), Mocker.Resolve<RateLimitService>(), Mocker.Resolve<FallbackHttpDispatcher>(), Mocker.Resolve<UserAgentBuilder>(), TestLogger));
             Mocker.SetConstant<ISonarrCloudRequestBuilder>(new SonarrCloudRequestBuilder());

src/NzbDrone.Core.Test/IndexerTests/IndexerStatusServiceFixture.cs

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

src/NzbDrone.Core.Test/MediaFiles/ImportApprovedEpisodesFixture.cs

@@ -5,7 +5,6 @@ using FizzWare.NBuilder;
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
-using NzbDrone.Common.Disk;
 using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.MediaFiles;
@@ -35,8 +34,6 @@ namespace NzbDrone.Core.Test.MediaFiles
             _rejectedDecisions = new List<ImportDecision>();
             _approvedDecisions = new List<ImportDecision>();
 
-            var outputPath = @"C:\Test\Unsorted\TV\30.Rock.S01E01".AsOsAgnostic();
-
             var series = Builder<Series>.CreateNew()
                                         .With(e => e.Profile = new Profile { Items = Qualities.QualityFixture.GetDefaultQualities() })
                                         .With(s => s.Path = @"C:\Test\TV\30 Rock".AsOsAgnostic())
@@ -69,14 +66,7 @@ namespace NzbDrone.Core.Test.MediaFiles
                   .Setup(s => s.UpgradeEpisodeFile(It.IsAny<EpisodeFile>(), It.IsAny<LocalEpisode>(), It.IsAny<bool>()))
                   .Returns(new EpisodeFileMoveResult());
 
-            _downloadClientItem = Builder<DownloadClientItem>.CreateNew()
-                                                             .With(d => d.OutputPath = new OsPath(outputPath))
-                                                             .Build();
-        }
-
-        private void GivenNewDownload()
-        {
-            _approvedDecisions.ForEach(a => a.LocalEpisode.Path = Path.Combine(_downloadClientItem.OutputPath.ToString(), Path.GetFileName(a.LocalEpisode.Path)));
+            _downloadClientItem = Builder<DownloadClientItem>.CreateNew().Build();
         }
 
         [Test]
@@ -150,7 +140,6 @@ namespace NzbDrone.Core.Test.MediaFiles
         [Test]
         public void should_use_nzb_title_as_scene_name()
         {
-            GivenNewDownload();
             _downloadClientItem.Title = "malcolm.in.the.middle.s02e05.dvdrip.xvid-ingot";
 
             Subject.Import(new List<ImportDecision> { _approvedDecisions.First() }, true, _downloadClientItem);
@@ -163,7 +152,6 @@ namespace NzbDrone.Core.Test.MediaFiles
         [TestCase(".nzb")]
         public void should_remove_extension_from_nzb_title_for_scene_name(string extension)
         {
-            GivenNewDownload();
             var title = "malcolm.in.the.middle.s02e05.dvdrip.xvid-ingot";
 
             _downloadClientItem.Title = title + extension;
@@ -176,8 +164,7 @@ namespace NzbDrone.Core.Test.MediaFiles
         [Test]
         public void should_not_use_nzb_title_as_scene_name_if_full_season()
         {
-            GivenNewDownload();
-            _approvedDecisions.First().LocalEpisode.Path = Path.Combine(_downloadClientItem.OutputPath.ToString(), "malcolm.in.the.middle.s02e23.dvdrip.xvid-ingot.mkv");
+            _approvedDecisions.First().LocalEpisode.Path = "c:\\tv\\season1\\malcolm.in.the.middle.s02e23.dvdrip.xvid-ingot.mkv".AsOsAgnostic();
             _downloadClientItem.Title = "malcolm.in.the.middle.s02.dvdrip.xvid-ingot";
 
             Subject.Import(new List<ImportDecision> { _approvedDecisions.First() }, true, _downloadClientItem);
@@ -188,8 +175,7 @@ namespace NzbDrone.Core.Test.MediaFiles
         [Test]
         public void should_use_file_name_as_scenename_only_if_it_looks_like_scenename()
         {
-            GivenNewDownload();
-            _approvedDecisions.First().LocalEpisode.Path = Path.Combine(_downloadClientItem.OutputPath.ToString(), "malcolm.in.the.middle.s02e23.dvdrip.xvid-ingot.mkv");
+            _approvedDecisions.First().LocalEpisode.Path = "c:\\tv\\malcolm.in.the.middle.s02e23.dvdrip.xvid-ingot.mkv".AsOsAgnostic();
 
             Subject.Import(new List<ImportDecision> { _approvedDecisions.First() }, true);
 
@@ -199,8 +185,7 @@ namespace NzbDrone.Core.Test.MediaFiles
         [Test]
         public void should_not_use_file_name_as_scenename_if_it_doesnt_looks_like_scenename()
         {
-            GivenNewDownload();
-            _approvedDecisions.First().LocalEpisode.Path = Path.Combine(_downloadClientItem.OutputPath.ToString(), "aaaaa.mkv");
+            _approvedDecisions.First().LocalEpisode.Path = "c:\\tv\\aaaaa.mkv".AsOsAgnostic();
 
             Subject.Import(new List<ImportDecision> { _approvedDecisions.First() }, true);
 
@@ -238,11 +223,7 @@ namespace NzbDrone.Core.Test.MediaFiles
         [Test]
         public void should_copy_when_cannot_move_files_downloads()
         {
-            GivenNewDownload();
-            _downloadClientItem.Title = "30.Rock.S01E01";
-            _downloadClientItem.CanMoveFiles = false;
-
-            Subject.Import(new List<ImportDecision> { _approvedDecisions.First() }, true, _downloadClientItem);
+            Subject.Import(new List<ImportDecision> { _approvedDecisions.First() }, true, new DownloadClientItem { Title = "30.Rock.S01E01", CanMoveFiles = false});
 
             Mocker.GetMock<IUpgradeMediaFiles>()
                   .Verify(v => v.UpgradeEpisodeFile(It.IsAny<EpisodeFile>(), _approvedDecisions.First().LocalEpisode, true), Times.Once());
@@ -251,155 +232,10 @@ namespace NzbDrone.Core.Test.MediaFiles
         [Test]
         public void should_use_override_importmode()
         {
-            GivenNewDownload();
-            _downloadClientItem.Title = "30.Rock.S01E01";
-            _downloadClientItem.CanMoveFiles = false;
-
-            Subject.Import(new List<ImportDecision> { _approvedDecisions.First() }, true, _downloadClientItem, ImportMode.Move);
+            Subject.Import(new List<ImportDecision> { _approvedDecisions.First() }, true, new DownloadClientItem { Title = "30.Rock.S01E01", CanMoveFiles = false }, ImportMode.Move);
 
             Mocker.GetMock<IUpgradeMediaFiles>()
                   .Verify(v => v.UpgradeEpisodeFile(It.IsAny<EpisodeFile>(), _approvedDecisions.First().LocalEpisode, false), Times.Once());
         }
-
-        [Test]
-        public void should_use_file_name_only_for_download_client_item_without_a_job_folder()
-        {
-            var fileName = "Series.Title.S01E01.720p.HDTV.x264-Sonarr.mkv";
-            var path = Path.Combine(@"C:\Test\Unsorted\TV\".AsOsAgnostic(), fileName);
-
-            _downloadClientItem.OutputPath = new OsPath(path);
-            _approvedDecisions.First().LocalEpisode.Path = path;
-
-            Subject.Import(new List<ImportDecision> { _approvedDecisions.First() }, true, _downloadClientItem);
-
-            Mocker.GetMock<IMediaFileService>().Verify(v => v.Add(It.Is<EpisodeFile>(c => c.OriginalFilePath == fileName)));
-        }
-
-        [Test]
-        public void should_use_folder_and_file_name_only_for_download_client_item_with_a_job_folder()
-        {
-            var name = "Series.Title.S01E01.720p.HDTV.x264-Sonarr";
-            var outputPath = Path.Combine(@"C:\Test\Unsorted\TV\".AsOsAgnostic(), name);
-
-            _downloadClientItem.OutputPath = new OsPath(outputPath);
-            _approvedDecisions.First().LocalEpisode.Path = Path.Combine(outputPath, name + ".mkv");
-
-            Subject.Import(new List<ImportDecision> { _approvedDecisions.First() }, true, _downloadClientItem);
-
-            Mocker.GetMock<IMediaFileService>().Verify(v => v.Add(It.Is<EpisodeFile>(c => c.OriginalFilePath == $"{name}\\{name}.mkv".AsOsAgnostic())));
-        }
-
-        [Test]
-        public void should_include_intermediate_folders_for_download_client_item_with_a_job_folder()
-        {
-            var name = "Series.Title.S01E01.720p.HDTV.x264-Sonarr";
-            var outputPath = Path.Combine(@"C:\Test\Unsorted\TV\".AsOsAgnostic(), name);
-
-            _downloadClientItem.OutputPath = new OsPath(outputPath);
-            _approvedDecisions.First().LocalEpisode.Path = Path.Combine(outputPath, "subfolder", name + ".mkv");
-
-            Subject.Import(new List<ImportDecision> { _approvedDecisions.First() }, true, _downloadClientItem);
-
-            Mocker.GetMock<IMediaFileService>().Verify(v => v.Add(It.Is<EpisodeFile>(c => c.OriginalFilePath == $"{name}\\subfolder\\{name}.mkv".AsOsAgnostic())));
-        }
-
-        [Test]
-        public void should_use_folder_info_release_title_to_find_relative_path()
-        {
-            var name = "Series.Title.S01E01.720p.HDTV.x264-Sonarr";
-            var outputPath = Path.Combine(@"C:\Test\Unsorted\TV\".AsOsAgnostic(), name);
-            var localEpisode = _approvedDecisions.First().LocalEpisode;
-
-            localEpisode.FolderEpisodeInfo = new ParsedEpisodeInfo { ReleaseTitle = name };
-            localEpisode.Path = Path.Combine(outputPath, "subfolder", name + ".mkv");
-
-            Subject.Import(new List<ImportDecision> { _approvedDecisions.First() }, true, null);
-
-            Mocker.GetMock<IMediaFileService>().Verify(v => v.Add(It.Is<EpisodeFile>(c => c.OriginalFilePath == $"{name}\\subfolder\\{name}.mkv".AsOsAgnostic())));
-        }
-
-        [Test]
-        public void should_get_relative_path_when_there_is_no_grandparent_windows()
-        {
-            WindowsOnly();
-
-            var name = "Series.Title.S01E01.720p.HDTV.x264-Sonarr";
-            var outputPath = @"C:\";
-            var localEpisode = _approvedDecisions.First().LocalEpisode;
-
-            localEpisode.FolderEpisodeInfo = new ParsedEpisodeInfo { ReleaseTitle = name };
-            localEpisode.Path = Path.Combine(outputPath, name + ".mkv");
-
-            Subject.Import(new List<ImportDecision> { _approvedDecisions.First() }, true, null);
-
-            Mocker.GetMock<IMediaFileService>().Verify(v => v.Add(It.Is<EpisodeFile>(c => c.OriginalFilePath == $"{name}.mkv".AsOsAgnostic())));
-        }
-
-        [Test]
-        public void should_get_relative_path_when_there_is_no_grandparent_mono()
-        {
-            MonoOnly();
-
-            var name = "Series.Title.S01E01.720p.HDTV.x264-Sonarr";
-            var outputPath = "/";
-            var localEpisode = _approvedDecisions.First().LocalEpisode;
-
-            localEpisode.FolderEpisodeInfo = new ParsedEpisodeInfo { ReleaseTitle = name };
-            localEpisode.Path = Path.Combine(outputPath, name + ".mkv");
-
-            Subject.Import(new List<ImportDecision> { _approvedDecisions.First() }, true, null);
-
-            Mocker.GetMock<IMediaFileService>().Verify(v => v.Add(It.Is<EpisodeFile>(c => c.OriginalFilePath == $"{name}.mkv".AsOsAgnostic())));
-        }
-
-        [Test]
-        public void should_get_relative_path_when_there_is_no_grandparent_for_UNC_path()
-        {
-            WindowsOnly();
-
-            var name = "Series.Title.S01E01.720p.HDTV.x264-Sonarr";
-            var outputPath = @"\\server\share";
-            var localEpisode = _approvedDecisions.First().LocalEpisode;
-
-            localEpisode.FolderEpisodeInfo = new ParsedEpisodeInfo { ReleaseTitle = name };
-            localEpisode.Path = Path.Combine(outputPath, name + ".mkv");
-
-            Subject.Import(new List<ImportDecision> { _approvedDecisions.First() }, true, null);
-
-            Mocker.GetMock<IMediaFileService>().Verify(v => v.Add(It.Is<EpisodeFile>(c => c.OriginalFilePath == $"{name}.mkv")));
-        }
-
-        [Test]
-        public void should_use_folder_info_release_title_to_find_relative_path_when_file_is_not_in_download_client_item_output_directory()
-        {
-            var name = "Series.Title.S01E01.720p.HDTV.x264-Sonarr";
-            var outputPath = Path.Combine(@"C:\Test\Unsorted\TV\".AsOsAgnostic(), name);
-            var localEpisode = _approvedDecisions.First().LocalEpisode;
-
-            _downloadClientItem.OutputPath = new OsPath(Path.Combine(@"C:\Test\Unsorted\TV-Other\".AsOsAgnostic(), name));
-            localEpisode.FolderEpisodeInfo = new ParsedEpisodeInfo { ReleaseTitle = name };
-            localEpisode.Path = Path.Combine(outputPath, "subfolder", name + ".mkv");
-
-            Subject.Import(new List<ImportDecision> { _approvedDecisions.First() }, true, _downloadClientItem);
-
-            Mocker.GetMock<IMediaFileService>().Verify(v => v.Add(It.Is<EpisodeFile>(c => c.OriginalFilePath == $"{name}\\subfolder\\{name}.mkv".AsOsAgnostic())));
-        }
-
-        [Test]
-        public void should_use_folder_info_release_title_to_find_relative_path_when_download_client_item_has_an_empty_output_path()
-        {
-            var name = "Series.Title.S01E01.720p.HDTV.x264-Sonarr";
-            var outputPath = Path.Combine(@"C:\Test\Unsorted\TV\".AsOsAgnostic(), name);
-            var localEpisode = _approvedDecisions.First().LocalEpisode;
-
-            _downloadClientItem.OutputPath = new OsPath();
-            localEpisode.FolderEpisodeInfo = new ParsedEpisodeInfo { ReleaseTitle = name };
-            localEpisode.Path = Path.Combine(outputPath, "subfolder", name + ".mkv");
-
-            Subject.Import(new List<ImportDecision> { _approvedDecisions.First() }, true, _downloadClientItem);
-
-            Mocker.GetMock<IMediaFileService>().Verify(v => v.Add(It.Is<EpisodeFile>(c => c.OriginalFilePath == $"{name}\\subfolder\\{name}.mkv".AsOsAgnostic())));
-        }
-
     }
 }

src/NzbDrone.Core.Test/MetadataSource/SkyHook/SkyHookProxySearchFixture.cs

@@ -44,12 +44,12 @@ namespace NzbDrone.Core.Test.MetadataSource.SkyHook
         [TestCase("tvdbid: 0")]
         [TestCase("tvdbid: -12")]
         [TestCase("tvdbid:289578")]
-        [TestCase("adjalkwdjkalwdjklawjdlKAJD")]
+        [TestCase("adjalkwdjkalwdjklawjdlKAJD;EF")]
         public void no_search_result(string term)
         {
             var result = Subject.SearchForNewSeries(term);
             result.Should().BeEmpty();
-
+            
             ExceptionVerification.IgnoreWarns();
         }
     }

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

@@ -136,29 +136,5 @@ namespace NzbDrone.Core.Test.ParserTests
             result.SeriesTitle.Should().Be(title);
             result.FullSeason.Should().BeFalse();
         }
-
-        [TestCase("[Vivid] Living Sky Saga S01 [Web][MKV][h264 10-bit][1080p][AAC 2.0]", "Living Sky Saga", 1)]
-        public void should_parse_anime_season_packs(string postTitle, string title, int seasonNumber)
-        {
-            var result = Parser.Parser.ParseTitle(postTitle);
-            result.Should().NotBeNull();
-            result.AbsoluteEpisodeNumbers.Should().BeEmpty();
-            result.SeriesTitle.Should().Be(title);
-            result.FullSeason.Should().BeTrue();
-            result.SeasonNumber.Should().Be(seasonNumber);
-        }
-
-        [TestCase("[HorribleSubs] Goblin Slayer - 10.5 [1080p].mkv", "Goblin Slayer", 10.5)]
-        public void should_handle_anime_recap_numbering(string postTitle, string title, double specialEpisodeNumber)
-        {
-            var result = Parser.Parser.ParseTitle(postTitle);
-            result.Should().NotBeNull();
-            result.SeriesTitle.Should().Be(title);
-            result.AbsoluteEpisodeNumbers.Should().BeEmpty();
-            result.SpecialAbsoluteEpisodeNumbers.Should().NotBeEmpty();
-            result.SpecialAbsoluteEpisodeNumbers.Should().BeEquivalentTo(new[] { (decimal)specialEpisodeNumber });
-            result.FullSeason.Should().BeFalse();
-        }
-
     }
 }

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

@@ -87,13 +87,6 @@ namespace NzbDrone.Core.Test.ParserTests
                 "Fargo",
                 Quality.WEBDL1080p,
                 "RARBG"
-            },
-            new object[]
-            {
-                @"C:\Test\XxQVHK4GJMP3n2dLpmhW\XxQVHK4GJMP3n2dLpmhW\MKV\010E70S.yhcranA.fo.snoS.mkv".AsOsAgnostic(),
-                "Sons of Anarchy",
-                Quality.HDTV720p,
-                null
             }
         };
 

src/NzbDrone.Core.Test/ThingiProviderTests/ProviderStatusServiceFixture.cs

@@ -1,10 +1,9 @@
-using System;
+using System;
 using System.Linq;
 using FluentAssertions;
 using Moq;
 using NLog;
 using NUnit.Framework;
-using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Core.ThingiProvider;
@@ -26,8 +25,8 @@ namespace NzbDrone.Core.Test.ThingiProviderTests
 
     public class MockProviderStatusService : ProviderStatusServiceBase<IMockProvider, MockProviderStatus>
     {
-        public MockProviderStatusService(IMockProviderStatusRepository providerStatusRepository, IEventAggregator eventAggregator, IRuntimeInfo runtimeInfo, Logger logger)
-            : base(providerStatusRepository, eventAggregator, runtimeInfo, logger)
+        public MockProviderStatusService(IMockProviderStatusRepository providerStatusRepository, IEventAggregator eventAggregator, Logger logger)
+            : base(providerStatusRepository, eventAggregator, logger)
         {
 
         }
@@ -41,20 +40,9 @@ namespace NzbDrone.Core.Test.ThingiProviderTests
         public void SetUp()
         {
             _epoch = DateTime.UtcNow;
-
-            Mocker.GetMock<IRuntimeInfo>()
-                .SetupGet(v => v.StartTime)
-                .Returns(_epoch - TimeSpan.FromHours(1));
         }
 
-        private void GivenRecentStartup()
-        {
-            Mocker.GetMock<IRuntimeInfo>()
-                .SetupGet(v => v.StartTime)
-                .Returns(_epoch - TimeSpan.FromMinutes(12));
-        }
-
-        private MockProviderStatus WithStatus(MockProviderStatus status)
+        private void WithStatus(MockProviderStatus status)
         {
             Mocker.GetMock<IMockProviderStatusRepository>()
                 .Setup(v => v.FindByProviderId(1))
@@ -63,8 +51,6 @@ namespace NzbDrone.Core.Test.ThingiProviderTests
             Mocker.GetMock<IMockProviderStatusRepository>()
                 .Setup(v => v.All())
                 .Returns(new[] { status });
-
-            return status;
         }
 
         private void VerifyUpdate()
@@ -136,32 +122,5 @@ namespace NzbDrone.Core.Test.ThingiProviderTests
             status.DisabledTill.Should().HaveValue();
             status.DisabledTill.Value.Should().BeCloseTo(_epoch + TimeSpan.FromMinutes(15), 500);
         }
-
-        [Test]
-        public void should_not_escalate_further_till_after_5_minutes_since_startup()
-        {
-            GivenRecentStartup();
-
-            var origStatus = WithStatus(new MockProviderStatus
-            {
-                InitialFailure = _epoch - TimeSpan.FromMinutes(6),
-                MostRecentFailure = _epoch - TimeSpan.FromSeconds(120),
-                EscalationLevel = 3
-            });
-
-            Subject.RecordFailure(1);
-            Subject.RecordFailure(1);
-            Subject.RecordFailure(1);
-            Subject.RecordFailure(1);
-            Subject.RecordFailure(1);
-            Subject.RecordFailure(1);
-            Subject.RecordFailure(1);
-
-            var status = Subject.GetBlockedProviders().FirstOrDefault();
-            status.Should().NotBeNull();
-
-            origStatus.EscalationLevel.Should().Be(3);
-            status.DisabledTill.Should().BeCloseTo(_epoch + TimeSpan.FromMinutes(5), 500);
-        }
     }
 }

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

@@ -9,7 +9,6 @@ using NzbDrone.Common.Extensions;
 using NzbDrone.Core.MetadataSource.SkyHook;
 using NzbDrone.Core.Tv;
 using NzbDrone.Core.Test.Framework;
-using NzbDrone.Test.Common;
 
 namespace NzbDrone.Core.Test.TvTests
 {
@@ -78,14 +77,12 @@ namespace NzbDrone.Core.Test.TvTests
         {
             Mocker.GetMock<IEpisodeService>().Setup(c => c.GetEpisodeBySeries(It.IsAny<int>()))
                 .Returns(new List<Episode>());
-            
+
             Subject.RefreshEpisodeInfo(GetSeries(), GetEpisodes());
 
             _insertedEpisodes.Should().HaveSameCount(GetEpisodes());
             _updatedEpisodes.Should().BeEmpty();
             _deletedEpisodes.Should().BeEmpty();
-
-            ExceptionVerification.ExpectedWarns(1);
         }
 
         [Test]
@@ -149,63 +146,6 @@ namespace NzbDrone.Core.Test.TvTests
             _updatedEpisodes.Should().OnlyContain(e => e.Monitored == true);
         }
 
-        [Test]
-        public void should_not_set_monitored_status_for_old_episodes_to_false_if_recent_enough()
-        {
-            var series = GetSeries();
-            series.Seasons = new List<Season>();
-            series.Seasons.Add(new Season { SeasonNumber = 1, Monitored = true });
-
-            var episodes = GetEpisodes().OrderBy(v => v.SeasonNumber).ThenBy(v => v.EpisodeNumber).Take(5).ToList();
-
-            episodes[1].AirDateUtc = DateTime.UtcNow.AddDays(-15);
-            episodes[2].AirDateUtc = DateTime.UtcNow.AddDays(-10);
-            episodes[3].AirDateUtc = DateTime.UtcNow.AddDays(1);
-
-            var existingEpisodes = episodes.Skip(4).ToList();
-
-            Mocker.GetMock<IEpisodeService>().Setup(c => c.GetEpisodeBySeries(It.IsAny<int>()))
-                .Returns(existingEpisodes);
-
-            Subject.RefreshEpisodeInfo(series, episodes);
-
-            _insertedEpisodes = _insertedEpisodes.OrderBy(v => v.EpisodeNumber).ToList();
-
-            _insertedEpisodes.Should().HaveCount(4);
-            _insertedEpisodes[0].Monitored.Should().Be(true);
-            _insertedEpisodes[1].Monitored.Should().Be(true);
-            _insertedEpisodes[2].Monitored.Should().Be(true);
-            _insertedEpisodes[3].Monitored.Should().Be(true);
-        }
-
-        [Test]
-        public void should_set_monitored_status_for_old_episodes_to_false_if_no_episodes_existed()
-        {
-            var series = GetSeries();
-            series.Seasons = new List<Season>();
-
-            var episodes = GetEpisodes().OrderBy(v => v.SeasonNumber).ThenBy(v => v.EpisodeNumber).Take(4).ToList();
-
-            episodes[1].AirDateUtc = DateTime.UtcNow.AddDays(-15);
-            episodes[2].AirDateUtc = DateTime.UtcNow.AddDays(-10);
-            episodes[3].AirDateUtc = DateTime.UtcNow.AddDays(1);
-
-            Mocker.GetMock<IEpisodeService>().Setup(c => c.GetEpisodeBySeries(It.IsAny<int>()))
-                .Returns(new List<Episode>());
-
-            Subject.RefreshEpisodeInfo(series, episodes);
-
-            _insertedEpisodes = _insertedEpisodes.OrderBy(v => v.EpisodeNumber).ToList();
-
-            _insertedEpisodes.Should().HaveSameCount(episodes);
-            _insertedEpisodes[0].Monitored.Should().Be(false);
-            _insertedEpisodes[1].Monitored.Should().Be(false);
-            _insertedEpisodes[2].Monitored.Should().Be(false);
-            _insertedEpisodes[3].Monitored.Should().Be(true);
-
-            ExceptionVerification.ExpectedWarns(1);
-        }
-
         [Test]
         public void should_remove_duplicate_remote_episodes_before_processing()
         {

src/NzbDrone.Core/Analytics/AnalyticsService.cs

@@ -1,40 +1,22 @@
-using System;
-using System.Linq;
-using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Datastore;
-using NzbDrone.Core.History;
 
 namespace NzbDrone.Core.Analytics
 {
     public interface IAnalyticsService
     {
         bool IsEnabled { get; }
-        bool InstallIsActive { get; }
     }
 
     public class AnalyticsService : IAnalyticsService
     {
         private readonly IConfigFileProvider _configFileProvider;
-        private readonly IHistoryService _historyService;
 
-        public AnalyticsService(IHistoryService historyService, IConfigFileProvider configFileProvider)
+        public AnalyticsService(IConfigFileProvider configFileProvider)
         {
             _configFileProvider = configFileProvider;
-            _historyService = historyService;
         }
 
         public bool IsEnabled => _configFileProvider.AnalyticsEnabled && RuntimeInfo.IsProduction;
-
-        public bool InstallIsActive
-        {
-            get
-            {
-                var lastRecord = _historyService.Paged(new PagingSpec<History.History>() { Page = 0, PageSize = 1, SortKey = "date", SortDirection = SortDirection.Descending });
-                var monthAgo = DateTime.UtcNow.AddMonths(-1);
-
-                return lastRecord.Records.Any(v => v.Date > monthAgo); 
-            }
-        }
     }
-}
+}

src/NzbDrone.Core/Datastore/ConnectionStringFactory.cs

@@ -1,7 +1,10 @@
 using System;
 using System.Data.SQLite;
+using NLog;
+using NzbDrone.Common.Disk;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Extensions;
+using NzbDrone.Common.Instrumentation;
 
 namespace NzbDrone.Core.Datastore
 {
@@ -14,10 +17,20 @@ namespace NzbDrone.Core.Datastore
 
     public class ConnectionStringFactory : IConnectionStringFactory
     {
-        public ConnectionStringFactory(IAppFolderInfo appFolderInfo)
+        private static readonly Logger Logger = NzbDroneLogger.GetLogger(typeof(ConnectionStringFactory));
+
+        public ConnectionStringFactory(IAppFolderInfo appFolderInfo, IDiskProvider diskProvider)
         {
-            MainDbConnectionString = GetConnectionString(appFolderInfo.GetNzbDroneDatabase());
-            LogDbConnectionString = GetConnectionString(appFolderInfo.GetLogDatabase());
+            var mount = diskProvider.GetMount(appFolderInfo.AppDataFolder);
+            var isNetworkDrive = mount.DriveType == System.IO.DriveType.Network;
+            if (isNetworkDrive)
+            {
+                Logger.Warn("AppData folder {0} is located on the network drive {1} using a {2} filesystem. Is highly discouraged to use a SQLite database on network drives and may lead to database corruption.",
+                    appFolderInfo.AppDataFolder, mount.RootDirectory, mount.DriveFormat);
+            }
+
+            MainDbConnectionString = GetConnectionString(appFolderInfo.GetNzbDroneDatabase(), isNetworkDrive);
+            LogDbConnectionString = GetConnectionString(appFolderInfo.GetLogDatabase(), isNetworkDrive);
         }
 
         public string MainDbConnectionString { get; private set; }
@@ -30,14 +43,14 @@ namespace NzbDrone.Core.Datastore
             return connectionBuilder.DataSource;
         }
 
-        private static string GetConnectionString(string dbPath)
+        private static string GetConnectionString(string dbPath, bool isNetworkDrive)
         {
             var connectionBuilder = new SQLiteConnectionStringBuilder();
 
             connectionBuilder.DataSource = dbPath;
-            connectionBuilder.CacheSize = (int)-10000;
+            connectionBuilder.CacheSize = (int)-10.Megabytes();
             connectionBuilder.DateTimeKind = DateTimeKind.Utc;
-            connectionBuilder.JournalMode = OsInfo.IsOsx ? SQLiteJournalModeEnum.Truncate : SQLiteJournalModeEnum.Wal;
+            connectionBuilder.JournalMode = OsInfo.IsOsx || isNetworkDrive ? SQLiteJournalModeEnum.Truncate : SQLiteJournalModeEnum.Wal;
             connectionBuilder.Pooling = true;
             connectionBuilder.Version = 3;
             

src/NzbDrone.Core/Datastore/Migration/129_add_relative_original_path_to_episode_file.cs

@@ -1,14 +0,0 @@
-using FluentMigrator;
-using NzbDrone.Core.Datastore.Migration.Framework;
-
-namespace NzbDrone.Core.Datastore.Migration
-{
-    [Migration(129)]
-    public class add_relative_original_path_to_episode_file : NzbDroneMigrationBase
-    {
-        protected override void MainDbUpgrade()
-        {
-            Alter.Table("EpisodeFiles").AddColumn("OriginalFilePath").AsString().Nullable();
-        }
-    }
-}

src/NzbDrone.Core/Datastore/Migration/130_episode_last_searched_time.cs

@@ -1,14 +0,0 @@
-using FluentMigrator;
-using NzbDrone.Core.Datastore.Migration.Framework;
-
-namespace NzbDrone.Core.Datastore.Migration
-{
-    [Migration(130)]
-    public class episode_last_searched_time : NzbDroneMigrationBase
-    {
-        protected override void MainDbUpgrade()
-        {
-            Alter.Table("Episodes").AddColumn("LastSearchTime").AsDateTime().Nullable();
-        }
-    }
-}

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

@@ -198,7 +198,7 @@ namespace NzbDrone.Core.Download.Clients.Deluge
         protected override void Test(List<ValidationFailure> failures)
         {
             failures.AddIfNotNull(TestConnection());
-            if (failures.HasErrors()) return;
+            if (failures.Any()) return;
             failures.AddIfNotNull(TestCategory());
             failures.AddIfNotNull(TestGetTorrents());
         }

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

@@ -48,25 +48,9 @@ namespace NzbDrone.Core.Download.Clients.Deluge
 
         public string GetVersion(DelugeSettings settings)
         {
-            try
-            {
-                var response = ProcessRequest<string>(settings, "daemon.info");
+            var response = ProcessRequest<string>(settings, "daemon.info");
 
-                return response;
-            }
-            catch (DownloadClientException ex)
-            {
-                if (ex.Message.Contains("Unknown method"))
-                {
-                    // Deluge v2 beta replaced 'daemon.info' with 'daemon.get_version'.
-                    // It may return or become official, for now we just retry with the get_version api.
-                    var response = ProcessRequest<string>(settings, "daemon.get_version");
-
-                    return response;
-                }
-
-                throw;
-            }
+            return response;
         }
 
         public Dictionary<string, object> GetConfig(DelugeSettings settings)

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

@@ -194,7 +194,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
         protected override void Test(List<ValidationFailure> failures)
         {
             failures.AddIfNotNull(TestConnection());
-            if (failures.HasErrors()) return;
+            if (failures.Any()) return;
             failures.AddIfNotNull(TestOutputPath());
             failures.AddIfNotNull(TestGetTorrents());
         }

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

@@ -189,7 +189,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
         protected override void Test(List<ValidationFailure> failures)
         {
             failures.AddIfNotNull(TestConnection());
-            if (failures.HasErrors()) return;
+            if (failures.Any()) return;
             failures.AddIfNotNull(TestOutputPath());
             failures.AddIfNotNull(TestGetNZB());
         }

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

@@ -130,7 +130,7 @@ namespace NzbDrone.Core.Download.Clients.Hadouken
         protected override void Test(List<ValidationFailure> failures)
         {
             failures.AddIfNotNull(TestConnection());
-            if (failures.HasErrors()) return;
+            if (failures.Any()) return;
             failures.AddIfNotNull(TestGetTorrents());
         }
 

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

@@ -17,9 +17,9 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
 {
     public class QBittorrent : TorrentClientBase<QBittorrentSettings>
     {
-        private readonly IQBittorrentProxySelector _proxySelector;
+        private readonly IQBittorrentProxy _proxy;
 
-        public QBittorrent(IQBittorrentProxySelector proxySelector,
+        public QBittorrent(IQBittorrentProxy proxy,
                            ITorrentFileInfoReader torrentFileInfoReader,
                            IHttpClient httpClient,
                            IConfigService configService,
@@ -28,23 +28,16 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
                            Logger logger)
             : base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, logger)
         {
-            _proxySelector = proxySelector;
+            _proxy = proxy;
         }
 
-        private IQBittorrentProxy Proxy => _proxySelector.GetProxy(Settings);
-
         protected override string AddFromMagnetLink(RemoteEpisode remoteEpisode, string hash, string magnetLink)
         {
-            if (!Proxy.GetConfig(Settings).DhtEnabled && !magnetLink.Contains("&tr="))
-            {
-                throw new NotSupportedException("Magnet Links without trackers not supported if DHT is disabled");
-            }
-
-            Proxy.AddTorrentFromUrl(magnetLink, Settings);
+            _proxy.AddTorrentFromUrl(magnetLink, Settings);
 
             if (Settings.TvCategory.IsNotNullOrWhiteSpace())
             {
-                Proxy.SetTorrentLabel(hash.ToLower(), Settings.TvCategory, Settings);
+                _proxy.SetTorrentLabel(hash.ToLower(), Settings.TvCategory, Settings);
             }
 
             var isRecentEpisode = remoteEpisode.IsRecentEpisode();
@@ -52,28 +45,23 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
             if (isRecentEpisode && Settings.RecentTvPriority == (int)QBittorrentPriority.First ||
                 !isRecentEpisode && Settings.OlderTvPriority == (int)QBittorrentPriority.First)
             {
-                Proxy.MoveTorrentToTopInQueue(hash.ToLower(), Settings);
+                _proxy.MoveTorrentToTopInQueue(hash.ToLower(), Settings);
             }
 
             SetInitialState(hash.ToLower());
 
-            if (remoteEpisode.SeedConfiguration != null && (remoteEpisode.SeedConfiguration.Ratio.HasValue || remoteEpisode.SeedConfiguration.SeedTime.HasValue))
-            {
-                Proxy.SetTorrentSeedingConfiguration(hash.ToLower(), remoteEpisode.SeedConfiguration, Settings);
-            }
-
             return hash;
         }
 
         protected override string AddFromTorrentFile(RemoteEpisode remoteEpisode, string hash, string filename, Byte[] fileContent)
         {
-            Proxy.AddTorrentFromFile(filename, fileContent, Settings);
+            _proxy.AddTorrentFromFile(filename, fileContent, Settings);
 
             try
             {
                 if (Settings.TvCategory.IsNotNullOrWhiteSpace())
                 {
-                    Proxy.SetTorrentLabel(hash.ToLower(), Settings.TvCategory, Settings);
+                    _proxy.SetTorrentLabel(hash.ToLower(), Settings.TvCategory, Settings);
                 }
             }
             catch (Exception ex)
@@ -88,7 +76,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
                 if (isRecentEpisode && Settings.RecentTvPriority == (int)QBittorrentPriority.First ||
                     !isRecentEpisode && Settings.OlderTvPriority == (int)QBittorrentPriority.First)
                 {
-                    Proxy.MoveTorrentToTopInQueue(hash.ToLower(), Settings);
+                    _proxy.MoveTorrentToTopInQueue(hash.ToLower(), Settings);
                 }
             }
             catch (Exception ex)
@@ -98,11 +86,6 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
 
             SetInitialState(hash.ToLower());
 
-            if (remoteEpisode.SeedConfiguration != null && (remoteEpisode.SeedConfiguration.Ratio.HasValue || remoteEpisode.SeedConfiguration.SeedTime.HasValue))
-            {
-                Proxy.SetTorrentSeedingConfiguration(hash.ToLower(), remoteEpisode.SeedConfiguration, Settings);
-            }
-
             return hash;
         }
 
@@ -110,29 +93,28 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
 
         public override IEnumerable<DownloadClientItem> GetItems()
         {
-            var config = Proxy.GetConfig(Settings);
-            var torrents = Proxy.GetTorrents(Settings);
+            var config = _proxy.GetConfig(Settings);
+            var torrents = _proxy.GetTorrents(Settings);
 
             var queueItems = new List<DownloadClientItem>();
 
             foreach (var torrent in torrents)
             {
-                var item = new DownloadClientItem()
-                {
-                    DownloadId = torrent.Hash.ToUpper(),
-                    Category = torrent.Category.IsNotNullOrWhiteSpace() ? torrent.Category : torrent.Label,
-                    Title = torrent.Name,
-                    TotalSize = torrent.Size,
-                    DownloadClient = Definition.Name,
-                    RemainingSize = (long)(torrent.Size * (1.0 - torrent.Progress)),
-                    RemainingTime = GetRemainingTime(torrent),
-                    SeedRatio = torrent.Ratio,
-                    OutputPath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(torrent.SavePath)),
-                };
+                var item = new DownloadClientItem();
+                item.DownloadId = torrent.Hash.ToUpper();
+                item.Category = torrent.Category.IsNotNullOrWhiteSpace() ? torrent.Category : torrent.Label;
+                item.Title = torrent.Name;
+                item.TotalSize = torrent.Size;
+                item.DownloadClient = Definition.Name;
+                item.RemainingSize = (long)(torrent.Size * (1.0 - torrent.Progress));
+                item.RemainingTime = GetRemainingTime(torrent);
+                item.SeedRatio = torrent.Ratio;
+
+                item.OutputPath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(torrent.SavePath));
 
                 // 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 = (torrent.State == "pausedUP" && HasReachedSeedLimit(torrent, config));
+                item.CanMoveFiles = item.CanBeRemoved = (!config.MaxRatioEnabled || config.MaxRatio <= torrent.Ratio) && torrent.State == "pausedUP";
 
                 if (!item.OutputPath.IsEmpty && item.OutputPath.FileName != torrent.Name)
                 {
@@ -170,18 +152,6 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
                         item.Message = "The download is stalled with no connections";
                         break;
 
-                    case "metaDL": // torrent magnet is being downloaded
-                        if (config.DhtEnabled)
-                        {
-                            item.Status = DownloadItemStatus.Queued;
-                        }
-                        else
-                        {
-                            item.Status = DownloadItemStatus.Warning;
-                            item.Message = "qBittorrent cannot resolve magnet link with DHT disabled";
-                        }
-                        break;
-
                     case "downloading": // torrent is being downloaded and data is being transfered
                     default: // new status in API? default to downloading
                         item.Status = DownloadItemStatus.Downloading;
@@ -196,12 +166,12 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
 
         public override void RemoveItem(string hash, bool deleteData)
         {
-            Proxy.RemoveTorrent(hash.ToLower(), deleteData, Settings);
+            _proxy.RemoveTorrent(hash.ToLower(), deleteData, Settings);
         }
 
         public override DownloadClientInfo GetStatus()
         {
-            var config = Proxy.GetConfig(Settings);
+            var config = _proxy.GetConfig(Settings);
 
             var destDir = new OsPath(config.SavePath);
 
@@ -215,7 +185,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
         protected override void Test(List<ValidationFailure> failures)
         {
             failures.AddIfNotNull(TestConnection());
-            if (failures.HasErrors()) return;
+            if (failures.Any()) return;
             failures.AddIfNotNull(TestPrioritySupport());
             failures.AddIfNotNull(TestGetTorrents());
         }
@@ -224,8 +194,8 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
         {
             try
             {
-                var version = _proxySelector.GetProxy(Settings, true).GetApiVersion(Settings);
-                if (version < Version.Parse("1.5"))
+                var version = _proxy.GetVersion(Settings);
+                if (version < 5)
                 {
                     // API version 5 introduced the "save_path" property in /query/torrents
                     return new NzbDroneValidationFailure("Host", "Unsupported client version")
@@ -233,7 +203,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
                         DetailedDescription = "Please upgrade to qBittorrent version 3.2.4 or higher."
                     };
                 }
-                else if (version < Version.Parse("1.6"))
+                else if (version < 6)
                 {
                     // API version 6 introduced support for labels
                     if (Settings.TvCategory.IsNotNullOrWhiteSpace())
@@ -255,8 +225,8 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
                 }
 
                 // Complain if qBittorrent is configured to remove torrents on max ratio
-                var config = Proxy.GetConfig(Settings);
-                if ((config.MaxRatioEnabled || config.MaxSeedingTimeEnabled) && config.RemoveOnMaxRatio)
+                var config = _proxy.GetConfig(Settings);
+                if (config.MaxRatioEnabled && config.RemoveOnMaxRatio)
                 {
                     return new NzbDroneValidationFailure(String.Empty, "qBittorrent is configured to remove torrents when they reach their Share Ratio Limit")
                     {
@@ -305,7 +275,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
 
             try
             {
-                var config = Proxy.GetConfig(Settings);
+                var config = _proxy.GetConfig(Settings);
 
                 if (!config.QueueingEnabled)
                 {
@@ -332,7 +302,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
         {
             try
             {
-                Proxy.GetTorrents(Settings);
+                _proxy.GetTorrents(Settings);
             }
             catch (Exception ex)
             {
@@ -350,13 +320,13 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
                 switch ((QBittorrentState)Settings.InitialState)
                 {
                     case QBittorrentState.ForceStart:
-                        Proxy.SetForceStart(hash, true, Settings);
+                        _proxy.SetForceStart(hash, true, Settings);
                         break;
                     case QBittorrentState.Start:
-                        Proxy.ResumeTorrent(hash, Settings);
+                        _proxy.ResumeTorrent(hash, Settings);
                         break;
                     case QBittorrentState.Pause:
-                        Proxy.PauseTorrent(hash, Settings);
+                        _proxy.PauseTorrent(hash, Settings);
                         break;
                 }
             }
@@ -373,53 +343,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
                 return null;
             }
 
-            // qBittorrent sends eta=8640000 if unknown such as queued
-            if (torrent.Eta == 8640000)
-            {
-                return null;
-            }
-
             return TimeSpan.FromSeconds((int)torrent.Eta);
         }
-
-        protected bool HasReachedSeedLimit(QBittorrentTorrent torrent, QBittorrentPreferences config)
-        {
-            if (torrent.RatioLimit >= 0)
-            {
-                if (torrent.Ratio >= torrent.RatioLimit) return true;
-            }
-            else if (torrent.RatioLimit == -2 && config.MaxRatioEnabled)
-            {
-                if (torrent.Ratio >= config.MaxRatio) return true;
-            }
-
-            if (torrent.SeedingTimeLimit >= 0)
-            {
-                if (!torrent.SeedingTime.HasValue)
-                {
-                    FetchTorrentDetails(torrent);
-                }
-
-                if (torrent.SeedingTime >= torrent.SeedingTimeLimit) return true;
-            }
-            else if (torrent.SeedingTimeLimit == -2 && config.MaxSeedingTimeEnabled)
-            {
-                if (!torrent.SeedingTime.HasValue)
-                {
-                    FetchTorrentDetails(torrent);
-                }
-
-                if (torrent.SeedingTime >= config.MaxSeedingTime) return true;
-            }
-
-            return false;
-        }
-
-        protected void FetchTorrentDetails(QBittorrentTorrent torrent)
-        {
-            var torrentProperties = Proxy.GetTorrentProperties(torrent.Hash, Settings);
-
-            torrent.SeedingTime = torrentProperties.SeedingTime;
-        }
     }
 }

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

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace NzbDrone.Core.Download.Clients.QBittorrent
 {
@@ -14,19 +14,10 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
         [JsonProperty(PropertyName = "max_ratio")]
         public float MaxRatio { get; set; } // Get the global share ratio limit
 
-        [JsonProperty(PropertyName = "max_seeding_time_enabled")]
-        public bool MaxSeedingTimeEnabled { get; set; } // True if share time limit is enabled
-
-        [JsonProperty(PropertyName = "max_seeding_time")]
-        public long MaxSeedingTime { get; set; } // Get the global share time limit in minutes
-
         [JsonProperty(PropertyName = "max_ratio_act")]
         public bool RemoveOnMaxRatio { get; set; } // Action performed when a torrent reaches the maximum share ratio. [false = pause, true = remove]
 
         [JsonProperty(PropertyName = "queueing_enabled")]
         public bool QueueingEnabled { get; set; } = true;
-
-        [JsonProperty(PropertyName = "dht")]
-        public bool DhtEnabled { get; set; } // DHT enabled (needed for more peers and magnet downloads)
     }
 }

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

@@ -11,68 +11,41 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
 {
     // API https://github.com/qbittorrent/qBittorrent/wiki/WebUI-API-Documentation
 
-    public class QBittorrentProxyV1 : IQBittorrentProxy
+    public interface IQBittorrentProxy
+    {
+        int GetVersion(QBittorrentSettings settings);
+        QBittorrentPreferences GetConfig(QBittorrentSettings settings);
+        List<QBittorrentTorrent> GetTorrents(QBittorrentSettings settings);
+
+        void AddTorrentFromUrl(string torrentUrl, QBittorrentSettings settings);
+        void AddTorrentFromFile(string fileName, Byte[] fileContent, QBittorrentSettings settings);
+
+        void RemoveTorrent(string hash, Boolean removeData, QBittorrentSettings settings);
+        void SetTorrentLabel(string hash, string label, QBittorrentSettings settings);
+        void MoveTorrentToTopInQueue(string hash, QBittorrentSettings settings);
+        void PauseTorrent(string hash, QBittorrentSettings settings);
+        void ResumeTorrent(string hash, QBittorrentSettings settings);
+        void SetForceStart(string hash, bool enabled, QBittorrentSettings settings);
+    }
+
+    public class QBittorrentProxy : IQBittorrentProxy
     {
         private readonly IHttpClient _httpClient;
         private readonly Logger _logger;
         private readonly ICached<Dictionary<string, string>> _authCookieCache;
 
-        public QBittorrentProxyV1(IHttpClient httpClient, ICacheManager cacheManager, Logger logger)
+        public QBittorrentProxy(IHttpClient httpClient, ICacheManager cacheManager, Logger logger)
         {
             _httpClient = httpClient;
             _logger = logger;
+
             _authCookieCache = cacheManager.GetCache<Dictionary<string, string>>(GetType(), "authCookies");
-
         }
 
-        public bool IsApiSupported(QBittorrentSettings settings)
+        public int GetVersion(QBittorrentSettings settings)
         {
-            // We can do the api test without having to authenticate since v4.1 will return 404 on the request.
             var request = BuildRequest(settings).Resource("/version/api");
-            request.SuppressHttpError = true;
-
-            try
-            {
-                var response = _httpClient.Execute(request.Build());
-
-                // Version request will return 404 if it doesn't exist.
-                if (response.StatusCode == HttpStatusCode.NotFound)
-                {
-                    return false;
-                }
-
-                if (response.StatusCode == HttpStatusCode.Forbidden)
-                {
-                    return true;
-                }
-
-                if (response.HasHttpError)
-                {
-                    throw new DownloadClientException("Failed to connect to qBittorrent, check your settings.", new HttpException(response));
-                }
-
-                return true;
-            }
-            catch (WebException ex)
-            {
-                throw new DownloadClientException("Failed to connect to qBittorrent, check your settings.", ex);
-            }
-        }
-
-        public Version GetApiVersion(QBittorrentSettings settings)
-        {
-            // Version request does not require authentication and will return 404 if it doesn't exist.
-            var request = BuildRequest(settings).Resource("/version/api");
-            var response = Version.Parse("1." + ProcessRequest(request, settings));
-
-            return response;
-        }
-
-        public string GetVersion(QBittorrentSettings settings)
-        {
-            // Version request does not require authentication.
-            var request = BuildRequest(settings).Resource("/version/qbittorrent");
-            var response = ProcessRequest(request, settings).TrimStart('v');
+            var response = ProcessRequest<int>(request, settings);
 
             return response;
         }
@@ -87,25 +60,15 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
 
         public List<QBittorrentTorrent> GetTorrents(QBittorrentSettings settings)
         {
-            var request = BuildRequest(settings).Resource("/query/torrents");
-            if (settings.TvCategory.IsNotNullOrWhiteSpace())
-            {
-                request.AddQueryParam("label", settings.TvCategory);
-                request.AddQueryParam("category", settings.TvCategory);
-            }
+            var request = BuildRequest(settings).Resource("/query/torrents")
+                                                .AddQueryParam("label", settings.TvCategory)
+                                                .AddQueryParam("category", settings.TvCategory);
+
             var response = ProcessRequest<List<QBittorrentTorrent>>(request, settings);
 
             return response;
         }
 
-        public QBittorrentTorrentProperties GetTorrentProperties(string hash, QBittorrentSettings settings)
-        {
-            var request = BuildRequest(settings).Resource($"/query/propertiesGeneral/{hash}");
-            var response = ProcessRequest<QBittorrentTorrentProperties>(request, settings);
-
-            return response;
-        }
-
         public void AddTorrentFromUrl(string torrentUrl, QBittorrentSettings settings)
         {
             var request = BuildRequest(settings).Resource("/command/download")
@@ -144,7 +107,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
 
             if ((QBittorrentState)settings.InitialState == QBittorrentState.Pause)
             {
-                request.AddFormParameter("paused", "true");
+                request.AddFormParameter("paused", true);
             }
 
             var result = ProcessRequest(request, settings);
@@ -159,8 +122,8 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
         public void RemoveTorrent(string hash, Boolean removeData, QBittorrentSettings settings)
         {
             var request = BuildRequest(settings).Resource(removeData ? "/command/deletePerm" : "/command/delete")
-                                                    .Post()
-                                                    .AddFormParameter("hashes", hash);
+                                                .Post()
+                                                .AddFormParameter("hashes", hash);
 
             ProcessRequest(request, settings);
         }
@@ -175,7 +138,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
             {
                 ProcessRequest(setCategoryRequest, settings);
             }
-            catch (DownloadClientException ex)
+            catch(DownloadClientException ex)
             {
                 // if setCategory fails due to method not being found, then try older setLabel command for qBittorrent < v.3.3.5
                 if (ex.InnerException is HttpException && (ex.InnerException as HttpException).Response.StatusCode == HttpStatusCode.NotFound)
@@ -190,16 +153,12 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
             }
         }
 
-        public void SetTorrentSeedingConfiguration(string hash, TorrentSeedConfiguration seedConfiguration, QBittorrentSettings settings)
-        {
-            // Not supported on api v1
-        }
-
         public void MoveTorrentToTopInQueue(string hash, QBittorrentSettings settings)
         {
             var request = BuildRequest(settings).Resource("/command/topPrio")
-                                                    .Post()
-                                                    .AddFormParameter("hashes", hash);
+                                                .Post()
+                                                .AddFormParameter("hashes", hash);
+
             try
             {
                 ProcessRequest(request, settings);
@@ -207,6 +166,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
             catch (DownloadClientException ex)
             {
                 // qBittorrent rejects all Prio commands with 403: Forbidden if Options -> BitTorrent -> Torrent Queueing is not enabled
+                #warning FIXME: so wouldn't the reauthenticate logic trigger on Forbidden?
                 if (ex.InnerException is HttpException && (ex.InnerException as HttpException).Response.StatusCode == HttpStatusCode.Forbidden)
                 {
                     return;
@@ -220,8 +180,9 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
         public void PauseTorrent(string hash, QBittorrentSettings settings)
         {
             var request = BuildRequest(settings).Resource("/command/pause")
-                                                 .Post()
-                                                 .AddFormParameter("hash", hash);
+                                                .Post()
+                                                .AddFormParameter("hash", hash);
+
             ProcessRequest(request, settings);
         }
 
@@ -230,6 +191,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
             var request = BuildRequest(settings).Resource("/command/resume")
                                                 .Post()
                                                 .AddFormParameter("hash", hash);
+
             ProcessRequest(request, settings);
         }
 
@@ -238,17 +200,17 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
             var request = BuildRequest(settings).Resource("/command/setForceStart")
                                                 .Post()
                                                 .AddFormParameter("hashes", hash)
-                                                .AddFormParameter("value", enabled ? "true" : "false");
+                                                .AddFormParameter("value", enabled ? "true": "false");
+
             ProcessRequest(request, settings);
         }
 
         private HttpRequestBuilder BuildRequest(QBittorrentSettings settings)
         {
-            var requestBuilder = new HttpRequestBuilder(settings.UseSsl, settings.Host, settings.Port)
-            {
-                LogResponseContent = true,
-                NetworkCredential = new NetworkCredential(settings.Username, settings.Password)
-            };
+            var requestBuilder = new HttpRequestBuilder(settings.UseSsl, settings.Host, settings.Port);
+            requestBuilder.LogResponseContent = true;
+            requestBuilder.NetworkCredential = new NetworkCredential(settings.Username, settings.Password);
+
             return requestBuilder;
         }
 
@@ -312,11 +274,11 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
             {
                 _authCookieCache.Remove(authKey);
 
-                var authLoginRequest = BuildRequest(settings).Resource( "/login")
-                                                             .Post()
-                                                             .AddFormParameter("username", settings.Username ?? string.Empty)
-                                                             .AddFormParameter("password", settings.Password ?? string.Empty)
-                                                             .Build();
+                var authLoginRequest = BuildRequest(settings).Resource("/login")
+                                                            .Post()
+                                                            .AddFormParameter("username", settings.Username ?? string.Empty)
+                                                            .AddFormParameter("password", settings.Password ?? string.Empty)
+                                                            .Build();
 
                 HttpResponse response;
                 try

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

@@ -1,90 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-using NLog;
-using NzbDrone.Common.Cache;
-
-using NzbDrone.Common.Http;
-
-
-namespace NzbDrone.Core.Download.Clients.QBittorrent
-{
-    public interface IQBittorrentProxy
-    {
-        bool IsApiSupported(QBittorrentSettings settings);
-        Version GetApiVersion(QBittorrentSettings settings);
-        string GetVersion(QBittorrentSettings settings);
-        QBittorrentPreferences GetConfig(QBittorrentSettings settings);
-        List<QBittorrentTorrent> GetTorrents(QBittorrentSettings settings);
-        QBittorrentTorrentProperties GetTorrentProperties(string hash, QBittorrentSettings settings);
-
-        void AddTorrentFromUrl(string torrentUrl, QBittorrentSettings settings);
-        void AddTorrentFromFile(string fileName, Byte[] fileContent, QBittorrentSettings settings);
-
-        void RemoveTorrent(string hash, Boolean removeData, QBittorrentSettings settings);
-        void SetTorrentLabel(string hash, string label, QBittorrentSettings settings);
-        void SetTorrentSeedingConfiguration(string hash, TorrentSeedConfiguration seedConfiguration, QBittorrentSettings settings);
-        void MoveTorrentToTopInQueue(string hash, QBittorrentSettings settings);
-        void PauseTorrent(string hash, QBittorrentSettings settings);
-        void ResumeTorrent(string hash, QBittorrentSettings settings);
-        void SetForceStart(string hash, bool enabled, QBittorrentSettings settings);
-    }
-
-    public interface IQBittorrentProxySelector
-    {
-        IQBittorrentProxy GetProxy(QBittorrentSettings settings, bool force = false);
-    }
-
-    public class QBittorrentProxySelector : IQBittorrentProxySelector
-    {
-        private readonly IHttpClient _httpClient;
-        private readonly ICached<IQBittorrentProxy> _proxyCache;
-        private readonly Logger _logger;
-
-        private readonly IQBittorrentProxy _proxyV1;
-        private readonly IQBittorrentProxy _proxyV2;
-
-        public  QBittorrentProxySelector(QBittorrentProxyV1 proxyV1,
-                                         QBittorrentProxyV2 proxyV2,
-                                         IHttpClient httpClient, 
-                                         ICacheManager cacheManager,
-                                         Logger logger)
-        {
-            _httpClient = httpClient;
-            _proxyCache = cacheManager.GetCache<IQBittorrentProxy>(GetType());
-            _logger = logger;
-
-            _proxyV1 = proxyV1;
-            _proxyV2 = proxyV2;
-        }
-
-        public IQBittorrentProxy GetProxy(QBittorrentSettings settings, bool force)
-        {
-            var proxyKey = $"{settings.Host}_{settings.Port}";
-
-            if (force)
-            {
-                _proxyCache.Remove(proxyKey);
-            }
-
-            return _proxyCache.Get(proxyKey, () => FetchProxy(settings), TimeSpan.FromMinutes(10.0));      
-        }
-
-        private IQBittorrentProxy FetchProxy(QBittorrentSettings settings)
-        {
-            if (_proxyV2.IsApiSupported(settings))
-            {
-                _logger.Trace("Using qbitTorrent API v2");
-                return _proxyV2;
-            }
-
-            if (_proxyV1.IsApiSupported(settings))
-            {
-                _logger.Trace("Using qbitTorrent API v1");
-                return _proxyV1;
-            }
-
-            throw new DownloadClientException("Unable to determine qBittorrent API version");
-        }
-    }
-}

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

@@ -1,371 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-using NLog;
-using NzbDrone.Common.Cache;
-using NzbDrone.Common.Extensions;
-using NzbDrone.Common.Http;
-using NzbDrone.Common.Serializer;
-
-namespace NzbDrone.Core.Download.Clients.QBittorrent
-{
-    // API https://github.com/qbittorrent/qBittorrent/wiki/Web-API-Documentation
-
-    public class QBittorrentProxyV2 : IQBittorrentProxy
-    {
-        private readonly IHttpClient _httpClient;
-        private readonly Logger _logger;
-        private readonly ICached<Dictionary<string, string>> _authCookieCache;
-
-        public QBittorrentProxyV2(IHttpClient httpClient, ICacheManager cacheManager, Logger logger)
-        {
-            _httpClient = httpClient;
-            _logger = logger;
-
-            _authCookieCache = cacheManager.GetCache<Dictionary<string, string>>(GetType(), "authCookies");
-        }
-
-        public bool IsApiSupported(QBittorrentSettings settings)
-        {
-            // We can do the api test without having to authenticate since v3.2.0-v4.0.4 will return 404 on the request.
-            var request = BuildRequest(settings).Resource("/api/v2/app/webapiVersion");
-            request.SuppressHttpError = true;
-
-            try
-            {
-                var response = _httpClient.Execute(request.Build());
-
-                // Version request will return 404 if it doesn't exist.
-                if (response.StatusCode == HttpStatusCode.NotFound)
-                {
-                    return false;
-                }
-
-                if (response.StatusCode == HttpStatusCode.Forbidden)
-                {
-                    return true;
-                }
-
-                if (response.HasHttpError)
-                {
-                    throw new DownloadClientException("Failed to connect to qBittorrent, check your settings.", new HttpException(response));
-                }
-
-                return true;
-            }
-            catch (WebException ex)
-            {
-                throw new DownloadClientException("Failed to connect to qBittorrent, check your settings.", ex);
-            }
-        }
-
-        public Version GetApiVersion(QBittorrentSettings settings)
-        {
-            var request = BuildRequest(settings).Resource("/api/v2/app/webapiVersion");
-            var response = Version.Parse(ProcessRequest(request, settings));
-
-            return response;
-        }
-
-        public string GetVersion(QBittorrentSettings settings)
-        {
-            var request = BuildRequest(settings).Resource("/api/v2/app/version");
-            var response = ProcessRequest(request, settings).TrimStart('v');
-
-            // eg "4.2alpha"
-            return response;
-        }
-
-        public QBittorrentPreferences GetConfig(QBittorrentSettings settings)
-        {
-            var request = BuildRequest(settings).Resource("/api/v2/app/preferences");
-            var response = ProcessRequest<QBittorrentPreferences>(request, settings);
-
-            return response;
-        }
-
-        public List<QBittorrentTorrent> GetTorrents(QBittorrentSettings settings)
-        {
-            var request = BuildRequest(settings).Resource("/api/v2/torrents/info");
-            if (settings.TvCategory.IsNotNullOrWhiteSpace())
-            {
-                request.AddQueryParam("category", settings.TvCategory);
-            }
-            var response = ProcessRequest<List<QBittorrentTorrent>>(request, settings);
-
-            return response;
-        }
-
-        public QBittorrentTorrentProperties GetTorrentProperties(string hash, QBittorrentSettings settings)
-        {
-            var request = BuildRequest(settings).Resource("/api/v2/torrents/properties")
-                                                .AddQueryParam("hash", hash);
-            var response = ProcessRequest<QBittorrentTorrentProperties>(request, settings);
-
-            return response;
-        }
-
-        public void AddTorrentFromUrl(string torrentUrl, QBittorrentSettings settings)
-        {
-            var request = BuildRequest(settings).Resource("/api/v2/torrents/add")
-                                                .Post()
-                                                .AddFormParameter("urls", torrentUrl);
-            if (settings.TvCategory.IsNotNullOrWhiteSpace())
-            {
-                request.AddFormParameter("category", settings.TvCategory);
-            }
-
-            if ((QBittorrentState)settings.InitialState == QBittorrentState.Pause)
-            {
-                request.AddFormParameter("paused", true);
-            }
-
-            var result = ProcessRequest(request, settings);
-
-            // Note: Older qbit versions returned nothing, so we can't do != "Ok." here.
-            if (result == "Fails.")
-            {
-                throw new DownloadClientException("Download client failed to add torrent by url");
-            }
-        }
-
-        public void AddTorrentFromFile(string fileName, Byte[] fileContent, QBittorrentSettings settings)
-        {
-            var request = BuildRequest(settings).Resource("/api/v2/torrents/add")
-                                                .Post()
-                                                .AddFormUpload("torrents", fileName, fileContent);
-
-            if (settings.TvCategory.IsNotNullOrWhiteSpace())
-            {
-                request.AddFormParameter("category", settings.TvCategory);
-            }
-
-            if ((QBittorrentState)settings.InitialState == QBittorrentState.Pause)
-            {
-                request.AddFormParameter("paused", "true");
-            }
-
-            var result = ProcessRequest(request, settings);
-
-            // Note: Current qbit versions return nothing, so we can't do != "Ok." here.
-            if (result == "Fails.")
-            {
-                throw new DownloadClientException("Download client failed to add torrent");
-            }
-        }
-
-        public void RemoveTorrent(string hash, Boolean removeData, QBittorrentSettings settings)
-        {
-            var request = BuildRequest(settings).Resource("/api/v2/torrents/delete")
-                                                .Post()
-                                                .AddFormParameter("hashes", hash);
-
-            if (removeData)
-            {
-                request.AddFormParameter("deleteFiles", "true");
-            }
-
-            ProcessRequest(request, settings);
-        }
-
-        public void SetTorrentLabel(string hash, string label, QBittorrentSettings settings)
-        {
-            var request = BuildRequest(settings).Resource("/api/v2/torrents/setCategory")
-                                                .Post()
-                                                .AddFormParameter("hashes", hash)
-                                                .AddFormParameter("category", label);
-            ProcessRequest(request, settings);
-        }
-
-        public void SetTorrentSeedingConfiguration(string hash, TorrentSeedConfiguration seedConfiguration, QBittorrentSettings settings)
-        {
-            var ratioLimit = seedConfiguration.Ratio.HasValue ? seedConfiguration.Ratio : -2;
-            var seedingTimeLimit = seedConfiguration.SeedTime.HasValue ? (long)seedConfiguration.SeedTime.Value.TotalMinutes : -2;
-
-            var request = BuildRequest(settings).Resource("/api/v2/torrents/setShareLimits")
-                                                .Post()
-                                                .AddFormParameter("hashes", hash)
-                                                .AddFormParameter("ratioLimit", ratioLimit)
-                                                .AddFormParameter("seedingTimeLimit", seedingTimeLimit);
-
-            try
-            {
-                ProcessRequest(request, settings);
-            }
-            catch (DownloadClientException ex)
-            {
-                // setShareLimits was added in api v2.0.1 so catch it case of the unlikely event that someone has api v2.0
-                if (ex.InnerException is HttpException && (ex.InnerException as HttpException).Response.StatusCode == HttpStatusCode.NotFound)
-                {
-                    return;
-                }
-
-                throw;
-            }
-        }
-
-        public void MoveTorrentToTopInQueue(string hash, QBittorrentSettings settings)
-        {
-            var request = BuildRequest(settings).Resource("/api/v2/torrents/topPrio")
-                                                .Post()
-                                                .AddFormParameter("hashes", hash);
-
-            try
-            {
-                ProcessRequest(request, settings);
-            }
-            catch (DownloadClientException ex)
-            {
-                // qBittorrent rejects all Prio commands with 409: Conflict if Options -> BitTorrent -> Torrent Queueing is not enabled
-                if (ex.InnerException is HttpException && (ex.InnerException as HttpException).Response.StatusCode == HttpStatusCode.Conflict)
-                {
-                    return;
-                }
-
-                throw;
-            }
-
-        }
-
-        public void PauseTorrent(string hash, QBittorrentSettings settings)
-        {
-            var request = BuildRequest(settings).Resource("/api/v2/torrents/pause")
-                                                .Post()
-                                                .AddFormParameter("hashes", hash);
-            ProcessRequest(request, settings);
-        }
-
-        public void ResumeTorrent(string hash, QBittorrentSettings settings)
-        {
-            var request = BuildRequest(settings).Resource("/api/v2/torrents/resume")
-                                                .Post()
-                                                .AddFormParameter("hashes", hash);
-            ProcessRequest(request, settings);
-        }
-
-        public void SetForceStart(string hash, bool enabled, QBittorrentSettings settings)
-        {
-            var request = BuildRequest(settings).Resource("/api/v2/torrents/setForceStart")
-                                                .Post()
-                                                .AddFormParameter("hashes", hash)
-                                                .AddFormParameter("value", enabled ? "true" : "false");
-            ProcessRequest(request, settings);
-        }
-
-        private HttpRequestBuilder BuildRequest(QBittorrentSettings settings)
-        {
-            var requestBuilder = new HttpRequestBuilder(settings.UseSsl, settings.Host, settings.Port)
-            {
-                LogResponseContent = true,
-                NetworkCredential = new NetworkCredential(settings.Username, settings.Password)
-            };
-            return requestBuilder;
-        }
-
-        private TResult ProcessRequest<TResult>(HttpRequestBuilder requestBuilder, QBittorrentSettings settings)
-            where TResult : new()
-        {
-            var responseContent = ProcessRequest(requestBuilder, settings);
-
-            return Json.Deserialize<TResult>(responseContent);
-        }
-
-        private string ProcessRequest(HttpRequestBuilder requestBuilder, QBittorrentSettings settings)
-        {
-            AuthenticateClient(requestBuilder, settings);
-
-            var request = requestBuilder.Build();
-            request.LogResponseContent = true;
-
-            HttpResponse response;
-            try
-            {
-                response = _httpClient.Execute(request);
-            }
-            catch (HttpException ex)
-            {
-                if (ex.Response.StatusCode == HttpStatusCode.Forbidden)
-                {
-                    _logger.Debug("Authentication required, logging in.");
-
-                    AuthenticateClient(requestBuilder, settings, true);
-
-                    request = requestBuilder.Build();
-
-                    response = _httpClient.Execute(request);
-                }
-                else
-                {
-                    throw new DownloadClientException("Failed to connect to qBittorrent, check your settings.", ex);
-                }
-            }
-            catch (WebException ex)
-            {
-                throw new DownloadClientException("Failed to connect to qBittorrent, please check your settings.", ex);
-            }
-
-            return response.Content;
-        }
-
-        private void AuthenticateClient(HttpRequestBuilder requestBuilder, QBittorrentSettings settings, bool reauthenticate = false)
-        {
-            if (settings.Username.IsNullOrWhiteSpace() || settings.Password.IsNullOrWhiteSpace())
-            {
-                if (reauthenticate)
-                {
-                    throw new DownloadClientAuthenticationException("Failed to authenticate with qBittorrent.");
-                }
-                return;
-            }
-
-            var authKey = string.Format("{0}:{1}", requestBuilder.BaseUrl, settings.Password);
-
-            var cookies = _authCookieCache.Find(authKey);
-
-            if (cookies == null || reauthenticate)
-            {
-                _authCookieCache.Remove(authKey);
-
-                var authLoginRequest = BuildRequest(settings).Resource("/api/v2/auth/login")
-                                                             .Post()
-                                                             .AddFormParameter("username", settings.Username ?? string.Empty)
-                                                             .AddFormParameter("password", settings.Password ?? string.Empty)
-                                                             .Build();
-
-                HttpResponse response;
-                try
-                {
-                    response = _httpClient.Execute(authLoginRequest);
-                }
-                catch (HttpException ex)
-                {
-                    _logger.Debug("qbitTorrent authentication failed.");
-                    if (ex.Response.StatusCode == HttpStatusCode.Forbidden)
-                    {
-                        throw new DownloadClientAuthenticationException("Failed to authenticate with qBittorrent.", ex);
-                    }
-
-                    throw new DownloadClientException("Failed to connect to qBittorrent, please check your settings.", ex);
-                }
-                catch (WebException ex)
-                {
-                    throw new DownloadClientUnavailableException("Failed to connect to qBittorrent, please check your settings.", ex);
-                }
-
-                if (response.Content != "Ok.") // returns "Fails." on bad login
-                {
-                    _logger.Debug("qbitTorrent authentication failed.");
-                    throw new DownloadClientAuthenticationException("Failed to authenticate with qBittorrent.");
-                }
-
-                _logger.Debug("qBittorrent authentication succeeded.");
-
-                cookies = response.GetCookies();
-
-                _authCookieCache.Set(authKey, cookies);
-            }
-
-            requestBuilder.SetCookies(cookies);
-        }
-    }
-}

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

@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Newtonsoft.Json;
 
 namespace NzbDrone.Core.Download.Clients.QBittorrent
@@ -25,22 +25,5 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
         public string SavePath { get; set; } // Torrent save path
 
         public float Ratio { get; set; } // Torrent share ratio
-
-        [JsonProperty(PropertyName = "ratio_limit")] // Per torrent seeding ratio limit (-2 = use global, -1 = unlimited)
-        public float RatioLimit { get; set; } = -2;
-
-        [JsonProperty(PropertyName = "seeding_time")]
-        public long? SeedingTime { get; set; } // Torrent seeding time (not provided by the list api)
-
-        [JsonProperty(PropertyName = "seeding_time_limit")] // Per torrent seeding time limit (-2 = use global, -1 = unlimited)
-        public long SeedingTimeLimit { get; set; } = -2;
-    }
-
-    public class QBittorrentTorrentProperties
-    {
-        public string Hash { get; set; } // Torrent hash
-
-        [JsonProperty(PropertyName = "seeding_time")]
-        public long SeedingTime { get; set; } // Torrent seeding time
     }
 }

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

@@ -165,7 +165,7 @@ namespace NzbDrone.Core.Download.Clients.Transmission
         protected override void Test(List<ValidationFailure> failures)
         {
             failures.AddIfNotNull(TestConnection());
-            if (failures.HasErrors()) return;
+            if (failures.Any()) return;
             failures.AddIfNotNull(TestGetTorrents());
         }
 

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

@@ -89,11 +89,11 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
             foreach (RTorrentTorrent torrent in torrents)
             {
                 // Don't concern ourselves with categories other than specified
-                if (Settings.TvCategory.IsNotNullOrWhiteSpace() && torrent.Category != Settings.TvCategory) continue;
+                if (torrent.Category != Settings.TvCategory) continue;
 
                 if (torrent.Path.StartsWith("."))
                 {
-                    throw new DownloadClientException("Download paths must be absolute. Please specify variable \"directory\" in rTorrent.");
+                    throw new DownloadClientException("Download paths paths must be absolute. Please specify variable \"directory\" in rTorrent.");
                 }
 
                 var item = new DownloadClientItem();
@@ -163,7 +163,7 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
         protected override void Test(List<ValidationFailure> failures)
         {
             failures.AddIfNotNull(TestConnection());
-            if (failures.HasErrors()) return;
+            if (failures.Any()) return;
             failures.AddIfNotNull(TestGetTorrents());
             failures.AddIfNotNull(TestDirectory());
         }

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

@@ -224,7 +224,7 @@ namespace NzbDrone.Core.Download.Clients.UTorrent
         protected override void Test(List<ValidationFailure> failures)
         {
             failures.AddIfNotNull(TestConnection());
-            if (failures.HasErrors()) return;
+            if (failures.Any()) return;
             failures.AddIfNotNull(TestGetTorrents());
         }
 

src/NzbDrone.Core/Download/DownloadClientStatusService.cs

@@ -1,6 +1,5 @@
-using System;
+using System;
 using NLog;
-using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.ThingiProvider.Status;
 
@@ -13,8 +12,8 @@ namespace NzbDrone.Core.Download
 
     public class DownloadClientStatusService : ProviderStatusServiceBase<IDownloadClient, DownloadClientStatus>, IDownloadClientStatusService
     {
-        public DownloadClientStatusService(IDownloadClientStatusRepository providerStatusRepository, IEventAggregator eventAggregator, IRuntimeInfo runtimeInfo, Logger logger)
-            : base(providerStatusRepository, eventAggregator, runtimeInfo, logger)
+        public DownloadClientStatusService(IDownloadClientStatusRepository providerStatusRepository, IEventAggregator eventAggregator, Logger logger)
+            : base(providerStatusRepository, eventAggregator, logger)
         {
             MinimumTimeSinceInitialFailure = TimeSpan.FromMinutes(5);
             MaximumEscalationLevel = 5;

src/NzbDrone.Core/IndexerSearch/NzbSearchService.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Threading.Tasks;
@@ -314,16 +314,6 @@ namespace NzbDrone.Core.IndexerSearch
 
             _logger.Debug("Total of {0} reports were found for {1} from {2} indexers", reports.Count, criteriaBase, indexers.Count);
 
-            // Update the last search time for all episodes if at least 1 indexer was searched.
-            if (indexers.Any())
-            {
-                var lastSearchTime = DateTime.UtcNow;
-                _logger.Debug("Setting last search time to: {0}", lastSearchTime);
-
-                criteriaBase.Episodes.ForEach(e => e.LastSearchTime = lastSearchTime);
-                _episodeService.UpdateEpisodes(criteriaBase.Episodes);
-            }
-
             return _makeDownloadDecision.GetSearchDecision(reports, criteriaBase).ToList();
         }
     }

src/NzbDrone.Core/Indexers/IndexerStatusService.cs

@@ -1,5 +1,4 @@
-using NLog;
-using NzbDrone.Common.EnvironmentInfo;
+using NLog;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.ThingiProvider.Status;
@@ -15,8 +14,8 @@ namespace NzbDrone.Core.Indexers
 
     public class IndexerStatusService : ProviderStatusServiceBase<IIndexer, IndexerStatus>, IIndexerStatusService
     {
-        public IndexerStatusService(IIndexerStatusRepository providerStatusRepository, IEventAggregator eventAggregator, IRuntimeInfo runtimeInfo, Logger logger)
-            : base(providerStatusRepository, eventAggregator, runtimeInfo, logger)
+        public IndexerStatusService(IIndexerStatusRepository providerStatusRepository, IEventAggregator eventAggregator, Logger logger)
+            : base(providerStatusRepository, eventAggregator, logger)
         {
 
         }

src/NzbDrone.Core/Indexers/Newznab/Newznab.cs

@@ -8,7 +8,6 @@ using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Parser;
 using NzbDrone.Core.ThingiProvider;
-using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Indexers.Newznab
 {
@@ -103,7 +102,7 @@ namespace NzbDrone.Core.Indexers.Newznab
         protected override void Test(List<ValidationFailure> failures)
         {
             base.Test(failures);
-            if (failures.HasErrors()) return;
+            if (failures.Any()) return;
             failures.AddIfNotNull(TestCapabilities());
         }
 

src/NzbDrone.Core/Indexers/Torznab/Torznab.cs

@@ -9,7 +9,6 @@ using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Indexers.Newznab;
 using NzbDrone.Core.Parser;
 using NzbDrone.Core.ThingiProvider;
-using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Indexers.Torznab
 {
@@ -92,7 +91,7 @@ namespace NzbDrone.Core.Indexers.Torznab
         protected override void Test(List<ValidationFailure> failures)
         {
             base.Test(failures);
-            if (failures.HasErrors()) return;
+            if (failures.Any()) return;
             failures.AddIfNotNull(TestCapabilities());
         }
 

src/NzbDrone.Core/MediaFiles/EpisodeFile.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Marr.Data;
 using NzbDrone.Core.Datastore;
@@ -17,7 +17,6 @@ namespace NzbDrone.Core.MediaFiles
         public string Path { get; set; }
         public long Size { get; set; }
         public DateTime DateAdded { get; set; }
-        public string OriginalFilePath { get; set; }
         public string SceneName { get; set; }
         public string ReleaseGroup { get; set; }
         public QualityModel Quality { get; set; }

src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedEpisodes.cs

@@ -102,7 +102,6 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport
 
                     if (newDownload)
                     {
-                        episodeFile.OriginalFilePath = GetOriginalFilePath(downloadClientItem, localEpisode);
                         episodeFile.SceneName = GetSceneName(downloadClientItem, localEpisode);
 
                         var moveResult = _episodeFileUpgrader.UpgradeEpisodeFile(episodeFile, localEpisode, copyOnly);
@@ -149,43 +148,6 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport
             return importResults;
         }
 
-        private string GetOriginalFilePath(DownloadClientItem downloadClientItem, LocalEpisode localEpisode)
-        {
-            var path = localEpisode.Path;
-
-            if (downloadClientItem != null && !downloadClientItem.OutputPath.IsEmpty)
-            {
-                var outputDirectory = downloadClientItem.OutputPath.Directory.ToString();
-
-                if (outputDirectory.IsParentPath(path))
-                {
-                    return outputDirectory.GetRelativePath(path);
-                }
-            }
-
-            var folderEpisodeInfo = localEpisode.FolderEpisodeInfo;
-
-            if (folderEpisodeInfo != null)
-            {
-                var folderPath = path.GetAncestorPath(folderEpisodeInfo.ReleaseTitle);
-
-                if (folderPath != null)
-                {
-                    return folderPath.GetParentPath().GetRelativePath(path);
-                }
-            }
-
-            var parentPath = path.GetParentPath();
-            var grandparentPath = parentPath.GetParentPath();
-
-            if (grandparentPath != null)
-            {
-                return grandparentPath.GetRelativePath(path);
-            }
-
-            return Path.GetFileName(path);
-        }
-
         private string GetSceneName(DownloadClientItem downloadClientItem, LocalEpisode localEpisode)
         {
             if (downloadClientItem != null)

src/NzbDrone.Core/NzbDrone.Core.csproj

@@ -143,8 +143,6 @@
     <Compile Include="Configuration\IConfigService.cs" />
     <Compile Include="Configuration\InvalidConfigFileException.cs" />
     <Compile Include="Configuration\ResetApiKeyCommand.cs" />
-    <Compile Include="Datastore\Migration\130_episode_last_searched_time.cs" />
-    <Compile Include="Datastore\Migration\129_add_relative_original_path_to_episode_file.cs" />
     <Compile Include="DecisionEngine\Specifications\AlreadyImportedSpecification.cs" />
     <Compile Include="Indexers\SeedConfigProvider.cs" />
     <Compile Include="DataAugmentation\DailySeries\DailySeries.cs" />
@@ -460,7 +458,7 @@
     <Compile Include="Download\Clients\rTorrent\RTorrentDirectoryValidator.cs" />
     <Compile Include="Download\Clients\QBittorrent\QBittorrent.cs" />
     <Compile Include="Download\Clients\QBittorrent\QBittorrentPriority.cs" />
-    <Compile Include="Download\Clients\QBittorrent\QBittorrentProxyV1.cs" />
+    <Compile Include="Download\Clients\QBittorrent\QBittorrentProxy.cs" />
     <Compile Include="Download\Clients\QBittorrent\QBittorrentSettings.cs" />
     <Compile Include="Download\Clients\QBittorrent\QBittorrentTorrent.cs" />
     <Compile Include="Download\Clients\Sabnzbd\JsonConverters\SabnzbdPriorityTypeConverter.cs" />
@@ -1234,8 +1232,6 @@
     <Compile Include="Validation\ProfileExistsValidator.cs" />
     <Compile Include="Validation\RuleBuilderExtensions.cs" />
     <Compile Include="Validation\UrlValidator.cs" />
-    <Compile Include="Download\Clients\QBittorrent\QBittorrentProxyV2.cs" />
-    <Compile Include="Download\Clients\QBittorrent\QBittorrentProxySelector.cs" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.0,Profile=Client">

src/NzbDrone.Core/Parser/Model/ParsedEpisodeInfo.cs

@@ -13,7 +13,6 @@ namespace NzbDrone.Core.Parser.Model
         public int SeasonNumber { get; set; }
         public int[] EpisodeNumbers { get; set; }
         public int[] AbsoluteEpisodeNumbers { get; set; }
-        public decimal[] SpecialAbsoluteEpisodeNumbers { get; set; }
         public string AirDate { get; set; }
         public Language Language { get; set; }
         public bool FullSeason { get; set; }
@@ -28,7 +27,6 @@ namespace NzbDrone.Core.Parser.Model
         {
             EpisodeNumbers = new int[0];
             AbsoluteEpisodeNumbers = new int[0];
-            SpecialAbsoluteEpisodeNumbers = new decimal[0];
         }
 
         public bool IsDaily

src/NzbDrone.Core/Parser/Parser.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -40,15 +39,15 @@ namespace NzbDrone.Core.Parser
                           RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
                 //Anime - [SubGroup] Title Episode Absolute Episode Number ([SubGroup] Series Title Episode 01)
-                new Regex(@"^(?:\[(?<subgroup>.+?)\][-_. ]?)(?<title>.+?)[-_. ](?:Episode)(?:[-_. ]+(?<absoluteepisode>(?<!\d+)\d{2,3}(\.\d{1,2})?(?!\d+)))+(?:_|-|\s|\.)*?(?<hash>\[.{8}\])?(?:$|\.)?",
+                new Regex(@"^(?:\[(?<subgroup>.+?)\][-_. ]?)(?<title>.+?)[-_. ](?:Episode)(?:[-_. ]+(?<absoluteepisode>(?<!\d+)\d{2,3}(?!\d+)))+(?:_|-|\s|\.)*?(?<hash>\[.{8}\])?(?:$|\.)?",
                           RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
                 //Anime - [SubGroup] Title Absolute Episode Number + Season+Episode
-                new Regex(@"^(?:\[(?<subgroup>.+?)\](?:_|-|\s|\.)?)(?<title>.+?)(?:(?:[-_\W](?<![()\[!]))+(?<absoluteepisode>\d{2,3}(\.\d{1,2})?))+(?:_|-|\s|\.)+(?:S?(?<season>(?<!\d+)\d{1,2}(?!\d+))(?:(?:\-|[ex]|\W[ex]){1,2}(?<episode>\d{2}(?!\d+)))+).*?(?<hash>[(\[]\w{8}[)\]])?(?:$|\.)",
+                new Regex(@"^(?:\[(?<subgroup>.+?)\](?:_|-|\s|\.)?)(?<title>.+?)(?:(?:[-_\W](?<![()\[!]))+(?<absoluteepisode>\d{2,3}))+(?:_|-|\s|\.)+(?:S?(?<season>(?<!\d+)\d{1,2}(?!\d+))(?:(?:\-|[ex]|\W[ex]){1,2}(?<episode>\d{2}(?!\d+)))+).*?(?<hash>[(\[]\w{8}[)\]])?(?:$|\.)",
                           RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
                 //Anime - [SubGroup] Title Season+Episode + Absolute Episode Number
-                new Regex(@"^(?:\[(?<subgroup>.+?)\](?:_|-|\s|\.)?)(?<title>.+?)(?:[-_\W](?<![()\[!]))+(?:S?(?<season>(?<!\d+)\d{1,2}(?!\d+))(?:(?:\-|[ex]|\W[ex]){1,2}(?<episode>\d{2}(?!\d+)))+)(?:(?:_|-|\s|\.)+(?<absoluteepisode>(?<!\d+)\d{2,3}(\.\d{1,2})?(?!\d+)))+.*?(?<hash>\[\w{8}\])?(?:$|\.)",
+                new Regex(@"^(?:\[(?<subgroup>.+?)\](?:_|-|\s|\.)?)(?<title>.+?)(?:[-_\W](?<![()\[!]))+(?:S?(?<season>(?<!\d+)\d{1,2}(?!\d+))(?:(?:\-|[ex]|\W[ex]){1,2}(?<episode>\d{2}(?!\d+)))+)(?:(?:_|-|\s|\.)+(?<absoluteepisode>(?<!\d+)\d{2,3}(?!\d+)))+.*?(?<hash>\[\w{8}\])?(?:$|\.)",
                           RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
                 //Anime - [SubGroup] Title Season+Episode
@@ -56,15 +55,15 @@ namespace NzbDrone.Core.Parser
                           RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
                 //Anime - [SubGroup] Title with trailing number Absolute Episode Number
-                new Regex(@"^\[(?<subgroup>.+?)\][-_. ]?(?<title>[^-]+?\d+?)[-_. ]+(?:[-_. ]?(?<absoluteepisode>\d{3}(\.\d{1,2})?(?!\d+)))+(?:[-_. ]+(?<special>special|ova|ovd))?.*?(?<hash>\[\w{8}\])?(?:$|\.mkv)",
+                new Regex(@"^\[(?<subgroup>.+?)\][-_. ]?(?<title>[^-]+?\d+?)[-_. ]+(?:[-_. ]?(?<absoluteepisode>\d{3}(?!\d+)))+(?:[-_. ]+(?<special>special|ova|ovd))?.*?(?<hash>\[\w{8}\])?(?:$|\.mkv)",
                           RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
                 //Anime - [SubGroup] Title - Absolute Episode Number
-                new Regex(@"^\[(?<subgroup>.+?)\][-_. ]?(?<title>.+?)(?:[. ]-[. ](?<absoluteepisode>\d{2,3}(\.\d{1,2})?(?!\d+|[-])))+(?:[-_. ]+(?<special>special|ova|ovd))?.*?(?<hash>\[\w{8}\])?(?:$|\.mkv)",
+                new Regex(@"^\[(?<subgroup>.+?)\][-_. ]?(?<title>.+?)(?:[. ]-[. ](?<absoluteepisode>\d{2,3}(?!\d+|[-])))+(?:[-_. ]+(?<special>special|ova|ovd))?.*?(?<hash>\[\w{8}\])?(?:$|\.mkv)",
                           RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
                 //Anime - [SubGroup] Title Absolute Episode Number
-                new Regex(@"^\[(?<subgroup>.+?)\][-_. ]?(?<title>.+?)[-_. ]+\(?(?:[-_. ]?#?(?<absoluteepisode>\d{2,3}(\.\d{1,2})?(?!\d+)))+\)?(?:[-_. ]+(?<special>special|ova|ovd))?.*?(?<hash>\[\w{8}\])?(?:$|\.mkv)",
+                new Regex(@"^\[(?<subgroup>.+?)\][-_. ]?(?<title>.+?)[-_. ]+\(?(?:[-_. ]?#?(?<absoluteepisode>\d{2,3}(?!\d+)))+\)?(?:[-_. ]+(?<special>special|ova|ovd))?.*?(?<hash>\[\w{8}\])?(?:$|\.mkv)",
                           RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
                 //Multi-episode Repeated (S01E05 - S01E06, 1x05 - 1x06, etc)
@@ -76,7 +75,7 @@ namespace NzbDrone.Core.Parser
                     RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
                 //Anime - Title Season EpisodeNumber + Absolute Episode Number [SubGroup]
-                new Regex(@"^(?<title>.+?)(?:[-_\W](?<![()\[!]))+(?:S?(?<season>(?<!\d+)\d{1,2}(?!\d+))(?:(?:[ex]|\W[ex]){1,2}(?<episode>(?<!\d+)\d{2}(?!\d+)))).+?(?:[-_. ]?(?<absoluteepisode>(?<!\d+)\d{3}(\.\d{1,2})?(?!\d+)))+.+?\[(?<subgroup>.+?)\](?:$|\.mkv)",
+                new Regex(@"^(?<title>.+?)(?:[-_\W](?<![()\[!]))+(?:S?(?<season>(?<!\d+)\d{1,2}(?!\d+))(?:(?:[ex]|\W[ex]){1,2}(?<episode>(?<!\d+)\d{2}(?!\d+)))).+?(?:[-_. ]?(?<absoluteepisode>(?<!\d+)\d{3}(?!\d+)))+.+?\[(?<subgroup>.+?)\](?:$|\.mkv)",
                           RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
                 //Multi-Episode with a title (S01E05E06, S01E05-06, S01E05 E06, etc) and trailing info in slashes
@@ -84,11 +83,11 @@ namespace NzbDrone.Core.Parser
                     RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
                 //Anime - Title Absolute Episode Number [SubGroup]
-                new Regex(@"^(?<title>.+?)(?:(?:_|-|\s|\.)+(?<absoluteepisode>\d{3}(\.\d{1,2})?(?!\d+)))+(?:.+?)\[(?<subgroup>.+?)\].*?(?<hash>\[\w{8}\])?(?:$|\.)",
+                new Regex(@"^(?<title>.+?)(?:(?:_|-|\s|\.)+(?<absoluteepisode>\d{3}(?!\d+)))+(?:.+?)\[(?<subgroup>.+?)\].*?(?<hash>\[\w{8}\])?(?:$|\.)",
                           RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
                 //Anime - Title Absolute Episode Number [Hash]
-                new Regex(@"^(?<title>.+?)(?:(?:_|-|\s|\.)+(?<absoluteepisode>\d{2,3}(\.\d{1,2})?(?!\d+)))+(?:[-_. ]+(?<special>special|ova|ovd))?[-_. ]+.*?(?<hash>\[\w{8}\])(?:$|\.)",
+                new Regex(@"^(?<title>.+?)(?:(?:_|-|\s|\.)+(?<absoluteepisode>\d{2,3}(?!\d+)))+(?:[-_. ]+(?<special>special|ova|ovd))?[-_. ]+.*?(?<hash>\[\w{8}\])(?:$|\.)",
                           RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
                 //Episodes with airdate AND season/episode number, capture season/epsiode only
@@ -172,11 +171,11 @@ namespace NzbDrone.Core.Parser
                           RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
                 // Anime - Title with season number - Absolute Episode Number (Title S01 - EP14)
-                new Regex(@"^(?<title>.+?S\d{1,2})[-_. ]{3,}(?:EP)?(?<absoluteepisode>\d{2,3}(\.\d{1,2})?(?!\d+|[-]))",
+                new Regex(@"^(?<title>.+?S\d{1,2})[-_. ]{3,}(?:EP)?(?<absoluteepisode>\d{2,3}(?!\d+|[-]))",
                     RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
                 // Anime - French titles with single episode numbers, with or without leading sub group ([RlsGroup] Title - Episode 1)
-                new Regex(@"^(?:\[(?<subgroup>.+?)\][-_. ]?)?(?<title>.+?)[-_. ]+?(?:Episode[-_. ]+?)(?<absoluteepisode>\d{1}(\.\d{1,2})?(?!\d+))",
+                new Regex(@"^(?:\[(?<subgroup>.+?)\][-_. ]?)?(?<title>.+?)[-_. ]+?(?:Episode[-_. ]+?)(?<absoluteepisode>\d{1}(?!\d+))",
                     RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
                 //Season only releases
@@ -231,19 +230,19 @@ namespace NzbDrone.Core.Parser
 
                 // TODO: THIS ONE
                 //Anime - Title Absolute Episode Number (e66)
-                new Regex(@"^(?:\[(?<subgroup>.+?)\][-_. ]?)?(?<title>.+?)(?:(?:_|-|\s|\.)+(?:e|ep)(?<absoluteepisode>\d{2,3}(\.\d{1,2})?))+.*?(?<hash>\[\w{8}\])?(?:$|\.)",
+                new Regex(@"^(?:\[(?<subgroup>.+?)\][-_. ]?)?(?<title>.+?)(?:(?:_|-|\s|\.)+(?:e|ep)(?<absoluteepisode>\d{2,3}))+.*?(?<hash>\[\w{8}\])?(?:$|\.)",
                           RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
                 //Anime - Title Episode Absolute Episode Number (Series Title Episode 01)
-                new Regex(@"^(?<title>.+?)[-_. ](?:Episode)(?:[-_. ]+(?<absoluteepisode>(?<!\d+)\d{2,3}(\.\d{1,2})?(?!\d+)))+(?:_|-|\s|\.)*?(?<hash>\[.{8}\])?(?:$|\.)?",
+                new Regex(@"^(?<title>.+?)[-_. ](?:Episode)(?:[-_. ]+(?<absoluteepisode>(?<!\d+)\d{2,3}(?!\d+)))+(?:_|-|\s|\.)*?(?<hash>\[.{8}\])?(?:$|\.)?",
                           RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
                 //Anime - Title Absolute Episode Number
-                new Regex(@"^(?:\[(?<subgroup>.+?)\][-_. ]?)?(?<title>.+?)(?:[-_. ]+(?<absoluteepisode>(?<!\d+)\d{2,3}(\.\d{1,2})?(?!\d+)))+(?:_|-|\s|\.)*?(?<hash>\[.{8}\])?(?:$|\.)?",
+                new Regex(@"^(?:\[(?<subgroup>.+?)\][-_. ]?)?(?<title>.+?)(?:[-_. ]+(?<absoluteepisode>(?<!\d+)\d{2,3}(?!\d+)))+(?:_|-|\s|\.)*?(?<hash>\[.{8}\])?(?:$|\.)?",
                           RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
                 //Anime - Title {Absolute Episode Number}
-                new Regex(@"^(?:\[(?<subgroup>.+?)\][-_. ]?)?(?<title>.+?)(?:(?:[-_\W](?<![()\[!]))+(?<absoluteepisode>(?<!\d+)\d{2,3}(\.\d{1,2})?(?!\d+)))+(?:_|-|\s|\.)*?(?<hash>\[.{8}\])?(?:$|\.)?",
+                new Regex(@"^(?:\[(?<subgroup>.+?)\][-_. ]?)?(?<title>.+?)(?:(?:[-_\W](?<![()\[!]))+(?<absoluteepisode>(?<!\d+)\d{2,3}(?!\d+)))+(?:_|-|\s|\.)*?(?<hash>\[.{8}\])?(?:$|\.)?",
                           RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
                 //Extant, terrible multi-episode naming (extant.10708.hdtv-lol.mp4)
@@ -291,7 +290,7 @@ namespace NzbDrone.Core.Parser
             };
 
         //Regex to detect whether the title was reversed.
-        private static readonly Regex ReversedTitleRegex = new Regex(@"[-._ ](p027|p0801|\d{2,3}E\d{2}S)[-._ ]", RegexOptions.Compiled);
+        private static readonly Regex ReversedTitleRegex = new Regex(@"[-._ ](p027|p0801|\d{2}E\d{2}S)[-._ ]", RegexOptions.Compiled);
 
         private static readonly Regex NormalizeRegex = new Regex(@"((?:\b|_)(?<!^)(a(?!$)|an|the|and|or|of)(?:\b|_))|\W|_",
                                                                 RegexOptions.IgnoreCase | RegexOptions.Compiled);
@@ -299,7 +298,7 @@ namespace NzbDrone.Core.Parser
         private static readonly Regex FileExtensionRegex = new Regex(@"\.[a-z0-9]{2,4}$",
                                                                 RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
-        private static readonly Regex SimpleTitleRegex = new Regex(@"(?:(480|720|1080|2160)[ip]|[xh][\W_]?26[45]|DD\W?5\W1|[<>?*:|]|848x480|1280x720|1920x1080|3840x2160|4096x2160|(8|10)b(it)?|10-bit)\s*?",
+        private static readonly Regex SimpleTitleRegex = new Regex(@"(?:(480|720|1080|2160)[ip]|[xh][\W_]?26[45]|DD\W?5\W1|[<>?*:|]|848x480|1280x720|1920x1080|3840x2160|4096x2160|(8|10)b(it)?)\s*?",
                                                                 RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
         private static readonly Regex WebsitePrefixRegex = new Regex(@"^\[\s*[a-z]+(\.[a-z]+)+\s*\][- ]*|^www\.[a-z]+\.(?:com|net)[ -]*",
@@ -654,32 +653,21 @@ namespace NzbDrone.Core.Parser
 
                     if (absoluteEpisodeCaptures.Any())
                     {
-                        var first = Convert.ToDecimal(absoluteEpisodeCaptures.First().Value, CultureInfo.InvariantCulture);
-                        var last = Convert.ToDecimal(absoluteEpisodeCaptures.Last().Value, CultureInfo.InvariantCulture);
+                        var first = Convert.ToInt32(absoluteEpisodeCaptures.First().Value);
+                        var last = Convert.ToInt32(absoluteEpisodeCaptures.Last().Value);
 
                         if (first > last)
                         {
                             return null;
                         }
 
-                        if ((first % 1) != 0 || (last % 1) != 0)
-                        {
-                            if (absoluteEpisodeCaptures.Count != 1)
-                                return null; // Multiple matches not allowed for specials
+                        var count = last - first + 1;
+                        result.AbsoluteEpisodeNumbers = Enumerable.Range(first, count).ToArray();
 
-                            result.SpecialAbsoluteEpisodeNumbers = new decimal[] { first };
+                        if (matchGroup.Groups["special"].Success)
+                        {
                             result.Special = true;
                         }
-                        else
-                        {
-                            var count = last - first + 1;
-                            result.AbsoluteEpisodeNumbers = Enumerable.Range((int)first, (int)count).ToArray();
-
-                            if (matchGroup.Groups["special"].Success)
-                            {
-                                result.Special = true;
-                            }
-                        }
                     }
 
                     if (!episodeCaptures.Any() && !absoluteEpisodeCaptures.Any())

src/NzbDrone.Core/ThingiProvider/Status/ProviderStatusServiceBase.cs

@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using NLog;
-using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.ThingiProvider.Events;
 
@@ -25,18 +24,15 @@ namespace NzbDrone.Core.ThingiProvider.Status
 
         protected readonly IProviderStatusRepository<TModel> _providerStatusRepository;
         protected readonly IEventAggregator _eventAggregator;
-        protected readonly IRuntimeInfo _runtimeInfo;
         protected readonly Logger _logger;
 
         protected int MaximumEscalationLevel { get; set; } = EscalationBackOff.Periods.Length - 1;
         protected TimeSpan MinimumTimeSinceInitialFailure { get; set; } = TimeSpan.Zero;
-        protected TimeSpan MinimumTimeSinceStartup { get; set; } = TimeSpan.FromMinutes(15);
 
-        public ProviderStatusServiceBase(IProviderStatusRepository<TModel> providerStatusRepository, IEventAggregator eventAggregator, IRuntimeInfo runtimeInfo, Logger logger)
+        public ProviderStatusServiceBase(IProviderStatusRepository<TModel> providerStatusRepository, IEventAggregator eventAggregator, Logger logger)
         {
             _providerStatusRepository = providerStatusRepository;
             _eventAggregator = eventAggregator;
-            _runtimeInfo = runtimeInfo;
             _logger = logger;
         }
 
@@ -93,10 +89,9 @@ namespace NzbDrone.Core.ThingiProvider.Status
                     escalate = false;
                 }
 
-                var inStartupGracePeriod = (_runtimeInfo.StartTime + MinimumTimeSinceStartup) > now;
                 var inGracePeriod = (status.InitialFailure.Value + MinimumTimeSinceInitialFailure) > now;
 
-                if (escalate && !inGracePeriod && !inStartupGracePeriod)
+                if (escalate && !inGracePeriod)
                 {
                     status.EscalationLevel = Math.Min(MaximumEscalationLevel, status.EscalationLevel + 1);
                 }
@@ -114,15 +109,6 @@ namespace NzbDrone.Core.ThingiProvider.Status
                     status.DisabledTill = now + CalculateBackOffPeriod(status);
                 }
 
-                if (inStartupGracePeriod && minimumBackOff == TimeSpan.Zero && status.DisabledTill.HasValue)
-                {
-                    var maximumDisabledTill = now + TimeSpan.FromSeconds(EscalationBackOff.Periods[1]);
-                    if (maximumDisabledTill < status.DisabledTill)
-                    {
-                        status.DisabledTill = maximumDisabledTill;
-                    }
-                }
-
                 _providerStatusRepository.Upsert(status);
 
                 _eventAggregator.PublishEvent(new ProviderStatusChangedEvent<TProvider>(providerId, status));

src/NzbDrone.Core/Tv/Episode.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Marr.Data;
 using NzbDrone.Common.Extensions;
@@ -32,7 +32,6 @@ namespace NzbDrone.Core.Tv
         public bool UnverifiedSceneNumbering { get; set; }
         public Ratings Ratings { get; set; }
         public List<MediaCover.MediaCover> Images { get; set; }
-        public DateTime? LastSearchTime { get; set; }
 
         public string SeriesTitle { get; private set; }
 
@@ -47,4 +46,4 @@ namespace NzbDrone.Core.Tv
             return string.Format("[{0}]{1}", Id, Title.NullSafe());
         }
     }
-}
+}

src/NzbDrone.Core/Tv/EpisodeAddedService.cs

@@ -73,9 +73,7 @@ namespace NzbDrone.Core.Tv
                     return;
                 }
 
-                var previouslyAired = message.Added.Where(a => a.AirDateUtc.HasValue
-                    && a.AirDateUtc.Value.Between(DateTime.UtcNow.AddDays(-14), DateTime.UtcNow.AddDays(1))
-                    && a.Monitored).ToList();
+                var previouslyAired = message.Added.Where(a => a.AirDateUtc.HasValue && a.AirDateUtc.Value.Before(DateTime.UtcNow.AddDays(1)) && a.Monitored).ToList();
 
                 if (previouslyAired.Empty())
                 {

src/NzbDrone.Core/Tv/RefreshEpisodeService.cs

@@ -34,7 +34,6 @@ namespace NzbDrone.Core.Tv
 
             var existingEpisodes = _episodeService.GetEpisodeBySeries(series.Id);
             var seasons = series.Seasons;
-            var hasExisting = existingEpisodes.Any();
 
             var updateList = new List<Episode>();
             var newList = new List<Episode>();
@@ -83,8 +82,6 @@ namespace NzbDrone.Core.Tv
                 }
             }
 
-            UnmonitorReaddedEpisodes(series, newList, hasExisting);
-
             var allEpisodes = new List<Episode>();
             allEpisodes.AddRange(newList);
             allEpisodes.AddRange(updateList);
@@ -120,41 +117,6 @@ namespace NzbDrone.Core.Tv
             return season == null || season.Monitored;
         }
 
-
-        private void UnmonitorReaddedEpisodes(Series series, List<Episode> episodes, bool hasExisting)
-        {
-            if (series.AddOptions != null)
-            {
-                return;
-            }
-
-            var threshold = DateTime.UtcNow.AddDays(-14);
-
-            var oldEpisodes = episodes.Where(e => e.AirDateUtc.HasValue && e.AirDateUtc.Value.Before(threshold)).ToList();
-
-            if (oldEpisodes.Any())
-            {
-                if (hasExisting)
-                {
-                    _logger.Warn("Show {0} ({1}) had {2} old episodes appear, please check monitored status.", series.TvdbId, series.Title, oldEpisodes.Count);
-                }
-                else
-                {
-                    threshold = DateTime.UtcNow.AddDays(-1);
-
-                    foreach (var episode in episodes)
-                    {
-                        if (episode.AirDateUtc.HasValue && episode.AirDateUtc.Value.Before(threshold))
-                        {
-                            episode.Monitored = false;
-                        }
-                    }
-
-                    _logger.Warn("Show {0} ({1}) had {2} old episodes appear, unmonitored aired episodes to prevent unexpected downloads.", series.TvdbId, series.Title, oldEpisodes.Count);
-                }
-            }
-        }
-
         private void AdjustMultiEpisodeAirTime(Series series, IEnumerable<Episode> allEpisodes)
         {
             if (series.Network == "Netflix")

src/NzbDrone.Core/Update/UpdatePackageProvider.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using NzbDrone.Common.Cloud;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Http;
-using NzbDrone.Core.Analytics;
 
 namespace NzbDrone.Core.Update
 {
@@ -16,16 +15,14 @@ namespace NzbDrone.Core.Update
     public class UpdatePackageProvider : IUpdatePackageProvider
     {
         private readonly IHttpClient _httpClient;
-        private readonly IHttpRequestBuilderFactory _requestBuilder;
         private readonly IPlatformInfo _platformInfo;
-        private readonly IAnalyticsService _analyticsService;
+        private readonly IHttpRequestBuilderFactory _requestBuilder;
 
-        public UpdatePackageProvider(IHttpClient httpClient, ISonarrCloudRequestBuilder requestBuilder, IAnalyticsService analyticsService, IPlatformInfo platformInfo)
+        public UpdatePackageProvider(IHttpClient httpClient, ISonarrCloudRequestBuilder requestBuilder, IPlatformInfo platformInfo)
         {
-            _platformInfo = platformInfo;
-            _analyticsService = analyticsService;
-            _requestBuilder = requestBuilder.Services;
             _httpClient = httpClient;
+            _platformInfo = platformInfo;
+            _requestBuilder = requestBuilder.Services;
         }
 
         public UpdatePackage GetLatestUpdate(string branch, Version currentVersion)
@@ -35,15 +32,10 @@ namespace NzbDrone.Core.Update
                                          .AddQueryParam("version", currentVersion)
                                          .AddQueryParam("os", OsInfo.Os.ToString().ToLowerInvariant())
                                          .AddQueryParam("runtimeVer", _platformInfo.Version)
-                                         .SetSegment("branch", branch);
+                                         .SetSegment("branch", branch)
+                                         .Build();
 
-            if (_analyticsService.IsEnabled)
-            {
-                // Send if the system is active so we know which versions to deprecate/ignore
-                request.AddQueryParam("active", _analyticsService.InstallIsActive.ToString().ToLower());
-            }
-
-            var update = _httpClient.Get<UpdatePackageAvailable>(request.Build()).Resource;
+            var update = _httpClient.Get<UpdatePackageAvailable>(request).Resource;
 
             if (!update.Available) return null;
 
@@ -57,15 +49,10 @@ namespace NzbDrone.Core.Update
                                          .AddQueryParam("version", currentVersion)
                                          .AddQueryParam("os", OsInfo.Os.ToString().ToLowerInvariant())
                                          .AddQueryParam("runtimeVer", _platformInfo.Version)
-                                         .SetSegment("branch", branch);
+                                         .SetSegment("branch", branch)
+                                         .Build();
 
-            if (_analyticsService.IsEnabled)
-            {
-                // Send if the system is active so we know which versions to deprecate/ignore
-                request.AddQueryParam("active", _analyticsService.InstallIsActive.ToString().ToLower());
-            }
-
-            var updates = _httpClient.Get<List<UpdatePackage>>(request.Build());
+            var updates = _httpClient.Get<List<UpdatePackage>>(request);
 
             return updates.Resource;
         }

src/NzbDrone.Core/Validation/NzbDroneValidationExtensions.cs

@@ -1,7 +1,5 @@
-using System.Collections.Generic;
 using System.Linq;
 using FluentValidation;
-using FluentValidation.Results;
 
 namespace NzbDrone.Core.Validation
 {
@@ -21,21 +19,5 @@ namespace NzbDrone.Core.Validation
                 throw new ValidationException(result.Errors);
             }
         }
-
-        public static bool HasErrors(this List<ValidationFailure> list)
-        {
-            foreach (var item in list)
-            {
-                var extended = item as NzbDroneValidationFailure;
-                if (extended != null && extended.IsWarning)
-                {
-                    continue;
-                }
-
-                return true;
-            }
-
-            return false;
-        }
     }
 }