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

Fixed some Windows path issues

Browse Source
This commit is contained in:
Kenneth Skovhede
2026-02-17 09:31:39 +01:00
parent a7fe859a50
commit d9b5cb256d
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Calendar.cs
+2 -2
View File
@@ -40,7 +40,7 @@ partial class RestoreProvider
}
else if (target.Type == SourceItemType.UserCalendar)
{
_targetUserId = target.Path.TrimStart('/').Split('/').Skip(1).FirstOrDefault();
_targetUserId = target.Path.TrimStart(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar).Skip(1).FirstOrDefault();
if (!string.IsNullOrWhiteSpace(_targetUserId))
_targetCalendarId = await GetDefaultRestoreTargetCalendar(_targetUserId, cancel);
}
@@ -48,7 +48,7 @@ partial class RestoreProvider
{
_targetUserId = target.Metadata.GetValueOrDefault("gsuite:UserId");
if (string.IsNullOrWhiteSpace(_targetUserId))
_targetUserId = target.Path.TrimStart('/').Split('/').Skip(1).FirstOrDefault();
_targetUserId = target.Path.TrimStart(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar).Skip(1).FirstOrDefault();
_targetCalendarId = target.Metadata.GetValueOrDefault("gsuite:Id");
}
else
proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Chat.cs
+1 -1
View File
@@ -35,7 +35,7 @@ partial class RestoreProvider
}
else if (target.Type == SourceItemType.UserChat)
{
_targetUserId = target.Path.TrimStart('/').Split('/').Skip(1).FirstOrDefault();
_targetUserId = target.Path.TrimStart(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar).Skip(1).FirstOrDefault();
}
else if (target.Type == SourceItemType.ChatSpace)
{
proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Contacts.cs
+1 -1
View File
@@ -33,7 +33,7 @@ partial class RestoreProvider
}
else if (target.Type == SourceItemType.UserContacts)
{
_targetUserId = target.Path.TrimStart('/').Split('/').Skip(1).FirstOrDefault();
_targetUserId = target.Path.TrimStart(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar).Skip(1).FirstOrDefault();
}
else
{
proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Drive.cs
+4 -4
View File
@@ -41,7 +41,7 @@ partial class RestoreProvider
}
else if (target.Type == SourceItemType.UserDrive)
{
userId = target.Path.TrimStart('/').Split('/').Skip(1).FirstOrDefault();
userId = target.Path.TrimStart(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar).Skip(1).FirstOrDefault();
}
else
{
@@ -387,7 +387,7 @@ partial class RestoreProvider
}
else if (RestoreTarget.Type == SourceItemType.UserDrive)
{
userId = RestoreTarget.Path.TrimStart('/').Split('/').Skip(1).FirstOrDefault();
userId = RestoreTarget.Path.TrimStart(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar).Skip(1).FirstOrDefault();
}
else if (RestoreTarget.Type == SourceItemType.DriveFolder)
{
@@ -464,7 +464,7 @@ partial class RestoreProvider
}
else if (RestoreTarget.Type == SourceItemType.UserDrive)
{
userId = RestoreTarget.Path.TrimStart('/').Split('/').Skip(1).FirstOrDefault();
userId = RestoreTarget.Path.TrimStart(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar).Skip(1).FirstOrDefault();
}
else if (RestoreTarget.Type == SourceItemType.DriveFolder)
{
@@ -684,7 +684,7 @@ partial class RestoreProvider
}
else if (RestoreTarget.Type == SourceItemType.UserDrive)
{
userId = RestoreTarget.Path.TrimStart('/').Split('/').Skip(1).FirstOrDefault();
userId = RestoreTarget.Path.TrimStart(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar).Skip(1).FirstOrDefault();
}
else if (RestoreTarget.Type == SourceItemType.DriveFolder)
{
proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Gmail.cs
+2 -2
View File
@@ -40,14 +40,14 @@ partial class RestoreProvider
}
else if (target.Type == SourceItemType.UserGmail)
{
_targetUserId = target.Path.TrimStart('/').Split('/').Skip(1).FirstOrDefault();
_targetUserId = target.Path.TrimStart(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar).Skip(1).FirstOrDefault();
if (string.IsNullOrWhiteSpace(_targetUserId))
throw new InvalidOperationException("User ID is not set");
_targetLabelId = await GetDefaultRestoreTargetLabel(_targetUserId, cancel);
}
else if (target.Type == SourceItemType.GmailLabel)
{
_targetUserId = target.Path.TrimStart('/').Split('/').Skip(1).FirstOrDefault();
_targetUserId = target.Path.TrimStart(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar).Skip(1).FirstOrDefault();
_targetLabelId = target.Metadata.GetValueOrDefault("gsuite:Id");
}
else
proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Keep.cs
+1 -1
View File
@@ -34,7 +34,7 @@ partial class RestoreProvider
}
else if (target.Type == SourceItemType.UserKeep)
{
_targetUserId = target.Path.TrimStart('/').Split('/').Skip(1).FirstOrDefault();
_targetUserId = target.Path.TrimStart(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar).Skip(1).FirstOrDefault();
}
else
{
proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Tasks.cs
+1 -1
View File
@@ -33,7 +33,7 @@ partial class RestoreProvider
}
else if (target.Type == SourceItemType.UserTasks)
{
_targetUserId = target.Path.TrimStart('/').Split('/').Skip(1).FirstOrDefault();
_targetUserId = target.Path.TrimStart(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar).Skip(1).FirstOrDefault();
}
else if (target.Type == SourceItemType.TaskList)
{