From 3719935b1ddf66350ab65a5a9f3921287e27da58 Mon Sep 17 00:00:00 2001 From: Kenneth Skovhede Date: Tue, 24 Jun 2025 16:13:59 +0200 Subject: [PATCH] No exempt throttle backends This PR removes the default value of `file` as a throttle exempt backend, so all backends are subject to throttle by default. This change makes the option easier to work with as the empty string could not be used to undo the default value, and fixing this would make the options be applied inconsistently. Also fixed two errors in the help text for the option. --- Duplicati/Library/Main/Options.cs | 4 ++-- Duplicati/Library/Main/Strings.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Duplicati/Library/Main/Options.cs b/Duplicati/Library/Main/Options.cs index 5ba524aa3..191cf88c7 100644 --- a/Duplicati/Library/Main/Options.cs +++ b/Duplicati/Library/Main/Options.cs @@ -97,7 +97,7 @@ namespace Duplicati.Library.Main /// /// The backends where throttling is disabled by default /// - private const string DEFAULT_THROTTLE_DISABLED_BACKENDS = "file"; + private const string DEFAULT_THROTTLE_DISABLED_BACKENDS = ""; /// /// The default retry delay @@ -390,7 +390,7 @@ namespace Duplicati.Library.Main new CommandLineArgument("throttle-upload", CommandLineArgument.ArgumentType.Size, Strings.Options.ThrottleuploadShort, Strings.Options.ThrottleuploadLong, "0kb"), new CommandLineArgument("throttle-download", CommandLineArgument.ArgumentType.Size, Strings.Options.ThrottledownloadShort, Strings.Options.ThrottledownloadLong, "0kb"), new CommandLineArgument("throttle-disabled", CommandLineArgument.ArgumentType.Boolean, Strings.Options.DisablethrottleShort, Strings.Options.DisablethrottleLong, "false"), - new CommandLineArgument("throttle-disabled-backends", CommandLineArgument.ArgumentType.String, Strings.Options.DisablethrottlebackendsShort, Strings.Options.DisablethrottlebackendsLong("disable-throttle"), DEFAULT_THROTTLE_DISABLED_BACKENDS), + new CommandLineArgument("throttle-disabled-backends", CommandLineArgument.ArgumentType.String, Strings.Options.DisablethrottlebackendsShort, Strings.Options.DisablethrottlebackendsLong("throttle-disabled"), DEFAULT_THROTTLE_DISABLED_BACKENDS), new CommandLineArgument("skip-files-larger-than", CommandLineArgument.ArgumentType.Size, Strings.Options.SkipfileslargerthanShort, Strings.Options.SkipfileslargerthanLong), new CommandLineArgument("upload-unchanged-backups", CommandLineArgument.ArgumentType.Boolean, Strings.Options.UploadUnchangedBackupsShort, Strings.Options.UploadUnchangedBackupsLong, "false"), diff --git a/Duplicati/Library/Main/Strings.cs b/Duplicati/Library/Main/Strings.cs index b9ddad7a4..cb3f223cf 100644 --- a/Duplicati/Library/Main/Strings.cs +++ b/Duplicati/Library/Main/Strings.cs @@ -64,7 +64,7 @@ namespace Duplicati.Library.Main.Strings public static string ThrottleuploadShort { get { return LC.L(@"Max number of kilobytes to upload pr. second"); } } public static string DisablethrottleLong { get { return LC.L(@"Disable the throttling of upload and download speeds for this task. If there is a throttle set, it will be ignored when running this task."); } } public static string DisablethrottleShort { get { return LC.L(@"Disable throttling"); } } - public static string DisablethrottlebackendsLong(string option) { return LC.L(@"Disable the throttling of upload and download speeds for specific backends. If there is a throttle set, it will be ignore when running this task, if the backend is one of the specified backends. Multiple backends can be specified with a comma separator. This option has no effect if there is no throttle or if --{0} is set", option); } + public static string DisablethrottlebackendsLong(string option) { return LC.L(@"Disable the throttling of upload and download speeds for specific backends. If there is a throttle set, it will be ignored when running this task, if the backend is one of the specified backends. Multiple backends can be specified with a comma separator. This option has no effect if there is no throttle or if --{0} is set", option); } public static string DisablethrottlebackendsShort { get { return LC.L(@"Disable throttling for specific backends"); } } public static string NoencryptionLong { get { return LC.L(@"If you store the backups on a local disk, and prefer that they are kept unencrypted, you can turn of encryption completely by using this switch."); } } public static string NoencryptionShort { get { return LC.L(@"Disable encryption"); } }