From 1202a434668cd7f9155b7e558160dd73f842b3fc Mon Sep 17 00:00:00 2001 From: Bogdan Date: Mon, 14 Aug 2023 00:03:18 +0300 Subject: [PATCH] Show warning when using the docker update mechanism (cherry picked from commit cc538c4b2d33a1734c45c0667776d946596107e9) Closes #2805 --- frontend/src/Settings/General/UpdateSettings.js | 1 + src/NzbDrone.Common/Extensions/PathExtensions.cs | 2 +- src/NzbDrone.Core/Localization/Core/en.json | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/src/Settings/General/UpdateSettings.js b/frontend/src/Settings/General/UpdateSettings.js index cd03ce2a3..f0a620167 100644 --- a/frontend/src/Settings/General/UpdateSettings.js +++ b/frontend/src/Settings/General/UpdateSettings.js @@ -91,6 +91,7 @@ function UpdateSettings(props) { type={inputTypes.CHECK} name="updateAutomatically" helpText={translate('UpdateAutomaticallyHelpText')} + helpTextWarning={updateMechanism.value === 'docker' ? translate('AutomaticUpdatesDisabledDocker', { appName: 'Readarr' }) : undefined} onChange={onInputChange} {...updateAutomatically} /> diff --git a/src/NzbDrone.Common/Extensions/PathExtensions.cs b/src/NzbDrone.Common/Extensions/PathExtensions.cs index cf5b1e3b7..166d160bb 100644 --- a/src/NzbDrone.Common/Extensions/PathExtensions.cs +++ b/src/NzbDrone.Common/Extensions/PathExtensions.cs @@ -140,7 +140,7 @@ namespace NzbDrone.Common.Extensions public static bool IsPathValid(this string path, PathValidationType validationType) { - if (path.ContainsInvalidPathChars() || string.IsNullOrWhiteSpace(path)) + if (string.IsNullOrWhiteSpace(path) || path.ContainsInvalidPathChars()) { return false; } diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json index ef5ffc76c..01b15bfe1 100644 --- a/src/NzbDrone.Core/Localization/Core/en.json +++ b/src/NzbDrone.Core/Localization/Core/en.json @@ -63,6 +63,7 @@ "AutoUnmonitorPreviouslyDownloadedBooksHelpText": "Books deleted from disk are automatically unmonitored in Readarr", "Automatic": "Automatic", "AutomaticAdd": "Automatic Add", + "AutomaticUpdatesDisabledDocker": "Automatic updates are not directly supported when using the Docker update mechanism. You will need to update the container image outside of {appName} or use a script", "AutomaticallySwitchEdition": "Automatically Switch Edition", "Backup": "Backup", "BackupFolderHelpText": "Relative paths will be under Readarr's AppData directory",