New: Per download client setting to Remove Completed/Failed

frontend/src/Components/FieldSet.css

@@ -16,4 +16,9 @@
   color: #3a3f51;
   font-size: 21px;
   line-height: inherit;
+
+  &.small {
+    color: #909293;
+    font-size: 18px;
+  }
 }

frontend/src/Components/FieldSet.js

@@ -1,5 +1,7 @@
+import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import { sizes } from 'Helpers/Props';
 import styles from './FieldSet.css';
 
 class FieldSet extends Component {
@@ -9,13 +11,14 @@ class FieldSet extends Component {
 
   render() {
     const {
+      size,
       legend,
       children
     } = this.props;
 
     return (
       <fieldset className={styles.fieldSet}>
-        <legend className={styles.legend}>
+        <legend className={classNames(styles.legend, (size === sizes.SMALL) && styles.small)}>
           {legend}
         </legend>
         {children}
@@ -26,8 +29,13 @@ class FieldSet extends Component {
 }
 
 FieldSet.propTypes = {
+  size: PropTypes.oneOf(sizes.all).isRequired,
   legend: PropTypes.oneOfType([PropTypes.node, PropTypes.string]),
   children: PropTypes.node
 };
 
+FieldSet.defaultProps = {
+  size: sizes.MEDIUM
+};
+
 export default FieldSet;

frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModalContent.js

@@ -1,6 +1,7 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import Alert from 'Components/Alert';
+import FieldSet from 'Components/FieldSet';
 import Form from 'Components/Form/Form';
 import FormGroup from 'Components/Form/FormGroup';
 import FormInputGroup from 'Components/Form/FormInputGroup';
@@ -13,7 +14,7 @@ import ModalBody from 'Components/Modal/ModalBody';
 import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
-import { inputTypes, kinds } from 'Helpers/Props';
+import { inputTypes, kinds, sizes } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
 import styles from './EditDownloadClientModalContent.css';
 
@@ -45,7 +46,10 @@ class EditDownloadClientModalContent extends Component {
       implementationName,
       name,
       enable,
+      protocol,
       priority,
+      removeCompletedDownloads,
+      removeFailedDownloads,
       fields,
       message
     } = item;
@@ -142,6 +146,38 @@ class EditDownloadClientModalContent extends Component {
                   />
                 </FormGroup>
 
+                <FieldSet
+                  size={sizes.SMALL}
+                  legend={translate('CompletedDownloadHandling')}
+                >
+                  <FormGroup>
+                    <FormLabel>{translate('RemoveCompleted')}</FormLabel>
+
+                    <FormInputGroup
+                      type={inputTypes.CHECK}
+                      name="removeCompletedDownloads"
+                      helpText={translate('RemoveCompletedDownloadsHelpText')}
+                      {...removeCompletedDownloads}
+                      onChange={onInputChange}
+                    />
+                  </FormGroup>
+
+                  {
+                    protocol.value !== 'torrent' &&
+                      <FormGroup>
+                        <FormLabel>{translate('RemoveFailed')}</FormLabel>
+
+                        <FormInputGroup
+                          type={inputTypes.CHECK}
+                          name="removeFailedDownloads"
+                          helpText={translate('RemoveFailedDownloadsHelpText')}
+                          {...removeFailedDownloads}
+                          onChange={onInputChange}
+                        />
+                      </FormGroup>
+                  }
+                </FieldSet>
+
               </Form>
           }
         </ModalBody>

frontend/src/Settings/DownloadClients/Options/DownloadClientOptions.js

@@ -1,12 +1,13 @@
 import PropTypes from 'prop-types';
 import React from 'react';
+import Alert from 'Components/Alert';
 import FieldSet from 'Components/FieldSet';
 import Form from 'Components/Form/Form';
 import FormGroup from 'Components/Form/FormGroup';
 import FormInputGroup from 'Components/Form/FormInputGroup';
 import FormLabel from 'Components/Form/FormLabel';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
-import { inputTypes, sizes } from 'Helpers/Props';
+import { inputTypes, kinds, sizes } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
 
 function DownloadClientOptions(props) {
@@ -34,14 +35,16 @@ function DownloadClientOptions(props) {
       }
 
       {
-        hasSettings && !isFetching && !error &&
+        hasSettings && !isFetching && !error && advancedSettings &&
           <div>
             <FieldSet legend={translate('CompletedDownloadHandling')}>
               <Form>
-                <FormGroup size={sizes.MEDIUM}>
+                <FormGroup
-                  <FormLabel>
+                  advancedSettings={advancedSettings}
-                    {translate('Enable')}
+                  isAdvanced={true}
-                  </FormLabel>
+                  size={sizes.MEDIUM}
+                >
+                  <FormLabel>{translate('Enable')}</FormLabel>
 
                   <FormInputGroup
                     type={inputTypes.CHECK}
@@ -51,24 +54,6 @@ function DownloadClientOptions(props) {
                     {...settings.enableCompletedDownloadHandling}
                   />
                 </FormGroup>
-
-                <FormGroup
-                  advancedSettings={advancedSettings}
-                  isAdvanced={true}
-                  size={sizes.MEDIUM}
-                >
-                  <FormLabel>
-                    {translate('Remove')}
-                  </FormLabel>
-
-                  <FormInputGroup
-                    type={inputTypes.CHECK}
-                    name="removeCompletedDownloads"
-                    helpText={translate('RemoveCompletedDownloadsHelpText')}
-                    onChange={onInputChange}
-                    {...settings.removeCompletedDownloads}
-                  />
-                </FormGroup>
               </Form>
             </FieldSet>
 
@@ -89,25 +74,10 @@ function DownloadClientOptions(props) {
                     {...settings.autoRedownloadFailed}
                   />
                 </FormGroup>
-
-                <FormGroup
-                  advancedSettings={advancedSettings}
-                  isAdvanced={true}
-                  size={sizes.MEDIUM}
-                >
-                  <FormLabel>
-                    {translate('Remove')}
-                  </FormLabel>
-
-                  <FormInputGroup
-                    type={inputTypes.CHECK}
-                    name="removeFailedDownloads"
-                    helpText={translate('RemoveFailedDownloadsHelpText')}
-                    onChange={onInputChange}
-                    {...settings.removeFailedDownloads}
-                  />
-                </FormGroup>
               </Form>
+              <Alert kind={kinds.INFO}>
+                {translate('RemoveDownloadsAlert')}
+              </Alert>
             </FieldSet>
           </div>
       }

src/Lidarr.Api.V1/Config/DownloadClientConfigResource.cs

@@ -6,12 +6,8 @@ namespace Lidarr.Api.V1.Config
     public class DownloadClientConfigResource : RestResource
     {
         public string DownloadClientWorkingFolders { get; set; }
-
         public bool EnableCompletedDownloadHandling { get; set; }
-        public bool RemoveCompletedDownloads { get; set; }
-
         public bool AutoRedownloadFailed { get; set; }
-        public bool RemoveFailedDownloads { get; set; }
     }
 
     public static class DownloadClientConfigResourceMapper
@@ -23,10 +19,7 @@ namespace Lidarr.Api.V1.Config
                 DownloadClientWorkingFolders = model.DownloadClientWorkingFolders,
 
                 EnableCompletedDownloadHandling = model.EnableCompletedDownloadHandling,
-                RemoveCompletedDownloads = model.RemoveCompletedDownloads,
+                AutoRedownloadFailed = model.AutoRedownloadFailed
-
-                AutoRedownloadFailed = model.AutoRedownloadFailed,
-                RemoveFailedDownloads = model.RemoveFailedDownloads
             };
         }
     }

src/Lidarr.Api.V1/DownloadClient/DownloadClientResource.cs

@@ -8,6 +8,8 @@ namespace Lidarr.Api.V1.DownloadClient
         public bool Enable { get; set; }
         public DownloadProtocol Protocol { get; set; }
         public int Priority { get; set; }
+        public bool RemoveCompletedDownloads { get; set; }
+        public bool RemoveFailedDownloads { get; set; }
     }
 
     public class DownloadClientResourceMapper : ProviderResourceMapper<DownloadClientResource, DownloadClientDefinition>
@@ -24,6 +26,8 @@ namespace Lidarr.Api.V1.DownloadClient
             resource.Enable = definition.Enable;
             resource.Protocol = definition.Protocol;
             resource.Priority = definition.Priority;
+            resource.RemoveCompletedDownloads = definition.RemoveCompletedDownloads;
+            resource.RemoveFailedDownloads = definition.RemoveFailedDownloads;
 
             return resource;
         }
@@ -40,6 +44,8 @@ namespace Lidarr.Api.V1.DownloadClient
             definition.Enable = resource.Enable;
             definition.Protocol = resource.Protocol;
             definition.Priority = resource.Priority;
+            definition.RemoveCompletedDownloads = resource.RemoveCompletedDownloads;
+            definition.RemoveFailedDownloads = resource.RemoveFailedDownloads;
 
             return definition;
         }

src/NzbDrone.Core.Test/Datastore/Migration/051_cdh_per_downloadclientFixture.cs

@@ -0,0 +1,131 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Common.Serializer;
+using NzbDrone.Core.Datastore.Migration;
+using NzbDrone.Core.Download.Clients.RTorrent;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.Datastore.Migration
+{
+    [TestFixture]
+    public class cdh_per_downloadclientFixture : MigrationTest<cdh_per_downloadclient>
+    {
+        [Test]
+        public void should_set_cdh_to_enabled()
+        {
+            var db = WithMigrationTestDb(c =>
+            {
+                c.Insert.IntoTable("DownloadClients").Row(new
+                {
+                    Enable = 1,
+                    Name = "Deluge",
+                    Implementation = "Deluge",
+                    Priority = 1,
+                    Settings = new DelugeSettings85
+                    {
+                        Host = "127.0.0.1",
+                        MovieCategory = "abc",
+                        UrlBase = "/my/"
+                    }.ToJson(),
+                    ConfigContract = "DelugeSettings"
+                });
+            });
+
+            var items = db.Query<DownloadClientDefinition158>("SELECT * FROM DownloadClients");
+
+            items.Should().HaveCount(1);
+            items.First().RemoveCompletedDownloads.Should().BeFalse();
+            items.First().RemoveFailedDownloads.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_set_cdh_to_disabled_when_globally_disabled()
+        {
+            var db = WithMigrationTestDb(c =>
+            {
+                c.Insert.IntoTable("Config").Row(new
+                {
+                    Key = "removecompleteddownloads",
+                    Value = "True"
+                });
+
+                c.Insert.IntoTable("DownloadClients").Row(new
+                {
+                    Enable = 1,
+                    Name = "Deluge",
+                    Implementation = "Deluge",
+                    Priority = 1,
+                    Settings = new DelugeSettings85
+                    {
+                        Host = "127.0.0.1",
+                        MovieCategory = "abc",
+                        UrlBase = "/my/"
+                    }.ToJson(),
+                    ConfigContract = "DelugeSettings"
+                });
+            });
+
+            var items = db.Query<DownloadClientDefinition158>("SELECT * FROM DownloadClients");
+
+            items.Should().HaveCount(1);
+            items.First().RemoveCompletedDownloads.Should().BeTrue();
+            items.First().RemoveFailedDownloads.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_disable_remove_for_existing_rtorrent()
+        {
+            var db = WithMigrationTestDb(c =>
+            {
+                c.Insert.IntoTable("DownloadClients").Row(new
+                {
+                    Enable = 1,
+                    Name = "RTorrent",
+                    Implementation = "RTorrent",
+                    Priority = 1,
+                    Settings = new RTorrentSettings
+                    {
+                        Host = "127.0.0.1",
+                        MusicCategory = "abc",
+                        UrlBase = "/my/"
+                    }.ToJson(),
+                    ConfigContract = "RTorrentSettings"
+                });
+            });
+
+            var items = db.Query<DownloadClientDefinition158>("SELECT * FROM DownloadClients");
+
+            items.Should().HaveCount(1);
+            items.First().RemoveCompletedDownloads.Should().BeFalse();
+            items.First().RemoveFailedDownloads.Should().BeTrue();
+        }
+    }
+
+    public class DownloadClientDefinition158
+    {
+        public int Id { get; set; }
+        public bool Enable { get; set; }
+        public int Priority { get; set; }
+        public string Name { get; set; }
+        public string Implementation { get; set; }
+        public JsonElement Settings { get; set; }
+        public string ConfigContract { get; set; }
+        public bool RemoveCompletedDownloads { get; set; }
+        public bool RemoveFailedDownloads { get; set; }
+    }
+
+    public class DelugeSettings85
+    {
+        public string Host { get; set; }
+        public int Port { get; set; }
+        public string UrlBase { get; set; }
+        public string Password { get; set; }
+        public string MovieCategory { get; set; }
+        public int RecentTvPriority { get; set; }
+        public int OlderTvPriority { get; set; }
+        public bool UseSsl { get; set; }
+    }
+}

src/NzbDrone.Core/Configuration/ConfigService.cs

@@ -138,13 +138,6 @@ namespace NzbDrone.Core.Configuration
             set { SetValue("EnableCompletedDownloadHandling", value); }
         }
 
-        public bool RemoveCompletedDownloads
-        {
-            get { return GetValueBoolean("RemoveCompletedDownloads", false); }
-
-            set { SetValue("RemoveCompletedDownloads", value); }
-        }
-
         public bool AutoRedownloadFailed
         {
             get { return GetValueBoolean("AutoRedownloadFailed", true); }
@@ -152,13 +145,6 @@ namespace NzbDrone.Core.Configuration
             set { SetValue("AutoRedownloadFailed", value); }
         }
 
-        public bool RemoveFailedDownloads
-        {
-            get { return GetValueBoolean("RemoveFailedDownloads", true); }
-
-            set { SetValue("RemoveFailedDownloads", value); }
-        }
-
         public bool CreateEmptyArtistFolders
         {
             get { return GetValueBoolean("CreateEmptyArtistFolders", false); }

src/NzbDrone.Core/Configuration/IConfigService.cs

@@ -18,10 +18,8 @@ namespace NzbDrone.Core.Configuration
 
         //Completed/Failed Download Handling (Download client)
         bool EnableCompletedDownloadHandling { get; set; }
-        bool RemoveCompletedDownloads { get; set; }
 
         bool AutoRedownloadFailed { get; set; }
-        bool RemoveFailedDownloads { get; set; }
 
         //Media Management
         bool AutoUnmonitorPreviouslyDownloadedTracks { get; set; }

src/NzbDrone.Core/Datastore/Migration/051_cdh_per_downloadclient.cs

@@ -0,0 +1,56 @@
+using System.Data;
+using System.Linq;
+using FluentMigrator;
+using Newtonsoft.Json.Linq;
+using NzbDrone.Common.Serializer;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(051)]
+    public class cdh_per_downloadclient : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            Alter.Table("DownloadClients")
+                 .AddColumn("RemoveCompletedDownloads").AsBoolean().NotNullable().WithDefaultValue(true)
+                 .AddColumn("RemoveFailedDownloads").AsBoolean().NotNullable().WithDefaultValue(true);
+
+            Execute.WithConnection(MoveRemoveSettings);
+        }
+
+        private void MoveRemoveSettings(IDbConnection conn, IDbTransaction tran)
+        {
+            var removeCompletedDownloads = false;
+            var removeFailedDownloads = true;
+
+            using (var removeCompletedDownloadsCmd = conn.CreateCommand(tran, "SELECT Value FROM Config WHERE Key = 'removecompleteddownloads'"))
+            {
+                if ((removeCompletedDownloadsCmd.ExecuteScalar() as string)?.ToLower() == "true")
+                {
+                    removeCompletedDownloads = true;
+                }
+            }
+
+            using (var removeFailedDownloadsCmd = conn.CreateCommand(tran, "SELECT Value FROM Config WHERE Key = 'removefaileddownloads'"))
+            {
+                if ((removeFailedDownloadsCmd.ExecuteScalar() as string)?.ToLower() == "false")
+                {
+                    removeFailedDownloads = false;
+                }
+            }
+
+            using (var updateClientCmd = conn.CreateCommand(tran, $"UPDATE DownloadClients SET RemoveCompletedDownloads = (CASE WHEN Implementation IN (\"RTorrent\", \"Flood\") THEN 0 ELSE ? END), RemoveFailedDownloads = ?"))
+            {
+                updateClientCmd.AddParameter(removeCompletedDownloads ? 1 : 0);
+                updateClientCmd.AddParameter(removeFailedDownloads ? 1 : 0);
+                updateClientCmd.ExecuteNonQuery();
+            }
+
+            using (var removeConfigCmd = conn.CreateCommand(tran, $"DELETE FROM Config WHERE Key IN ('removecompleteddownloads', 'removefaileddownloads')"))
+            {
+                removeConfigCmd.ExecuteNonQuery();
+            }
+        }
+    }
+}

src/NzbDrone.Core/Datastore/Migration/Framework/MigrationExtension.cs

@@ -1,4 +1,5 @@
-using FluentMigrator;
+using System.Data;
+using FluentMigrator;
 using FluentMigrator.Builders.Create;
 using FluentMigrator.Builders.Create.Table;
 using FluentMigrator.Runner;
@@ -16,6 +17,15 @@ namespace NzbDrone.Core.Datastore.Migration.Framework
             return expressionRoot.Table(name).WithColumn("Id").AsInt32().PrimaryKey().Identity();
         }
 
+        public static IDbCommand CreateCommand(this IDbConnection conn, IDbTransaction tran, string query)
+        {
+            var command = conn.CreateCommand();
+            command.Transaction = tran;
+            command.CommandText = query;
+
+            return command;
+        }
+
         public static void AddParameter(this System.Data.IDbCommand command, object value)
         {
             var parameter = command.CreateParameter();

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

@@ -70,8 +70,7 @@ namespace NzbDrone.Core.Download.Clients.Flood
         }
 
         public override string Name => "Flood";
-        public override ProviderMessage Message => new ProviderMessage("Lidarr is unable to remove torrents that have finished seeding when using Flood", ProviderMessageType.Warning);
+        public override ProviderMessage Message => new ProviderMessage("Lidarr will handle automatic removal of torrents based on the current seed criteria in Settings -> Indexers", ProviderMessageType.Info);
-
         protected override string AddFromTorrentFile(RemoteAlbum remoteAlbum, string hash, string filename, byte[] fileContent)
         {
             _proxy.AddTorrentByFile(Convert.ToBase64String(fileContent), HandleTags(remoteAlbum, Settings), Settings);
@@ -112,6 +111,8 @@ namespace NzbDrone.Core.Download.Clients.Flood
                     TotalSize = properties.SizeBytes,
                     SeedRatio = properties.Ratio,
                     Message = properties.Message,
+                    CanMoveFiles = false,
+                    CanBeRemoved = false,
                 };
 
                 if (properties.Eta > 0)
@@ -136,8 +137,6 @@ namespace NzbDrone.Core.Download.Clients.Flood
                     item.Status = DownloadItemStatus.Paused;
                 }
 
-                item.CanMoveFiles = item.CanBeRemoved = false;
-
                 items.Add(item);
             }
 

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

@@ -31,5 +31,9 @@ namespace NzbDrone.Core.Download.Clients.Flood.Types
 
         [JsonProperty(PropertyName = "tags")]
         public List<string> Tags { get; set; }
+
+        // added in Flood 4.5
+        [JsonProperty(PropertyName = "dateFinished")]
+        public long? DateFinished { get; set; }
     }
 }

src/NzbDrone.Core/Download/DownloadClientDefinition.cs

@@ -1,4 +1,4 @@
-using NzbDrone.Core.Indexers;
+using NzbDrone.Core.Indexers;
 using NzbDrone.Core.ThingiProvider;
 
 namespace NzbDrone.Core.Download
@@ -7,5 +7,7 @@ namespace NzbDrone.Core.Download
     {
         public DownloadProtocol Protocol { get; set; }
         public int Priority { get; set; } = 1;
+        public bool RemoveCompletedDownloads { get; set; } = true;
+        public bool RemoveFailedDownloads { get; set; } = true;
     }
 }

src/NzbDrone.Core/Download/DownloadEventHub.cs

@@ -27,38 +27,65 @@ namespace NzbDrone.Core.Download
         {
             var trackedDownload = message.TrackedDownload;
 
-            if (trackedDownload == null || !trackedDownload.DownloadItem.CanBeRemoved || _configService.RemoveFailedDownloads == false)
+            if (trackedDownload == null ||
+                message.TrackedDownload.DownloadItem.Removed ||
+                !trackedDownload.DownloadItem.CanBeRemoved)
             {
                 return;
             }
 
-            RemoveFromDownloadClient(trackedDownload);
+            var downloadClient = _downloadClientProvider.Get(message.TrackedDownload.DownloadClient);
+            var definition = downloadClient.Definition as DownloadClientDefinition;
+
+            if (!definition.RemoveFailedDownloads)
+            {
+                return;
+            }
+
+            RemoveFromDownloadClient(trackedDownload, downloadClient);
         }
 
         public void Handle(DownloadCompletedEvent message)
         {
-            if (_configService.RemoveCompletedDownloads &&
+            var trackedDownload = message.TrackedDownload;
-                !message.TrackedDownload.DownloadItem.Removed &&
+            var downloadClient = _downloadClientProvider.Get(trackedDownload.DownloadClient);
-                message.TrackedDownload.DownloadItem.CanBeRemoved &&
+            var definition = downloadClient.Definition as DownloadClientDefinition;
-                message.TrackedDownload.DownloadItem.Status != DownloadItemStatus.Downloading)
+
+            MarkItemAsImported(trackedDownload, downloadClient);
+
+            if (trackedDownload.DownloadItem.Removed ||
+                !trackedDownload.DownloadItem.CanBeRemoved ||
+                trackedDownload.DownloadItem.Status == DownloadItemStatus.Downloading)
             {
-                RemoveFromDownloadClient(message.TrackedDownload);
+                return;
             }
-            else
+
+            if (!definition.RemoveCompletedDownloads)
             {
-                MarkItemAsImported(message.TrackedDownload);
+                return;
             }
+
+            RemoveFromDownloadClient(message.TrackedDownload, downloadClient);
         }
 
         public void Handle(DownloadCanBeRemovedEvent message)
         {
-            // Already verified that it can be removed, just needs to be removed
+            var trackedDownload = message.TrackedDownload;
-            RemoveFromDownloadClient(message.TrackedDownload);
+            var downloadClient = _downloadClientProvider.Get(trackedDownload.DownloadClient);
+            var definition = downloadClient.Definition as DownloadClientDefinition;
+
+            if (trackedDownload.DownloadItem.Removed ||
+                !trackedDownload.DownloadItem.CanBeRemoved ||
+                !definition.RemoveCompletedDownloads)
+            {
+                return;
+            }
+
+            RemoveFromDownloadClient(message.TrackedDownload, downloadClient);
         }
 
-        private void RemoveFromDownloadClient(TrackedDownload trackedDownload)
+        private void RemoveFromDownloadClient(TrackedDownload trackedDownload, IDownloadClient downloadClient)
         {
-            var downloadClient = _downloadClientProvider.Get(trackedDownload.DownloadClient);
             try
             {
                 _logger.Debug("[{0}] Removing download from {1} history", trackedDownload.DownloadItem.Title, trackedDownload.DownloadItem.DownloadClientInfo.Name);
@@ -75,9 +102,8 @@ namespace NzbDrone.Core.Download
             }
         }
 
-        private void MarkItemAsImported(TrackedDownload trackedDownload)
+        private void MarkItemAsImported(TrackedDownload trackedDownload, IDownloadClient downloadClient)
         {
-            var downloadClient = _downloadClientProvider.Get(trackedDownload.DownloadClient);
             try
             {
                 _logger.Debug("[{0}] Marking download as imported from {1}", trackedDownload.DownloadItem.Title, trackedDownload.DownloadItem.DownloadClientInfo.Name);

src/NzbDrone.Core/Download/DownloadProcessingService.cs

@@ -47,7 +47,6 @@ namespace NzbDrone.Core.Download
         public void Execute(ProcessMonitoredDownloadsCommand message)
         {
             var enableCompletedDownloadHandling = _configService.EnableCompletedDownloadHandling;
-            var removeCompletedDownloads = _configService.RemoveCompletedDownloads;
             var trackedDownloads = _trackedDownloadService.GetTrackedDownloads()
                                                           .Where(t => t.IsTrackable)
                                                           .ToList();
@@ -72,10 +71,7 @@ namespace NzbDrone.Core.Download
             }
 
             // Imported downloads are no longer trackable so process them after processing trackable downloads
-            if (removeCompletedDownloads)
+            RemoveCompletedDownloads();
-            {
-                RemoveCompletedDownloads();
-            }
 
             _eventAggregator.PublishEvent(new DownloadsProcessedEvent());
         }

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

@@ -456,8 +456,11 @@
   "RemotePathHelpText": "Root path to the directory that the Download Client accesses",
   "RemotePathMappings": "Remote Path Mappings",
   "Remove": "Remove",
+  "RemoveCompleted": "Remove Completed",
   "RemoveCompletedDownloadsHelpText": "Remove imported downloads from download client history",
   "RemovedFromTaskQueue": "Removed from task queue",
+  "RemoveDownloadsAlert": "The Remove settings were moved to the individual Download Client settings in the table above.",
+  "RemoveFailed": "Remove Failed",
   "RemoveFailedDownloadsHelpText": "Remove failed downloads from download client history",
   "RemoveFilter": "Remove filter",
   "RemoveFromBlocklist": "Remove from blocklist",