PublicArchive/duplicati
2
0
Fork 0
mirror of https://github.com/duplicati/duplicati.git synced 2026-05-06 07:16:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6884 from duplicati/feature/quota-disable-on-remote-sync

Browse Source 
Add `quote-disable` to synctool
This commit is contained in:
Kenneth Skovhede
2026-05-04 11:34:15 +02:00
committed by GitHub
parent 25d9eeb1b7 fc675638c4
commit 9fd6e83536
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/Library/Main/Backend/LightWeightBackendManager.cs
+3 -3
View File
@@ -40,7 +40,7 @@ namespace Duplicati.Library.Main.Backend
private readonly bool _autoCreateFolders; private readonly bool _autoCreateFolders;
private readonly string _backendUrl; private readonly string _backendUrl;
private readonly int _maxRetries; private readonly int _maxRetries;
private readonly Dictionary<string, string> _options; private readonly Dictionary<string, string?> _options;
private readonly int _retryDelay; private readonly int _retryDelay;
private readonly bool _retryWithExponentialBackoff; private readonly bool _retryWithExponentialBackoff;
private int _currentRetryDelay; private int _currentRetryDelay;
@@ -48,11 +48,11 @@ namespace Duplicati.Library.Main.Backend
private readonly IOperationProgressUpdater? _progressUpdater; private readonly IOperationProgressUpdater? _progressUpdater;
private readonly IBackendProgressUpdater? _backendProgressUpdater; private readonly IBackendProgressUpdater? _backendProgressUpdater;
public LightWeightBackendManager(string backendUrl, Dictionary<string, string> options, int maxRetries = 3, int retryDelay = 1000, bool autoCreateFolders = false, bool retryWithExponentialBackoff = false) public LightWeightBackendManager(string backendUrl, Dictionary<string, string?> options, int maxRetries = 3, int retryDelay = 1000, bool autoCreateFolders = false, bool retryWithExponentialBackoff = false)
: this(backendUrl, options, maxRetries, retryDelay, autoCreateFolders, retryWithExponentialBackoff, null, null) : this(backendUrl, options, maxRetries, retryDelay, autoCreateFolders, retryWithExponentialBackoff, null, null)
{ } { }
internal LightWeightBackendManager(string backendUrl, Dictionary<string, string> options, int maxRetries = 3, int retryDelay = 1000, bool autoCreateFolders = false, bool retryWithExponentialBackoff = false, IOperationProgressUpdater? progressUpdater = null, IBackendProgressUpdater? backendProgressUpdater = null) internal LightWeightBackendManager(string backendUrl, Dictionary<string, string?> options, int maxRetries = 3, int retryDelay = 1000, bool autoCreateFolders = false, bool retryWithExponentialBackoff = false, IOperationProgressUpdater? progressUpdater = null, IBackendProgressUpdater? backendProgressUpdater = null)
{ {
_backendUrl = backendUrl; _backendUrl = backendUrl;
_maxRetries = maxRetries; _maxRetries = maxRetries;
Duplicati/Library/Main/Operation/RemoteSynchronization/RemoteSynchronizationRunner.cs
+5 -4
View File
@@ -197,9 +197,10 @@ public static class RemoteSynchronizationRunner
// Prepare the operations // Prepare the operations
var (to_copy, to_delete, to_verify) = await PrepareFileLists(b1m, b2m, config, token).ConfigureAwait(false); var (to_copy, to_delete, to_verify) = await PrepareFileLists(b1m, b2m, config, token).ConfigureAwait(false);
var disableQuota = Library.Utility.Utility.ParseBoolOption(dst_opts, "quota-disable");
// Check if we have enough free space in the destination to perform the synchronization. // Check if we have enough free space in the destination to perform the synchronization.
var dst_quota = await b2m.GetQuotaInfoAsync(token).ConfigureAwait(false); var dst_quota = disableQuota ? null : await b2m.GetQuotaInfoAsync(token).ConfigureAwait(false);
if (dst_quota is not null) if (dst_quota is not null)
{ {
var total_delete_size = to_delete.Sum(x => Math.Max(x.Size, 0)); var total_delete_size = to_delete.Sum(x => Math.Max(x.Size, 0));
@@ -210,7 +211,7 @@ public static class RemoteSynchronizationRunner
"Not enough free space in destination to perform the synchronization. Required: {0}, Available: {1}. Aborting.", "Not enough free space in destination to perform the synchronization. Required: {0}, Available: {1}. Aborting.",
Duplicati.Library.Utility.Utility.FormatSizeString(total_copy_size - total_delete_size), Duplicati.Library.Utility.Utility.FormatSizeString(total_copy_size - total_delete_size),
Duplicati.Library.Utility.Utility.FormatSizeString(dst_quota.FreeQuotaSpace)); Duplicati.Library.Utility.Utility.FormatSizeString(dst_quota.FreeQuotaSpace));
throw new Exception("Not enough free space in destination to perform the synchronization."); throw new UserInformationException("Not enough free space in destination to perform the synchronization.", "NotEnoughDestinationSpace");
} }
} }
@@ -652,11 +653,11 @@ public static class RemoteSynchronizationRunner
/// <param name="options">The list of string options to parse</param> /// <param name="options">The list of string options to parse</param>
/// <returns>A dictionary with the parsed options, where the key is the option name and the value is the option value.</returns> /// <returns>A dictionary with the parsed options, where the key is the option name and the value is the option value.</returns>
/// <exception cref="ArgumentException">If an option was not parsed correctly.</exception> /// <exception cref="ArgumentException">If an option was not parsed correctly.</exception>
private static Dictionary<string, string> ParseOptions(IEnumerable<string> options) private static Dictionary<string, string?> ParseOptions(IEnumerable<string> options)
{ {
var result = options var result = options
.Select(x => x.Split('=')) .Select(x => x.Split('='))
.ToDictionary(x => x[0], x => string.Join("=", x.Skip(1))); .ToDictionary(x => x[0], x => (string?)string.Join("=", x.Skip(1)));
// Double check that the options are valid by reconstructing them from the dictionary // Double check that the options are valid by reconstructing them from the dictionary
foreach (var opt in result.Select(x => $"{x.Key}={x.Value}")) foreach (var opt in result.Select(x => $"{x.Key}={x.Value}"))