Automated API Docs update

Closes #8724

azure-pipelines.yml

@@ -9,7 +9,7 @@ variables:
   testsFolder: './_tests'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
   nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '4.6.2'
+  majorVersion: '4.6.3'
   minorVersion: $[counter('minorVersion', 2000)]
   radarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(radarrVersion)'

frontend/src/Components/Page/Header/MovieSearchInputConnector.js

@@ -19,6 +19,8 @@ function createCleanMovieSelector() {
           year,
           images,
           alternateTitles = [],
+          tmdbId,
+          imdbId,
           tags = []
         } = movie;
 
@@ -29,6 +31,8 @@ function createCleanMovieSelector() {
           year,
           images,
           alternateTitles,
+          tmdbId,
+          imdbId,
           firstCharacter: title.charAt(0).toLowerCase(),
           tags: tags.reduce((acc, id) => {
             const matchingTag = allTags.find((tag) => tag.id === id);

frontend/src/Components/Page/Header/MovieSearchResult.js

@@ -12,6 +12,8 @@ function MovieSearchResult(props) {
     year,
     images,
     alternateTitles,
+    tmdbId,
+    imdbId,
     tags
   } = props;
 
@@ -47,6 +49,22 @@ function MovieSearchResult(props) {
             null
         }
 
+        {
+          match.key === 'tmdbId' && tmdbId ?
+            <div className={styles.alternateTitle}>
+              TmdbId: {tmdbId}
+            </div> :
+            null
+        }
+
+        {
+          match.key === 'imdbId' && imdbId ?
+            <div className={styles.alternateTitle}>
+              ImdbId: {imdbId}
+            </div> :
+            null
+        }
+
         {
           tag ?
             <div className={styles.tagContainer}>
@@ -69,6 +87,8 @@ MovieSearchResult.propTypes = {
   year: PropTypes.number.isRequired,
   images: PropTypes.arrayOf(PropTypes.object).isRequired,
   alternateTitles: PropTypes.arrayOf(PropTypes.object).isRequired,
+  tmdbId: PropTypes.number,
+  imdbId: PropTypes.string,
   tags: PropTypes.arrayOf(PropTypes.object).isRequired,
   match: PropTypes.object.isRequired
 };

frontend/src/Components/Page/Header/fuse.worker.js

@@ -9,6 +9,8 @@ const fuseOptions = {
   keys: [
     'title',
     'alternateTitles.title',
+    'tmdbId',
+    'imdbId',
     'tags.label'
   ]
 };

frontend/src/Settings/CustomFormats/CustomFormats/CustomFormat.js

@@ -152,13 +152,7 @@ class CustomFormat extends Component {
           isOpen={this.state.isDeleteCustomFormatModalOpen}
           kind={kinds.DANGER}
           title={translate('DeleteCustomFormat')}
-          message={
-            <div>
-              <div>
-                {translate('DeleteCustomFormatMessageText', [name])}
-              </div>
-            </div>
-          }
+          message={translate('DeleteCustomFormatMessageText', [name])}
           confirmLabel={translate('Delete')}
           isSpinning={isDeleting}
           onConfirm={this.onConfirmDeleteCustomFormat}

src/NzbDrone.Common/Http/HttpResponse.cs

@@ -50,6 +50,8 @@ namespace NzbDrone.Common.Http
 
         public bool HasHttpError => (int)StatusCode >= 400;
 
+        public bool HasHttpServerError => (int)StatusCode >= 500;
+
         public bool HasHttpRedirect => StatusCode == HttpStatusCode.Moved ||
                                        StatusCode == HttpStatusCode.MovedPermanently ||
                                        StatusCode == HttpStatusCode.Found ||

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

@@ -109,6 +109,7 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Movie.Should.Not.Use.Dots.2022.1080p.BluRay.x265.10bit.Tigole", "Tigole")]
         [TestCase("Movie.Title.2005.2160p.UHD.BluRay.TrueHD 7.1.Atmos.x265 - HQMUX", "HQMUX")]
         [TestCase("Movie.Name.2022.1080p.BluRay.x264-VARYG (Blue Lock, Multi-Subs)", "VARYG")]
+        [TestCase("Movie Title (2023) (1080p BluRay x265 SDR AAC 2.0 English Vyndros)", "Vyndros")]
         public void should_parse_exception_release_group(string title, string expected)
         {
             Parser.Parser.ParseReleaseGroup(title).Should().Be(expected);

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

@@ -0,0 +1,43 @@
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.Parser;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.ParserTests
+{
+    [TestFixture]
+    public class UrlFixture : CoreTest
+    {
+        [TestCase("[www.test.com] - Movie.Title.2023.720p.HDTV.X264-DIMENSION", "Movie Title")]
+        [TestCase("test.net - Movie.Title.2023.720p.HDTV.X264-DIMENSION", "Movie Title")]
+        [TestCase("[www.test-hyphen.com] - Movie.Title.2023.720p.HDTV.X264-DIMENSION", "Movie Title")]
+        [TestCase("www.test123.org - Movie.Title.2023.720p.HDTV.X264-DIMENSION", "Movie Title")]
+        [TestCase("[test.co.uk] - Movie.Title.2023.720p.HDTV.X264-DIMENSION", "Movie Title")]
+        [TestCase("www.test-hyphen.net.au - Movie.Title.2023.720p.HDTV.X264-DIMENSION", "Movie Title")]
+        [TestCase("[www.test123.co.nz] - Movie.Title.2023.720p.HDTV.X264-DIMENSION", "Movie Title")]
+        [TestCase("test-hyphen123.org.au - Movie.Title.2023.720p.HDTV.X264-DIMENSION", "Movie Title")]
+        [TestCase("[www.test123.de] - Mad Movie Title 2023 [Bluray720p]", "Mad Movie Title")]
+        [TestCase("www.test-hyphen.de - Mad Movie Title 2023 [Bluray1080p]", "Mad Movie Title")]
+        [TestCase("www.test123.co.za - The Movie Title Bros. (2023)", "The Movie Title Bros.")]
+        [TestCase("[www.test-hyphen.ca] - Movie Title (2023)", "Movie Title")]
+        [TestCase("test123.ca - Movie Time 2023 720p HDTV x264 CRON", "Movie Time")]
+        [TestCase("[www.test-hyphen123.co.za] - Movie Title 2023", "Movie Title")]
+        public void should_not_parse_url_in_name(string postTitle, string title)
+        {
+            var result = Parser.Parser.ParseMovieTitle(postTitle).MovieTitle.CleanMovieTitle();
+            result.Should().Be(title.CleanMovieTitle());
+        }
+
+        [TestCase("Movie.2023.English.HDTV.XviD-LOL[www.abb.com]", "LOL")]
+        [TestCase("Movie Title 2023 English HDTV XviD LOL[www.academy.org]", null)]
+        [TestCase("Movie Title Now 2023 DVDRip XviD RUNNER[www.aetna.net]", null)]
+        [TestCase("Movie.Title.2023.DVDRip.XviD-RUNNER[www.alfaromeo.io]", "RUNNER")]
+        [TestCase("Movie.Title.2023.English.HDTV.XviD-LOL[www.abbott.gov]", "LOL")]
+        [TestCase("Movie Title 2023 English HDTV XviD LOL[www.actor.org]", null)]
+        [TestCase("Movie Title Future 2023 DVDRip XviD RUNNER[www.allstate.net]", null)]
+        public void should_not_parse_url_in_group(string title, string expected)
+        {
+            Parser.Parser.ParseReleaseGroup(title).Should().Be(expected);
+        }
+    }
+}

src/NzbDrone.Core/HealthCheck/Checks/DownloadClientRootFolderCheck.cs

@@ -48,13 +48,11 @@ namespace NzbDrone.Core.HealthCheck.Checks
                 try
                 {
                     var status = client.GetStatus();
-                    var folders = status.OutputRootFolders;
+                    var folders = status.OutputRootFolders.Where(folder => rootFolders.Any(r => r.Path.PathEquals(folder.FullPath)));
+
                     foreach (var folder in folders)
                     {
-                        if (rootFolders.Any(r => r.Path.PathEquals(folder.FullPath)))
-                        {
-                            return new HealthCheck(GetType(), HealthCheckResult.Warning, string.Format(_localizationService.GetLocalizedString("DownloadClientCheckDownloadingToRoot"), client.Definition.Name, folder.FullPath), "#downloads-in-root-folder");
-                        }
+                        return new HealthCheck(GetType(), HealthCheckResult.Warning, string.Format(_localizationService.GetLocalizedString("DownloadClientCheckDownloadingToRoot"), client.Definition.Name, folder.FullPath), "#downloads-in-root-folder");
                     }
                 }
                 catch (DownloadClientException ex)

src/NzbDrone.Core/HealthCheck/Checks/IndexerJackettAllCheck.cs

@@ -23,12 +23,14 @@ namespace NzbDrone.Core.HealthCheck.Checks
 
         public override HealthCheck Check()
         {
-            var jackettAllProviders = _providerFactory.All().Where(
-                i => i.ConfigContract.Equals("TorznabSettings") &&
-                ((i.Settings as TorznabSettings).BaseUrl.Contains("/torznab/all/api", StringComparison.InvariantCultureIgnoreCase) ||
-                (i.Settings as TorznabSettings).BaseUrl.Contains("/api/v2.0/indexers/all/results/torznab", StringComparison.InvariantCultureIgnoreCase) ||
-                (i.Settings as TorznabSettings).ApiPath.Contains("/torznab/all/api", StringComparison.InvariantCultureIgnoreCase) ||
-                (i.Settings as TorznabSettings).ApiPath.Contains("/api/v2.0/indexers/all/results/torznab", StringComparison.InvariantCultureIgnoreCase)));
+            var jackettAllProviders = _providerFactory.All()
+                .Where(
+                    i => i.ConfigContract.Equals("TorznabSettings") &&
+                         (((TorznabSettings)i.Settings).BaseUrl.Contains("/torznab/all/api", StringComparison.InvariantCultureIgnoreCase) ||
+                          ((TorznabSettings)i.Settings).BaseUrl.Contains("/api/v2.0/indexers/all/results/torznab", StringComparison.InvariantCultureIgnoreCase) ||
+                          ((TorznabSettings)i.Settings).ApiPath.Contains("/torznab/all/api", StringComparison.InvariantCultureIgnoreCase) ||
+                          ((TorznabSettings)i.Settings).ApiPath.Contains("/api/v2.0/indexers/all/results/torznab", StringComparison.InvariantCultureIgnoreCase)))
+                .ToArray();
 
             if (jackettAllProviders.Empty())
             {

src/NzbDrone.Core/HealthCheck/Checks/IndexerLongTermStatusCheck.cs

@@ -28,13 +28,12 @@ namespace NzbDrone.Core.HealthCheck.Checks
         {
             var enabledProviders = _providerFactory.GetAvailableProviders();
             var backOffProviders = enabledProviders.Join(_providerStatusService.GetBlockedProviders(),
-                                                       i => i.Definition.Id,
-                                                       s => s.ProviderId,
-                                                       (i, s) => new { Provider = i, Status = s })
-                                                   .Where(p => p.Status.InitialFailure.HasValue &&
-                                                               p.Status.InitialFailure.Value.Before(
-                                                                   DateTime.UtcNow.AddHours(-6)))
-                                                   .ToList();
+                    i => i.Definition.Id,
+                    s => s.ProviderId,
+                    (i, s) => new { Provider = i, Status = s })
+                .Where(p => p.Status.InitialFailure.HasValue &&
+                            p.Status.InitialFailure.Value.Before(DateTime.UtcNow.AddHours(-6)))
+                .ToList();
 
             if (backOffProviders.Empty())
             {

src/NzbDrone.Core/HealthCheck/Checks/IndexerStatusCheck.cs

@@ -26,13 +26,12 @@ namespace NzbDrone.Core.HealthCheck.Checks
         {
             var enabledProviders = _providerFactory.GetAvailableProviders();
             var backOffProviders = enabledProviders.Join(_providerStatusService.GetBlockedProviders(),
-                                                       i => i.Definition.Id,
-                                                       s => s.ProviderId,
-                                                       (i, s) => new { Provider = i, Status = s })
-                                                   .Where(p => p.Status.InitialFailure.HasValue &&
-                                                               p.Status.InitialFailure.Value.After(
-                                                                   DateTime.UtcNow.AddHours(-6)))
-                                                   .ToList();
+                    i => i.Definition.Id,
+                    s => s.ProviderId,
+                    (i, s) => new { Provider = i, Status = s })
+                .Where(p => p.Status.InitialFailure.HasValue &&
+                            p.Status.InitialFailure.Value.After(DateTime.UtcNow.AddHours(-6)))
+                .ToList();
 
             if (backOffProviders.Empty())
             {

src/NzbDrone.Core/HealthCheck/Checks/MountCheck.cs

@@ -21,10 +21,10 @@ namespace NzbDrone.Core.HealthCheck.Checks
         {
             // Not best for optimization but due to possible symlinks and junctions, we get mounts based on series path so internals can handle mount resolution.
             var mounts = _movieService.AllMoviePaths()
-                                      .Select(p => _diskProvider.GetMount(p.Value))
-                                      .Where(m => m != null && m.MountOptions != null && m.MountOptions.IsReadOnly)
-                                      .DistinctBy(m => m.RootDirectory)
-                                      .ToList();
+                .Select(p => _diskProvider.GetMount(p.Value))
+                .Where(m => m is { MountOptions.IsReadOnly: true })
+                .DistinctBy(m => m.RootDirectory)
+                .ToList();
 
             if (mounts.Any())
             {

src/NzbDrone.Core/HealthCheck/Checks/PTPOldSettingsCheck.cs

@@ -18,10 +18,12 @@ namespace NzbDrone.Core.HealthCheck.Checks
 
         public override HealthCheck Check()
         {
-            var ptpIndexers = _indexerFactory.All().Where(i => i.Settings.GetType() == typeof(PassThePopcornSettings));
+            var ptpIndexers = _indexerFactory.All()
+                .Where(i => i.Settings.GetType() == typeof(PassThePopcornSettings));
 
             var ptpIndexerOldSettings = ptpIndexers
-                .Where(i => (i.Settings as PassThePopcornSettings).APIUser.IsNullOrWhiteSpace()).Select(i => i.Name);
+                .Where(i => ((PassThePopcornSettings)i.Settings).APIUser.IsNullOrWhiteSpace()).Select(i => i.Name)
+                .ToList();
 
             if (ptpIndexerOldSettings.Any())
             {

src/NzbDrone.Core/HealthCheck/Checks/ProxyCheck.cs

@@ -31,35 +31,38 @@ namespace NzbDrone.Core.HealthCheck.Checks
 
         public override HealthCheck Check()
         {
-            if (_configService.ProxyEnabled)
+            if (!_configService.ProxyEnabled)
             {
-                var addresses = Dns.GetHostAddresses(_configService.ProxyHostname);
-                if (!addresses.Any())
-                {
-                    return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("ProxyCheckResolveIpMessage"), _configService.ProxyHostname), "#proxy-failed-resolve-ip");
-                }
+                return new HealthCheck(GetType());
+            }
 
-                var request = _cloudRequestBuilder.Create()
-                                                  .Resource("/ping")
-                                                  .Build();
+            var addresses = Dns.GetHostAddresses(_configService.ProxyHostname);
 
-                try
-                {
-                    var response = _client.Execute(request);
+            if (!addresses.Any())
+            {
+                return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("ProxyCheckResolveIpMessage"), _configService.ProxyHostname), "#proxy-failed-resolve-ip");
+            }
 
-                    // We only care about 400 responses, other error codes can be ignored
-                    if (response.StatusCode == HttpStatusCode.BadRequest)
-                    {
-                        _logger.Error("Proxy Health Check failed: {0}", response.StatusCode);
-                        return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("ProxyCheckBadRequestMessage"), response.StatusCode), "#proxy-failed-test");
-                    }
-                }
-                catch (Exception ex)
+            var request = _cloudRequestBuilder.Create()
+                .Resource("/ping")
+                .Build();
+
+            try
+            {
+                var response = _client.Execute(request);
+
+                // We only care about 400 responses, other error codes can be ignored
+                if (response.StatusCode == HttpStatusCode.BadRequest)
                 {
-                    _logger.Error(ex, "Proxy Health Check failed");
-                    return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("ProxyCheckFailedToTestMessage"), request.Url), "#proxy-failed-test");
+                    _logger.Error("Proxy Health Check failed: {0}", response.StatusCode);
+                    return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("ProxyCheckBadRequestMessage"), response.StatusCode), "#proxy-failed-test");
                 }
             }
+            catch (Exception ex)
+            {
+                _logger.Error(ex, "Proxy Health Check failed");
+                return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("ProxyCheckFailedToTestMessage"), request.Url), "#proxy-failed-test");
+            }
 
             return new HealthCheck(GetType());
         }

src/NzbDrone.Core/HealthCheck/Checks/RemotePathMappingCheck.cs

@@ -62,6 +62,7 @@ namespace NzbDrone.Core.HealthCheck.Checks
                 {
                     var status = client.GetStatus();
                     var folders = status.OutputRootFolders;
+
                     foreach (var folder in folders)
                     {
                         if (!folder.IsValid)
@@ -70,14 +71,13 @@ namespace NzbDrone.Core.HealthCheck.Checks
                             {
                                 return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckWrongOSPath"), client.Definition.Name, folder.FullPath, _osInfo.Name), "#bad-remote-path-mapping");
                             }
-                            else if (_osInfo.IsDocker)
+
+                            if (_osInfo.IsDocker)
                             {
                                 return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckBadDockerPath"), client.Definition.Name, folder.FullPath, _osInfo.Name), "#docker-bad-remote-path-mapping");
                             }
-                            else
-                            {
-                                return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckLocalWrongOSPath"), client.Definition.Name, folder.FullPath, _osInfo.Name), "#bad-download-client-settings");
-                            }
+
+                            return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckLocalWrongOSPath"), client.Definition.Name, folder.FullPath, _osInfo.Name), "#bad-download-client-settings");
                         }
 
                         if (!_diskProvider.FolderExists(folder.FullPath))
@@ -86,14 +86,13 @@ namespace NzbDrone.Core.HealthCheck.Checks
                             {
                                 return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckDockerFolderMissing"), client.Definition.Name, folder.FullPath), "#docker-bad-remote-path-mapping");
                             }
-                            else if (!status.IsLocalhost)
+
+                            if (!status.IsLocalhost)
                             {
                                 return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckLocalFolderMissing"), client.Definition.Name, folder.FullPath), "#bad-remote-path-mapping");
                             }
-                            else
-                            {
-                                return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckGenericPermissions"), client.Definition.Name, folder.FullPath), "#permissions-error");
-                            }
+
+                            return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckGenericPermissions"), client.Definition.Name, folder.FullPath), "#permissions-error");
                         }
                     }
                 }
@@ -122,24 +121,21 @@ namespace NzbDrone.Core.HealthCheck.Checks
                 return new HealthCheck(GetType());
             }
 
-            if (typeof(MovieImportFailedEvent).IsAssignableFrom(message.GetType()))
+            if (message is MovieImportFailedEvent failureMessage)
             {
-                var failureMessage = (MovieImportFailedEvent)message;
-
                 // if we can see the file exists but the import failed then likely a permissions issue
                 if (failureMessage.MovieInfo != null)
                 {
                     var moviePath = failureMessage.MovieInfo.Path;
+
                     if (_diskProvider.FileExists(moviePath))
                     {
                         return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckDownloadPermissions"), moviePath), "#permissions-error");
                     }
-                    else
-                    {
-                        // If the file doesn't exist but MovieInfo is not null then the message is coming from
-                        // ImportApprovedMovies and the file must have been removed part way through processing
-                        return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckFileRemoved"), moviePath), "#remote-path-file-removed");
-                    }
+
+                    // If the file doesn't exist but MovieInfo is not null then the message is coming from
+                    // ImportApprovedMovies and the file must have been removed part way through processing
+                    return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckFileRemoved"), moviePath), "#remote-path-file-removed");
                 }
 
                 // If the previous case did not match then the failure occured in DownloadedMovieImportService,
@@ -170,14 +166,13 @@ namespace NzbDrone.Core.HealthCheck.Checks
                         {
                             return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckFilesWrongOSPath"), client.Definition.Name, dlpath, _osInfo.Name), "#bad-remote-path-mapping");
                         }
-                        else if (_osInfo.IsDocker)
+
+                        if (_osInfo.IsDocker)
                         {
                             return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckFilesBadDockerPath"), client.Definition.Name, dlpath, _osInfo.Name), "#docker-bad-remote-path-mapping");
                         }
-                        else
-                        {
-                            return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckFilesLocalWrongOSPath"), client.Definition.Name, dlpath, _osInfo.Name), "#bad-download-client-settings");
-                        }
+
+                        return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckFilesLocalWrongOSPath"), client.Definition.Name, dlpath, _osInfo.Name), "#bad-download-client-settings");
                     }
 
                     if (_diskProvider.FolderExists(dlpath))
@@ -190,15 +185,14 @@ namespace NzbDrone.Core.HealthCheck.Checks
                     {
                         return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckFolderPermissions"), client.Definition.Name, dlpath), "#docker-bad-remote-path-mapping");
                     }
-                    else if (!status.IsLocalhost)
+
+                    if (!status.IsLocalhost)
                     {
                         return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckRemoteDownloadClient"), client.Definition.Name, dlpath), "#bad-remote-path-mapping");
                     }
-                    else
-                    {
-                        // path mappings shouldn't be needed locally so probably a permissions issue
-                        return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckFilesGenericPermissions"), client.Definition.Name, dlpath), "#permissions-error");
-                    }
+
+                    // path mappings shouldn't be needed locally so probably a permissions issue
+                    return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckFilesGenericPermissions"), client.Definition.Name, dlpath), "#permissions-error");
                 }
                 catch (DownloadClientException ex)
                 {
@@ -215,10 +209,8 @@ namespace NzbDrone.Core.HealthCheck.Checks
 
                 return new HealthCheck(GetType());
             }
-            else
-            {
-                return Check();
-            }
+
+            return Check();
         }
     }
 }

src/NzbDrone.Core/HealthCheck/Checks/RootFolderCheck.cs

@@ -29,11 +29,11 @@ namespace NzbDrone.Core.HealthCheck.Checks
         public override HealthCheck Check()
         {
             var rootFolders = _movieService.AllMoviePaths()
-                                                           .Select(s => _rootFolderService.GetBestRootFolderPath(s.Value))
-                                                           .Distinct();
+                .Select(s => _rootFolderService.GetBestRootFolderPath(s.Value))
+                .Distinct();
 
             var missingRootFolders = rootFolders.Where(s => !_diskProvider.FolderExists(s))
-                                                          .ToList();
+                .ToList();
 
             if (missingRootFolders.Any())
             {

src/NzbDrone.Core/HealthCheck/Checks/SlackUrlCheck.cs

@@ -22,7 +22,9 @@ namespace NzbDrone.Core.HealthCheck.Checks
 
         public override HealthCheck Check()
         {
-            var discordSlackNotifications = _notificationFactory.GetAvailableProviders().Where(n => n.ConfigContract.Equals("SlackSettings") && (n.Definition.Settings as SlackSettings).WebHookUrl.Contains("discord"));
+            var discordSlackNotifications = _notificationFactory.GetAvailableProviders()
+                .Where(n => n.ConfigContract.Equals("SlackSettings") && ((SlackSettings)n.Definition.Settings).WebHookUrl.Contains("discord"))
+                .ToList();
 
             if (discordSlackNotifications.Empty())
             {
@@ -31,8 +33,7 @@ namespace NzbDrone.Core.HealthCheck.Checks
 
             return new HealthCheck(GetType(),
                 HealthCheckResult.Warning,
-                string.Format(_localizationService.GetLocalizedString("DiscordUrlInSlackNotification"),
-                    string.Join(", ", discordSlackNotifications.Select(n => n.Name))),
+                string.Format(_localizationService.GetLocalizedString("DiscordUrlInSlackNotification"), string.Join(", ", discordSlackNotifications.Select(n => n.Name))),
                 "#discord-as-slack-notification");
         }
     }

src/NzbDrone.Core/HealthCheck/Checks/SystemTimeCheck.cs

@@ -24,8 +24,8 @@ namespace NzbDrone.Core.HealthCheck.Checks
         public override HealthCheck Check()
         {
             var request = _cloudRequestBuilder.Create()
-                                              .Resource("/time")
-                                              .Build();
+                .Resource("/time")
+                .Build();
 
             var response = _client.Execute(request);
             var result = Json.Deserialize<ServiceTimeResponse>(response.Content);

src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupAbsolutePathMetadataFiles.cs

@@ -14,34 +14,32 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
 
         public void Clean()
         {
-            using (var mapper = _database.OpenConnection())
+            using var mapper = _database.OpenConnection();
+            if (_database.DatabaseType == DatabaseType.PostgreSQL)
             {
-                if (_database.DatabaseType == DatabaseType.PostgreSQL)
-                {
-                    mapper.Execute(@"DELETE FROM ""MetadataFiles""
-                                     WHERE ""Id"" = ANY (
-                                         SELECT ""Id"" FROM ""MetadataFiles""
-                                         WHERE ""RelativePath""
-                                         LIKE '_:\\%'
-                                         OR ""RelativePath""
-                                         LIKE '\\%'
-                                         OR ""RelativePath""
-                                         LIKE '/%'
-                                     )");
-                }
-                else
-                {
-                    mapper.Execute(@"DELETE FROM ""MetadataFiles""
-                                     WHERE ""Id"" IN (
-                                         SELECT ""Id"" FROM ""MetadataFiles""
-                                         WHERE ""RelativePath""
-                                         LIKE '_:\%'
-                                         OR ""RelativePath""
-                                         LIKE '\%'
-                                         OR ""RelativePath""
-                                         LIKE '/%'
-                                     )");
-                }
+                mapper.Execute(@"DELETE FROM ""MetadataFiles""
+                                 WHERE ""Id"" = ANY (
+                                     SELECT ""Id"" FROM ""MetadataFiles""
+                                     WHERE ""RelativePath""
+                                     LIKE '_:\\%'
+                                     OR ""RelativePath""
+                                     LIKE '\\%'
+                                     OR ""RelativePath""
+                                     LIKE '/%'
+                                 )");
+            }
+            else
+            {
+                mapper.Execute(@"DELETE FROM ""MetadataFiles""
+                                 WHERE ""Id"" IN (
+                                     SELECT ""Id"" FROM ""MetadataFiles""
+                                     WHERE ""RelativePath""
+                                     LIKE '_:\%'
+                                     OR ""RelativePath""
+                                     LIKE '\%'
+                                     OR ""RelativePath""
+                                     LIKE '/%'
+                                 )");
             }
         }
     }

src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupAdditionalNamingSpecs.cs

@@ -14,13 +14,11 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
 
         public void Clean()
         {
-            using (var mapper = _database.OpenConnection())
-            {
-                mapper.Execute(@"DELETE FROM ""NamingConfig""
-                                     WHERE ""Id"" NOT IN (
-                                     SELECT ""Id"" FROM ""NamingConfig""
-                                     LIMIT 1)");
-            }
+            using var mapper = _database.OpenConnection();
+            mapper.Execute(@"DELETE FROM ""NamingConfig""
+                             WHERE ""Id"" NOT IN (
+                             SELECT ""Id"" FROM ""NamingConfig""
+                             LIMIT 1)");
         }
     }
 }

src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupAdditionalUsers.cs

@@ -14,13 +14,11 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
 
         public void Clean()
         {
-            using (var mapper = _database.OpenConnection())
-            {
-                mapper.Execute(@"DELETE FROM ""Users""
-                                 WHERE ""Id"" NOT IN (
-                                 SELECT ""Id"" FROM ""Users""
-                                 LIMIT 1)");
-            }
+            using var mapper = _database.OpenConnection();
+            mapper.Execute(@"DELETE FROM ""Users""
+                             WHERE ""Id"" NOT IN (
+                             SELECT ""Id"" FROM ""Users""
+                             LIMIT 1)");
         }
     }
 }

src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupDownloadClientUnavailablePendingReleases.cs

@@ -16,30 +16,28 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
 
         public void Clean()
         {
-            using (var mapper = _database.OpenConnection())
+            using var mapper = _database.OpenConnection();
+            if (_database.DatabaseType == DatabaseType.PostgreSQL)
             {
-                if (_database.DatabaseType == DatabaseType.PostgreSQL)
-                {
-                    mapper.Execute(@"DELETE FROM ""PendingReleases""
+                mapper.Execute(@"DELETE FROM ""PendingReleases""
                                 WHERE ""Added"" < @TwoWeeksAgo
                                 AND ""Reason"" = ANY (@Reasons)",
-                              new
-                              {
-                                  TwoWeeksAgo = DateTime.UtcNow.AddDays(-14),
-                                  Reasons = new[] { (int)PendingReleaseReason.DownloadClientUnavailable, (int)PendingReleaseReason.Fallback }
-                              });
-                }
-                else
-                {
+                    new
+                    {
+                        TwoWeeksAgo = DateTime.UtcNow.AddDays(-14),
+                        Reasons = new[] { (int)PendingReleaseReason.DownloadClientUnavailable, (int)PendingReleaseReason.Fallback }
+                    });
+            }
+            else
+            {
                 mapper.Execute(@"DELETE FROM ""PendingReleases""
                                 WHERE ""Added"" < @TwoWeeksAgo
                                 AND ""REASON"" IN @Reasons",
-                              new
-                              {
-                                  TwoWeeksAgo = DateTime.UtcNow.AddDays(-14),
-                                  Reasons = new[] { (int)PendingReleaseReason.DownloadClientUnavailable, (int)PendingReleaseReason.Fallback }
-                              });
-                }
+                    new
+                    {
+                        TwoWeeksAgo = DateTime.UtcNow.AddDays(-14),
+                        Reasons = new[] { (int)PendingReleaseReason.DownloadClientUnavailable, (int)PendingReleaseReason.Fallback }
+                    });
             }
         }
     }

src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupDuplicateMetadataFiles.cs

@@ -20,30 +20,26 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
 
         private void DeleteDuplicateMovieMetadata()
         {
-            using (var mapper = _database.OpenConnection())
-            {
-                mapper.Execute(@"DELETE FROM ""MetadataFiles""
-                                     WHERE ""Id"" IN (
-                                         SELECT MIN(""Id"") FROM ""MetadataFiles""
-                                         WHERE ""Type"" = 1
-                                         GROUP BY ""MovieId"", ""Consumer""
-                                         HAVING COUNT(""MovieId"") > 1
-                                     )");
-            }
+            using var mapper = _database.OpenConnection();
+            mapper.Execute(@"DELETE FROM ""MetadataFiles""
+                             WHERE ""Id"" IN (
+                                 SELECT MIN(""Id"") FROM ""MetadataFiles""
+                                 WHERE ""Type"" = 1
+                                 GROUP BY ""MovieId"", ""Consumer""
+                                 HAVING COUNT(""MovieId"") > 1
+                             )");
         }
 
         private void DeleteDuplicateMovieFileMetadata()
         {
-            using (var mapper = _database.OpenConnection())
-            {
-                mapper.Execute(@"DELETE FROM ""MetadataFiles""
-                                     WHERE ""Id"" IN (
-                                         SELECT MIN(""Id"") FROM ""MetadataFiles""
-                                         WHERE ""Type"" = 1
-                                         GROUP BY ""MovieFileId"", ""Consumer""
-                                         HAVING COUNT(""MovieFileId"") > 1
-                                     )");
-            }
+            using var mapper = _database.OpenConnection();
+            mapper.Execute(@"DELETE FROM ""MetadataFiles""
+                             WHERE ""Id"" IN (
+                                 SELECT MIN(""Id"") FROM ""MetadataFiles""
+                                 WHERE ""Type"" = 1
+                                 GROUP BY ""MovieFileId"", ""Consumer""
+                                 HAVING COUNT(""MovieFileId"") > 1
+                             )");
         }
     }
 }

src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedAlternativeTitles.cs

@@ -14,15 +14,13 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
 
         public void Clean()
         {
-            using (var mapper = _database.OpenConnection())
-            {
-                mapper.Execute(@"DELETE FROM ""AlternativeTitles""
-                                     WHERE ""Id"" IN (
-                                     SELECT ""AlternativeTitles"".""Id"" FROM ""AlternativeTitles""
-                                     LEFT OUTER JOIN ""MovieMetadata""
-                                     ON ""AlternativeTitles"".""MovieMetadataId"" = ""MovieMetadata"".""Id""
-                                     WHERE ""MovieMetadata"".""Id"" IS NULL)");
-            }
+            using var mapper = _database.OpenConnection();
+            mapper.Execute(@"DELETE FROM ""AlternativeTitles""
+                             WHERE ""Id"" IN (
+                             SELECT ""AlternativeTitles"".""Id"" FROM ""AlternativeTitles""
+                             LEFT OUTER JOIN ""MovieMetadata""
+                             ON ""AlternativeTitles"".""MovieMetadataId"" = ""MovieMetadata"".""Id""
+                             WHERE ""MovieMetadata"".""Id"" IS NULL)");
         }
     }
 }

src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedBlocklist.cs

@@ -14,15 +14,13 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
 
         public void Clean()
         {
-            using (var mapper = _database.OpenConnection())
-            {
-                mapper.Execute(@"DELETE FROM ""Blocklist""
-                                     WHERE ""Id"" IN (
-                                     SELECT ""Blocklist"".""Id"" FROM ""Blocklist""
-                                     LEFT OUTER JOIN ""Movies""
-                                     ON ""Blocklist"".""MovieId"" = ""Movies"".""Id""
-                                     WHERE ""Movies"".""Id"" IS NULL)");
-            }
+            using var mapper = _database.OpenConnection();
+            mapper.Execute(@"DELETE FROM ""Blocklist""
+                             WHERE ""Id"" IN (
+                             SELECT ""Blocklist"".""Id"" FROM ""Blocklist""
+                             LEFT OUTER JOIN ""Movies""
+                             ON ""Blocklist"".""MovieId"" = ""Movies"".""Id""
+                             WHERE ""Movies"".""Id"" IS NULL)");
         }
     }
 }

src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedCollections.cs

@@ -14,13 +14,11 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
 
         public void Clean()
         {
-            using (var mapper = _database.OpenConnection())
-            {
-                mapper.Execute(@"DELETE FROM ""Collections"" WHERE ""TmdbId"" IN (SELECT ""X"".""TmdbId"" FROM (SELECT ""Collections"".""TmdbId"", COUNT(""Movies"".""Id"") as ""MovieCount"" FROM ""Collections"" 
-                                 LEFT OUTER JOIN ""MovieMetadata"" ON ""Collections"".""TmdbId"" = ""MovieMetadata"".""CollectionTmdbId""
-                                 LEFT OUTER JOIN ""Movies"" ON ""Movies"".""MovieMetadataId"" = ""MovieMetadata"".""Id""
-                                 GROUP BY ""Collections"".""Id"") AS ""X"" WHERE ""X"".""MovieCount"" = 0)");
-            }
+            using var mapper = _database.OpenConnection();
+            mapper.Execute(@"DELETE FROM ""Collections"" WHERE ""TmdbId"" IN (SELECT ""X"".""TmdbId"" FROM (SELECT ""Collections"".""TmdbId"", COUNT(""Movies"".""Id"") as ""MovieCount"" FROM ""Collections""
+                             LEFT OUTER JOIN ""MovieMetadata"" ON ""Collections"".""TmdbId"" = ""MovieMetadata"".""CollectionTmdbId""
+                             LEFT OUTER JOIN ""Movies"" ON ""Movies"".""MovieMetadataId"" = ""MovieMetadata"".""Id""
+                             GROUP BY ""Collections"".""Id"") AS ""X"" WHERE ""X"".""MovieCount"" = 0)");
         }
     }
 }

src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedCredits.cs

@@ -14,15 +14,13 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
 
         public void Clean()
         {
-            using (var mapper = _database.OpenConnection())
-            {
-                mapper.Execute(@"DELETE FROM ""Credits""
-                                     WHERE ""Id"" IN (
-                                     SELECT ""Credits"".""Id"" FROM ""Credits""
-                                     LEFT OUTER JOIN ""MovieMetadata""
-                                     ON ""Credits"".""MovieMetadataId"" = ""MovieMetadata"".""Id""
-                                     WHERE ""MovieMetadata"".""Id"" IS NULL)");
-            }
+            using var mapper = _database.OpenConnection();
+            mapper.Execute(@"DELETE FROM ""Credits""
+                             WHERE ""Id"" IN (
+                             SELECT ""Credits"".""Id"" FROM ""Credits""
+                             LEFT OUTER JOIN ""MovieMetadata""
+                             ON ""Credits"".""MovieMetadataId"" = ""MovieMetadata"".""Id""
+                             WHERE ""MovieMetadata"".""Id"" IS NULL)");
         }
     }
 }

src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedDownloadClientStatus.cs

@@ -14,15 +14,13 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
 
         public void Clean()
         {
-            using (var mapper = _database.OpenConnection())
-            {
-                mapper.Execute(@"DELETE FROM ""DownloadClientStatus""
-                                         WHERE ""Id"" IN (
-                                         SELECT ""DownloadClientStatus"".""Id"" FROM ""DownloadClientStatus""
-                                         LEFT OUTER JOIN ""DownloadClients""
-                                         ON ""DownloadClientStatus"".""ProviderId"" = ""DownloadClients"".""Id""
-                                         WHERE ""DownloadClients"".""Id"" IS NULL)");
-            }
+            using var mapper = _database.OpenConnection();
+            mapper.Execute(@"DELETE FROM ""DownloadClientStatus""
+                             WHERE ""Id"" IN (
+                             SELECT ""DownloadClientStatus"".""Id"" FROM ""DownloadClientStatus""
+                             LEFT OUTER JOIN ""DownloadClients""
+                             ON ""DownloadClientStatus"".""ProviderId"" = ""DownloadClients"".""Id""
+                             WHERE ""DownloadClients"".""Id"" IS NULL)");
         }
     }
 }

src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedExtraFiles.cs

@@ -20,29 +20,25 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
 
         private void DeleteOrphanedByMovie()
         {
-            using (var mapper = _database.OpenConnection())
-            {
-                mapper.Execute(@"DELETE FROM ""ExtraFiles""
-                                     WHERE ""Id"" IN (
-                                     SELECT ""ExtraFiles"".""Id"" FROM ""ExtraFiles""
-                                     LEFT OUTER JOIN ""Movies""
-                                     ON ""ExtraFiles"".""MovieId"" = ""Movies"".""Id""
-                                     WHERE ""Movies"".""Id"" IS NULL)");
-            }
+            using var mapper = _database.OpenConnection();
+            mapper.Execute(@"DELETE FROM ""ExtraFiles""
+                             WHERE ""Id"" IN (
+                             SELECT ""ExtraFiles"".""Id"" FROM ""ExtraFiles""
+                             LEFT OUTER JOIN ""Movies""
+                             ON ""ExtraFiles"".""MovieId"" = ""Movies"".""Id""
+                             WHERE ""Movies"".""Id"" IS NULL)");
         }
 
         private void DeleteOrphanedByMovieFile()
         {
-            using (var mapper = _database.OpenConnection())
-            {
-                mapper.Execute(@"DELETE FROM ""ExtraFiles""
-                                     WHERE ""Id"" IN (
-                                     SELECT ""ExtraFiles"".""Id"" FROM ""ExtraFiles""
-                                     LEFT OUTER JOIN ""MovieFiles""
-                                     ON ""ExtraFiles"".""MovieFileId"" = ""MovieFiles"".""Id""
-                                     WHERE ""ExtraFiles"".""MovieFileId"" > 0
-                                     AND ""MovieFiles"".""Id"" IS NULL)");
-            }
+            using var mapper = _database.OpenConnection();
+            mapper.Execute(@"DELETE FROM ""ExtraFiles""
+                             WHERE ""Id"" IN (
+                             SELECT ""ExtraFiles"".""Id"" FROM ""ExtraFiles""
+                             LEFT OUTER JOIN ""MovieFiles""
+                             ON ""ExtraFiles"".""MovieFileId"" = ""MovieFiles"".""Id""
+                             WHERE ""ExtraFiles"".""MovieFileId"" > 0
+                             AND ""MovieFiles"".""Id"" IS NULL)");
         }
     }
 }

src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedHistoryItems.cs

@@ -19,15 +19,13 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
 
         private void CleanupOrphanedByMovie()
         {
-            using (var mapper = _database.OpenConnection())
-            {
-                mapper.Execute(@"DELETE FROM ""History""
-                                     WHERE ""Id"" IN (
-                                     SELECT ""History"".""Id"" FROM ""History""
-                                     LEFT OUTER JOIN ""Movies""
-                                     ON ""History"".""MovieId"" = ""Movies"".""Id""
-                                     WHERE ""Movies"".""Id"" IS NULL)");
-            }
+            using var mapper = _database.OpenConnection();
+            mapper.Execute(@"DELETE FROM ""History""
+                             WHERE ""Id"" IN (
+                             SELECT ""History"".""Id"" FROM ""History""
+                             LEFT OUTER JOIN ""Movies""
+                             ON ""History"".""MovieId"" = ""Movies"".""Id""
+                             WHERE ""Movies"".""Id"" IS NULL)");
         }
     }
 }

src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedIndexerStatus.cs

@@ -14,15 +14,13 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
 
         public void Clean()
         {
-            using (var mapper = _database.OpenConnection())
-            {
-                mapper.Execute(@"DELETE FROM ""IndexerStatus""
-                                     WHERE ""Id"" IN (
-                                     SELECT ""IndexerStatus"".""Id"" FROM ""IndexerStatus""
-                                     LEFT OUTER JOIN ""Indexers""
-                                     ON ""IndexerStatus"".""ProviderId"" = ""Indexers"".""Id""
-                                     WHERE ""Indexers"".""Id"" IS NULL)");
-            }
+            using var mapper = _database.OpenConnection();
+            mapper.Execute(@"DELETE FROM ""IndexerStatus""
+                             WHERE ""Id"" IN (
+                             SELECT ""IndexerStatus"".""Id"" FROM ""IndexerStatus""
+                             LEFT OUTER JOIN ""Indexers""
+                             ON ""IndexerStatus"".""ProviderId"" = ""Indexers"".""Id""
+                             WHERE ""Indexers"".""Id"" IS NULL)");
         }
     }
 }

src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedMetadataFiles.cs

@@ -21,41 +21,35 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
 
         private void DeleteOrphanedByMovie()
         {
-            using (var mapper = _database.OpenConnection())
-            {
-                mapper.Execute(@"DELETE FROM ""MetadataFiles""
-                                     WHERE ""Id"" IN (
-                                     SELECT ""MetadataFiles"".""Id"" FROM ""MetadataFiles""
-                                     LEFT OUTER JOIN ""Movies""
-                                     ON ""MetadataFiles"".""MovieId"" = ""Movies"".""Id""
-                                     WHERE ""Movies"".""Id"" IS NULL)");
-            }
+            using var mapper = _database.OpenConnection();
+            mapper.Execute(@"DELETE FROM ""MetadataFiles""
+                             WHERE ""Id"" IN (
+                             SELECT ""MetadataFiles"".""Id"" FROM ""MetadataFiles""
+                             LEFT OUTER JOIN ""Movies""
+                             ON ""MetadataFiles"".""MovieId"" = ""Movies"".""Id""
+                             WHERE ""Movies"".""Id"" IS NULL)");
         }
 
         private void DeleteOrphanedByMovieFile()
         {
-            using (var mapper = _database.OpenConnection())
-            {
-                mapper.Execute(@"DELETE FROM ""MetadataFiles""
-                                     WHERE ""Id"" IN (
-                                     SELECT ""MetadataFiles"".""Id"" FROM ""MetadataFiles""
-                                     LEFT OUTER JOIN ""MovieFiles""
-                                     ON ""MetadataFiles"".""MovieFileId"" = ""MovieFiles"".""Id""
-                                     WHERE ""MetadataFiles"".""MovieFileId"" > 0
-                                     AND ""MovieFiles"".""Id"" IS NULL)");
-            }
+            using var mapper = _database.OpenConnection();
+            mapper.Execute(@"DELETE FROM ""MetadataFiles""
+                             WHERE ""Id"" IN (
+                             SELECT ""MetadataFiles"".""Id"" FROM ""MetadataFiles""
+                             LEFT OUTER JOIN ""MovieFiles""
+                             ON ""MetadataFiles"".""MovieFileId"" = ""MovieFiles"".""Id""
+                             WHERE ""MetadataFiles"".""MovieFileId"" > 0
+                             AND ""MovieFiles"".""Id"" IS NULL)");
         }
 
         private void DeleteWhereMovieFileIsZero()
         {
-            using (var mapper = _database.OpenConnection())
-            {
-                mapper.Execute(@"DELETE FROM ""MetadataFiles""
-                                     WHERE ""Id"" IN (
-                                     SELECT ""Id"" FROM ""MetadataFiles""
-                                     WHERE ""Type"" IN (1, 2)
-                                     AND ""MovieFileId"" = 0)");
-            }
+            using var mapper = _database.OpenConnection();
+            mapper.Execute(@"DELETE FROM ""MetadataFiles""
+                             WHERE ""Id"" IN (
+                             SELECT ""Id"" FROM ""MetadataFiles""
+                             WHERE ""Type"" IN (1, 2)
+                             AND ""MovieFileId"" = 0)");
         }
     }
 }

src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedMovieFiles.cs

@@ -14,15 +14,13 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
 
         public void Clean()
         {
-            using (var mapper = _database.OpenConnection())
-            {
-                mapper.Execute(@"DELETE FROM ""MovieFiles""
-                                 WHERE ""Id"" IN (
-                                 SELECT ""MovieFiles"".""Id"" FROM ""MovieFiles""
-                                 LEFT OUTER JOIN ""Movies""
-                                 ON ""MovieFiles"".""Id"" = ""Movies"".""MovieFileId""
-                                 WHERE ""Movies"".""Id"" IS NULL)");
-            }
+            using var mapper = _database.OpenConnection();
+            mapper.Execute(@"DELETE FROM ""MovieFiles""
+                             WHERE ""Id"" IN (
+                             SELECT ""MovieFiles"".""Id"" FROM ""MovieFiles""
+                             LEFT OUTER JOIN ""Movies""
+                             ON ""MovieFiles"".""Id"" = ""Movies"".""MovieFileId""
+                             WHERE ""Movies"".""Id"" IS NULL)");
         }
     }
 }

src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedMovieMetadata.cs

@@ -14,16 +14,14 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
 
         public void Clean()
         {
-            using (var mapper = _database.OpenConnection())
-            {
-                mapper.Execute(@"DELETE FROM ""MovieMetadata""
-                                     WHERE ""Id"" IN (
-                                     SELECT ""MovieMetadata"".""Id"" FROM ""MovieMetadata""
-                                     LEFT OUTER JOIN ""Movies"" ON ""Movies"".""MovieMetadataId"" = ""MovieMetadata"".""Id""
-                                     LEFT OUTER JOIN ""Collections"" ON ""Collections"".""TmdbId"" = ""MovieMetadata"".""CollectionTmdbId""
-                                     LEFT OUTER JOIN ""ImportListMovies"" ON ""ImportListMovies"".""MovieMetadataId"" = ""MovieMetadata"".""Id""
-                                     WHERE ""Movies"".""Id"" IS NULL AND ""ImportListMovies"".""Id"" IS NULL AND ""Collections"".""Id"" IS NULL)");
-            }
+            using var mapper = _database.OpenConnection();
+            mapper.Execute(@"DELETE FROM ""MovieMetadata""
+                             WHERE ""Id"" IN (
+                             SELECT ""MovieMetadata"".""Id"" FROM ""MovieMetadata""
+                             LEFT OUTER JOIN ""Movies"" ON ""Movies"".""MovieMetadataId"" = ""MovieMetadata"".""Id""
+                             LEFT OUTER JOIN ""Collections"" ON ""Collections"".""TmdbId"" = ""MovieMetadata"".""CollectionTmdbId""
+                             LEFT OUTER JOIN ""ImportListMovies"" ON ""ImportListMovies"".""MovieMetadataId"" = ""MovieMetadata"".""Id""
+                             WHERE ""Movies"".""Id"" IS NULL AND ""ImportListMovies"".""Id"" IS NULL AND ""Collections"".""Id"" IS NULL)");
         }
     }
 }

src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedMovieMovieFileIds.cs

@@ -14,16 +14,14 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
 
         public void Clean()
         {
-            using (var mapper = _database.OpenConnection())
-            {
-                mapper.Execute(@"UPDATE ""Movies""
-                                 SET ""MovieFileId"" = 0
-                                 WHERE ""Id"" IN (
-                                 SELECT ""Movies"".""Id"" FROM ""Movies""
-                                 LEFT OUTER JOIN ""MovieFiles""
-                                 ON ""Movies"".""MovieFileId"" = ""MovieFiles"".""Id""
-                                 WHERE ""MovieFiles"".""Id"" IS NULL)");
-            }
+            using var mapper = _database.OpenConnection();
+            mapper.Execute(@"UPDATE ""Movies""
+                             SET ""MovieFileId"" = 0
+                             WHERE ""Id"" IN (
+                             SELECT ""Movies"".""Id"" FROM ""Movies""
+                             LEFT OUTER JOIN ""MovieFiles""
+                             ON ""Movies"".""MovieFileId"" = ""MovieFiles"".""Id""
+                             WHERE ""MovieFiles"".""Id"" IS NULL)");
         }
     }
 }

src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedMovieTranslations.cs

@@ -14,15 +14,13 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
 
         public void Clean()
         {
-            using (var mapper = _database.OpenConnection())
-            {
-                mapper.Execute(@"DELETE FROM ""MovieTranslations""
-                                     WHERE ""Id"" IN (
-                                     SELECT ""MovieTranslations"".""Id"" FROM ""MovieTranslations""
-                                     LEFT OUTER JOIN ""MovieMetadata""
-                                     ON ""MovieTranslations"".""MovieMetadataId"" = ""MovieMetadata"".""Id""
-                                     WHERE ""MovieMetadata"".""Id"" IS NULL)");
-            }
+            using var mapper = _database.OpenConnection();
+            mapper.Execute(@"DELETE FROM ""MovieTranslations""
+                             WHERE ""Id"" IN (
+                             SELECT ""MovieTranslations"".""Id"" FROM ""MovieTranslations""
+                             LEFT OUTER JOIN ""MovieMetadata""
+                             ON ""MovieTranslations"".""MovieMetadataId"" = ""MovieMetadata"".""Id""
+                             WHERE ""MovieMetadata"".""Id"" IS NULL)");
         }
     }
 }

src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedPendingReleases.cs

@@ -14,15 +14,13 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
 
         public void Clean()
         {
-            using (var mapper = _database.OpenConnection())
-            {
-                mapper.Execute(@"DELETE FROM ""PendingReleases""
-                                 WHERE ""Id"" IN (
-                                 SELECT ""PendingReleases"".""Id"" FROM ""PendingReleases""
-                                 LEFT OUTER JOIN ""Movies""
-                                 ON ""PendingReleases"".""MovieId"" = ""Movies"".""Id""
-                                 WHERE ""Movies"".""Id"" IS NULL)");
-            }
+            using var mapper = _database.OpenConnection();
+            mapper.Execute(@"DELETE FROM ""PendingReleases""
+                             WHERE ""Id"" IN (
+                             SELECT ""PendingReleases"".""Id"" FROM ""PendingReleases""
+                             LEFT OUTER JOIN ""Movies""
+                             ON ""PendingReleases"".""MovieId"" = ""Movies"".""Id""
+                             WHERE ""Movies"".""Id"" IS NULL)");
         }
     }
 }

src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedSubtitleFiles.cs

@@ -20,29 +20,25 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
 
         private void DeleteOrphanedByMovie()
         {
-            using (var mapper = _database.OpenConnection())
-            {
-                mapper.Execute(@"DELETE FROM ""SubtitleFiles""
-                                     WHERE ""Id"" IN (
-                                     SELECT ""SubtitleFiles"".""Id"" FROM ""SubtitleFiles""
-                                     LEFT OUTER JOIN ""Movies""
-                                     ON ""SubtitleFiles"".""MovieId"" = ""Movies"".""Id""
-                                     WHERE ""Movies"".""Id"" IS NULL)");
-            }
+            using var mapper = _database.OpenConnection();
+            mapper.Execute(@"DELETE FROM ""SubtitleFiles""
+                             WHERE ""Id"" IN (
+                             SELECT ""SubtitleFiles"".""Id"" FROM ""SubtitleFiles""
+                             LEFT OUTER JOIN ""Movies""
+                             ON ""SubtitleFiles"".""MovieId"" = ""Movies"".""Id""
+                             WHERE ""Movies"".""Id"" IS NULL)");
         }
 
         private void DeleteOrphanedByMovieFile()
         {
-            using (var mapper = _database.OpenConnection())
-            {
-                mapper.Execute(@"DELETE FROM ""SubtitleFiles""
-                                     WHERE ""Id"" IN (
-                                     SELECT ""SubtitleFiles"".""Id"" FROM ""SubtitleFiles""
-                                     LEFT OUTER JOIN ""MovieFiles""
-                                     ON ""SubtitleFiles"".""MovieFileId"" = ""MovieFiles"".""Id""
-                                     WHERE ""SubtitleFiles"".""MovieFileId"" > 0
-                                     AND ""MovieFiles"".""Id"" IS NULL)");
-            }
+            using var mapper = _database.OpenConnection();
+            mapper.Execute(@"DELETE FROM ""SubtitleFiles""
+                             WHERE ""Id"" IN (
+                             SELECT ""SubtitleFiles"".""Id"" FROM ""SubtitleFiles""
+                             LEFT OUTER JOIN ""MovieFiles""
+                             ON ""SubtitleFiles"".""MovieFileId"" = ""MovieFiles"".""Id""
+                             WHERE ""SubtitleFiles"".""MovieFileId"" > 0
+                             AND ""MovieFiles"".""Id"" IS NULL)");
         }
     }
 }

src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupUnusedTags.cs

@@ -18,31 +18,29 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
 
         public void Clean()
         {
-            using (var mapper = _database.OpenConnection())
+            using var mapper = _database.OpenConnection();
+            var usedTags = new[] { "Movies", "Notifications", "DelayProfiles", "Restrictions", "ImportLists", "Indexers" }
+                .SelectMany(v => GetUsedTags(v, mapper))
+                .Distinct()
+                .ToList();
+
+            if (usedTags.Any())
             {
-                var usedTags = new[] { "Movies", "Notifications", "DelayProfiles", "Restrictions", "ImportLists", "Indexers" }
-                    .SelectMany(v => GetUsedTags(v, mapper))
-                    .Distinct()
-                    .ToList();
+                var usedTagsList = usedTags.Select(d => d.ToString()).Join(",");
 
-                if (usedTags.Any())
+                if (_database.DatabaseType == DatabaseType.PostgreSQL)
                 {
-                    var usedTagsList = usedTags.Select(d => d.ToString()).Join(",");
-
-                    if (_database.DatabaseType == DatabaseType.PostgreSQL)
-                    {
-                        mapper.Execute($"DELETE FROM \"Tags\" WHERE NOT \"Id\" = ANY (\'{{{usedTagsList}}}\'::int[])");
-                    }
-                    else
-                    {
-                        mapper.Execute($"DELETE FROM \"Tags\" WHERE NOT \"Id\" IN ({usedTagsList})");
-                    }
+                    mapper.Execute($"DELETE FROM \"Tags\" WHERE NOT \"Id\" = ANY (\'{{{usedTagsList}}}\'::int[])");
                 }
                 else
                 {
-                    mapper.Execute("DELETE FROM \"Tags\"");
+                    mapper.Execute($"DELETE FROM \"Tags\" WHERE NOT \"Id\" IN ({usedTagsList})");
                 }
             }
+            else
+            {
+                mapper.Execute("DELETE FROM \"Tags\"");
+            }
         }
 
         private int[] GetUsedTags(string table, IDbConnection mapper)

src/NzbDrone.Core/Housekeeping/Housekeepers/FixFutureRunScheduledTasks.cs

@@ -24,13 +24,11 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
                 _logger.Debug("Not running scheduled task last execution cleanup during debug");
             }
 
-            using (var mapper = _database.OpenConnection())
-            {
-                mapper.Execute(@"UPDATE ""ScheduledTasks""
-                                 SET ""LastExecution"" = @time
-                                 WHERE ""LastExecution"" > @time",
-                               new { time = DateTime.UtcNow });
-            }
+            using var mapper = _database.OpenConnection();
+            mapper.Execute(@"UPDATE ""ScheduledTasks""
+                             SET ""LastExecution"" = @time
+                             WHERE ""LastExecution"" > @time",
+                new { time = DateTime.UtcNow });
         }
     }
 }

src/NzbDrone.Core/Indexers/HttpIndexerBase.cs

@@ -2,6 +2,8 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
 using FluentValidation.Results;
 using NLog;
 using NzbDrone.Common.Extensions;
@@ -94,6 +96,7 @@ namespace NzbDrone.Core.Indexers
         {
             var releases = new List<ReleaseInfo>();
             var url = string.Empty;
+            var minimumBackoff = TimeSpan.FromHours(1);
 
             try
             {
@@ -190,8 +193,7 @@ namespace NzbDrone.Core.Indexers
             }
             catch (WebException webException)
             {
-                if (webException.Status == WebExceptionStatus.NameResolutionFailure ||
-                    webException.Status == WebExceptionStatus.ConnectFailure)
+                if (webException.Status is WebExceptionStatus.NameResolutionFailure or WebExceptionStatus.ConnectFailure)
                 {
                     _indexerStatusService.RecordConnectionFailure(Definition.Id);
                 }
@@ -201,7 +203,7 @@ namespace NzbDrone.Core.Indexers
                 }
 
                 if (webException.Message.Contains("502") || webException.Message.Contains("503") ||
-                    webException.Message.Contains("timed out"))
+                    webException.Message.Contains("504") || webException.Message.Contains("timed out"))
                 {
                     _logger.Warn("{0} server is currently unavailable. {1} {2}", this, url, webException.Message);
                 }
@@ -212,34 +214,29 @@ namespace NzbDrone.Core.Indexers
             }
             catch (TooManyRequestsException ex)
             {
-                if (ex.RetryAfter != TimeSpan.Zero)
-                {
-                    _indexerStatusService.RecordFailure(Definition.Id, ex.RetryAfter);
-                }
-                else
-                {
-                    _indexerStatusService.RecordFailure(Definition.Id, TimeSpan.FromHours(1));
-                }
+                var retryTime = ex.RetryAfter != TimeSpan.Zero ? ex.RetryAfter : minimumBackoff;
+                _indexerStatusService.RecordFailure(Definition.Id, retryTime);
 
-                _logger.Warn("API Request Limit reached for {0}", this);
+                _logger.Warn("API Request Limit reached for {0}. Disabled for {1}", this, retryTime);
             }
             catch (HttpException ex)
             {
                 _indexerStatusService.RecordFailure(Definition.Id);
-                _logger.Warn("{0} {1}", this, ex.Message);
-            }
-            catch (RequestLimitReachedException ex)
-            {
-                if (ex.RetryAfter != TimeSpan.Zero)
+                if (ex.Response.HasHttpServerError)
                 {
-                    _indexerStatusService.RecordFailure(Definition.Id, ex.RetryAfter);
+                    _logger.Warn("Unable to connect to {0} at [{1}]. Indexer's server is unavailable. Try again later. {2}", this, url, ex.Message);
                 }
                 else
                 {
-                    _indexerStatusService.RecordFailure(Definition.Id, TimeSpan.FromHours(1));
+                    _logger.Warn("{0} {1}", this, ex.Message);
                 }
+            }
+            catch (RequestLimitReachedException ex)
+            {
+                var retryTime = ex.RetryAfter != TimeSpan.Zero ? ex.RetryAfter : minimumBackoff;
+                _indexerStatusService.RecordFailure(Definition.Id, retryTime);
 
-                _logger.Warn("API Request Limit reached for {0}", this);
+                _logger.Warn("API Request Limit reached for {0}. Disabled for {1}", this, retryTime);
             }
             catch (ApiKeyException)
             {
@@ -259,6 +256,11 @@ namespace NzbDrone.Core.Indexers
                     _logger.Error(ex, "CAPTCHA token required for {0}, check indexer settings.", this);
                 }
             }
+            catch (TaskCanceledException ex)
+            {
+                _indexerStatusService.RecordFailure(Definition.Id);
+                _logger.Warn(ex, "Unable to connect to indexer, possibly due to a timeout. {0}", url);
+            }
             catch (IndexerException ex)
             {
                 _indexerStatusService.RecordFailure(Definition.Id);
@@ -360,6 +362,8 @@ namespace NzbDrone.Core.Indexers
             catch (RequestLimitReachedException ex)
             {
                 _logger.Warn("Request limit reached: " + ex.Message);
+
+                return new ValidationFailure(string.Empty, "Request limit reached: " + ex.Message);
             }
             catch (CloudFlareCaptchaException ex)
             {
@@ -392,11 +396,45 @@ namespace NzbDrone.Core.Indexers
                     _logger.Warn(ex, "Indexer does not support the query");
                     return new ValidationFailure(string.Empty, "Indexer does not support the current query. Check if the categories and or searching for movies are supported. Check the log for more details.");
                 }
-                else
-                {
-                    _logger.Warn(ex, "Unable to connect to indexer");
 
-                    return new ValidationFailure(string.Empty, "Unable to connect to indexer. " + ex.Message);
+                _logger.Warn(ex, "Unable to connect to indexer");
+                if (ex.Response.HasHttpServerError)
+                {
+                    return new ValidationFailure(string.Empty, "Unable to connect to indexer, indexer's server is unavailable. Try again later. " + ex.Message);
+                }
+
+                if (ex.Response.StatusCode is HttpStatusCode.Forbidden or HttpStatusCode.Unauthorized)
+                {
+                    return new ValidationFailure(string.Empty, "Unable to connect to indexer, invalid credentials. " + ex.Message);
+                }
+
+                return new ValidationFailure(string.Empty, "Unable to connect to indexer, check the log above the ValidationFailure for more details. " + ex.Message);
+            }
+            catch (HttpRequestException ex)
+            {
+                _logger.Warn(ex, "Unable to connect to indexer");
+
+                return new ValidationFailure(string.Empty, "Unable to connect to indexer, please check your DNS settings and ensure IPv6 is working or disabled. " + ex.Message);
+            }
+            catch (TaskCanceledException ex)
+            {
+                _logger.Warn(ex, "Unable to connect to indexer");
+
+                return new ValidationFailure(string.Empty, "Unable to connect to indexer, possibly due to a timeout. Try again or check your network settings. " + ex.Message);
+            }
+            catch (WebException webException)
+            {
+                _logger.Warn("Unable to connect to indexer.");
+
+                if (webException.Status is WebExceptionStatus.NameResolutionFailure or WebExceptionStatus.ConnectFailure)
+                {
+                    return new ValidationFailure(string.Empty, "Unable to connect to indexer connection failure. Check your connection to the indexer's server and DNS." + webException.Message);
+                }
+
+                if (webException.Message.Contains("502") || webException.Message.Contains("503") ||
+                    webException.Message.Contains("504") || webException.Message.Contains("timed out"))
+                {
+                    return new ValidationFailure(string.Empty, "Unable to connect to indexer, indexer's server is unavailable. Try again later. " + webException.Message);
                 }
             }
             catch (Exception ex)

src/NzbDrone.Core/Indexers/RssParser.cs

@@ -123,7 +123,8 @@ namespace NzbDrone.Core.Indexers
 
         protected virtual bool PreProcess(IndexerResponse indexerResponse)
         {
-            if (indexerResponse.HttpResponse.StatusCode != HttpStatusCode.OK)
+            // Server Down HTTP Errors are handled in HTTPIndexerBase so ignore them here
+            if (indexerResponse.HttpResponse.StatusCode != HttpStatusCode.OK && !indexerResponse.HttpResponse.HasHttpServerError)
             {
                 throw new IndexerException(indexerResponse, "Indexer API call resulted in an unexpected StatusCode [{0}]", indexerResponse.HttpResponse.StatusCode);
             }
@@ -268,11 +269,11 @@ namespace NzbDrone.Core.Indexers
                                      try
                                      {
                                          return new RssEnclosure
-                                                {
-                                                    Url = v.Attribute("url")?.Value,
-                                                    Type = v.Attribute("type")?.Value,
-                                                    Length = v.Attribute("length")?.Value?.ParseInt64() ?? 0
-                                                };
+                                         {
+                                             Url = v.Attribute("url")?.Value,
+                                             Type = v.Attribute("type")?.Value,
+                                             Length = v.Attribute("length")?.Value?.ParseInt64() ?? 0
+                                         };
                                      }
                                      catch (Exception e)
                                      {

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

@@ -1128,7 +1128,7 @@
   "UnmappedFolders": "Unmapped Folders",
   "Unmonitored": "Unmonitored",
   "UnmonitoredHelpText": "Include unmonitored movies in the iCal feed",
-  "Unreleased": "Unavailable",
+  "Unreleased": "Unreleased",
   "UnsavedChanges": "Unsaved Changes",
   "UnselectAll": "Unselect All",
   "UpdateAll": "Update All",

src/NzbDrone.Core/Parser/Parser.cs

@@ -120,11 +120,12 @@ namespace NzbDrone.Core.Parser
 
         private static readonly Regex SimpleReleaseTitleRegex = new Regex(@"\s*(?:[<>?*:|])", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
-        private static readonly RegexReplace WebsitePrefixRegex = new RegexReplace(@"^\[\s*[-a-z]+(\.[a-z]+)+\s*\][- ]*|^www\.[a-z0-9]+\.(?:com|net|org|casa|pics|tc)[ -]*",
+        // Valid TLDs http://data.iana.org/TLD/tlds-alpha-by-domain.txt
+        private static readonly RegexReplace WebsitePrefixRegex = new RegexReplace(@"^(?:\[\s*)?(?:www\.)?[-a-z0-9-]{1,256}\.(?:[a-z]{2,6}\.[a-z]{2,6}|xn--[a-z0-9-]{4,}|[a-z]{2,})\b(?:\s*\]|[ -]{2,})[ -]*",
                                                                 string.Empty,
                                                                 RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
-        private static readonly RegexReplace WebsitePostfixRegex = new RegexReplace(@"\[\s*[-a-z]+(\.[a-z0-9]+)+\s*\]$",
+        private static readonly RegexReplace WebsitePostfixRegex = new RegexReplace(@"(?:\[\s*)?(?:www\.)?[-a-z0-9-]{1,256}\.(?:xn--[a-z0-9-]{4,}|[a-z]{2,6})\b(?:\s*\])$",
                                                         string.Empty,
                                                         RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
@@ -152,7 +153,7 @@ namespace NzbDrone.Core.Parser
 
         // Handle Exception Release Groups that don't follow -RlsGrp; Manual List
         // groups whose releases end with RlsGroup) or RlsGroup]
-        private static readonly Regex ExceptionReleaseGroupRegex = new Regex(@"(?<releasegroup>(Joy|YIFY|YTS.(MX|LT|AG)|FreetheFish|afm72|Anna|Bandi|Ghost|Kappa|MONOLITH|Qman|RZeroX|SAMPA|Silence|theincognito|t3nzin|Vyndros|HDO|DusIctv|DHD|SEV|CtrlHD|-ZR-|ADC|XZVN|RH|Kametsu|r00t|HONE)(?=\]|\)))", RegexOptions.IgnoreCase | RegexOptions.Compiled);
+        private static readonly Regex ExceptionReleaseGroupRegex = new Regex(@"(?<releasegroup>(Joy|YIFY|YTS.(MX|LT|AG)|FreetheFish|afm72|Anna|Bandi|Ghost|Kappa|MONOLITH|Qman|RZeroX|SAMPA|Silence|theincognito|t3nzin|Vyndros|HDO|DusIctv|DHD|SEV|CtrlHD|-ZR-|ADC|XZVN|RH|Kametsu|r00t|HONE|Vyndros)(?=\]|\)))", RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
        // Handle Exception Release Groups that don't follow -RlsGrp; Manual List
        // name only...BE VERY CAREFUL WITH THIS, HIGH CHANCE OF FALSE POSITIVES

src/Radarr.Api.V3/Calendar/CalendarController.cs

@@ -35,6 +35,7 @@ namespace Radarr.Api.V3.Calendar
             _configService = configService;
         }
 
+        [NonAction]
         protected override MovieResource GetResourceById(int id)
         {
             throw new NotImplementedException();

src/Radarr.Api.V3/Health/HealthController.cs

@@ -22,6 +22,7 @@ namespace Radarr.Api.V3.Health
             _healthCheckService = healthCheckService;
         }
 
+        [NonAction]
         protected override HealthResource GetResourceById(int id)
         {
             throw new NotImplementedException();

src/Radarr.Api.V3/Indexers/ReleaseControllerBase.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc;
 using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.Profiles;
 using Radarr.Http.REST;
@@ -15,6 +16,7 @@ namespace Radarr.Api.V3.Indexers
             _qualityProfile = qualityProfileService.GetDefaultProfile(string.Empty);
         }
 
+        [NonAction]
         protected override ReleaseResource GetResourceById(int id)
         {
             throw new NotImplementedException();

src/Radarr.Api.V3/Movies/MovieImportController.cs

@@ -17,6 +17,7 @@ namespace Radarr.Api.V3.Movies
             _addMovieService = addMovieService;
         }
 
+        [NonAction]
         protected override MovieResource GetResourceById(int id)
         {
             throw new NotImplementedException();

src/Radarr.Api.V3/Movies/MovieLookupController.cs

@@ -35,6 +35,7 @@ namespace Radarr.Api.V3.Movies
             _configService = configService;
         }
 
+        [NonAction]
         protected override MovieResource GetResourceById(int id)
         {
             throw new NotImplementedException();

src/Radarr.Api.V3/ProviderControllerBase.cs

@@ -66,6 +66,8 @@ namespace Radarr.Api.V3
         }
 
         [RestPostById]
+        [Consumes("application/json")]
+        [Produces("application/json")]
         public ActionResult<TProviderResource> CreateProvider([FromBody] TProviderResource providerResource, [FromQuery] bool forceSave = false)
         {
             var providerDefinition = GetDefinition(providerResource, true, !forceSave, false);
@@ -81,6 +83,8 @@ namespace Radarr.Api.V3
         }
 
         [RestPutById]
+        [Consumes("application/json")]
+        [Produces("application/json")]
         public ActionResult<TProviderResource> UpdateProvider([FromBody] TProviderResource providerResource, [FromQuery] bool forceSave = false)
         {
             var providerDefinition = GetDefinition(providerResource, true, !forceSave, false);
@@ -98,6 +102,7 @@ namespace Radarr.Api.V3
 
         [HttpPut("bulk")]
         [Consumes("application/json")]
+        [Produces("application/json")]
         public ActionResult<TProviderResource> UpdateProvider([FromBody] TBulkProviderResource providerResource)
         {
             var definitionsToUpdate = _providerFactory.Get(providerResource.Ids).ToList();
@@ -191,6 +196,7 @@ namespace Radarr.Api.V3
         }
 
         [HttpPost("testall")]
+        [Produces("application/json")]
         public IActionResult TestAll()
         {
             var providerDefinitions = _providerFactory.All()
@@ -214,6 +220,8 @@ namespace Radarr.Api.V3
 
         [SkipValidation]
         [HttpPost("action/{name}")]
+        [Consumes("application/json")]
+        [Produces("application/json")]
         public IActionResult RequestAction(string name, [FromBody] TProviderResource resource)
         {
             var providerDefinition = GetDefinition(resource, false, false, false);

src/Radarr.Api.V3/Queue/QueueController.cs

@@ -58,6 +58,7 @@ namespace Radarr.Api.V3.Queue
             _qualityComparer = new QualityModelComparer(qualityProfileService.GetDefaultProfile(string.Empty));
         }
 
+        [NonAction]
         protected override QueueResource GetResourceById(int id)
         {
             throw new NotImplementedException();

src/Radarr.Api.V3/Queue/QueueDetailsController.cs

@@ -26,6 +26,7 @@ namespace Radarr.Api.V3.Queue
             _pendingReleaseService = pendingReleaseService;
         }
 
+        [NonAction]
         protected override QueueResource GetResourceById(int id)
         {
             throw new NotImplementedException();

src/Radarr.Api.V3/Queue/QueueStatusController.cs

@@ -30,6 +30,7 @@ namespace Radarr.Api.V3.Queue
             _broadcastDebounce = new Debouncer(BroadcastChange, TimeSpan.FromSeconds(5));
         }
 
+        [NonAction]
         protected override QueueStatusResource GetResourceById(int id)
         {
             throw new NotImplementedException();

src/Radarr.Api.V3/System/Backup/BackupController.cs

@@ -20,7 +20,7 @@ namespace Radarr.Api.V3.System.Backup
         private readonly IAppFolderInfo _appFolderInfo;
         private readonly IDiskProvider _diskProvider;
 
-        private static readonly List<string> ValidExtensions = new List<string> { ".zip", ".db", ".xml" };
+        private static readonly List<string> ValidExtensions = new () { ".zip", ".db", ".xml" };
 
         public BackupController(IBackupService backupService,
                             IAppFolderInfo appFolderInfo,
@@ -37,22 +37,28 @@ namespace Radarr.Api.V3.System.Backup
             var backups = _backupService.GetBackups();
 
             return backups.Select(b => new BackupResource
-            {
-                Id = GetBackupId(b),
-                Name = b.Name,
-                Path = $"/backup/{b.Type.ToString().ToLower()}/{b.Name}",
-                Type = b.Type,
-                Size = b.Size,
-                Time = b.Time
-            })
-                                       .OrderByDescending(b => b.Time)
-                                       .ToList();
+                {
+                    Id = GetBackupId(b),
+                    Name = b.Name,
+                    Path = $"/backup/{b.Type.ToString().ToLower()}/{b.Name}",
+                    Type = b.Type,
+                    Size = b.Size,
+                    Time = b.Time
+                })
+                .OrderByDescending(b => b.Time)
+                .ToList();
         }
 
         [RestDeleteById]
         public void DeleteBackup(int id)
         {
             var backup = GetBackup(id);
+
+            if (backup == null)
+            {
+                throw new NotFoundException();
+            }
+
             var path = GetBackupPath(backup);
 
             if (!_diskProvider.FileExists(path))

src/Radarr.Api.V3/openapi.json

@@ -1673,16 +1673,6 @@
               "schema": {
                 "$ref": "#/components/schemas/DownloadClientResource"
               }
-            },
-            "text/json": {
-              "schema": {
-                "$ref": "#/components/schemas/DownloadClientResource"
-              }
-            },
-            "application/*+json": {
-              "schema": {
-                "$ref": "#/components/schemas/DownloadClientResource"
-              }
             }
           }
         },
@@ -1690,20 +1680,10 @@
           "200": {
             "description": "Success",
             "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/DownloadClientResource"
-                }
-              },
               "application/json": {
                 "schema": {
                   "$ref": "#/components/schemas/DownloadClientResource"
                 }
-              },
-              "text/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/DownloadClientResource"
-                }
               }
             }
           }
@@ -1739,16 +1719,6 @@
               "schema": {
                 "$ref": "#/components/schemas/DownloadClientResource"
               }
-            },
-            "text/json": {
-              "schema": {
-                "$ref": "#/components/schemas/DownloadClientResource"
-              }
-            },
-            "application/*+json": {
-              "schema": {
-                "$ref": "#/components/schemas/DownloadClientResource"
-              }
             }
           }
         },
@@ -1756,20 +1726,10 @@
           "200": {
             "description": "Success",
             "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/DownloadClientResource"
-                }
-              },
               "application/json": {
                 "schema": {
                   "$ref": "#/components/schemas/DownloadClientResource"
                 }
-              },
-              "text/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/DownloadClientResource"
-                }
               }
             }
           }
@@ -1853,20 +1813,10 @@
           "200": {
             "description": "Success",
             "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/DownloadClientResource"
-                }
-              },
               "application/json": {
                 "schema": {
                   "$ref": "#/components/schemas/DownloadClientResource"
                 }
-              },
-              "text/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/DownloadClientResource"
-                }
               }
             }
           }
@@ -1994,16 +1944,6 @@
               "schema": {
                 "$ref": "#/components/schemas/DownloadClientResource"
               }
-            },
-            "text/json": {
-              "schema": {
-                "$ref": "#/components/schemas/DownloadClientResource"
-              }
-            },
-            "application/*+json": {
-              "schema": {
-                "$ref": "#/components/schemas/DownloadClientResource"
-              }
             }
           }
         },
@@ -2934,16 +2874,6 @@
               "schema": {
                 "$ref": "#/components/schemas/ImportListResource"
               }
-            },
-            "text/json": {
-              "schema": {
-                "$ref": "#/components/schemas/ImportListResource"
-              }
-            },
-            "application/*+json": {
-              "schema": {
-                "$ref": "#/components/schemas/ImportListResource"
-              }
             }
           }
         },
@@ -2951,20 +2881,10 @@
           "200": {
             "description": "Success",
             "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/ImportListResource"
-                }
-              },
               "application/json": {
                 "schema": {
                   "$ref": "#/components/schemas/ImportListResource"
                 }
-              },
-              "text/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ImportListResource"
-                }
               }
             }
           }
@@ -3000,16 +2920,6 @@
               "schema": {
                 "$ref": "#/components/schemas/ImportListResource"
               }
-            },
-            "text/json": {
-              "schema": {
-                "$ref": "#/components/schemas/ImportListResource"
-              }
-            },
-            "application/*+json": {
-              "schema": {
-                "$ref": "#/components/schemas/ImportListResource"
-              }
             }
           }
         },
@@ -3017,20 +2927,10 @@
           "200": {
             "description": "Success",
             "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/ImportListResource"
-                }
-              },
               "application/json": {
                 "schema": {
                   "$ref": "#/components/schemas/ImportListResource"
                 }
-              },
-              "text/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ImportListResource"
-                }
               }
             }
           }
@@ -3114,20 +3014,10 @@
           "200": {
             "description": "Success",
             "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/ImportListResource"
-                }
-              },
               "application/json": {
                 "schema": {
                   "$ref": "#/components/schemas/ImportListResource"
                 }
-              },
-              "text/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ImportListResource"
-                }
               }
             }
           }
@@ -3255,16 +3145,6 @@
               "schema": {
                 "$ref": "#/components/schemas/ImportListResource"
               }
-            },
-            "text/json": {
-              "schema": {
-                "$ref": "#/components/schemas/ImportListResource"
-              }
-            },
-            "application/*+json": {
-              "schema": {
-                "$ref": "#/components/schemas/ImportListResource"
-              }
             }
           }
         },
@@ -3497,16 +3377,6 @@
               "schema": {
                 "$ref": "#/components/schemas/IndexerResource"
               }
-            },
-            "text/json": {
-              "schema": {
-                "$ref": "#/components/schemas/IndexerResource"
-              }
-            },
-            "application/*+json": {
-              "schema": {
-                "$ref": "#/components/schemas/IndexerResource"
-              }
             }
           }
         },
@@ -3514,20 +3384,10 @@
           "200": {
             "description": "Success",
             "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/IndexerResource"
-                }
-              },
               "application/json": {
                 "schema": {
                   "$ref": "#/components/schemas/IndexerResource"
                 }
-              },
-              "text/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/IndexerResource"
-                }
               }
             }
           }
@@ -3563,16 +3423,6 @@
               "schema": {
                 "$ref": "#/components/schemas/IndexerResource"
               }
-            },
-            "text/json": {
-              "schema": {
-                "$ref": "#/components/schemas/IndexerResource"
-              }
-            },
-            "application/*+json": {
-              "schema": {
-                "$ref": "#/components/schemas/IndexerResource"
-              }
             }
           }
         },
@@ -3580,20 +3430,10 @@
           "200": {
             "description": "Success",
             "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/IndexerResource"
-                }
-              },
               "application/json": {
                 "schema": {
                   "$ref": "#/components/schemas/IndexerResource"
                 }
-              },
-              "text/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/IndexerResource"
-                }
               }
             }
           }
@@ -3677,20 +3517,10 @@
           "200": {
             "description": "Success",
             "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/IndexerResource"
-                }
-              },
               "application/json": {
                 "schema": {
                   "$ref": "#/components/schemas/IndexerResource"
                 }
-              },
-              "text/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/IndexerResource"
-                }
               }
             }
           }
@@ -3818,16 +3648,6 @@
               "schema": {
                 "$ref": "#/components/schemas/IndexerResource"
               }
-            },
-            "text/json": {
-              "schema": {
-                "$ref": "#/components/schemas/IndexerResource"
-              }
-            },
-            "application/*+json": {
-              "schema": {
-                "$ref": "#/components/schemas/IndexerResource"
-              }
             }
           }
         },
@@ -4492,16 +4312,6 @@
               "schema": {
                 "$ref": "#/components/schemas/MetadataResource"
               }
-            },
-            "text/json": {
-              "schema": {
-                "$ref": "#/components/schemas/MetadataResource"
-              }
-            },
-            "application/*+json": {
-              "schema": {
-                "$ref": "#/components/schemas/MetadataResource"
-              }
             }
           }
         },
@@ -4509,20 +4319,10 @@
           "200": {
             "description": "Success",
             "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/MetadataResource"
-                }
-              },
               "application/json": {
                 "schema": {
                   "$ref": "#/components/schemas/MetadataResource"
                 }
-              },
-              "text/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/MetadataResource"
-                }
               }
             }
           }
@@ -4558,16 +4358,6 @@
               "schema": {
                 "$ref": "#/components/schemas/MetadataResource"
               }
-            },
-            "text/json": {
-              "schema": {
-                "$ref": "#/components/schemas/MetadataResource"
-              }
-            },
-            "application/*+json": {
-              "schema": {
-                "$ref": "#/components/schemas/MetadataResource"
-              }
             }
           }
         },
@@ -4575,20 +4365,10 @@
           "200": {
             "description": "Success",
             "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/MetadataResource"
-                }
-              },
               "application/json": {
                 "schema": {
                   "$ref": "#/components/schemas/MetadataResource"
                 }
-              },
-              "text/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/MetadataResource"
-                }
               }
             }
           }
@@ -4672,20 +4452,10 @@
           "200": {
             "description": "Success",
             "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/MetadataResource"
-                }
-              },
               "application/json": {
                 "schema": {
                   "$ref": "#/components/schemas/MetadataResource"
                 }
-              },
-              "text/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/MetadataResource"
-                }
               }
             }
           }
@@ -4813,16 +4583,6 @@
               "schema": {
                 "$ref": "#/components/schemas/MetadataResource"
               }
-            },
-            "text/json": {
-              "schema": {
-                "$ref": "#/components/schemas/MetadataResource"
-              }
-            },
-            "application/*+json": {
-              "schema": {
-                "$ref": "#/components/schemas/MetadataResource"
-              }
             }
           }
         },
@@ -5929,16 +5689,6 @@
               "schema": {
                 "$ref": "#/components/schemas/NotificationResource"
               }
-            },
-            "text/json": {
-              "schema": {
-                "$ref": "#/components/schemas/NotificationResource"
-              }
-            },
-            "application/*+json": {
-              "schema": {
-                "$ref": "#/components/schemas/NotificationResource"
-              }
             }
           }
         },
@@ -5946,20 +5696,10 @@
           "200": {
             "description": "Success",
             "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/NotificationResource"
-                }
-              },
               "application/json": {
                 "schema": {
                   "$ref": "#/components/schemas/NotificationResource"
                 }
-              },
-              "text/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/NotificationResource"
-                }
               }
             }
           }
@@ -5995,16 +5735,6 @@
               "schema": {
                 "$ref": "#/components/schemas/NotificationResource"
               }
-            },
-            "text/json": {
-              "schema": {
-                "$ref": "#/components/schemas/NotificationResource"
-              }
-            },
-            "application/*+json": {
-              "schema": {
-                "$ref": "#/components/schemas/NotificationResource"
-              }
             }
           }
         },
@@ -6012,20 +5742,10 @@
           "200": {
             "description": "Success",
             "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/NotificationResource"
-                }
-              },
               "application/json": {
                 "schema": {
                   "$ref": "#/components/schemas/NotificationResource"
                 }
-              },
-              "text/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/NotificationResource"
-                }
               }
             }
           }
@@ -6109,20 +5829,10 @@
           "200": {
             "description": "Success",
             "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/NotificationResource"
-                }
-              },
               "application/json": {
                 "schema": {
                   "$ref": "#/components/schemas/NotificationResource"
                 }
-              },
-              "text/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/NotificationResource"
-                }
               }
             }
           }
@@ -6250,16 +5960,6 @@
               "schema": {
                 "$ref": "#/components/schemas/NotificationResource"
               }
-            },
-            "text/json": {
-              "schema": {
-                "$ref": "#/components/schemas/NotificationResource"
-              }
-            },
-            "application/*+json": {
-              "schema": {
-                "$ref": "#/components/schemas/NotificationResource"
-              }
             }
           }
         },