diff options
-rw-r--r-- | Duplicati.sln | 2 | ||||
-rw-r--r-- | Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj | 4 | ||||
-rw-r--r-- | Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj | 4 | ||||
-rw-r--r-- | Duplicati/CommandLine/Duplicati.CommandLine.csproj | 6 | ||||
-rw-r--r-- | Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj | 4 | ||||
-rw-r--r-- | Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj | 4 | ||||
-rw-r--r-- | Duplicati/Library/Backend/Storj/Duplicati.Library.Backend.Storj.csproj (renamed from Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj) | 6 | ||||
-rw-r--r-- | Duplicati/Library/Backend/Storj/Properties/AssemblyInfo.cs (renamed from Duplicati/Library/Backend/Tardigrade/Properties/AssemblyInfo.cs) | 0 | ||||
-rw-r--r-- | Duplicati/Library/Backend/Storj/StorjBackend.cs (renamed from Duplicati/Library/Backend/Tardigrade/TardigradeBackend.cs) | 30 | ||||
-rw-r--r-- | Duplicati/Library/Backend/Storj/StorjConfig.cs (renamed from Duplicati/Library/Backend/Tardigrade/TardigradeConfig.cs) | 2 | ||||
-rw-r--r-- | Duplicati/Library/Backend/Storj/StorjFile.cs (renamed from Duplicati/Library/Backend/Tardigrade/TardigradeFile.cs) | 6 | ||||
-rw-r--r-- | Duplicati/Library/Backend/Storj/Strings.cs | 33 | ||||
-rw-r--r-- | Duplicati/Library/Backend/Storj/libstorj_uplink.dylib (renamed from Duplicati/Library/Backend/Tardigrade/libstorj_uplink.dylib) | bin | 14341776 -> 14341776 bytes | |||
-rw-r--r-- | Duplicati/Library/Backend/Storj/libstorj_uplink.so (renamed from Duplicati/Library/Backend/Tardigrade/libstorj_uplink.so) | bin | 15439776 -> 15439776 bytes | |||
-rw-r--r-- | Duplicati/Library/Backend/Storj/packages.config (renamed from Duplicati/Library/Backend/Tardigrade/packages.config) | 0 | ||||
-rw-r--r-- | Duplicati/Library/Backend/Storj/win-x64/storj_uplink.dll (renamed from Duplicati/Library/Backend/Tardigrade/win-x64/storj_uplink.dll) | bin | 9595904 -> 9595904 bytes | |||
-rw-r--r-- | Duplicati/Library/Backend/Storj/win-x86/storj_uplink.dll (renamed from Duplicati/Library/Backend/Tardigrade/win-x86/storj_uplink.dll) | bin | 8198656 -> 8198656 bytes | |||
-rw-r--r-- | Duplicati/Library/Backend/Tardigrade/Strings.cs | 33 | ||||
-rw-r--r-- | Duplicati/Server/Duplicati.Server.csproj | 4 |
19 files changed, 69 insertions, 69 deletions
diff --git a/Duplicati.sln b/Duplicati.sln index d162cb249..e734b5ee1 100644 --- a/Duplicati.sln +++ b/Duplicati.sln @@ -101,7 +101,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.CommandLine.Confi EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Encryption", "Duplicati\Library\Encryption\Duplicati.Library.Encryption.csproj", "{2CF2D90E-C25B-47AD-91E0-98451BAB8058}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.Tardigrade", "Duplicati\Library\Backend\Tardigrade\Duplicati.Library.Backend.Tardigrade.csproj", "{AE035E01-C917-4F13-A35E-78F21C1A2F17}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.Storj", "Duplicati\Library\Backend\Storj\Duplicati.Library.Backend.Storj.csproj", "{AE035E01-C917-4F13-A35E-78F21C1A2F17}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.TencentCOS", "Duplicati\Library\Backend\TencentCOS\Duplicati.Library.Backend.TencentCOS.csproj", "{545DD6D4-9476-42D6-B51C-A28E000C489E}" EndProject diff --git a/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj b/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj index 721163ebb..3a427342c 100644 --- a/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj +++ b/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj @@ -86,9 +86,9 @@ <Project>{32a74526-3e5f-413a-8cb4-1efdad4c8b91}</Project>
<Name>Duplicati.Library.Backend.Sia</Name>
</ProjectReference>
- <ProjectReference Include="..\..\Library\Backend\Tardigrade\Duplicati.Library.Backend.Tardigrade.csproj">
+ <ProjectReference Include="..\..\Library\Backend\Storj\Duplicati.Library.Backend.Storj.csproj">
<Project>{ae035e01-c917-4f13-a35e-78f21c1a2f17}</Project>
- <Name>Duplicati.Library.Backend.Tardigrade</Name>
+ <Name>Duplicati.Library.Backend.Storj</Name>
</ProjectReference>
<ProjectReference Include="..\..\Library\Backend\TencentCOS\Duplicati.Library.Backend.TencentCOS.csproj">
<Project>{545dd6d4-9476-42d6-b51c-a28e000c489e}</Project>
diff --git a/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj b/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj index 694439e22..d35fafe90 100644 --- a/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj +++ b/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj @@ -92,9 +92,9 @@ <Project>{C0270709-2A40-43B5-8CF1-69581B9FA2A1}</Project>
<Name>Duplicati.Library.Backend.TahoeLAFS</Name>
</ProjectReference>
- <ProjectReference Include="..\..\Library\Backend\Tardigrade\Duplicati.Library.Backend.Tardigrade.csproj">
+ <ProjectReference Include="..\..\Library\Backend\Storj\Duplicati.Library.Backend.Storj.csproj">
<Project>{ae035e01-c917-4f13-a35e-78f21c1a2f17}</Project>
- <Name>Duplicati.Library.Backend.Tardigrade</Name>
+ <Name>Duplicati.Library.Backend.Storj</Name>
</ProjectReference>
<ProjectReference Include="..\..\Library\Backend\TencentCOS\Duplicati.Library.Backend.TencentCOS.csproj">
<Project>{545dd6d4-9476-42d6-b51c-a28e000c489e}</Project>
diff --git a/Duplicati/CommandLine/Duplicati.CommandLine.csproj b/Duplicati/CommandLine/Duplicati.CommandLine.csproj index 83b3926dc..5e7db2104 100644 --- a/Duplicati/CommandLine/Duplicati.CommandLine.csproj +++ b/Duplicati/CommandLine/Duplicati.CommandLine.csproj @@ -231,9 +231,9 @@ <Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project>
<Name>Duplicati.Library.Common</Name>
</ProjectReference>
- <ProjectReference Include="..\Library\Backend\Tardigrade\Duplicati.Library.Backend.Tardigrade.csproj">
+ <ProjectReference Include="..\Library\Backend\Storj\Duplicati.Library.Backend.Storj.csproj">
<Project>{AE035E01-C917-4F13-A35E-78F21C1A2F17}</Project>
- <Name>Duplicati.Library.Backend.Tardigrade</Name>
+ <Name>Duplicati.Library.Backend.Storj</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
@@ -256,4 +256,4 @@ <Target Name="AfterBuild">
</Target>
-->
-</Project>
+</Project>
\ No newline at end of file diff --git a/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj b/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj index 819aff870..ea1e82626 100644 --- a/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj +++ b/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj @@ -182,9 +182,9 @@ <Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project>
<Name>Duplicati.Library.Common</Name>
</ProjectReference>
- <ProjectReference Include="..\..\Library\Backend\Tardigrade\Duplicati.Library.Backend.Tardigrade.csproj">
+ <ProjectReference Include="..\..\Library\Backend\Storj\Duplicati.Library.Backend.Storj.csproj">
<Project>{AE035E01-C917-4F13-A35E-78F21C1A2F17}</Project>
- <Name>Duplicati.Library.Backend.Tardigrade</Name>
+ <Name>Duplicati.Library.Backend.Storj</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj index e5b3f7b72..81a3997c1 100644 --- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj @@ -217,9 +217,9 @@ <Project>{C0270709-2A40-43B5-8CF1-69581B9FA2A1}</Project>
<Name>Duplicati.Library.Backend.TahoeLAFS</Name>
</ProjectReference>
- <ProjectReference Include="..\..\Library\Backend\Tardigrade\Duplicati.Library.Backend.Tardigrade.csproj">
+ <ProjectReference Include="..\..\Library\Backend\Storj\Duplicati.Library.Backend.Storj.csproj">
<Project>{ae035e01-c917-4f13-a35e-78f21c1a2f17}</Project>
- <Name>Duplicati.Library.Backend.Tardigrade</Name>
+ <Name>Duplicati.Library.Backend.Storj</Name>
</ProjectReference>
<ProjectReference Include="..\..\Library\Backend\TencentCOS\Duplicati.Library.Backend.TencentCOS.csproj">
<Project>{545dd6d4-9476-42d6-b51c-a28e000c489e}</Project>
diff --git a/Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj b/Duplicati/Library/Backend/Storj/Duplicati.Library.Backend.Storj.csproj index e3227fde0..c44e61a61 100644 --- a/Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj +++ b/Duplicati/Library/Backend/Storj/Duplicati.Library.Backend.Storj.csproj @@ -76,11 +76,11 @@ </Reference> </ItemGroup> <ItemGroup> - <Compile Include="TardigradeFile.cs" /> + <Compile Include="StorjFile.cs" /> <Compile Include="Strings.cs" /> - <Compile Include="TardigradeBackend.cs" /> + <Compile Include="StorjBackend.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> - <Compile Include="TardigradeConfig.cs" /> + <Compile Include="StorjConfig.cs" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\..\Common\Duplicati.Library.Common.csproj"> diff --git a/Duplicati/Library/Backend/Tardigrade/Properties/AssemblyInfo.cs b/Duplicati/Library/Backend/Storj/Properties/AssemblyInfo.cs index 5f3cc907e..5f3cc907e 100644 --- a/Duplicati/Library/Backend/Tardigrade/Properties/AssemblyInfo.cs +++ b/Duplicati/Library/Backend/Storj/Properties/AssemblyInfo.cs diff --git a/Duplicati/Library/Backend/Tardigrade/TardigradeBackend.cs b/Duplicati/Library/Backend/Storj/StorjBackend.cs index ecd3e67cf..7575525e3 100644 --- a/Duplicati/Library/Backend/Tardigrade/TardigradeBackend.cs +++ b/Duplicati/Library/Backend/Storj/StorjBackend.cs @@ -127,7 +127,7 @@ namespace Duplicati.Library.Backend.Tardigrade public string DisplayName { - get { return Strings.Tardigrade.DisplayName; } + get { return Strings.Storj.DisplayName; } } public string ProtocolKey => PROTOCOL_KEY; @@ -137,13 +137,13 @@ namespace Duplicati.Library.Backend.Tardigrade get { return new List<ICommandLineArgument>(new ICommandLineArgument[] { - new CommandLineArgument(TARDIGRADE_AUTH_METHOD, CommandLineArgument.ArgumentType.String, Strings.Tardigrade.TardigradeAuthMethodDescriptionShort, Strings.Tardigrade.TardigradeAuthMethodDescriptionLong, "API key"), - new CommandLineArgument(TARDIGRADE_SATELLITE, CommandLineArgument.ArgumentType.String, Strings.Tardigrade.TardigradeSatelliteDescriptionShort, Strings.Tardigrade.TardigradeSatelliteDescriptionLong, "us1.storj.io:7777"), - new CommandLineArgument(TARDIGRADE_API_KEY, CommandLineArgument.ArgumentType.String, Strings.Tardigrade.TardigradeAPIKeyDescriptionShort, Strings.Tardigrade.TardigradeAPIKeyDescriptionLong), - new CommandLineArgument(TARDIGRADE_SECRET, CommandLineArgument.ArgumentType.Password, Strings.Tardigrade.TardigradeSecretDescriptionShort, Strings.Tardigrade.TardigradeSecretDescriptionLong), - new CommandLineArgument(TARDIGRADE_SHARED_ACCESS, CommandLineArgument.ArgumentType.String, Strings.Tardigrade.TardigradeSharedAccessDescriptionShort, Strings.Tardigrade.TardigradeSharedAccessDescriptionLong), - new CommandLineArgument(TARDIGRADE_BUCKET, CommandLineArgument.ArgumentType.String, Strings.Tardigrade.TardigradeBucketDescriptionShort, Strings.Tardigrade.TardigradeBucketDescriptionLong), - new CommandLineArgument(TARDIGRADE_FOLDER, CommandLineArgument.ArgumentType.String, Strings.Tardigrade.TardigradeFolderDescriptionShort, Strings.Tardigrade.TardigradeFolderDescriptionLong), + new CommandLineArgument(TARDIGRADE_AUTH_METHOD, CommandLineArgument.ArgumentType.String, Strings.Storj.StorjAuthMethodDescriptionShort, Strings.Storj.StorjAuthMethodDescriptionLong, "API key"), + new CommandLineArgument(TARDIGRADE_SATELLITE, CommandLineArgument.ArgumentType.String, Strings.Storj.StorjSatelliteDescriptionShort, Strings.Storj.StorjSatelliteDescriptionLong, "us1.storj.io:7777"), + new CommandLineArgument(TARDIGRADE_API_KEY, CommandLineArgument.ArgumentType.String, Strings.Storj.StorjAPIKeyDescriptionShort, Strings.Storj.StorjAPIKeyDescriptionLong), + new CommandLineArgument(TARDIGRADE_SECRET, CommandLineArgument.ArgumentType.Password, Strings.Storj.StorjSecretDescriptionShort, Strings.Storj.StorjSecretDescriptionLong), + new CommandLineArgument(TARDIGRADE_SHARED_ACCESS, CommandLineArgument.ArgumentType.String, Strings.Storj.StorjSharedAccessDescriptionShort, Strings.Storj.StorjSharedAccessDescriptionLong), + new CommandLineArgument(TARDIGRADE_BUCKET, CommandLineArgument.ArgumentType.String, Strings.Storj.StorjBucketDescriptionShort, Strings.Storj.StorjBucketDescriptionLong), + new CommandLineArgument(TARDIGRADE_FOLDER, CommandLineArgument.ArgumentType.String, Strings.Storj.StorjFolderDescriptionShort, Strings.Storj.StorjFolderDescriptionLong), }); } } @@ -152,7 +152,7 @@ namespace Duplicati.Library.Backend.Tardigrade { get { - return Strings.Tardigrade.Description; + return Strings.Storj.Description; } } @@ -166,7 +166,7 @@ namespace Duplicati.Library.Backend.Tardigrade public void CreateFolder() { - //Tardigrade has no folders + //Storj DCS has no folders } public void Delete(string remotename) @@ -258,14 +258,14 @@ namespace Duplicati.Library.Backend.Tardigrade private async Task<IEnumerable<IFileEntry>> ListAsync() { - List<TardigradeFile> files = new List<TardigradeFile>(); + List<StorjFile> files = new List<StorjFile>(); var bucket = await _bucketService.EnsureBucketAsync(_bucket); var prefix = GetBasePath(); var objects = await _objectService.ListObjectsAsync(bucket, new ListObjectsOptions { Recursive = true, System = true, Custom = true, Prefix = prefix }); foreach (var obj in objects.Items) { - TardigradeFile file = new TardigradeFile(obj); + StorjFile file = new StorjFile(obj); if (prefix != "") { file.Name = file.Name.Replace(prefix, ""); @@ -286,8 +286,8 @@ namespace Duplicati.Library.Backend.Tardigrade { var bucket = await _bucketService.EnsureBucketAsync(_bucket); CustomMetadata custom = new CustomMetadata(); - custom.Entries.Add(new CustomMetadataEntry { Key = TardigradeFile.TARDIGRADE_LAST_ACCESS, Value = DateTime.Now.ToUniversalTime().ToString("O") }); - custom.Entries.Add(new CustomMetadataEntry { Key = TardigradeFile.TARDIGRADE_LAST_MODIFICATION, Value = DateTime.Now.ToUniversalTime().ToString("O") }); + custom.Entries.Add(new CustomMetadataEntry { Key = StorjFile.TARDIGRADE_LAST_ACCESS, Value = DateTime.Now.ToUniversalTime().ToString("O") }); + custom.Entries.Add(new CustomMetadataEntry { Key = StorjFile.TARDIGRADE_LAST_MODIFICATION, Value = DateTime.Now.ToUniversalTime().ToString("O") }); var upload = await _objectService.UploadObjectAsync(bucket, GetBasePath() + remotename, new UploadOptions(), stream, custom, false); await upload.StartUploadAsync(); } @@ -298,7 +298,7 @@ namespace Duplicati.Library.Backend.Tardigrade testTask.Wait(10000); if (!testTask.Result) { - throw new Exception(Strings.Tardigrade.TestConnectionFailed); + throw new Exception(Strings.Storj.TestConnectionFailed); } } diff --git a/Duplicati/Library/Backend/Tardigrade/TardigradeConfig.cs b/Duplicati/Library/Backend/Storj/StorjConfig.cs index 7c99982e2..d0280a5c8 100644 --- a/Duplicati/Library/Backend/Tardigrade/TardigradeConfig.cs +++ b/Duplicati/Library/Backend/Storj/StorjConfig.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; namespace Duplicati.Library.Backend.Tardigrade { - public class TardigradeConfig : IWebModule + public class StorjConfig : IWebModule { private const ConfigType DEFAULT_CONFIG_TYPE = ConfigType.Satellites; private const string KEY_CONFIGTYPE = "tardigrade-config"; diff --git a/Duplicati/Library/Backend/Tardigrade/TardigradeFile.cs b/Duplicati/Library/Backend/Storj/StorjFile.cs index 794e427e0..7815f6c56 100644 --- a/Duplicati/Library/Backend/Tardigrade/TardigradeFile.cs +++ b/Duplicati/Library/Backend/Storj/StorjFile.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; namespace Duplicati.Library.Backend.Tardigrade { - public class TardigradeFile : IFileEntry + public class StorjFile : IFileEntry { public static readonly string TARDIGRADE_LAST_ACCESS = "DUPLICATI:LAST-ACCESS"; public static readonly string TARDIGRADE_LAST_MODIFICATION = "DUPLICATI:LAST-MODIFICATION"; @@ -21,12 +21,12 @@ namespace Duplicati.Library.Backend.Tardigrade public long Size { get; set; } - public TardigradeFile() + public StorjFile() { } - public TardigradeFile(uplink.NET.Models.Object tardigradeObject) + public StorjFile(uplink.NET.Models.Object tardigradeObject) { IsFolder = tardigradeObject.IsPrefix; var lastAccess = tardigradeObject.CustomMetaData.Entries.Where(e => e.Key == TARDIGRADE_LAST_ACCESS).FirstOrDefault(); diff --git a/Duplicati/Library/Backend/Storj/Strings.cs b/Duplicati/Library/Backend/Storj/Strings.cs new file mode 100644 index 000000000..51b445067 --- /dev/null +++ b/Duplicati/Library/Backend/Storj/Strings.cs @@ -0,0 +1,33 @@ +using Duplicati.Library.Localization.Short; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Duplicati.Library.Backend.Strings +{ + internal static class Storj + { + public static string DisplayName { get { return LC.L(@"Storj DCS (Decentralized Cloud Storage)"); } } + public static string Description { get { return LC.L(@"This backend can read and write data to the Storj DCS."); } } + public static string TestConnectionFailed { get { return LC.L(@"The connection-test failed."); } } + public static string StorjAuthMethodDescriptionShort { get { return LC.L(@"The authentication method"); } } + public static string StorjAuthMethodDescriptionLong { get { return LC.L(@"The authentication method describes which way to use to connect to the network - either via API key or via an access grant."); } } + public static string StorjSatelliteDescriptionShort { get { return LC.L(@"The satellite"); } } + public static string StorjSatelliteDescriptionLong { get { return LC.L(@"The satellite that keeps track of all metadata. Use a Storj DCS server for high-performance SLA-backed connectivity or use a community server. Or even host your own."); } } + public static string StorjAPIKeyDescriptionShort { get { return LC.L(@"The API key"); } } + public static string StorjAPIKeyDescriptionLong { get { return LC.L(@"The API key grants access to a specific project on your chosen satellite. Head over to the dashboard of your satellite to create one if you do not already have an API key."); } } + public static string StorjSecretDescriptionShort { get { return LC.L(@"The encryption passphrase"); } } + public static string StorjSecretDescriptionLong { get { return LC.L(@"The encryption passphrase is used to encrypt your data before sending it to the Storj network. This passphrase can be the only secret to provide - for Storj you do not necessary need any additional encryption (from Duplicati) in place."); } } + public static string StorjSecretVerifyDescriptionShort { get { return LC.L(@"The encryption passphrase (for verification)"); } } + public static string StorjSecretVerifyDescriptionLong { get { return LC.L(@"The encryption passphrase verification to make sure you provided the expected value."); } } + public static string StorjSharedAccessDescriptionShort { get { return LC.L(@"The access grant"); } } + public static string StorjSharedAccessDescriptionLong { get { return LC.L(@"An access grant contains all information in one encrypted string. You may use it instead of a satellite, API key and secret."); } } + public static string StorjBucketDescriptionShort { get { return LC.L(@"The bucket"); } } + public static string StorjBucketDescriptionLong { get { return LC.L(@"The bucket where the backup will reside in."); } } + public static string StorjFolderDescriptionShort { get { return LC.L(@"The folder"); } } + public static string StorjFolderDescriptionLong { get { return LC.L(@"The folder within the bucket where the backup will reside in."); } } + public static string StorjEncryptionPassphrasesDoNotMatchError { get { return LC.L(@"The encryption passphrases do not match"); } } + } +} diff --git a/Duplicati/Library/Backend/Tardigrade/libstorj_uplink.dylib b/Duplicati/Library/Backend/Storj/libstorj_uplink.dylib Binary files differindex a3e4de942..a3e4de942 100644 --- a/Duplicati/Library/Backend/Tardigrade/libstorj_uplink.dylib +++ b/Duplicati/Library/Backend/Storj/libstorj_uplink.dylib diff --git a/Duplicati/Library/Backend/Tardigrade/libstorj_uplink.so b/Duplicati/Library/Backend/Storj/libstorj_uplink.so Binary files differindex 0ecab8ba8..0ecab8ba8 100644 --- a/Duplicati/Library/Backend/Tardigrade/libstorj_uplink.so +++ b/Duplicati/Library/Backend/Storj/libstorj_uplink.so diff --git a/Duplicati/Library/Backend/Tardigrade/packages.config b/Duplicati/Library/Backend/Storj/packages.config index 1592ab1f8..1592ab1f8 100644 --- a/Duplicati/Library/Backend/Tardigrade/packages.config +++ b/Duplicati/Library/Backend/Storj/packages.config diff --git a/Duplicati/Library/Backend/Tardigrade/win-x64/storj_uplink.dll b/Duplicati/Library/Backend/Storj/win-x64/storj_uplink.dll Binary files differindex 8b42a9c6b..8b42a9c6b 100644 --- a/Duplicati/Library/Backend/Tardigrade/win-x64/storj_uplink.dll +++ b/Duplicati/Library/Backend/Storj/win-x64/storj_uplink.dll diff --git a/Duplicati/Library/Backend/Tardigrade/win-x86/storj_uplink.dll b/Duplicati/Library/Backend/Storj/win-x86/storj_uplink.dll Binary files differindex c34a75d19..c34a75d19 100644 --- a/Duplicati/Library/Backend/Tardigrade/win-x86/storj_uplink.dll +++ b/Duplicati/Library/Backend/Storj/win-x86/storj_uplink.dll diff --git a/Duplicati/Library/Backend/Tardigrade/Strings.cs b/Duplicati/Library/Backend/Tardigrade/Strings.cs deleted file mode 100644 index 2484797dc..000000000 --- a/Duplicati/Library/Backend/Tardigrade/Strings.cs +++ /dev/null @@ -1,33 +0,0 @@ -using Duplicati.Library.Localization.Short; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Duplicati.Library.Backend.Strings -{ - internal static class Tardigrade - { - public static string DisplayName { get { return LC.L(@"Storj DCS (Decentralized Cloud Storage)"); } } - public static string Description { get { return LC.L(@"This backend can read and write data to the Storj DCS."); } } - public static string TestConnectionFailed { get { return LC.L(@"The connection-test failed."); } } - public static string TardigradeAuthMethodDescriptionShort { get { return LC.L(@"The authentication method"); } } - public static string TardigradeAuthMethodDescriptionLong { get { return LC.L(@"The authentication method describes which way to use to connect to the network - either via API key or via an access grant."); } } - public static string TardigradeSatelliteDescriptionShort { get { return LC.L(@"The satellite"); } } - public static string TardigradeSatelliteDescriptionLong { get { return LC.L(@"The satellite that keeps track of all metadata. Use a Storj DCS server for high-performance SLA-backed connectivity or use a community server. Or even host your own."); } } - public static string TardigradeAPIKeyDescriptionShort { get { return LC.L(@"The API key"); } } - public static string TardigradeAPIKeyDescriptionLong { get { return LC.L(@"The API key grants access to a specific project on your chosen satellite. Head over to the dashboard of your satellite to create one if you do not already have an API key."); } } - public static string TardigradeSecretDescriptionShort { get { return LC.L(@"The encryption passphrase"); } } - public static string TardigradeSecretDescriptionLong { get { return LC.L(@"The encryption passphrase is used to encrypt your data before sending it to the Storj network. This passphrase can be the only secret to provide - for Storj you do not necessary need any additional encryption (from Duplicati) in place."); } } - public static string TardigradeSecretVerifyDescriptionShort { get { return LC.L(@"The encryption passphrase (for verification)"); } } - public static string TardigradeSecretVerifyDescriptionLong { get { return LC.L(@"The encryption passphrase verification to make sure you provided the expected value."); } } - public static string TardigradeSharedAccessDescriptionShort { get { return LC.L(@"The access grant"); } } - public static string TardigradeSharedAccessDescriptionLong { get { return LC.L(@"An access grant contains all information in one encrypted string. You may use it instead of a satellite, API key and secret."); } } - public static string TardigradeBucketDescriptionShort { get { return LC.L(@"The bucket"); } } - public static string TardigradeBucketDescriptionLong { get { return LC.L(@"The bucket where the backup will reside in."); } } - public static string TardigradeFolderDescriptionShort { get { return LC.L(@"The folder"); } } - public static string TardigradeFolderDescriptionLong { get { return LC.L(@"The folder within the bucket where the backup will reside in."); } } - public static string TardigradeEncryptionPassphrasesDoNotMatchError { get { return LC.L(@"The encryption passphrases do not match"); } } - } -} diff --git a/Duplicati/Server/Duplicati.Server.csproj b/Duplicati/Server/Duplicati.Server.csproj index 4a81dbdad..c1b36fa4a 100644 --- a/Duplicati/Server/Duplicati.Server.csproj +++ b/Duplicati/Server/Duplicati.Server.csproj @@ -203,9 +203,9 @@ <Project>{C0270709-2A40-43B5-8CF1-69581B9FA2A1}</Project>
<Name>Duplicati.Library.Backend.TahoeLAFS</Name>
</ProjectReference>
- <ProjectReference Include="..\Library\Backend\Tardigrade\Duplicati.Library.Backend.Tardigrade.csproj">
+ <ProjectReference Include="..\Library\Backend\Storj\Duplicati.Library.Backend.Storj.csproj">
<Project>{ae035e01-c917-4f13-a35e-78f21c1a2f17}</Project>
- <Name>Duplicati.Library.Backend.Tardigrade</Name>
+ <Name>Duplicati.Library.Backend.Storj</Name>
</ProjectReference>
<ProjectReference Include="..\Library\Backend\TencentCOS\Duplicati.Library.Backend.TencentCOS.csproj">
<Project>{545dd6d4-9476-42d6-b51c-a28e000c489e}</Project>
|