diff options
author | TopperDEL <github_com@tparth.de> | 2021-07-15 18:37:22 +0300 |
---|---|---|
committer | TopperDEL <github_com@tparth.de> | 2021-07-15 18:37:22 +0300 |
commit | 5d36791aa59303b90cd5369c23a0e990a9f66158 (patch) | |
tree | 33023dc863c08ad09ff78ce0095bd16d70b9b32a /Duplicati | |
parent | 7e335d36ec0ad8543ada254fe35c79ba127c7c57 (diff) |
feat: Inform user about deprecated Tardigrade-Backend with a warning
Diffstat (limited to 'Duplicati')
-rw-r--r-- | Duplicati/Library/Backend/Storj/StorjBackend.cs | 10 | ||||
-rw-r--r-- | Duplicati/Library/Backend/Tardigrade/TardigradeBackend.cs | 2 | ||||
-rw-r--r-- | Duplicati/Library/Main/Controller.cs | 8 |
3 files changed, 18 insertions, 2 deletions
diff --git a/Duplicati/Library/Backend/Storj/StorjBackend.cs b/Duplicati/Library/Backend/Storj/StorjBackend.cs index 715aeef12..cdc761b1e 100644 --- a/Duplicati/Library/Backend/Storj/StorjBackend.cs +++ b/Duplicati/Library/Backend/Storj/StorjBackend.cs @@ -20,6 +20,7 @@ namespace Duplicati.Library.Backend.Storj private const string STORJ_SATELLITE = "storj-satellite"; private const string STORJ_API_KEY = "storj-api-key"; private const string STORJ_SECRET = "storj-secret"; + private const string STORJ_SECRET_VERIFY = "storj-secret-verify"; private const string STORJ_SHARED_ACCESS = "storj-shared-access"; private const string STORJ_BUCKET = "storj-bucket"; private const string STORJ_FOLDER = "storj-folder"; @@ -83,6 +84,14 @@ namespace Duplicati.Library.Backend.Storj { InitStorjLibrary(); + foreach(var option in options.ToList()) + { + if(option.Key.ToLower().Contains("tardigrade")) + { + options.Add(option.Key.ToLower().Replace("tardigrade", "storj"), option.Value); + } + } + var auth_method = options[STORJ_AUTH_METHOD]; if (auth_method == "Access grant") { @@ -142,6 +151,7 @@ namespace Duplicati.Library.Backend.Storj new CommandLineArgument(STORJ_SATELLITE, CommandLineArgument.ArgumentType.String, Strings.Storj.StorjSatelliteDescriptionShort, Strings.Storj.StorjSatelliteDescriptionLong, "us1.storj.io:7777"), new CommandLineArgument(STORJ_API_KEY, CommandLineArgument.ArgumentType.String, Strings.Storj.StorjAPIKeyDescriptionShort, Strings.Storj.StorjAPIKeyDescriptionLong), new CommandLineArgument(STORJ_SECRET, CommandLineArgument.ArgumentType.Password, Strings.Storj.StorjSecretDescriptionShort, Strings.Storj.StorjSecretDescriptionLong), + new CommandLineArgument(STORJ_SECRET_VERIFY, CommandLineArgument.ArgumentType.Password, Strings.Storj.StorjSecretDescriptionShort, Strings.Storj.StorjSecretDescriptionLong), new CommandLineArgument(STORJ_SHARED_ACCESS, CommandLineArgument.ArgumentType.String, Strings.Storj.StorjSharedAccessDescriptionShort, Strings.Storj.StorjSharedAccessDescriptionLong), new CommandLineArgument(STORJ_BUCKET, CommandLineArgument.ArgumentType.String, Strings.Storj.StorjBucketDescriptionShort, Strings.Storj.StorjBucketDescriptionLong), new CommandLineArgument(STORJ_FOLDER, CommandLineArgument.ArgumentType.String, Strings.Storj.StorjFolderDescriptionShort, Strings.Storj.StorjFolderDescriptionLong), diff --git a/Duplicati/Library/Backend/Tardigrade/TardigradeBackend.cs b/Duplicati/Library/Backend/Tardigrade/TardigradeBackend.cs index 255830500..89374310d 100644 --- a/Duplicati/Library/Backend/Tardigrade/TardigradeBackend.cs +++ b/Duplicati/Library/Backend/Tardigrade/TardigradeBackend.cs @@ -28,6 +28,7 @@ namespace Duplicati.Library.Backend.Tardigrade private const string TARDIGRADE_SATELLITE = "tardigrade-satellite"; private const string TARDIGRADE_API_KEY = "tardigrade-api-key"; private const string TARDIGRADE_SECRET = "tardigrade-secret"; + private const string TARDIGRADE_SECRET_VERIFY = "tardigrade-secret-verify"; private const string TARDIGRADE_SHARED_ACCESS = "tardigrade-shared-access"; private const string TARDIGRADE_BUCKET = "tardigrade-bucket"; private const string TARDIGRADE_FOLDER = "tardigrade-folder"; @@ -62,6 +63,7 @@ namespace Duplicati.Library.Backend.Tardigrade new CommandLineArgument(TARDIGRADE_SATELLITE, CommandLineArgument.ArgumentType.String, Strings.Storj.StorjSatelliteDescriptionShort, Strings.Storj.StorjSatelliteDescriptionLong, "us1.storj.io:7777", null, null), new CommandLineArgument(TARDIGRADE_API_KEY, CommandLineArgument.ArgumentType.String, Strings.Storj.StorjAPIKeyDescriptionShort, Strings.Storj.StorjAPIKeyDescriptionLong, null, null, null), new CommandLineArgument(TARDIGRADE_SECRET, CommandLineArgument.ArgumentType.Password, Strings.Storj.StorjSecretDescriptionShort, Strings.Storj.StorjSecretDescriptionLong, null, null, null), + new CommandLineArgument(TARDIGRADE_SECRET_VERIFY, CommandLineArgument.ArgumentType.Password, Strings.Storj.StorjSecretDescriptionShort, Strings.Storj.StorjSecretDescriptionLong, null, null, null), new CommandLineArgument(TARDIGRADE_SHARED_ACCESS, CommandLineArgument.ArgumentType.String, Strings.Storj.StorjSharedAccessDescriptionShort, Strings.Storj.StorjSharedAccessDescriptionLong, null, null, null), new CommandLineArgument(TARDIGRADE_BUCKET, CommandLineArgument.ArgumentType.String, Strings.Storj.StorjBucketDescriptionShort, Strings.Storj.StorjBucketDescriptionLong, null, null, null), new CommandLineArgument(TARDIGRADE_FOLDER, CommandLineArgument.ArgumentType.String, Strings.Storj.StorjFolderDescriptionShort, Strings.Storj.StorjFolderDescriptionLong, null, null, null), diff --git a/Duplicati/Library/Main/Controller.cs b/Duplicati/Library/Main/Controller.cs index 18669a994..bbedd875c 100644 --- a/Duplicati/Library/Main/Controller.cs +++ b/Duplicati/Library/Main/Controller.cs @@ -816,8 +816,12 @@ namespace Duplicati.Library.Main if (string.Equals(m_options.CompressionModule, "7z", StringComparison.OrdinalIgnoreCase))
Logging.Log.WriteWarningMessage(LOGTAG, "7zModuleHasIssues", null, "The 7z compression module has known issues and should only be used for experimental purposes");
- //TODO: Based on the action, see if all options are relevant
- }
+ //Inform the user about the deprecated Tardigrade-Backend. They should switch to Storj DCS instead.
+ if (string.Equals(new Library.Utility.Uri(m_backend).Scheme, "tardigrade", StringComparison.OrdinalIgnoreCase))
+ Logging.Log.WriteWarningMessage(LOGTAG, "TardigradeRename", null, "The Tardigrade-backend got renamed to Storj DCS - please migrate your backups to the new configuration.");
+
+ //TODO: Based on the action, see if all options are relevant
+ }
/// <summary>
/// Helper method that expands the users chosen source input paths,
|