TrueCloudLab/rclone
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions 1

drive: switch to the Drives API for looking up shared drives - fixes #3139

Browse source 
Before this change rclone used the deprecated teamdrives API. This
change uses the new drives API (which seems to be the teamdrives API
renames).
This commit is contained in:
Nick Craig-Wood 2021-04-03 14:21:20 +01:00
parent 9e2fbe0f1a
commit 116a8021bb
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
backend/drive/drive.go
View file

@ -2959,12 +2959,12 @@ func (f *Fs) makeShortcut(ctx context.Context, srcPath string, dstFs *Fs, dstPat
} }
// List all team drives // List all team drives
func (f *Fs) listTeamDrives(ctx context.Context) (drives []*drive.TeamDrive, err error) { func (f *Fs) listTeamDrives(ctx context.Context) (drives []*drive.Drive, err error) {
drives = []*drive.TeamDrive{} drives = []*drive.Drive{}
listTeamDrives := f.svc.Teamdrives.List().PageSize(100) listTeamDrives := f.svc.Drives.List().PageSize(100)
var defaultFs Fs // default Fs with default Options var defaultFs Fs // default Fs with default Options
for { for {
var teamDrives *drive.TeamDriveList var teamDrives *drive.DriveList
err = f.pacer.Call(func() (bool, error) { err = f.pacer.Call(func() (bool, error) {
teamDrives, err = listTeamDrives.Context(ctx).Do() teamDrives, err = listTeamDrives.Context(ctx).Do()
return defaultFs.shouldRetry(ctx, err) return defaultFs.shouldRetry(ctx, err)
@ -2972,7 +2972,7 @@ func (f *Fs) listTeamDrives(ctx context.Context) (drives []*drive.TeamDrive, err
if err != nil { if err != nil {
return drives, errors.Wrap(err, "listing Team Drives failed") return drives, errors.Wrap(err, "listing Team Drives failed")
} }
drives = append(drives, teamDrives.TeamDrives...) drives = append(drives, teamDrives.Drives...)
if teamDrives.NextPageToken == "" { if teamDrives.NextPageToken == "" {
break break
} }