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

Reworked the use of scopes.

Browse Source 
Instead of requesting all scopes up front, each sub-section of the backup/restore will request the permissions that are relevant for the operation.

The effect is that it is not required to grant all permissions to get a backup running. If permissions are failing, that part of the backup will generate warnings for items that are excluded.
This commit is contained in:
Kenneth Skovhede
2026-02-15 22:03:57 +01:00
parent 3bc449281a
commit 910c56b3c4
53 changed files with 2954 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files
proprietary/GoogleWorkspace/SourceItems/DriveFileSourceEntry.cs
+6 -5
View File
@@ -2,12 +2,13 @@
using Duplicati.Library.Common.IO;
using Duplicati.Library.Interface;
using Google.Apis.Drive.v3;
using System.Runtime.CompilerServices;
using File = Google.Apis.Drive.v3.Data.File;
namespace Duplicati.Proprietary.GoogleWorkspace.SourceItems;
internal class DriveFileSourceEntry(SourceProvider provider, string parentPath, File file)
internal class DriveFileSourceEntry(string parentPath, File file, DriveService driveService)
: MetaEntryBase(Util.AppendDirSeparator(SystemIO.IO_OS.PathCombine(parentPath, file.Name)), file.CreatedTimeDateTimeOffset.HasValue ? file.CreatedTimeDateTimeOffset.Value.UtcDateTime : DateTime.UnixEpoch, file.ModifiedTimeDateTimeOffset.HasValue ? file.ModifiedTimeDateTimeOffset.Value.UtcDateTime : DateTime.UnixEpoch)
{
public override async IAsyncEnumerable<ISourceProviderEntry> Enumerate([EnumeratorCancellation] CancellationToken cancellationToken)
@@ -16,18 +17,18 @@ internal class DriveFileSourceEntry(SourceProvider provider, string parentPath,
yield return new DriveFileMetadataSourceEntry(this.Path, file);
if (cancellationToken.IsCancellationRequested) yield break;
yield return new DriveFilePermissionsSourceEntry(provider, this.Path, file);
yield return new DriveFilePermissionsSourceEntry(this.Path, file, driveService);
if (cancellationToken.IsCancellationRequested) yield break;
yield return new DriveFileContentSourceEntry(provider, this.Path, file);
yield return new DriveFileContentSourceEntry(this.Path, file, driveService);
if (cancellationToken.IsCancellationRequested) yield break;
yield return new DriveFileCommentsSourceEntry(provider, this.Path, file);
yield return new DriveFileCommentsSourceEntry(this.Path, file, driveService);
if (!GoogleMimeTypes.IsGoogleSite(file.MimeType) && !GoogleMimeTypes.IsShortcut(file.MimeType))
{
if (cancellationToken.IsCancellationRequested) yield break;
yield return new DriveFileRevisionsSourceEntry(provider, this.Path, file);
yield return new DriveFileRevisionsSourceEntry(this.Path, file, driveService);
}
}