New: Download client option for redownloading failed releases from Interactive Search

(cherry picked from commit 87e0a7983a437a4d166aa8b9c9eaf78ea5431969)

frontend/src/Components/Form/FormLabel.css

@@ -2,8 +2,10 @@
   display: flex;
   justify-content: flex-end;
   margin-right: $formLabelRightMarginWidth;
+  padding-top: 8px;
+  min-height: 35px;
+  text-align: end;
   font-weight: bold;
-  line-height: 35px;
 }
 
 .hasError {

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

@@ -61,10 +61,12 @@ function DownloadClientOptions(props) {
               legend={translate('FailedDownloadHandling')}
             >
               <Form>
-                <FormGroup size={sizes.MEDIUM}>
-                  <FormLabel>
-                    {translate('Redownload')}
-                  </FormLabel>
+                <FormGroup
+                  advancedSettings={advancedSettings}
+                  isAdvanced={true}
+                  size={sizes.MEDIUM}
+                >
+                  <FormLabel>{translate('AutoRedownloadFailed')}</FormLabel>
 
                   <FormInputGroup
                     type={inputTypes.CHECK}
@@ -74,7 +76,28 @@ function DownloadClientOptions(props) {
                     {...settings.autoRedownloadFailed}
                   />
                 </FormGroup>
+
+                {
+                  settings.autoRedownloadFailed.value ?
+                    <FormGroup
+                      advancedSettings={advancedSettings}
+                      isAdvanced={true}
+                      size={sizes.MEDIUM}
+                    >
+                      <FormLabel>{translate('AutoRedownloadFailedFromInteractiveSearch')}</FormLabel>
+
+                      <FormInputGroup
+                        type={inputTypes.CHECK}
+                        name="autoRedownloadFailedFromInteractiveSearch"
+                        helpText={translate('AutoRedownloadFailedFromInteractiveSearchHelpText')}
+                        onChange={onInputChange}
+                        {...settings.autoRedownloadFailedFromInteractiveSearch}
+                      />
+                    </FormGroup> :
+                    null
+                }
               </Form>
+
               <Alert kind={kinds.INFO}>
                 {translate('RemoveDownloadsAlert')}
               </Alert>

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

@@ -1,4 +1,4 @@
-using Lidarr.Http.REST;
+using Lidarr.Http.REST;
 using NzbDrone.Core.Configuration;
 
 namespace Lidarr.Api.V1.Config
@@ -8,6 +8,7 @@ namespace Lidarr.Api.V1.Config
         public string DownloadClientWorkingFolders { get; set; }
         public bool EnableCompletedDownloadHandling { get; set; }
         public bool AutoRedownloadFailed { get; set; }
+        public bool AutoRedownloadFailedFromInteractiveSearch { get; set; }
     }
 
     public static class DownloadClientConfigResourceMapper
@@ -19,7 +20,8 @@ namespace Lidarr.Api.V1.Config
                 DownloadClientWorkingFolders = model.DownloadClientWorkingFolders,
 
                 EnableCompletedDownloadHandling = model.EnableCompletedDownloadHandling,
-                AutoRedownloadFailed = model.AutoRedownloadFailed
+                AutoRedownloadFailed = model.AutoRedownloadFailed,
+                AutoRedownloadFailedFromInteractiveSearch = model.AutoRedownloadFailedFromInteractiveSearch
             };
         }
     }

src/NzbDrone.Core/Configuration/ConfigService.cs

@@ -144,6 +144,13 @@ namespace NzbDrone.Core.Configuration
             set { SetValue("AutoRedownloadFailed", value); }
         }
 
+        public bool AutoRedownloadFailedFromInteractiveSearch
+        {
+            get { return GetValueBoolean("AutoRedownloadFailedFromInteractiveSearch", true); }
+
+            set { SetValue("AutoRedownloadFailedFromInteractiveSearch", value); }
+        }
+
         public bool CreateEmptyArtistFolders
         {
             get { return GetValueBoolean("CreateEmptyArtistFolders", false); }

src/NzbDrone.Core/Configuration/IConfigService.cs

@@ -20,6 +20,7 @@ namespace NzbDrone.Core.Configuration
         bool EnableCompletedDownloadHandling { get; set; }
 
         bool AutoRedownloadFailed { get; set; }
+        bool AutoRedownloadFailedFromInteractiveSearch { get; set; }
 
         // Media Management
         bool AutoUnmonitorPreviouslyDownloadedTracks { get; set; }

src/NzbDrone.Core/Download/DownloadFailedEvent.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using NzbDrone.Common.Messaging;
 using NzbDrone.Core.Download.TrackedDownloads;
+using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Qualities;
 
 namespace NzbDrone.Core.Download
@@ -22,5 +23,6 @@ namespace NzbDrone.Core.Download
         public Dictionary<string, string> Data { get; set; }
         public TrackedDownload TrackedDownload { get; set; }
         public bool SkipRedownload { get; set; }
+        public ReleaseSourceType ReleaseSource { get; set; }
     }
 }

src/NzbDrone.Core/Download/FailedDownloadService.cs

@@ -1,9 +1,11 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Download.TrackedDownloads;
 using NzbDrone.Core.History;
 using NzbDrone.Core.Messaging.Events;
+using NzbDrone.Core.Parser.Model;
 
 namespace NzbDrone.Core.Download
 {
@@ -117,6 +119,7 @@ namespace NzbDrone.Core.Download
         private void PublishDownloadFailedEvent(List<EntityHistory> historyItems, string message, TrackedDownload trackedDownload = null, bool skipRedownload = false)
         {
             var historyItem = historyItems.Last();
+            Enum.TryParse(historyItem.Data.GetValueOrDefault(EntityHistory.RELEASE_SOURCE, ReleaseSourceType.Unknown.ToString()), out ReleaseSourceType releaseSource);
 
             var downloadFailedEvent = new DownloadFailedEvent
             {
@@ -129,7 +132,8 @@ namespace NzbDrone.Core.Download
                 Message = message,
                 Data = historyItem.Data,
                 TrackedDownload = trackedDownload,
-                SkipRedownload = skipRedownload
+                SkipRedownload = skipRedownload,
+                ReleaseSource = releaseSource
             };
 
             _eventAggregator.PublishEvent(downloadFailedEvent);

src/NzbDrone.Core/Download/RedownloadFailedDownloadService.cs

@@ -5,6 +5,7 @@ using NzbDrone.Core.Messaging;
 using NzbDrone.Core.Messaging.Commands;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.Music;
+using NzbDrone.Core.Parser.Model;
 
 namespace NzbDrone.Core.Download
 {
@@ -41,6 +42,12 @@ namespace NzbDrone.Core.Download
                 return;
             }
 
+            if (message.ReleaseSource == ReleaseSourceType.InteractiveSearch && !_configService.AutoRedownloadFailedFromInteractiveSearch)
+            {
+                _logger.Debug("Auto redownloading failed albumbs from interactive search is disabled");
+                return;
+            }
+
             if (message.AlbumIds.Count == 1)
             {
                 _logger.Debug("Failed download only contains one album, searching again");

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

@@ -135,6 +135,9 @@
   "AuthenticationRequiredWarning": "To prevent remote access without authentication, {appName} now requires authentication to be enabled. You can optionally disable authentication from local addresses.",
   "Auto": "Auto",
   "AutoAdd": "Auto Add",
+  "AutoRedownloadFailed": "Redownload Failed",
+  "AutoRedownloadFailedFromInteractiveSearch": "Redownload Failed from Interactive Search",
+  "AutoRedownloadFailedFromInteractiveSearchHelpText": "Automatically search for and attempt to download a different release when failed release was grabbed from interactive search",
   "AutoRedownloadFailedHelpText": "Automatically search for and attempt to download a different release",
   "AutoTagging": "Auto Tagging",
   "AutoTaggingLoadError": "Unable to load auto tagging",