New: Use Notifiarr API

New: Notifiarr Add Instance Name Support

Fixed: Notifiarr - Better HTTP Error Handling

also quiet sentry

(cherry picked from commit 1db690ad39ec103c0f4dc89ac4545801ef95bec7)

Fixed: Improve Notifiarr Exception Handling and Validation Errors

(cherry picked from commit 6aaa024d71b939030950460ae986ada5bbae5ad7)

also move notifiarr to header auth from url auth

frontend/src/Activity/History/HistoryRow.js

@@ -169,16 +169,6 @@ class HistoryRow extends Component {
               );
             }
 
-            if (name === 'sourceTitle') {
-              return (
-                <TableRowCell
-                  key={name}
-                >
-                  {sourceTitle}
-                </TableRowCell>
-              );
-            }
-
             if (name === 'details') {
               return (
                 <TableRowCell

frontend/src/Settings/General/HostSettings.js

@@ -21,7 +21,6 @@ function HostSettings(props) {
     port,
     urlBase,
     instanceName,
-    applicationUrl,
     enableSsl,
     sslPort,
     sslCertPath,
@@ -97,21 +96,6 @@ function HostSettings(props) {
         />
       </FormGroup>
 
-      <FormGroup
-        advancedSettings={advancedSettings}
-        isAdvanced={true}
-      >
-        <FormLabel>{translate('ApplicationURL')}</FormLabel>
-
-        <FormInputGroup
-          type={inputTypes.TEXT}
-          name="applicationUrl"
-          helpText={translate('ApplicationUrlHelpText')}
-          onChange={onInputChange}
-          {...applicationUrl}
-        />
-      </FormGroup>
-
       <FormGroup
         advancedSettings={advancedSettings}
         isAdvanced={true}

frontend/src/Store/Actions/Creators/createSaveProviderHandler.js

@@ -6,7 +6,6 @@ import getProviderState from 'Utilities/State/getProviderState';
 import { removeItem, set, updateItem } from '../baseActions';
 
 const abortCurrentRequests = {};
-let lastSaveData = null;
 
 export function createCancelSaveProviderHandler(section) {
   return function(getState, payload, dispatch) {
@@ -28,33 +27,27 @@ function createSaveProviderHandler(section, url, options = {}, removeStale = fal
     } = payload;
 
     const saveData = Array.isArray(id) ? id.map((x) => getProviderState({ id: x, ...otherPayload }, getState, section)) : getProviderState({ id, ...otherPayload }, getState, section);
-    const requestUrl = id ? `${url}/${id}` : url;
-    const params = { ...queryParams };
-
-    // If the user is re-saving the same provider without changes
-    // force it to be saved. Only applies to editing existing providers.
-
-    if (id && _.isEqual(saveData, lastSaveData)) {
-      params.forceSave = true;
-    }
-
-    lastSaveData = saveData;
 
     const ajaxOptions = {
-      url: `${requestUrl}?${$.param(params, true)}`,
-      method: id ? 'PUT' : 'POST',
+      url: `${url}?${$.param(queryParams, true)}`,
+      method: 'POST',
       contentType: 'application/json',
       dataType: 'json',
       data: JSON.stringify(saveData)
     };
 
+    if (id) {
+      ajaxOptions.method = 'PUT';
+      if (!Array.isArray(id)) {
+        ajaxOptions.url = `${url}/${id}?${$.param(queryParams, true)}`;
+      }
+    }
+
     const { request, abortRequest } = createAjaxRequest(ajaxOptions);
 
     abortCurrentRequests[section] = abortRequest;
 
     request.done((data) => {
-      lastSaveData = null;
-
       if (!Array.isArray(data)) {
         data = [data];
       }

frontend/src/Store/Actions/historyActions.js

@@ -71,11 +71,6 @@ export const defaultState = {
       label: 'Release Group',
       isVisible: false
     },
-    {
-      name: 'sourceTitle',
-      label: 'Source Title',
-      isVisible: false
-    },
     {
       name: 'details',
       columnLabel: 'Details',

src/Directory.Packages.props

@@ -29,9 +29,9 @@
     <PackageVersion Include="MonoTorrent" Version="2.0.6" />
     <PackageVersion Include="NBuilder" Version="6.1.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageVersion Include="NLog.Extensions.Logging" Version="5.1.0" />
-    <PackageVersion Include="NLog" Version="5.0.5" />
-    <PackageVersion Include="NLog.Targets.Syslog" Version="7.0.0" />
+    <PackageVersion Include="NLog.Extensions.Logging" Version="1.7.4" />
+    <PackageVersion Include="NLog" Version="4.7.14" />
+    <PackageVersion Include="NLog.Targets.Syslog" Version="6.0.2" />
     <PackageVersion Include="Npgsql" Version="6.0.3" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.2.1" />
     <PackageVersion Include="NUnit" Version="3.13.3" />

src/NzbDrone.Common/Disk/SystemFolders.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using NzbDrone.Common.EnvironmentInfo;
 
@@ -24,8 +24,7 @@ namespace NzbDrone.Common.Disk
                        "/boot",
                        "/lib",
                        "/sbin",
-                       "/proc",
-                       "/usr/bin"
+                       "/proc"
                    };
         }
     }

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

@@ -1,6 +1,6 @@
-using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
 using NLog;
+using NLog.Fluent;
 
 namespace NzbDrone.Common.Instrumentation.Extensions
 {
@@ -8,46 +8,47 @@ namespace NzbDrone.Common.Instrumentation.Extensions
     {
         public static readonly Logger SentryLogger = LogManager.GetLogger("Sentry");
 
-        public static LogEventBuilder SentryFingerprint(this LogEventBuilder logBuilder, params string[] fingerprint)
+        public static LogBuilder SentryFingerprint(this LogBuilder logBuilder, params string[] fingerprint)
         {
             return logBuilder.Property("Sentry", fingerprint);
         }
 
-        public static LogEventBuilder WriteSentryDebug(this LogEventBuilder logBuilder, params string[] fingerprint)
+        public static LogBuilder WriteSentryDebug(this LogBuilder logBuilder, params string[] fingerprint)
         {
             return LogSentryMessage(logBuilder, LogLevel.Debug, fingerprint);
         }
 
-        public static LogEventBuilder WriteSentryInfo(this LogEventBuilder logBuilder, params string[] fingerprint)
+        public static LogBuilder WriteSentryInfo(this LogBuilder logBuilder, params string[] fingerprint)
         {
             return LogSentryMessage(logBuilder, LogLevel.Info, fingerprint);
         }
 
-        public static LogEventBuilder WriteSentryWarn(this LogEventBuilder logBuilder, params string[] fingerprint)
+        public static LogBuilder WriteSentryWarn(this LogBuilder logBuilder, params string[] fingerprint)
         {
             return LogSentryMessage(logBuilder, LogLevel.Warn, fingerprint);
         }
 
-        public static LogEventBuilder WriteSentryError(this LogEventBuilder logBuilder, params string[] fingerprint)
+        public static LogBuilder WriteSentryError(this LogBuilder logBuilder, params string[] fingerprint)
         {
             return LogSentryMessage(logBuilder, LogLevel.Error, fingerprint);
         }
 
-        private static LogEventBuilder LogSentryMessage(LogEventBuilder logBuilder, LogLevel level, string[] fingerprint)
+        private static LogBuilder LogSentryMessage(LogBuilder logBuilder, LogLevel level, string[] fingerprint)
         {
-            SentryLogger.ForLogEvent(level)
-                        .CopyLogEvent(logBuilder.LogEvent)
+            SentryLogger.Log(level)
+                        .CopyLogEvent(logBuilder.LogEventInfo)
                         .SentryFingerprint(fingerprint)
-                        .Log();
+                        .Write();
 
-            return logBuilder.Property<string>("Sentry", null);
+            return logBuilder.Property("Sentry", null);
         }
 
-        private static LogEventBuilder CopyLogEvent(this LogEventBuilder logBuilder, LogEventInfo logEvent)
+        private static LogBuilder CopyLogEvent(this LogBuilder logBuilder, LogEventInfo logEvent)
         {
-            return logBuilder.TimeStamp(logEvent.TimeStamp)
+            return logBuilder.LoggerName(logEvent.LoggerName)
+                             .TimeStamp(logEvent.TimeStamp)
                              .Message(logEvent.Message, logEvent.Parameters)
-                             .Properties(logEvent.Properties.Select(p => new KeyValuePair<string, object>(p.Key.ToString(), p.Value)))
+                             .Properties(logEvent.Properties.ToDictionary(v => v.Key, v => v.Value))
                              .Exception(logEvent.Exception);
         }
     }

src/NzbDrone.Common/Instrumentation/NzbDroneFileTarget.cs

@@ -1,15 +1,13 @@
-using System.Text;
-using NLog;
+using NLog;
 using NLog.Targets;
 
 namespace NzbDrone.Common.Instrumentation
 {
     public class NzbDroneFileTarget : FileTarget
     {
-        protected override void RenderFormattedMessage(LogEventInfo logEvent, StringBuilder target)
+        protected override string GetFormattedMessage(LogEventInfo logEvent)
         {
-            var result = CleanseLogMessage.Cleanse(Layout.Render(logEvent));
-            target.Append(result);
+            return CleanseLogMessage.Cleanse(Layout.Render(logEvent));
         }
     }
 }

src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs

@@ -34,8 +34,6 @@ namespace NzbDrone.Common.Instrumentation
 
             var appFolderInfo = new AppFolderInfo(startupContext);
 
-            RegisterGlobalFilters();
-
             if (Debugger.IsAttached)
             {
                 RegisterDebugger();
@@ -103,16 +101,6 @@ namespace NzbDrone.Common.Instrumentation
             LogManager.Configuration.LoggingRules.Add(loggingRule);
         }
 
-        private static void RegisterGlobalFilters()
-        {
-            LogManager.Setup().LoadConfiguration(c =>
-            {
-                c.ForLogger("Microsoft.Hosting.Lifetime*").WriteToNil(LogLevel.Info);
-                c.ForLogger("System*").WriteToNil(LogLevel.Warn);
-                c.ForLogger("Microsoft*").WriteToNil(LogLevel.Warn);
-            });
-        }
-
         private static void RegisterConsole()
         {
             var level = LogLevel.Trace;

src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs

@@ -206,11 +206,7 @@ namespace NzbDrone.Common.Instrumentation.Sentry
             if (ex != null)
             {
                 fingerPrint.Add(ex.GetType().FullName);
-                if (ex.TargetSite != null)
-                {
-                    fingerPrint.Add(ex.TargetSite.ToString());
-                }
-
+                fingerPrint.Add(ex.TargetSite.ToString());
                 if (ex.InnerException != null)
                 {
                     fingerPrint.Add(ex.InnerException.GetType().FullName);

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

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using FizzWare.NBuilder;
@@ -6,7 +5,6 @@ using FluentAssertions;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Core.Books;
-using NzbDrone.Core.Configuration;
 using NzbDrone.Core.DecisionEngine.Specifications;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Parser.Model;
@@ -246,89 +244,5 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                    .Should()
                    .BeFalse();
         }
-
-        [Test]
-        public void should_return_true_when_repacks_are_not_preferred()
-        {
-            Mocker.GetMock<IConfigService>()
-            .Setup(s => s.DownloadPropersAndRepacks)
-            .Returns(ProperDownloadTypes.DoNotPrefer);
-
-            _trackFiles.Select(c =>
-            {
-                c.ReleaseGroup = "";
-                return c;
-            }).ToList();
-
-            _trackFiles.Select(c =>
-            {
-                c.Quality = new QualityModel(Quality.FLAC);
-                return c;
-            }).ToList();
-
-            var remoteAlbum = Builder<RemoteBook>.CreateNew()
-                                                      .With(e => e.ParsedBookInfo = _parsedBookInfo)
-                                                      .With(e => e.Books = _books)
-                                                      .Build();
-
-            Subject.IsSatisfiedBy(remoteAlbum, null).Accepted.Should().BeTrue();
-        }
-
-        [Test]
-        public void should_return_true_when_repack_but_auto_download_repacks_is_true()
-        {
-            Mocker.GetMock<IConfigService>()
-            .Setup(s => s.DownloadPropersAndRepacks)
-            .Returns(ProperDownloadTypes.PreferAndUpgrade);
-
-            _parsedBookInfo.Quality.Revision.IsRepack = true;
-
-            _trackFiles.Select(c =>
-            {
-                c.ReleaseGroup = "Readarr";
-                return c;
-            }).ToList();
-
-            _trackFiles.Select(c =>
-            {
-                c.Quality = new QualityModel(Quality.FLAC);
-                return c;
-            }).ToList();
-
-            var remoteAlbum = Builder<RemoteBook>.CreateNew()
-                                                      .With(e => e.ParsedBookInfo = _parsedBookInfo)
-                                                      .With(e => e.Books = _books)
-                                                      .Build();
-
-            Subject.IsSatisfiedBy(remoteAlbum, null).Accepted.Should().BeTrue();
-        }
-
-        [Test]
-        public void should_return_false_when_repack_but_auto_download_repacks_is_false()
-        {
-            Mocker.GetMock<IConfigService>()
-            .Setup(s => s.DownloadPropersAndRepacks)
-            .Returns(ProperDownloadTypes.DoNotUpgrade);
-
-            _parsedBookInfo.Quality.Revision.IsRepack = true;
-
-            _trackFiles.Select(c =>
-            {
-                c.ReleaseGroup = "Readarr";
-                return c;
-            }).ToList();
-            _trackFiles.Select(c =>
-            {
-                c.Quality = new QualityModel(Quality.FLAC);
-                return c;
-            }).ToList();
-
-            var remoteAlbum = Builder<RemoteBook>.CreateNew()
-                                                      .With(e => e.ParsedBookInfo = _parsedBookInfo)
-                                                      .With(e => e.Books = _books)
-                                                      .Build();
-
-            Subject.IsSatisfiedBy(remoteAlbum, null).Accepted.Should().BeFalse();
-        }
     }
 }

src/NzbDrone.Core.Test/Download/DownloadClientTests/FreeboxDownloadTests/TorrentFreeboxDownloadFixture.cs

@@ -1,371 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using FluentAssertions;
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Common.Disk;
-using NzbDrone.Common.Http;
-using NzbDrone.Core.Download;
-using NzbDrone.Core.Download.Clients;
-using NzbDrone.Core.Download.Clients.FreeboxDownload;
-using NzbDrone.Core.Download.Clients.FreeboxDownload.Responses;
-using NzbDrone.Core.Parser.Model;
-
-namespace NzbDrone.Core.Test.Download.DownloadClientTests.FreeboxDownloadTests
-{
-    [TestFixture]
-    public class TorrentFreeboxDownloadFixture : DownloadClientFixtureBase<TorrentFreeboxDownload>
-    {
-        protected FreeboxDownloadSettings _settings;
-
-        protected FreeboxDownloadConfiguration _downloadConfiguration;
-
-        protected FreeboxDownloadTask _task;
-
-        protected string _defaultDestination = @"/some/path";
-        protected string _encodedDefaultDestination = "L3NvbWUvcGF0aA==";
-        protected string _category = "somecat";
-        protected string _encodedDefaultDestinationAndCategory = "L3NvbWUvcGF0aC9zb21lY2F0";
-        protected string _destinationDirectory = @"/path/to/media";
-        protected string _encodedDestinationDirectory = "L3BhdGgvdG8vbWVkaWE=";
-        protected OsPath _physicalPath = new OsPath("/mnt/sdb1/mydata");
-        protected string _downloadURL => "magnet:?xt=urn:btih:5dee65101db281ac9c46344cd6b175cdcad53426&dn=download";
-
-        [SetUp]
-        public void Setup()
-        {
-            Subject.Definition = new DownloadClientDefinition();
-
-            _settings = new FreeboxDownloadSettings()
-            {
-                Host = "127.0.0.1",
-                Port = 443,
-                ApiUrl = "/api/v1/",
-                AppId = "someid",
-                AppToken = "S0mEv3RY1oN9T0k3n"
-            };
-
-            Subject.Definition.Settings = _settings;
-
-            _downloadConfiguration = new FreeboxDownloadConfiguration()
-            {
-                DownloadDirectory = _encodedDefaultDestination
-            };
-
-            _task = new FreeboxDownloadTask()
-            {
-                Id = "id0",
-                Name = "name",
-                DownloadDirectory = "L3NvbWUvcGF0aA==",
-                InfoHash = "HASH",
-                QueuePosition = 1,
-                Status = FreeboxDownloadTaskStatus.Unknown,
-                Eta = 0,
-                Error = "none",
-                Type = FreeboxDownloadTaskType.Bt.ToString(),
-                IoPriority = FreeboxDownloadTaskIoPriority.Normal.ToString(),
-                StopRatio = 150,
-                PieceLength = 125,
-                CreatedTimestamp = 1665261599,
-                Size = 1000,
-                ReceivedPrct = 0,
-                ReceivedBytes = 0,
-                ReceivedRate = 0,
-                TransmittedPrct = 0,
-                TransmittedBytes = 0,
-                TransmittedRate = 0,
-            };
-
-            Mocker.GetMock<IHttpClient>()
-                  .Setup(s => s.Get(It.IsAny<HttpRequest>()))
-                  .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), new byte[0]));
-        }
-
-        protected void GivenCategory()
-        {
-            _settings.Category = _category;
-        }
-
-        protected void GivenDestinationDirectory()
-        {
-            _settings.DestinationDirectory = _destinationDirectory;
-        }
-
-        protected virtual void GivenDownloadConfiguration()
-        {
-            Mocker.GetMock<IFreeboxDownloadProxy>()
-                  .Setup(s => s.GetDownloadConfiguration(It.IsAny<FreeboxDownloadSettings>()))
-                  .Returns(_downloadConfiguration);
-        }
-
-        protected virtual void GivenTasks(List<FreeboxDownloadTask> torrents)
-        {
-            if (torrents == null)
-            {
-                torrents = new List<FreeboxDownloadTask>();
-            }
-
-            Mocker.GetMock<IFreeboxDownloadProxy>()
-                  .Setup(s => s.GetTasks(It.IsAny<FreeboxDownloadSettings>()))
-                  .Returns(torrents);
-        }
-
-        protected void PrepareClientToReturnQueuedItem()
-        {
-            _task.Status = FreeboxDownloadTaskStatus.Queued;
-
-            GivenTasks(new List<FreeboxDownloadTask>
-            {
-                _task
-            });
-        }
-
-        protected void GivenSuccessfulDownload()
-        {
-            Mocker.GetMock<IHttpClient>()
-                  .Setup(s => s.Get(It.IsAny<HttpRequest>()))
-                  .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), new byte[1000]));
-
-            Mocker.GetMock<IFreeboxDownloadProxy>()
-                  .Setup(s => s.AddTaskFromUrl(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<double?>(), It.IsAny<FreeboxDownloadSettings>()))
-                  .Callback(PrepareClientToReturnQueuedItem);
-
-            Mocker.GetMock<IFreeboxDownloadProxy>()
-                  .Setup(s => s.AddTaskFromFile(It.IsAny<string>(), It.IsAny<byte[]>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<double?>(), It.IsAny<FreeboxDownloadSettings>()))
-                  .Callback(PrepareClientToReturnQueuedItem);
-        }
-
-        protected override RemoteEpisode CreateRemoteEpisode()
-        {
-            var episode = base.CreateRemoteEpisode();
-
-            episode.Release.DownloadUrl = _downloadURL;
-
-            return episode;
-        }
-
-        [Test]
-        public void Download_with_DestinationDirectory_should_force_directory()
-        {
-            GivenDestinationDirectory();
-            GivenSuccessfulDownload();
-
-            var remoteEpisode = CreateRemoteEpisode();
-
-            Subject.Download(remoteEpisode);
-
-            Mocker.GetMock<IFreeboxDownloadProxy>()
-                  .Verify(v => v.AddTaskFromUrl(It.IsAny<string>(), _encodedDestinationDirectory, It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<double?>(), It.IsAny<FreeboxDownloadSettings>()), Times.Once());
-        }
-
-        [Test]
-        public void Download_with_Category_should_force_directory()
-        {
-            GivenDownloadConfiguration();
-            GivenCategory();
-            GivenSuccessfulDownload();
-
-            var remoteEpisode = CreateRemoteEpisode();
-
-            Subject.Download(remoteEpisode);
-
-            Mocker.GetMock<IFreeboxDownloadProxy>()
-                  .Verify(v => v.AddTaskFromUrl(It.IsAny<string>(), _encodedDefaultDestinationAndCategory, It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<double?>(), It.IsAny<FreeboxDownloadSettings>()), Times.Once());
-        }
-
-        [Test]
-        public void Download_without_DestinationDirectory_and_Category_should_use_default()
-        {
-            GivenDownloadConfiguration();
-            GivenSuccessfulDownload();
-
-            var remoteEpisode = CreateRemoteEpisode();
-
-            Subject.Download(remoteEpisode);
-
-            Mocker.GetMock<IFreeboxDownloadProxy>()
-                  .Verify(v => v.AddTaskFromUrl(It.IsAny<string>(), _encodedDefaultDestination, It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<double?>(), It.IsAny<FreeboxDownloadSettings>()), Times.Once());
-        }
-
-        [TestCase(false, false)]
-        [TestCase(true, true)]
-        public void Download_should_pause_torrent_as_expected(bool addPausedSetting, bool toBePausedFlag)
-        {
-            _settings.AddPaused = addPausedSetting;
-
-            GivenDownloadConfiguration();
-            GivenSuccessfulDownload();
-
-            var remoteEpisode = CreateRemoteEpisode();
-
-            Subject.Download(remoteEpisode);
-
-            Mocker.GetMock<IFreeboxDownloadProxy>()
-                  .Verify(v => v.AddTaskFromUrl(It.IsAny<string>(), It.IsAny<string>(), toBePausedFlag, It.IsAny<bool>(), It.IsAny<double?>(), It.IsAny<FreeboxDownloadSettings>()), Times.Once());
-        }
-
-        [TestCase(0, (int)FreeboxDownloadPriority.First, (int)FreeboxDownloadPriority.First, true)]
-        [TestCase(0, (int)FreeboxDownloadPriority.Last, (int)FreeboxDownloadPriority.First, true)]
-        [TestCase(0, (int)FreeboxDownloadPriority.First, (int)FreeboxDownloadPriority.Last, false)]
-        [TestCase(0, (int)FreeboxDownloadPriority.Last, (int)FreeboxDownloadPriority.Last, false)]
-        [TestCase(15, (int)FreeboxDownloadPriority.First, (int)FreeboxDownloadPriority.First, true)]
-        [TestCase(15, (int)FreeboxDownloadPriority.Last, (int)FreeboxDownloadPriority.First, false)]
-        [TestCase(15, (int)FreeboxDownloadPriority.First, (int)FreeboxDownloadPriority.Last, true)]
-        [TestCase(15, (int)FreeboxDownloadPriority.Last, (int)FreeboxDownloadPriority.Last, false)]
-        public void Download_should_queue_torrent_first_as_expected(int ageDay, int olderPriority, int recentPriority, bool toBeQueuedFirstFlag)
-        {
-            _settings.OlderPriority = olderPriority;
-            _settings.RecentPriority = recentPriority;
-
-            GivenDownloadConfiguration();
-            GivenSuccessfulDownload();
-
-            var remoteEpisode = CreateRemoteEpisode();
-
-            var episode = new Tv.Episode()
-            {
-                AirDateUtc = DateTime.UtcNow.Date.AddDays(-ageDay)
-            };
-
-            remoteEpisode.Episodes.Add(episode);
-
-            Subject.Download(remoteEpisode);
-
-            Mocker.GetMock<IFreeboxDownloadProxy>()
-                  .Verify(v => v.AddTaskFromUrl(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>(), toBeQueuedFirstFlag, It.IsAny<double?>(), It.IsAny<FreeboxDownloadSettings>()), Times.Once());
-        }
-
-        [TestCase(0, 0)]
-        [TestCase(1.5, 150)]
-        public void Download_should_define_seed_ratio_as_expected(double? providerSeedRatio, double? expectedSeedRatio)
-        {
-            GivenDownloadConfiguration();
-            GivenSuccessfulDownload();
-
-            var remoteEpisode = CreateRemoteEpisode();
-
-            remoteEpisode.SeedConfiguration = new TorrentSeedConfiguration();
-            remoteEpisode.SeedConfiguration.Ratio = providerSeedRatio;
-
-            Subject.Download(remoteEpisode);
-
-            Mocker.GetMock<IFreeboxDownloadProxy>()
-                  .Verify(v => v.AddTaskFromUrl(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<bool>(), expectedSeedRatio, It.IsAny<FreeboxDownloadSettings>()), Times.Once());
-        }
-
-        [Test]
-        public void GetItems_should_return_empty_list_if_no_tasks_available()
-        {
-            GivenTasks(new List<FreeboxDownloadTask>());
-
-            Subject.GetItems().Should().BeEmpty();
-        }
-
-        [Test]
-        public void GetItems_should_return_ignore_tasks_of_unknown_type()
-        {
-            _task.Status = FreeboxDownloadTaskStatus.Done;
-            _task.Type = "toto";
-
-            GivenTasks(new List<FreeboxDownloadTask> { _task });
-
-            Subject.GetItems().Should().BeEmpty();
-        }
-
-        [Test]
-        public void GetItems_when_destinationdirectory_is_set_should_ignore_downloads_in_wrong_folder()
-        {
-            _settings.DestinationDirectory = @"/some/path/that/will/not/match";
-
-            _task.Status = FreeboxDownloadTaskStatus.Done;
-
-            GivenTasks(new List<FreeboxDownloadTask> { _task });
-
-            Subject.GetItems().Should().BeEmpty();
-        }
-
-        [Test]
-        public void GetItems_when_category_is_set_should_ignore_downloads_in_wrong_folder()
-        {
-            _settings.Category = "somecategory";
-
-            _task.Status = FreeboxDownloadTaskStatus.Done;
-
-            GivenTasks(new List<FreeboxDownloadTask> { _task });
-
-            Subject.GetItems().Should().BeEmpty();
-        }
-
-        [TestCase(FreeboxDownloadTaskStatus.Downloading, false, false)]
-        [TestCase(FreeboxDownloadTaskStatus.Done, true, true)]
-        [TestCase(FreeboxDownloadTaskStatus.Seeding, false, false)]
-        [TestCase(FreeboxDownloadTaskStatus.Stopped, false, false)]
-        public void GetItems_should_return_canBeMoved_and_canBeDeleted_as_expected(FreeboxDownloadTaskStatus apiStatus, bool canMoveFilesExpected, bool canBeRemovedExpected)
-        {
-            _task.Status = apiStatus;
-
-            GivenTasks(new List<FreeboxDownloadTask>() { _task });
-
-            var items = Subject.GetItems();
-
-            items.Should().HaveCount(1);
-            items.First().CanBeRemoved.Should().Be(canBeRemovedExpected);
-            items.First().CanMoveFiles.Should().Be(canMoveFilesExpected);
-        }
-
-        [TestCase(FreeboxDownloadTaskStatus.Stopped, DownloadItemStatus.Paused)]
-        [TestCase(FreeboxDownloadTaskStatus.Stopping, DownloadItemStatus.Paused)]
-        [TestCase(FreeboxDownloadTaskStatus.Queued, DownloadItemStatus.Queued)]
-        [TestCase(FreeboxDownloadTaskStatus.Starting, DownloadItemStatus.Downloading)]
-        [TestCase(FreeboxDownloadTaskStatus.Downloading, DownloadItemStatus.Downloading)]
-        [TestCase(FreeboxDownloadTaskStatus.Retry, DownloadItemStatus.Downloading)]
-        [TestCase(FreeboxDownloadTaskStatus.Checking, DownloadItemStatus.Downloading)]
-        [TestCase(FreeboxDownloadTaskStatus.Error, DownloadItemStatus.Warning)]
-        [TestCase(FreeboxDownloadTaskStatus.Seeding, DownloadItemStatus.Completed)]
-        [TestCase(FreeboxDownloadTaskStatus.Done, DownloadItemStatus.Completed)]
-        [TestCase(FreeboxDownloadTaskStatus.Unknown, DownloadItemStatus.Downloading)]
-        public void GetItems_should_return_item_as_downloadItemStatus(FreeboxDownloadTaskStatus apiStatus, DownloadItemStatus expectedItemStatus)
-        {
-            _task.Status = apiStatus;
-
-            GivenTasks(new List<FreeboxDownloadTask>() { _task });
-
-            var items = Subject.GetItems();
-
-            items.Should().HaveCount(1);
-            items.First().Status.Should().Be(expectedItemStatus);
-        }
-
-        [Test]
-        public void GetItems_should_return_decoded_destination_directory()
-        {
-            var decodedDownloadDirectory = "/that/the/path";
-
-            _task.Status = FreeboxDownloadTaskStatus.Done;
-            _task.DownloadDirectory = "L3RoYXQvdGhlL3BhdGg=";
-
-            GivenTasks(new List<FreeboxDownloadTask> { _task });
-
-            var items = Subject.GetItems();
-
-            items.Should().HaveCount(1);
-            items.First().OutputPath.Should().Be(decodedDownloadDirectory);
-        }
-
-        [Test]
-        public void GetItems_should_return_message_if_tasks_in_error()
-        {
-            _task.Status = FreeboxDownloadTaskStatus.Error;
-            _task.Error = "internal";
-
-            GivenTasks(new List<FreeboxDownloadTask> { _task });
-
-            var items = Subject.GetItems();
-
-            items.Should().HaveCount(1);
-            items.First().Message.Should().Be("Internal error.");
-            items.First().Status.Should().Be(DownloadItemStatus.Warning);
-        }
-    }
-}

src/NzbDrone.Core/Configuration/ConfigService.cs

@@ -410,8 +410,6 @@ namespace NzbDrone.Core.Configuration
         public CertificateValidationType CertificateValidation =>
             GetValueEnum("CertificateValidation", CertificateValidationType.Enabled);
 
-        public string ApplicationUrl => GetValue("ApplicationUrl", string.Empty);
-
         private string GetValue(string key)
         {
             return GetValue(key, string.Empty);

src/NzbDrone.Core/Configuration/IConfigService.cs

@@ -97,6 +97,5 @@ namespace NzbDrone.Core.Configuration
         int BackupRetention { get; }
 
         CertificateValidationType CertificateValidation { get; }
-        string ApplicationUrl { get; }
     }
 }

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

@@ -1,11 +1,9 @@
 using System;
 using NLog;
 using NzbDrone.Common.Extensions;
-using NzbDrone.Core.Configuration;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Qualities;
 
 namespace NzbDrone.Core.DecisionEngine.Specifications
 {
@@ -13,14 +11,12 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
     {
         private readonly IMediaFileService _mediaFileService;
         private readonly UpgradableSpecification _upgradableSpecification;
-        private readonly IConfigService _configService;
         private readonly Logger _logger;
 
-        public RepackSpecification(IMediaFileService mediaFileService, UpgradableSpecification upgradableSpecification, IConfigService configService, Logger logger)
+        public RepackSpecification(IMediaFileService mediaFileService, UpgradableSpecification upgradableSpecification, Logger logger)
         {
             _mediaFileService = mediaFileService;
             _upgradableSpecification = upgradableSpecification;
-            _configService = configService;
             _logger = logger;
         }
 
@@ -34,14 +30,6 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
                 return Decision.Accept();
             }
 
-            var downloadPropersAndRepacks = _configService.DownloadPropersAndRepacks;
-
-            if (downloadPropersAndRepacks == ProperDownloadTypes.DoNotPrefer)
-            {
-                _logger.Debug("Repacks are not preferred, skipping check");
-                return Decision.Accept();
-            }
-
             foreach (var book in subject.Books)
             {
                 var releaseGroup = subject.ParsedBookInfo.ReleaseGroup;
@@ -51,12 +39,6 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
                 {
                     if (_upgradableSpecification.IsRevisionUpgrade(file.Quality, subject.ParsedBookInfo.Quality))
                     {
-                        if (downloadPropersAndRepacks == ProperDownloadTypes.DoNotUpgrade)
-                        {
-                            _logger.Debug("Auto downloading of repacks is disabled");
-                            return Decision.Reject("Repack downloading is disabled");
-                        }
-
                         var fileReleaseGroup = file.ReleaseGroup;
 
                         if (fileReleaseGroup.IsNullOrWhiteSpace())

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

@@ -125,22 +125,22 @@ namespace NzbDrone.Core.Download.Clients.Flood
                     item.RemainingTime = TimeSpan.FromSeconds(properties.Eta);
                 }
 
-                if (properties.Status.Contains("seeding") || properties.Status.Contains("complete"))
-                {
-                    item.Status = DownloadItemStatus.Completed;
-                }
-                else if (properties.Status.Contains("stopped"))
-                {
-                    item.Status = DownloadItemStatus.Paused;
-                }
-                else if (properties.Status.Contains("error"))
+                if (properties.Status.Contains("error"))
                 {
                     item.Status = DownloadItemStatus.Warning;
                 }
+                else if (properties.Status.Contains("seeding") || properties.Status.Contains("complete"))
+                {
+                    item.Status = DownloadItemStatus.Completed;
+                }
                 else if (properties.Status.Contains("downloading"))
                 {
                     item.Status = DownloadItemStatus.Downloading;
                 }
+                else if (properties.Status.Contains("stopped"))
+                {
+                    item.Status = DownloadItemStatus.Paused;
+                }
 
                 if (item.Status == DownloadItemStatus.Completed)
                 {

src/NzbDrone.Core/Download/Clients/FreeboxDownload/FreeboxDownloadEncoding.cs

@@ -1,27 +0,0 @@
-namespace NzbDrone.Core.Download.Clients.FreeboxDownload
-{
-    public static class EncodingForBase64
-    {
-        public static string EncodeBase64(this string text)
-        {
-            if (text == null)
-            {
-                return null;
-            }
-
-            byte[] textAsBytes = System.Text.Encoding.UTF8.GetBytes(text);
-            return System.Convert.ToBase64String(textAsBytes);
-        }
-
-        public static string DecodeBase64(this string encodedText)
-        {
-            if (encodedText == null)
-            {
-                return null;
-            }
-
-            byte[] textAsBytes = System.Convert.FromBase64String(encodedText);
-            return System.Text.Encoding.UTF8.GetString(textAsBytes);
-        }
-    }
-}

src/NzbDrone.Core/Download/Clients/FreeboxDownload/FreeboxDownloadException.cs

@@ -1,10 +0,0 @@
-namespace NzbDrone.Core.Download.Clients.FreeboxDownload
-{
-    public class FreeboxDownloadException : DownloadClientException
-    {
-        public FreeboxDownloadException(string message)
-            : base(message)
-        {
-        }
-    }
-}

src/NzbDrone.Core/Download/Clients/FreeboxDownload/FreeboxDownloadPriority.cs

@@ -1,8 +0,0 @@
-namespace NzbDrone.Core.Download.Clients.FreeboxDownload
-{
-    public enum FreeboxDownloadPriority
-    {
-        Last = 0,
-        First = 1
-    }
-}

src/NzbDrone.Core/Download/Clients/FreeboxDownload/FreeboxDownloadProxy.cs

@@ -1,277 +0,0 @@
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Http;
-using System.Security.Cryptography;
-using NLog;
-using NzbDrone.Common.Cache;
-using NzbDrone.Common.Extensions;
-using NzbDrone.Common.Http;
-using NzbDrone.Common.Serializer;
-using NzbDrone.Core.Download.Clients.FreeboxDownload.Responses;
-
-namespace NzbDrone.Core.Download.Clients.FreeboxDownload
-{
-    public interface IFreeboxDownloadProxy
-    {
-        void Authenticate(FreeboxDownloadSettings settings);
-        string AddTaskFromUrl(string url, string directory, bool addPaused, bool addFirst, double? seedRatio, FreeboxDownloadSettings settings);
-        string AddTaskFromFile(string fileName, byte[] fileContent, string directory, bool addPaused, bool addFirst, double? seedRatio, FreeboxDownloadSettings settings);
-        void DeleteTask(string id, bool deleteData, FreeboxDownloadSettings settings);
-        FreeboxDownloadConfiguration GetDownloadConfiguration(FreeboxDownloadSettings settings);
-        List<FreeboxDownloadTask> GetTasks(FreeboxDownloadSettings settings);
-    }
-
-    public class FreeboxDownloadProxy : IFreeboxDownloadProxy
-    {
-        private readonly IHttpClient _httpClient;
-        private readonly Logger _logger;
-        private ICached<string> _authSessionTokenCache;
-
-        public FreeboxDownloadProxy(ICacheManager cacheManager, IHttpClient httpClient, Logger logger)
-        {
-            _httpClient = httpClient;
-            _logger = logger;
-            _authSessionTokenCache = cacheManager.GetCache<string>(GetType(), "authSessionToken");
-        }
-
-        public void Authenticate(FreeboxDownloadSettings settings)
-        {
-            var request = BuildRequest(settings).Resource("/login").Build();
-
-            var response = ProcessRequest<FreeboxLogin>(request, settings);
-
-            if (response.Result.LoggedIn == false)
-            {
-                throw new DownloadClientAuthenticationException("Not logged");
-            }
-        }
-
-        public string AddTaskFromUrl(string url, string directory, bool addPaused, bool addFirst, double? seedRatio, FreeboxDownloadSettings settings)
-        {
-            var request = BuildRequest(settings).Resource("/downloads/add").Post();
-            request.Headers.ContentType = "application/x-www-form-urlencoded";
-
-            request.AddFormParameter("download_url", System.Web.HttpUtility.UrlPathEncode(url));
-
-            if (!directory.IsNullOrWhiteSpace())
-            {
-                request.AddFormParameter("download_dir", directory);
-            }
-
-            var response = ProcessRequest<FreeboxDownloadTask>(request.Build(), settings);
-
-            SetTorrentSettings(response.Result.Id, addPaused, addFirst, seedRatio, settings);
-
-            return response.Result.Id;
-        }
-
-        public string AddTaskFromFile(string fileName, byte[] fileContent, string directory, bool addPaused, bool addFirst, double? seedRatio, FreeboxDownloadSettings settings)
-        {
-            var request = BuildRequest(settings).Resource("/downloads/add").Post();
-
-            request.AddFormUpload("download_file", fileName, fileContent, "multipart/form-data");
-
-            if (directory.IsNotNullOrWhiteSpace())
-            {
-                request.AddFormParameter("download_dir", directory);
-            }
-
-            var response = ProcessRequest<FreeboxDownloadTask>(request.Build(), settings);
-
-            SetTorrentSettings(response.Result.Id, addPaused, addFirst, seedRatio, settings);
-
-            return response.Result.Id;
-        }
-
-        public void DeleteTask(string id, bool deleteData, FreeboxDownloadSettings settings)
-        {
-            var uri = "/downloads/" + id;
-
-            if (deleteData == true)
-            {
-                uri += "/erase";
-            }
-
-            var request = BuildRequest(settings).Resource(uri).Build();
-
-            request.Method = HttpMethod.Delete;
-
-            ProcessRequest<string>(request, settings);
-        }
-
-        public FreeboxDownloadConfiguration GetDownloadConfiguration(FreeboxDownloadSettings settings)
-        {
-            var request = BuildRequest(settings).Resource("/downloads/config/").Build();
-
-            return ProcessRequest<FreeboxDownloadConfiguration>(request, settings).Result;
-        }
-
-        public List<FreeboxDownloadTask> GetTasks(FreeboxDownloadSettings settings)
-        {
-            var request = BuildRequest(settings).Resource("/downloads/").Build();
-
-            return ProcessRequest<List<FreeboxDownloadTask>>(request, settings).Result;
-        }
-
-        private static string BuildCachedHeaderKey(FreeboxDownloadSettings settings)
-        {
-            return $"{settings.Host}:{settings.AppId}:{settings.AppToken}";
-        }
-
-        private void SetTorrentSettings(string id, bool addPaused, bool addFirst, double? seedRatio, FreeboxDownloadSettings settings)
-        {
-            var request = BuildRequest(settings).Resource("/downloads/" + id).Build();
-
-            request.Method = HttpMethod.Put;
-
-            var body = new Dictionary<string, object> { };
-
-            if (addPaused)
-            {
-                body.Add("status", FreeboxDownloadTaskStatus.Stopped.ToString().ToLower());
-            }
-
-            if (addFirst)
-            {
-                body.Add("queue_pos", "1");
-            }
-
-            if (seedRatio != null)
-            {
-                // 0 means unlimited seeding
-                body.Add("stop_ratio", seedRatio);
-            }
-
-            if (body.Count == 0)
-            {
-                return;
-            }
-
-            request.SetContent(body.ToJson());
-
-            ProcessRequest<FreeboxDownloadTask>(request, settings);
-        }
-
-        private string GetSessionToken(HttpRequestBuilder requestBuilder, FreeboxDownloadSettings settings, bool force = false)
-        {
-            var sessionToken = _authSessionTokenCache.Find(BuildCachedHeaderKey(settings));
-
-            if (sessionToken == null || force)
-            {
-                _authSessionTokenCache.Remove(BuildCachedHeaderKey(settings));
-
-                _logger.Debug($"Client needs a new Session Token to reach the API with App ID '{settings.AppId}'");
-
-                // Obtaining a Session Token (from official documentation):
-                // To protect the app_token secret, it will never be used directly to authenticate the
-                // application, instead the API will provide a challenge the app will combine to its
-                // app_token to open a session and get a session_token.
-                // The validity of the session_token is limited in time and the app will have to renew
-                // this session_token once in a while.
-
-                // Retrieving the 'challenge' value (it changes frequently and have a limited time validity)
-                // needed to build password
-                var challengeRequest = requestBuilder.Resource("/login").Build();
-                challengeRequest.Method = HttpMethod.Get;
-
-                var challenge = ProcessRequest<FreeboxLogin>(challengeRequest, settings).Result.Challenge;
-
-                // The password is computed using the 'challenge' value and the 'app_token' ('App Token' setting)
-                var enc = System.Text.Encoding.ASCII;
-                var hmac = new HMACSHA1(enc.GetBytes(settings.AppToken));
-                hmac.Initialize();
-                var buffer = enc.GetBytes(challenge);
-                var password = System.BitConverter.ToString(hmac.ComputeHash(buffer)).Replace("-", "").ToLower();
-
-                // Both 'app_id' ('App ID' setting) and computed password are set to get a Session Token
-                var sessionRequest = requestBuilder.Resource("/login/session").Post().Build();
-                var body = new Dictionary<string, object>
-                {
-                    { "app_id", settings.AppId },
-                    { "password", password }
-                };
-                sessionRequest.SetContent(body.ToJson());
-
-                sessionToken = ProcessRequest<FreeboxLogin>(sessionRequest, settings).Result.SessionToken;
-
-                _authSessionTokenCache.Set(BuildCachedHeaderKey(settings), sessionToken);
-
-                _logger.Debug($"New Session Token stored in cache for App ID '{settings.AppId}', ready to reach API");
-            }
-
-            return sessionToken;
-        }
-
-        private HttpRequestBuilder BuildRequest(FreeboxDownloadSettings settings, bool authentication = true)
-        {
-            var requestBuilder = new HttpRequestBuilder(settings.UseSsl, settings.Host, settings.Port, settings.ApiUrl)
-            {
-                LogResponseContent = true
-            };
-
-            requestBuilder.Headers.ContentType = "application/json";
-
-            if (authentication == true)
-            {
-                requestBuilder.SetHeader("X-Fbx-App-Auth", GetSessionToken(requestBuilder, settings));
-            }
-
-            return requestBuilder;
-        }
-
-        private FreeboxResponse<T> ProcessRequest<T>(HttpRequest request, FreeboxDownloadSettings settings)
-        {
-            request.LogResponseContent = true;
-            request.SuppressHttpError = true;
-
-            HttpResponse response;
-
-            try
-            {
-                response = _httpClient.Execute(request);
-            }
-            catch (HttpRequestException ex)
-            {
-                throw new DownloadClientUnavailableException($"Unable to reach Freebox API. Verify 'Host', 'Port' or 'Use SSL' settings. (Error: {ex.Message})", ex);
-            }
-            catch (WebException ex)
-            {
-                throw new DownloadClientUnavailableException("Unable to connect to Freebox API, please check your settings", ex);
-            }
-
-            if (response.StatusCode == HttpStatusCode.Forbidden || response.StatusCode == HttpStatusCode.Unauthorized)
-            {
-                _authSessionTokenCache.Remove(BuildCachedHeaderKey(settings));
-
-                var responseContent = Json.Deserialize<FreeboxResponse<FreeboxLogin>>(response.Content);
-
-                var msg = $"Authentication to Freebox API failed. Reason: {responseContent.GetErrorDescription()}";
-                _logger.Error(msg);
-                throw new DownloadClientAuthenticationException(msg);
-            }
-            else if (response.StatusCode == HttpStatusCode.NotFound)
-            {
-                throw new FreeboxDownloadException("Unable to reach Freebox API. Verify 'API URL' setting for base URL and version.");
-            }
-            else if (response.StatusCode == HttpStatusCode.OK)
-            {
-                var responseContent = Json.Deserialize<FreeboxResponse<T>>(response.Content);
-
-                if (responseContent.Success)
-                {
-                    return responseContent;
-                }
-                else
-                {
-                    var msg = $"Freebox API returned error: {responseContent.GetErrorDescription()}";
-                    _logger.Error(msg);
-                    throw new DownloadClientException(msg);
-                }
-            }
-            else
-            {
-                throw new DownloadClientException("Unable to connect to Freebox, please check your settings.");
-            }
-        }
-    }
-}

src/NzbDrone.Core/Download/Clients/FreeboxDownload/FreeboxDownloadSettings.cs

@@ -1,87 +0,0 @@
-using System.Text.RegularExpressions;
-using FluentValidation;
-using NzbDrone.Common.Extensions;
-using NzbDrone.Core.Annotations;
-using NzbDrone.Core.ThingiProvider;
-using NzbDrone.Core.Validation;
-using NzbDrone.Core.Validation.Paths;
-
-namespace NzbDrone.Core.Download.Clients.FreeboxDownload
-{
-    public class FreeboxDownloadSettingsValidator : AbstractValidator<FreeboxDownloadSettings>
-    {
-        public FreeboxDownloadSettingsValidator()
-        {
-            RuleFor(c => c.Host).ValidHost();
-            RuleFor(c => c.Port).InclusiveBetween(1, 65535);
-            RuleFor(c => c.ApiUrl).NotEmpty()
-                                  .WithMessage("'API URL' must not be empty.");
-            RuleFor(c => c.ApiUrl).ValidUrlBase();
-            RuleFor(c => c.AppId).NotEmpty()
-                                 .WithMessage("'App ID' must not be empty.");
-            RuleFor(c => c.AppToken).NotEmpty()
-                                    .WithMessage("'App Token' must not be empty.");
-            RuleFor(c => c.Category).Matches(@"^\.?[-a-z]*$", RegexOptions.IgnoreCase)
-                                    .WithMessage("Allowed characters a-z and -");
-            RuleFor(c => c.DestinationDirectory).IsValidPath()
-                                                .When(c => c.DestinationDirectory.IsNotNullOrWhiteSpace());
-            RuleFor(c => c.DestinationDirectory).Empty()
-                                    .When(c => c.Category.IsNotNullOrWhiteSpace())
-                                    .WithMessage("Cannot use 'Category' and 'Destination Directory' at the same time.");
-            RuleFor(c => c.Category).Empty()
-                                    .When(c => c.DestinationDirectory.IsNotNullOrWhiteSpace())
-                                    .WithMessage("Cannot use 'Category' and 'Destination Directory' at the same time.");
-        }
-    }
-
-    public class FreeboxDownloadSettings : IProviderConfig
-    {
-        private static readonly FreeboxDownloadSettingsValidator Validator = new FreeboxDownloadSettingsValidator();
-
-        public FreeboxDownloadSettings()
-        {
-            Host = "mafreebox.freebox.fr";
-            Port = 443;
-            UseSsl = true;
-            ApiUrl = "/api/v1/";
-        }
-
-        [FieldDefinition(0, Label = "Host", Type = FieldType.Textbox, HelpText = "Hostname or host IP address of the Freebox, defaults to 'mafreebox.freebox.fr' (will only work if on same network)")]
-        public string Host { get; set; }
-
-        [FieldDefinition(1, Label = "Port", Type = FieldType.Textbox, HelpText = "Port used to access Freebox interface, defaults to '443'")]
-        public int Port { get; set; }
-
-        [FieldDefinition(2, Label = "Use SSL", Type = FieldType.Checkbox, HelpText = "Use secured connection when connecting to Freebox API")]
-        public bool UseSsl { get; set; }
-
-        [FieldDefinition(3, Label = "API URL", Type = FieldType.Textbox, Advanced = true, HelpText = "Define Freebox API base URL with API version, eg http://[host]:[port]/[api_base_url]/[api_version]/, defaults to '/api/v1/'")]
-        public string ApiUrl { get; set; }
-
-        [FieldDefinition(4, Label = "App ID", Type = FieldType.Textbox, HelpText = "App ID given when creating access to Freebox API (ie 'app_id')")]
-        public string AppId { get; set; }
-
-        [FieldDefinition(5, Label = "App Token", Type = FieldType.Password, Privacy = PrivacyLevel.Password, HelpText = "App token retrieved when creating access to Freebox API (ie 'app_token')")]
-        public string AppToken { get; set; }
-
-        [FieldDefinition(6, Label = "Destination Directory", Type = FieldType.Textbox, Advanced = true, HelpText = "Optional location to put downloads in, leave blank to use the default Freebox download location")]
-        public string DestinationDirectory { get; set; }
-
-        [FieldDefinition(7, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Sonarr avoids conflicts with unrelated non-Sonarr downloads (will create a [category] subdirectory in the output directory)")]
-        public string Category { get; set; }
-
-        [FieldDefinition(8, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(FreeboxDownloadPriority), HelpText = "Priority to use when grabbing episodes that aired within the last 14 days")]
-        public int RecentPriority { get; set; }
-
-        [FieldDefinition(9, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(FreeboxDownloadPriority), HelpText = "Priority to use when grabbing episodes that aired over 14 days ago")]
-        public int OlderPriority { get; set; }
-
-        [FieldDefinition(10, Label = "Add Paused", Type = FieldType.Checkbox)]
-        public bool AddPaused { get; set; }
-
-        public NzbDroneValidationResult Validate()
-        {
-            return new NzbDroneValidationResult(Validator.Validate(this));
-        }
-    }
-}

src/NzbDrone.Core/Download/Clients/FreeboxDownload/Responses/FreeboxDownloadConfiguration.cs

@@ -1,21 +0,0 @@
-using Newtonsoft.Json;
-
-namespace NzbDrone.Core.Download.Clients.FreeboxDownload.Responses
-{
-    public class FreeboxDownloadConfiguration
-    {
-        [JsonProperty(PropertyName = "download_dir")]
-        public string DownloadDirectory { get; set; }
-        public string DecodedDownloadDirectory
-        {
-            get
-            {
-                return DownloadDirectory.DecodeBase64();
-            }
-            set
-            {
-                DownloadDirectory = value.EncodeBase64();
-            }
-        }
-    }
-}

src/NzbDrone.Core/Download/Clients/FreeboxDownload/Responses/FreeboxDownloadTask.cs

@@ -1,137 +0,0 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
-using NzbDrone.Common.Serializer;
-
-namespace NzbDrone.Core.Download.Clients.FreeboxDownload.Responses
-{
-    public enum FreeboxDownloadTaskType
-    {
-        Bt,
-        Nzb,
-        Http,
-        Ftp
-    }
-
-    public enum FreeboxDownloadTaskStatus
-    {
-        Unknown,
-        Stopped,
-        Queued,
-        Starting,
-        Downloading,
-        Stopping,
-        Error,
-        Done,
-        Checking,
-        Repairing,
-        Extracting,
-        Seeding,
-        Retry
-    }
-
-    public enum FreeboxDownloadTaskIoPriority
-    {
-        Low,
-        Normal,
-        High
-    }
-
-    public class FreeboxDownloadTask
-    {
-        private static readonly Dictionary<string, string> Descriptions;
-
-        [JsonProperty(PropertyName = "id")]
-        public string Id { get; set; }
-        [JsonProperty(PropertyName = "name")]
-        public string Name { get; set; }
-        [JsonProperty(PropertyName = "download_dir")]
-        public string DownloadDirectory { get; set; }
-        public string DecodedDownloadDirectory
-        {
-            get
-            {
-                return DownloadDirectory.DecodeBase64();
-            }
-            set
-            {
-                DownloadDirectory = value.EncodeBase64();
-            }
-        }
-
-        [JsonProperty(PropertyName = "info_hash")]
-        public string InfoHash { get; set; }
-        [JsonProperty(PropertyName = "queue_pos")]
-        public int QueuePosition { get; set; }
-        [JsonConverter(typeof(UnderscoreStringEnumConverter), FreeboxDownloadTaskStatus.Unknown)]
-        public FreeboxDownloadTaskStatus Status { get; set; }
-        [JsonProperty(PropertyName = "eta")]
-        public long Eta { get; set; }
-        [JsonProperty(PropertyName = "error")]
-        public string Error { get; set; }
-        [JsonProperty(PropertyName = "type")]
-        public string Type { get; set; }
-        [JsonProperty(PropertyName = "io_priority")]
-        public string IoPriority { get; set; }
-        [JsonProperty(PropertyName = "stop_ratio")]
-        public long StopRatio { get; set; }
-        [JsonProperty(PropertyName = "piece_length")]
-        public long PieceLength { get; set; }
-        [JsonProperty(PropertyName = "created_ts")]
-        public long CreatedTimestamp { get; set; }
-        [JsonProperty(PropertyName = "size")]
-        public long Size { get; set; }
-        [JsonProperty(PropertyName = "rx_pct")]
-        public long ReceivedPrct { get; set; }
-        [JsonProperty(PropertyName = "rx_bytes")]
-        public long ReceivedBytes { get; set; }
-        [JsonProperty(PropertyName = "rx_rate")]
-        public long ReceivedRate { get; set; }
-        [JsonProperty(PropertyName = "tx_pct")]
-        public long TransmittedPrct { get; set; }
-        [JsonProperty(PropertyName = "tx_bytes")]
-        public long TransmittedBytes { get; set; }
-        [JsonProperty(PropertyName = "tx_rate")]
-        public long TransmittedRate { get; set; }
-
-        static FreeboxDownloadTask()
-        {
-            Descriptions = new Dictionary<string, string>
-            {
-                { "internal", "Internal error." },
-                { "disk_full", "The disk is full." },
-                { "unknown", "Unknown error." },
-                { "parse_error", "Parse error." },
-                { "unknown_host", "Unknown host." },
-                { "timeout", "Timeout." },
-                { "bad_authentication", "Invalid credentials." },
-                { "connection_refused", "Remote host refused connection." },
-                { "bt_tracker_error", "Unable to announce on tracker." },
-                { "bt_missing_files", "Missing torrent files." },
-                { "bt_file_error", "Error accessing torrent files." },
-                { "missing_ctx_file", "Error accessing task context file." },
-                { "nzb_no_group", "Cannot find the requested group on server." },
-                { "nzb_not_found", "Article not fount on the server." },
-                { "nzb_invalid_crc", "Invalid article CRC." },
-                { "nzb_invalid_size", "Invalid article size." },
-                { "nzb_invalid_filename", "Invalid filename." },
-                { "nzb_open_failed", "Error opening." },
-                { "nzb_write_failed", "Error writing." },
-                { "nzb_missing_size", "Missing article size." },
-                { "nzb_decode_error", "Article decoding error." },
-                { "nzb_missing_segments", "Missing article segments." },
-                { "nzb_error", "Other nzb error." },
-                { "nzb_authentication_required", "Nzb server need authentication." }
-            };
-        }
-
-        public string GetErrorDescription()
-        {
-            if (Descriptions.ContainsKey(Error))
-            {
-                return Descriptions[Error];
-            }
-
-            return $"{Error} - Unknown error";
-        }
-    }
-}

src/NzbDrone.Core/Download/Clients/FreeboxDownload/Responses/FreeboxLogin.cs

@@ -1,18 +0,0 @@
-using Newtonsoft.Json;
-
-namespace NzbDrone.Core.Download.Clients.FreeboxDownload.Responses
-{
-    public class FreeboxLogin
-    {
-        [JsonProperty(PropertyName = "logged_in")]
-        public bool LoggedIn { get; set; }
-        [JsonProperty(PropertyName = "challenge")]
-        public string Challenge { get; set; }
-        [JsonProperty(PropertyName = "password_salt")]
-        public string PasswordSalt { get; set; }
-        [JsonProperty(PropertyName = "password_set")]
-        public bool PasswordSet { get; set; }
-        [JsonProperty(PropertyName = "session_token")]
-        public string SessionToken { get; set; }
-    }
-}

src/NzbDrone.Core/Download/Clients/FreeboxDownload/Responses/FreeboxResponse.cs

@@ -1,69 +0,0 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace NzbDrone.Core.Download.Clients.FreeboxDownload.Responses
-{
-    public class FreeboxResponse<T>
-    {
-        private static readonly Dictionary<string, string> Descriptions;
-
-        [JsonProperty(PropertyName = "success")]
-        public bool Success { get; set; }
-        [JsonProperty(PropertyName = "msg")]
-        public string Message { get; set; }
-        [JsonProperty(PropertyName = "error_code")]
-        public string ErrorCode { get; set; }
-        [JsonProperty(PropertyName = "result")]
-        public T Result { get; set; }
-
-        static FreeboxResponse()
-        {
-            Descriptions = new Dictionary<string, string>
-            {
-                // Common errors
-                { "invalid_request", "Your request is invalid." },
-                { "invalid_api_version", "Invalid API base url or unknown API version." },
-                { "internal_error", "Internal error." },
-
-                // Login API errors
-                { "auth_required", "Invalid session token, or no session token sent." },
-                { "invalid_token", "The app token you are trying to use is invalid or has been revoked." },
-                { "pending_token", "The app token you are trying to use has not been validated by user yet." },
-                { "insufficient_rights", "Your app permissions does not allow accessing this API." },
-                { "denied_from_external_ip", "You are trying to get an app_token from a remote IP." },
-                { "ratelimited", "Too many auth error have been made from your IP." },
-                { "new_apps_denied", "New application token request has been disabled." },
-                { "apps_denied", "API access from apps has been disabled." },
-
-                // Download API errors
-                { "task_not_found", "No task was found with the given id." },
-                { "invalid_operation", "Attempt to perform an invalid operation." },
-                { "invalid_file", "Error with the download file (invalid format ?)." },
-                { "invalid_url", "URL is invalid." },
-                { "not_implemented", "Method not implemented." },
-                { "out_of_memory", "No more memory available to perform the requested action." },
-                { "invalid_task_type", "The task type is invalid." },
-                { "hibernating", "The downloader is hibernating." },
-                { "need_bt_stopped_done", "This action is only valid for Bittorrent task in stopped or done state." },
-                { "bt_tracker_not_found", "Attempt to access an invalid tracker object." },
-                { "too_many_tasks", "Too many tasks." },
-                { "invalid_address", "Invalid peer address." },
-                { "port_conflict", "Port conflict when setting config." },
-                { "invalid_priority", "Invalid priority." },
-                { "ctx_file_error", "Failed to initialize task context file (need to check disk)." },
-                { "exists", "Same task already exists." },
-                { "port_outside_range", "Incoming port is not available for this customer." }
-            };
-        }
-
-        public string GetErrorDescription()
-        {
-            if (Descriptions.ContainsKey(ErrorCode))
-            {
-                return Descriptions[ErrorCode];
-            }
-
-            return $"{ErrorCode} - Unknown error";
-        }
-    }
-}

src/NzbDrone.Core/Download/Clients/FreeboxDownload/TorrentFreeboxDownload.cs

@@ -1,227 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using FluentValidation.Results;
-using NLog;
-using NzbDrone.Common.Disk;
-using NzbDrone.Common.Extensions;
-using NzbDrone.Common.Http;
-using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Download.Clients.FreeboxDownload.Responses;
-using NzbDrone.Core.MediaFiles.TorrentInfo;
-using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.RemotePathMappings;
-
-namespace NzbDrone.Core.Download.Clients.FreeboxDownload
-{
-    public class TorrentFreeboxDownload : TorrentClientBase<FreeboxDownloadSettings>
-    {
-        private readonly IFreeboxDownloadProxy _proxy;
-
-        public TorrentFreeboxDownload(IFreeboxDownloadProxy proxy,
-            ITorrentFileInfoReader torrentFileInfoReader,
-            IHttpClient httpClient,
-            IConfigService configService,
-            IDiskProvider diskProvider,
-            IRemotePathMappingService remotePathMappingService,
-            Logger logger)
-            : base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, logger)
-        {
-            _proxy = proxy;
-        }
-
-        public override string Name => "Freebox Download";
-
-        protected IEnumerable<FreeboxDownloadTask> GetTorrents()
-        {
-            return _proxy.GetTasks(Settings).Where(v => v.Type.ToLower() == FreeboxDownloadTaskType.Bt.ToString().ToLower());
-        }
-
-        public override IEnumerable<DownloadClientItem> GetItems()
-        {
-            var torrents = GetTorrents();
-
-            var queueItems = new List<DownloadClientItem>();
-
-            foreach (var torrent in torrents)
-            {
-                var outputPath = new OsPath(torrent.DecodedDownloadDirectory);
-
-                if (Settings.DestinationDirectory.IsNotNullOrWhiteSpace())
-                {
-                    if (!new OsPath(Settings.DestinationDirectory).Contains(outputPath))
-                    {
-                        continue;
-                    }
-                }
-
-                if (Settings.Category.IsNotNullOrWhiteSpace())
-                {
-                    var directories = outputPath.FullPath.Split('\\', '/');
-
-                    if (!directories.Contains(Settings.Category))
-                    {
-                        continue;
-                    }
-                }
-
-                var item = new DownloadClientItem()
-                {
-                    DownloadId = torrent.Id,
-                    Category = Settings.Category,
-                    Title = torrent.Name,
-                    TotalSize = torrent.Size,
-                    DownloadClientInfo = DownloadClientItemClientInfo.FromDownloadClient(this),
-                    RemainingSize = (long)(torrent.Size * (double)(1 - ((double)torrent.ReceivedPrct / 10000))),
-                    RemainingTime = torrent.Eta <= 0 ? null : TimeSpan.FromSeconds(torrent.Eta),
-                    SeedRatio = torrent.StopRatio <= 0 ? 0 : torrent.StopRatio / 100,
-                    OutputPath = _remotePathMappingService.RemapRemoteToLocal(Settings.Host, outputPath)
-                };
-
-                switch (torrent.Status)
-                {
-                    case FreeboxDownloadTaskStatus.Stopped: // task is stopped, can be resumed by setting the status to downloading
-                    case FreeboxDownloadTaskStatus.Stopping: // task is gracefully stopping
-                        item.Status = DownloadItemStatus.Paused;
-                        break;
-
-                    case FreeboxDownloadTaskStatus.Queued: // task will start when a new download slot is available the queue position is stored in queue_pos attribute
-                        item.Status = DownloadItemStatus.Queued;
-                        break;
-
-                    case FreeboxDownloadTaskStatus.Starting: // task is preparing to start download
-                    case FreeboxDownloadTaskStatus.Downloading:
-                    case FreeboxDownloadTaskStatus.Retry: // you can set a task status to ‘retry’ to restart the download task.
-                    case FreeboxDownloadTaskStatus.Checking: // checking data before lauching download.
-                        item.Status = DownloadItemStatus.Downloading;
-                        break;
-
-                    case FreeboxDownloadTaskStatus.Error: // there was a problem with the download, you can get an error code in the error field
-                        item.Status = DownloadItemStatus.Warning;
-                        item.Message = torrent.GetErrorDescription();
-                        break;
-
-                    case FreeboxDownloadTaskStatus.Done: // the download is over. For bt you can resume seeding setting the status to seeding if the ratio is not reached yet
-                    case FreeboxDownloadTaskStatus.Seeding: // download is over, the content is Change to being shared to other users. The task will automatically stop once the seed ratio has been reached
-                        item.Status = DownloadItemStatus.Completed;
-                        break;
-
-                    case FreeboxDownloadTaskStatus.Unknown:
-                    default: // new status in API? default to downloading
-                        item.Message = "Unknown download state: " + torrent.Status;
-                        _logger.Info(item.Message);
-                        item.Status = DownloadItemStatus.Downloading;
-                        break;
-                }
-
-                item.CanBeRemoved = item.CanMoveFiles = torrent.Status == FreeboxDownloadTaskStatus.Done;
-
-                queueItems.Add(item);
-            }
-
-            return queueItems;
-        }
-
-        protected override string AddFromMagnetLink(RemoteEpisode remoteEpisode, string hash, string magnetLink)
-        {
-            return _proxy.AddTaskFromUrl(magnetLink,
-                                         GetDownloadDirectory().EncodeBase64(),
-                                         ToBePaused(),
-                                         ToBeQueuedFirst(remoteEpisode),
-                                         GetSeedRatio(remoteEpisode),
-                                         Settings);
-        }
-
-        protected override string AddFromTorrentFile(RemoteEpisode remoteEpisode, string hash, string filename, byte[] fileContent)
-        {
-            return _proxy.AddTaskFromFile(filename,
-                                          fileContent,
-                                          GetDownloadDirectory().EncodeBase64(),
-                                          ToBePaused(),
-                                          ToBeQueuedFirst(remoteEpisode),
-                                          GetSeedRatio(remoteEpisode),
-                                          Settings);
-        }
-
-        public override void RemoveItem(DownloadClientItem item, bool deleteData)
-        {
-            _proxy.DeleteTask(item.DownloadId, deleteData, Settings);
-        }
-
-        public override DownloadClientInfo GetStatus()
-        {
-            var destDir = GetDownloadDirectory();
-
-            return new DownloadClientInfo
-            {
-                IsLocalhost = Settings.Host == "127.0.0.1" || Settings.Host == "::1" || Settings.Host == "localhost",
-                OutputRootFolders = new List<OsPath> { _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(destDir)) }
-            };
-        }
-
-        protected override void Test(List<ValidationFailure> failures)
-        {
-            try
-            {
-                _proxy.Authenticate(Settings);
-            }
-            catch (DownloadClientUnavailableException ex)
-            {
-                failures.Add(new ValidationFailure("Host", ex.Message));
-                failures.Add(new ValidationFailure("Port", ex.Message));
-            }
-            catch (DownloadClientAuthenticationException ex)
-            {
-                failures.Add(new ValidationFailure("AppId", ex.Message));
-                failures.Add(new ValidationFailure("AppToken", ex.Message));
-            }
-            catch (FreeboxDownloadException ex)
-            {
-                failures.Add(new ValidationFailure("ApiUrl", ex.Message));
-            }
-        }
-
-        private string GetDownloadDirectory()
-        {
-            if (Settings.DestinationDirectory.IsNotNullOrWhiteSpace())
-            {
-                return Settings.DestinationDirectory.TrimEnd('/');
-            }
-
-            var destDir = _proxy.GetDownloadConfiguration(Settings).DecodedDownloadDirectory.TrimEnd('/');
-
-            if (Settings.Category.IsNotNullOrWhiteSpace())
-            {
-                destDir = $"{destDir}/{Settings.Category}";
-            }
-
-            return destDir;
-        }
-
-        private bool ToBePaused()
-        {
-            return Settings.AddPaused;
-        }
-
-        private bool ToBeQueuedFirst(RemoteEpisode remoteEpisode)
-        {
-            if ((remoteEpisode.IsRecentEpisode() && Settings.RecentPriority == (int)FreeboxDownloadPriority.First) ||
-                (!remoteEpisode.IsRecentEpisode() && Settings.OlderPriority == (int)FreeboxDownloadPriority.First))
-            {
-                return true;
-            }
-
-            return false;
-        }
-
-        private double? GetSeedRatio(RemoteEpisode remoteEpisode)
-        {
-            if (remoteEpisode.SeedConfiguration == null || remoteEpisode.SeedConfiguration.Ratio == null)
-            {
-                return null;
-            }
-
-            return remoteEpisode.SeedConfiguration.Ratio.Value * 100;
-        }
-    }
-}

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

@@ -115,7 +115,7 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
 
         public override string Name => "rTorrent";
 
-        public override ProviderMessage Message => new ProviderMessage($"rTorrent will not pause torrents when they meet the seed criteria. Readarr will handle automatic removal of torrents based on the current seed criteria in Settings->Indexers only when Remove Completed is enabled.  After importing it will also set \"{_imported_view}\" as an rTorrent view, which can be used in rTorrent scripts to customize behavior.", ProviderMessageType.Info);
+        public override ProviderMessage Message => new ProviderMessage($"Readarr will handle automatic removal of torrents based on the current seed criteria in Settings->Indexers. After importing it will also set \"{_imported_view}\" as an rTorrent view, which can be used in rTorrent scripts to customize behavior.", ProviderMessageType.Info);
 
         public override IEnumerable<DownloadClientItem> GetItems()
         {

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

@@ -37,10 +37,10 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
         [FieldDefinition(1, Label = "Port", Type = FieldType.Textbox)]
         public int Port { get; set; }
 
-        [FieldDefinition(2, Label = "Use SSL", Type = FieldType.Checkbox, HelpText = "Use secure connection when connecting to rTorrent")]
+        [FieldDefinition(2, Label = "Use SSL", Type = FieldType.Checkbox, HelpText = "Use secure connection when connecting to ruTorrent")]
         public bool UseSsl { get; set; }
 
-        [FieldDefinition(3, Label = "Url Path", Type = FieldType.Textbox, HelpText = "Path to the XMLRPC endpoint, see http(s)://[host]:[port]/[urlPath]. This is usually RPC2 or [path to ruTorrent]/plugins/rpc/rpc.php when using ruTorrent.")]
+        [FieldDefinition(3, Label = "Url Path", Type = FieldType.Textbox, HelpText = "Path to the XMLRPC endpoint, see http(s)://[host]:[port]/[urlPath]. When using ruTorrent this usually is RPC2 or (path to ruTorrent)/plugins/rpc/rpc.php")]
         public string UrlBase { get; set; }
 
         [FieldDefinition(4, Label = "Username", Type = FieldType.Textbox, Privacy = PrivacyLevel.UserName)]
@@ -64,7 +64,7 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
         [FieldDefinition(10, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(RTorrentPriority), HelpText = "Priority to use when grabbing books released over 14 days ago")]
         public int OlderTvPriority { get; set; }
 
-        [FieldDefinition(11, Label = "Add Stopped", Type = FieldType.Checkbox, HelpText = "Enabling will add torrents and magnets to rTorrent in a stopped state. This may break magnet files.")]
+        [FieldDefinition(11, Label = "Add Stopped", Type = FieldType.Checkbox, HelpText = "Enabling will add torrents and magnets to ruTorrent in a stopped state")]
         public bool AddStopped { get; set; }
 
         public NzbDroneValidationResult Validate()

src/NzbDrone.Core/Download/CompletedDownloadService.cs

@@ -164,14 +164,14 @@ namespace NzbDrone.Core.Download
                 }
                 else
                 {
-                    _logger.ForDebugEvent()
+                    _logger.Debug()
                            .Message("No books were just imported, but all books were previously imported, possible issue with download history.")
                            .Property("AuthorId", trackedDownload.RemoteBook.Author.Id)
                            .Property("DownloadId", trackedDownload.DownloadItem.DownloadId)
                            .Property("Title", trackedDownload.DownloadItem.Title)
                            .Property("Path", trackedDownload.DownloadItem.OutputPath.ToString())
                            .WriteSentryWarn("DownloadHistoryIncomplete")
-                           .Log();
+                           .Write();
                 }
 
                 trackedDownload.State = TrackedDownloadState.Imported;

src/NzbDrone.Core/Download/DownloadIgnoredEvent.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using NzbDrone.Common.Messaging;
-using NzbDrone.Core.Download.TrackedDownloads;
 using NzbDrone.Core.Qualities;
 
 namespace NzbDrone.Core.Download
@@ -14,6 +13,5 @@ namespace NzbDrone.Core.Download
         public DownloadClientItemClientInfo DownloadClientInfo { get; set; }
         public string DownloadId { get; set; }
         public string Message { get; set; }
-        public TrackedDownload TrackedDownload { get; set; }
     }
 }

src/NzbDrone.Core/Download/DownloadService.cs

@@ -110,7 +110,7 @@ namespace NzbDrone.Core.Download
                 bookGrabbedEvent.DownloadId = downloadClientId;
             }
 
-            _logger.ProgressInfo("Report sent to {0} from indexer {1}. {2}", downloadClient.Definition.Name, remoteBook.Release.Indexer, downloadTitle);
+            _logger.ProgressInfo("Report sent to {0}. {1}", downloadClient.Definition.Name, downloadTitle);
             _eventAggregator.PublishEvent(bookGrabbedEvent);
         }
     }

src/NzbDrone.Core/Download/IgnoredDownloadService.cs

@@ -42,7 +42,6 @@ namespace NzbDrone.Core.Download
                 SourceTitle = trackedDownload.DownloadItem.Title,
                 DownloadClientInfo = trackedDownload.DownloadItem.DownloadClientInfo,
                 DownloadId = trackedDownload.DownloadItem.DownloadId,
-                TrackedDownload = trackedDownload,
                 Message = "Manually ignored"
             };
 

src/NzbDrone.Core/History/HistoryService.cs

@@ -200,7 +200,6 @@ namespace NzbDrone.Core.History
                 };
 
                 history.Data.Add("StatusMessages", message.TrackedDownload.StatusMessages.ToJson());
-                history.Data.Add("ReleaseGroup", message.TrackedDownload?.RemoteBook?.ParsedBookInfo?.ReleaseGroup);
                 _historyRepository.Insert(history);
             }
         }
@@ -236,7 +235,6 @@ namespace NzbDrone.Core.History
             history.Data.Add("ImportedPath", message.ImportedBook.Path);
             history.Data.Add("DownloadClient", message.DownloadClientInfo?.Type);
             history.Data.Add("DownloadClientName", message.DownloadClientInfo?.Name);
-            history.Data.Add("ReleaseGroup", message.BookInfo.ReleaseGroup);
 
             _historyRepository.Insert(history);
         }
@@ -288,7 +286,6 @@ namespace NzbDrone.Core.History
             };
 
             history.Data.Add("Reason", message.Reason.ToString());
-            history.Data.Add("ReleaseGroup", message.BookFile.ReleaseGroup);
 
             _historyRepository.Insert(history);
         }
@@ -310,7 +307,6 @@ namespace NzbDrone.Core.History
 
             history.Data.Add("SourcePath", sourcePath);
             history.Data.Add("Path", path);
-            history.Data.Add("ReleaseGroup", message.BookFile.ReleaseGroup);
 
             _historyRepository.Insert(history);
         }
@@ -362,7 +358,6 @@ namespace NzbDrone.Core.History
                 };
 
                 history.Data.Add("DownloadClient", message.DownloadClientInfo.Name);
-                history.Data.Add("ReleaseGroup", message.TrackedDownload?.RemoteBook?.ParsedBookInfo?.ReleaseGroup);
                 history.Data.Add("Message", message.Message);
 
                 historyToAdd.Add(history);

src/NzbDrone.Core/Instrumentation/ReconfigureLogging.cs

@@ -117,6 +117,7 @@ namespace NzbDrone.Core.Instrumentation
             syslogTarget.MessageSend.Protocol = ProtocolType.Udp;
             syslogTarget.MessageSend.Udp.Port = syslogPort;
             syslogTarget.MessageSend.Udp.Server = syslogServer;
+            syslogTarget.MessageSend.Udp.ReconnectInterval = 500;
             syslogTarget.MessageCreation.Rfc = RfcNumber.Rfc5424;
             syslogTarget.MessageCreation.Rfc5424.AppName = _configFileProvider.InstanceName;
 

src/NzbDrone.Core/Localization/Core/en.json

@@ -34,8 +34,6 @@
   "ApiKeyHelpTextWarning": "Requires restart to take effect",
   "AppDataDirectory": "AppData directory",
   "AppDataLocationHealthCheckMessage": "Updating will not be possible to prevent deleting AppData on Update",
-  "ApplicationURL": "Application URL",
-  "ApplicationUrlHelpText": "This application's external URL including http(s)://, port and URL base",
   "ApplyTags": "Apply Tags",
   "ApplyTagsHelpTexts1": "How to apply tags to the selected author",
   "ApplyTagsHelpTexts2": "Add: Add the tags the existing list of tags",

src/NzbDrone.Core/MediaFiles/AudioTag.cs

@@ -400,11 +400,11 @@ namespace NzbDrone.Core.MediaFiles
             }
             catch (Exception ex)
             {
-                Logger.ForWarnEvent()
+                Logger.Warn()
                     .Exception(ex)
                     .Message($"Tag writing failed for {path}")
                     .WriteSentryWarn("Tag writing failed")
-                    .Log();
+                    .Write();
             }
             finally
             {

src/NzbDrone.Core/MediaFiles/AudioTagService.cs

@@ -147,11 +147,11 @@ namespace NzbDrone.Core.MediaFiles
             }
             catch (Exception ex)
             {
-                _logger.ForWarnEvent()
+                _logger.Warn()
                     .Exception(ex)
                     .Message($"Tag removal failed for {path}")
                     .WriteSentryWarn("Tag removal failed")
-                    .Log();
+                    .Write();
             }
             finally
             {

src/NzbDrone.Core/MediaFiles/MediaInfoFormatter.cs

@@ -65,10 +65,10 @@ namespace NzbDrone.Core.MediaFiles
             }
             else
             {
-                Logger.ForDebugEvent()
+                Logger.Debug()
                     .Message("Unknown audio format: '{0}'.", string.Join(", ", mediaInfo.AudioFormat))
                     .WriteSentryWarn("UnknownAudioFormat", mediaInfo.AudioFormat)
-                    .Log();
+                    .Write();
 
                 return "Unknown";
             }

src/NzbDrone.Core/Notifications/Notifiarr/NotifiarrProxy.cs

@@ -1,11 +1,10 @@
-using System;
-using System.Collections.Generic;
+using System;
 using System.Collections.Specialized;
-using System.Net;
 using FluentValidation.Results;
 using NLog;
-using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
+using NzbDrone.Core.Configuration;
 
 namespace NzbDrone.Core.Notifications.Notifiarr
 {
@@ -17,27 +16,21 @@ namespace NzbDrone.Core.Notifications.Notifiarr
 
     public class NotifiarrProxy : INotifiarrProxy
     {
-        private const string URL = "https://notifiarr.com/notifier.php";
+        private const string URL = "https://notifiarr.com";
         private readonly IHttpClient _httpClient;
+        private readonly IConfigFileProvider _configFileProvider;
         private readonly Logger _logger;
 
-        public NotifiarrProxy(IHttpClient httpClient, Logger logger)
+        public NotifiarrProxy(IHttpClient httpClient, IConfigFileProvider configFileProvider, Logger logger)
         {
             _httpClient = httpClient;
+            _configFileProvider = configFileProvider;
             _logger = logger;
         }
 
         public void SendNotification(StringDictionary message, NotifiarrSettings settings)
         {
-            try
-            {
                 ProcessNotification(message, settings);
-            }
-            catch (NotifiarrException ex)
-            {
-                _logger.Error(ex, "Unable to send notification");
-                throw new NotifiarrException("Unable to send notification");
-            }
         }
 
         public ValidationFailure Test(NotifiarrSettings settings)
@@ -50,21 +43,14 @@ namespace NzbDrone.Core.Notifications.Notifiarr
                 SendNotification(variables, settings);
                 return null;
             }
-            catch (HttpException ex)
+            catch (NotifiarrException ex)
             {
-                if (ex.Response.StatusCode == HttpStatusCode.Unauthorized)
-                {
-                    _logger.Error(ex, "API key is invalid: " + ex.Message);
-                    return new ValidationFailure("APIKey", "API key is invalid");
-                }
-
-                _logger.Error(ex, "Unable to send test message: " + ex.Message);
-                return new ValidationFailure("APIKey", "Unable to send test notification");
+                return new ValidationFailure("APIKey", ex.Message);
             }
             catch (Exception ex)
             {
-                _logger.Error(ex, "Unable to send test notification: " + ex.Message);
-                return new ValidationFailure("", "Unable to send test notification");
+                _logger.Error(ex, ex.Message);
+                return new ValidationFailure("", "Unable to send test notification. Check the log for more details.");
             }
         }
 
@@ -72,8 +58,10 @@ namespace NzbDrone.Core.Notifications.Notifiarr
         {
             try
             {
-                var requestBuilder = new HttpRequestBuilder(URL).Post();
-                requestBuilder.AddFormParameter("api", settings.APIKey).Build();
+                var instanceName = _configFileProvider.InstanceName;
+                var requestBuilder = new HttpRequestBuilder(URL + "/api/v1/notification/readarr").Post();
+                requestBuilder.AddFormParameter("instanceName", instanceName).Build();
+                requestBuilder.SetHeader("X-API-Key", settings.APIKey);
 
                 foreach (string key in message.Keys)
                 {
@@ -86,13 +74,31 @@ namespace NzbDrone.Core.Notifications.Notifiarr
             }
             catch (HttpException ex)
             {
-                if (ex.Response.StatusCode == HttpStatusCode.BadRequest)
+                var responseCode = ex.Response.StatusCode;
+                switch ((int)responseCode)
                 {
-                    _logger.Error(ex, "API key is invalid");
-                    throw;
+                    case 401:
+                        _logger.Error("Unauthorized", "HTTP 401 - API key is invalid");
+                        throw new NotifiarrException("API key is invalid");
+                    case 400:
+                        _logger.Error("Invalid Request", "HTTP 400 - Unable to send notification. Ensure Readarr Integration is enabled & assigned a channel on Notifiarr");
+                        throw new NotifiarrException("Unable to send notification. Ensure Readarr Integration is enabled & assigned a channel on Notifiarr");
+                    case 502:
+                    case 503:
+                    case 504:
+                        _logger.Error("Service Unavailable", "Unable to send notification. Service Unavailable");
+                        throw new NotifiarrException("Unable to send notification. Service Unavailable", ex);
+                    case 520:
+                    case 521:
+                    case 522:
+                    case 523:
+                    case 524:
+                        _logger.Error(ex, "Cloudflare Related HTTP Error - Unable to send notification");
+                        throw new NotifiarrException("Cloudflare Related HTTP Error - Unable to send notification", ex);
+                    default:
+                        _logger.Error(ex, "Unknown HTTP Error - Unable to send notification");
+                        throw new NotifiarrException("Unknown HTTP Error - Unable to send notification", ex);
                 }
-
-                throw new NotifiarrException("Unable to send notification", ex);
             }
         }
     }

src/NzbDrone.Core/Organizer/FileNameValidation.cs

@@ -1,10 +1,6 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Text.RegularExpressions;
 using FluentValidation;
 using FluentValidation.Validators;
-using NzbDrone.Common.Extensions;
 
 namespace NzbDrone.Core.Organizer
 {
@@ -16,16 +12,12 @@ namespace NzbDrone.Core.Organizer
         public static IRuleBuilderOptions<T, string> ValidBookFormat<T>(this IRuleBuilder<T, string> ruleBuilder)
         {
             ruleBuilder.SetValidator(new NotEmptyValidator(null));
-            ruleBuilder.SetValidator(new IllegalCharactersValidator());
-
             return ruleBuilder.SetValidator(new ValidStandardTrackFormatValidator());
         }
 
         public static IRuleBuilderOptions<T, string> ValidAuthorFolderFormat<T>(this IRuleBuilder<T, string> ruleBuilder)
         {
             ruleBuilder.SetValidator(new NotEmptyValidator(null));
-            ruleBuilder.SetValidator(new IllegalCharactersValidator());
-
             return ruleBuilder.SetValidator(new RegularExpressionValidator(FileNameBuilder.AuthorNameRegex)).WithMessage("Must contain Author name");
         }
     }
@@ -50,41 +42,4 @@ namespace NzbDrone.Core.Organizer
             return true;
         }
     }
-
-    public class IllegalCharactersValidator : PropertyValidator
-    {
-        private readonly char[] _invalidPathChars = Path.GetInvalidPathChars();
-
-        public IllegalCharactersValidator()
-            : base("Contains illegal characters: {InvalidCharacters}")
-        {
-        }
-
-        protected override bool IsValid(PropertyValidatorContext context)
-        {
-            var value = context.PropertyValue as string;
-            var invalidCharacters = new List<char>();
-
-            if (value.IsNullOrWhiteSpace())
-            {
-                return true;
-            }
-
-            foreach (var i in _invalidPathChars)
-            {
-                if (value.IndexOf(i) >= 0)
-                {
-                    invalidCharacters.Add(i);
-                }
-            }
-
-            if (invalidCharacters.Any())
-            {
-                context.MessageFormatter.AppendArgument("InvalidCharacters", string.Join("", invalidCharacters));
-                return false;
-            }
-
-            return true;
-        }
-    }
 }

src/NzbDrone.Core/Validation/Paths/StartupFolderValidator.cs

@@ -9,7 +9,7 @@ namespace NzbDrone.Core.Validation.Paths
         private readonly IAppFolderInfo _appFolderInfo;
 
         public StartupFolderValidator(IAppFolderInfo appFolderInfo)
-            : base("Path cannot be {relationship} the start up folder")
+            : base("Path cannot be an ancestor of the start up folder")
         {
             _appFolderInfo = appFolderInfo;
         }
@@ -21,24 +21,7 @@ namespace NzbDrone.Core.Validation.Paths
                 return true;
             }
 
-            var startupFolder = _appFolderInfo.StartUpFolder;
-            var folder = context.PropertyValue.ToString();
-
-            if (startupFolder.PathEquals(folder))
-            {
-                context.MessageFormatter.AppendArgument("relationship", "set to");
-
-                return false;
-            }
-
-            if (startupFolder.IsParentPath(folder))
-            {
-                context.MessageFormatter.AppendArgument("relationship", "child of");
-
-                return false;
-            }
-
-            return true;
+            return !_appFolderInfo.StartUpFolder.IsParentPath(context.PropertyValue.ToString());
         }
     }
 }

src/Readarr.Api.V1/Config/HostConfigResource.cs

@@ -26,7 +26,6 @@ namespace Readarr.Api.V1.Config
         public string SslCertPassword { get; set; }
         public string UrlBase { get; set; }
         public string InstanceName { get; set; }
-        public string ApplicationUrl { get; set; }
         public bool UpdateAutomatically { get; set; }
         public UpdateMechanism UpdateMechanism { get; set; }
         public string UpdateScriptPath { get; set; }
@@ -83,8 +82,7 @@ namespace Readarr.Api.V1.Config
                 CertificateValidation = configService.CertificateValidation,
                 BackupFolder = configService.BackupFolder,
                 BackupInterval = configService.BackupInterval,
-                BackupRetention = configService.BackupRetention,
-                ApplicationUrl = configService.ApplicationUrl
+                BackupRetention = configService.BackupRetention
             };
         }
     }

src/Readarr.Api.V1/DownloadClient/DownloadClientController.cs

@@ -12,5 +12,15 @@ namespace Readarr.Api.V1.DownloadClient
             : base(downloadClientFactory, "downloadclient", ResourceMapper)
         {
         }
+
+        protected override void Validate(DownloadClientDefinition definition, bool includeWarnings)
+        {
+            if (!definition.Enable)
+            {
+                return;
+            }
+
+            base.Validate(definition, includeWarnings);
+        }
     }
 }

src/Readarr.Api.V1/ImportLists/ImportListController.cs

@@ -22,5 +22,15 @@ namespace Readarr.Api.V1.ImportLists
             SharedValidator.RuleFor(c => c.QualityProfileId).SetValidator(qualityProfileExistsValidator);
             SharedValidator.RuleFor(c => c.MetadataProfileId).SetValidator(metadataProfileExistsValidator);
         }
+
+        protected override void Validate(ImportListDefinition definition, bool includeWarnings)
+        {
+            if (!definition.Enable)
+            {
+                return;
+            }
+
+            base.Validate(definition, includeWarnings);
+        }
     }
 }

src/Readarr.Api.V1/Indexers/IndexerController.cs

@@ -12,5 +12,15 @@ namespace Readarr.Api.V1.Indexers
             : base(indexerFactory, "indexer", ResourceMapper)
         {
         }
+
+        protected override void Validate(IndexerDefinition definition, bool includeWarnings)
+        {
+            if (!definition.Enable)
+            {
+                return;
+            }
+
+            base.Validate(definition, includeWarnings);
+        }
     }
 }

src/Readarr.Api.V1/Metadata/MetadataController.cs

@@ -12,5 +12,15 @@ namespace Readarr.Api.V1.Metadata
             : base(metadataFactory, "metadata", ResourceMapper)
         {
         }
+
+        protected override void Validate(MetadataDefinition definition, bool includeWarnings)
+        {
+            if (!definition.Enable)
+            {
+                return;
+            }
+
+            base.Validate(definition, includeWarnings);
+        }
     }
 }

src/Readarr.Api.V1/Notifications/NotificationController.cs

@@ -12,5 +12,15 @@ namespace Readarr.Api.V1.Notifications
             : base(notificationFactory, "notification", ResourceMapper)
         {
         }
+
+        protected override void Validate(NotificationDefinition definition, bool includeWarnings)
+        {
+            if (!definition.Enable)
+            {
+                return;
+            }
+
+            base.Validate(definition, includeWarnings);
+        }
     }
 }

src/Readarr.Api.V1/ProviderControllerBase.cs

@@ -7,7 +7,6 @@ using NzbDrone.Common.Serializer;
 using NzbDrone.Core.ThingiProvider;
 using NzbDrone.Core.Validation;
 using NzbDrone.Http.REST.Attributes;
-using Readarr.Http.Extensions;
 using Readarr.Http.REST;
 
 namespace Readarr.Api.V1
@@ -61,7 +60,7 @@ namespace Readarr.Api.V1
         [RestPostById]
         public ActionResult<TProviderResource> CreateProvider(TProviderResource providerResource)
         {
-            var providerDefinition = GetDefinition(providerResource, true, false, false);
+            var providerDefinition = GetDefinition(providerResource, false);
 
             if (providerDefinition.Enable)
             {
@@ -76,11 +75,11 @@ namespace Readarr.Api.V1
         [RestPutById]
         public ActionResult<TProviderResource> UpdateProvider(TProviderResource providerResource)
         {
-            var providerDefinition = GetDefinition(providerResource, true, false, false);
-            var forceSave = Request.GetBooleanQueryParameter("forceSave");
+            var providerDefinition = GetDefinition(providerResource, false);
+            var existingDefinition = _providerFactory.Get(providerDefinition.Id);
 
-            // Only test existing definitions if it is enabled and forceSave isn't set.
-            if (providerDefinition.Enable && !forceSave)
+            // Only test existing definitions if it was previously disabled
+            if (providerDefinition.Enable && !existingDefinition.Enable)
             {
                 Test(providerDefinition, false);
             }
@@ -90,11 +89,11 @@ namespace Readarr.Api.V1
             return Accepted(providerResource.Id);
         }
 
-        private TProviderDefinition GetDefinition(TProviderResource providerResource, bool validate, bool includeWarnings, bool forceValidate)
+        private TProviderDefinition GetDefinition(TProviderResource providerResource, bool includeWarnings = false, bool validate = true)
         {
             var definition = _resourceMapper.ToModel(providerResource);
 
-            if (validate && (definition.Enable || forceValidate))
+            if (validate)
             {
                 Validate(definition, includeWarnings);
             }
@@ -114,7 +113,7 @@ namespace Readarr.Api.V1
         {
             var defaultDefinitions = _providerFactory.GetDefaultDefinitions().OrderBy(p => p.ImplementationName).ToList();
 
-            var result = new List<TProviderResource>(defaultDefinitions.Count);
+            var result = new List<TProviderResource>(defaultDefinitions.Count());
 
             foreach (var providerDefinition in defaultDefinitions)
             {
@@ -135,7 +134,7 @@ namespace Readarr.Api.V1
         [HttpPost("test")]
         public object Test([FromBody] TProviderResource providerResource)
         {
-            var providerDefinition = GetDefinition(providerResource, true, true, true);
+            var providerDefinition = GetDefinition(providerResource, true);
 
             Test(providerDefinition, true);
 
@@ -168,7 +167,7 @@ namespace Readarr.Api.V1
         [HttpPost("action/{name}")]
         public IActionResult RequestAction(string name, [FromBody] TProviderResource resource)
         {
-            var providerDefinition = GetDefinition(resource, false, false, false);
+            var providerDefinition = GetDefinition(resource, true, false);
 
             var query = Request.Query.ToDictionary(x => x.Key, x => x.Value.ToString());
 
@@ -177,7 +176,7 @@ namespace Readarr.Api.V1
             return Content(data.ToJson(), "application/json");
         }
 
-        private void Validate(TProviderDefinition definition, bool includeWarnings)
+        protected virtual void Validate(TProviderDefinition definition, bool includeWarnings)
         {
             var validationResult = definition.Settings.Validate();
 

src/Readarr.Api.V1/Queue/QueueController.cs

@@ -176,7 +176,7 @@ namespace Readarr.Api.V1.Queue
                 case "status":
                     return q => q.Status;
                 case "authors.sortName":
-                    return q => q.Author?.Metadata.Value.SortName ?? q.Title;
+                    return q => q.Author?.Metadata.Value.SortName ?? string.Empty;
                 case "authors.sortNameLastFirst":
                     return q => q.Author?.Metadata.Value.SortNameLastFirst ?? string.Empty;
                 case "title":