haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6776 from duplicati/feature/fix-compile-errors

Browse Source 
Fixed a compile issue after merge
This commit is contained in:
Kenneth Skovhede
2026-02-20 10:33:15 +01:00
committed by GitHub
parent 8cf2154037 21f85dbcc9
commit 83a4e749ba
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/UnitTest/ServerApiIntegrationTests.cs
+1 -1
View File
@@ -408,7 +408,7 @@ public class ServerApiIntegrationTests : BasicSetupHelper
{
var restoreResponse = await httpClient.PostAsJsonAsync(
$"/api/v1/backup/{backupId}/restore",
new RestoreInputDto(null, passphrase, "now", restoreFolder, true, false, false, null),
new RestoreInputDto(null, passphrase, "now", restoreFolder, true, false, false, null, null),
JsonOptions).ConfigureAwait(false);
restoreResponse.EnsureSuccessStatusCode();
var task = await restoreResponse.Content.ReadFromJsonAsync<TaskStartedDto>(JsonOptions).ConfigureAwait(false)
Duplicati/WebserverCore/Dto/RestoreInputDto.cs
+2
View File
@@ -30,6 +30,7 @@ namespace Duplicati.WebserverCore.Dto;
/// <param name="overwrite">Whether to overwrite existing files</param>
/// <param name="permissions">Whether to restore permissions</param>
/// <param name="skip_metadata">Whether to skip metadata</param>
/// <param name="connection_string_id">The connection string ID to use, if the destination is a masked remote source</param>
/// <param name="source_prefix">The source prefix to use, if the destination is a masked remote source</param>
public sealed record RestoreInputDto(
string[]? paths,
@@ -39,4 +40,5 @@ public sealed record RestoreInputDto(
bool? overwrite,
bool? permissions,
bool? skip_metadata,
long? connection_string_id,
string? source_prefix);
Duplicati/WebserverCore/Endpoints/V1/Backup/BackupPost.cs
+1 -1
View File
@@ -120,7 +120,7 @@ public class BackupPost : IEndpointV1
var restorepath = input.restore_path;
if (restorepath != null && restorepath.StartsWith("@"))
{
var res = await SharedRemoteOperation.ExpandUrl(connection, applicationSettings, restorepath.Substring(1), id, input.source_prefix, cancellationToken);
var res = await SharedRemoteOperation.ExpandUrl(connection, applicationSettings, restorepath.Substring(1), id, input.connection_string_id ?? -1, input.source_prefix, cancellationToken);
if (!string.IsNullOrWhiteSpace(res.Url))
restorepath = "@" + res.Url;
}